2.1.2_rc1-r4 revbump. This fixes bugs #153951 and #153980.

(Portage version: 2.1.2_rc1-r4)
 (Signed Manifest commit)

5 files changed, 15 insertions, 451 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bc8d6e01c9e0..cba95426b79f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,9 +17,8 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2_rc1-r1.patch.bz2 2664 RMD160 a2c8a15dcfaca1a40c910c56a5acc7e74bb6146e SHA1 f016e91f1f40cc11b039d404b49750a870e283fb SHA256 5e00b068e94d82e0fdd96c3256d1a67488d11d768e4aaf5d52134b5686519fd9
-DIST portage-2.1.2_rc1-r2.patch.bz2 5310 RMD160 4d8fa4410f9e7d8f6892d047ae3087de45200f48 SHA1 1bb01d606186097cda46f42c446452c284059d48 SHA256 0b96bac2d54c3d1b8b85a98893dec7b6f7dd90dae7a15adb97f6de74362c8ad6
 DIST portage-2.1.2_rc1-r3.patch.bz2 10110 RMD160 7862868e7dd7d118461bc4714c6e83c2167ecc69 SHA1 c9b5c5bd975890923adf934a73257698ed62a617 SHA256 99aa012b7feb47af8ed37e5189728188c715c8405f9d2bd1790cb38fb8ab5699
+DIST portage-2.1.2_rc1-r4.patch.bz2 11084 RMD160 9e1c0faf5211bd73066d69333d8f8c3b99c6df9b SHA1 1b54d798363df9aaa469b68cad5b57bc795e0a2f SHA256 3fde47286877d6418463f2f1dccaed24b34994d19988aba04fdf41ee76ae5734
 DIST portage-2.1.2_rc1.tar.bz2 313134 RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 SHA1 17f6dfb1f01eb53a3d2046dc518373d2a1472bed SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_pre3.tar.bz2 52723 RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d SHA1 abf8f99b684efd3aa5053c6e40ef2a74755a70b6 SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761
@@ -40,22 +39,18 @@ EBUILD portage-2.1.1.ebuild 6243 RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a
 MD5 02773f7cafb9bbb12339af7f5107de87 portage-2.1.1.ebuild 6243
 RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a portage-2.1.1.ebuild 6243
 SHA256 7875f1597c5e75c333ba3323b3ebea38a255426d447aa57cc6c95fd9da30756c portage-2.1.1.ebuild 6243
-EBUILD portage-2.1.2_rc1-r1.ebuild 6179 RMD160 4596042350529dd9cc4ebffcb25ef91645dc7327 SHA1 d3869e4208a94ac4b5bdbe9d00d504a252800a21 SHA256 5b2b19f391c4149e627c8da72d798e9903a3faf677f66325745f531114a78b80
-MD5 71f89785f85fa549987515d0558dabbb portage-2.1.2_rc1-r1.ebuild 6179
-RMD160 4596042350529dd9cc4ebffcb25ef91645dc7327 portage-2.1.2_rc1-r1.ebuild 6179
-SHA256 5b2b19f391c4149e627c8da72d798e9903a3faf677f66325745f531114a78b80 portage-2.1.2_rc1-r1.ebuild 6179
-EBUILD portage-2.1.2_rc1-r2.ebuild 6179 RMD160 c9e1dee3c8fe0731c0e7dbc2275f30d79abf2b89 SHA1 5a0f60314603ab7310ec46972a3d9b9adcee82d3 SHA256 3e0aa5ae1bad77a4a4fe2bd579bee2a7986a2ea18f132de2f9293c9dec867277
-MD5 fb28e2192fb00549a271e64ad7bada0d portage-2.1.2_rc1-r2.ebuild 6179
-RMD160 c9e1dee3c8fe0731c0e7dbc2275f30d79abf2b89 portage-2.1.2_rc1-r2.ebuild 6179
-SHA256 3e0aa5ae1bad77a4a4fe2bd579bee2a7986a2ea18f132de2f9293c9dec867277 portage-2.1.2_rc1-r2.ebuild 6179
 EBUILD portage-2.1.2_rc1-r3.ebuild 6183 RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 SHA1 69161f608558d070bad4ff9e5b4a0f22b173ae71 SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9
 MD5 79b8c7a64af59c763317942d144fd0c6 portage-2.1.2_rc1-r3.ebuild 6183
 RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 portage-2.1.2_rc1-r3.ebuild 6183
 SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9 portage-2.1.2_rc1-r3.ebuild 6183
-MISC ChangeLog 20020 RMD160 bd2899d10bed47e5f1e2358fde691a2c070d9ebe SHA1 2d7b8b54ec366a8580f7e8533a23ff8776956b78 SHA256 ee90899a7a16d9169ce8596182c88a74fab8a7066f49b3165ece932331df101e
-MD5 accd90f4df5776a28935e86de44c5b43 ChangeLog 20020
-RMD160 bd2899d10bed47e5f1e2358fde691a2c070d9ebe ChangeLog 20020
-SHA256 ee90899a7a16d9169ce8596182c88a74fab8a7066f49b3165ece932331df101e ChangeLog 20020
+EBUILD portage-2.1.2_rc1-r4.ebuild 6183 RMD160 34e9d2af2f359a10fcdd23751acfb8cadf67dbf7 SHA1 a6af0d128532cecf17b680a8ba78f12b7c4c8c88 SHA256 4e2e08913d22bd30f0e0cd83b92ebd958d98f58f36d779a6568712c0d486cbb4
+MD5 6b07da3642d4b4b1a63d9c0946d814a6 portage-2.1.2_rc1-r4.ebuild 6183
+RMD160 34e9d2af2f359a10fcdd23751acfb8cadf67dbf7 portage-2.1.2_rc1-r4.ebuild 6183
+SHA256 4e2e08913d22bd30f0e0cd83b92ebd958d98f58f36d779a6568712c0d486cbb4 portage-2.1.2_rc1-r4.ebuild 6183
+MISC ChangeLog 20197 RMD160 147e47137f1ae565e5a1a78470017d93cf20b5d5 SHA1 fca1f6264dc88f1f8b2388b7341547f3cd429dcc SHA256 3ce7e83e72d6c640934ace6f91c6e79f69b27c7e18224964ecea0e5e1993f53a
+MD5 48e3489a1ea1d8f5d96a8d70bd689b6e ChangeLog 20197
+RMD160 147e47137f1ae565e5a1a78470017d93cf20b5d5 ChangeLog 20197
+SHA256 3ce7e83e72d6c640934ace6f91c6e79f69b27c7e18224964ecea0e5e1993f53a ChangeLog 20197
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -72,19 +67,16 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di
 MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021
 RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021
 SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021
-MD5 7500500072f0fef82a11e0d09fc0583b files/digest-portage-2.1.2_rc1-r1 798
-RMD160 69bc0bdc383cedd7c59543f4769aa4666f9fb511 files/digest-portage-2.1.2_rc1-r1 798
-SHA256 f33fc4e39edb942e59da7a25df064ade922a0fae0e22ab06496a2fddc94aeffd files/digest-portage-2.1.2_rc1-r1 798
-MD5 9ab32cf22d6642802f76f3bbc15660d3 files/digest-portage-2.1.2_rc1-r2 798
-RMD160 70e88ddcedc5cf34ba7a5baa3da1271777fd2d58 files/digest-portage-2.1.2_rc1-r2 798
-SHA256 a2c39bd353e4e159c7d34086a23a6e7e7a0616943d57c7f4547c50a66c1681db files/digest-portage-2.1.2_rc1-r2 798
 MD5 c9defdc35913488b9c488a6fa6fcc1c2 files/digest-portage-2.1.2_rc1-r3 801
 RMD160 6a1df826851f59d41ce4963eb9db317d74d7aafc files/digest-portage-2.1.2_rc1-r3 801
 SHA256 a083d2fa28221fb8e4ffe64e8daca7baa5fda6310df2f5fc43c11876d39bf3d7 files/digest-portage-2.1.2_rc1-r3 801
+MD5 54dc5611c9194ff42d6799c353ad6c31 files/digest-portage-2.1.2_rc1-r4 801
+RMD160 ee59924ed547f03c92e050e43c4d12ad604039d9 files/digest-portage-2.1.2_rc1-r4 801
+SHA256 d2c7612c82d26da5691150683db93b3c2a548c9b12896b74f376945968770ed5 files/digest-portage-2.1.2_rc1-r4 801
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFSyBH/ejvha5XGaMRAnfIAJ9rhkcsQYENqXk3B56qE5I+XTEhUQCgvp8b
-Qk4ZQWMcZDPbRsCIxm8lwWI=
-=0fGn
+iD8DBQFFTuYH/ejvha5XGaMRAo7QAJ9DzWPlqwqakd0x5tdBNN9+9bd92ACgkWxB
+jdkw6bP74mBAF6rMG6cmDZY=
+=gyFA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r1 b/sys-apps/portage/files/digest-portage-2.1.2_rc1-r1
deleted file mode 100644
index 02d0841f56c3..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 51259b840b84aaffc36f7befece71274 portage-2.1.2_rc1-r1.patch.bz2 2664
-RMD160 a2c8a15dcfaca1a40c910c56a5acc7e74bb6146e portage-2.1.2_rc1-r1.patch.bz2 2664
-SHA256 5e00b068e94d82e0fdd96c3256d1a67488d11d768e4aaf5d52134b5686519fd9 portage-2.1.2_rc1-r1.patch.bz2 2664
-MD5 218eb9853085ed02f389e73258e7422e portage-2.1.2_rc1.tar.bz2 313134
-RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 portage-2.1.2_rc1.tar.bz2 313134
-SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 portage-2.1.2_rc1.tar.bz2 313134
-MD5 aa8c11d2540016412e9662cfd1fded60 portage-man-pl-2.1.2_pre3.tar.bz2 52723
-RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d portage-man-pl-2.1.2_pre3.tar.bz2 52723
-SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761 portage-man-pl-2.1.2_pre3.tar.bz2 52723
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r2 b/sys-apps/portage/files/digest-portage-2.1.2_rc1-r2
deleted file mode 100644
index cf5201b239c5..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 62765fe4dfd031f7b460c3cfe07274fa portage-2.1.2_rc1-r2.patch.bz2 5310
-RMD160 4d8fa4410f9e7d8f6892d047ae3087de45200f48 portage-2.1.2_rc1-r2.patch.bz2 5310
-SHA256 0b96bac2d54c3d1b8b85a98893dec7b6f7dd90dae7a15adb97f6de74362c8ad6 portage-2.1.2_rc1-r2.patch.bz2 5310
-MD5 218eb9853085ed02f389e73258e7422e portage-2.1.2_rc1.tar.bz2 313134
-RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 portage-2.1.2_rc1.tar.bz2 313134
-SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 portage-2.1.2_rc1.tar.bz2 313134
-MD5 aa8c11d2540016412e9662cfd1fded60 portage-man-pl-2.1.2_pre3.tar.bz2 52723
-RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d portage-man-pl-2.1.2_pre3.tar.bz2 52723
-SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761 portage-man-pl-2.1.2_pre3.tar.bz2 52723
diff --git a/sys-apps/portage/portage-2.1.2_rc1-r1.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r1.ebuild
deleted file mode 100644
index 226802b2e904..000000000000
--- a/sys-apps/portage/portage-2.1.2_rc1-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_rc1-r1.ebuild,v 1.2 2006/11/02 23:59:06 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		!userland_Darwin? ( >=app-shells/bash-3.0 ) )
-	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2_pre3"
-PATCHVER_PL=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER=""
-[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-	SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-	elog ""
-	elog "For help with using portage please consult the Gentoo Handbook"
-	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	elog ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-	fi
-	if [ "${PR}" != "r0" ]; then
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	fi
-	if [ -n "${PATCHVER_PL}" ]; then
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		chmod +x setup.py
-		./setup.py build || die "Failed to install bsd-chflags module"
-	fi
-}
-
-src_install() {
-	local portage_base="/usr/lib/portage"
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf make.globals
-	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
-	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
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		./setup.py install --root "${D}" || \
-			die "Failed to install bsd-chflags module"
-	fi
-
-	dodir ${portage_base}/bin
-	exeinto ${portage_base}/bin
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins ${portage_base}/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py
-	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
-	dodoc "${S}"/NEWS
-	dodoc "${S}"/RELEASE-NOTES
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../lib/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
-		quickpkg
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/lib/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-		done
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-	   [ -f "${ROOT}"/var/cache/edb/world ] &&
-	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-		ln -s ../../lib/portage/world /var/cache/edb/world
-	fi
-
-	for x in "${ROOT}"/etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-	done
-
-	ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
-	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-	ewarn "For more information regarding this change, please refer to bug #148870."
-
-	portage_docs
-}
diff --git a/sys-apps/portage/portage-2.1.2_rc1-r2.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r2.ebuild
deleted file mode 100644
index fa6ae2860226..000000000000
--- a/sys-apps/portage/portage-2.1.2_rc1-r2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_rc1-r2.ebuild,v 1.2 2006/11/02 23:59:06 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5 )"
-RDEPEND=">=dev-lang/python-2.3
-	!build? ( >=sys-apps/sed-4.0.5
-		dev-python/python-fchksum
-		!userland_Darwin? ( >=app-shells/bash-3.0 ) )
-	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	selinux? ( >=dev-python/python-selinux-2.16 )
-	doc? ( app-portage/portage-manpages )
-	>=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2_pre3"
-PATCHVER_PL=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER=""
-[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-	SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-	elog ""
-	elog "For help with using portage please consult the Gentoo Handbook"
-	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	elog ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if [ -n "${PATCHVER}" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-	fi
-	if [ "${PR}" != "r0" ]; then
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	fi
-	if [ -n "${PATCHVER_PL}" ]; then
-		use linguas_pl && \
-			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		chmod +x setup.py
-		./setup.py build || die "Failed to install bsd-chflags module"
-	fi
-}
-
-src_install() {
-	local portage_base="/usr/lib/portage"
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf make.globals
-	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
-	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
-	fi
-
-	if use elibc_FreeBSD; then
-		cd "${S}"/src/bsd-flags
-		./setup.py install --root "${D}" || \
-			die "Failed to install bsd-chflags module"
-	fi
-
-	dodir ${portage_base}/bin
-	exeinto ${portage_base}/bin
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-	fi
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins ${portage_base}/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py
-	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
-	dodoc "${S}"/NEWS
-	dodoc "${S}"/RELEASE-NOTES
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman tbz2tool xpak; do
-		dosym ../lib/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
-		quickpkg
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-	done
-
-	dodir /etc/portage
-	keepdir /etc/portage
-
-	doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-	local portage_base="/usr/lib/portage"
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-		done
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-	   [ -f "${ROOT}"/var/cache/edb/world ] &&
-	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-		ln -s ../../lib/portage/world /var/cache/edb/world
-	fi
-
-	for x in "${ROOT}"/etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-	done
-
-	ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
-	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-	ewarn "For more information regarding this change, please refer to bug #148870."
-
-	portage_docs
-}