From c432804664db354a9c0a4dc1a4604e63aec347f2 Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Date: Tue, 15 Sep 2009 01:26:30 +0000
Subject: [PATCH] Several updates from likewhoa. Moved some use flags to
 stage2, reviewed the package list, dropped some redundant packages, updated
 the session and dm for stage2 and updated the snapshots.

svn path=/trunk/; revision=704
---
 releases/10.0/specs/amd64/livedvd-stage1.spec   |  3 ++-
 releases/10.0/specs/amd64/livedvd-stage2.spec   |  6 +++---
 .../10.0/specs/x86/i686/livedvd-stage1.spec     | 17 ++++++-----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/releases/10.0/specs/amd64/livedvd-stage1.spec b/releases/10.0/specs/amd64/livedvd-stage1.spec
index f4284842..79935c69 100644
--- a/releases/10.0/specs/amd64/livedvd-stage1.spec
+++ b/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: 20090906
+snapshot: 20090913
 source_subpath: default/stage3-amd64-desktop-10.0
 portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage/
 
@@ -153,6 +153,7 @@ livecd/packages:
 #	app-arch/lzip
 	app-arch/p7zip
 	app-arch/pbzip2
+	app-arch/xz-utils
 # keywords.
 #	app-arch/pigz
 	app-arch/xarchiver	
diff --git a/releases/10.0/specs/amd64/livedvd-stage2.spec b/releases/10.0/specs/amd64/livedvd-stage2.spec
index b94210b8..8a50a11f 100644
--- a/releases/10.0/specs/amd64/livedvd-stage2.spec
+++ b/releases/10.0/specs/amd64/livedvd-stage2.spec
@@ -3,7 +3,7 @@ version_stamp: 10.0
 target: livecd-stage2
 rel_type: default
 profile: default/linux/amd64/10.0/desktop
-snapshot: 20090906
+snapshot: 20090913
 source_subpath: default/livecd-stage1-amd64-10.0
 
 livecd/bootargs: dokeymap
@@ -14,7 +14,7 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
 livecd/iso: /tmp/catalyst/builds/default/livedvd-amd64-10.0.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo Linux 10.0 amd64 LiveDVD
-livecd/xsession: kde-4.3
+livecd/xsession: kde 4.3
 livecd/xdm: kdm
 livecd/rcadd:
         hald|default
@@ -26,7 +26,7 @@ livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/roo
 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 truetype usb portaudio
+boot/kernel/gentoo/use: atm fbcondecor mng png portaudio truetype usb
 boot/kernel/gentoo/packages:
 # keywords.
 #	net-wireless/rt73-firmware
diff --git a/releases/10.0/specs/x86/i686/livedvd-stage1.spec b/releases/10.0/specs/x86/i686/livedvd-stage1.spec
index 8f325e73..426b9846 100644
--- a/releases/10.0/specs/x86/i686/livedvd-stage1.spec
+++ b/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: 20090910
+snapshot: 20090913
 source_subpath: default/stage3-i686-desktop-10.0
 portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage
 
@@ -14,12 +14,6 @@ livecd/use:
 	socks5
 	gnome
 	qt4
-	atm
-	fbcondecor
-	mng
-	png
-	truetype
-	usb
 livecd/packages:
 	dev-util/qt-creator
 	dev-util/kdevelop
@@ -51,7 +45,6 @@ livecd/packages:
 	sys-block/partitionmanager
 	sys-block/tw_cli
 	kde-base/kde-meta
-	kde-base/kdebase-meta
 	gnome-base/gnome
 	x11-proto/dri2proto
 	net-misc/wicd
@@ -126,8 +119,8 @@ livecd/packages:
 	x11-drivers/xf86-video-cirrus
 	x11-libs/gksu
 	x11-libs/vte
+	x11-misc/cairo-clock
 # keywords.
-#	x11-misc/cairo-clock
 #	x11-misc/grsync
 	x11-plugins/pidgin-encryption
 	x11-plugins/pidgin-extprefs
@@ -160,15 +153,15 @@ livecd/packages:
 #	app-arch/lzip
 	app-arch/p7zip
 	app-arch/pbzip2
+	app-arch/xz-utils
 # keywords.
 #	app-arch/pigz
 	app-arch/xarchiver	
-	app-arch/zip	
+	app-arch/zip
 # keywords.
 #	app-backup/tob
 #	app-cdr/cdw
 	app-cdr/xfburn
-# keywords.
 	app-crypt/pinentry
 	app-editors/hexcurse
 	app-editors/joe
@@ -233,6 +226,7 @@ livecd/packages:
 # keywords.
 #	sys-fs/btrfs-progs
 	sys-process/atop
+	sys-process/iotop
 	www-client/elinks
 # keywords.
 #	net-p2p/frostwire
@@ -303,6 +297,7 @@ livecd/packages:
 	dev-util/subversion
 	dev-util/valgrind
 	gnome-base/gdm
+	gnome-base/gnome
 	gnome-extra/evolution-exchange
 	gnome-extra/gsynaptics
 	gnome-extra/sensors-applet