New portage and ebuild cleanout.

16 files changed, 13 insertions, 1802 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 3d6f5d138efc..c6381a36a3d0 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/portage
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.30 2004/04/04 23:59:18 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.31 2004/04/26 17:24:41 carpaski Exp $
 
 # See the gentoo-src Portage ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
@@ -8,5 +8,5 @@
 *portage-2.0.50-r3 (23 Mar 2004)
 
   23 Mar 2004; Nicholas Jones <carpaski@gentoo.org> portage-2.0.50-r3:
-	Security fixes for sandbox hardlink vulnerabilities.
+  Security fixes for sandbox hardlink vulnerabilities.
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c8fab1cb13a8..362570a6126e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,20 +1,10 @@
-MD5 aa66cd56ab4e7ed92eaf2976aa1a4743 portage-2.0.51_pre6.ebuild 13278
-MD5 e453628fc1b0bacd4bab14140e8d4dfb portage-2.0.50-r6.ebuild 10854
-MD5 51cbe7060e0d9f8a2ad9e613dad9bb47 portage-2.0.51_pre3.ebuild 11096
-MD5 c325f19a0e791d8b4882aa2ff718405a portage-2.0.51_pre5.ebuild 13232
-MD5 673a21fdda3d3f469ddce1cbc691295f portage-2.0.50-r5.ebuild 10847
-MD5 9f6bd830bfade99560f227c8455d5d54 portage-2.0.51_pre2.ebuild 11088
-MD5 e7ef8d484311c7089084da09860eee60 ChangeLog 580
+MD5 b15516a255df929db2f1ca9340ccbfd5 portage-2.0.50-r6.ebuild 10868
+MD5 6148821ddcc2cd0437ddc5c0673d655f portage-2.0.51_pre7.ebuild 13299
+MD5 4c71f42c1e1729a4b4078964e084f195 ChangeLog 581
 MD5 4ec0f0ae9676b9d2d227d737d508306b metadata.xml 165
-MD5 9bb41a4e771cd43ee7b70ef5b5c5146c portage-2.0.51_pre4.ebuild 13196
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
 MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986
-MD5 9a91134712cb65d3c91ba74542e74474 files/digest-portage-2.0.51_pre2 72
-MD5 bf7c79234106b8ac85cb4205f3287006 files/digest-portage-2.0.51_pre3 72
-MD5 9b9a18fc40c63b3cc9902883d30cd362 files/digest-portage-2.0.51_pre4 72
-MD5 7974f2e3523dd577d9b806a3069e4b73 files/digest-portage-2.0.51_pre5 72
-MD5 5e3f3478ab2a45686a39a9737e27879e files/digest-portage-2.0.51_pre6 72
-MD5 607910baea1a744afc2e828b34d6d1b2 files/digest-portage-2.0.50-r5 70
+MD5 9766a22aec69782a98fde2cc6022bf4b files/digest-portage-2.0.51_pre7 72
 MD5 3b35eb55c2810fa539f29b4242b4d18a files/digest-portage-2.0.50-r6 70
 MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027
 MD5 74e6d2c3002dd2370ab9bd9f4fcb7dc6 files/README.RESCUE 1689
diff --git a/sys-apps/portage/files/digest-portage-2.0.50-r5 b/sys-apps/portage/files/digest-portage-2.0.50-r5
deleted file mode 100644
index 53b73e5f3570..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.50-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97aafaba91a3e509f63207c2911976b2 portage-2.0.50-r5.tar.bz2 224604
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre2 b/sys-apps/portage/files/digest-portage-2.0.51_pre2
deleted file mode 100644
index 51317b9c7322..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 751ed1985cd9116ddfd3a95c46893702 portage-2.0.51_pre2.tar.bz2 288798
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre3 b/sys-apps/portage/files/digest-portage-2.0.51_pre3
deleted file mode 100644
index a963034036da..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 242c467b7d60e78246c4252f19851dee portage-2.0.51_pre3.tar.bz2 279132
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre4 b/sys-apps/portage/files/digest-portage-2.0.51_pre4
deleted file mode 100644
index 101a5c70cc5a..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d622427212eea8581b67c3d9c3e87fb portage-2.0.51_pre4.tar.bz2 281303
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre5 b/sys-apps/portage/files/digest-portage-2.0.51_pre5
deleted file mode 100644
index a2786b85633b..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_pre5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0670ee59b575581a9bfed612b797384 portage-2.0.51_pre5.tar.bz2 281424
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre6 b/sys-apps/portage/files/digest-portage-2.0.51_pre6
deleted file mode 100644
index 37fb33075eb1..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_pre6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18bd9147bde8a3a6490a84832287a0b5 portage-2.0.51_pre6.tar.bz2 277001
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_pre7 b/sys-apps/portage/files/digest-portage-2.0.51_pre7
new file mode 100644
index 000000000000..6328c54ecffc
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.51_pre7
@@ -0,0 +1 @@
+MD5 160ac28137d601ed22a1ecd0c44b0c0e portage-2.0.51_pre7.tar.bz2 277072
diff --git a/sys-apps/portage/portage-2.0.50-r5.ebuild b/sys-apps/portage/portage-2.0.50-r5.ebuild
deleted file mode 100644
index ad08c94e485b..000000000000
--- a/sys-apps/portage/portage-2.0.50-r5.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r5.ebuild,v 1.3 2004/04/12 03:43:59 carpaski Exp $
-
-IUSE="build"
-
-# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
-# cause everything to segfault !!
-export SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${PF}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-# Contact carpaski with a reason before you modify any of these.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86"
-
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		alpha )
-		newins make.globals.alpha make.globals
-		newins make.conf.alpha make.conf
-		;;
-		arm )
-		newins make.globals.arm make.globals
-		newins make.conf.arm make.conf
-		;;
-		hppa )
-		newins make.globals.hppa make.globals
-		newins make.conf.hppa make.conf
-		;;
-		mips )
-		newins make.globals.mips make.globals
-		newins make.conf.mips make.conf
-		;;
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		sparc )
-		newins make.globals.sparc make.globals
-		newins make.conf.sparc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#This special handling of make.conf is required for catalyst
-	#to function properly.
-	mv ${D}/etc/make.conf ${D}/etc/make.conf.example
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.py ../bin/emergehelp.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-
-	#install sandbox
-	cd ${S}/src/sandbox-1.1
-	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-
-	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
-	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
-	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym ../lib/portage/bin/portageq /usr/bin/portageq
-
-	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
-	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
-	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
-	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
-
-	dosym newins /usr/lib/portage/bin/donewins
-
-	# man pages
-	doman ${S}/man/*.[15]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#disable global sandbox if it's active (it's been deprecated)
-	if [ -f /etc/ld.so.preload ] ; then
-		cp /etc/ld.so.preload ${T}
-		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
-	fi
-
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		rm -rf ${ROOT}/usr/lib/sandbox
-	fi
-
-	#yank old cache files
-	if [ -d /var/cache/edb ]
-	then
-		rm -f /var/cache/edb/xcache.p
-		rm -f /var/cache/edb/mtimes
-	fi
-
-	if [ ! -f "/etc/portage/package.mask" ]; then
-	  if [ -f "/etc/portage/profiles/package.mask" ]; then
-			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
-			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
-			einfo "a hardlink has been created to the new location if it exists in profiles"
-			einfo "already."
-			echo
-		fi
-	fi
-	echo
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "GENTOOLKIT will need to be updated to at least 0.2.0 for some tools"
-	einfo "to work properly."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5; do
-			# Double beep here.
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-		done
-		sleep 8
-
-		# Kill the existing counter and generate a new one.
-		echo -n "Recalculating the counter... "
-		mv /var/cache/edb/counter /var/cache/edb/counter.old
-		python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
-		if [ -f /var/cache/edb/counter ] ; then
-			echo "Counter updated successfully."
-			rm -f /var/cache/edb/counter.old
-		else
-			echo "FAILED to update counter."
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root:portage ${ROOT}var/cache/edb/dep
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-
-
-	if has ccache $FEATURES && has userpriv $FEATURES; then
-		chown -R portage:portage /var/tmp/ccache &> /dev/null
-		chmod -R g+rws /var/tmp/ccache &>/dev/null
-	fi
-
-
-#
-# Take a shot at fixing the world file...
-# This finds all specific-version ebuilds without modifiers.
-#
-	addwrite ${ROOT}var/cache/edb/
-	python -c "
-import portage
-world = portage.grabfile('${ROOT}var/cache/edb/world')
-newlist = []
-
-for x in world:
-	try:
-		if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)):
-			newlist.append('='+x)
-			continue
-	except:
-		pass
-	newlist.append(x)
-
-if newlist and (len(newlist) == len(world)):
-	myworld=open('${ROOT}var/cache/edb/world','w')
-	for x in newlist:
-		myworld.write(x+'\\n')
-
-	myworld.close()
-
-"
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-}
diff --git a/sys-apps/portage/portage-2.0.50-r6.ebuild b/sys-apps/portage/portage-2.0.50-r6.ebuild
index 87fa33b7556c..e2da53ed5a00 100644
--- a/sys-apps/portage/portage-2.0.50-r6.ebuild
+++ b/sys-apps/portage/portage-2.0.50-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r6.ebuild,v 1.2 2004/04/24 07:58:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r6.ebuild,v 1.3 2004/04/26 17:24:41 carpaski Exp $
 
 IUSE="build"
 
@@ -15,8 +15,8 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 
 # Contact carpaski with a reason before you modify any of these.
-KEYWORDS="x86 ppc ppc64 sparc mips alpha arm hppa amd64 ia64 s390"
-#KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc64  s390  sparc  x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
diff --git a/sys-apps/portage/portage-2.0.51_pre2.ebuild b/sys-apps/portage/portage-2.0.51_pre2.ebuild
deleted file mode 100644
index 6a204c71eadf..000000000000
--- a/sys-apps/portage/portage-2.0.51_pre2.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre2.ebuild,v 1.3 2004/04/12 03:43:59 carpaski Exp $
-
-IUSE="build"
-
-# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
-# cause everything to segfault !!
-export SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${PF}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-# Contact carpaski with a reason before you modify any of these.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86"
-
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		alpha )
-		newins make.globals.alpha make.globals
-		newins make.conf.alpha make.conf
-		;;
-		arm )
-		newins make.globals.arm make.globals
-		newins make.conf.arm make.conf
-		;;
-		hppa )
-		newins make.globals.hppa make.globals
-		newins make.conf.hppa make.conf
-		;;
-		mips )
-		newins make.globals.mips make.globals
-		newins make.conf.mips make.conf
-		;;
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		sparc )
-		newins make.globals.sparc make.globals
-		newins make.conf.sparc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#This special handling of make.conf is required for catalyst
-	#to function properly.
-	mv ${D}/etc/make.conf ${D}/etc/make.conf.example
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.py ../bin/emergehelp.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-
-	#install sandbox
-	cd ${S}/src/sandbox-1.1
-	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-
-	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
-	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
-	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym ../lib/portage/bin/portageq /usr/bin/portageq
-
-	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
-	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
-	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
-	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
-
-	dosym newins /usr/lib/portage/bin/donewins
-
-	# man pages
-	doman ${S}/man/*.[15]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#disable global sandbox if it's active (it's been deprecated)
-	if [ -f /etc/ld.so.preload ] ; then
-		cp /etc/ld.so.preload ${T}
-		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
-	fi
-
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		rm -rf ${ROOT}/usr/lib/sandbox
-	fi
-
-	#yank old cache files
-	if [ -d /var/cache/edb ]
-	then
-		rm -f /var/cache/edb/xcache.p
-		rm -f /var/cache/edb/mtimes
-	fi
-
-	mkdir "${ROOT}/etc/portage" &> /dev/null
-
-	if [ ! -f "/etc/portage/package.mask" ]; then
-	  if [ -f "/etc/portage/profiles/package.mask" ]; then
-			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
-			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
-			einfo "a hardlink has been created to the new location if it exists in profiles"
-			einfo "already."
-			echo
-		fi
-	fi
-	echo
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "GENTOOLKIT will need to be updated to at least 0.2.0 for some tools"
-	einfo "to work properly."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5; do
-			# Double beep here.
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-		done
-		sleep 8
-
-		# Kill the existing counter and generate a new one.
-		echo -n "Recalculating the counter... "
-		mv /var/cache/edb/counter /var/cache/edb/counter.old
-		python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
-		if [ -f /var/cache/edb/counter ] ; then
-			echo "Counter updated successfully."
-			rm -f /var/cache/edb/counter.old
-		else
-			echo "FAILED to update counter."
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root:portage ${ROOT}var/cache/edb/dep
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-
-
-	if has ccache $FEATURES && has userpriv $FEATURES; then
-		chown -R portage:portage /var/tmp/ccache &> /dev/null
-		chmod -R g+rws /var/tmp/ccache &>/dev/null
-	fi
-
-
-#
-# Take a shot at fixing the world file...
-# This finds all specific-version ebuilds without modifiers.
-#
-	addwrite ${ROOT}var/cache/edb/
-	python -c "
-import portage
-world = portage.grabfile('${ROOT}var/cache/edb/world')
-newlist = []
-
-for x in world:
-	try:
-		if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)):
-			newlist.append('='+x)
-			continue
-	except:
-		pass
-	newlist.append(x)
-
-if newlist and (len(newlist) == len(world)):
-	myworld=open('${ROOT}var/cache/edb/world','w')
-	for x in newlist:
-		myworld.write(x+'\\n')
-
-	myworld.close()
-
-"
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-}
diff --git a/sys-apps/portage/portage-2.0.51_pre3.ebuild b/sys-apps/portage/portage-2.0.51_pre3.ebuild
deleted file mode 100644
index e86405721344..000000000000
--- a/sys-apps/portage/portage-2.0.51_pre3.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre3.ebuild,v 1.3 2004/04/24 07:58:02 vapier Exp $
-
-IUSE="build"
-
-# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
-# cause everything to segfault !!
-export SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${PF}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-
-# Contact carpaski with a reason before you modify any of these.
-KEYWORDS="x86 ppc ppc64 sparc mips alpha arm hppa amd64 ia64 s390"
-#KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
-
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		alpha )
-		newins make.globals.alpha make.globals
-		newins make.conf.alpha make.conf
-		;;
-		arm )
-		newins make.globals.arm make.globals
-		newins make.conf.arm make.conf
-		;;
-		hppa )
-		newins make.globals.hppa make.globals
-		newins make.conf.hppa make.conf
-		;;
-		mips )
-		newins make.globals.mips make.globals
-		newins make.conf.mips make.conf
-		;;
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		sparc )
-		newins make.globals.sparc make.globals
-		newins make.conf.sparc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#This special handling of make.conf is required for catalyst
-	#to function properly.
-	mv ${D}/etc/make.conf ${D}/etc/make.conf.example
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.py ../bin/emergehelp.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-
-	#install sandbox
-	cd ${S}/src/sandbox-1.1
-	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-
-	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
-	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
-	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym ../lib/portage/bin/portageq /usr/bin/portageq
-
-	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
-	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
-	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
-	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
-
-	dosym newins /usr/lib/portage/bin/donewins
-
-	# man pages
-	doman ${S}/man/*.[15]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#disable global sandbox if it's active (it's been deprecated)
-	if [ -f /etc/ld.so.preload ] ; then
-		cp /etc/ld.so.preload ${T}
-		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
-	fi
-
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		rm -rf ${ROOT}/usr/lib/sandbox
-	fi
-
-	#yank old cache files
-	if [ -d /var/cache/edb ]
-	then
-		rm -f /var/cache/edb/xcache.p
-		rm -f /var/cache/edb/mtimes
-	fi
-
-	mkdir "${ROOT}/etc/portage" &> /dev/null
-
-	if [ ! -f "/etc/portage/package.mask" ]; then
-	  if [ -f "/etc/portage/profiles/package.mask" ]; then
-			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
-			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
-			einfo "a hardlink has been created to the new location if it exists in profiles"
-			einfo "already."
-			echo
-		fi
-	fi
-	echo
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "GENTOOLKIT will need to be updated to at least 0.2.0 for some tools"
-	einfo "to work properly."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5; do
-			# Double beep here.
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-		done
-		sleep 8
-
-		# Kill the existing counter and generate a new one.
-		echo -n "Recalculating the counter... "
-		mv /var/cache/edb/counter /var/cache/edb/counter.old
-		python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
-		if [ -f /var/cache/edb/counter ] ; then
-			echo "Counter updated successfully."
-			rm -f /var/cache/edb/counter.old
-		else
-			echo "FAILED to update counter."
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root:portage ${ROOT}var/cache/edb/dep
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-
-
-	if has ccache $FEATURES && has userpriv $FEATURES; then
-		chown -R portage:portage /var/tmp/ccache &> /dev/null
-		chmod -R g+rws /var/tmp/ccache &>/dev/null
-	fi
-
-
-#
-# Take a shot at fixing the world file...
-# This finds all specific-version ebuilds without modifiers.
-#
-	addwrite ${ROOT}var/cache/edb/
-	python -c "
-import portage
-world = portage.grabfile('${ROOT}var/cache/edb/world')
-newlist = []
-
-for x in world:
-	try:
-		if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)):
-			newlist.append('='+x)
-			continue
-	except:
-		pass
-	newlist.append(x)
-
-if newlist and (len(newlist) == len(world)):
-	myworld=open('${ROOT}var/cache/edb/world','w')
-	for x in newlist:
-		myworld.write(x+'\\n')
-
-	myworld.close()
-
-"
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-}
diff --git a/sys-apps/portage/portage-2.0.51_pre4.ebuild b/sys-apps/portage/portage-2.0.51_pre4.ebuild
deleted file mode 100644
index 033008bd1b1b..000000000000
--- a/sys-apps/portage/portage-2.0.51_pre4.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre4.ebuild,v 1.1 2004/04/25 09:11:51 carpaski Exp $
-
-IUSE="build"
-
-# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
-# cause everything to segfault !!
-export SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${PF}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-
-# Contact carpaski with a reason before you modify any of these.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86"
-
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		alpha )
-		newins make.globals.alpha make.globals
-		newins make.conf.alpha make.conf
-		;;
-		arm )
-		newins make.globals.arm make.globals
-		newins make.conf.arm make.conf
-		;;
-		hppa )
-		newins make.globals.hppa make.globals
-		newins make.conf.hppa make.conf
-		;;
-		mips )
-		newins make.globals.mips make.globals
-		newins make.conf.mips make.conf
-		;;
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		sparc )
-		newins make.globals.sparc make.globals
-		newins make.conf.sparc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#This special handling of make.conf is required for catalyst
-	#to function properly.
-	mv ${D}/etc/make.conf ${D}/etc/make.conf.example
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.py ../bin/emergehelp.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-
-	#install sandbox
-	cd ${S}/src/sandbox-1.1
-	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-
-	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
-	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
-	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym ../lib/portage/bin/portageq /usr/bin/portageq
-
-	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
-	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
-	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
-	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
-
-	dosym newins /usr/lib/portage/bin/donewins
-
-	# man pages
-	doman ${S}/man/*.[15]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#disable global sandbox if it's active (it's been deprecated)
-	if [ -f /etc/ld.so.preload ] ; then
-		cp /etc/ld.so.preload ${T}
-		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
-	fi
-
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		rm -rf ${ROOT}/usr/lib/sandbox
-	fi
-
-	#yank old cache files
-	if [ -d /var/cache/edb ]
-	then
-		rm -f /var/cache/edb/xcache.p
-		rm -f /var/cache/edb/mtimes
-	fi
-
-	install -o root -g portage -m 0755 -d "${ROOT}/etc/portage"
-	install -o root -g portage -m 2775 -d "${ROOT}/etc/portage/sets"
-	# u+rwx,g+srwx --- This is a secure directory for temp files.
-
-	install -o root -g portage -m 2770 -d "${ROOT}/var/lib/portage"
-	einfo "Checking ${ROOT}/var/lib/portage for bad/illegal files:"
-	find "${ROOT}/var/lib/portage" ! -gid $(id -g portage) -o -perm -002 -print0 | xargs -0n 500 rm -Rvf
-
-	OLDWORLD="${ROOT}/var/cache/edb/world"
-	NEWWORLD="${ROOT}/var/lib/portage/world"
-
-	if [ ! -L "${OLDWORLD}" ]; then
-		# edb/world is not a symlink
-		if [ -f "${NEWWORLD}" ]; then
-			# portage/world exists
-			if cmp "${OLDWORLD}" "${NEWWORLD}"; then
-				# They are identical. Delete the real file and symlink it.
-				rm "${OLDWORLD}"
-				ln -s "../../../var/lib/portage/world" "${OLDWORLD}"
-				rm /etc/portage/sets/worldem
-				ln -s "../../../var/lib/portage/world" "${OLDWORLD}"
-			else
-				# They don't match. Complain and do nothing.
-				ewarn "A world file exists in both ${ROOT}/var/cache/db/world and"
-				ewarn "in ${ROOT}/etc/portage/sets/world --- you will need to merge these"
-				ewarn "files by hand to ensure that your world is proper. For compatibility"
-				ewarn "the file in /var should be a symlink to the one in /etc."
-			fi
-		else
-			# portage/world does not yet exist.
-			ewarn "Moving world file into /etc/portage/sets/world"
-			rm "${ROOT}/var/cache/edb/world"
-			ln -s "../../../etc/portage/sets/world" "${ROOT}/var/cache/edb/world"
-		fi
-	fi
-
-	if [ ! -f "/etc/portage/package.mask" ]; then
-	  if [ -f "/etc/portage/profiles/package.mask" ]; then
-			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
-			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
-			einfo "a hardlink has been created to the new location if it exists in profiles"
-			einfo "already."
-			echo
-		fi
-	fi
-	echo
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-	ewarn "NOTICE: There have been changes in the location of some internal files"
-	ewarn "        to better match the FHS. The changes do not directly affect users"
-	ewarn "        but please be advised that changing between versions of portage"
-	ewarn "        with and without these changes may introduce some inconsistencies"
-	ewarn "        in package data regarding 'world' and 'virtuals' (provides)."
-	echo
-	einfo "        /var/cache/edb/world has moved to /etc/portage/sets/world"
-	einfo "        /var/cache/edb/virtuals has move to /etc/portage/virtuals"
-	echo
-	ewarn "The virtuals file functionality is being changed. It will contain only"
-	ewarn "user preferences for virtuals and will never be modified by portage."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5 6 7 8 9 10; do
-			echo -ne "\a" ; sleep 0.$(( $RANDOM % 9 + 1)) &>/dev/null ; sleep 0,$(( $RANDOM % 9 + 1)) &>/dev/null
-		done
-		sleep 5
-
-		# Kill the existing counter and generate a new one.
-		echo -n "Recalculating the counter... "
-		mv /var/cache/edb/counter /var/cache/edb/counter.old
-		python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
-		if [ -f /var/cache/edb/counter ] ; then
-			echo "Counter updated successfully."
-			rm -f /var/cache/edb/counter.old
-		else
-			echo "FAILED to update counter."
-			ls -l /var/cache/edb/counter.old
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d "${ROOT}var/cache/edb/dep" ]
-	then
-		install -d -m2755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root:portage ${ROOT}var/cache/edb/dep
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-
-
-	if has ccache $FEATURES && has userpriv $FEATURES; then
-		chown -R portage:portage /var/tmp/ccache &> /dev/null
-		chmod -R g+rws /var/tmp/ccache &>/dev/null
-	fi
-
-
-#
-# Take a shot at fixing the world file...
-# This finds all specific-version ebuilds without modifiers.
-#
-	addwrite ${ROOT}var/cache/edb/
-	python -c "
-import portage
-world = portage.grabfile('${ROOT}var/cache/edb/world')
-newlist = []
-
-for x in world:
-	try:
-		if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)):
-			newlist.append('='+x)
-			continue
-	except:
-		pass
-	newlist.append(x)
-
-if newlist and (len(newlist) == len(world)):
-	myworld=open('${ROOT}var/cache/edb/world','w')
-	for x in newlist:
-		myworld.write(x+'\\n')
-
-	myworld.close()
-
-"
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-}
diff --git a/sys-apps/portage/portage-2.0.51_pre5.ebuild b/sys-apps/portage/portage-2.0.51_pre5.ebuild
deleted file mode 100644
index 50133d3a53f2..000000000000
--- a/sys-apps/portage/portage-2.0.51_pre5.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre5.ebuild,v 1.2 2004/04/26 04:15:25 carpaski Exp $
-
-IUSE="build"
-
-# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
-# cause everything to segfault !!
-export SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${PF}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-
-# Contact carpaski with a reason before you modify any of these.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86"
-
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
-		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
-		make || die
-	fi
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		alpha )
-		newins make.globals.alpha make.globals
-		newins make.conf.alpha make.conf
-		;;
-		arm )
-		newins make.globals.arm make.globals
-		newins make.conf.arm make.conf
-		;;
-		hppa )
-		newins make.globals.hppa make.globals
-		newins make.conf.hppa make.conf
-		;;
-		mips )
-		newins make.globals.mips make.globals
-		newins make.conf.mips make.conf
-		;;
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		sparc )
-		newins make.globals.sparc make.globals
-		newins make.conf.sparc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#This special handling of make.conf is required for catalyst
-	#to function properly.
-	mv ${D}/etc/make.conf ${D}/etc/make.conf.example
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.py ../bin/emergehelp.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-
-	#install sandbox
-	cd ${S}/src/sandbox-1.1
-	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-
-	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
-	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
-	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym ../lib/portage/bin/portageq /usr/bin/portageq
-
-	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
-	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
-	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
-	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
-
-	dosym newins /usr/lib/portage/bin/donewins
-
-	# man pages
-	doman ${S}/man/*.[15]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#disable global sandbox if it's active (it's been deprecated)
-	if [ -f /etc/ld.so.preload ] ; then
-		cp /etc/ld.so.preload ${T}
-		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
-	fi
-
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		rm -rf ${ROOT}/usr/lib/sandbox
-	fi
-
-	#yank old cache files
-	if [ -d /var/cache/edb ]
-	then
-		rm -f /var/cache/edb/xcache.p
-		rm -f /var/cache/edb/mtimes
-	fi
-
-	install -o root -g portage -m 0755 -d "${ROOT}/etc/portage"
-	install -o root -g portage -m 2775 -d "${ROOT}/etc/portage/sets"
-	# u+rwx,g+srwx --- This is a secure directory for temp files.
-
-	install -o root -g portage -m 2770 -d "${ROOT}/var/lib/portage"
-	einfo "Checking ${ROOT}/var/lib/portage for bad/illegal files:"
-	find "${ROOT}/var/lib/portage" ! -gid $(id -g portage) -o -perm -002 -print0 | xargs -0n 500 rm -Rvf
-
-	OLDWORLD="${ROOT}/var/cache/edb/world"
-	NEWWORLD="${ROOT}/var/lib/portage/world"
-
-	if [ ! -L "${OLDWORLD}" ]; then
-		# edb/world is not a symlink
-		if [ -f "${NEWWORLD}" ]; then
-			# portage/world exists
-			if cmp "${OLDWORLD}" "${NEWWORLD}"; then
-				# They are identical. Delete the real file and symlink it.
-				rm "${OLDWORLD}"
-				ln -s "../../../var/lib/portage/world" "${OLDWORLD}"
-				rm /etc/portage/sets/world
-				ln -s "../../../var/lib/portage/world" "/etc/portage/sets/world"
-			else
-				# They don't match. Complain and do nothing.
-				ewarn "A world file exists in both ${ROOT}/var/cache/db/world and"
-				ewarn "in ${ROOT}/etc/portage/sets/world --- you will need to merge these"
-				ewarn "files by hand to ensure that your world is proper. For compatibility"
-				ewarn "the file in /var should be a symlink to the one in /etc."
-			fi
-		else
-			# portage/world does not yet exist.
-			ewarn "Moving world file into ${NEWWORLD}"
-			cp "${OLDWORLD}" "${NEWWORLD}"
-			chown root:portage "${NEWWORLD}"
-			chmod 0660 "${NEWWORLD}"
-			ln -s "../../lib/portage/world" "${OLDWORLD}"
-		fi
-	fi
-
-	if [ ! -f "/etc/portage/package.mask" ]; then
-	  if [ -f "/etc/portage/profiles/package.mask" ]; then
-			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
-			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
-			einfo "a hardlink has been created to the new location if it exists in profiles"
-			einfo "already."
-			echo
-		fi
-	fi
-	echo
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-	ewarn "NOTICE: There have been changes in the location of some internal files"
-	ewarn "        to better match the FHS. The changes do not directly affect users"
-	ewarn "        but please be advised that changing between versions of portage"
-	ewarn "        with and without these changes may introduce some inconsistencies"
-	ewarn "        in package data regarding 'world' and 'virtuals' (provides)."
-	echo
-	einfo "        /var/cache/edb/world has moved to /etc/portage/sets/world"
-	einfo "        /var/cache/edb/virtuals has move to /etc/portage/virtuals"
-	echo
-	ewarn "The virtuals file functionality is being changed. It will contain only"
-	ewarn "user preferences for virtuals and will never be modified by portage."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5 6 7 8 9 10; do
-			echo -ne "\a" ; sleep 0.$(( $RANDOM % 9 + 1)) &>/dev/null ; sleep 0,$(( $RANDOM % 9 + 1)) &>/dev/null
-		done
-		sleep 5
-
-		# Kill the existing counter and generate a new one.
-		echo -n "Recalculating the counter... "
-		mv /var/cache/edb/counter /var/cache/edb/counter.old
-		python -c 'import sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
-		if [ -f /var/cache/edb/counter ] ; then
-			echo "Counter updated successfully."
-			rm -f /var/cache/edb/counter.old
-		else
-			echo "FAILED to update counter."
-			ls -l /var/cache/edb/counter.old
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d "${ROOT}var/cache/edb/dep" ]
-	then
-		install -d -m2755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root:portage ${ROOT}var/cache/edb/dep
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dcdialog.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_anydbm.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_cpickle.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_flat.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_db_template.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage_dep.py')"
-
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/xpak.py')"
-
-
-	if has ccache $FEATURES && has userpriv $FEATURES; then
-		chown -R portage:portage /var/tmp/ccache &> /dev/null
-		chmod -R g+rws /var/tmp/ccache &>/dev/null
-	fi
-
-
-#
-# Take a shot at fixing the world file...
-# This finds all specific-version ebuilds without modifiers.
-#
-	addwrite ${ROOT}var/cache/edb/
-	python -c "
-import portage
-world = portage.grabfile('${ROOT}var/cache/edb/world')
-newlist = []
-
-for x in world:
-	try:
-		if portage.catpkgsplit(x) and (x == portage.dep_getcpv(x)):
-			newlist.append('='+x)
-			continue
-	except:
-		pass
-	newlist.append(x)
-
-if newlist and (len(newlist) == len(world)):
-	myworld=open('${ROOT}var/cache/edb/world','w')
-	for x in newlist:
-		myworld.write(x+'\\n')
-
-	myworld.close()
-
-"
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-}
diff --git a/sys-apps/portage/portage-2.0.51_pre6.ebuild b/sys-apps/portage/portage-2.0.51_pre7.ebuild
index 9031614e984f..1d1058990083 100644
--- a/sys-apps/portage/portage-2.0.51_pre6.ebuild
+++ b/sys-apps/portage/portage-2.0.51_pre7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre6.ebuild,v 1.1 2004/04/26 05:45:44 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre7.ebuild,v 1.1 2004/04/26 17:24:41 carpaski Exp $
 
 IUSE="build"
 
@@ -16,8 +16,8 @@ HOMEPAGE="http://www.gentoo.org"
 
 
 # Contact carpaski with a reason before you modify any of these.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86"
+KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc64  s390  sparc  x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"