From 8fa83de06e7155136de880362fe6689393a78532 Mon Sep 17 00:00:00 2001
From: Robert Seaton <seatonr@dupage.edu>
Date: Sun, 26 Jun 2011 10:35:44 -0500
Subject: Lots of little changes to support X11, per package use flags, and fix
 build issues.

---
 livecd-stage2.spec | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/livecd-stage2.spec b/livecd-stage2.spec
index 2c87b9e..4072a97 100755
--- a/livecd-stage2.spec
+++ b/livecd-stage2.spec
@@ -9,7 +9,7 @@ source_subpath: default/livecd-stage1-x86-0.1
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
-livecd/gk_mainargs: ---dmraid --mdadm --makeopts=-j8
+livecd/gk_mainargs: --dmraid --mdadm --makeopts=-j8
 livecd/iso: /tmp/glentoo-x86-minimal.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Glentoo 0.1
@@ -19,10 +19,14 @@ portage_overlay: /usr/local/portage
 
 boot/kernel: gentoo
 
+portage_confdir: /home/robb/glentoo/livecd-overlay/etc/portage
+
+livecd/xinitrc: /home/robb/glentoo/livecd-overlay/home/root/.xinitrc
+
 boot/kernel/gentoo/sources: glendix-sources
 boot/kernel/gentoo/config: /home/robb/glentoo/installcd-2.6.31.config
 boot/kernel/gentoo/use:
-	-*
+#	-*
 	alsa
 	alsa_pcm_plugins_adpcm
 	alsa_pcm_plugins_alaw
@@ -69,6 +73,7 @@ boot/kernel/gentoo/use:
 	pam
 	png
 	portaudio
+        python
 	readline
 	socks5
 	ssl
@@ -76,24 +81,23 @@ boot/kernel/gentoo/use:
         threads
 	unicode
 	usb
-
+        xml
+        
 boot/kernel/gentoo/packages:
-### These need to be added for software speech.
 	app-accessibility/espeakup
-	media-libs/alsa-oss
-	media-sound/alsa-utils
-### Compile failure w/ 2.6.24
-#	net-dialup/slmodem
+        app-misc/livecd-tools
+#	media-libs/alsa-oss
+#	media-sound/alsa-utils
 	net-dialup/globespan-adsl
 	net-wireless/hostap-utils
-#	net-dialup/fritzcapi
-#	net-dialup/fcdsl
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
         dev-util/plan9port
-#        app-misc/livecd-tools
         sys-fs/udev
+        x11-apps/xinit
+        x11-base/xorg-x11
 
+        
 livecd/unmerge:
 	app-admin/eselect
 	app-admin/eselect-ctags
@@ -117,8 +121,6 @@ livecd/unmerge:
 	sys-apps/man
 	sys-apps/man-pages
 	sys-apps/miscfiles
-#	sys-apps/portage
-#	sys-apps/sandbox
 	sys-apps/texinfo
 	sys-devel/autoconf
 	sys-devel/autoconf-wrapper
@@ -128,8 +130,6 @@ livecd/unmerge:
 	sys-devel/binutils-config
 	sys-devel/bison
 	sys-devel/flex
-# This might be needed for software speech.
-#	sys-devel/gcc
 	sys-devel/gcc-config
 	sys-devel/gettext
 	sys-devel/gnuconfig
@@ -143,7 +143,7 @@ livecd/unmerge:
 	sys-kernel/genkernel
 	sys-kernel/linux-headers
 
-#livecd/empty:
+livecd/empty:
 	/etc/cron.daily
 	/etc/cron.hourly
 	/etc/cron.monthly
-- 
cgit v1.2.3-65-gdbad