Revert "Rebase spec files on *current* official specs."

This reverts commit 85b6c344db42d22e9adfeefb7a5eba55c83d504a.

2 files changed, 215 insertions, 327 deletions

diff --git a/livecd-stage1.spec b/livecd-stage1.spec
index 8806e9b..046e823 100755
--- a/livecd-stage1.spec
+++ b/livecd-stage1.spec
@@ -1,93 +1,232 @@
-subarch: x86
-version_stamp: 0.1
+subarch: i686
+version_stamp: installer-10.0
 target: livecd-stage1
 rel_type: default
-profile: default/linux/x86/10.0
+profile: default/linux/x86/10.0/desktop
 snapshot: latest
 source_subpath: stage3-i686-20110524
+portage_overlay:/usr/local/portage
 livecd/use:
-	-*
-	deprecated
-	fbcon
-	ipv6
+	branding
 	livecd
 	loop-aes
-	lvm1
-	modules
-	ncurses
-	nls
-	pam
-	readline
 	socks5
-	ssl
-	static-libs
-	unicode
-	xml
 
 livecd/packages:
+# Start new packages
+#	app-admin/eselect-esd
+	app-admin/localepurge
+#	app-admin/paxtest
+	app-admin/sysstat
+	app-admin/testdisk
+	app-admin/usbview
+	#app-antivirus/bitdefender-console
+	app-antivirus/clamav
+	app-arch/afio
+	app-arch/arc
+	app-arch/arj
+	app-arch/deb2targz
+	app-arch/dump
+	app-arch/file-roller
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/mscompress
+	app-arch/ncompress
+	app-arch/par2cmdline
+	app-arch/rar
+	app-arch/rzip
+	app-arch/sharutils
+	app-arch/unace
+	app-arch/unarj
+	app-arch/unrar
+#	app-arch/upx
+	app-arch/zoo
+	app-backup/dar
+	app-backup/duplicity
+	app-backup/rdiff-backup
+	app-backup/rsnapshot
+	app-cdr/bin2iso
+	app-cdr/ccd2iso
+	app-cdr/cdrdao
+#	app-cdr/mdf2iso
+	app-cdr/nrg2iso 
+	app-crypt/johntheripper
+	app-editors/gedit
+	app-editors/gvim
+	app-editors/hexedit
+	app-forensics/cmospwd
+	app-forensics/foremost
+	app-forensics/magicrescue
+	app-forensics/sleuthkit
+	app-misc/ckermit
+	app-misc/wipe
+        sys-kernel/glendix-sources
+	app-text/a2ps
+	app-text/evince
+	dev-util/strace
+	dev-util/yacc
+	media-gfx/gimp
+	media-gfx/sane-frontends
+	media-gfx/xsane
+	media-plugins/gst-plugins-esd
+	media-sound/alsa-utils
+	media-sound/aumix
+	media-video/mplayer
+	media-video/rovclock
+#	net-firewall/guarddog
+	net-ftp/gftp
+	net-ftp/ncftp
+	net-im/licq
+	net-im/ysm
+	net-misc/networkmanager
+	net-misc/putty		
+	net-wireless/ipw3945-ucode
+	net-wireless/ipw3945d
+	sys-apps/chpax
+	sys-apps/hwdata-gentoo
+	sys-apps/lshw
+	sys-apps/paxctl
+	sys-apps/readahead-list
+	sys-block/gparted
+	sys-block/tw_cli
+	sys-fs/dd-rescue
+	sys-fs/ddrescue
+	sys-power/powernowd
+	sys-power/powertop
+	www-client/httrack
+# end new packages
 	app-accessibility/brltty
 	app-admin/hddtemp
+	app-admin/ide-smart
+	app-admin/logrotate
 	app-admin/passook
 	app-admin/pwgen
+	app-admin/sudo
 	app-admin/syslog-ng
-	app-arch/unzip
-	app-arch/xz-utils
+	app-arch/mt-st
+	app-benchmarks/cpuburn
+	app-cdr/cdrkit
 	app-crypt/gnupg
-	app-editors/zile
+	app-editors/emacs
+	app-editors/vim
+	app-misc/mc
 	app-misc/screen
 	app-misc/vlock
+### Removed for space reasons
+#	app-office/openoffice-bin
+	app-portage/gentoolkit
 	app-portage/mirrorselect
+	app-portage/ufed
 	app-text/wgetpaste
+	dev-util/ccache
+#	dev-util/cvs
+#	dev-util/git
+#	dev-util/subversion
+#	gnome-base/gdm
+### Removed for space reasons
+#	mail-client/mozilla-thunderbird
 	media-gfx/fbgrab
+	media-sound/audacious
+	net-analyzer/netcat
+	net-analyzer/nmap
+	net-analyzer/tcpdump
+	net-analyzer/tcptraceroute
 	net-analyzer/traceroute
 	net-dialup/mingetty
-	net-dialup/pptpclient
-	net-dialup/rp-pppoe
+	net-dialup/minicom
+#	net-dialup/penggy
+	#net-dialup/pptpclient
+	#net-dialup/rp-pppoe
+	net-firewall/iptables
 	net-fs/mount-cifs
 	net-fs/nfs-utils
+	net-im/pidgin
 	net-irc/irssi
+	net-irc/xchat
+	net-misc/bridge-utils
 	net-misc/dhcpcd
 	net-misc/iputils
 	net-misc/ntp
 	net-misc/rdate
+	net-misc/rdesktop
 	net-misc/vconfig
+	net-misc/vpnc
+	net-misc/whois
+	net-p2p/bittorrent
 	net-proxy/dante
 	net-proxy/ntlmaps
 	net-proxy/tsocks
-	net-wireless/b43-fwcutter
+### Masked by ~x86
+#	net-wireless/b43-fwcutter
+#	net-wireless/bcm43xx-fwcutter
 	net-wireless/ipw2100-firmware
 	net-wireless/ipw2200-firmware
 	net-wireless/iwl3945-ucode
 	net-wireless/iwl4965-ucode
-	net-wireless/iwl5000-ucode
-	net-wireless/prism54-firmware
+# Failed to fetch.
+#	net-wireless/prism54-firmware
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/zd1201-firmware
 	net-wireless/zd1211-firmware
 	sys-apps/apmd
-	sys-block/eject
+#	sys-apps/eject
 	sys-apps/ethtool
 	sys-apps/fxload
+	#sys-apps/gli
 	sys-apps/hdparm
 	sys-apps/hwsetup
+#	sys-apps/ibm-powerpc-utils
+#	sys-apps/ibm-powerpc-utils-papr
 	sys-apps/iproute2
 	sys-apps/memtester
 	sys-apps/netplug
-	sys-block/parted
+#	sys-apps/parted
+#	sys-apps/powerpc-utils
 	sys-apps/sdparm
+	sys-apps/sg3_utils
+#	sys-apps/slocate
+	sys-apps/smartmontools
+	sys-block/aoetools
+	sys-block/disktype
+	sys-block/gpart
 	sys-block/partimage
-	sys-fs/cryptsetup
+	sys-block/qla-fc-firmware
+#	sys-boot/aboot
+#	sys-boot/elilo
+	sys-boot/grub
+#	sys-boot/lilo
+	sys-boot/syslinux
+#	sys-boot/yaboot
+#	sys-devel/binutils-hppa64
+	sys-devel/distcc
+#	sys-devel/gcc-hppa64
 	sys-fs/dmraid
 	sys-fs/dosfstools
 	sys-fs/e2fsprogs
+#	sys-fs/evms
+	sys-fs/hfsplusutils
+	sys-fs/hfsutils
+#	sys-fs/iprutils
 	sys-fs/jfsutils
 	sys-fs/lsscsi
 	sys-fs/lvm2
+#	sys-fs/lvm-user
+	sys-fs/mac-fdisk
 	sys-fs/mdadm
 	sys-fs/ntfsprogs
 	sys-fs/reiserfsprogs
 	sys-fs/xfsprogs
+	sys-kernel/genkernel
 	sys-libs/gpm
 	sys-power/acpid
-	www-client/links
\ No newline at end of file
+	sys-process/htop
+	sys-process/vixie-cron
+	www-client/links
+#	www-client/mozilla-firefox
+	x11-base/xorg-server
+	x11-base/xorg-x11
+#	x11-themes/gdm-themes-livecd
+	x11-themes/gentoo-artwork-livecd
+#	xfce-base/xfce4
diff --git a/livecd-stage2.spec b/livecd-stage2.spec
index b681cfb..4b3106e 100755
--- a/livecd-stage2.spec
+++ b/livecd-stage2.spec
@@ -1,335 +1,84 @@
-subarch: x86
-version_stamp: 0.1
+subarch: i686
+version_stamp: 10.0
 target: livecd-stage2
 rel_type: default
-profile: default/linux/x86/10.0
+profile: default/linux/x86/10.0/desktop
 snapshot: latest
-source_subpath: default/livecd-stage1-x86-0.1
-
+source_subpath: default/livecd-stage1-i686-installer-10.0
+portage_overlay: /usr/local/portage
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
+#livecd/fsscript: /home/agaffney/release/10.0/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
-livecd/iso: /tmp/glentoo-minimal-installcd.iso
-livecd/type: gentoo-release-minimal
-livecd/volid: Glentoo 0.1
+livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
+livecd/iso: /var/tmp/catalyst/builds/default/livecd-i686-installer-10.0.iso
+livecd/type: gentoo-release-livecd
+livecd/volid: Glentoo
+livecd/xdm: gdm
+livecd/xsession: xfce
 
-pkgcache_path: /tmp/packages
-kerncache_path: /tmp/kernel
+#livecd/overlay: /usr/local/sources
+#livecd/root_overlay: /home/agaffney/release/10.0/overlays/common/root_overlay
 
 boot/kernel: gentoo
 
 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
-	alsa_pcm_plugins_asym
-	alsa_pcm_plugins_copy
-	alsa_pcm_plugins_dmix
-	alsa_pcm_plugins_dshare
-	alsa_pcm_plugins_dsnoop
-	alsa_pcm_plugins_empty
-	alsa_pcm_plugins_extplug
-	alsa_pcm_plugins_file
-	alsa_pcm_plugins_hooks
-	alsa_pcm_plugins_iec958
-	alsa_pcm_plugins_ioplug
-	alsa_pcm_plugins_ladspa
-	alsa_pcm_plugins_lfloat
-	alsa_pcm_plugins_linear
-	alsa_pcm_plugins_meter
-	alsa_pcm_plugins_mmap_emul
-	alsa_pcm_plugins_mulaw
-	alsa_pcm_plugins_multi
-	alsa_pcm_plugins_null
-	alsa_pcm_plugins_plug
-	alsa_pcm_plugins_rate
-	alsa_pcm_plugins_route
-	alsa_pcm_plugins_share
-	alsa_pcm_plugins_shm
-	alsa_pcm_plugins_softvol
 	atm
-	deprecated
-	fbcon
 	fbcondecor
-	ipv6
-	livecd
-	loop-aes
-	lvm1
-	midi
 	mng
-	modules
-	ncurses
-	nls
-	nptl
-	nptlonly
-	pam
 	png
 	portaudio
-	readline
-	socks5
-	ssl
 	truetype
-	unicode
 	usb
-
 boot/kernel/gentoo/packages:
-### These need to be added for software speech.
+# new packages
 	app-accessibility/espeakup
+        dev-util/plan9port
+	net-dialup/ppp
+	net-dialup/pppconfig
+	net-dialup/rp-pppoe
+	net-dialup/speedtouch-usb
+	net-firewall/iptables
+	net-wireless/ndiswrapper
+	sys-apps/lm_sensors
+# failed
+#	sys-apps/pcmcia-cs
+	sys-fs/sshfs-fuse
+# end new packages	
 	media-libs/alsa-oss
 	media-sound/alsa-utils
+#	net-dialup/fcdsl
+#	net-dialup/fritzcapi
 	net-dialup/globespan-adsl
+	net-misc/br2684ctl
+### Compile failure
+#	net-wireless/acx
 	net-wireless/hostap-utils
+### In-kernel
+#	net-wireless/ipw3945
+#	net-wireless/madwifi-ng-tools
+### Compile failure and in-kernel
+#	net-wireless/rt2500
+#	net-wireless/rtl8187
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
-
-        dev-util/plan9port
-
-livecd/unmerge:
-	app-admin/eselect
-	app-admin/eselect-ctags
-	app-admin/eselect-vi
-	app-admin/perl-cleaner
-	app-admin/python-updater
-	app-arch/cpio
-	dev-libs/gmp
-	dev-libs/libxml2
-	dev-libs/mpfr
-	dev-libs/popt
-	dev-python/pycrypto
-	dev-util/pkgconfig
-	net-misc/rsync
-	perl-core/PodParser
-	perl-core/Test-Harness
-	sys-apps/debianutils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/groff
-	sys-apps/man
-	sys-apps/man-pages
-	sys-apps/miscfiles
-	sys-apps/texinfo
-	sys-devel/autoconf
-	sys-devel/autoconf-wrapper
-	sys-devel/automake
-	sys-devel/automake-wrapper
-	sys-devel/binutils
-	sys-devel/binutils-config
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gcc-config
-	sys-devel/gettext
-	sys-devel/gnuconfig
-	sys-devel/libtool
-	sys-devel/m4
-	sys-devel/make
-	sys-devel/patch
-	sys-libs/db
-	sys-libs/gdbm
-	sys-libs/libkudzu
-	sys-kernel/genkernel
-	sys-kernel/linux-headers
-
 livecd/empty:
-	/etc/cron.daily
-	/etc/cron.hourly
-	/etc/cron.monthly
-	/etc/cron.weekly
-	/etc/logrotate.d
-	/etc/modules.autoload.d
-	/etc/rsync
-	/etc/runlevels/single
-	/etc/skel
-	/lib/dev-state
-	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
-	/root/.ccache
-	/tmp
-	/usr/diet/include
-	/usr/diet/man
-	/usr/i?86-gentoo-linux-uclibc
-	/usr/i?86-pc-linux-gnu
-	/usr/i?86-pc-linux-uclibc
-	/usr/include
-	/usr/lib/X11/config
-	/usr/lib/X11/doc
-	/usr/lib/X11/etc
-	/usr/lib/awk
-	/usr/lib/ccache
-	/usr/lib/gcc-config
-	/usr/lib/gconv
-	/usr/lib/nfs
-	/usr/lib/perl5/site_perl
-	/usr/lib/portage
-	/usr/lib/python2.2
-	/usr/lib/python2.3
-	/usr/lib/python2.4/test
-	/usr/lib64/X11/config
-	/usr/lib64/X11/doc
-	/usr/lib64/X11/etc
-	/usr/lib64/awk
-	/usr/lib64/ccache
-	/usr/lib64/gcc-config
-	/usr/lib64/gconv
-	/usr/lib64/nfs
-	/usr/lib64/perl5/site_perl
-	/usr/lib64/portage
-	/usr/lib64/python2.2
-	/usr/lib64/python2.3
-	/usr/lib64/python2.4/test
-	/usr/local
-	/usr/portage
-	/usr/powerpc-unknown-linux-gnu
-	/usr/powerpc64-unknown-linux-gnu
-	/usr/share/aclocal
-	/usr/share/baselayout
-	/usr/share/binutils-data
-	/usr/share/consolefonts/partialfonts
-	/usr/share/consoletrans
-	/usr/share/dict
-	/usr/share/doc
-	/usr/share/emacs
-	/usr/share/et
-	/usr/share/gcc-data
-	/usr/share/genkernel
-	/usr/share/gettext
-	/usr/share/glib-2.0
-	/usr/share/gnuconfig
-	/usr/share/gtk-doc
-	/usr/share/i18n
-	/usr/share/info
-	/usr/share/lcms
-	/usr/share/libtool
-	/usr/share/locale
-	/usr/share/man
-	/usr/share/rfc
-	/usr/share/ss
-	/usr/share/state
-	/usr/share/texinfo
-	/usr/share/unimaps
-	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
-	/usr/src
-	/usr/x86_64-pc-linux-gnu
-	/var/cache
+	/var/tmp
 	/var/empty
-	/var/lib/portage
-	/var/lock
-	/var/log
 	/var/run
-	/var/spool
 	/var/state
-	/var/tmp
+	/var/cache/edb/dep
+	/tmp
+	/usr/portage
+	/usr/src
+	/root/.ccache
+	/usr/share/genkernel/pkg/x86/cpio
 
 livecd/rm:
-	/boot/System*
-	/boot/initr*
-	/boot/kernel*
 	/etc/*-
 	/etc/*.old
-	/etc/default/audioctl
-	/etc/dispatch-conf.conf
-	/etc/env.d/05binutils
-	/etc/env.d/05gcc
-	/etc/etc-update.conf
-	/etc/hosts.bck
-	/etc/issue*
-	/etc/genkernel.conf
-	/etc/make.conf*
-	/etc/make.globals
-	/etc/make.profile
-	/etc/man.conf
-	/etc/resolv.conf
-	/lib*/*.a
-	/lib*/*.la
-	/lib*/cpp
-	/root/.bash_history
 	/root/.viminfo
-	/sbin/*.static
-	/sbin/fsck.cramfs
-	/sbin/fsck.minix
-	/sbin/mkfs.bfs
-	/sbin/mkfs.cramfs
-	/sbin/mkfs.minix
-	/usr/bin/addr2line
-	/usr/bin/ar
-	/usr/bin/as
-	/usr/bin/audioctl
-	/usr/bin/c++*
-	/usr/bin/cc
-	/usr/bin/cjpeg
-	/usr/bin/cpp
-	/usr/bin/djpeg
-	/usr/bin/ebuild
-	/usr/bin/emerge
-	/usr/bin/elftoaout
-	/usr/bin/f77
-	/usr/bin/g++*
-	/usr/bin/g77
-	/usr/bin/gcc*
-	/usr/bin/genkernel
-	/usr/bin/gprof
-	/usr/bin/i?86-gentoo-linux-uclibc-*
-	/usr/bin/i?86-pc-linux-*
-	/usr/bin/jpegtran
-	/usr/bin/ld
-	/usr/bin/libpng*
-	/usr/bin/nm
-	/usr/bin/objcopy
-	/usr/bin/objdump
-	/usr/bin/piggyback*
-	/usr/bin/portageq
-	/usr/bin/ranlib
-	/usr/bin/readelf
-	/usr/bin/repoman
-	/usr/bin/size
-	/usr/bin/powerpc-unknown-linux-gnu-*
-	/usr/bin/powerpc64-unknown-linux-gnu-*
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
-	/usr/bin/strip
-	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
-	/usr/bin/xpak
-	/usr/bin/yacc
-	/usr/lib*/*.a
-	/usr/lib*/*.la
-	/usr/lib*/perl5/site_perl
-	/usr/lib*/gcc-lib/*/*/libgcj*
-	/usr/sbin/archive-conf
-	/usr/sbin/dispatch-conf
-	/usr/sbin/emaint
-	/usr/sbin/emerge-webrsync
-	/usr/sbin/env-update
-	/usr/sbin/fb*
-	/usr/sbin/fixpackages
-	/usr/sbin/quickpkg
-	/usr/sbin/regenworld
-	/usr/share/consolefonts/1*
-	/usr/share/consolefonts/7*
-	/usr/share/consolefonts/8*
-	/usr/share/consolefonts/9*
-	/usr/share/consolefonts/A*
-	/usr/share/consolefonts/C*
-	/usr/share/consolefonts/E*
-	/usr/share/consolefonts/G*
-	/usr/share/consolefonts/L*
-	/usr/share/consolefonts/M*
-	/usr/share/consolefonts/R*
-	/usr/share/consolefonts/a*
-	/usr/share/consolefonts/c*
-	/usr/share/consolefonts/dr*
-	/usr/share/consolefonts/g*
-	/usr/share/consolefonts/i*
-	/usr/share/consolefonts/k*
-	/usr/share/consolefonts/l*
-	/usr/share/consolefonts/r*
-	/usr/share/consolefonts/s*
-	/usr/share/consolefonts/t*
-	/usr/share/consolefonts/v*
-	/usr/share/misc/*.old
\ No newline at end of file
+	/var/log/*.log
+	/usr/share/genkernel/pkg/x86/*.bz2