Applied all likewhoa's updates since the 10.0 release.

svn path=/trunk/; revision=713

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,38 +3,57 @@ 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/type: gentoo-release-livecd
+livecd/iso: /chroot/livedvd-amd64-10.0.iso
+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
 boot/kernel/gentoo/use:
-	atm
-	fbcondecor
-	mng
-	png
-	portaudio
-	truetype
-	usb
+        atm       
+        fbcondecor
+        mng
+        png      
+        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