spec files from 2004.2

26 files changed, 1693 insertions, 0 deletions

diff --git a/users/jhuebel/livecd/specs/amd64-packagecd-20040716.spec b/users/jhuebel/livecd/specs/amd64-packagecd-20040716.spec
new file mode 100644
index 0000000000..e4a3e9636a
--- /dev/null
+++ b/users/jhuebel/livecd/specs/amd64-packagecd-20040716.spec
@@ -0,0 +1,135 @@
+subarch: amd64 
+version_stamp: 20040716
+target: grp
+rel_type: default
+rel_version: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/stage3-amd64-20040716
+grp: src cd2
+
+grp/use: 
+	gtk2 
+	gnome 
+	kde 
+	qt 
+	bonobo 
+	cdr 
+	esd 
+	gtkhtml 
+	mozilla
+	mysql
+	perl
+	postgres
+	ruby
+	tcltk
+	acl
+	cups
+	ldap
+	ssl
+	tcpd
+	-bindist
+
+grp/src/type: srcset
+grp/src/packages:
+	iptables
+	gpm
+	rp-pppoe
+	ppp
+	speedtouch
+	pciutils
+	hdparm
+	hotplug
+	aumix
+	xorg-x11
+	iputils
+	vixie-cron
+	sysklogd
+	metalog
+	syslog-ng
+	raidtools
+	jfsutils
+	xfsprogs
+	reiserfsprogs
+	lvm2
+	dosfstools
+	grub-static
+	gentoo-dev-sources
+	superadduser
+	gentoolkit
+#USE effects for these?:
+	dante
+	tsocks
+	chkrootkit
+	minicom
+	lynx
+	rpm2targz
+	parted
+	rdate
+	whois
+	tcpdump
+	cvs
+	unzip
+	zip
+	netcat
+#isdn4k-utils was a binary pkg in 1.4, so we will need to get docs updated
+#since it's kernel-dependent? maybe?
+	isdn4k-utils
+	iproute
+#nvidia-glx requires nvidia-kernel
+	nvidia-kernel
+	nvidia-glx
+	wireless-tools
+	pcmcia-cs
+	
+grp/cd2/type: pkgset
+grp/cd2/packages:
+	pciutils
+	hdparm
+	hotplug
+	aumix
+	xorg-x11
+	dante
+	tsocks
+	chkrootkit
+	minicom
+	lynx
+	rpm2targz
+	parted
+	rdate
+	whois
+	tcpdump
+	cvs
+	unzip
+	zip
+	netcat
+	apache
+	app-cdr/cdrtools
+	gnome
+	evolution
+	cups
+	dev-db/mysql
+	dev-db/postgresql
+	dev-lang/ruby
+	emacs
+	enlightenment
+	fluxbox
+	kde
+	libsdl
+	mozilla
+#	openbox
+	sylpheed
+	vim
+	xemacs
+	xmms
+#use interactions?
+	mozilla-firefox
+	gaim
+	tetex
+	xcdroast
+#	kdrive
+	samba
+	nmap
+#	gradm
+	xchat
+
diff --git a/users/jhuebel/livecd/specs/livecd-stage1-2004.2.spec b/users/jhuebel/livecd/specs/livecd-stage1-2004.2.spec
new file mode 100644
index 0000000000..7f51f6fefe
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage1-2004.2.spec
@@ -0,0 +1,74 @@
+subarch: amd64
+version_stamp: 2004.2-test8
+target: livecd-stage1
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/stage3-amd64-20040716
+livecd/use:
+	-X
+	-gtk
+	-svga
+	ipv6
+	socks5
+	livecd
+	fbcon
+	ssl
+	
+livecd/packages:
+	baselayout
+	livecd-tools
+	genkernel
+	bootsplash-themes-livecd
+	ucl
+	kudzu-knoppix
+	module-init-tools
+	hotplug
+	irssi
+	aumix
+	metalog
+	pciutils
+	parted
+	mt-st
+	links
+	star
+	strace
+	raidtools
+	nfs-utils
+	jfsutils
+	usbutils
+	speedtouch
+	xfsprogs
+	e2fsprogs
+	reiserfsprogs
+	hdparm
+	nano
+	less
+	openssh
+	dhcpcd
+	mingetty
+	pwgen
+	popt
+	dialog
+	rp-pppoe
+	gpm
+	screen
+	mirrorselect
+#	penggy
+	iputils
+	hwdata-knoppix
+	hwsetup
+	bootsplash
+	device-mapper
+	lvm2
+	evms
+	vim
+#	gpart
+	pwgen
+	pptpclient
+	mdadm
+#	tcptraceroute
+	netcat
+	ethtool
+	wireless-tools
+	ufed
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-minimal.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-minimal.spec
new file mode 100644
index 0000000000..97b937875c
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-minimal.spec
@@ -0,0 +1,126 @@
+subarch: amd64
+version_stamp: 2004.2
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/livecd-stage1-amd64-2004.2-test8
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/install-amd64-2004.2-minimal.iso
+livecd/bootsplash: livecd-2004.2
+livecd/overlay: /home/jhuebel/2004.2/overlay-minimal
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# mm-sources livecd kernel
+#boot/kernel/mm-sources/sources: sys-kernel/mm-sources
+#boot/kernel/mm-sources/config: /home/jhuebel/2004.2/20040717-mm-sources-2.6.7-up-amd64.config
+#boot/kernel/mm-sources/use: pcmcia usb -X
+#boot/kernel/mm-sources/extraversion: up
+#boot/kernel/mm-sources/packages:
+#	pcmcia-cs
+#	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test2.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test2.spec
new file mode 100644
index 0000000000..7bfe69b1f6
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test2.spec
@@ -0,0 +1,112 @@
+subarch: amd64
+version_stamp: 2004.2-test2
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test2.iso
+#livecd/fsscript: /usr/lib/catalyst/livecd/runscript-support/gamecdfs-update.sh
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+#livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040708-amd64-uni-2.6.7-r6.config
+boot/kernel/gentoo/use: pcmcia usb
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	hostap-driver
+	fcpci
+	ipw2100
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040708-amd64-smp-2.6.7-r6.config
+boot/kernel/smp/use: pcmcia usb
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test3.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test3.spec
new file mode 100644
index 0000000000..9f36b55202
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test3.spec
@@ -0,0 +1,112 @@
+subarch: amd64
+version_stamp: 2004.2-test3
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test3.iso
+#livecd/fsscript: /usr/lib/catalyst/livecd/runscript-support/gamecdfs-update.sh
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+#livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040708-amd64-uni-2.6.7-r6.config
+boot/kernel/gentoo/use: pcmcia usb
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	hostap-driver
+	fcpci
+	ipw2100
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040708-amd64-smp-2.6.7-r6.config
+boot/kernel/smp/use: pcmcia usb
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test4.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test4.spec
new file mode 100644
index 0000000000..88181a33f9
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test4.spec
@@ -0,0 +1,123 @@
+subarch: amd64
+version_stamp: 2004.2-test5
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test5.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	hostap-driver
+	fcpci
+	ipw2100
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.7-smp_numa-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: livecd
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: livecd
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test5.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test5.spec
new file mode 100644
index 0000000000..2a47d58efe
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test5.spec
@@ -0,0 +1,123 @@
+subarch: amd64
+version_stamp: 2004.2-test5
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test5.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	hostap-driver
+	fcpci
+	ipw2100
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp_numa-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: livecd
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: livecd
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+	fcpci
+	hostap-driver
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test6.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test6.spec
new file mode 100644
index 0000000000..985a1b399b
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test6.spec
@@ -0,0 +1,116 @@
+subarch: amd64
+version_stamp: 2004.2-test6
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test6.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test7.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test7.spec
new file mode 100644
index 0000000000..1a70813127
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test7.spec
@@ -0,0 +1,116 @@
+subarch: amd64
+version_stamp: 2004.2-test7
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test7.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test8.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test8.spec
new file mode 100644
index 0000000000..b67b6ef195
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test8.spec
@@ -0,0 +1,125 @@
+subarch: amd64
+version_stamp: 2004.2-test8
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/livecd-stage1-amd64-2004.2-test8
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test7.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# mm-sources livecd kernel
+#boot/kernel/mm-sources/sources: sys-kernel/mm-sources
+#boot/kernel/mm-sources/config: /home/jhuebel/2004.2/20040717-mm-sources-2.6.7-up-amd64.config
+#boot/kernel/mm-sources/use: pcmcia usb -X
+#boot/kernel/mm-sources/extraversion: up
+#boot/kernel/mm-sources/packages:
+#	pcmcia-cs
+#	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test9.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test9.spec
new file mode 100644
index 0000000000..e7648ce3be
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-test9.spec
@@ -0,0 +1,125 @@
+subarch: amd64
+version_stamp: 2004.2-test9
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/livecd-stage1-amd64-2004.2-test8
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test9.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-minimal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# mm-sources livecd kernel
+#boot/kernel/mm-sources/sources: sys-kernel/mm-sources
+#boot/kernel/mm-sources/config: /home/jhuebel/2004.2/20040717-mm-sources-2.6.7-up-amd64.config
+#boot/kernel/mm-sources/use: pcmcia usb -X
+#boot/kernel/mm-sources/extraversion: up
+#boot/kernel/mm-sources/packages:
+#	pcmcia-cs
+#	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2-universal.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-universal.spec
new file mode 100644
index 0000000000..fca2b65ee1
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2-universal.spec
@@ -0,0 +1,126 @@
+subarch: amd64
+version_stamp: 2004.2
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r1
+source_subpath: default/livecd-stage1-amd64-2004.2-test8
+
+livecd/cdfstype: zisofs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/install-amd64-2004.2-universal.iso
+livecd/bootsplash: livecd-2004.2
+
+livecd/type: gentoo-release-universal
+livecd/motd: /usr/lib/catalyst/livecd/files/motd.txt
+livecd/modblacklist: siimage 8139cp
+livecd/overlay: /home/jhuebel/2004.2/overlay-universal
+
+boot/kernel: gentoo smp emachines
+
+# gentoo livecd kernel
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-up-amd64.config
+boot/kernel/gentoo/use: pcmcia usb -X
+boot/kernel/gentoo/extraversion: up
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	iptables
+	xfsdump
+
+# smp livecd kernel
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040713-gentoo-dev-sources-2.6.7-smp-amd64.config
+boot/kernel/smp/use: pcmcia usb -X
+boot/kernel/smp/extraversion: smp
+boot/kernel/smp/packages:
+	pcmcia-cs
+	iptables
+
+# mm-sources livecd kernel
+#boot/kernel/mm-sources/sources: sys-kernel/mm-sources
+#boot/kernel/mm-sources/config: /home/jhuebel/2004.2/20040717-mm-sources-2.6.7-up-amd64.config
+#boot/kernel/mm-sources/use: pcmcia usb -X
+#boot/kernel/mm-sources/extraversion: up
+#boot/kernel/mm-sources/packages:
+#	pcmcia-cs
+#	iptables
+
+# emachines livecd kernel
+boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
+boot/kernel/emachines/config: /home/jhuebel/2004.2/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
+boot/kernel/emachines/kernelopts: pci=noacpi noapic
+boot/kernel/emachines/use: pcmcia usb -X
+boot/kernel/emachines/extraversion: emachines
+boot/kernel/emachines/packages:
+	pcmcia-cs
+	iptables
+
+livecd/unmerge:
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	addpatches
+	man
+	groff
+	lib-compat
+	gcc
+	miscfiles
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/livecd-stage2-2004.2.spec b/users/jhuebel/livecd/specs/livecd-stage2-2004.2.spec
new file mode 100644
index 0000000000..b032476d7e
--- /dev/null
+++ b/users/jhuebel/livecd/specs/livecd-stage2-2004.2.spec
@@ -0,0 +1,88 @@
+subarch: amd64
+version_stamp: 2004.2-test2
+target: livecd-stage2
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040626-r2
+source_subpath: default/livecd-stage1-amd64-2004.2-test2
+#livecd/cdfstype: zisofs
+livecd/cdfstype: zisofs
+livecd/archscript: /home/jhuebel/prog/gentoo/src/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /home/jhuebel/prog/gentoo/src/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /home/jhuebel/prog/gentoo/src/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/iso: /home/jhuebel/2004.2/minimal-amd64-2004.2-test2.iso
+#livecd/gk_mainargs: --makeopts=-j3
+livecd/bootsplash: livecd-2004.2
+
+#livecd/type: gentoo-release-universal
+livecd/type: gentoo-release-minimal
+livecd/blacklist: siimage
+
+boot/kernel: gentoo smp
+boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
+boot/kernel/gentoo/config: /home/jhuebel/2004.2/20040627-amd64-uni-2.6.7-r6.config
+#boot/kernel/gentoo/gk_kernargs: --makeopts=-j2
+boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
+#boot/kernel/smp/gk_kernargs: --makeopts=-j1
+boot/kernel/smp/config: /home/jhuebel/2004.2/20040627-amd64-smp-2.6.7-r6.config
+
+#this next line sets any USE settings you want exported to the environment for
+#your kernel build *and* during the build of any kernel-dependent packages
+boot/kernel/gentoo/use: pcmcia usb
+boot/kernel/smp/use: pcmcia usb
+
+#use this next option to add an extension to the name of your kernel. This
+#allows you to have 2 identical kernels on the livecd built with different
+#options, and each with their own modules dir in /lib/modules (otherwise
+#the second kernel would overwrite the first modules directory.
+boot/kernel/gentoo/extraversion: livecd
+boot/kernel/smp/extraversion: livecd
+
+#this next line is for merging kernel-dependent packages after your kernel
+#is built. This is where you merge third-party ebuilds that contain kernel
+#modules.
+boot/kernel/gentoo/packages: pcmcia-cs slmodem linux-wlan-ng iptables hostap-driver fcpci
+boot/kernel/smp/packages: pcmcia-cs iptables fcpci hostap-driver
+
+livecd/unmerge:
+	autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
+	sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/cache
+	/var/lock
+	/var/log
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/X11R6/lib/X11/doc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
diff --git a/users/jhuebel/livecd/specs/packagecd-amd64-2004.2.spec b/users/jhuebel/livecd/specs/packagecd-amd64-2004.2.spec
new file mode 100644
index 0000000000..1f7c3d25de
--- /dev/null
+++ b/users/jhuebel/livecd/specs/packagecd-amd64-2004.2.spec
@@ -0,0 +1,94 @@
+subarch: amd64
+version_stamp: 20040716
+target: grp
+rel_type: default
+profile: default-amd64-2004.2
+snapshot: 20040716-r2
+source_subpath: default/stage3-amd64-20040716
+grp: src cd2
+
+grp/use: 
+	gtk2 
+	gnome 
+	kde 
+	qt 
+	bonobo 
+	cdr 
+	esd 
+	gtkhtml 
+	mozilla
+	mysql
+	perl
+	ruby
+	tcltk
+	acl
+	cups
+	ldap
+	ssl
+	tcpd
+	-svga
+
+grp/src/type: srcset
+grp/src/packages:
+	xorg-x11
+#	gentoo-sources
+	gentoo-dev-sources
+#	vanilla-sources
+#	development-sources
+#	mm-sources
+	iptables
+	gpm
+	rp-pppoe
+	ppp
+	speedtouch
+	pciutils
+	hdparm
+	hotplug
+	aumix
+	iputils
+	vixie-cron
+	sysklogd
+	metalog
+	syslog-ng
+	raidtools
+	jfsutils
+	xfsprogs
+	reiserfsprogs
+	lvm-user
+	dosfstools
+#	lilo
+	grub-static
+	superadduser
+	gentoolkit
+	chkrootkit
+	minicom
+	lynx
+	rpm2targz
+	parted
+	rdate
+	whois
+	tcpdump
+	cvs
+	unzip
+	zip
+	netcat
+	isdn4k-utils
+#	nforce-net
+#	nforce-audio
+#	iproute
+	nvidia-kernel
+	nvidia-glx
+#	ati-drivers
+#	e100
+#	e1000
+	wireless-tools
+	pcmcia-cs
+#	emu10k1
+	evms
+#	linux-wlan-ng
+	sys-apps/eject
+	genkernel
+
+grp/cd2/type: pkgset
+grp/cd2/packages:
+
diff --git a/users/jhuebel/livecd/specs/stage1-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage1-amd64-20040626.spec
new file mode 100644
index 0000000000..a07925f32b
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage1-amd64-20040626.spec
@@ -0,0 +1,9 @@
+subarch: amd64
+version_stamp: 20040626
+target: stage1
+rel_type: default
+rel_verson: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040626
+#source_subpath: default-amd64-2004.1/stage2-amd64-20040411
+source_subpath: default-amd64-2004.2/stage2-amd64-20040602
diff --git a/users/jhuebel/livecd/specs/stage1-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage1-amd64-20040716.spec
new file mode 100644
index 0000000000..5a6046ee27
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage1-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: 20040716
+target: stage1
+rel_type: default
+rel_verson: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040716
+source_subpath: default/stage2-amd64-20040626-r1
diff --git a/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040626.spec
new file mode 100644
index 0000000000..f7d6d13deb
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040626.spec
@@ -0,0 +1,9 @@
+subarch: amd64
+version_stamp: gcc34-20040626
+target: stage1
+rel_type: default
+rel_verson: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040626-r2
+#source_subpath: default-amd64-2004.1/stage2-amd64-20040411
+source_subpath: default-amd64-2004.2/stage2-amd64-20040626
diff --git a/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040716.spec
new file mode 100644
index 0000000000..4e5409af70
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage1-gcc34-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: gcc34-20040716
+target: stage1
+rel_type: default
+rel_verson: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040716
+source_subpath: default/stage2-amd64-gcc34-20040626-r1
diff --git a/users/jhuebel/livecd/specs/stage2-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage2-amd64-20040626.spec
new file mode 100644
index 0000000000..87d0348d67
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage2-amd64-20040626.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: 20040626
+target: stage2
+rel_type: default
+rel_version: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040626
+source_subpath: default-amd64-2004.2/stage1-amd64-20040626
diff --git a/users/jhuebel/livecd/specs/stage2-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage2-amd64-20040716.spec
new file mode 100644
index 0000000000..6ecf78e374
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage2-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: 20040716
+target: stage2
+rel_type: default
+rel_version: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040716
+source_subpath: default/stage1-amd64-20040716
diff --git a/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040626.spec
new file mode 100644
index 0000000000..1494882e13
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040626.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: gcc34-20040626
+target: stage2
+rel_type: default
+rel_version: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040626-r2
+source_subpath: gcc34-amd64-2004.2/stage1-amd64-gcc34-20040626
diff --git a/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040716.spec
new file mode 100644
index 0000000000..43ef406c6c
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage2-gcc34-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: gcc34-20040716
+target: stage2
+rel_type: default
+rel_version: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040716
+source_subpath: default/stage1-amd64-gcc34-20040716
diff --git a/users/jhuebel/livecd/specs/stage3-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage3-amd64-20040626.spec
new file mode 100644
index 0000000000..07f3123e53
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage3-amd64-20040626.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: 20040626
+target: stage3
+rel_type: default
+rel_version: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040626
+source_subpath: default-amd64-2004.2/stage2-amd64-20040626
diff --git a/users/jhuebel/livecd/specs/stage3-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage3-amd64-20040716.spec
new file mode 100644
index 0000000000..f6904aa37a
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage3-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: 20040716
+target: stage3
+rel_type: default
+rel_version: 2004.2
+profile: default-amd64-2004.2
+snapshot: 20040716
+source_subpath: default/stage2-amd64-20040716
diff --git a/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040626.spec b/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040626.spec
new file mode 100644
index 0000000000..e806a131fd
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040626.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: gcc-3420040626
+target: stage3
+rel_type: default
+rel_version: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040626-r2
+source_subpath: gcc34-amd64-2004.2/stage2-amd64-gcc34-20040626
diff --git a/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040716.spec b/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040716.spec
new file mode 100644
index 0000000000..36ba3c5614
--- /dev/null
+++ b/users/jhuebel/livecd/specs/stage3-gcc34-amd64-20040716.spec
@@ -0,0 +1,8 @@
+subarch: amd64
+version_stamp: gcc34-20040716
+target: stage3
+rel_type: default
+rel_version: 2004.2
+profile: gcc34-amd64-2004.1
+snapshot: 20040716
+source_subpath: default/stage2-amd64-gcc34-20040716