Remove old versions.

Package-Manager: portage-2.2.0_alpha81_p16/cvs/Linux i686

4 files changed, 9 insertions, 810 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 16787c004a2d..ed461ba387b9 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.930 2011/12/14 23:43:56 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.931 2011/12/18 18:02:11 zmedico Exp $
+
+  18 Dec 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.40.ebuild,
+  -portage-2.2.0_alpha80.ebuild:
+  Remove old versions.
 
   14 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.10.41.ebuild:
   Remove obsolete elog message about --quiet-build.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ac7c68a0e93b..4acba53af6e8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
-DIST portage-2.1.10.40.tar.bz2 918006 RMD160 27fc9019efbee00a50a35dca0d505380781d0527 SHA1 a816cc4a5d91d2199c4423cfcb31996d9d1ee21f SHA256 b678e016058139f3bd9e0db96267397392c0b9816b732d8edb99494857468121
 DIST portage-2.1.10.41.tar.bz2 920129 RMD160 c0f425eeb78d9e17d1abfd17787d27df72337931 SHA1 3fb7ab592ceb28544b0ca4a9ddcd1298e73eaaa3 SHA256 e29c94fda9bb2eb2eb191df26ea1db7f709db728d6c3844f7b23a3660b7c5bf9
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
@@ -14,21 +13,19 @@ DIST portage-2.2.0_alpha80.tar.bz2 918039 RMD160 95b6182987268266a707e34dae55370
 DIST portage-2.2.0_alpha81.patch.bz2 10884 RMD160 e12fa7d351db2de76923e1e0383d5bb8ae690a8f SHA1 03bc059ec2e50eb0ed890c1d2a999619726f2865 SHA256 383aab0e086e2d748c96d8625e4f4885662ded1c07fa6ae1fff6da261802de20
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11500 RMD160 b1bd438bf34fd97e28a881df86eb5f8e8ee96df9 SHA1 9b9bb0f9d9b0799eee7b0893968b47171a620e0d SHA256 794358ef93f1082061d2dd355cd5e000b7de1e77d6fe56d63019882362812e9c
-EBUILD portage-2.1.10.40.ebuild 12036 RMD160 d57c3f147eba3fb1a0e4bae5357a7496ea2058f7 SHA1 fadf9d2b7f6846e5a4e2e663b443fe8eb45c5427 SHA256 81c8ca2c74cae8bf5b689a1ca7fe9005c72845d1c2afaa475ca7b416af36e498
 EBUILD portage-2.1.10.41.ebuild 11549 RMD160 3dfd2f9dfea824733adf5fe596831fb5e3e2b45f SHA1 8409a814d1869f6f05ef62b676cbc8c4ad1797e1 SHA256 0f4fafa2e7ac3a1a1b20b8f15ecc2836668c30e22cc103536fefa29201f1eaba
 EBUILD portage-2.1.6.13.ebuild 9923 RMD160 d27d0aec5dca631deb00f9dc0d415e5d3b3b8140 SHA1 c88f3873cdb95dea9dc2f66101d43ad370254bf9 SHA256 6b4794c017d59118697193c9cb208285c13eb6bf377eb97546c5c072b7073048
 EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27c1 SHA1 4f6b8bac1f951311382b1c8f92969c71e54fb4f1 SHA256 08a1ef8de3117a1e48d7650cbce7828c8d1e8855ebfb5081b4069086bc189d26
 EBUILD portage-2.1.9.42.ebuild 10122 RMD160 04081079c4b31d0a17fec1baae9707ded83adfd9 SHA1 ad9bcaa30ad2dd93f0b92e61161e9d19fdb5f317 SHA256 29a246ddf895613410c30e9d1f43ee123e852b21b19904dfd053c563648b7cc9
 EBUILD portage-2.2.0_alpha51.ebuild 12569 RMD160 06fd93ba44e0477a2caaead573621adead90db63 SHA1 13c52b8df1b6cb30e8ef8ad1586c16393e515a27 SHA256 58a0b18d8cb971504b34c3666ceb09536ad91bc6f29f6aa02443eaa76f6c0691
-EBUILD portage-2.2.0_alpha80.ebuild 14633 RMD160 432e03cde9acbb79e440d2691d0eee70bc974550 SHA1 1f36c81176f4752d5a00c6013f876b3e6d1772c6 SHA256 87283213b646a308ea376833434a75bd11b672e71a0a41a0cd2de9fbb23639ac
 EBUILD portage-2.2.0_alpha81.ebuild 14633 RMD160 bf8c4325d02c88b142e1663a2e58e11684d338dc SHA1 6afe40ef7e47fa17f5836fd9792920d0496bfb6c SHA256 babe03cfd284767dc702d12097eda7b76f2b92d6b1d61a2bda2e13a643000c1c
 EBUILD portage-9999.ebuild 13804 RMD160 f9e1c039ce1e642705185049d2c5c89ee5865dca SHA1 084aac1916f604214bfcd595dd5375f75960b817 SHA256 6c6d1b2f0aab74434ef8142b41e5b46ef5b35010bd89898590125ebdd1e8e6b0
-MISC ChangeLog 70590 RMD160 730239e67a54913713c763a4233b2a28d11ceb2b SHA1 70fccd07e7c687733c4fc053821b1cedf1edb0c2 SHA256 c0f2df6265e324f1798d1ed71d9acc33f45fab407fa3e0ef7fd4fb3a37d18e01
+MISC ChangeLog 70721 RMD160 75fe561c5c5b777a4347d01b9f7fdb0a92768e30 SHA1 68e647a271e03263db776bc4a37e7b416e75c87c SHA256 3d12b8ec17e5c91b0c1784a19a379a3459fd2879aec6fa94f1b15191fa2298b0
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7pNMMACgkQ/ejvha5XGaPbawCeOTEaVrE7LE/XGMIBCkuFJMNa
-/rUAniaHjDNnnkSTHKnP1MhMC9A1+BCk
-=HlLP
+iEYEARECAAYFAk7uKqkACgkQ/ejvha5XGaNtdgCfY0DnuSxQXAopRG9/tpeUxz26
+2AcAnRRz8anklb0wCg/PEPjt2oZAV9Lh
+=uhTv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.40.ebuild b/sys-apps/portage/portage-2.1.10.40.ebuild
deleted file mode 100644
index d5b1c189f69e..000000000000
--- a/sys-apps/portage/portage-2.1.10.40.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.40.ebuild,v 1.1 2011/12/11 08:44:38 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-	) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=$PV
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example || die
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-	fi
-
-	local x symlinks files
-
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	doman "${S}"/man/*.[0-9]
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-	fi
-
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
-	fi
-
-	if [[ -d ${ROOT}var/log/portage && \
-		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-		has_version '<sys-apps/portage-2.1.10.11' ; then
-		# Initialize permissions for bug #378451 and bug #377177, since older
-		# portage does not create /var/log/portage with the desired default
-		# permissions.
-		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-		chown portage:portage "${ROOT}var/log/portage"
-		chmod g+ws "${ROOT}var/log/portage"
-	fi
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-
-	has_version "<${CATEGORY}/${PN}-2.1.10.34" \
-		&& QUIET_BUILD_WARN=true || QUIET_BUILD_WARN=false
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if $REPO_LAYOUT_CONF_WARN ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	if $QUIET_BUILD_WARN ; then
-		elog
-		echo "NOTE: Beginning with portage-2.1.10.34, the emerge" \
-			"--quiet-build option is enabled by default." \
-			"Set --quiet-build=n in EMERGE_DEFAULT_OPTS if" \
-			"you want to disable it by default. See the emerge(1)" \
-			"man page for more information about this option." \
-			| fmt -w 75 | while read -r ; do elog "$REPLY" ; done
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha80.ebuild b/sys-apps/portage/portage-2.2.0_alpha80.ebuild
deleted file mode 100644
index 37b21008cd3f..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha80.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha80.ebuild,v 1.2 2011/12/11 20:18:53 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=3
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-	) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha80
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		find . -type f -print0 | \
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done
-
-		einfo "Setting SYNC in make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-}
-
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example || die
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-	fi
-
-	local x symlinks files
-
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	doman "${S}"/man/*.[0-9]
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-	fi
-
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$ED" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [ -f "${EROOT}/etc/make.globals" ]; then
-		rm "${EROOT}/etc/make.globals"
-	fi
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
-		&& MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if $WORLD_MIGRATION_UPGRADE ; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${EROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if $NEEDED_REBUILD_UPGRADE ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${EROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-
-	if $REPO_LAYOUT_CONF_WARN ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	if $MINOR_UPGRADE ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}