remove old 2.1_pre7 ebuild

(Portage version: 2.1_pre10-r3)
 (Signed Manifest commit)

21 files changed, 6 insertions, 1252 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 647e6cf9f26b..766a5e33dc2c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -70,60 +70,6 @@ RMD160 1e710dc28c2e45cb8d04f7d7931c91bf43f094c3 files/2.1/pre9/1100_r3193_manife
 AUX 2.1/pre9/1110_r3194_bug_130928.patch 1070 RMD160 690804a2cac2da0a047dcc879b1c275c2e796a1a SHA1 631bf3630623bccc3f81c7b85d61cac4b15b340d size 1070
 MD5 3f1a52882791195ef0bf033dcbe5a2a7 files/2.1/pre9/1110_r3194_bug_130928.patch 1070
 RMD160 690804a2cac2da0a047dcc879b1c275c2e796a1a files/2.1/pre9/1110_r3194_bug_130928.patch 1070
-AUX 2.1_pre7/1000_r2994_workdir_mode.patch 1096 RMD160 39e882bb941f5ac3560b9a5cfa795e957199c51e SHA1 3c0526603612fc6caa26cbe1edcf600d7db9dece size 1096
-MD5 5347de9da65c2d77b2ae2faf149364a6 files/2.1_pre7/1000_r2994_workdir_mode.patch 1096
-RMD160 39e882bb941f5ac3560b9a5cfa795e957199c51e files/2.1_pre7/1000_r2994_workdir_mode.patch 1096
-AUX 2.1_pre7/1010_r3004_lazy_virtuals.patch 7519 RMD160 1e1cf9086c235ea9b89a661d6f1e0bdd8dbad72a SHA1 bc9c073af7445ff452cdab2e33c4450c1ebac295 size 7519
-MD5 c2b78a47a57679befb0b05a2983ff321 files/2.1_pre7/1010_r3004_lazy_virtuals.patch 7519
-RMD160 1e1cf9086c235ea9b89a661d6f1e0bdd8dbad72a files/2.1_pre7/1010_r3004_lazy_virtuals.patch 7519
-AUX 2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385 RMD160 a85c3c523a2f40b5f4220a1d7372dec2da86f496 SHA1 ea5c2ade0046778d174ce83e897d3707e8e8be4e size 385
-MD5 8d4e3a72650d231b182368b0a06d2c36 files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385
-RMD160 a85c3c523a2f40b5f4220a1d7372dec2da86f496 files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch 385
-AUX 2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126 RMD160 9de354cb09921aeb5a89f0ee3671bf42dc608605 SHA1 5f7363e369b3de84640402d8c71503628a880768 size 5126
-MD5 e954c9807bb789151bb72dbc82806fff files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126
-RMD160 9de354cb09921aeb5a89f0ee3671bf42dc608605 files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch 5126
-AUX 2.1_pre7/1040_r3015_user_fetch.patch 1078 RMD160 d992189579ee7ce98ee555a1cbbc9b3c2db144e0 SHA1 892cd1a85f3161a675ce91022c4d411bf08b179e size 1078
-MD5 5411976690e9b0e6504bae7ce912e1c1 files/2.1_pre7/1040_r3015_user_fetch.patch 1078
-RMD160 d992189579ee7ce98ee555a1cbbc9b3c2db144e0 files/2.1_pre7/1040_r3015_user_fetch.patch 1078
-AUX 2.1_pre7/1050_forum_3210399_empty_digest.patch 374 RMD160 01adefa804a8ae31c3a9c2e533accf187b0cdf3f SHA1 83da33b58fcb6d6022c714fb1c9226d4def522b6 size 374
-MD5 78f817f6f2dd7068087d4886ef520e60 files/2.1_pre7/1050_forum_3210399_empty_digest.patch 374
-RMD160 01adefa804a8ae31c3a9c2e533accf187b0cdf3f files/2.1_pre7/1050_forum_3210399_empty_digest.patch 374
-AUX 2.1_pre7/1060_r3034_bug_127897_realpath.patch 965 RMD160 61ae23a0b1f1a1f4cd8fd8cb2401f16ef8559930 SHA1 7c876e02e744004908d9490041376e2546f9d19d size 965
-MD5 994e124a061c4ec989cb22a9e0f08a7e files/2.1_pre7/1060_r3034_bug_127897_realpath.patch 965
-RMD160 61ae23a0b1f1a1f4cd8fd8cb2401f16ef8559930 files/2.1_pre7/1060_r3034_bug_127897_realpath.patch 965
-AUX 2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch 409 RMD160 4f488fb66c84ef61761645fbfdec51c6d87dce3c SHA1 aa5f1ccbcd34feeef9292357858b2c65645c6fa5 size 409
-MD5 5f68cba86d8f99186b15e923499c3d49 files/2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch 409
-RMD160 4f488fb66c84ef61761645fbfdec51c6d87dce3c files/2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch 409
-AUX 2.1_pre7/1080_ensure_dirs.patch 6363 RMD160 cd138486af48f05b38a7298dcdf264abfffba4ce SHA1 014baa474cac176ffaa808b41bc41ccaaac481f5 size 6363
-MD5 e5c64d09695d972ae1ae9fe88a8cc625 files/2.1_pre7/1080_ensure_dirs.patch 6363
-RMD160 cd138486af48f05b38a7298dcdf264abfffba4ce files/2.1_pre7/1080_ensure_dirs.patch 6363
-AUX 2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794 RMD160 511103b68cd4479ada8542cfd5897b85d3254f42 SHA1 1df123d0dd03e160d3f9a6647a09e55429b1a82d size 794
-MD5 242854cffd82d6fbc3d1fb4fb40a757d files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794
-RMD160 511103b68cd4479ada8542cfd5897b85d3254f42 files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch 794
-AUX 2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123 RMD160 2db6a407371c931b3bb9f3e216d3f4f3810a06d7 SHA1 8062ee0812fdf43fbdbaa9d3067fb0e5862374db size 4123
-MD5 120a029d48d352782e62d6e6522e8243 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
-RMD160 2db6a407371c931b3bb9f3e216d3f4f3810a06d7 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
-AUX 2.1_pre7/1110_r3096_emerge_args_validation.patch 716 RMD160 bd77f09bdefaf7ee62b61be7bb54c5906d2e8743 SHA1 3f9db2f3c314ddbe20a515f9c9c8d5c6090d0c29 size 716
-MD5 c40cd40ae42b30f1f0154dfd495a1d1f files/2.1_pre7/1110_r3096_emerge_args_validation.patch 716
-RMD160 bd77f09bdefaf7ee62b61be7bb54c5906d2e8743 files/2.1_pre7/1110_r3096_emerge_args_validation.patch 716
-AUX 2.1_pre7/1120_r3094_bug_129193.patch 965 RMD160 9f2d19c7a8c5610a3560b1a75f9c48b7c5dd4db7 SHA1 00dbb50e89e4f2be69d60bb2f2922136a21796bf size 965
-MD5 faf87b699766ea40753169397c660313 files/2.1_pre7/1120_r3094_bug_129193.patch 965
-RMD160 9f2d19c7a8c5610a3560b1a75f9c48b7c5dd4db7 files/2.1_pre7/1120_r3094_bug_129193.patch 965
-AUX 2.1_pre7/1130_r3087_bug_129098.patch 375 RMD160 a546380bbf2431f20dd144e35ca4e20cf73f6418 SHA1 2d78abf83dcebf8ed8c2e21bcb1c1c10c81c6f43 size 375
-MD5 0181ace45de180697a0fd8196af21b86 files/2.1_pre7/1130_r3087_bug_129098.patch 375
-RMD160 a546380bbf2431f20dd144e35ca4e20cf73f6418 files/2.1_pre7/1130_r3087_bug_129098.patch 375
-AUX 2.1_pre7/1140_r3077_noclean.patch 880 RMD160 d0daf475d69fe279d0393ccc09d46d6da7c34abf SHA1 23b83484e1c6e47a16a26f4628735640a1aff8a5 size 880
-MD5 2c1e907dce4d6034fcf166fd5d024e09 files/2.1_pre7/1140_r3077_noclean.patch 880
-RMD160 d0daf475d69fe279d0393ccc09d46d6da7c34abf files/2.1_pre7/1140_r3077_noclean.patch 880
-AUX 2.1_pre7/1150_r3082_bug_117713.patch 489 RMD160 3a42b3236117c79c5b47da7707780cb0d14f54bf SHA1 8fe94c75f3bd20ad838944e6b74539ac10b14033 size 489
-MD5 84f8ea5fb233fddf4dff78746e708096 files/2.1_pre7/1150_r3082_bug_117713.patch 489
-RMD160 3a42b3236117c79c5b47da7707780cb0d14f54bf files/2.1_pre7/1150_r3082_bug_117713.patch 489
-AUX 2.1_pre7/1160_r3083_bug_126801.patch 527 RMD160 745749df3e40b4fcfb1aff3922a9da4f32653b00 SHA1 1bec4362cc9ab14ad0ee2f13bf5d3646974f5a49 size 527
-MD5 dfae7fcea89199d2ab8b76525db73a34 files/2.1_pre7/1160_r3083_bug_126801.patch 527
-RMD160 745749df3e40b4fcfb1aff3922a9da4f32653b00 files/2.1_pre7/1160_r3083_bug_126801.patch 527
-AUX 2.1_pre7/1170_r3084_bug_128362.patch 560 RMD160 6fb60a634638158bac6dfd06ed1305f56eca3a3e SHA1 60a57d665698e628ceed8b65aa50bfd54bf1baa0 size 560
-MD5 3de90958e6ca54932e7b821759630ea8 files/2.1_pre7/1170_r3084_bug_128362.patch 560
-RMD160 6fb60a634638158bac6dfd06ed1305f56eca3a3e files/2.1_pre7/1170_r3084_bug_128362.patch 560
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 size 137
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
@@ -134,10 +80,9 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 DIST portage-2.0.53.tar.bz2 234679 RMD160 c4e8716bdc37bc2611e49b261ac82627aa3e63b9 size 234679
 DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e3556b size 234784
 DIST portage-2.1_pre10.tar.bz2 265067 RMD160 5fa51f0ecc7ccf5072a9765c81cf3e0a593b1de2 size 265067
-DIST portage-2.1_pre7.tar.bz2 256493 RMD160 543c4090ee7ade75d8005962b55ebbcf57dfd0b5 size 256493
 DIST portage-2.1_pre9.tar.bz2 260738 RMD160 6a31123ff904395c5d22f631241293e808b5f94f size 260738
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 size 4398
-DIST portage-patches-2.0.54-2.tar.bz2 6722 size 6722
+DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 size 6722
 EBUILD portage-2.0.51.22-r3.ebuild 5796 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 SHA1 b88b2898eb5ba5b4471a10f8fa82df9b8dc747f0 size 5796
 MD5 4df85686b65f5591383e16bf3d6845ba portage-2.0.51.22-r3.ebuild 5796
 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 portage-2.0.51.22-r3.ebuild 5796
@@ -156,9 +101,6 @@ RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
 EBUILD portage-2.1_pre10-r3.ebuild 6093 RMD160 0a5cb63b4380307958b654ac1217d16074247176 SHA1 1126f96f08dccbcdf0dd2fd8af7f44a55a425556 size 6093
 MD5 680a2481e14d579259fc79226c2946da portage-2.1_pre10-r3.ebuild 6093
 RMD160 0a5cb63b4380307958b654ac1217d16074247176 portage-2.1_pre10-r3.ebuild 6093
-EBUILD portage-2.1_pre7-r5.ebuild 5990 RMD160 2b36bc22a0b19f920e856d3113131ca374d57a85 SHA1 5d3ccabb8bd714b4d05f46e64016507655a6ef71 size 5990
-MD5 6ef8ace6b92df29e8a3f528127f48c06 portage-2.1_pre7-r5.ebuild 5990
-RMD160 2b36bc22a0b19f920e856d3113131ca374d57a85 portage-2.1_pre7-r5.ebuild 5990
 EBUILD portage-2.1_pre9-r5.ebuild 6180 RMD160 71271c686b9178700380fcc5cfdb6a1057f8c338 SHA1 f47b1da18e95a44a17ab37cde4f2d98945bb3f1f size 6180
 MD5 7d6fdf4428877b6d56eca645c9f53698 portage-2.1_pre9-r5.ebuild 6180
 RMD160 71271c686b9178700380fcc5cfdb6a1057f8c338 portage-2.1_pre9-r5.ebuild 6180
@@ -176,18 +118,16 @@ MD5 65372f5d0f6b19c94cdae92150cdab01 files/digest-portage-2.0.54 145
 RMD160 603688a05b8057b777d33ebefb17e1c9fcc4b938 files/digest-portage-2.0.54 145
 MD5 5b857931bd168ec3192114e2ab6c5a72 files/digest-portage-2.0.54-r1 306
 RMD160 990b4d62ad267177500fbaf3b8170c9de54b304f files/digest-portage-2.0.54-r1 306
-MD5 4e02d816cafa9d16b66fe58c514bb111 files/digest-portage-2.0.54-r2 220
-RMD160 c5ce7888ea24226247f25a83d99037071fb91ed2 files/digest-portage-2.0.54-r2 220
+MD5 6cbef6dfb5cc519ab1dbcf288b05681d files/digest-portage-2.0.54-r2 306
+RMD160 8610a1ba4262db214f6d990bf6587f78ed5f4a5d files/digest-portage-2.0.54-r2 306
 MD5 e58dcba277a524c51f55d4edc3f339de files/digest-portage-2.1_pre10-r3 151
 RMD160 e0ea7e4b4dd248a3511aad5abbe3f58fdd740d0e files/digest-portage-2.1_pre10-r3 151
-MD5 d00b518df8792d6ec867bd936b53894b files/digest-portage-2.1_pre7-r5 149
-RMD160 c927ddb9bfa13c4472abf0123fde195e7d393d86 files/digest-portage-2.1_pre7-r5 149
 MD5 082c53e9ecdde29d87558c85841c90a6 files/digest-portage-2.1_pre9-r5 149
 RMD160 fabe751bf6110c0cfbd0559b41dc38b44c7e68ac files/digest-portage-2.1_pre9-r5 149
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEW9FK/ejvha5XGaMRAjFPAKDijykxF/mv1vY8d2fW8yFoHio+DQCcD9tR
-Ct+x4MrK/ZKKi/5qN2mZDVY=
-=nT2e
+iD8DBQFEXCTm/ejvha5XGaMRAmRMAKCtNpFep1vgWNXViVcrpeEcONizKQCgtovA
+Lz9Uzekon+Tzo/zxNA5LGdk=
+=jPw4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre7/1000_r2994_workdir_mode.patch b/sys-apps/portage/files/2.1_pre7/1000_r2994_workdir_mode.patch
deleted file mode 100644
index e9c2aafec02c..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1000_r2994_workdir_mode.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -2613,15 +2613,22 @@
- 
- 	workdir_mode = 0700
- 	try:
--		parsed_mode = int(eval(mysettings["PORTAGE_WORKDIR_MODE"]))
-+		mode = mysettings["PORTAGE_WORKDIR_MODE"]
-+		if mode.isdigit():
-+			parsed_mode = int(mode, 8)
-+		elif mode == "":
-+			raise KeyError()
-+		else:
-+			raise ValueError()
- 		if parsed_mode & 07777 != parsed_mode:
--			raise ValueError("Invalid file mode: %s" % mysettings["PORTAGE_WORKDIR_MODE"])
-+			raise ValueError("Invalid file mode: %s" % mode)
- 		else:
- 			workdir_mode = parsed_mode
- 	except KeyError, e:
--		writemsg("!!! PORTAGE_WORKDIR_MODE is unset, using %s." % oct(workdir_mode))
--	except (ValueError, SyntaxError), e:
--		writemsg("%s\n" % e)
-+		writemsg("!!! PORTAGE_WORKDIR_MODE is unset, using %s.\n" % oct(workdir_mode))
-+	except ValueError, e:
-+		if len(str(e)) > 0:
-+			writemsg("%s\n" % e)
- 		writemsg("!!! Unable to parse PORTAGE_WORKDIR_MODE='%s', using %s.\n" % \
- 		(mysettings["PORTAGE_WORKDIR_MODE"], oct(workdir_mode)))
- 	mysettings["PORTAGE_WORKDIR_MODE"] = oct(workdir_mode)
-
diff --git a/sys-apps/portage/files/2.1_pre7/1010_r3004_lazy_virtuals.patch b/sys-apps/portage/files/2.1_pre7/1010_r3004_lazy_virtuals.patch
deleted file mode 100644
index dba252d6c743..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1010_r3004_lazy_virtuals.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -2127,9 +2127,9 @@
- 	syslist = []
- 	for x in realsyslist:
- 		mycp = portage.dep_getkey(x)
--		if mycp in portage.settings.virtuals:
-+		if mycp in portage.settings.getvirtuals():
- 			providers = []
--			for provider in portage.settings.virtuals[mycp]:
-+			for provider in portage.settings.getvirtuals()[mycp]:
- 				if portage.db[portage.root]["vartree"].dbapi.match(provider):
- 					providers.append(provider)
- 			if len(providers) == 1:
-
-=== modified file 'bin/repoman'
---- bin/repoman	
-+++ bin/repoman	
-@@ -1115,7 +1115,7 @@
- 	
- 				for myprovide in myaux["PROVIDE"].split():
- 					prov_cp = portage.dep_getkey(myprovide)
--					if prov_cp not in dep_settings.virtuals:
-+					if prov_cp not in dep_settings.getvirtuals():
- 						stats["virtual.unavailable"]+=1
- 						fails["virtual.unavailable"].append(x+"/"+y+".ebuild: "+keyword+"("+prof[0]+") "+prov_cp)
- 
-
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -880,6 +880,8 @@
- 		self.modifiedkeys = []
- 
- 		self.virtuals = {}
-+		self.virts_p = {}
-+		self.dirVirtuals = None
- 		self.v_count  = 0
- 
- 		# Virtuals obtained from the vartree
-@@ -1141,9 +1143,6 @@
- 			archlist = stack_lists(archlist, incremental=1)
- 			self.configdict["conf"]["PORTAGE_ARCHLIST"] = " ".join(archlist)
- 
--			# get virtuals -- needs categories
--			self.loadVirtuals('/')
--
- 			#package.mask
- 			pkgmasklines = [grabfile_package(os.path.join(x, "package.mask")) for x in self.profiles]
- 			for l in locations:
-@@ -1184,7 +1183,8 @@
- 		if not useorder:
- 			# reasonable defaults; this is important as without USE_ORDER,
- 			# USE will always be "" (nothing set)!
--			useorder="env:pkg:conf:auto:defaults"
-+			useorder = "env:pkg:conf:defaults"
-+			self.backupenv["USE_ORDER"] = useorder
- 		useordersplit=useorder.split(":")
- 
- 		self.uvlist=[]
-@@ -1258,7 +1258,9 @@
- 			self.setcpv(mycpv)
- 
- 	def loadVirtuals(self,root):
--		self.virtuals = self.getvirtuals(root)
-+		"""Not currently used by portage."""
-+		writemsg("DEPRECATED: portage.config.loadVirtuals\n")
-+		self.getvirtuals(root)
- 
- 	def load_best_module(self,property_string):
- 		best_mod = best_from_dict(property_string,self.modules,self.module_priority)
-@@ -1346,6 +1348,8 @@
- 		self.reset(keeping_pkg=1,use_cache=use_cache)
- 
- 	def setinst(self,mycpv,mydbapi):
-+		if len(self.virtuals) == 0:
-+			self.getvirtuals()
- 		# Grab the virtuals this package provides and add them into the tree virtuals.
- 		provides = mydbapi.aux_get(mycpv, ["PROVIDE"])[0]
- 		if isinstance(mydbapi, portdbapi):
-@@ -1384,7 +1388,7 @@
- 			if mykey=="USE":
- 				mydbs=self.uvlist
- 				# XXX Global usage of db... Needs to go away somehow.
--				if db.has_key(root) and db[root].has_key("vartree"):
-+				if "auto" in self["USE_ORDER"].split(":") and db.has_key(root) and db[root].has_key("vartree"):
- 					self.configdict["auto"]["USE"]=autouse(db[root]["vartree"],use_cache=use_cache)
- 				else:
- 					self.configdict["auto"]["USE"]=""
-@@ -1450,7 +1454,20 @@
- 
- 		self.already_in_regenerate = 0
- 
--	def getvirtuals(self, myroot):
-+	def get_virts_p(self, myroot):
-+		if self.virts_p:
-+			return self.virts_p
-+		virts = self.getvirtuals(myroot)
-+		if virts:
-+			myvkeys = virts.keys()
-+			for x in myvkeys:
-+				vkeysplit = x.split("/")
-+				if not self.virts_p.has_key(vkeysplit[1]):
-+					self.virts_p[vkeysplit[1]] = virts[x]
-+		return self.virts_p
-+
-+	def getvirtuals(self, myroot="/"):
-+		#XXX: due to caching, myroot is ignored on all but the first call
- 		if self.virtuals:
- 			return self.virtuals
- 
-@@ -1504,7 +1521,8 @@
- 			# Reduce the provides into a list by CP.
- 			self.treeVirtuals = map_dictlist_vals(getCPFromCPV,temp_vartree.get_all_provides())
- 
--		return self.__getvirtuals_compile()
-+		self.virtuals = self.__getvirtuals_compile()
-+		return self.virtuals
- 
- 	def __getvirtuals_compile(self):
- 		"""Actually generate the virtuals we have collected.
-@@ -3152,16 +3170,17 @@
- 			newsplit.append(dep_virtual(x, mysettings))
- 		else:
- 			mykey=dep_getkey(x)
--			if mysettings.virtuals.has_key(mykey):
--				if len(mysettings.virtuals[mykey])==1:
--					a=string.replace(x, mykey, mysettings.virtuals[mykey][0])
-+			myvirtuals = mysettings.getvirtuals()
-+			if myvirtuals.has_key(mykey):
-+				if len(myvirtuals[mykey]) == 1:
-+					a = string.replace(x, mykey, myvirtuals[mykey][0])
- 				else:
- 					if x[0]=="!":
- 						# blocker needs "and" not "or(||)".
- 						a=[]
- 					else:
- 						a=['||']
--					for y in mysettings.virtuals[mykey]:
-+					for y in myvirtuals[mykey]:
- 						a.append(string.replace(x, mykey, y))
- 				newsplit.append(a)
- 			else:
-@@ -3469,6 +3488,9 @@
- 
- def key_expand(mykey,mydb=None,use_cache=1):
- 	mysplit=mykey.split("/")
-+	global settings
-+	virts = settings.getvirtuals("/")
-+	virts_p = settings.get_virts_p("/")
- 	if len(mysplit)==1:
- 		if mydb and type(mydb)==types.InstanceType:
- 			for x in settings.categories:
-@@ -3490,6 +3512,9 @@
- 	are no installed/available candidates."""
- 	myslash=mycpv.split("/")
- 	mysplit=pkgsplit(myslash[-1])
-+	global settings
-+	virts = settings.getvirtuals("/")
-+	virts_p = settings.get_virts_p("/")
- 	if len(myslash)>2:
- 		# this is illegal case.
- 		mysplit=[]
-@@ -6612,20 +6637,29 @@
- 	return settings.getvirtuals(myroot)
- 
- def do_vartree(mysettings):
--	global virts,virts_p
--	virts=mysettings.getvirtuals("/")
--	virts_p={}
--
--	if virts:
--		myvkeys=virts.keys()
--		for x in myvkeys:
--			vkeysplit=x.split("/")
--			if not virts_p.has_key(vkeysplit[1]):
--				virts_p[vkeysplit[1]]=virts[x]
--	db["/"]={"virtuals":virts,"vartree":vartree("/",virts)}
-+	class LazyVirtualsDict(dict):
-+		def __init__(self, myroot):
-+			super(LazyVirtualsDict, self).__init__()
-+			self.myroot = myroot
-+			self["virtuals"] = None
-+		def __getitem__(self, key):
-+			if "virtuals" == key:
-+				if "virtuals" in self:
-+					virtuals = super(LazyVirtualsDict, self).__getitem__("virtuals")
-+					if virtuals is not None:
-+						return virtuals
-+					else:
-+						global settings
-+						virtuals = settings.getvirtuals(self.myroot)
-+						self["virtuals"] = virtuals
-+						return virtuals
-+			return super(LazyVirtualsDict, self).__getitem__(key)
-+	global db, root
-+	db["/"] = LazyVirtualsDict("/")
-+	db["/"]["vartree"] = vartree("/")
- 	if root!="/":
--		virts=mysettings.getvirtuals(root)
--		db[root]={"virtuals":virts,"vartree":vartree(root,virts)}
-+		db[root] = LazyVirtualsDict(root)
-+		db[root]["vartree"] = vartree(root)
- 	#We need to create the vartree first, then load our settings, and then set up our other trees
- 
- usedefaults=settings.use_defs
-@@ -6891,7 +6925,7 @@
- 					writemsg("%s\n" % msg)
- 		update_config_files(myupd)
- 
--		db["/"]["bintree"] = binarytree("/", settings["PKGDIR"], virts)
-+		db["/"]["bintree"] = binarytree("/", settings["PKGDIR"], settings.getvirtuals("/"))
- 		for update_cmd in myupd:
- 			if update_cmd[0] == "move":
- 				db["/"]["vartree"].dbapi.move_ent(update_cmd)
-@@ -6938,11 +6972,11 @@
- 		global_updates()
- 
- #continue setting up other trees
--db["/"]["porttree"]=portagetree("/",virts)
--db["/"]["bintree"]=binarytree("/",settings["PKGDIR"],virts)
-+db["/"]["porttree"] = portagetree("/")
-+db["/"]["bintree"] = binarytree("/", settings["PKGDIR"])
- if root!="/":
--	db[root]["porttree"]=portagetree(root,virts)
--	db[root]["bintree"]=binarytree(root,settings["PKGDIR"],virts)
-+	db[root]["porttree"] = portagetree(root)
-+	db[root]["bintree"] = binarytree(root, settings["PKGDIR"])
- 
- profileroots = [settings["PORTDIR"]+"/profiles/"]
- for x in settings["PORTDIR_OVERLAY"].split():
-
diff --git a/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch b/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch
deleted file mode 100644
index 6c715a13af97..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1020_r3006_bug_127573_cachedir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -214,7 +214,7 @@
- 		if stat.S_ISDIR(pathstat[stat.ST_MODE]):
- 			mtime = pathstat[stat.ST_MTIME]
- 		else:
--			raise portage_exception.PortageException
-+			raise portage_exception.DirectoryNotFound(mypath)
- 	except (IOError,OSError,portage_exception.PortageException):
- 		if EmptyOnError:
- 			return [], []
-
diff --git a/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch b/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch
deleted file mode 100644
index 727fca9c9b15..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1030_r3009_bug_127563_ccache_stat.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -2564,70 +2564,72 @@
- 			writemsg("File Not Found: '%s'\n" % str(e))
- 			return 1
- 
--	if "ccache" in features:
--		ccache_enabled = True
--		if "CCACHE_DIR" not in mysettings or "" == mysettings["CCACHE_DIR"]:
--			mysettings["CCACHE_DIR"] = os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache")
--
--		ccache_enabled = makedirs(mysettings["CCACHE_DIR"])
--
--		if ccache_enabled:
--			ccache_enabled = apply_recursive_permissions(
--				mysettings["CCACHE_DIR"], gid=portage_gid,
--				dirmode=02070, dirmask=02,
--				filemode=060, filemask=02)
--
--		if not ccache_enabled:
--			writemsg("!!! Failed resetting perms on CCACHE_DIR='%s'\n" % mysettings["CCACHE_DIR"])
--			features.remove("ccache")
--			mysettings["FEATURES"] = " ".join(features)
--
--		del ccache_enabled
--
--	if "confcache" in features:
--		confcache_enabled = True
--		if "CONFCACHE_DIR" not in mysettings:
--			mysettings["CONFCACHE_DIR"] = os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache")
--
--		confcache_enabled = makedirs(mysettings["CONFCACHE_DIR"])
--
--		if confcache_enabled:
--			confcache_enabled = apply_recursive_permissions(
--				mysettings["CONFCACHE_DIR"], gid=portage_gid,
--				dirmode=02070, dirmask=02,
--				filemode=060, filemask=02)
--
--		if not confcache_enabled:
--			writemsg("!!! Failed resetting perms on confcachedir %s\n" % mysettings["CONFCACHE_DIR"])
--			features.remove("confcache")
--			mysettings["FEATURES"] = " ".join(features)
--
--		del confcache_enabled
--
--	if "distcc" in features:
--		
--		distcc_enabled = True
--
--		if "DISTCC_DIR" not in mysettings or "" == mysettings["DISTCC_DIR"]:
--			mysettings["DISTCC_DIR"] = os.path.join(mysettings["BUILD_PREFIX"], ".distcc")
--		for x in ("", "lock", "state"):
--			mydir = os.path.join(mysettings["DISTCC_DIR"], x)
--			if not makedirs(mydir):
--				distcc_enabled = False
--				break
--
--		if distcc_enabled:
--			distcc_enabled = apply_recursive_permissions(
--			mysettings["DISTCC_DIR"], gid=portage_gid,
--			dirmode=02070, dirmask=02, filemode=060, filemask=02)
--
--		if not distcc_enabled:
--			writemsg("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")
--			writemsg(  "!!! DISTCC_DIR="+str(mysettings["DISTCC_DIR"]+"\n"))
--			time.sleep(5)
--			features.remove("distcc")
--			mysettings["FEATURES"] = " ".join(features)
--			mysettings["DISTCC_DIR"]=""
-+	features_dirs = {
-+		"ccache":{
-+			"basedir_var":"CCACHE_DIR",
-+			"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
-+			"always_recurse":False},
-+		"confcache":{
-+			"basedir_var":"CONFCACHE_DIR",
-+			"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"),
-+			"always_recurse":True},
-+		"distcc":{
-+			"basedir_var":"DISTCC_DIR",
-+			"default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"),
-+			"subdirs":("lock", "state"),
-+			"always_recurse":True}
-+	}
-+	dirmode  = 02070
-+	filemode =   060
-+	modemask =    02
-+	for myfeature, kwargs in features_dirs.iteritems():
-+		if myfeature in features:
-+			basedir = mysettings[kwargs["basedir_var"]]
-+			if basedir == "":
-+				basedir = kwargs["default_dir"]
-+				mysettings[kwargs["basedir_var"]] = basedir
-+			try:
-+				mydirs = [mysettings[kwargs["basedir_var"]]]
-+				if "subdirs" in kwargs:
-+					for subdir in kwargs["subdirs"]:
-+						mydirs.append(os.path.join(basedir, subdir))
-+				for mydir in mydirs:
-+					if not makedirs(mydir):
-+						raise portage_exception.DirectoryNotFound(
-+							"Failed to create directory.")
-+					try:
-+						initial_stat = os.stat(mydir)
-+						apply_secpass_permissions(mydir,
-+							gid=portage_gid, mode=dirmode, mask=modemask, stat_cached=initial_stat)
-+						result_stat = os.stat(mydir)
-+					except OSError, oe:
-+						if errno.EPERM == oe.errno:
-+							writemsg("!!! %s\n" % oe)
-+							raise portage_exception.OperationNotPermitted("stat('%s')" % mydir)
-+						raise
-+					# To avoid excessive recursive stat calls, we trigger
-+					# recursion when the top level directory does not initially
-+					# match our permission requirements.
-+					if kwargs["always_recurse"] or \
-+					result_stat.st_gid != initial_stat.st_gid or \
-+					result_stat.st_mode & 07777 != initial_stat.st_mode & 07777:
-+						if not kwargs["always_recurse"]:
-+							writemsg("Adjusting permissions recursively: '%s'" % mydir)
-+						def onerror(e):
-+							raise	# The feature is disabled if a single error
-+									# occurs during permissions adjustment.
-+						if not apply_recursive_permissions(mydir,
-+						gid=portage_gid, dirmode=dirmode, dirmask=modemask,
-+						filemode=filemode, filemask=modemask, onerror=onerror):
-+							raise portage_exception.OperationNotPermitted(
-+								"Failed to apply recursive permissions for the portage group.")
-+			except portage_exception.PortageException, e:
-+				features.remove(myfeature)
-+				mysettings["FEATURES"] = " ".join(features)
-+				writemsg("!!! %s\n" % str(e))
-+				writemsg("!!! Failed resetting perms on %s='%s'\n" % (kwargs["basedir_var"], basedir))
-+				writemsg("!!! Disabled FEATURES='%s'\n" % myfeature)
-+				time.sleep(5)
- 
- 	workdir_mode = 0700
- 	try:
-
diff --git a/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch b/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch
deleted file mode 100644
index 803d8dd3cee1..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1040_r3015_user_fetch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -611,16 +611,23 @@
- 	print "emerge: wheel group use is being deprecated. Please update group and passwd to"
- 	print "        include the portage user as noted above, and then use group portage."
- 
-+if "--debug" in myopts:
-+	print "myaction", myaction
-+	print "myopts", myopts
-+
- # check if root user is the current user for the actions where emerge needs this
- if portage.secpass < 2:
- 	# We've already allowed "--version" and "--help" above.
- 	if "--pretend" not in myopts and \
- 	myaction not in ("search","info"):
--		if "--debug" in myopts:
--			print "myaction",myaction
--			print "myopts",myopts
--		print "emerge: root access required."
--		sys.exit(1)
-+		if portage.secpass >= 1:
-+			if "--fetchonly" not in myopts and \
-+			"--fetch-all-uri" not in myopts:
-+				print "emerge: root access required."
-+				sys.exit(1)
-+		else:
-+			print "emerge: root access required."
-+			sys.exit(1)
- 
- if not "--pretend" in myopts:
- 	emergelog("Started emerge on: "+time.strftime("%b %d, %Y %H:%M:%S", time.localtime()))
-
diff --git a/sys-apps/portage/files/2.1_pre7/1050_forum_3210399_empty_digest.patch b/sys-apps/portage/files/2.1_pre7/1050_forum_3210399_empty_digest.patch
deleted file mode 100644
index 8b26993be436..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1050_forum_3210399_empty_digest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -2135,7 +2135,7 @@
- 		if mydigests==None: # There was a problem, exit with an errorcode.
- 			return 0
- 
--		if mydigests != myolddigest:
-+		if mydigests != myolddigest or not os.path.exists(digestfn):
- 			digest_lines = digestCreateLines(myarchives, mydigests)
- 			digest_success = True
- 			try:
-
diff --git a/sys-apps/portage/files/2.1_pre7/1060_r3034_bug_127897_realpath.patch b/sys-apps/portage/files/2.1_pre7/1060_r3034_bug_127897_realpath.patch
deleted file mode 100644
index 980ccc32eb5d..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1060_r3034_bug_127897_realpath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'pym/portage_util.py'
---- pym/portage_util.py	
-+++ pym/portage_util.py	
-@@ -607,9 +607,21 @@
- 	file when the write is interrupted (for example, when an 'out of space'
- 	error occurs)."""
- 
--	def __init__(self, filename, mode='w', **kargs):
-+	def __init__(self, filename, mode='w', follow_links=True, **kargs):
- 		"""Opens a temporary filename.pid in the same directory as filename."""
- 		self._aborted = False
-+
-+		if follow_links:
-+			canonical_path = os.path.realpath(filename)
-+			self._real_name = canonical_path
-+			tmp_name = "%s.%i" % (canonical_path, os.getpid())
-+			try:
-+				super(atomic_ofstream, self).__init__(tmp_name, mode=mode, **kargs)
-+				return
-+			except (OSError, IOError), e:
-+				writemsg("!!! Failed to open file: '%s'\n" % tmp_name)
-+				writemsg("!!! %s\n" % str(e))
-+
- 		self._real_name = filename
- 		tmp_name = "%s.%i" % (filename, os.getpid())
- 		super(atomic_ofstream, self).__init__(tmp_name, mode=mode, **kargs)
-
diff --git a/sys-apps/portage/files/2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch b/sys-apps/portage/files/2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch
deleted file mode 100644
index b544f7a3e7c4..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1070_r3036_bug_127930_unpack_timestamp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'bin/ebuild.sh'
---- bin/ebuild.sh	
-+++ bin/ebuild.sh	
-@@ -664,7 +664,7 @@
- 		local checkme
- 		for x in ${AA}; do
- 			echo ">>> Checking ${x}'s mtime..."
--			if [ "${DISTDIR}/${x}" -nt "${WORKDIR}" ]; then
-+			if [ "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/${x}" -nt "${WORKDIR}" ]; then
- 				echo ">>> ${x} has been updated; recreating WORKDIR..."
- 				newstuff="yes"
- 				rm -rf "${WORKDIR}"
-
diff --git a/sys-apps/portage/files/2.1_pre7/1080_ensure_dirs.patch b/sys-apps/portage/files/2.1_pre7/1080_ensure_dirs.patch
deleted file mode 100644
index 686ac97e0a49..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1080_ensure_dirs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1837,29 +1837,12 @@
- 			print "!!! No write access to %s" % mysettings["DISTDIR"]+"/"
- 			can_fetch=False
- 	else:
--		def distdir_perms(filename):
--			all_applied = True
--			try:
--				all_applied = portage_util.apply_secpass_permissions(filename, gid=portage_gid, mode=0775)
--			except portage_exception.OperationNotPermitted:
--				all_applied = False
--			if not all_applied:
--				writemsg(("!!! Unable to apply group permissions to '%s'." \
--				+ "  Non-root users may experience issues.\n") % filename)
--		distdir_perms(mysettings["DISTDIR"])
- 		if use_locks and locks_in_subdir:
- 			distlocks_subdir = os.path.join(mysettings["DISTDIR"], locks_in_subdir)
--			try:
--				distdir_perms(distlocks_subdir)
--			except portage_exception.FileNotFound:
--				os.mkdir(distlocks_subdir)
--				distdir_perms(distlocks_subdir)
- 			if not os.access(distlocks_subdir, os.W_OK):
- 				writemsg("!!! No write access to write to %s.  Aborting.\n" % distlocks_subdir)
- 				return 0
- 			del distlocks_subdir
--		del distdir_perms
--
- 	for myfile in filedict.keys():
- 		fetched=0
- 		file_lock = None
-@@ -2594,26 +2577,13 @@
- 					for subdir in kwargs["subdirs"]:
- 						mydirs.append(os.path.join(basedir, subdir))
- 				for mydir in mydirs:
--					if not makedirs(mydir):
--						raise portage_exception.DirectoryNotFound(
--							"Failed to create directory.")
--					try:
--						initial_stat = os.stat(mydir)
--						apply_secpass_permissions(mydir,
--							gid=portage_gid, mode=dirmode, mask=modemask, stat_cached=initial_stat)
--						result_stat = os.stat(mydir)
--					except OSError, oe:
--						if errno.EPERM == oe.errno:
--							writemsg("!!! %s\n" % oe)
--							raise portage_exception.OperationNotPermitted("stat('%s')" % mydir)
--						raise
-+					modified = portage_util.ensure_dirs(mydir,
-+						gid=portage_gid, mode=dirmode, mask=modemask)
- 					# To avoid excessive recursive stat calls, we trigger
- 					# recursion when the top level directory does not initially
- 					# match our permission requirements.
--					if kwargs["always_recurse"] or \
--					result_stat.st_gid != initial_stat.st_gid or \
--					result_stat.st_mode & 07777 != initial_stat.st_mode & 07777:
--						if not kwargs["always_recurse"]:
-+					if modified or kwargs["always_recurse"]:
-+						if modified:
- 							writemsg("Adjusting permissions recursively: '%s'" % mydir)
- 						def onerror(e):
- 							raise	# The feature is disabled if a single error
-@@ -2804,28 +2774,29 @@
- 		checkme=alist[:]
- 
- 	if not listonly:
--		for x in ("", "cvs-src"):
--			mydir = os.path.join(mysettings["DISTDIR"], x)
--			try:
--				os.makedirs(mydir)
--			except OSError, oe:
--				if errno.EEXIST == oe.errno:
--					pass
--				elif errno.EPERM == oe.errno:
--					writemsg("!!! %s\n" % str(oe))
--					writemsg("!!! Fetching may fail!\n")
--				else:
--					raise
-+		dirmode  = 02070
-+		filemode =   060
-+		modemask =    02
-+		distdir_dirs = ["", "cvs-src"]
-+		if "distlocks" in features:
-+			distdir_dirs.append(".locks")
- 		try:
--			apply_secpass_permissions(mysettings["DISTDIR"],
--				gid=portage_gid, mode=0775, mask=02)
--		except portage_exception.OperationNotPermitted, e:
--			writemsg("Operation Not Permitted: %s\n" % str(e))
--		except portage_exception.FileNotFound, e:
--			writemsg("File Not Found: '%s'\n" % str(e))
--
--		apply_recursive_permissions(os.path.join(mysettings["DISTDIR"], "cvs-src"),
--			gid=portage_gid, dirmode=02770, dirmask=02, filemode=0660, filemask=02)
-+			
-+			for x in distdir_dirs:
-+				mydir = os.path.join(mysettings["DISTDIR"], x)
-+				if portage_util.ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
-+					writemsg("Adjusting permissions recursively: '%s'\n" % mydir)
-+					def onerror(e):
-+						raise # bail out on the first error that occurs during recursion
-+					if not apply_recursive_permissions(mydir,
-+						gid=portage_gid, dirmode=dirmode, dirmask=modemask,
-+						filemode=filemode, filemask=modemask, onerror=onerror):
-+						raise portage_exception.OperationNotPermitted(
-+							"Failed to apply recursive permissions for the portage group.")
-+		except portage_exception.PortageException, e:
-+			writemsg("!!! %s\n" % str(e))
-+			writemsg("!!! Problem adjusting permissions on DISTDIR='%s'\n" % mysettings["DISTDIR"])
-+			writemsg("!!! Fetching may fail!\n")
- 
- 	# Only try and fetch the files if we are going to need them ... otherwise,
- 	# if user has FEATURES=noauto and they run `ebuild clean unpack compile install`,
-
-=== modified file 'pym/portage_util.py'
---- pym/portage_util.py	
-+++ pym/portage_util.py	
-@@ -462,7 +462,10 @@
- 	bits.  When mask=0 is specified, mode bits on the target file are allowed
- 	to be a superset of the mode argument (via logical OR).  When mask>0, the
- 	mode bits that the target file is allowed to have are restricted via
--	logical XOR."""
-+	logical XOR.
-+	Returns True if the permissions were modified and False otherwise."""
-+
-+	modified = False
- 
- 	if stat_cached is None:
- 		try:
-@@ -479,6 +482,7 @@
- 		(gid != -1 and gid != stat_cached.st_gid):
- 		try:
- 			os.chown(filename, uid, gid)
-+			modified = True
- 		except OSError, oe:
- 			if oe.errno == errno.EPERM:
- 				raise OperationNotPermitted("chown('%s', %i, %i)" % (filename, uid, gid))
-@@ -506,6 +510,7 @@
- 	if new_mode != -1:
- 		try:
- 			os.chmod(filename, new_mode)
-+			modified = True
- 		except OSError, oe:
- 			if oe.errno == errno.EPERM:
- 				raise OperationNotPermitted("chmod('%s', %s)" % (filename, oct(new_mode)))
-@@ -513,6 +518,7 @@
- 				raise FileNotFound(filename)
- 			else:
- 				raise
-+	return modified
- 
- def apply_stat_permissions(filename, newstat, **kwargs):
- 	"""A wrapper around apply_secpass_permissions that gets
-@@ -680,3 +686,23 @@
- 	except IOError, ioe:
- 		f.abort()
- 		raise ioe
-+
-+def ensure_dirs(dir_path, *args, **kwargs):
-+	"""Create a directory and call apply_permissions.
-+	Returns True if a directory is created or the permissions needed to be
-+	modified, and False otherwise."""
-+
-+	created_dir = False
-+
-+	try:
-+		os.makedirs(dir_path)
-+		created_dir = True
-+	except OSError, oe:
-+		if errno.EEXIST == oe.errno:
-+			pass
-+		elif  oe.errno in (errno.EPERM, errno.EROFS):
-+			raise portage_exception.OperationNotPermitted(str(oe))
-+		else:
-+			raise
-+	perms_modified = apply_permissions(dir_path, *args, **kwargs)
-+	return created_dir or perms_modified
-
diff --git a/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch b/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch
deleted file mode 100644
index 32336218f038..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1090_r3055_bug_128284_get_open_fds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'pym/portage_exec.py'
---- pym/portage_exec.py	
-+++ pym/portage_exec.py	
-@@ -16,6 +16,13 @@
- 	max_fd_limit = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
- except ImportError:
- 	max_fd_limit = 256
-+
-+if os.path.isdir("/proc/%i/fd" % os.getpid()):
-+	def get_open_fds():
-+		return map(int, [fd for fd in os.listdir("/proc/%i/fd" % os.getpid()) if fd.isdigit()])
-+else:
-+	def get_open_fds():
-+		return xrange(max_fd_limit)
- 
- sandbox_capable = (os.path.isfile(SANDBOX_BINARY) and
-                    os.access(SANDBOX_BINARY, os.X_OK))
-@@ -222,7 +229,7 @@
- 		os.dup2(my_fds[fd], fd)
- 	# Then close _all_ fds that haven't been explictly
- 	# requested to be kept open.
--	for fd in range(max_fd_limit):
-+	for fd in get_open_fds():
- 		if fd not in my_fds:
- 			try:
- 				os.close(fd)
-
diff --git a/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch b/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch
deleted file mode 100644
index 1a621224dfc3..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1832,6 +1832,33 @@
- 	del missingSourceHost
- 
- 	can_fetch=True
-+
-+	if not listonly:
-+		dirmode  = 02070
-+		filemode =   060
-+		modemask =    02
-+		distdir_dirs = ["", "cvs-src"]
-+		if "distlocks" in features:
-+			distdir_dirs.append(".locks")
-+		try:
-+			
-+			for x in distdir_dirs:
-+				mydir = os.path.join(mysettings["DISTDIR"], x)
-+				if portage_util.ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
-+					writemsg("Adjusting permissions recursively: '%s'\n" % mydir)
-+					def onerror(e):
-+						raise # bail out on the first error that occurs during recursion
-+					if not apply_recursive_permissions(mydir,
-+						gid=portage_gid, dirmode=dirmode, dirmask=modemask,
-+						filemode=filemode, filemask=modemask, onerror=onerror):
-+						raise portage_exception.OperationNotPermitted(
-+							"Failed to apply recursive permissions for the portage group.")
-+		except portage_exception.PortageException, e:
-+			if not os.path.isdir(mysettings["DISTDIR"]):
-+				writemsg("!!! %s\n" % str(e))
-+				writemsg("!!! Directory Not Found: DISTDIR='%s'\n" % mysettings["DISTDIR"])
-+				writemsg("!!! Fetching will fail!\n")
-+
- 	if not os.access(mysettings["DISTDIR"]+"/",os.W_OK):
- 		if not fetch_to_ro:
- 			print "!!! No write access to %s" % mysettings["DISTDIR"]+"/"
-@@ -2772,31 +2799,6 @@
- 	else:
- 		fetchme=newuris[:]
- 		checkme=alist[:]
--
--	if not listonly:
--		dirmode  = 02070
--		filemode =   060
--		modemask =    02
--		distdir_dirs = ["", "cvs-src"]
--		if "distlocks" in features:
--			distdir_dirs.append(".locks")
--		try:
--			
--			for x in distdir_dirs:
--				mydir = os.path.join(mysettings["DISTDIR"], x)
--				if portage_util.ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
--					writemsg("Adjusting permissions recursively: '%s'\n" % mydir)
--					def onerror(e):
--						raise # bail out on the first error that occurs during recursion
--					if not apply_recursive_permissions(mydir,
--						gid=portage_gid, dirmode=dirmode, dirmask=modemask,
--						filemode=filemode, filemask=modemask, onerror=onerror):
--						raise portage_exception.OperationNotPermitted(
--							"Failed to apply recursive permissions for the portage group.")
--		except portage_exception.PortageException, e:
--			writemsg("!!! %s\n" % str(e))
--			writemsg("!!! Problem adjusting permissions on DISTDIR='%s'\n" % mysettings["DISTDIR"])
--			writemsg("!!! Fetching may fail!\n")
- 
- 	# Only try and fetch the files if we are going to need them ... otherwise,
- 	# if user has FEATURES=noauto and they run `ebuild clean unpack compile install`,
-
-=== modified file 'pym/portage_exception.py'
---- pym/portage_exception.py	
-+++ pym/portage_exception.py	
-@@ -49,6 +49,9 @@
- class OperationNotPermitted(PortageException):
- 	"""An operation was not permitted operating system"""
- 
-+class ReadOnlyFileSystem(PortageException):
-+	"""Read-only file system"""
-+
- class CommandNotFound(PortageException):
- 	"""A required binary was not available or executable"""
- 
-
-=== modified file 'pym/portage_util.py'
---- pym/portage_util.py	
-+++ pym/portage_util.py	
-@@ -2,7 +2,7 @@
- # Distributed under the terms of the GNU General Public License v2
- # $Id: /var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.6 2005/04/23 07:26:04 jstubbs Exp $
- 
--from portage_exception import PortageException, FileNotFound, OperationNotPermitted
-+from portage_exception import PortageException, FileNotFound, OperationNotPermitted, ReadOnlyFileSystem
- 
- import sys,string,shlex,os,errno
- try:
-@@ -512,12 +512,14 @@
- 			os.chmod(filename, new_mode)
- 			modified = True
- 		except OSError, oe:
-+			func_call = "chmod('%s', %s)" % (filename, oct(new_mode))
- 			if oe.errno == errno.EPERM:
--				raise OperationNotPermitted("chmod('%s', %s)" % (filename, oct(new_mode)))
-+				raise OperationNotPermitted(func_call)
-+			elif oe.errno == errno.EROFS:
-+				raise ReadOnlyFileSystem(func_call)
- 			elif oe.errno == errno.ENOENT:
- 				raise FileNotFound(filename)
--			else:
--				raise
-+			raise
- 	return modified
- 
- def apply_stat_permissions(filename, newstat, **kwargs):
-
diff --git a/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch b/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch
deleted file mode 100644
index 19dc5ed27fa5..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -614,6 +614,10 @@
- if "--debug" in myopts:
- 	print "myaction", myaction
- 	print "myopts", myopts
-+
-+if not myaction and not myfiles and "--resume" not in myopts:
-+	help()
-+	sys.exit(1)
- 
- # check if root user is the current user for the actions where emerge needs this
- if portage.secpass < 2:
-@@ -3285,11 +3289,6 @@
- 			if not ("--quiet" in myopts):
- 				print "\b\b... done!"
- 		else:
--			if not myfiles:
--				print "emerge: please tell me what to do."
--				help()
--				sys.exit(1)
--				#we don't have any files to process; skip this step and exit
- 			if not ("--quiet" in myopts):
- 				print "Calculating dependencies  ",
- 				sys.stdout.flush()
-
diff --git a/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch b/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch
deleted file mode 100644
index 51b20d366657..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -3266,19 +3266,17 @@
- 
- 
- def dep_getkey(mydep):
--	if not len(mydep):
--		return mydep
--	if mydep[0]=="*":
-+	if mydep and mydep[0]=="*":
- 		mydep=mydep[1:]
--	if mydep[-1]=="*":
-+	if mydep and mydep[-1]=="*":
- 		mydep=mydep[:-1]
--	if mydep[0]=="!":
-+	if mydep and mydep[0]=="!":
- 		mydep=mydep[1:]
- 	if mydep[:2] in [ ">=", "<=" ]:
- 		mydep=mydep[2:]
- 	elif mydep[:1] in "=<>~":
- 		mydep=mydep[1:]
--	if isspecific(mydep):
-+	if mydep and isspecific(mydep):
- 		mysplit=catpkgsplit(mydep)
- 		if not mysplit:
- 			return mydep
-@@ -3287,13 +3285,11 @@
- 		return mydep
- 
- def dep_getcpv(mydep):
--	if not len(mydep):
--		return mydep
--	if mydep[0]=="*":
-+	if mydep and mydep[0]=="*":
- 		mydep=mydep[1:]
--	if mydep[-1]=="*":
-+	if mydep and mydep[-1]=="*":
- 		mydep=mydep[:-1]
--	if mydep[0]=="!":
-+	if mydep and mydep[0]=="!":
- 		mydep=mydep[1:]
- 	if mydep[:2] in [ ">=", "<=" ]:
- 		mydep=mydep[2:]
-
diff --git a/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch b/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch
deleted file mode 100644
index 2df2dcae30a6..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'pym/portage_util.py'
---- pym/portage_util.py	
-+++ pym/portage_util.py	
-@@ -627,6 +627,8 @@
- 				super(atomic_ofstream, self).__init__(tmp_name, mode=mode, **kargs)
- 				return
- 			except (OSError, IOError), e:
-+				if canonical_path == filename:
-+					raise
- 				writemsg("!!! Failed to open file: '%s'\n" % tmp_name)
- 				writemsg("!!! %s\n" % str(e))
- 
-
diff --git a/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch b/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch
deleted file mode 100644
index 4d006bb67a02..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -2745,8 +2745,6 @@
- 
- 	# if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
- 	if mydo in ["clean","cleanrm"]:
--		if "noclean" in features:
--			return 0
- 		return spawn(EBUILD_SH_BINARY+" clean",mysettings,debug=debug,free=1,logfile=None)
- 	elif mydo in ["help","setup"]:
- 		return spawn(EBUILD_SH_BINARY+" "+mydo,mysettings,debug=debug,free=1,logfile=logfile)
-@@ -6089,7 +6087,8 @@
- 
- 		# Process ebuild logfiles
- 		elog_process(self.mycpv, self.settings)
--		doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
-+		if "noclean" not in self.settings.features:
-+			doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
- 		return 0
- 
- 	def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):
-
diff --git a/sys-apps/portage/files/2.1_pre7/1150_r3082_bug_117713.patch b/sys-apps/portage/files/2.1_pre7/1150_r3082_bug_117713.patch
deleted file mode 100644
index 59a8a92d109c..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1150_r3082_bug_117713.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'bin/ebuild.sh'
---- bin/ebuild.sh	
-+++ bin/ebuild.sh	
-@@ -55,7 +55,7 @@
- [ ! -z "$OCC" ] && export CC="$OCC"
- [ ! -z "$OCXX" ] && export CXX="$OCXX"
- 
--export PATH="/sbin:/usr/sbin:/usr/lib/portage/bin:/bin:/usr/bin:${ROOTPATH}"
-+export PATH="/usr/local/sbin:/sbin:/usr/sbin:/usr/lib/portage/bin:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
- [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
- 
- source /usr/lib/portage/bin/isolated-functions.sh  &>/dev/null
-
diff --git a/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch b/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch
deleted file mode 100644
index 832a8131e87b..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'bin/ebuild.sh'
---- bin/ebuild.sh	
-+++ bin/ebuild.sh	
-@@ -878,6 +878,12 @@
- 
- 	[ "${DISTCC_DIR-unset}"  == "unset" ] && export DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
- 	[ ! -z "${DISTCC_DIR}" ] && addwrite "${DISTCC_DIR}"
-+
-+	LIBDIR_VAR="LIBDIR_${ABI}"
-+	if [ -z "${PKG_CONFIG_PATH}" -a -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
-+		export PKG_CONFIG_PATH="/usr/${!LIBDIR_VAR}/pkgconfig"
-+	fi
-+	unset LIBDIR_VAR
- 
- 	if hasq noauto $FEATURES &>/dev/null && [ ! -f ${PORTAGE_BUILDDIR}/.unpacked ]; then
- 		echo
-
diff --git a/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch b/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch
deleted file mode 100644
index d14310409a2f..000000000000
--- a/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -2595,10 +2595,10 @@
- 		if "--quiet" in myopts:
- 			rsync_opts.append("--quiet")    # Shut up a lot
- 		else:
--			rsync_opts.append("--progress") # Progress meter for each file
-+			rsync_opts.append("--verbose")	# Print filelist
- 
- 		if "--verbose" in myopts:
--			rsync_opts.append("--verbose")  # More noise? Not really sure what
-+			rsync_opts.append("--progress")  # Progress meter for each file
- 
- 		if "--debug" in myopts:
- 			rsync_opts.append("--checksum") # Force checksum on all files
-
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre7-r5 b/sys-apps/portage/files/digest-portage-2.1_pre7-r5
deleted file mode 100644
index e1a3586e0bd8..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre7-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a27283b750830207a79325ac4ed4c88d portage-2.1_pre7.tar.bz2 256493
-RMD160 543c4090ee7ade75d8005962b55ebbcf57dfd0b5 portage-2.1_pre7.tar.bz2 256493
diff --git a/sys-apps/portage/portage-2.1_pre7-r5.ebuild b/sys-apps/portage/portage-2.1_pre7-r5.ebuild
deleted file mode 100644
index 3412fd05483c..000000000000
--- a/sys-apps/portage/portage-2.1_pre7-r5.ebuild
+++ /dev/null
@@ -1,202 +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_pre7-r5.ebuild,v 1.1 2006/04/09 06:56:52 zmedico Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="build doc selinux"
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
-					dev-python/python-fchksum \
-					>=dev-lang/python-2.3 \
-					userland_GNU? ( sys-apps/debianutils ) \
-					>=app-shells/bash-2.05a ) \
-		elibc_glibc? ( sys-apps/sandbox )
-		elibc_uclibc? ( sys-apps/sandbox )
-		!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
-		selinux? ( >=dev-python/python-selinux-2.15 ) \
-		doc? ( app-portage/portage-manpages )
-		>=dev-python/pycrypto-2.0.1-r4"
-
-PROVIDE="virtual/portage"
-
-S=${WORKDIR}/${PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local my_patches="1000_r2994_workdir_mode.patch
-		1010_r3004_lazy_virtuals.patch
-		1020_r3006_bug_127573_cachedir.patch
-		1030_r3009_bug_127563_ccache_stat.patch
-		1040_r3015_user_fetch.patch
-		1050_forum_3210399_empty_digest.patch
-		1060_r3034_bug_127897_realpath.patch
-		1070_r3036_bug_127930_unpack_timestamp.patch
-		1080_ensure_dirs.patch
-		1090_r3055_bug_128284_get_open_fds.patch
-		1100_r3063_bug_128506_distdir_error.patch
-		1110_r3096_emerge_args_validation.patch
-		1120_r3094_bug_129193.patch
-		1130_r3087_bug_129098.patch
-		1140_r3077_noclean.patch
-		1150_r3082_bug_117713.patch
-		1160_r3083_bug_126801.patch
-		1170_r3084_bug_128362.patch"
-	for patch_name in ${my_patches}; do
-		einfo "Applying ${patch_name} ..."
-		patch -p0 --no-backup-if-mismatch < \
-			"${FILESDIR}"/${PV}/${patch_name} >/dev/null || \
-			die "Failed to apply patch"
-	done
-	if [ "${PR}" != "r0" ]; then
-		einfo "Setting portage.VERSION to ${PVR} ..."
-		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-			die "Failed to patch portage.VERSION"
-	fi
-}
-
-src_compile() {
-	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
-
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-		die "Failed to build tbz2tool"
-
-	if ! use userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		chmod +x setup.py
-		./setup.py build || die "Failed to build missingos module"
-	fi
-
-	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() {
-	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 userland_Darwin; then
-		cd "${S}"/src/python-missingos
-		./setup.py install --root ${D} || \
-			die "Failed to install missingos module"
-	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 /usr/lib/portage/bin
-	exeinto /usr/lib/portage/bin
-	cd "${S}"/bin
-	doexe *
-	doexe "${S}"/src/tbz2tool
-	dosym newins /usr/lib/portage/bin/donewins
-
-	for mydir in pym pym/cache pym/elog_modules; do
-		dodir /usr/lib/portage/${mydir}
-		insinto /usr/lib/portage/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py *.pyo
-	done
-
-	doman "${S}"/man/*.[0-9]
-	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"
-	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() {
-	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf ${IMAGE}/usr/lib/portage/pym/*
-		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
-		rm -rf ${IMAGE}/usr/lib/portage/bin/*
-		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
-	else
-		for mydir in pym pym/cache pym/elog_modules; do
-			rm /usr/lib/portage/${mydir}/*.pyc >& /dev/null
-			rm /usr/lib/portage/${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 "This series contains a completely rewritten caching framework."
-	ewarn "If you are using any cache modules (such as the CDB cache"
-	ewarn "module) portage will not work until they have been disabled."
-	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
-	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
-	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
-}