Applied all likewhoa's updates since the 10.0 release.

svn path=/trunk/; revision=713

releases/10.0/livecd/root_overlay/usr/share/config/kdm/kdmrc

@@ -19,6 +19,7 @@ AllowNullPasswd=false
 AllowShutdown=Root
 SessionsDirs=/usr/share/xsessions
 ClientLogFile=.xsession-errors-%d
+TerminateServer=true
 [X-*-Greeter]
 LogoArea=Logo
 LogoPixmap=/usr/share/apps/kdm/pics/kdelogo.png

releases/10.0/portage/package.keywords/keywords

@@ -1,3 +1,10 @@
+media-video/mplayer
+www-plugins/gecko-mediaplayer
+x11-themes/gtk-engines-qt
+x11-themes/qtcurve-qt4
+x11-base/xorg-server
+www-client/mozilla-firefox
+app-cdr/brasero
 app-admin/eselect-python
 app-arch/lrzip
 app-arch/lzip
@@ -48,3 +55,52 @@ dev-util/kdevplatform
 net-im/licq
 app-arch/xz-utils
 dev-util/giggle
+app-admin/eselect-opengl
+app-admin/eselect
+x11-libs/libXfont
+x11-proto/randrproto
+x11-proto/dri2proto
+x11-base/xorg-drivers
+net-libs/xulrunner
+dev-libs/nspr
+dev-libs/libburn
+x11-libs/cairo
+media-video/gnome-mplayer
+=x11-themes/gentoo-livedvd-gnome-theme-001
+x11-themes/gnome-colors
+gnome-base/nautilus
+x11-themes/gtk-engines
+sys-apps/devicekit
+sys-apps/devicekit-power
+sys-auth/pambase
+app-office/openoffice
+www-client/seamonkey
+x11-libs/libxklavier
+xfce-extra/xfce4-xkb-plugin
+xfce-base/xfce4-settings
+sys-fs/nilfs-utils
+media-tv/xbmc
+x11-proto/fixesproto
+x11-proto/xextproto
+x11-proto/xf86vidmodeproto
+x11-proto/renderproto
+x11-proto/recordproto
+x11-proto/inputproto
+x11-proto/xineramaproto
+x11-proto/bigreqsproto
+x11-proto/xf86driproto
+x11-proto/xf86dgaproto
+x11-proto/xcmiscproto
+net-libs/webkit-gtk
+net-libs/libsoup
+net-libs/libsoup-gnome
+x11-libs/libXi
+x11-proto/xproto
+x11-libs/libX11
+x11-libs/libXext
+x11-libs/libXxf86vm
+x11-libs/libXtst
+x11-libs/libXi
+x11-libs/libXinerama
+=sys-kernel/gentoo-sources-2.6.31
+sys-fs/aufs2

releases/10.0/portage/package.mask/mask

@@ -2,3 +2,5 @@ media-plugins/gst-plugins-a52dec
 media-plugins/gst-plugins-dvdread
 media-plugins/gst-plugins-mad
 media-plugins/gst-plugins-mpeg2dec
+net-wireless/gnome-bluetooth
+=x11-base/xorg-server-1.7*

releases/10.0/portage/package.use/use

@@ -1,27 +1,22 @@
 net-dns/avahi dbus
 gnome-extra/evolution-data-server ldap kerberos
 gnome-extra/gnome-utils -ipv6 -hal
-
 app-office/akonadi-server -mysql sqlite
 # The one below should not be picked by emerge anyway, but this is the 'working' default
 dev-libs/soprano -redland java
 dev-python/PyQt4 dbus sql svg webkit X
 media-sound/phonon -gstreamer xcb xine
-
 x11-libs/qt-core -glib iconv
 x11-libs/qt-gui -glib -gtk mng
 x11-libs/qt-sql -firebird -odbc -mysql -postgres iconv sqlite
 x11-libs/qt-webkit kde
-
 kde-base/kdelibs -zeroconf spell
 kde-base/kdm -consolekit pam
 kde-base/kwin -xinerama xcomposite
 kde-base/phonon-kde -pulseaudio xine
 kde-base/plasma-workspace -google-gadgets -python -xinerama rss
 kde-base/solid -bluetooth -networkmanager -wicd
-
 sys-auth/pambase consolekit
-
 dev-db/mysql embedded
 sys-block/gparted dmraid fat hfs jfs kde gnome ntfs reiserfs xfce xfs
 app-misc/mc slang samba
@@ -30,3 +25,18 @@ net-irc/quassel sqlite
 net-wireless/wpa_supplicant madwifi
 media-plugins/gst-plugins-meta -dvd -a52 -mad -mpeg
 app-cdr/gnomebaker -mp3
+sys-devel/gcc -gtk
+media-gfx/splashutils fbcondecor
+media-libs/freetype bindist
+media-libs/libmng lcms
+app-admin/conky audacious hddtemp mpd nano-syntax vim-syntax wifi rss
+x11-themes/gtk-engines-qt
+x11-themes/gtk-engines-qtcurve firefox3 mozilla
+gnome-base/nautilus gnome-keyring
+gnome-base/gnome-volume-manager consolekit
+sys-apps/hal consolekit
+net-dns/avahi mdnsresponder-compat
+media-tv/xbmc joystick
+sys-fs/aufs2 kernel-patch ramfs inotify
+media-libs/taglib -mp4
+

releases/10.0/specs/amd64/livedvd-stage1.spec

@@ -3,7 +3,7 @@ version_stamp: 10.0
 target: livecd-stage1
 rel_type: default
 profile: default/linux/amd64/10.0/desktop
-snapshot: 20090921
+snapshot: 20091117
 source_subpath: default/stage3-amd64-desktop-10.0
 portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage/
 
@@ -14,7 +14,46 @@ livecd/use:
 	socks5
 	gnome
 	qt4
+        -x264
+        -mp3
+	-mp4
+        -mpeg2
+        -mpeg4pt2
+        -xvid
+        -a52
+        -real
+        -dvdnav
+        -faac
+        -amr
+        nautilus
+        exif
+        cdda
+        avahi
 livecd/packages:
+	media-tv/xbmc
+	sys-fs/nilfs-utils
+	x11-apps/xinput
+	x11-apps/xev
+        www-plugins/gecko-mediaplayer
+        media-video/gnome-mplayer
+        x11-themes/gtk-engines-qtcurve
+        x11-themes/gtk-engines-qt
+        x11-themes/qtcurve-qt4
+	x11-misc/obconf
+	x11-misc/menumaker
+        app-admin/conky
+        media-gfx/scrot
+	app-misc/dtach
+	app-backup/flexbackup
+	net-dns/dnsmasq
+	net-misc/bridge-utils
+	games-strategy/wesnoth
+	games-simulation/simutrans
+	games-action/supertuxkart
+	games-simulation/lincity-ng
+	games-arcade/lbreakout2
+	games-strategy/hedgewars
+	app-cdr/brasero
 	dev-util/devhelp
 	net-p2p/transmission
 	net-p2p/linuxdcpp
@@ -115,7 +154,6 @@ livecd/packages:
 	app-backup/rdiff-backup
 	app-backup/rsnapshot
 	app-cdr/ccd2iso
-	app-cdr/mdf2iso
 	app-crypt/johntheripper
 	app-editors/gedit
 	app-editors/hexedit
@@ -289,7 +327,6 @@ livecd/packages:
 	app-cdr/cdrdao
 	app-cdr/cdrkit
 	app-cdr/dvd+rw-tools
-	app-cdr/gnomebaker
 	#app-cdr/k3b
 	app-cdr/nrg2iso
 	app-crypt/gnupg
@@ -314,7 +351,7 @@ livecd/packages:
 	app-office/gnucash
 	app-office/gnumeric
 	app-office/grisbi
-	app-office/openoffice-bin
+	app-office/openoffice
 	app-office/scribus
 # keywords.
 #	app-office/koffice
@@ -495,13 +532,13 @@ livecd/packages:
 	www-client/opera
 	www-client/seamonkey
 	x11-base/xorg-x11
+	x11-base/xorg-drivers
 	x11-drivers/xf86-input-synaptics
 	x11-misc/xscreensaver
 ### Masked (no stable keywords)
 #	x11-plugins/gkrellm-plugins
 	x11-themes/gdm-themes-livecd
 	x11-themes/gentoo-artwork-livecd
-	x11-wm/afterstep
 	x11-wm/enlightenment
 	x11-wm/fluxbox
 	x11-wm/windowmaker

releases/10.0/specs/amd64/livedvd-stage2.spec

@@ -3,26 +3,28 @@ version_stamp: 10.0
 target: livecd-stage2
 rel_type: default
 profile: default/linux/amd64/10.0/desktop
-snapshot: 20090921
+snapshot: 20091117
 source_subpath: default/livecd-stage1-amd64-10.0
 
+livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 #livecd/fsscript: /var/svnroot/releng/trunk/releases/10.0/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
-livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso
+livecd/iso: /chroot/livedvd-amd64-10.0.iso
-livecd/type: gentoo-release-livecd
+livecd/type: gentoo-release-livedvd
 livecd/volid: Gentoo Linux 10.0 amd64 LiveDVD
 livecd/xsession: default
+livecd/splash_theme: livecd-2007.0
 livecd/xdm: kdm
 livecd/rcadd:
 	hald|default
 	dbus|default
+	wicd|default
+	avahi-daemon|default
 
-#livecd/overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/overlay/livecd
 livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
-
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
 boot/kernel/gentoo/config:  /var/svnroot/releng/trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
@@ -34,7 +36,24 @@ boot/kernel/gentoo/use:
         portaudio
         truetype   
         usb           
+        -x264
+        -mp3
+	-mp4
+        -mpeg2
+        -mpeg4pt2
+        -xvid
+        -a52
+        -real
+        -dvdnav
+        -faac
+        -amr
+        nautilus
+        exif
+        cdda
+        avahi
 boot/kernel/gentoo/packages:
+	x11-drivers/linuxwacom
+	net-wireless/ipw2200-firmware
 	app-accessibility/espeakup
 # keywords.
 #	net-wireless/rt73-firmware
@@ -55,7 +74,8 @@ boot/kernel/gentoo/packages:
 	net-wireless/zd1201-firmware
 	net-wireless/zd1211-firmware                                                           
 	sys-block/iscsitarget
-	sys-block/open-iscsi
+# failed
+#	sys-block/open-iscsi
 	net-misc/openswan
 # failed
 #	sys-apps/pcmcia-cs
@@ -90,6 +110,8 @@ livecd/empty:
 	/usr/share/genkernel/pkg/x86/cpio
 
 livecd/rm:
+	/usr/share/autostart/kalarm.autostart.desktop
+	/usr/share/autostart/nepomukserver.desktop
 	/etc/*-
 	/etc/*.old
 	/root/.viminfo

releases/10.0/specs/x86/i686/livedvd-stage1.spec

@@ -3,7 +3,7 @@ version_stamp: 10.0
 target: livecd-stage1
 rel_type: default
 profile: default/linux/x86/10.0/desktop
-snapshot: 20090921
+snapshot: 20091117
 source_subpath: default/stage3-i686-desktop-10.0
 portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage
 
@@ -14,8 +14,47 @@ livecd/use:
 	socks5
 	gnome
 	qt4
+	-x264
+	-mp3
+	-mp4
+	-mpeg2
+	-mpeg4pt2
+	-xvid
+	-a52
+	-real
+	-dvdnav
+	-faac
+	-amr
+	nautilus
+	exif
+	cdda
+	avahi
 livecd/packages:
-	dev-util/devhelp
+	media-tv/xbmc
+	sys-fs/nilfs-utils
+	x11-apps/xinput
+	x11-apps/xev
+	www-plugins/gecko-mediaplayer
+	media-video/gnome-mplayer
+	x11-themes/gtk-engines-qtcurve
+	x11-themes/gtk-engines-qt
+	x11-themes/qtcurve-qt4
+	x11-misc/obconf
+	x11-misc/menumaker
+	app-admin/conky
+	media-gfx/scrot
+	app-misc/dtach
+	app-backup/flexbackup
+	net-dns/dnsmasq
+	net-misc/bridge-utils
+	games-strategy/wesnoth
+	games-simulation/simutrans
+	games-action/supertuxkart
+	games-simulation/lincity-ng
+	games-arcade/lbreakout2
+	games-strategy/hedgewars
+	app-cdr/brasero
+#	dev-util/devhelp
 	net-p2p/transmission
 	net-p2p/linuxdcpp
 	dev-util/giggle
@@ -115,7 +154,6 @@ livecd/packages:
 	app-backup/rdiff-backup
 	app-backup/rsnapshot
 	app-cdr/ccd2iso
-	app-cdr/mdf2iso
 	app-crypt/johntheripper
 	app-editors/gedit
 	app-editors/hexedit
@@ -289,7 +327,6 @@ livecd/packages:
 	app-cdr/cdrdao
 	app-cdr/cdrkit
 	app-cdr/dvd+rw-tools
-	app-cdr/gnomebaker
 	#app-cdr/k3b
 	app-cdr/nrg2iso
 	app-crypt/gnupg
@@ -314,7 +351,7 @@ livecd/packages:
 	app-office/gnucash 
 	app-office/gnumeric
 	app-office/grisbi
-        app-office/openoffice-bin
+	app-office/openoffice
 	app-office/scribus
 # keywords.
 #	app-office/koffice
@@ -493,13 +530,13 @@ livecd/packages:
 	www-client/opera
 	www-client/seamonkey
 	x11-base/xorg-x11
+	x11-base/xorg-drivers
 	x11-drivers/xf86-input-synaptics
 	x11-misc/xscreensaver
 ### Masked (no stable keywords)
 #	x11-plugins/gkrellm-plugins
 	x11-themes/gdm-themes-livecd
 	x11-themes/gentoo-artwork-livecd
-	x11-wm/afterstep
 	x11-wm/enlightenment
 	x11-wm/fluxbox
 	x11-wm/windowmaker

releases/10.0/specs/x86/i686/livedvd-stage2.spec

@@ -3,7 +3,7 @@ version_stamp: 10.0
 target: livecd-stage2
 rel_type: default
 profile: default/linux/x86/10.0/desktop
-snapshot: 20090921
+snapshot: 20091117
 source_subpath: default/livecd-stage1-i686-10.0
 
 livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
@@ -11,14 +11,17 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
-livecd/iso: /var/tmp/catalyst/builds/default/livedvd-i686-10.0.iso
+livecd/iso: /chroot/livedvd-i686-10.0.iso
 livecd/type: gentoo-release-livedvd
 livecd/volid: Gentoo Linux 10.0 x86 LiveDVD
 livecd/xdm: kdm
 livecd/xsession: default
+livecd/splash_theme: livecd-2007.0
 livecd/rcadd: 
 	hald|default 
 	dbus|default
+	wicd|default
+	avahi-daemon|default
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
@@ -31,7 +34,24 @@ boot/kernel/gentoo/use:
 	portaudio
 	truetype
 	usb
+	-x264
+	-mp3
+	-mp4
+	-mpeg2
+	-mpeg4pt2
+	-xvid
+	-a52
+	-real
+	-dvdnav
+	-faac
+	-amr
+	nautilus
+	exif
+	cdda
+	avahi
 boot/kernel/gentoo/packages:
+	x11-drivers/linuxwacom
+	net-wireless/ipw2200-firmware
 	app-accessibility/espeakup
 # keywords.
 #	net-wireless/rt73-firmware
@@ -89,6 +109,8 @@ livecd/empty:
 	/usr/share/genkernel/pkg/x86/cpio
 
 livecd/rm:
+	/usr/share/autostart/kalarm.autostart.desktop
+	/usr/share/autostart/nepomukserver.desktop
 	/etc/*-
 	/etc/*.old
 	/root/.viminfo