tuple fixes, multiple overlays, 2.0.48-r3

11 files changed, 6 insertions, 756 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 81c14a443e15..2ad696f31c29 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,5 @@
 MD5 5fcbc3de6bcdc83b48ac01bb1d1d58cf portage-2.0.48-r1.ebuild 9132
-MD5 37c87eff9ec399a1d1218329d9788f63 portage-2.0.48-r3.ebuild 9169
+MD5 6b0a70b3fb889be81ae0a165acc4cd94 portage-2.0.48-r3.ebuild 9172
 MD5 30286e3aa7a1e245e2a6ddaa35a090c5 ChangeLog 409
 MD5 beeeafc0d6a7b83077f4edb470975716 files/digest-portage-2.0.48-r1 70
 MD5 77f0e38b4ba03013c461b9bbd6e47ed0 files/digest-portage-2.0.48-r3 70
diff --git a/sys-apps/portage/files/digest-portage-2.0.47-r10 b/sys-apps/portage/files/digest-portage-2.0.47-r10
deleted file mode 100644
index 6397a2c86412..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.47-r10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4eca74ff665b5a33d654af5b055a74a4 portage-2.0.47-r10.tar.bz2 180282
diff --git a/sys-apps/portage/files/digest-portage-2.0.48 b/sys-apps/portage/files/digest-portage-2.0.48
deleted file mode 100644
index 08f76063eb45..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.48
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ec22945b6c5849f05be44921790edb5 portage-2.0.48.tar.bz2 194274
diff --git a/sys-apps/portage/files/digest-portage-2.0.48-r2 b/sys-apps/portage/files/digest-portage-2.0.48-r2
deleted file mode 100644
index 05aedde9ddf4..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.48-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e31ece65fd8f6ded929c3412bccec5d4 portage-2.0.48-r2.tar.bz2 206743
diff --git a/sys-apps/portage/files/digest-portage-2.0.48-r3 b/sys-apps/portage/files/digest-portage-2.0.48-r3
new file mode 100644
index 000000000000..4bc647904285
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.48-r3
@@ -0,0 +1 @@
+MD5 66f09fd1a4c730f18429aa609837fb99 portage-2.0.48-r3.tar.bz2 223325
diff --git a/sys-apps/portage/files/digest-portage-2.0.48_pre6 b/sys-apps/portage/files/digest-portage-2.0.48_pre6
deleted file mode 100644
index 3bb92e851fe8..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.48_pre6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e212ebfa0c59b5d40197163f016aa471 portage-2.0.48_pre6.tar.bz2 192877
diff --git a/sys-apps/portage/files/output.py.diff.gz b/sys-apps/portage/files/output.py.diff.gz
deleted file mode 100644
index f539c1df5f65..000000000000
--- a/sys-apps/portage/files/output.py.diff.gz
+++ /dev/null
diff --git a/sys-apps/portage/portage-2.0.47-r10.ebuild b/sys-apps/portage/portage-2.0.47-r10.ebuild
deleted file mode 100644
index 33c4ece63f2b..000000000000
--- a/sys-apps/portage/portage-2.0.47-r10.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r10.ebuild,v 1.12 2003/06/22 05:25:36 seemant 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="x86 amd64"
-#KEYWORDS="x86 amd64"
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
-
-src_unpack() {
-	cd ${WORKDIR}
-	echo tar xjf ${DISTDIR}/${PF}.tar.bz2
-	tar xjf ${DISTDIR}/${PF}.tar.bz2 || die "No portage tarball in distfiles."
-}
-
-src_compile() {
-	cd ${S}/src; 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
-}
-
-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
-
-
-	#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 /usr/lib/portage/bin/portage-maintain /usr/sbin/portage-maintain
-	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/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 ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-
-	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
-
-	echo
-	einfo "NOTICE: PLEASE update your make.globals. All user changes to variables"
-	einfo "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
-	echo
-	einfo "NOTICE: The wheel group requirement for non-root users has been changed to"
-	einfo "group portage. Group portage must be a valid group for user to use portage."
-	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
-	einfo "A worldfile rebuilding script is available to regenerate entries that"
-	einfo "should be in your worldfile but were removed by a recently discovered"
-	einfo "'-e bug' or if you deleted it: run 'regenworld' as root."
-	echo
-	einfo "The 2.0.47 line of portages contains an optional userpriv mode that"
-	einfo "enables portage to drop root privleges and run as a normal user. It is"
-	einfo "enabled via FEATURES by adding userpriv."
-	echo
-	einfo "Please 'emerge sync' after merging portage to update some permissions."
-	echo
-	if [ -z "$PORTAGE_TEST" ]; then
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		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 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]
-	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/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 &>/dev/null && has userpriv $FEATURES &>/dev/null; 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.48-r2.ebuild b/sys-apps/portage/portage-2.0.48-r2.ebuild
deleted file mode 100644
index 375828776e56..000000000000
--- a/sys-apps/portage/portage-2.0.48-r2.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r2.ebuild,v 1.1 2003/06/30 06:54:22 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 arm hppa mips ppc sparc x86"
-#KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/pym
-}
-
-src_compile() {
-	cd ${S}/src; 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
-
-
-	#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/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 ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-
-	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
-
-	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
-	eerror "NOTICE: The wheel group requirement for non-root users has been changed to"
-	eerror "group portage. Group portage must be a valid group for user to use portage."
-	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
-	einfo "A worldfile rebuilding script is available to regenerate entries that"
-	einfo "should be in your worldfile but were removed by a recently discovered"
-	einfo "'-e bug' or if you deleted it: run 'regenworld' as root."
-	echo
-	eerror "The late 2.0.48 portages contains Manifest files which contain all"
-	eerror "the files and ebuilds used, not just the archives extracted. This is to"
-	eerror "help discovering corruption and increasing security and should require"
-	eerror "no extra work from end-users. If portage reports a bad file that is not"
-	eerror "in the distfiles directory, after you've deleted it an re-sync'd, report it."
-	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/emergehelp.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 -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.48.ebuild b/sys-apps/portage/portage-2.0.48-r3.ebuild
index 32d5c61fcb27..837970b6bd3c 100644
--- a/sys-apps/portage/portage-2.0.48.ebuild
+++ b/sys-apps/portage/portage-2.0.48-r3.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48.ebuild,v 1.9 2003/06/22 05:25:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r3.ebuild,v 1.1 2003/07/02 03:59:30 carpaski Exp $
 
 IUSE="build"
 
@@ -12,10 +12,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="x86 amd64"
-#KEYWORDS="x86 amd64"
+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 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
+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 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/portage/portage-2.0.48_pre6.ebuild b/sys-apps/portage/portage-2.0.48_pre6.ebuild
deleted file mode 100644
index 7d0d32be10a9..000000000000
--- a/sys-apps/portage/portage-2.0.48_pre6.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48_pre6.ebuild,v 1.5 2003/06/22 05:25:36 seemant 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="x86 amd64"
-KEYWORDS="x86 amd64"
-LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
-
-src_compile() {
-	cd ${S}/src; 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
-
-
-	#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/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 ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
-
-	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
-
-	echo
-	eerror "NOTICE: PLEASE update your make.globals. All user changes to variables"
-	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
-	echo
-	eerror "NOTICE: The wheel group requirement for non-root users has been changed to"
-	eerror "group portage. Group portage must be a valid group for user to use portage."
-	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
-	einfo "A worldfile rebuilding script is available to regenerate entries that"
-	einfo "should be in your worldfile but were removed by a recently discovered"
-	einfo "'-e bug' or if you deleted it: run 'regenworld' as root."
-	echo
-	eerror "The late 2.0.47 portages contains enhanced digests which contain all"
-	eerror "the files and ebuilds used, not just the archives extracted. This is to"
-	eerror "help discovering corruption and increasing security and should require"
-	eerror "no extra work from end-users. If portage reports a bad file that is not"
-	eerror "in the distfiles directory, after you've deleted it an re-sync'd, report it."
-	echo
-	if [ -z $PORTAGE_TEST ]; then
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; 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/emergehelp.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 -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
-}
-
-