2.1.1_pre3-r2 revbump. This fixes bugs #68612, #97074, #101695, #102436, #103092, #110900, #114713, #119807, #131787, #140591, #140731, #140971, and #141110.

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

7 files changed, 19 insertions, 476 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7fe346397b86..17fdfa126aa0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,24 +9,19 @@ 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-r2-fixes.patch 494 RMD160 1db1cf6bc5a10dc98a1fc6d41b8f8ae22c3353fc SHA1 a241ac271f833c8f7010f024ad93372b87442ce0 SHA256 2675cc5ddbeb9e1938d6052ddf3643a5336a3d7b31c1a2db45848e0334f6a588
+MD5 19d8457771719f8c8cd69e555058c99e files/2.1.1_pre3-r2-fixes.patch 494
+RMD160 1db1cf6bc5a10dc98a1fc6d41b8f8ae22c3353fc files/2.1.1_pre3-r2-fixes.patch 494
+SHA256 2675cc5ddbeb9e1938d6052ddf3643a5336a3d7b31c1a2db45848e0334f6a588 files/2.1.1_pre3-r2-fixes.patch 494
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
-AUX bug_140045.patch 714 RMD160 5f1f61255d48ccd176137fc12258b25e7d19f466 SHA1 a34077f5c4a4baa06070f5eee1fc00c32dadc38b SHA256 43b6e7662ac994f1e73c538549647c291ba6b139ee0f1c8ecc3e19e1ea1c975b
-MD5 40288e5fce4bab19af1822df895f8d96 files/bug_140045.patch 714
-RMD160 5f1f61255d48ccd176137fc12258b25e7d19f466 files/bug_140045.patch 714
-SHA256 43b6e7662ac994f1e73c538549647c291ba6b139ee0f1c8ecc3e19e1ea1c975b files/bug_140045.patch 714
-AUX depend_phase_category.patch 451 RMD160 b62754a7eeaf5552e3a21364dcddd051239457bf SHA1 dd116f3e15ed1a7475c9dfd84ed4039ac368475a SHA256 5ab3d24adbda12a31f494325732f6c3d7f6c4a6805b73c9bef14dcda31d44314
-MD5 3f79fc72a0099fdcfeb6d47dcc37c0b2 files/depend_phase_category.patch 451
-RMD160 b62754a7eeaf5552e3a21364dcddd051239457bf files/depend_phase_category.patch 451
-SHA256 5ab3d24adbda12a31f494325732f6c3d7f6c4a6805b73c9bef14dcda31d44314 files/depend_phase_category.patch 451
 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_pre2-r7.patch.bz2 20013 RMD160 098bdee8781a159502901b8e59b7b727e28c18ac SHA1 11a1eb1531981077221cce5645748418eee265c7 SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7
-DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
 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.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
@@ -44,22 +39,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_pre2-r8.ebuild 5817 RMD160 93cd821fbb8aa9cf2ff6bf3b1d2e5f091cacf655 SHA1 5e18d14a73acf19e962e391a87a3596fe31b1f3b SHA256 ecd7d002bd70461827fc8892d3c273f663d99c3aab7a96383013beb8c84d292f
-MD5 260c64ffb733ebf848af91dff119ece3 portage-2.1.1_pre2-r8.ebuild 5817
-RMD160 93cd821fbb8aa9cf2ff6bf3b1d2e5f091cacf655 portage-2.1.1_pre2-r8.ebuild 5817
-SHA256 ecd7d002bd70461827fc8892d3c273f663d99c3aab7a96383013beb8c84d292f portage-2.1.1_pre2-r8.ebuild 5817
 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.ebuild 5731 RMD160 de3421f0bf1df7a4c4c2750034ecd806d2e62ee2 SHA1 f7f13962f063411726ca2e237a43781fa13ff8aa SHA256 5806c5bb45881e30607d9e20b056c17d8a7d8cafccfc3ba45c4d5bee1288fda3
-MD5 bb8327b2808053b56943e9f72b7590ce portage-2.1.1_pre3.ebuild 5731
-RMD160 de3421f0bf1df7a4c4c2750034ecd806d2e62ee2 portage-2.1.1_pre3.ebuild 5731
-SHA256 5806c5bb45881e30607d9e20b056c17d8a7d8cafccfc3ba45c4d5bee1288fda3 portage-2.1.1_pre3.ebuild 5731
-MISC ChangeLog 17778 RMD160 6b45f87e0d8cff874d3b618d7865be63bd336063 SHA1 6319d2408fb210f18388a5dbadfbd355b0591676 SHA256 b4e5ffad378afa982a167a618b348801dafbb33c75b38cd339959f6ff0e492c7
-MD5 0a790a665a0e2b9d1c18961587e0bf2b ChangeLog 17778
-RMD160 6b45f87e0d8cff874d3b618d7865be63bd336063 ChangeLog 17778
-SHA256 b4e5ffad378afa982a167a618b348801dafbb33c75b38cd339959f6ff0e492c7 ChangeLog 17778
+EBUILD portage-2.1.1_pre3-r2.ebuild 5789 RMD160 386caf305f9fed6dd9105343f48e2f837af12370 SHA1 41c01a98c0052c22fb676e0515ac0856e3d41554 SHA256 6d35aa7d816b929ca038248be4a7959e734340b4f4ca54beded2b2965a4303a5
+MD5 139f4bbd35270b4eda38e8d0b85ac41e portage-2.1.1_pre3-r2.ebuild 5789
+RMD160 386caf305f9fed6dd9105343f48e2f837af12370 portage-2.1.1_pre3-r2.ebuild 5789
+SHA256 6d35aa7d816b929ca038248be4a7959e734340b4f4ca54beded2b2965a4303a5 portage-2.1.1_pre3-r2.ebuild 5789
+MISC ChangeLog 18095 RMD160 9ad2ff6a41110c9fddb7bfaf2e3972e985df5f89 SHA1 49712aca642537659782bccbd9ab1aec9334e5f3 SHA256 aa34f63822682535575db85d551ce18155a6ea9b0c983cb60eeff8fe427e67f1
+MD5 c6fd0b43c9b4361b76a8acbd622c64df ChangeLog 18095
+RMD160 9ad2ff6a41110c9fddb7bfaf2e3972e985df5f89 ChangeLog 18095
+SHA256 aa34f63822682535575db85d551ce18155a6ea9b0c983cb60eeff8fe427e67f1 ChangeLog 18095
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -73,19 +64,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 6919994cfeb13e5695d5357e3d90cd9b files/digest-portage-2.1.1_pre2-r8 1054
-RMD160 fd9a8c6a1a9eb0dde812e5845f6496face9812b4 files/digest-portage-2.1.1_pre2-r8 1054
-SHA256 58f2f65b45aa2b1f51db361d0c9c174245917520852ee5dc9108b02d4e51f896 files/digest-portage-2.1.1_pre2-r8 1054
-MD5 644fb53f23e73624555845deca18ade9 files/digest-portage-2.1.1_pre3 783
-RMD160 f8e4085fd91653a58c04dd72b88035277e6ab2cc files/digest-portage-2.1.1_pre3 783
-SHA256 0a6cb66ee62d41bde4a8586da24006d854a4ac3fb3e69d3ff0183afe96baa66f files/digest-portage-2.1.1_pre3 783
 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-r2 1054
+RMD160 4791a28d53a2a2814a85c5a706fc6b9c770e712b files/digest-portage-2.1.1_pre3-r2 1054
+SHA256 5c1d606818465a0c7d4d8d7a33b2f2f1edf42c8b49ae1dfa91d60f3ae842d9ed files/digest-portage-2.1.1_pre3-r2 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuuSw/ejvha5XGaMRAhmgAKCuMItbZEB84uRoKbJZTBIQ2RxBegCgngC6
-iegX6Ds6+8xdKbCdoeA9YTk=
-=gPcS
+iD8DBQFEv+8b/ejvha5XGaMRAml3AKDoBqaAg8DVkjB7XCWGAKKwVlTGewCgoNuF
+MhFJX/gK5m5JBRc6Jr5vtp8=
+=aRkB
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_140045.patch b/sys-apps/portage/files/bug_140045.patch
deleted file mode 100644
index fbac476b0350..000000000000
--- a/sys-apps/portage/files/bug_140045.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: pym/portage.py
-===================================================================
---- pym/portage.py	(revision 3836)
-+++ pym/portage.py	(revision 3837)
-@@ -6442,7 +6442,10 @@
- 			# We need mydest defined up here to calc. protection paths.  This is now done once per
- 			# directory rather than once per file merge.  This should really help merge performance.
- 			# Trailing / ensures that protects/masks with trailing /'s match.
--			mytruncpath = os.path.join(destroot, offset) + os.path.sep
-+			mytruncpath = os.path.sep + \
-+				os.path.join(
-+					destroot.strip(os.path.sep), offset.strip(os.path.sep)) + \
-+				os.path.sep
- 			myppath=self.isprotected(mytruncpath)
- 		else:
- 			mergelist=stufftomerge
diff --git a/sys-apps/portage/files/depend_phase_category.patch b/sys-apps/portage/files/depend_phase_category.patch
deleted file mode 100644
index 39e1bcfbac89..000000000000
--- a/sys-apps/portage/files/depend_phase_category.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: pym/portage.py
-===================================================================
---- pym/portage.py	(revision 3812)
-+++ pym/portage.py	(revision 3813)
-@@ -5054,6 +5054,7 @@
- 					writemsg("Uncaught handled exception: %(exception)s\n" % {"exception":str(e)})
- 					raise
- 
-+			self.doebuild_settings.reset()
- 			myret = doebuild(myebuild, "depend", "/", self.doebuild_settings,
- 				dbkey=mydbkey, tree="porttree", mydbapi=self)
- 			if myret:
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r8 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r8
deleted file mode 100644
index f0c5f5a8f4ff..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 eef91eb70d4740d34cc2c1ad232003fa portage-2.1.1_pre2-r7.patch.bz2 20013
-RMD160 098bdee8781a159502901b8e59b7b727e28c18ac portage-2.1.1_pre2-r7.patch.bz2 20013
-SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7 portage-2.1.1_pre2-r7.patch.bz2 20013
-MD5 2f933f22a47e42e284639097e6abaa4a portage-2.1.1_pre2.tar.bz2 283920
-RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a portage-2.1.1_pre2.tar.bz2 283920
-SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4 portage-2.1.1_pre2.tar.bz2 283920
-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 b/sys-apps/portage/files/digest-portage-2.1.1_pre3
deleted file mode 100644
index 093b59928c89..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre3
+++ /dev/null
@@ -1,9 +0,0 @@
-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_pre2-r8.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r8.ebuild
deleted file mode 100644
index 30ebadfb27fa..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2-r8.ebuild
+++ /dev/null
@@ -1,199 +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_pre2-r8.ebuild,v 1.1 2006/07/12 10:47:18 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_GNU? ( sys-apps/debianutils )
-		!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="-r7"
-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
-	epatch "${FILESDIR}/bug_140045.patch"
-}
-
-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.ebuild b/sys-apps/portage/portage-2.1.1_pre3.ebuild
deleted file mode 100644
index d4dbbb23fdd9..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre3.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.ebuild,v 1.1 2006/07/15 16:51:10 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=""
-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
-}