diff --git a/specs/2006.1/sparc/sparc64/livecd-stage1.spec b/specs/2006.1/sparc/sparc64/livecd-stage1.spec
index 0131938c..d39c64ed 100644
--- a/specs/2006.1/sparc/sparc64/livecd-stage1.spec
+++ b/specs/2006.1/sparc/sparc64/livecd-stage1.spec
@@ -11,54 +11,83 @@ livecd/use:
 	fbcon
 	gpm
 	ipv6
-	jpeg
 	livecd
 	ncurses
-	nocxx
+	nls
 	pam
-	png
 	readline
 	socks5
 	ssl
+	unicode
 
 livecd/packages:
-	~baselayout-1.11.15
-	livecd-tools
-	module-init-tools
-	hotplug
-	coldplug
-	irssi
-	rdate
-	syslog-ng
-	pciutils
-	mt-st
-	tar
-	links
-	raidtools
-	mdadm
-	lvm2
-	evms
-	nfs-utils
-	usbutils
-	e2fsprogs
-	nano
-	vim
-	less
-	openssh
-	dhcpcd
-	mingetty
-	pwgen
-	popt
-	dialog
-	rp-pppoe
-	screen
-	mirrorselect
-	iputils
-	traceroute
-	tcptraceroute
-	ethtool
-	netcat
-	parted
-	hwsetup
-	lsscsi
-	wipe
+        app-admin/passook
+        app-admin/pwgen
+        app-admin/syslog-ng
+        app-arch/unzip
+        app-editors/vim
+        app-misc/livecd-tools
+        app-misc/screen
+        app-misc/vlock
+        app-portage/mirrorselect
+        dev-lang/python
+#       media-gfx/fbgrab
+        net-analyzer/tcptraceroute
+        net-analyzer/traceroute
+#       net-dialup/bpalogin
+        net-dialup/mingetty
+#       net-dialup/penggy
+#       net-dialup/pptpclient
+        net-dialup/rp-pppoe
+        net-fs/nfs-utils
+        net-irc/irssi
+        net-misc/dhcpcd
+        net-misc/iputils
+        net-misc/rdate
+#       net-misc/vconfig
+#       net-wireless/ipw2100-firmware
+#       net-wireless/ipw2200-firmware
+#       net-wireless/prism54-firmware
+#       net-wireless/wireless-tools
+#       net-wireless/wpa_supplicant
+#       net-wireless/zd1201-firmware
+#       sys-apps/apmd
+        sys-apps/coldplug
+        sys-apps/eject
+        sys-apps/ethtool
+        sys-apps/fxload
+        sys-apps/hdparm
+        sys-apps/hwsetup
+        sys-apps/iproute2
+        sys-apps/memtester
+#       sys-apps/netplug
+        sys-apps/parted
+#       sys-apps/powerpc-utils
+#       sys-apps/ibm-powerpc-utils
+#       sys-apps/ibm-powerpc-utils-papr
+#       sys-block/partimage
+#       sys-boot/yaboot
+#       sys-devel/binutils-hppa64
+#       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/multipath-tools
+#       sys-fs/ntfsprogs
+        sys-fs/raidtools
+#       sys-fs/reiserfsprogs
+#       sys-fs/xfsprogs
+        sys-libs/gpm
+#       sys-power/acpid
+#       sys-power/apmd
+        www-client/links
diff --git a/specs/2006.1/sparc/sparc64/livecd-stage2-minimal.spec b/specs/2006.1/sparc/sparc64/livecd-stage2-minimal.spec
index 1db56657..6b2f9012 100644
--- a/specs/2006.1/sparc/sparc64/livecd-stage2-minimal.spec
+++ b/specs/2006.1/sparc/sparc64/livecd-stage2-minimal.spec
@@ -22,156 +22,303 @@ boot/kernel/2617/config: 2.6.17-sparc64-generic.config
 boot/kernel/2617/use: ultra1
 
 livecd/unmerge:
-	autoconf
-	automake
-	binutils
-	bison
-	busybox
-	ccache
-	flex
-	gcc
-	gcc-sparc64
-	gettext
-	groff
-	libperl
-	libtool
-	linux-headers
-	m4
-	make
-	man
-	man-pages
-	patch
-	perl
-	sandbox
-	texinfo
+#       acl
+#       addpatches
+#       attr
+        alsa-headers
+        autoconf
+        autoconf-wrapper
+        automake
+        automake-wrapper
+#       bc
+#       bin86
+        binutils
+        binutils-config
+        bison
+        busybox
+#       ccache
+        cpio
+#       cronbase
+#       devfsd
+        diffutils
+#       distcc
+#       ed
+        expat
+        flex
+        gcc
+        gcc-config
+        gcc-sparc64
+        genkernel
+        gentoo-sources
+        gettext
+        gnuconfig
+        groff
+#       grub
+        help2man
+#       lcms
+#       ld.so
+#       lib-compat
+#       libmng
+        libperl
+        libstdc++-v3
+        libtool
+        linux-headers
+        m4
+        make
+        man
+        man-pages
+        miscfiles
+        pax-utils
+        patch
+        perl
+        perl-cleaner
+        perl-Test-Simple
+        PodParser
+        pycrypto
+        python-fchksum
+        rpm2targz
+        rsync
+        sandbox
+#       sash
+#       sysklogd
+#       tcp-wrappers
+        Test-Harness
+        texinfo
+#       ucl
+#       vanilla-sources
 
 livecd/empty:
-	/etc/cron.daily
-	/etc/cron.hourly
-	/etc/cron.monthly
-	/etc/cron.weekly
-	/etc/rsync
-	/etc/skel
-	/root/.ccache
-	/tmp
-	/usr/lib/binutils
-	/usr/lib/gcc
-	/usr/lib/gconv
-	/usr/lib/perl5
-	/usr/lib/portage
-	/usr/lib/python2.4/test
-	/usr/local
-	/usr/portage
-	/usr/share/man
-	/usr/share/info
-	/usr/share/unimaps
-	/usr/include
-	/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/genkernel
-	/usr/share/gettext
-	/usr/share/gcc-data
-	/usr/share/glib-2.0
-	/usr/share/gnuconfig
-	/usr/share/gtk-doc
-	/usr/share/i18n
-	/usr/share/libtool
-	/usr/share/locale
-	/usr/share/man
-	/usr/share/perl
-	/usr/share/rfc
-	/usr/share/ss
-	/usr/share/state
-	/usr/share/texinfo
-	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
-	/usr/src
-	/usr/X11R6
-	/var/cache
-	/var/db
-	/var/empty
-	/var/lib/portage
-	/var/lock
-	/var/log
-	/var/run
-	/var/tmp
+        /etc/bootsplash/gentoo
+        /etc/bootsplash/gentoo-highquality
+        /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
+        /etc/splash/emergence
+        /etc/splash/gentoo
+        /lib/dev-state
+        /lib/udev-state
+        /lib64/dev-state
+        /lib64/udev-state
+        /root/.ccache
+        /tmp
+        /usr/diet/include
+        /usr/diet/man
+        /usr/i386-gentoo-linux-uclibc
+        /usr/i386-pc-linux-gnu
+        /usr/i386-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
+        /usr/lib/portage
+        /usr/lib/python2.2
+        /usr/lib/python2.3
+        /usr/lib/python2.4/tests
+        /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
+        /usr/lib64/portage
+        /usr/lib64/python2.2
+        /usr/lib64/python2.3
+        /usr/lib64/python2.4/tests
+        /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/perl
+        /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/db
+        /var/empty
+        /var/lib/portage
+        /var/lock
+        /var/log
+        /var/run
+        /var/spool
+        /var/state
+        /var/tmp
 
 livecd/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/default/audioctl
-	/etc/dispatch-conf.conf
-	/etc/etc-update.conf
-	/etc/genkernel.conf
-	/etc/make.conf
-	/etc/make.conf.example
-	/etc/make.globals
-	/etc/make.profile
-	/etc/man.conf
-	/etc/resolv.conf
-	/lib/*.a
-	/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/elftoaout
-	/usr/bin/f77
-	/usr/bin/g++*
-	/usr/bin/g77
-	/usr/bin/gcc*
-	/usr/bin/gprof
-	/usr/bin/jpegtran
-	/usr/bin/libpng*
-	/usr/bin/ld
-	/usr/bin/nm
-	/usr/bin/objcopy
-	/usr/bin/objdump
-	/usr/bin/piggyback
-	/usr/bin/piggyback64
-	/usr/bin/ranlib
-	/usr/bin/readelf
-	/usr/bin/size
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
-	/usr/bin/strip
-	/usr/lib/*.a
-	/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*
+        /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.conf.example
+        /etc/make.globals
+        /etc/make.profile
+        /etc/man.conf
+        /etc/resolv.conf
+        /etc/splash/livecd-2006.1/12*
+        /etc/splash/livecd-2006.1/14*
+        /etc/splash/livecd-2006.1/16*
+        /etc/splash/livecd-2006.1/19*
+        /etc/splash/livecd-2006.1/6*
+        /etc/splash/livecd-2006.1/8*
+        /etc/splash/livecd-2006.1/images/background-12*
+        /etc/splash/livecd-2006.1/images/background-14*
+        /etc/splash/livecd-2006.1/images/background-16*
+        /etc/splash/livecd-2006.1/images/background-19*
+        /etc/splash/livecd-2006.1/images/background-6*
+        /etc/splash/livecd-2006.1/images/background-8*
+        /etc/splash/livecd-2006.1/images/verbose-12*
+        /etc/splash/livecd-2006.1/images/verbose-14*
+        /etc/splash/livecd-2006.1/images/verbose-16*
+        /etc/splash/livecd-2006.1/images/verbose-19*
+        /etc/splash/livecd-2006.1/images/verbose-6*
+        /etc/splash/livecd-2006.1/images/verbose-8*
+        /lib*/*.a
+        /lib*/*.la
+        /lib*/cpp
+        #/lib*/security/pam_access.so
+        #/lib*/security/pam_chroot.so
+        #/lib*/security/pam_debug.so
+        #/lib*/security/pam_ftp.so
+        #/lib*/security/pam_issue.so
+        #/lib*/security/pam_mail.so
+        #/lib*/security/pam_mkhomedir.so
+        #/lib*/security/pam_motd.so
+        #/lib*/security/pam_postgresok.so
+        #/lib*/security/pam_rhosts_auth.so
+        #/lib*/security/pam_userdb.so
+        /root/.bash_history
+        /root/.viminfo
+        /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/i386-gentoo-linux-uclibc-*
+        /usr/bin/i386-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*/gcc-lib/*/*/libgcj*
+        /usr/sbin/archive-conf
+        /usr/sbin/bootsplash*
+        /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
diff --git a/specs/2006.1/sparc/sparc64/livecd-stage2-universal.spec b/specs/2006.1/sparc/sparc64/livecd-stage2-universal.spec
index 823ed862..57ee7310 100644
--- a/specs/2006.1/sparc/sparc64/livecd-stage2-universal.spec
+++ b/specs/2006.1/sparc/sparc64/livecd-stage2-universal.spec
@@ -23,156 +23,303 @@ boot/kernel/2617/config: 2.6.17-sparc64-generic.config
 boot/kernel/2617/use: ultra1
 
 livecd/unmerge:
-	autoconf
-	automake
-	binutils
-	bison
-	busybox
-	ccache
-	flex
-	gcc
-	gcc-sparc64
-	gettext
-	groff
-	libperl
-	libtool
-	linux-headers
-	m4
-	make
-	man
-	man-pages
-	patch
-	perl
-	sandbox
-	texinfo
+#       acl
+#       addpatches
+#       attr
+        alsa-headers
+        autoconf
+        autoconf-wrapper
+        automake
+        automake-wrapper
+#       bc
+#       bin86
+        binutils
+        binutils-config
+        bison
+        busybox
+#       ccache
+        cpio
+#       cronbase
+#       devfsd
+        diffutils
+#       distcc
+#       ed
+        expat
+        flex
+        gcc
+        gcc-config
+        gcc-sparc64
+        genkernel
+        gentoo-sources
+        gettext
+        gnuconfig
+        groff
+#       grub
+        help2man
+#       lcms
+#       ld.so
+#       lib-compat
+#       libmng
+        libperl
+        libstdc++-v3
+        libtool
+        linux-headers
+        m4
+        make
+        man
+        man-pages
+        miscfiles
+        pax-utils
+        patch
+        perl
+        perl-cleaner
+        perl-Test-Simple
+        PodParser
+        pycrypto
+        python-fchksum
+        rpm2targz
+        rsync
+        sandbox
+#       sash
+#       sysklogd
+#       tcp-wrappers
+        Test-Harness
+        texinfo
+#       ucl
+#       vanilla-sources
 
 livecd/empty:
-	/etc/cron.daily
-	/etc/cron.hourly
-	/etc/cron.monthly
-	/etc/cron.weekly
-	/etc/rsync
-	/etc/skel
-	/root/.ccache
-	/tmp
-	/usr/lib/binutils
-	/usr/lib/gcc
-	/usr/lib/gconv
-	/usr/lib/perl5
-	/usr/lib/portage
-	/usr/lib/python2.4/test
-	/usr/local
-	/usr/portage
-	/usr/share/man
-	/usr/share/info
-	/usr/share/unimaps
-	/usr/include
-	/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/genkernel
-	/usr/share/gettext
-	/usr/share/gcc-data
-	/usr/share/glib-2.0
-	/usr/share/gnuconfig
-	/usr/share/gtk-doc
-	/usr/share/i18n
-	/usr/share/libtool
-	/usr/share/locale
-	/usr/share/man
-	/usr/share/perl
-	/usr/share/rfc
-	/usr/share/ss
-	/usr/share/state
-	/usr/share/texinfo
-	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
-	/usr/src
-	/usr/X11R6
-	/var/cache
-	/var/db
-	/var/empty
-	/var/lib/portage
-	/var/lock
-	/var/log
-	/var/run
-	/var/tmp
+        /etc/bootsplash/gentoo
+        /etc/bootsplash/gentoo-highquality
+        /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
+        /etc/splash/emergence
+        /etc/splash/gentoo
+        /lib/dev-state
+        /lib/udev-state
+        /lib64/dev-state
+        /lib64/udev-state
+        /root/.ccache
+        /tmp
+        /usr/diet/include
+        /usr/diet/man
+        /usr/i386-gentoo-linux-uclibc
+        /usr/i386-pc-linux-gnu
+        /usr/i386-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
+        /usr/lib/portage
+        /usr/lib/python2.2
+        /usr/lib/python2.3
+        /usr/lib/python2.4/tests
+        /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
+        /usr/lib64/portage
+        /usr/lib64/python2.2
+        /usr/lib64/python2.3
+        /usr/lib64/python2.4/tests
+        /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/perl
+        /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/db
+        /var/empty
+        /var/lib/portage
+        /var/lock
+        /var/log
+        /var/run
+        /var/spool
+        /var/state
+        /var/tmp
 
 livecd/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/default/audioctl
-	/etc/dispatch-conf.conf
-	/etc/etc-update.conf
-	/etc/genkernel.conf
-	/etc/make.conf
-	/etc/make.conf.example
-	/etc/make.globals
-	/etc/make.profile
-	/etc/man.conf
-	/etc/resolv.conf
-	/lib/*.a
-	/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/elftoaout
-	/usr/bin/f77
-	/usr/bin/g++*
-	/usr/bin/g77
-	/usr/bin/gcc*
-	/usr/bin/gprof
-	/usr/bin/jpegtran
-	/usr/bin/libpng*
-	/usr/bin/ld
-	/usr/bin/nm
-	/usr/bin/objcopy
-	/usr/bin/objdump
-	/usr/bin/piggyback
-	/usr/bin/piggyback64
-	/usr/bin/ranlib
-	/usr/bin/readelf
-	/usr/bin/size
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
-	/usr/bin/strip
-	/usr/lib/*.a
-	/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*
+        /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.conf.example
+        /etc/make.globals
+        /etc/make.profile
+        /etc/man.conf
+        /etc/resolv.conf
+        /etc/splash/livecd-2006.1/12*
+        /etc/splash/livecd-2006.1/14*
+        /etc/splash/livecd-2006.1/16*
+        /etc/splash/livecd-2006.1/19*
+        /etc/splash/livecd-2006.1/6*
+        /etc/splash/livecd-2006.1/8*
+        /etc/splash/livecd-2006.1/images/background-12*
+        /etc/splash/livecd-2006.1/images/background-14*
+        /etc/splash/livecd-2006.1/images/background-16*
+        /etc/splash/livecd-2006.1/images/background-19*
+        /etc/splash/livecd-2006.1/images/background-6*
+        /etc/splash/livecd-2006.1/images/background-8*
+        /etc/splash/livecd-2006.1/images/verbose-12*
+        /etc/splash/livecd-2006.1/images/verbose-14*
+        /etc/splash/livecd-2006.1/images/verbose-16*
+        /etc/splash/livecd-2006.1/images/verbose-19*
+        /etc/splash/livecd-2006.1/images/verbose-6*
+        /etc/splash/livecd-2006.1/images/verbose-8*
+        /lib*/*.a
+        /lib*/*.la
+        /lib*/cpp
+        /lib*/security/pam_access.so
+        /lib*/security/pam_chroot.so
+        /lib*/security/pam_debug.so
+        /lib*/security/pam_ftp.so
+        /lib*/security/pam_issue.so
+        /lib*/security/pam_mail.so
+        /lib*/security/pam_mkhomedir.so
+        /lib*/security/pam_motd.so
+        /lib*/security/pam_postgresok.so
+        /lib*/security/pam_rhosts_auth.so
+        /lib*/security/pam_userdb.so
+        /root/.bash_history
+        /root/.viminfo
+        /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/i386-gentoo-linux-uclibc-*
+        /usr/bin/i386-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*/gcc-lib/*/*/libgcj*
+        /usr/sbin/archive-conf
+        /usr/sbin/bootsplash*
+        /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