New ebuilds. Fixes and -r11 is python2.3 integration work.

13 files changed, 55 insertions, 820 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 233ea2e8c121..c60929126afd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,6 @@
-MD5 274456fad6ff03a43cc9cf0eb52acc6a portage-2.0.49-r10.ebuild 9663
+MD5 0af3407febdabad3e3f8a8bdcc553c4f portage-2.0.49-r10.ebuild 9663
 MD5 75dc69a6278d22bb4bb57e521504900a portage-2.0.48-r5.ebuild 8772
-MD5 e0a9e047fb046bffd93a9aa65cdb7042 portage-2.0.49-r11.ebuild 10058
+MD5 a469078e5356b2bd207c74c4b48c7747 portage-2.0.49-r11.ebuild 10058
 MD5 d30ba0090f191de5923f6e46d2d6fa63 ChangeLog 417
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
 MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r10 b/sys-apps/portage/files/digest-portage-2.0.49-r10
new file mode 100644
index 000000000000..5e837440c0e0
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.49-r10
@@ -0,0 +1 @@
+MD5 e41297f5d421a14e95b8f6795d9aca3e portage-2.0.49-r10.tar.bz2 242454
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r11 b/sys-apps/portage/files/digest-portage-2.0.49-r11
new file mode 100644
index 000000000000..9c297a113921
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.49-r11
@@ -0,0 +1 @@
+MD5 e41297f5d421a14e95b8f6795d9aca3e portage-2.0.49-r11.tar.bz2 242454
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r3 b/sys-apps/portage/files/digest-portage-2.0.49-r3
deleted file mode 100644
index 01aacc0325fa..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0eac435c5d31c2b23945159c874d38d7 portage-2.0.49-r3.tar.bz2 235605
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r6 b/sys-apps/portage/files/digest-portage-2.0.49-r6
deleted file mode 100644
index 4ff7106fcfc3..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55b99a9d36ad736c6a6872874a461796 portage-2.0.49-r6.tar.bz2 231484
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r7 b/sys-apps/portage/files/digest-portage-2.0.49-r7
deleted file mode 100644
index fedbb17ea801..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a0be71d6bb1a3da761a9a9037589313 portage-2.0.49-r7.tar.bz2 231468
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r8 b/sys-apps/portage/files/digest-portage-2.0.49-r8
deleted file mode 100644
index 0e0bea829fdb..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12f264ece92ccfe6f08a6e37fef46afc portage-2.0.49-r8.tar.bz2 242633
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r9 b/sys-apps/portage/files/digest-portage-2.0.49-r9
deleted file mode 100644
index 99af693e84f9..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0a6887737a2e58363b7d40568adce3d portage-2.0.49-r9.tar.bz2 242665
diff --git a/sys-apps/portage/portage-2.0.49-r9.ebuild b/sys-apps/portage/portage-2.0.49-r10.ebuild
index 66e6e5ca3956..29da2186ba25 100644
--- a/sys-apps/portage/portage-2.0.49-r9.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.49-r9.ebuild,v 1.2 2003/10/07 18:17:05 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r10.ebuild,v 1.1 2003/10/08 11:16:54 carpaski Exp $
 
 IUSE="build"
 
@@ -13,8 +13,10 @@ 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"
-#KEYWORDS="alpha ~amd64 arm hppa mips ppc sparc x86"
-KEYWORDS="~alpha -amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ia64"
+
+#KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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.49-r8.ebuild b/sys-apps/portage/portage-2.0.49-r11.ebuild
index 4cc9c9fa4158..729e68072ac5 100644
--- a/sys-apps/portage/portage-2.0.49-r8.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.49-r8.ebuild,v 1.1 2003/10/06 10:02:06 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r11.ebuild,v 1.1 2003/10/08 11:16:54 carpaski Exp $
 
 IUSE="build"
 
@@ -13,11 +13,24 @@ 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"
-#KEYWORDS="alpha ~amd64 arm hppa mips ppc sparc x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ia64"
+
+# Contact carpaski a reason before you modify any of these.
+#KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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 )"
 
+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}/pym
@@ -70,20 +83,22 @@ src_install() {
 	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
 
 	doins etc-update.conf dispatch-conf.conf
+
+
 	#python modules
 	cd ${S}/src/python-missingos
 	chmod +x setup.py
 	./setup.py install --root ${D} || die
+
+
+	dodir /usr/lib/portage/pym
 	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py cvstree.py getbinpkg.py dispatch_conf.py
+	doins *.py
 
 
 	#binaries, libraries and scripts
 	dodir /usr/lib/portage/bin
 	cd ${S}/bin
-	doins emergehelp.py               # XXX: Needs to get cleaned up.
-	                                  #      Goes into site-packages.
 	exeinto /usr/lib/portage/bin
 	doexe *
 	dosym emake /usr/lib/portage/bin/pmake
@@ -218,10 +233,10 @@ pkg_postinst() {
 			for x in *
 			do
 				[ ! -d "$x" ] && continue
-				#go into each category directory so we don't overload the python2.2 command-line
+				#go into each category directory so we don't overload the python command-line
 				cd $x
 				#fix silly output from this command (hack)
-				python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
+				python ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
 			cd ..
 			done
 			echo ">>> Database upgrade complete."
@@ -232,28 +247,38 @@ pkg_postinst() {
 		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/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]
+
+	# Old place of install
+	rm -f ${ROOT}usr/lib/portage/pym/portage.py[co]
+	rm -f ${ROOT}usr/lib/portage/pym/output.py[co]
+	rm -f ${ROOT}usr/lib/portage/pym/cvstree.py[co]
+	rm -f ${ROOT}usr/lib/portage/pym/getbinpkg.py[co]
+	rm -f ${ROOT}usr/lib/portage/pym/emergehelp.py[co]
+	rm -f ${ROOT}usr/lib/portage/pym/dispatch_conf.py[co]
+
 	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
 	chown -R root.wheel ${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/python2.2/site-packages/portage.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/portage.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/output.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/cvstree.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/getbinpkg.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/dispatch_conf.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/pym/emergehelp.py')" || die
 
 	if has ccache $FEATURES && has userpriv $FEATURES; then
 		chown -R portage:portage /var/tmp/ccache &> /dev/null
@@ -261,4 +286,3 @@ pkg_postinst() {
 	fi
 }
 
-
diff --git a/sys-apps/portage/portage-2.0.49-r3.ebuild b/sys-apps/portage/portage-2.0.49-r3.ebuild
deleted file mode 100644
index a00caee7c206..000000000000
--- a/sys-apps/portage/portage-2.0.49-r3.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2003 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.49-r3.ebuild,v 1.2 2003/09/10 04:48:34 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"
-KEYWORDS="alpha ~amd64 arm hppa mips ppc sparc x86"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/pym
-}
-
-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
-	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
-
-	doins etc-update.conf dispatch-conf.conf
-	#python modules
-	cd ${S}/src/python-missingos
-	chmod +x setup.py
-	./setup.py install --root ${D} || die
-	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py cvstree.py getbinpkg.py dispatch_conf.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 DESTDIR=${D} install || die
-
-	#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_postinst() {
-	local x
-
-	#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
-	eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables"
-	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
-	echo
-	einfo "Feature additions are noted in help and make.conf descriptions. Update"
-	einfo "them using 'etc-update' please. Maintaining current configs for portage"
-	einfo "and other system packages is fairly important for the continued health"
-	einfo "of your system."
-	echo
-	if [ -z "$PORTAGE_TEST" ]; then
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		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 portage; portage.counter_tick_core("/")' &>/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
-
-		# Changes in the size of auxdbkeys can cause aux_get() problems.
-		echo -n ">>> Clearing invalid entries in dependancy cache..."
-		cd ${ROOT}var/cache/edb/dep
-		# 2>&1 >/dev/null <---- Kills stdout, replaces it with stderr
-		AUXDBKEYLEN="$(python -c 'import portage,sys; sys.stderr.write(str(len(portage.auxdbkeys)))' 2>&1 >/dev/null)"
-		find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f
-		echo " ...done!"
-	fi # PORTAGE_TESTING
-
-	#fix cache (could contain staleness)
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		#upgrade /var/db/pkg library; conditional required for build image creation
-		if [ -d ${ROOT}var/db/pkg ]
-		then
-			echo ">>> Database upgrade..."
-			cd ${ROOT}var/db/pkg
-			for x in *
-			do
-				[ ! -d "$x" ] && continue
-				#go into each category directory so we don't overload the python2.2 command-line
-				cd $x
-				#fix silly output from this command (hack)
-				python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
-			cd ..
-			done
-			echo ">>> Database upgrade complete."
-			#remove old virtual directory to prevent virtual deps from getting messed-up
-			[ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual
-		fi
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.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]
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root.wheel ${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/python2.2/site-packages/portage.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-
-	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
-}
-
-
diff --git a/sys-apps/portage/portage-2.0.49-r6.ebuild b/sys-apps/portage/portage-2.0.49-r6.ebuild
deleted file mode 100644
index 9009741ec21c..000000000000
--- a/sys-apps/portage/portage-2.0.49-r6.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2003 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.49-r6.ebuild,v 1.1 2003/09/23 22:11:50 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"
-#KEYWORDS="alpha ~amd64 arm hppa mips ppc sparc x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ia64"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/pym
-}
-
-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
-	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
-
-	doins etc-update.conf dispatch-conf.conf
-	#python modules
-	cd ${S}/src/python-missingos
-	chmod +x setup.py
-	./setup.py install --root ${D} || die
-	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py cvstree.py getbinpkg.py dispatch_conf.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 DESTDIR=${D} install || die
-
-	#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_postinst() {
-	local x
-
-	#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
-	eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables"
-	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
-	echo
-	einfo "Feature additions are noted in help and make.conf descriptions. Update"
-	einfo "them using 'etc-update' please. Maintaining current configs for portage"
-	einfo "and other system packages is fairly important for the continued health"
-	einfo "of your system."
-	echo
-	if [ -z "$PORTAGE_TEST" ]; then
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		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 portage; portage.counter_tick_core("/")' &>/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
-
-		# Changes in the size of auxdbkeys can cause aux_get() problems.
-		echo -n ">>> Clearing invalid entries in dependancy cache..."
-		cd ${ROOT}var/cache/edb/dep
-		# 2>&1 >/dev/null <---- Kills stdout, replaces it with stderr
-		AUXDBKEYLEN="$(python -c 'import portage,sys; sys.stderr.write(str(len(portage.auxdbkeys)))' 2>&1 >/dev/null)"
-		find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f
-		echo " ...done!"
-	fi # PORTAGE_TESTING
-
-	#fix cache (could contain staleness)
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		#upgrade /var/db/pkg library; conditional required for build image creation
-		if [ -d ${ROOT}var/db/pkg ]
-		then
-			echo ">>> Database upgrade..."
-			cd ${ROOT}var/db/pkg
-			for x in *
-			do
-				[ ! -d "$x" ] && continue
-				#go into each category directory so we don't overload the python2.2 command-line
-				cd $x
-				#fix silly output from this command (hack)
-				python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
-			cd ..
-			done
-			echo ">>> Database upgrade complete."
-			#remove old virtual directory to prevent virtual deps from getting messed-up
-			[ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual
-		fi
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.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]
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root.wheel ${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/python2.2/site-packages/portage.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-
-	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
-}
-
-
diff --git a/sys-apps/portage/portage-2.0.49-r7.ebuild b/sys-apps/portage/portage-2.0.49-r7.ebuild
deleted file mode 100644
index 068fc7c1572d..000000000000
--- a/sys-apps/portage/portage-2.0.49-r7.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2003 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.49-r7.ebuild,v 1.1 2003/09/26 14:39:30 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"
-#KEYWORDS="alpha ~amd64 arm hppa mips ppc sparc x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ia64"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/pym
-}
-
-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
-	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
-
-	doins etc-update.conf dispatch-conf.conf
-	#python modules
-	cd ${S}/src/python-missingos
-	chmod +x setup.py
-	./setup.py install --root ${D} || die
-	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py cvstree.py getbinpkg.py dispatch_conf.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	doins emergehelp.py               # XXX: Needs to get cleaned up.
-	                                  #      Goes into site-packages.
-	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 DESTDIR=${D} install || die
-
-	#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_postinst() {
-	local x
-
-	#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
-	eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables"
-	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
-	echo
-	einfo "Feature additions are noted in help and make.conf descriptions. Update"
-	einfo "them using 'etc-update' please. Maintaining current configs for portage"
-	einfo "and other system packages is fairly important for the continued health"
-	einfo "of your system."
-	echo
-	if [ -z "$PORTAGE_TEST" ]; then
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-		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 portage; portage.counter_tick_core("/")' &>/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
-
-		# Changes in the size of auxdbkeys can cause aux_get() problems.
-		echo -n ">>> Clearing invalid entries in dependancy cache..."
-		cd ${ROOT}var/cache/edb/dep
-		# 2>&1 >/dev/null <---- Kills stdout, replaces it with stderr
-		AUXDBKEYLEN="$(python -c 'import portage,sys; sys.stderr.write(str(len(portage.auxdbkeys)))' 2>&1 >/dev/null)"
-		find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f
-		echo " ...done!"
-	fi # PORTAGE_TESTING
-
-	#fix cache (could contain staleness)
-	if [ ! -d ${ROOT}var/cache/edb/dep ]
-	then
-		#upgrade /var/db/pkg library; conditional required for build image creation
-		if [ -d ${ROOT}var/db/pkg ]
-		then
-			echo ">>> Database upgrade..."
-			cd ${ROOT}var/db/pkg
-			for x in *
-			do
-				[ ! -d "$x" ] && continue
-				#go into each category directory so we don't overload the python2.2 command-line
-				cd $x
-				#fix silly output from this command (hack)
-				python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
-			cd ..
-			done
-			echo ">>> Database upgrade complete."
-			#remove old virtual directory to prevent virtual deps from getting messed-up
-			[ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual
-		fi
-		install -d -m0755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.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]
-	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
-	chown -R root.wheel ${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/python2.2/site-packages/portage.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
-	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
-
-	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
-}
-
-