Remove old versions.

Package-Manager: portage-2.2.0_alpha141_p4/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 9 insertions, 635 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index acb60f42a8c2..7d1f4abce34f 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1128 2012/10/18 07:00:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1129 2012/10/24 19:19:03 zmedico Exp $
+
+  24 Oct 2012; Zac Medico <zmedico@gentoo.org> -portage-2.1.11.29.ebuild,
+  -portage-2.2.0_alpha140.ebuild:
+  Remove old versions.
 
 *portage-2.2.0_alpha141 (18 Oct 2012)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8c842e2cfade..0c1d8deafd6d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.1.11.29.tar.bz2 847598 SHA256 8bd95a4a91f79190e09f9c56ef538b63d7a14b7837575bc433723e67b603fe61 SHA512 c1132af4c1ff39190b8b7b8c4453bbca3b2fc3e1c9d9df49a7149f417baa197780c26070541d6f124f07e49d9cf077af17567bb585ab22e906f0e4f1f33bd5b4 WHIRLPOOL 44d097026db7e57d4cf022a6fb9685f96428a962e43b0a1ae09903d2c7eb3fcedb2435c1f428c0b615a99207e16968b8520d7871077908b175c3643f8431e9fc
 DIST portage-2.1.11.30.tar.bz2 848792 SHA256 0144882d8acfe82cf4f7bee83731d37b5c019f2701db81797c95e1bc4ed71b56 SHA512 faaaf92c61a22bdffc18f69d79b663573b8bfdae0f898e7e79c64a30066de1839e4941a239740eb0166d2ddb6249e33290fe423a2875d9269f728e9f6475e859 WHIRLPOOL 76941309624e1439a9126baefba0ecafa57f50690a3162fd8d90425737190ae2f093919db8e91bccc35d94709850189d02047afbd397d650e50712739f9899ec
 DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
@@ -11,23 +10,20 @@ DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b232
 DIST portage-2.2.0_alpha111.tar.bz2 836193 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df SHA512 b1dfee2c1869cf30ac50c5ecaa603571bd7c71879d5e9fae80b89602b5d7e3016636703ffc7aec384e7d93356c93415200609dcd2f0f9f74a56ca0364144c120 WHIRLPOOL e7a5cea176b66f632388920bf8e1635b2ec8b7ce70f9aedea2289cdc6a7d560e6b0e6f3a7f3636217539d4883857aa84bb85e3b146e749600d57435f613b60a8
 DIST portage-2.2.0_alpha120.patch.bz2 33973 SHA256 24a5447e9af37013e30c3372e3eef799e1de17884f6328f08396e8f50c9527d1 SHA512 397114af03680734ba95de42087ead7b8cb122c4952407fb0b0c86c510c65be487d0578a3e5052f8c03c0ed9487b6f8138a4d6fb54b9025c16bd393800b67b59 WHIRLPOOL 440e5796f53be19b4a3af8dacfba576b8bd3cf7fa01bfe1b5d0f1af8fb15fb9daa8efe5d9d909d37712c7a381c3811a8dc213106f19cb87fad3faec75c4c8e9d
 DIST portage-2.2.0_alpha135.tar.bz2 837081 SHA256 2b5fad75d428b9529e97d0484204bf0079b458ff63d8f2008dcdd5585595ffb2 SHA512 ee4bce1dbdb044214d5a660c5d60f5a2ada14b03ca7cc257b9c1f7bc645ddb4c8bd51afd2d58babc0515ac149f4c5b6f5548ed00dec5ffb5a52628031cfc07fe WHIRLPOOL 583021917dcbf19ccb95afc59d9e4687f1d5635f333cf2ffdac0528cc70832d35509a82fc709462d4f7ca89712ceb6931728589eed6a4f1c4983d5cecaaaf601
-DIST portage-2.2.0_alpha140.patch.bz2 52053 SHA256 cb598b3f4f132a204be84b46d14ba8c2e3c5e8a79569b7f3dae902791f7e550c SHA512 67d9db23ca704cd0a9c663351655f8900fbffbeaa7cabfebd088f1c3ee7e81c6b5ddb3a70567a5dc6fc8f68eac6a99a5dc44547f188d05622e9e1084c2d6b1ce WHIRLPOOL fd646e39a31163994fa619d5645643c5dde314e4b1fb90b1b98ccb8654fba610cdd50ce511f4557b4762da1a00ad706753ad8f25166c3381d5e41668618c3860
 DIST portage-2.2.0_alpha141.patch.bz2 61026 SHA256 b3bba4166c79961e04b589a92ff0edd93dffd7c5fe157c359b792a7ec60859ab SHA512 b2881148cbdd162049bd824f31502471c2f09a13e824deb2d229bbaf1f0d73c0d997df9c6439f398a2ac73926cfaec625155e0ccc6e024833c4d0a06d8b9340d WHIRLPOOL 831bbd364f45dd9f9fa60e0df611d80c9bd23314a8b05b652e0091fd25279ea16b9f108e00fec7aed39f86ab1374e6ec6a6cbf534f8ae23d40e47727554962a0
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
-EBUILD portage-2.1.11.29.ebuild 9793 SHA256 a0f649ff4c74ec0e0c3856e68db16e47994988230ecc15101ab1da1615b2d696 SHA512 da11dc4c4e020bca1b2356843d3b0ab0f01c39bcb1a0eb2a21cd99d8d9f8731a27e955dd2135ccb7db43ea8d1aa25b76eab569b9eed0d22f303379eaf7a5c765 WHIRLPOOL c05d38cf18eb1c8dc4c7e658bebe9a8d763f8ca7daa15afd60c8099f6a2370a6943098526769be01d266404e2a4405c922804a81240f839d7d408b90acae1bd6
 EBUILD portage-2.1.11.30.ebuild 9793 SHA256 79d8e9c2e0bd5fd97d04f603df671c0139a82db1ce596fa236e63f16b9c507cd SHA512 1da07a9d52204fbcd6b96d9d1cf2db6a7e301c5946ff923f817496389d6a3b0be308424f7140c5b288cd512ca6a3d41ad255a883e47db05caa587fdd414ff7a2 WHIRLPOOL 3333f65492e21ab7d3af1aad8a74c3551443ea5694cd4f67d61c4c2c81ff4c810d725f4d69fe23e5286626f592fb1793e56f52eb819e564eedf13c9024f9565f
 EBUILD portage-2.1.11.9.ebuild 9833 SHA256 4b4e3df3e35a4cfba3fd3134d1dc16514e382af4474a42c925fae058440c197c SHA512 9cc3b74e87904575b7646cc1de33cadb249d7b1b03d6e3dda94a347c2ed27291d217ebcb4410cd520551289830d69c8a80a2a9a739c883a11cc9e8693f5c8335 WHIRLPOOL 4031694d504fa820b9470204d6d3297de7e98c5a6b087967977db0190326c0b6d52d611af4f3086f66a04eafa08edd277c259e4257d2ce7997a704533359c44f
 EBUILD portage-2.1.6.7_p1.ebuild 8392 SHA256 75dfa3bdb1100ca28ba46eb83e34ffc196cb3e57204e7b4f451cfb19a1644e62 SHA512 ac70b4ba9d658c4d79953088b2fdaeed8d0e31986ff7c649272c39a743ddfdf112e44d3f0f8078941c47a06b373002cfcd454100585d5bbaa807a2079b19eb8c WHIRLPOOL 57c26b40de86f3d6969fe66d5b1fd6df55f5478e03c855813ff83b1e485f99d1b34cbf30422b5b60986263cae4d4ee066daaa01c0166a04f53c7bb829fd214e1
 EBUILD portage-2.2.0_alpha120.ebuild 11951 SHA256 9530b793174de796ecf951a2808cb163005b605630b0455c57194e97f2a36dd2 SHA512 f6af265d8d9b1cbf884787105abb32335727c179d904fbdecba598878083f7384088a5db063aee4282afd4daa4d20f02466911d6c5625bf538c7cdb437026866 WHIRLPOOL 93daa1caa5b31023b1fbb11e8baabf1abced715c879acdc1bb578f75dc58d3737e23bba2c9fa3bd69702810640e47a1debbf3464d16db7a6f68a3d37799b3b76
-EBUILD portage-2.2.0_alpha140.ebuild 11895 SHA256 d84c0c4939f35783aaf7ccda7857b00c269990c35e44c1d4b494d7aef01759be SHA512 2efd9827f8e945fba2a9b624be7b901bf45a6aeb2108c85a1c2658cf82d72f26cb6d2f8226a817b7b2e249c2160b5707624117c6e6fd1a4b8f4feee3b4f3bfe1 WHIRLPOOL e7c29e71157b88fef002f6d1d7abc39a09f4ce64d4d384d45a89d55595c879aae89d6cd32679863e3aaac28869ee0d6c0af2f372a72f6d97ad20ec21e770784f
 EBUILD portage-2.2.0_alpha141.ebuild 11895 SHA256 a99b4eec8ad7f5a1f11c08b7382f3f1486afb57313a867ff91f211f2ccfc1a48 SHA512 565cd3da60169fc24a0f8572fb9a20b95ef8a70ecc8970d4209477a2dbe03eced5a9ded565bf61fb34bfeeafca86c948f67df107cd7fb507ca5d229654453c99 WHIRLPOOL 3a19d63ce14d2f73db198dc045b160bee2826f4c61d9a7900c007d0f80674a1d8309aac0004d9e13480106b130a72e272aa5274164beac130fca157112b21920
 EBUILD portage-9999.ebuild 11145 SHA256 959e0a67b6c2d5398a961e9b63a37e47ec57e648b4ec0abce653e5f63bf8c448 SHA512 4977bce3b1ecc068125b8b076e265820aa1f12e52bcd129eb9e8a698b9ad4ee0d688c448edfb78b73367e89dd1ed2ad296466bf008843d4cfe13513c66c689c9 WHIRLPOOL 40f322b179564c36844cb54d167746a0f81de32dd5dcda2242cc6421a1e25a5a4f0fe17328f7734dd64032749fabed2d985b1a0c74e58972d1c3a43475a52d0b
-MISC ChangeLog 125892 SHA256 eb4f90f46f8b5939dea2c4b2326cf79d1f2f4ff80b5ddd8a00b83f0e17223e5c SHA512 b6ca51573cd17a94a2eafb496a05f6d1d2ff94481775286f2cda49ae43499d26135fff4ecdfa53fb5d2ffd11e3536a5b0cc83e259cf60ec42fb39fd4126b838e WHIRLPOOL e02465aef494880f01cd832e339ee88e823144fd68f08d6a3d4f9bcc30a635c804cf198b557ccfaa77ca5e67d2cce2ad7dae8a0a079b1fa1d097fa6da96630ba
+MISC ChangeLog 126024 SHA256 ecca0f2046ccd724c6e2309e4f0150ecbaf48889bd12461a6f65b4c9bb6c00c8 SHA512 600092848adc3b2935a4a9746aa693cb439e9aae2d16b7d764e4ec91b05337e616a3fb3f196de8bdfeff925b7e7b2b2fec3b7d5e44a3857281da7de9cbb0c01d WHIRLPOOL dd60a1f14f618e634207fbfe4892e01a439d301a56de5243af1fe7f98346a5aa8863ae93368cf2da2ac4db1914fa089f751d22118ea0c7605fdd0bf215e56184
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB/qP0ACgkQ/ejvha5XGaPomwCg1Y9aaWqNOVpmx2RIH55fhlSt
-HrYAoNKVn011wQ8dYDe7xbO6gtyK/MEt
-=S3+8
+iEYEAREIAAYFAlCIPyoACgkQ/ejvha5XGaPhqgCggMx1UqE5RDAC1QifIWe3Fzhz
+6BMAn2LDuO29Eijc51V7AYgeacEBlWwc
+=QDm6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.29.ebuild b/sys-apps/portage/portage-2.1.11.29.ebuild
deleted file mode 100644
index 4efdc7ce4586..000000000000
--- a/sys-apps/portage/portage-2.1.11.29.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.29.ebuild,v 1.1 2012/10/17 04:33:14 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 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 pypy1_9 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_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	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.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	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=$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 ]]
-}
-
-current_python_has_xattr() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	/usr/bin/python -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	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 pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_9 && ! 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
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
-	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 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	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 ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	emake test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		sysconfdir="/etc" \
-		prefix="/usr" \
-		install || die
-
-	# Extended set config is currently disabled in portage-2.1.x.
-	rm -rf "${D}/usr/share/portage/config/sets" || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage" || die
-}
-
-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 xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	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 [[ -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
-
-	if has_version '<sys-apps/portage-2.1.10.61' ; then
-		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
-		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
-		ewarn "files that have not been modified since they were installed."
-	fi
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha140.ebuild b/sys-apps/portage/portage-2.2.0_alpha140.ebuild
deleted file mode 100644
index 39f18f5e5108..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha140.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2012 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_alpha140.ebuild,v 1.1 2012/10/17 04:34:22 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 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="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_9 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_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy1_9? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	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.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	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_alpha135
-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() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	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 pypy1_9 && use python3 ; then
-		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_9 && use python2 ; then
-		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_9 && ! 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
-	elif use pypy1_9; then
-		python_set_active_version 2.7-pypy-1.9
-	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 .
-	elif use pypy1_9; then
-		einfo "Converting shebangs for pypy-c1.9..."
-		python_convert_shebangs -r 2.7-pypy-1.9 .
-	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 "Adjusting make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-			-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
-
-	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
-		|| die "failed to append to make.globals"
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	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 ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	emake test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/etc" \
-		prefix="${EPREFIX}/usr" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage" || die
-}
-
-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 xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	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
-
-	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
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-
-	if $WORLD_MIGRATION_UPGRADE && \
-		grep -q "^@" "${EROOT}/var/lib/portage/world"; 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
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
-}