2.1.1_pre3-r5 release. This fixes bugs #116955, #126748, and #141643.

(Portage version: 2.1.1_pre3-r5)
 (Signed Manifest commit)

6 files changed, 15 insertions, 476 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1fe45db93277..3e7a54f3f247 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,10 +9,6 @@ AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579
 SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579
-AUX 2.1.1_pre3-r3-fixes.patch 1131 RMD160 6c57ebfad97ce8eedcfade09fddb34fb6d3432b5 SHA1 8970cef6153474eb492d559903aa30e04745f002 SHA256 ad53abf35190e25dad135bcfe1bb8ef575cc6dfea62fe9e32404368525badb94
-MD5 64f9bc5ed596e40881144987e53c92f6 files/2.1.1_pre3-r3-fixes.patch 1131
-RMD160 6c57ebfad97ce8eedcfade09fddb34fb6d3432b5 files/2.1.1_pre3-r3-fixes.patch 1131
-SHA256 ad53abf35190e25dad135bcfe1bb8ef575cc6dfea62fe9e32404368525badb94 files/2.1.1_pre3-r3-fixes.patch 1131
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
@@ -20,9 +16,8 @@ SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/RE
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b SHA1 0559bf8068976c124f0026ab65f3f4a62ae39d83 SHA256 69075ab4599958c4f7c7a932b95dcd77efa1b3c46ac28acb577284bc48a1db06
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
-DIST portage-2.1.1_pre3-r1.patch.bz2 6443 RMD160 bc9e6e807b17e0c773040f0eb5a8c3753a52a40d SHA1 83fb84dfd890a95687fc27b0212bc03b6b9b6135 SHA256 ed1090437786c53d26f338e22ff32bfbc84bd04b1883fa03ce2afdd099f40dc2
-DIST portage-2.1.1_pre3-r2.patch.bz2 21497 RMD160 9bedc652591a06ffcf663b45c87bec549dec873a SHA1 a30518c44e7285d7486a47fe3f2c55d6f2f481d0 SHA256 cd8014ffbfcc6a6fa6ad501f9bf8cd01465e73e4931ce6d6a867e15a2826d339
 DIST portage-2.1.1_pre3-r4.patch.bz2 29737 RMD160 7cc40dfd5b92cae624f697a67a52a6df9e427a8c SHA1 e7c0b7e1cafea71254f57b4517d15f38c47f600b SHA256 d2929f739c79358fbb1352755fd72e50d134f2ff4e9fc3cdd601273520bcb8b5
+DIST portage-2.1.1_pre3-r5.patch.bz2 30472 RMD160 7aac0b39bc0d4d9c27f28ed56f4cc599fecf9f1c SHA1 7e347a537965a6c5319df5666d80b0f62775822d SHA256 da0368ee8f445dd7f51ab222bfa122841dc814e4887da475c96894563cc849aa
 DIST portage-2.1.1_pre3.tar.bz2 287206 RMD160 f3224349459899e33b9f29e60c5a8c49f63807af SHA1 c661aa975e2b02f8f13ee32bfd19d49d798e4508 SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -40,22 +35,18 @@ EBUILD portage-2.1-r1.ebuild 7519 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a
 MD5 4573216aa36cf4904976d82b14825c02 portage-2.1-r1.ebuild 7519
 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 portage-2.1-r1.ebuild 7519
 SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1 portage-2.1-r1.ebuild 7519
-EBUILD portage-2.1.1_pre3-r1.ebuild 5740 RMD160 fa182d1623ad3edb2c0278c31673e7078a26b541 SHA1 ac4d34673189d679207190862a12f1a6f6e21d20 SHA256 3c2534e6572c7298a61fe5e32e21676e5dc52287de92df39365424aeca12cad6
-MD5 bb7820a52013adca1fb4716e5f6b668d portage-2.1.1_pre3-r1.ebuild 5740
-RMD160 fa182d1623ad3edb2c0278c31673e7078a26b541 portage-2.1.1_pre3-r1.ebuild 5740
-SHA256 3c2534e6572c7298a61fe5e32e21676e5dc52287de92df39365424aeca12cad6 portage-2.1.1_pre3-r1.ebuild 5740
-EBUILD portage-2.1.1_pre3-r3.ebuild 5786 RMD160 b7851c75d5aa62a47b3786e6198f9c5a437098f7 SHA1 7736481d1c7e0f9a72ef28948cc7a6253b716854 SHA256 a1f80c48e45476d59429c3b72ade8ba3a1b639f746bbc10dd546faa866c8732d
-MD5 943cee83e01790d08e1b47a10addac66 portage-2.1.1_pre3-r3.ebuild 5786
-RMD160 b7851c75d5aa62a47b3786e6198f9c5a437098f7 portage-2.1.1_pre3-r3.ebuild 5786
-SHA256 a1f80c48e45476d59429c3b72ade8ba3a1b639f746bbc10dd546faa866c8732d portage-2.1.1_pre3-r3.ebuild 5786
 EBUILD portage-2.1.1_pre3-r4.ebuild 5740 RMD160 2e28bbdd48d7fe4dcc765f6b698c86ec97274a6a SHA1 02d8d9fedb5009de740c333f20c1f7171367e561 SHA256 7af933f6452dabefeeed7e21729be182f9089d7a991ce8d031d2d86cf54d670d
 MD5 2bef101e23a07068f4e424d0977bf88f portage-2.1.1_pre3-r4.ebuild 5740
 RMD160 2e28bbdd48d7fe4dcc765f6b698c86ec97274a6a portage-2.1.1_pre3-r4.ebuild 5740
 SHA256 7af933f6452dabefeeed7e21729be182f9089d7a991ce8d031d2d86cf54d670d portage-2.1.1_pre3-r4.ebuild 5740
-MISC ChangeLog 18501 RMD160 2697af9da1460b10706f74a7968803c186062c94 SHA1 9f620c8fa393bbcc63b67b67cb15ea39c5cc4cfa SHA256 3806a698ccd499555ee39d5339945a380c5aaf8416710ead700d6161bea57ee2
-MD5 3f9ac2b43fa2ed6e867589b0cf522398 ChangeLog 18501
-RMD160 2697af9da1460b10706f74a7968803c186062c94 ChangeLog 18501
-SHA256 3806a698ccd499555ee39d5339945a380c5aaf8416710ead700d6161bea57ee2 ChangeLog 18501
+EBUILD portage-2.1.1_pre3-r5.ebuild 5740 RMD160 dcbf65a71907275fef1e64d097afb7a8f0e92003 SHA1 3fa54cdff95e06acbaad36b871adb6125aad94fe SHA256 afd741b2824279e60e530e01c9e177dd5517583aac983e0d078ee151865c9e20
+MD5 5fbe51fdda5cc61280a4b079f84232d5 portage-2.1.1_pre3-r5.ebuild 5740
+RMD160 dcbf65a71907275fef1e64d097afb7a8f0e92003 portage-2.1.1_pre3-r5.ebuild 5740
+SHA256 afd741b2824279e60e530e01c9e177dd5517583aac983e0d078ee151865c9e20 portage-2.1.1_pre3-r5.ebuild 5740
+MISC ChangeLog 18691 RMD160 e414fb0f91742136775d836a18d4b3bb9757a849 SHA1 590cf296b7025c62bb5632b3964f75d118892cb4 SHA256 2c2d7c666e8008559bb84ff6b7f579c733d4be842b87aa7a5e609f0c10edd536
+MD5 3f3af90865928ebaed3737b7ae93fc6a ChangeLog 18691
+RMD160 e414fb0f91742136775d836a18d4b3bb9757a849 ChangeLog 18691
+SHA256 2c2d7c666e8008559bb84ff6b7f579c733d4be842b87aa7a5e609f0c10edd536 ChangeLog 18691
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -69,19 +60,16 @@ SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/di
 MD5 5a9aac645d5a2bdb9d987f45813d495a files/digest-portage-2.1-r1 1012
 RMD160 ae625221b6669b5f4f1aef277b2a8ea3ae70e1ae files/digest-portage-2.1-r1 1012
 SHA256 9f002b314a87d8dfad176863f83c6963acec51093a45494201b53e9c0cf87cd8 files/digest-portage-2.1-r1 1012
-MD5 a2aed6debbc258ec0f5d2a18058a0478 files/digest-portage-2.1.1_pre3-r1 1051
-RMD160 524b26c4219a753e79aedce39d3b8a8fe08c19f6 files/digest-portage-2.1.1_pre3-r1 1051
-SHA256 811e4aa81ab2fc5f71b3f123288bdb84a53328f3b7c6b48342d559b523761f68 files/digest-portage-2.1.1_pre3-r1 1051
-MD5 a939c56bf0de6fc08e05610f2e1c2c21 files/digest-portage-2.1.1_pre3-r3 1054
-RMD160 4791a28d53a2a2814a85c5a706fc6b9c770e712b files/digest-portage-2.1.1_pre3-r3 1054
-SHA256 5c1d606818465a0c7d4d8d7a33b2f2f1edf42c8b49ae1dfa91d60f3ae842d9ed files/digest-portage-2.1.1_pre3-r3 1054
 MD5 ea507b06c61d7e86e2d0abce0515b6ef files/digest-portage-2.1.1_pre3-r4 1054
 RMD160 f3274dc39f62914bd58d7018f66d0d6e8965efbd files/digest-portage-2.1.1_pre3-r4 1054
 SHA256 22051e37e1253741ae0307d0dd93441c16180765e000858197b04565402cd013 files/digest-portage-2.1.1_pre3-r4 1054
+MD5 36786d7bcdaedadeaa1d8a6e511cb852 files/digest-portage-2.1.1_pre3-r5 1054
+RMD160 6b8250bf067c94e5c9e8331ffe95ccf13c0d63da files/digest-portage-2.1.1_pre3-r5 1054
+SHA256 b0ba2052fb51b3719e780ed7eecbcccc62ea92caed415a9252d8f23a18c2b7c9 files/digest-portage-2.1.1_pre3-r5 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEw/Dd/ejvha5XGaMRAogaAJ0dh6cYkvP5pIUKUftv+/gL+a3bzQCfbI9s
-IDxL05x2n2xnN3zRZ2AvunI=
-=4405
+iD8DBQFExnBX/ejvha5XGaMRAkKrAKCWdlik7hbuJ0+NekVn/5ENjbXRgACgoe9L
+NZhQeCBa/yni1zsF+mFVduQ=
+=K1Ln
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1.1_pre3-r3-fixes.patch b/sys-apps/portage/files/2.1.1_pre3-r3-fixes.patch
deleted file mode 100644
index e9f22edfdffb..000000000000
--- a/sys-apps/portage/files/2.1.1_pre3-r3-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: bin/repoman
-===================================================================
---- bin/repoman	(revision 3970)
-+++ bin/repoman	(revision 3972)
-@@ -843,7 +843,8 @@
- 
- 	if mymode == "commit":
- 		repoman_settings["O"] = checkdir
--		portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb)
-+		portage.digestgen(
-+			[], repoman_settings, manifestonly=1, myportdb=portdb)
- 
- 	mf = Manifest(checkdir, repoman_settings["DISTDIR"])
- 	mydigests=mf.getTypeDigests("DIST")
-Index: bin/etc-update
-===================================================================
---- bin/etc-update	(revision 3970)
-+++ bin/etc-update	(revision 3972)
-@@ -272,9 +272,9 @@
- 	local -i my_input=0
- 	
- 	until (( ${my_input} == -1 )) || [ ! -f ${file} ]; do
--		if [[ "${OVERWRITE_ALL}" == "yes" && ! user_special ${ofile} ]]; then
-+		if [[ "${OVERWRITE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
- 			my_input=1
--		elif [[ "${DELETE_ALL}" == "yes" && ! user_special ${ofile} ]]; then
-+		elif [[ "${DELETE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
- 			my_input=2
- 		else
- 		  showdiffcmd=$(echo "${diff_command}" |
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1 b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1
deleted file mode 100644
index 2109c174dafe..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 728bab227fe5dc635769f11b4598434a portage-2.1.1_pre3-r1.patch.bz2 6443
-RMD160 bc9e6e807b17e0c773040f0eb5a8c3753a52a40d portage-2.1.1_pre3-r1.patch.bz2 6443
-SHA256 ed1090437786c53d26f338e22ff32bfbc84bd04b1883fa03ce2afdd099f40dc2 portage-2.1.1_pre3-r1.patch.bz2 6443
-MD5 78baab083cf81f14f5929da16550584a portage-2.1.1_pre3.tar.bz2 287206
-RMD160 f3224349459899e33b9f29e60c5a8c49f63807af portage-2.1.1_pre3.tar.bz2 287206
-SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363 portage-2.1.1_pre3.tar.bz2 287206
-MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
-RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
-SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
-MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
-RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
-SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r3 b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r3
deleted file mode 100644
index 55feeda31775..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 107c86eac94eb783682a2565b3e64150 portage-2.1.1_pre3-r2.patch.bz2 21497
-RMD160 9bedc652591a06ffcf663b45c87bec549dec873a portage-2.1.1_pre3-r2.patch.bz2 21497
-SHA256 cd8014ffbfcc6a6fa6ad501f9bf8cd01465e73e4931ce6d6a867e15a2826d339 portage-2.1.1_pre3-r2.patch.bz2 21497
-MD5 78baab083cf81f14f5929da16550584a portage-2.1.1_pre3.tar.bz2 287206
-RMD160 f3224349459899e33b9f29e60c5a8c49f63807af portage-2.1.1_pre3.tar.bz2 287206
-SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363 portage-2.1.1_pre3.tar.bz2 287206
-MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
-RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
-SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
-MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
-RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
-SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/portage-2.1.1_pre3-r1.ebuild b/sys-apps/portage/portage-2.1.1_pre3-r1.ebuild
deleted file mode 100644
index f223f3bebc7b..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre3-r1.ebuild
+++ /dev/null
@@ -1,197 +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.1_pre3-r1.ebuild,v 1.1 2006/07/17 01:15:21 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-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 ~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 )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!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"
-PATCHVER_PL="-r1"
-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}"
-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() {
-	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
-
-	portage_docs
-}
diff --git a/sys-apps/portage/portage-2.1.1_pre3-r3.ebuild b/sys-apps/portage/portage-2.1.1_pre3-r3.ebuild
deleted file mode 100644
index 7c8e42fc41a6..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre3-r3.ebuild
+++ /dev/null
@@ -1,198 +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.1_pre3-r3.ebuild,v 1.1 2006/07/20 22:01:25 zmedico Exp $
-
-inherit toolchain-funcs eutils
-
-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 ~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 )
-	elibc_uclibc? ( sys-apps/sandbox )
-	!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"
-PATCHVER_PL="-r1"
-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="-r2"
-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"
-		epatch "${FILESDIR}/2.1.1_pre3-r3-fixes.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() {
-	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
-
-	portage_docs
-}