2.1.1_pre2-r5 regression fix revbump for bug #139580.

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

9 files changed, 15 insertions, 747 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e8d01e07e033..a93354a38b4b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,14 +13,6 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
-AUX bug_132601-2.patch 887 RMD160 c7d10e1fe79aa8bae3e9c6ebaced37aecde95f15 SHA1 430de339d786c2768501b274a8c3398e59a5f591 SHA256 b3474c7f44d96bcc581565ff5e3f297b4b1695fc7b25fcf84f88cdee5e0d59cb
-MD5 f54ffd517de40dfb702f14ac96891e3b files/bug_132601-2.patch 887
-RMD160 c7d10e1fe79aa8bae3e9c6ebaced37aecde95f15 files/bug_132601-2.patch 887
-SHA256 b3474c7f44d96bcc581565ff5e3f297b4b1695fc7b25fcf84f88cdee5e0d59cb files/bug_132601-2.patch 887
-AUX bug_132601.patch 1435 RMD160 e109fd5b8fc66c86842913a2128d7c27e00adf58 SHA1 1e60f5f4af9828ec15857251d1e02d3e994d9ae5 SHA256 0c54775ef7a97e005cd0725bdf278e00e59e1590489d2c746aad79ea88413b19
-MD5 63b99b5d3eb8d8ccde9e6949ec95890a files/bug_132601.patch 1435
-RMD160 e109fd5b8fc66c86842913a2128d7c27e00adf58 files/bug_132601.patch 1435
-SHA256 0c54775ef7a97e005cd0725bdf278e00e59e1590489d2c746aad79ea88413b19 files/bug_132601.patch 1435
 AUX bugs_138246_138259.patch 3224 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 SHA1 84d746b9c21369febe7c897b6f83fd00c176601a SHA256 7dd6cc900dbf83e8efd85e1c2fad86e18fb8489d8d3f70b7b0dabbe183b1d664
 MD5 216e8e331f34339920c5eb492e6871b7 files/bugs_138246_138259.patch 3224
 RMD160 a82a7fc3fcbbee64c377c9a99cd76e29dbc7a6a0 files/bugs_138246_138259.patch 3224
@@ -30,13 +22,11 @@ DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e355
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
 DIST portage-2.1.1_pre1-r5.patch.bz2 39728 RMD160 d82b4203462e77c17dc4f3ba87c62a09b53745a7 SHA1 01ffcc7123c7b89109699d043a86ddafb2cbb80b SHA256 abe00224559f2ae45261d46b36cea9b6a1add88aa145093482e1786b5b866bea
 DIST portage-2.1.1_pre1.tar.bz2 277982 RMD160 41fc05479ba8774ad35939b6b5f597e559602f0e SHA1 bd7787676d3db97932867983ab01781cf5f56b78 SHA256 de7d23e15681a6eff9199a505bc9bdf59a5a43d5c51e6223d6296659c1a0cc3e
-DIST portage-2.1.1_pre2-r2.patch.bz2 2627 RMD160 ab221fbc97aae65a81a474ce7dc06f3dfe507389 SHA1 539d31f39541e79111e24db706b11ed9a90f4d00 SHA256 b4ca589e8f1a497942ca4bc7cb8d7660ce0ef6d2705f8bd7192f77d831be3dc2
-DIST portage-2.1.1_pre2-r3.patch.bz2 12775 RMD160 77c0e096e83a8902ce3ba03912bf71939a640c91 SHA1 89f38ff6025f4651a175cd9b19f2b190520f9149 SHA256 9633c83147121fd2c15df49d581dcfbb0354d3427e7b3cfa3791b6b5d3ad3d1c
+DIST portage-2.1.1_pre2-r5.patch.bz2 14811 RMD160 6d5fb74511e27b22e3aaea7240b7abf661d2c9ba SHA1 b70b367e6ce2da6ccaab8f2fbf0b1d9281e58222 SHA256 bae0b087ae3661ed4650e985a7b7122c40ff601baba3014f9413a85560803c6d
 DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
 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
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
-DIST portage-man-pl-2.1_rc4.tar.bz2 52266 RMD160 e250a0c2e6da46f3c5c21ac6ac6df47f9976243a SHA1 0f6700555da057af5d9d447ca7f3ddb5955931f0 SHA256 86e462a529471601f64ec6293c56f4f461c853201d0587fb0b7de8e845021fbb
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc
 EBUILD portage-2.0.51.22-r3.ebuild 5784 RMD160 b832375b604d0032e3727ad96d9c766c5f49f448 SHA1 932b3a10dcf86c09600db06084bf4425a55ece20 SHA256 b3eb209b100cb5c1b6eec6028d3b7652b75043ae60a8b8bc0b1b8aa923879b5b
 MD5 b61116f5434ae92ca80cba6e990928d5 portage-2.0.51.22-r3.ebuild 5784
@@ -54,22 +44,14 @@ EBUILD portage-2.1.1_pre1-r5.ebuild 5686 RMD160 824053e6cd304ce142934660bbb647e9
 MD5 de6e10e1ef1add7046303b16caf5f442 portage-2.1.1_pre1-r5.ebuild 5686
 RMD160 824053e6cd304ce142934660bbb647e91054ca62 portage-2.1.1_pre1-r5.ebuild 5686
 SHA256 5a3e35178728f935e23eccaab373e007d6da5f6b2c33e3980409d945e6a0c929 portage-2.1.1_pre1-r5.ebuild 5686
-EBUILD portage-2.1.1_pre2-r2.ebuild 5780 RMD160 49dbeb4cd588385ef7a5c023cdb200b647159f6b SHA1 4731009f4b91ce6f5817f9b4fd8c843054a43a51 SHA256 65af49d2bf643e7f69f913f6e51c4df0589a606bc9bfda58f6ee93eb353e5abc
-MD5 0fe6b7ca777a766eef8509ac887b87e8 portage-2.1.1_pre2-r2.ebuild 5780
-RMD160 49dbeb4cd588385ef7a5c023cdb200b647159f6b portage-2.1.1_pre2-r2.ebuild 5780
-SHA256 65af49d2bf643e7f69f913f6e51c4df0589a606bc9bfda58f6ee93eb353e5abc portage-2.1.1_pre2-r2.ebuild 5780
-EBUILD portage-2.1.1_pre2-r4.ebuild 5857 RMD160 9d71ec95d944ae63b5e1247afd3ae0911d93bf92 SHA1 e3689538f3351e80a2e82129e520986ba1104fda SHA256 6d539a1a2ba4b488aedd916e839952bfc3aa13c6289bf92652118635ab64c963
-MD5 ae220267bee5b3947aeaf06f1b572c76 portage-2.1.1_pre2-r4.ebuild 5857
-RMD160 9d71ec95d944ae63b5e1247afd3ae0911d93bf92 portage-2.1.1_pre2-r4.ebuild 5857
-SHA256 6d539a1a2ba4b488aedd916e839952bfc3aa13c6289bf92652118635ab64c963 portage-2.1.1_pre2-r4.ebuild 5857
-EBUILD portage-2.1.ebuild 7219 RMD160 a8e6380ecb7077788c916da17cdcb651b71829c9 SHA1 3d6662a9d142e0cff5c29efbe21d85dede046800 SHA256 bfc3eb21c086de9e2cf45a1b3547bead801ab2e31d48d2e164bddd1419a07b8a
-MD5 680a2956b11fc523028c3a7e889315ca portage-2.1.ebuild 7219
-RMD160 a8e6380ecb7077788c916da17cdcb651b71829c9 portage-2.1.ebuild 7219
-SHA256 bfc3eb21c086de9e2cf45a1b3547bead801ab2e31d48d2e164bddd1419a07b8a portage-2.1.ebuild 7219
-MISC ChangeLog 16450 RMD160 6eebb9c7eae05214b097ef1450b04046b8f9ddf9 SHA1 cee7c7d292514636b3e36084ed52ce23dec186ae SHA256 8369275dff9938ede42701c5159ef8c56dd8c4c3b11730a8dc71ef2f9e773f72
-MD5 6cb395a7ca71e1a7e9234ecca0be5995 ChangeLog 16450
-RMD160 6eebb9c7eae05214b097ef1450b04046b8f9ddf9 ChangeLog 16450
-SHA256 8369275dff9938ede42701c5159ef8c56dd8c4c3b11730a8dc71ef2f9e773f72 ChangeLog 16450
+EBUILD portage-2.1.1_pre2-r5.ebuild 5781 RMD160 ee3c26112c90e3b33b9885732630a62f03a3e6de SHA1 f948426cbf9a40873236760bb65c98bf7acb8504 SHA256 2b903dab7f2a62be65ae5669427d93df5742a9b6c85f05b33e656ae7bb88032d
+MD5 ddfcc247660283f02cfcf4b0142cd325 portage-2.1.1_pre2-r5.ebuild 5781
+RMD160 ee3c26112c90e3b33b9885732630a62f03a3e6de portage-2.1.1_pre2-r5.ebuild 5781
+SHA256 2b903dab7f2a62be65ae5669427d93df5742a9b6c85f05b33e656ae7bb88032d portage-2.1.1_pre2-r5.ebuild 5781
+MISC ChangeLog 16624 RMD160 50c49657c7af7ae9b43c7d3164d42631d3f1d8f7 SHA1 bf558a40f137a1e8c1cbbbad1a2cc8ea62a166ba SHA256 90f563f64ab726f45773952e96f9fc7a8f0ba0f6c361b12af09c1ad83fb1723e
+MD5 1326d3a2851d025e75a390d5cb6478dd ChangeLog 16624
+RMD160 50c49657c7af7ae9b43c7d3164d42631d3f1d8f7 ChangeLog 16624
+SHA256 90f563f64ab726f45773952e96f9fc7a8f0ba0f6c361b12af09c1ad83fb1723e ChangeLog 16624
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -80,25 +62,19 @@ SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/di
 MD5 e45f7d0e8e0ac69dbe448716a15fed01 files/digest-portage-2.0.54-r2 518
 RMD160 ba39dd410b0e4fb7a4f95e3ea17c3827431b1d56 files/digest-portage-2.0.54-r2 518
 SHA256 e494cfdb2648a2b63f87602043fe2a34432e684159ec53347bdc6395a16cf17e files/digest-portage-2.0.54-r2 518
-MD5 29d5cbd0a0736e68ab249a0b43ab6ca5 files/digest-portage-2.1 506
-RMD160 a911cf67209be2f99c4653406e4a124d59ad5734 files/digest-portage-2.1 506
-SHA256 998fe70d318d97ec7c596b0ab72151080acb5a41fe03ed92ad77e5eb2f511545 files/digest-portage-2.1 506
 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 65e33a514b2084c868cb3ee45f7fda32 files/digest-portage-2.1.1_pre1-r5 1054
 RMD160 2c1a5753d848cd1c61d917ec06f346ce838a19bf files/digest-portage-2.1.1_pre1-r5 1054
 SHA256 76b054610dbdad6aa3cb0e21cefa2a8f3a9470494f8b57cf49b99799f6a84573 files/digest-portage-2.1.1_pre1-r5 1054
-MD5 e18d610ee65346765e91e141bc432f7c files/digest-portage-2.1.1_pre2-r2 1051
-RMD160 1da3423919fc1215e9df921c72efa9393f207bb4 files/digest-portage-2.1.1_pre2-r2 1051
-SHA256 d6fbc94eed9697210285206f62058cc5487c782efe2336fce3f87bc64a1ff989 files/digest-portage-2.1.1_pre2-r2 1051
-MD5 f69e359bed7935297aeb76a50ae37575 files/digest-portage-2.1.1_pre2-r4 1054
-RMD160 be92e277ac26f6eac09e69896b5a09a49ce39b2f files/digest-portage-2.1.1_pre2-r4 1054
-SHA256 175b5640aa6cea37b0f5fb79b31c277fa33459017426a27d73e9a0ae12c50491 files/digest-portage-2.1.1_pre2-r4 1054
+MD5 c3763350fa7c71736a77cd2724a25779 files/digest-portage-2.1.1_pre2-r5 1054
+RMD160 785885112976473160774f7ba721ece110e8f61b files/digest-portage-2.1.1_pre2-r5 1054
+SHA256 d869f5bca5f06fce7c1e1ea6f8da1167ddef0c008ca7191d3ac3111aeaaee5a6 files/digest-portage-2.1.1_pre2-r5 1054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFErZn26J2i8a8J4okRAuFPAJ4+bpEPff6CFafMimtjo5hOfHpmhwCg20Uf
-Qsz+BRp/qCFus5Se37+Idso=
-=FaSS
+iD8DBQFErrQc/ejvha5XGaMRAngzAKCvgb8Vow/l13xt73o3vm9xAIe5rgCePgAc
+H7K1Yv9Hgbra9wzDn43s+68=
+=GlhJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/bug_132601-2.patch b/sys-apps/portage/files/bug_132601-2.patch
deleted file mode 100644
index 07a08cbbaaf0..000000000000
--- a/sys-apps/portage/files/bug_132601-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: pym/portage.py
-===================================================================
---- pym/portage.py	(revision 3790)
-+++ pym/portage.py	(revision 3791)
-@@ -5041,10 +5041,6 @@
- 			else:
- 				mydbkey = self.depcachedir+"/aux_db_key_temp"
- 
--			# XXX: Part of the gvisible hack/fix to prevent deadlock
--			# XXX: through doebuild. Need to isolate this somehow...
--			self.mysettings.reset()
--
- 			if self.lock_held:
- 				raise "Lock is already held by me?"
- 			self.lock_held = 1
-@@ -5059,7 +5055,8 @@
- 					writemsg("Uncaught handled exception: %(exception)s\n" % {"exception":str(e)})
- 					raise
- 
--			myret = doebuild(myebuild, "depend", "/", self.mysettings,
-+			ebuild_settings = config(clone=self.mysettings)
-+			myret = doebuild(myebuild, "depend", "/", ebuild_settings,
- 				dbkey=mydbkey, tree="porttree", mydbapi=self)
- 			if myret:
- 				portage_locks.unlockfile(mylock)
diff --git a/sys-apps/portage/files/bug_132601.patch b/sys-apps/portage/files/bug_132601.patch
deleted file mode 100644
index 099d34592571..000000000000
--- a/sys-apps/portage/files/bug_132601.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: bin/repoman
-===================================================================
---- bin/repoman	(revision 3789)
-+++ bin/repoman	(revision 3790)
-@@ -481,7 +481,7 @@
- 	print "PORTDIR = \""+os.environ["PORTDIR"]+"\""
- 	print "PORTDIR_OVERLAY = \""+os.environ["PORTDIR_OVERLAY"]+"\""
- 
--
-+portage.close_portdbapi_caches()
- reload(portage)
- repoman_settings = portage.config(clone=portage.settings)
- 
-@@ -1138,14 +1138,16 @@
- 
- 				profdir = portdir+"/profiles/"+prof[0]
- 	
--				if arch_caches.has_key(prof[0]):
--					dep_settings, portage.portdb, portage.db["/"]["porttree"] = arch_caches[prof[0]]
-+				if prof[0] in arch_caches:
-+					dep_settings = arch_caches[prof[0]]
- 				else:
--					dep_settings=portage.config(config_profile_path=profdir, config_incrementals=portage_const.INCREMENTALS)
--					portage.portdb=portage.portdbapi(portdir, dep_settings)
--					portage.db["/"]["porttree"]=portage.portagetree("/",dep_settings.getvirtuals("/"))
--					arch_caches[prof[0]]=[dep_settings, portage.portdb, portage.db["/"]["porttree"]]
-+					dep_settings = portage.config(
-+						config_profile_path=profdir,
-+						config_incrementals=portage_const.INCREMENTALS)
-+					arch_caches[prof[0]] = dep_settings
- 
-+				portage.db["/"]["porttree"].settings = dep_settings
-+				portage.db["/"]["porttree"].dbapi.mysettings = dep_settings
- 				dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups)
- 
- 				for myprovide in myaux["PROVIDE"].split():
diff --git a/sys-apps/portage/files/digest-portage-2.1 b/sys-apps/portage/files/digest-portage-2.1
deleted file mode 100644
index 12172da3e61b..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cb8c8af28d59f267377bba27ceea2337 portage-2.1.tar.bz2 277243
-RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 portage-2.1.tar.bz2 277243
-SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0 portage-2.1.tar.bz2 277243
-MD5 5b96b9299668afa97c419b40f8946137 portage-man-pl-2.1_rc4.tar.bz2 52266
-RMD160 e250a0c2e6da46f3c5c21ac6ac6df47f9976243a portage-man-pl-2.1_rc4.tar.bz2 52266
-SHA256 86e462a529471601f64ec6293c56f4f461c853201d0587fb0b7de8e845021fbb portage-man-pl-2.1_rc4.tar.bz2 52266
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r2 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r2
deleted file mode 100644
index 2c97be1537fd..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 d414a78d3892c0f8a47ba0b126179b72 portage-2.1.1_pre2-r2.patch.bz2 2627
-RMD160 ab221fbc97aae65a81a474ce7dc06f3dfe507389 portage-2.1.1_pre2-r2.patch.bz2 2627
-SHA256 b4ca589e8f1a497942ca4bc7cb8d7660ce0ef6d2705f8bd7192f77d831be3dc2 portage-2.1.1_pre2-r2.patch.bz2 2627
-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_pre2-r4 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r4
deleted file mode 100644
index 562d241654a3..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 a83edce7d0a6a9aed8392a18492d8269 portage-2.1.1_pre2-r3.patch.bz2 12775
-RMD160 77c0e096e83a8902ce3ba03912bf71939a640c91 portage-2.1.1_pre2-r3.patch.bz2 12775
-SHA256 9633c83147121fd2c15df49d581dcfbb0354d3427e7b3cfa3791b6b5d3ad3d1c portage-2.1.1_pre2-r3.patch.bz2 12775
-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/portage-2.1.1_pre2-r2.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild
deleted file mode 100644
index f02a266462e8..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2-r2.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_pre2-r2.ebuild,v 1.2 2006/07/06 23:15:23 genone 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="-${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_pre2-r4.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild
deleted file mode 100644
index 0cdaa5e896fb..000000000000
--- a/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild
+++ /dev/null
@@ -1,200 +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-r4.ebuild,v 1.2 2006/07/06 23:15:23 genone 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="-r3"
-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
-	epatch "${FILESDIR}/bug_132601.patch"
-	epatch "${FILESDIR}/bug_132601-2.patch"
-	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.ebuild b/sys-apps/portage/portage-2.1.ebuild
deleted file mode 100644
index 54a59af89678..000000000000
--- a/sys-apps/portage/portage-2.1.ebuild
+++ /dev/null
@@ -1,219 +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.ebuild,v 1.10 2006/07/06 23:15:23 genone 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 )
-		userland_Darwin? ( >=app-shells/bash-2.05a ) )
-	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_rc4"
-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 )"
-
-if [ "${PR}" != "r0" ]; then
-	PATCHVER="-${PR}"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.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}
-	if [ "${PR}" != "r0" ]; then
-		cd "${S}"
-		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		elog "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-		eend 0
-	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.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 "Portage 2.1 contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules from portage-2.0.x (such as"
-	ewarn "the CDB cache module), portage will not work until they have"
-	ewarn "been disabled via /etc/portage/modules."
-	echo
-	elog "The default cache format has changed between 2.0.x and 2.1"
-	elog "versions. If you have upgraded from 2.0.x, before using"
-	elog "emerge, run \`emerge --metadata\` to restore portage's local"
-	elog "cache."
-	echo
-	elog "With the new metadata_overlay cache module, it is possible to"
-	elog "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	elog "When this module is used, eclasses in \${PORTDIR} must never"
-	elog "be modified by the user because portage will not be able to"
-	elog "detect that cache regeneration is necessary."
-	elog "When metadata_overlay is initially enabled by setting"
-	elog "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	elog "in /etc/portage/modules, the user must completely remove"
-	elog "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	elog "cache regeneration."
-	echo
-	elog "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	elog "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	elog "to restore the previous ordering."
-	echo
-	elog "The default USE_ORDER setting (see make.conf.5) has changed in"
-	elog "2.1 so that auto USE flags (from use.defaults) are no longer"
-	elog "enabled.  In order to find out which flags have been disabled,"
-	elog "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
-	elog "helpful.  These flags can be manually added to make.conf by the"
-	elog "user (the command output may contain a few other automatically"
-	elog "generated flags that do not need to be added to make.conf)."
-	echo
-	elog "See NEWS and RELEASE-NOTES for further changes."
-
-	portage_docs
-}