2.1_pre10-r5 bug fix revbump

Package-Manager: portage-2.1_pre10-r5

15 files changed, 15 insertions, 900 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f332ee6767c6..d78468fbaf52 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,42 +7,9 @@ RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 SHA1 6305707411c213cd78f028952f7aabcb8b56e0ce size 10579
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579
-AUX 2.1/pre10/1000_r3291_bug_73350_configroot.patch 10736 RMD160 abe36e81af35e4a0580ca269d8d274885510763a SHA1 f4e937c8bdc4b065af78b16a0be6bb8d05c2a648 size 10736
-MD5 8c623d6ee5dc6030cd338cf0d1372166 files/2.1/pre10/1000_r3291_bug_73350_configroot.patch 10736
-RMD160 abe36e81af35e4a0580ca269d8d274885510763a files/2.1/pre10/1000_r3291_bug_73350_configroot.patch 10736
-AUX 2.1/pre10/1010_r3292_bug_131820_noauto.patch 1160 RMD160 5957328f21b0c104ff63e88e066fc764af0d6c89 SHA1 92d5202b0be14fcda4e619a22cf0f6155be90031 size 1160
-MD5 f1e6b75c0f6604a95f6add5a3f196663 files/2.1/pre10/1010_r3292_bug_131820_noauto.patch 1160
-RMD160 5957328f21b0c104ff63e88e066fc764af0d6c89 files/2.1/pre10/1010_r3292_bug_131820_noauto.patch 1160
-AUX 2.1/pre10/1020_r3293_bug_131820_noauto.patch 1141 RMD160 46a97b8142bf95fb569cb8c1d803b8fb914fbcb4 SHA1 d6cf02fd7bf6539023beb5798c30dbf94dbaa2d9 size 1141
-MD5 5019f5d3ed29b8a2c5214efc38090cc9 files/2.1/pre10/1020_r3293_bug_131820_noauto.patch 1141
-RMD160 46a97b8142bf95fb569cb8c1d803b8fb914fbcb4 files/2.1/pre10/1020_r3293_bug_131820_noauto.patch 1141
-AUX 2.1/pre10/1030_r3304_fetch_digests.patch 634 RMD160 cc6fded23161880419b44d51b045e53699c08326 SHA1 fb5f2c630ea36f8b664a5c97e6290b91e9eb09f0 size 634
-MD5 3b07419a088447ef92c1ecf95931f721 files/2.1/pre10/1030_r3304_fetch_digests.patch 634
-RMD160 cc6fded23161880419b44d51b045e53699c08326 files/2.1/pre10/1030_r3304_fetch_digests.patch 634
-AUX 2.1/pre10/1040_r3306_bug_117509_xterm.patch 502 RMD160 6a2f310845ea073527bfe9577775dad505d30123 SHA1 6cb65e325234b4257a0f244aa36d2755f3b36408 size 502
-MD5 32ae9114f9d4d65d28c8cec10fb92b2f files/2.1/pre10/1040_r3306_bug_117509_xterm.patch 502
-RMD160 6a2f310845ea073527bfe9577775dad505d30123 files/2.1/pre10/1040_r3306_bug_117509_xterm.patch 502
-AUX 2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch 590 RMD160 551c37170e0016f3920942010d9583a7c6a781b9 SHA1 16753e81afa03cb87abca87823286ff6c13856c2 size 590
-MD5 80c868c3d735df301cb48e80a3709763 files/2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch 590
-RMD160 551c37170e0016f3920942010d9583a7c6a781b9 files/2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch 590
-AUX 2.1/pre10/1060_r3317_bug_132182_assume_digests.patch 3126 RMD160 46ccfc4924b3b34bb0d4981a6f0a3f4d1d90369a SHA1 5dc1238bbe041e492c5879538a8871051c2f8521 size 3126
-MD5 7a2ca22e2af2d62a7bfc4d86082fb23c files/2.1/pre10/1060_r3317_bug_132182_assume_digests.patch 3126
-RMD160 46ccfc4924b3b34bb0d4981a6f0a3f4d1d90369a files/2.1/pre10/1060_r3317_bug_132182_assume_digests.patch 3126
-AUX 2.1/pre10/1070_r3320_bug_132338_config_clone.patch 1936 RMD160 5db83ef4ea706718b0b38acf187d6cf04f440a32 SHA1 b7f3f232762aba2b237f3d249440583da75d3c81 size 1936
-MD5 47c313d568f758451edf0f1c0cd36178 files/2.1/pre10/1070_r3320_bug_132338_config_clone.patch 1936
-RMD160 5db83ef4ea706718b0b38acf187d6cf04f440a32 files/2.1/pre10/1070_r3320_bug_132338_config_clone.patch 1936
-AUX 2.1/pre10/1080_r3321_bug_132373_search_digest.patch 1023 RMD160 54108767538c3e29d921b0c1a57469f82871cf99 SHA1 efc3d05339abfbdbb69ad3f05a70ef136afe6759 size 1023
-MD5 23e88a3e82e8a1cd770639dbb0f81114 files/2.1/pre10/1080_r3321_bug_132373_search_digest.patch 1023
-RMD160 54108767538c3e29d921b0c1a57469f82871cf99 files/2.1/pre10/1080_r3321_bug_132373_search_digest.patch 1023
-AUX 2.1/pre10/1090_r3324_bug_132410_missing_digest.patch 1241 RMD160 5f85a69370143a6bf1fcef9b17774168ea2dda96 SHA1 a091d4d19256622ebded7ec5a4c25fa026e12277 size 1241
-MD5 03089334eee602773844a298117710bc files/2.1/pre10/1090_r3324_bug_132410_missing_digest.patch 1241
-RMD160 5f85a69370143a6bf1fcef9b17774168ea2dda96 files/2.1/pre10/1090_r3324_bug_132410_missing_digest.patch 1241
-AUX 2.1/pre10/1100_r3326_bug_132442_root_clone.patch 870 RMD160 d94dc3125a60a5e7b4b8d33b3052ce68087f9d7e SHA1 919ac055bca279e48db926624879db79a3f744a8 size 870
-MD5 8f392ee075bd86726e65ed7021fc31db files/2.1/pre10/1100_r3326_bug_132442_root_clone.patch 870
-RMD160 d94dc3125a60a5e7b4b8d33b3052ce68087f9d7e files/2.1/pre10/1100_r3326_bug_132442_root_clone.patch 870
-AUX 2.1/pre10/1110_r3330_bug_130395_homedir.patch 1418 RMD160 2def8681e3c6ba21fe1dfafe6880ae88f0cf26e9 SHA1 92d5d737b69a7f6962b9aa50a0dfd34894d36e0e size 1418
-MD5 4d7f66b9e2c538cad3f7e73db3c12291 files/2.1/pre10/1110_r3330_bug_130395_homedir.patch 1418
-RMD160 2def8681e3c6ba21fe1dfafe6880ae88f0cf26e9 files/2.1/pre10/1110_r3330_bug_130395_homedir.patch 1418
+AUX 2.1/pre10/1150_r3334_make_profile_realpath.patch 414 RMD160 04ed98982137a5710b879e5208a529e7753292e0 SHA1 f759cf6a73fc8c3942423e0331838da66bb1c846 size 414
+MD5 9171630257c115eaf795e55f9532b266 files/2.1/pre10/1150_r3334_make_profile_realpath.patch 414
+RMD160 04ed98982137a5710b879e5208a529e7753292e0 files/2.1/pre10/1150_r3334_make_profile_realpath.patch 414
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 size 137
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
@@ -51,6 +18,7 @@ DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e355
 DIST portage-2.1_pre10.tar.bz2 265067 RMD160 5fa51f0ecc7ccf5072a9765c81cf3e0a593b1de2 size 265067
 DIST portage-patches-2.0.54-1.tar.bz2 4398 RMD160 8b7520b99aec0cb53a117b46345a720f5c7a68c0 size 4398
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 size 6722
+DIST portage-patches-2.1_pre10-r5.tar.bz2 7804 RMD160 044ce00ab342781c112aab89c9edbf8717a7b5bf size 7804
 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
@@ -63,12 +31,12 @@ RMD160 17fba8aba5d5007b73f6df346ffa82b524461215 portage-2.0.54-r2.ebuild 4194
 EBUILD portage-2.0.54.ebuild 3891 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 SHA1 e499b0e717d7de8947bca591ecbcf3b71b744853 size 3891
 MD5 f9c41fcd6a2155552f0cacbe7a62101c portage-2.0.54.ebuild 3891
 RMD160 4e64e86813b5bbdfbce76d76a56b5afd2305b2f8 portage-2.0.54.ebuild 3891
-EBUILD portage-2.1_pre10-r4.ebuild 6217 RMD160 3e95ef6a9792d6b1fb33a81789e016cb274a3dc0 SHA1 f0ffc1ed80114e28610b8eac09bc8dcdacb1a067 size 6217
-MD5 d84b2f083e57a2440eb53929344e6970 portage-2.1_pre10-r4.ebuild 6217
-RMD160 3e95ef6a9792d6b1fb33a81789e016cb274a3dc0 portage-2.1_pre10-r4.ebuild 6217
-MISC ChangeLog 19722 RMD160 91d4084c2f32683d193a7469835d0974479aae30 SHA1 de20bd53b5c3fd13845f2a5d7d7d45a4e0c4f555 size 19722
-MD5 460874e02422696efb8d6daee5b94668 ChangeLog 19722
-RMD160 91d4084c2f32683d193a7469835d0974479aae30 ChangeLog 19722
+EBUILD portage-2.1_pre10-r5.ebuild 6650 RMD160 5097da996cd443b3858a8b413a6974860427112c SHA1 70381ae8b4c8c42db403bbdc97bbb1da2f400661 size 6650
+MD5 f4aa9d14a966b38bdf5734dbc2970b7d portage-2.1_pre10-r5.ebuild 6650
+RMD160 5097da996cd443b3858a8b413a6974860427112c portage-2.1_pre10-r5.ebuild 6650
+MISC ChangeLog 20048 RMD160 f7f6e46794265199e0cd7a982bdeeeea20dd38b2 SHA1 75b117d4142242481f2ead4328b885777ffcc051 size 20048
+MD5 c61ceaabadcfa60382dd4c1b8fd8bff6 ChangeLog 20048
+RMD160 f7f6e46794265199e0cd7a982bdeeeea20dd38b2 ChangeLog 20048
 MISC metadata.xml 276 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 SHA1 73bd9b0dacf481b876934c38010be20a91eaf591 size 276
 MD5 dc02eeaf8060043bfa8d483a42696963 metadata.xml 276
 RMD160 addc800a374a637032ce56d1a1928542d5c9ef74 metadata.xml 276
@@ -80,12 +48,12 @@ MD5 5b857931bd168ec3192114e2ab6c5a72 files/digest-portage-2.0.54-r1 306
 RMD160 990b4d62ad267177500fbaf3b8170c9de54b304f files/digest-portage-2.0.54-r1 306
 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-r4 151
-RMD160 e0ea7e4b4dd248a3511aad5abbe3f58fdd740d0e files/digest-portage-2.1_pre10-r4 151
+MD5 152dd0f2e50dd9109e23cee4aca421b2 files/digest-portage-2.1_pre10-r5 320
+RMD160 938aaaea1b87312dc8343da847ef14d7b18caf79 files/digest-portage-2.1_pre10-r5 320
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXt95/ejvha5XGaMRAq4EAJ4rvJzertkDtceVUj9rHanPdPgBuQCfZ0+2
-ExPAvZSr96VY9MbLebTdq/M=
-=JOLm
+iD8DBQFEX63D/ejvha5XGaMRAlpYAKDzq+QJkuINzS+DpEemfIbVbja+8ACg09r/
+7n87K1WhW3+XW1xPaDB3Jes=
+=l+XV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1/pre10/1000_r3291_bug_73350_configroot.patch b/sys-apps/portage/files/2.1/pre10/1000_r3291_bug_73350_configroot.patch
deleted file mode 100644
index 35628b03dc98..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1000_r3291_bug_73350_configroot.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-=== modified file 'bin/ebuild.sh'
---- bin/ebuild.sh	
-+++ bin/ebuild.sh	
-@@ -3,7 +3,11 @@
- # Distributed under the terms of the GNU General Public License v2
- # $Id: 1000_r3291_bug_73350_configroot.patch,v 1.1 2006/05/01 08:48:30 zmedico Exp $
- 
--export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random"
-+PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
-+PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
-+declare -rx PORTAGE_BIN_PATH PORTAGE_PYM_PATH
-+
-+export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:${PORTAGE_PYM_PATH}:/dev/random"
- export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:/dev/stdout:/dev/stderr:${PORTAGE_TMPDIR}"
- export SANDBOX_READ="${SANDBOX_READ}:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}"
- 
-@@ -55,10 +59,10 @@
- [ ! -z "$OCC" ] && export CC="$OCC"
- [ ! -z "$OCXX" ] && export CXX="$OCXX"
- 
--export PATH="/usr/local/sbin:/sbin:/usr/sbin:/usr/lib/portage/bin:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
-+export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
- [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
- 
--source /usr/lib/portage/bin/isolated-functions.sh  &>/dev/null
-+source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null
- 
- case "${NOCOLOR:-false}" in
- 	yes|true)
-@@ -158,7 +162,7 @@
- 	fi
- 	# return shell-true/shell-false if exists.
- 	# Takes single depend-type atoms.
--	if /usr/lib/portage/bin/portageq 'has_version' "${ROOT}" "$1"; then
-+	if "${PORTAGE_BIN_PATH}/portageq" 'has_version' "${ROOT}" "$1"; then
- 		return 0
- 	else
- 		return 1
-@@ -169,7 +173,7 @@
- 	if [ "${EBUILD_PHASE}" == "depend" ]; then
- 		die "portageq calls are not allowed in the global scope"
- 	fi
--	/usr/lib/portage/bin/portageq "$@"
-+	"${PORTAGE_BIN_PATH}/portageq" "$@"
- }
- 
- 
-@@ -184,7 +188,7 @@
- 	fi
- 	# returns the best/most-current match.
- 	# Takes single depend-type atoms.
--	/usr/lib/portage/bin/portageq 'best_version' "${ROOT}" "$1"
-+	"${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
- }
- 
- use_with() {
-
-=== modified file 'bin/misc-functions.sh'
---- bin/misc-functions.sh	
-+++ bin/misc-functions.sh	
-@@ -14,7 +14,8 @@
- # XXX hack: clear the args so ebuild.sh doesn't see them
- MISC_FUNCTIONS_ARGS="$@"
- shift $#
--source /usr/lib/portage/bin/ebuild.sh
-+
-+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/ebuild.sh"
- 
- install_qa_check() {
- 
-
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -895,7 +895,8 @@
- 		raise TypeError, "Invalid type for config object: %s" % test.__class__
- 
- class config:
--	def __init__(self, clone=None, mycpv=None, config_profile_path=None, config_incrementals=None):
-+	def __init__(self, clone=None, mycpv=None, config_profile_path=None,
-+		config_incrementals=None, config_root="/", target_root="/"):
- 
- 		self.already_in_regenerate = 0
- 
-@@ -960,13 +961,32 @@
- 			self.uvlist     = copy.deepcopy(clone.uvlist)
- 			self.dirVirtuals = copy.deepcopy(clone.dirVirtuals)
- 			self.treeVirtuals = copy.deepcopy(clone.treeVirtuals)
-+			config_root = self.backupenv["PORTAGE_CONFIGROOT"]
-+			target_root = self.backupenv["ROOT"]
- 		else:
-+
-+			# backupenv is for calculated incremental variables.
-+			self.backupenv = os.environ.copy()
-+
-+			config_root = config_root.rstrip(os.path.sep) + os.path.sep
-+			target_root = target_root.rstrip(os.path.sep) + os.path.sep
-+
-+			for k, v in (("PORTAGE_CONFIGROOT", config_root),
-+				("ROOT", target_root)):
-+				if not os.path.isdir(v):
-+					writemsg("!!! Error: %s='%s' is not a directory. Please correct this.\n" % (k, v))
-+					raise portage_exception.DirectoryNotFound(v)
-+
-+			self.backupenv["PORTAGE_CONFIGROOT"] = config_root
-+			self.backupenv["ROOT"] = target_root
-+
- 			self.depcachedir = DEPCACHE_PATH
- 
- 			if not config_profile_path:
--				writemsg("config_profile_path not specified to class config\n")
--				if os.path.isdir(PROFILE_PATH):
--					self.profile_path = PROFILE_PATH
-+				config_profile_path = \
-+					os.path.join(config_root, PROFILE_PATH.lstrip(os.path.sep))
-+				if os.path.isdir(config_profile_path):
-+					self.profile_path = config_profile_path
- 				else:
- 					self.profile_path = None
- 			else:
-@@ -980,7 +1000,8 @@
- 
- 			self.module_priority    = ["user","default"]
- 			self.modules            = {}
--			self.modules["user"]    = getconfig(MODULES_FILE_PATH)
-+			self.modules["user"] = getconfig(
-+				os.path.join(config_root, MODULES_FILE_PATH.lstrip(os.path.sep)))
- 			if self.modules["user"] is None:
- 				self.modules["user"] = {}
- 			self.modules["default"] = {
-@@ -990,7 +1011,7 @@
- 
- 			self.usemask=[]
- 			self.configlist=[]
--			self.backupenv={}
-+
- 			# back up our incremental variables:
- 			self.configdict={}
- 			# configlist will contain: [ globals, defaults, conf, pkg, auto, backupenv (incrementals), origenv ]
-@@ -1012,10 +1033,12 @@
- 			if os.environ.has_key("PORTAGE_CALLER") and os.environ["PORTAGE_CALLER"] == "repoman":
- 				pass
- 			else:
--				# XXX: This should depend on ROOT?
--				if os.path.exists("/"+CUSTOM_PROFILE_PATH):
--					self.user_profile_dir = os.path.normpath("/"+"///"+CUSTOM_PROFILE_PATH)
--					self.profiles.append(self.user_profile_dir[:])
-+				custom_prof = os.path.join(
-+					config_root, CUSTOM_PROFILE_PATH.lstrip(os.path.sep))
-+				if os.path.exists(custom_prof):
-+					self.user_profile_dir = custom_prof
-+					self.profiles.append(custom_prof)
-+				del custom_prof
- 
- 			self.packages_list = [grabfile_package(os.path.join(x, "packages")) for x in self.profiles]
- 			self.packages      = stack_lists(self.packages_list, incremental=1)
-@@ -1040,7 +1063,8 @@
- 			del use_defs_lists
- 
- 			try:
--				mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) for x in self.profiles+["/etc"]]
-+				mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) \
-+					for x in self.profiles + [os.path.join(config_root, "etc")]]
- 				self.mygcfg   = stack_dicts(mygcfg_dlists, incrementals=portage_const.INCREMENTALS, ignore_none=1)
- 
- 				if self.mygcfg is None:
-@@ -1075,8 +1099,9 @@
- 			self.configdict["defaults"]=self.configlist[-1]
- 
- 			try:
--				# XXX: Should depend on root?
--				self.mygcfg=getconfig("/"+MAKE_CONF_FILE,allow_sourcing=True)
-+				self.mygcfg = getconfig(
-+					os.path.join(config_root, MAKE_CONF_FILE.lstrip(os.path.sep)),
-+					allow_sourcing=True)
- 				if self.mygcfg is None:
- 					self.mygcfg = {}
- 			except SystemExit, e:
-@@ -1097,8 +1122,6 @@
- 			self.configlist.append({})
- 			self.configdict["auto"]=self.configlist[-1]
- 
--			#backup-env (for recording our calculated incremental variables:)
--			self.backupenv = os.environ.copy()
- 			self.configlist.append(self.backupenv) # XXX Why though?
- 			self.configdict["backupenv"]=self.configlist[-1]
- 
-@@ -1117,13 +1140,17 @@
- 				self.pkeywordsdict = {}
- 				self.punmaskdict = {}
- 			else:
--				locations = [self["PORTDIR"] + "/profiles", USER_CONFIG_PATH]
-+				abs_user_config = os.path.join(config_root,
-+					USER_CONFIG_PATH.lstrip(os.path.sep))
-+				locations = [os.path.join(self["PORTDIR"], "profiles"),
-+					abs_user_config]
- 				for ov in self["PORTDIR_OVERLAY"].split():
- 					ov = os.path.normpath(ov)
- 					if os.path.isdir(ov+"/profiles"):
- 						locations.append(ov+"/profiles")
- 
--				pusedict=grabdict_package(USER_CONFIG_PATH+"/package.use", recursive=1)
-+				pusedict = grabdict_package(
-+					os.path.join(abs_user_config, "package.use"), recursive=1)
- 				self.pusedict = {}
- 				for key in pusedict.keys():
- 					cp = dep_getkey(key)
-@@ -1132,7 +1159,9 @@
- 					self.pusedict[cp][key] = pusedict[key]
- 
- 				#package.keywords
--				pkgdict=grabdict_package(USER_CONFIG_PATH+"/package.keywords", recursive=1)
-+				pkgdict = grabdict_package(
-+					os.path.join(abs_user_config, "package.keywords"),
-+					recursive=1)
- 				self.pkeywordsdict = {}
- 				for key in pkgdict.keys():
- 					# default to ~arch if no specific keyword is given
-@@ -1152,7 +1181,9 @@
- 					self.pkeywordsdict[cp][key] = pkgdict[key]
- 
- 				#package.unmask
--				pkgunmasklines = grabfile_package(USER_CONFIG_PATH+"/package.unmask",recursive=1)
-+				pkgunmasklines = grabfile_package(
-+					os.path.join(abs_user_config, "package.unmask"),
-+					recursive=1)
- 				self.punmaskdict = {}
- 				for x in pkgunmasklines:
- 					mycatpkg=dep_getkey(x)
-@@ -1284,15 +1315,8 @@
- 		if mycpv:
- 			self.setcpv(mycpv)
- 
--		myroot = self.get("ROOT", "/")
--		myroot = myroot.rstrip(os.path.sep) + os.path.sep
--		if not os.path.exists(myroot):
--			writemsg("!!! Error: ROOT '%s' does not exist.  Please correct this.\n" % myroot)
--			raise portage_exception.DirectoryNotFound(myroot)
--		elif not os.path.isdir(myroot):
--			writemsg("!!! Error: ROOT '%s' is not a directory. Please correct this.\n" % myroot[:-1])
--			raise portage_exception.DirectoryNotFound(myroot)
--		self.backupenv["ROOT"] = myroot
-+		self.backupenv["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH
-+		self.backupenv["PORTAGE_PYM_PATH"] = PORTAGE_PYM_PATH
- 
- 		self._init_dirs()
- 
-@@ -1327,13 +1351,17 @@
- 				if group not in archlist and group[0] != '-':
- 					writemsg("!!! INVALID ACCEPT_KEYWORDS: %s\n" % str(group))
- 
--		if not os.path.islink(PROFILE_PATH) and \
-+		abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"],
-+			PROFILE_PATH.lstrip(os.path.sep))
-+		if not os.path.islink(abs_profile_path) and \
- 			os.path.exists(os.path.join(self["PORTDIR"], "profiles")):
--			writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % PROFILE_PATH)
-+			writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % abs_profile_path)
- 			writemsg("!!! It should point into a profile within %s/profiles/\n" % self["PORTDIR"])
- 			writemsg("!!! (You can safely ignore this message when syncing. It's harmless.)\n\n\n")
- 
--		if os.path.exists(USER_VIRTUALS_FILE):
-+		abs_user_virtuals = os.path.join(self["PORTAGE_CONFIGROOT"],
-+			USER_VIRTUALS_FILE.lstrip(os.path.sep))
-+		if os.path.exists(abs_user_virtuals):
- 			writemsg("\n!!! /etc/portage/virtuals is deprecated in favor of\n")
- 			writemsg("!!! /etc/portage/profile/virtuals. Please move it to\n")
- 			writemsg("!!! this new location.\n\n")
-@@ -6860,9 +6888,14 @@
- 	archlist, features, groups, pkglines, thirdpartymirrors, usedefaults, \
- 	profiledir, flushmtimedb
- 
-+	kwargs = {}
-+	for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):
-+		kwargs[k] = os.environ.get(envvar, "/")
-+
- 	try:
--		settings = config(config_profile_path=PROFILE_PATH,
--			config_incrementals=portage_const.INCREMENTALS)
-+		settings = config(
-+			config_incrementals=portage_const.INCREMENTALS, **kwargs)
-+		del kwargs
- 	except portage_exception.DirectoryNotFound, e:
- 		writemsg("!!! Directory Not Found: %s\n" % str(e))
- 		sys.exit(1)
-
diff --git a/sys-apps/portage/files/2.1/pre10/1010_r3292_bug_131820_noauto.patch b/sys-apps/portage/files/2.1/pre10/1010_r3292_bug_131820_noauto.patch
deleted file mode 100644
index 8b882e13c75d..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1010_r3292_bug_131820_noauto.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-=== modified file 'bin/emerge'
---- bin/emerge	
-+++ bin/emerge	
-@@ -168,8 +168,13 @@
- portage.portdb.freeze()
- 
- # Kill noauto as it will break merges otherwise.
--while 'noauto' in portage.settings.features:
--	portage.settings.features.remove('noauto')
-+if "noauto" in portage.settings.features:
-+	while "noauto" in portage.settings.features:
-+		portage.settings.features.remove("noauto")
-+	portage.settings.unlock()
-+	portage.settings["FEATURES"] = " ".join(portage.settings.features)
-+	portage.settings.backup_changes("FEATURES")
-+	portage.settings.lock()
- 
- #number of ebuilds merged
- merged=0
-
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1287,7 +1287,12 @@
- 			self["PORTDIR_OVERLAY"] = string.join(new_ov)
- 			self.backup_changes("PORTDIR_OVERLAY")
- 
--		self.regenerate()
-+		# XXX
-+		# The below self.regenerate() causes previous changes to FEATURES (and 
-+		# other incrementals) to be reverted.  If this instance is a clone, we
-+		# need to skip regenerate() so that the copied values are preserved.
-+		if clone is None:
-+			self.regenerate()
- 
- 		self.features = portage_util.unique_array(self["FEATURES"].split())
- 
-
diff --git a/sys-apps/portage/files/2.1/pre10/1020_r3293_bug_131820_noauto.patch b/sys-apps/portage/files/2.1/pre10/1020_r3293_bug_131820_noauto.patch
deleted file mode 100644
index e54cd0050254..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1020_r3293_bug_131820_noauto.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1287,14 +1287,18 @@
- 			self["PORTDIR_OVERLAY"] = string.join(new_ov)
- 			self.backup_changes("PORTDIR_OVERLAY")
- 
--		# XXX
--		# The below self.regenerate() causes previous changes to FEATURES (and 
--		# other incrementals) to be reverted.  If this instance is a clone, we
--		# need to skip regenerate() so that the copied values are preserved.
- 		if clone is None:
- 			self.regenerate()
--
--		self.features = portage_util.unique_array(self["FEATURES"].split())
-+			self.features = portage_util.unique_array(self["FEATURES"].split())
-+		else:
-+			# XXX
-+			# The below self.regenerate() causes previous changes to FEATURES (and 
-+			# other incrementals) to be reverted.  If this instance is a clone, we
-+			# need to skip regenerate() so that the copied values are preserved.
-+			self.features = portage_util.unique_array(self["FEATURES"].split())
-+			self.regenerate()
-+			self["FEATURES"] = " ".join(self.features)
-+			self.backup_changes("FEATURES")
- 
- 		#XXX: Should this be temporary? Is it possible at all to have a default?
- 		if "gpg" in self.features:
-
diff --git a/sys-apps/portage/files/2.1/pre10/1030_r3304_fetch_digests.patch b/sys-apps/portage/files/2.1/pre10/1030_r3304_fetch_digests.patch
deleted file mode 100644
index 9fa705defe09..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1030_r3304_fetch_digests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Modified: pym/portage.py
-===================================================================
---- pym/portage.py	2006-05-02 06:11:35 UTC (rev 3303)
-+++ pym/portage.py	2006-05-02 06:22:19 UTC (rev 3304)
-@@ -1881,10 +1881,8 @@
- 		if try_mirrors:
- 			mymirrors += [x.rstrip("/") for x in mysettings["GENTOO_MIRRORS"].split() if x]
- 
--	mydigests = {}
--	digestfn  = mysettings["FILESDIR"]+"/digest-"+mysettings["PF"]
--	if os.path.exists(digestfn):
--		mydigests = digestParseFile(digestfn)
-+	mydigests = Manifest(
-+		mysettings["O"], mysettings["DISTDIR"]).getTypeDigests("DIST")
- 
- 	fsmirrors = []
- 	for x in range(len(mymirrors)-1,-1,-1):
diff --git a/sys-apps/portage/files/2.1/pre10/1040_r3306_bug_117509_xterm.patch b/sys-apps/portage/files/2.1/pre10/1040_r3306_bug_117509_xterm.patch
deleted file mode 100644
index fc1c5a3a36a2..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1040_r3306_bug_117509_xterm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Modified: pym/output.py
-===================================================================
---- pym/output.py	2006-05-02 09:31:04 UTC (rev 3305)
-+++ pym/output.py	2006-05-02 13:08:53 UTC (rev 3306)
-@@ -173,7 +173,7 @@
- 		legal_terms = ["xterm","Eterm","aterm","rxvt","screen","kterm","rxvt-unicode","gnome"]
- 		for term in legal_terms:
- 			if myt.startswith(term):
--				sys.stderr.write("\x1b]2;"+str(mystr)+"\x07")
-+				sys.stderr.write("\x1b]0;"+str(mystr)+"\x07")
- 				sys.stderr.flush()
- 				break
diff --git a/sys-apps/portage/files/2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch b/sys-apps/portage/files/2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch
deleted file mode 100644
index 0c3dfb2eb40c..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1050_r3313_bug_126692_cache_corruption.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Modified: pym/cache/util.py
-===================================================================
---- pym/cache/util.py	2006-05-03 17:07:02 UTC (rev 3312)
-+++ pym/cache/util.py	2006-05-03 19:02:34 UTC (rev 3313)
-@@ -41,7 +41,13 @@
- 			pass
- 
- 		if write_it:
--			if entry.get("INHERITED",""):
-+			try:
-+				inherited = entry.get("INHERITED", None)
-+			except cache_errors.CacheError, ce:
-+				noise.exception(x, ce)
-+				del ce
-+				continue
-+			if inherited:
- 				if src_cache.complete_eclass_entries:
- 					if not "_eclasses_" in entry:
- 						noise.corruption(x,"missing _eclasses_ field")
diff --git a/sys-apps/portage/files/2.1/pre10/1060_r3317_bug_132182_assume_digests.patch b/sys-apps/portage/files/2.1/pre10/1060_r3317_bug_132182_assume_digests.patch
deleted file mode 100644
index 2ba14e6e09e9..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1060_r3317_bug_132182_assume_digests.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Modified: pym/portage.py
-===================================================================
---- pym/portage.py	2006-05-03 23:00:08 UTC (rev 3316)
-+++ pym/portage.py	2006-05-04 02:44:01 UTC (rev 3317)
-@@ -2222,7 +2222,8 @@
- 		fetchlist_dict=FetchlistDict(mysettings["O"], mysettings, myportdb))
- 	writemsg(">>> Creating Manifest for %s\n" % mysettings["O"])
- 	try:
--		mf.create(assumeDistfileHashes=True, requiredDistfiles=myarchives)
-+		mf.create(requiredDistfiles=myarchives, assumeDistHashesSometimes=True,
-+			assumeDistHashesAlways=("assume-digests" in mysettings.features))
- 	except portage_exception.FileNotFound, e:
- 		writemsg("!!! File %s doesn't exist, can't update Manifest\n" % str(e))
- 		return 0
-
-Modified: pym/portage_manifest.py
-===================================================================
---- pym/portage_manifest.py	2006-05-03 23:00:08 UTC (rev 3316)
-+++ pym/portage_manifest.py	2006-05-04 02:44:01 UTC (rev 3317)
-@@ -400,16 +400,19 @@
- 				return t
- 		return None
- 	
--	def create(self, checkExisting=False, assumeDistfileHashes=True, requiredDistfiles=None):
--		""" Recreate this Manifest from scratch, not using any existing checksums
--		(exception: if assumeDistfileHashes is true then existing DIST checksums are
--		reused if the file doesn't exist in DISTDIR.  The requiredDistfiles
--		parameter specifies a list of distfiles to raise a FileNotFound
--		exception for (if no file or existing checksums are available), and
--		defaults to all distfiles when not specified."""
-+	def create(self, checkExisting=False, assumeDistHashesSometimes=False,
-+		assumeDistHashesAlways=False, requiredDistfiles=None):
-+		""" Recreate this Manifest from scratch.  This will not use any
-+		existing checksums unless assumeDistHashesSometimes or
-+		assumeDistHashesAlways is true (assumeDistHashesSometimes will only
-+		cause DIST checksums to be reused if the file doesn't exist in
-+		DISTDIR).  The requiredDistfiles parameter specifies a list of
-+		distfiles to raise a FileNotFound exception for (if no file or existing
-+		checksums are available), and defaults to all distfiles when not
-+		specified."""
- 		if checkExisting:
- 			self.checkAllHashes()
--		if assumeDistfileHashes:
-+		if assumeDistHashesSometimes or assumeDistHashesAlways:
- 			distfilehashes = self.fhashdict["DIST"]
- 		else:
- 			distfilehashes = {}
-@@ -446,12 +449,16 @@
- 			requiredDistfiles = distlist.copy()
- 		for f in distlist:
- 			fname = os.path.join(self.distdir, f)
--			if os.path.exists(fname):
--				self.fhashdict["DIST"][f] = perform_multiple_checksums(fname, self.hashes)
--			elif assumeDistfileHashes and f in distfilehashes:
-+			if f in distfilehashes and (assumeDistHashesAlways or \
-+				(assumeDistHashesSometimes and not os.path.exists(fname))):
- 				self.fhashdict["DIST"][f] = distfilehashes[f]
--			elif f in requiredDistfiles:
--					raise FileNotFound(fname)
-+			else:
-+				try:
-+					self.fhashdict["DIST"][f] = perform_multiple_checksums(fname, self.hashes)
-+				except FileNotFound:
-+					if f in requiredDistfiles:
-+						raise
-+
- 	def _pkgdir_category(self):
- 		return self.pkgdir.rstrip(os.sep).split(os.sep)[-2]
diff --git a/sys-apps/portage/files/2.1/pre10/1070_r3320_bug_132338_config_clone.patch b/sys-apps/portage/files/2.1/pre10/1070_r3320_bug_132338_config_clone.patch
deleted file mode 100644
index a50eb6b78a88..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1070_r3320_bug_132338_config_clone.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-=== modified file 'pym/portage.py'
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -1292,13 +1292,15 @@
- 			self.features = portage_util.unique_array(self["FEATURES"].split())
- 		else:
- 			# XXX
--			# The below self.regenerate() causes previous changes to FEATURES (and 
--			# other incrementals) to be reverted.  If this instance is a clone, we
--			# need to skip regenerate() so that the copied values are preserved.
--			self.features = portage_util.unique_array(self["FEATURES"].split())
-+			# The below self.regenerate() causes previous changes to FEATURES
-+			# (and other incrementals) to be reverted.  If this instance is a
-+			# clone, we need to take the cloned FEATURES from backupenv and
-+			# save them where the regenerate() call will not destroy them.
-+			# Later, we use backup_changes() to restore the cloned FEATURES
-+			# into the backupenv once again.
-+			self.features = portage_util.unique_array(
-+				self.backupenv["FEATURES"].split())
- 			self.regenerate()
--			self["FEATURES"] = " ".join(self.features)
--			self.backup_changes("FEATURES")
- 
- 		#XXX: Should this be temporary? Is it possible at all to have a default?
- 		if "gpg" in self.features:
-@@ -1314,7 +1316,7 @@
- 				self.features.remove("usersandbox")
- 
- 		self.features.sort()
--		self["FEATURES"] = " ".join(["-*"]+self.features)
-+		self["FEATURES"] = " ".join(self.features)
- 		self.backup_changes("FEATURES")
- 
- 		if not len(self["CBUILD"]) and len(self["CHOST"]):
-@@ -1501,6 +1503,14 @@
- 			myincrementals=["USE"]
- 		else:
- 			myincrementals=portage_const.INCREMENTALS
-+
-+		# If self.features exists, it has already been stacked and may have
-+		# been mutated, so don't stack it again or else any mutations will be
-+		# reverted.
-+		if "FEATURES" in myincrementals and hasattr(self, "features"):
-+			myincrementals = set(myincrementals)
-+			myincrementals.remove("FEATURES")
-+
- 		for mykey in myincrementals:
- 			if mykey=="USE":
- 				mydbs=self.uvlist
-
diff --git a/sys-apps/portage/files/2.1/pre10/1080_r3321_bug_132373_search_digest.patch b/sys-apps/portage/files/2.1/pre10/1080_r3321_bug_132373_search_digest.patch
deleted file mode 100644
index a35f48e9b577..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1080_r3321_bug_132373_search_digest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Modified: bin/emerge
-===================================================================
---- bin/emerge	2006-05-05 18:10:20 UTC (rev 3320)
-+++ bin/emerge	2006-05-05 21:04:04 UTC (rev 3321)
-@@ -800,13 +800,16 @@
- 						pkgdir, portage.settings["DISTDIR"])
- 					fetchlist = portage.portdb.getfetchlist(mycpv,
- 						mysettings=portage.settings, all=True)[1]
--					mysum[0] = mf.getDistfilesSize(fetchlist)
--					mystr = str(mysum[0]/1024)
--					mycount=len(mystr)
--					while (mycount > 3):
--						mycount-=3
--						mystr=mystr[:mycount]+","+mystr[mycount:]
--					mysum[0]=mystr+" kB"
-+					try:
-+						mysum[0] = mf.getDistfilesSize(fetchlist)
-+						mystr = str(mysum[0]/1024)
-+						mycount=len(mystr)
-+						while (mycount > 3):
-+							mycount-=3
-+							mystr=mystr[:mycount]+","+mystr[mycount:]
-+						mysum[0]=mystr+" kB"
-+					except KeyError, e:
-+						mysum[0] = "Unknown (missing digest for %s)" % str(e)
- 
- 					if "--quiet" not in myopts:
- 						print "     ", darkgreen("Latest version available:"),myversion
diff --git a/sys-apps/portage/files/2.1/pre10/1090_r3324_bug_132410_missing_digest.patch b/sys-apps/portage/files/2.1/pre10/1090_r3324_bug_132410_missing_digest.patch
deleted file mode 100644
index 1e3351d13c23..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1090_r3324_bug_132410_missing_digest.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- pym/portage.py	
-+++ pym/portage.py	
-@@ -2315,18 +2315,26 @@
- 		if strict:
- 			return 0
- 	mf = Manifest(pkgdir, mysettings["DISTDIR"])
-+	okaymsg = " ;-)\n"
- 	try:
--		writemsg_stdout(">>> checking ebuild checksums\n")
-+		writemsg_stdout(">>> checking ebuild checksums")
- 		mf.checkTypeHashes("EBUILD")
--		writemsg_stdout(">>> checking auxfile checksums\n")
-+		writemsg_stdout(okaymsg)
-+		writemsg_stdout(">>> checking auxfile checksums")
- 		mf.checkTypeHashes("AUX")
--		writemsg_stdout(">>> checking miscfile checksums\n")
-+		writemsg_stdout(okaymsg)
-+		writemsg_stdout(">>> checking miscfile checksums")
- 		mf.checkTypeHashes("MISC", ignoreMissingFiles=True)
--		writemsg_stdout(">>> checking distfiles checksums\n")
-+		writemsg_stdout(okaymsg)
- 		for f in myfiles:
-+			writemsg_stdout(">>> checking %s" % f)
- 			mf.checkFileHashes(mf.findFile(f), f)
-+			writemsg_stdout(okaymsg)
-+	except KeyError, e:
-+		writemsg("\n!!! Missing digest for %s\n" % str(e))
-+		return 0
- 	except portage_exception.DigestException, e:
--		writemsg("!!! Digest verification failed:\n")
-+		writemsg("\n!!! Digest verification failed:\n")
- 		writemsg("!!! %s\n" % e.value[0])
- 		writemsg("!!! Reason: %s\n" % e.value[1])
- 		writemsg("!!! Got: %s\n" % e.value[2])
diff --git a/sys-apps/portage/files/2.1/pre10/1100_r3326_bug_132442_root_clone.patch b/sys-apps/portage/files/2.1/pre10/1100_r3326_bug_132442_root_clone.patch
deleted file mode 100644
index 778d0e1ee4c0..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1100_r3326_bug_132442_root_clone.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Modified: pym/portage.py
-===================================================================
---- pym/portage.py	2006-05-06 13:23:02 UTC (rev 3325)
-+++ pym/portage.py	2006-05-06 18:37:18 UTC (rev 3326)
-@@ -977,9 +977,6 @@
- 					writemsg("!!! Error: %s='%s' is not a directory. Please correct this.\n" % (k, v))
- 					raise portage_exception.DirectoryNotFound(v)
- 
--			self.backupenv["PORTAGE_CONFIGROOT"] = config_root
--			self.backupenv["ROOT"] = target_root
--
- 			self.depcachedir = DEPCACHE_PATH
- 
- 			if not config_profile_path:
-@@ -1329,6 +1326,11 @@
- 		self.backupenv["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH
- 		self.backupenv["PORTAGE_PYM_PATH"] = PORTAGE_PYM_PATH
- 
-+		self["PORTAGE_CONFIGROOT"] = config_root
-+		self.backup_changes("PORTAGE_CONFIGROOT")
-+		self["ROOT"] = target_root
-+		self.backup_changes("ROOT")
-+
- 		self._init_dirs()
- 
- 	def _init_dirs(self):
diff --git a/sys-apps/portage/files/2.1/pre10/1110_r3330_bug_130395_homedir.patch b/sys-apps/portage/files/2.1/pre10/1110_r3330_bug_130395_homedir.patch
deleted file mode 100644
index 0fef2982d2e0..000000000000
--- a/sys-apps/portage/files/2.1/pre10/1110_r3330_bug_130395_homedir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Modified: bin/ebuild.sh
-===================================================================
---- bin/ebuild.sh	2006-05-07 20:36:02 UTC (rev 3329)
-+++ bin/ebuild.sh	2006-05-08 01:28:20 UTC (rev 3330)
-@@ -719,7 +719,7 @@
- 		chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null
- 	fi
- 
--	rm -rf "${PORTAGE_BUILDDIR}/image"
-+	rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir"
- 
- 	if ! hasq keeptemp $FEATURES; then
- 		rm -rf "${T}"
-
-Modified: pym/portage.py
-===================================================================
---- pym/portage.py	2006-05-07 20:36:02 UTC (rev 3329)
-+++ pym/portage.py	2006-05-08 01:28:20 UTC (rev 3330)
-@@ -2462,7 +2462,6 @@
- 
- 
- 	mysettings["BUILD_PREFIX"] = mysettings["PORTAGE_TMPDIR"]+"/portage"
--	mysettings["HOME"]         = mysettings["BUILD_PREFIX"]+"/homedir"
- 	mysettings["PKG_TMPDIR"]   = mysettings["PORTAGE_TMPDIR"]+"/binpkgs"
- 	
- 	# Package {pre,post}inst and {pre,post}rm may overlap, so they must have separate
-@@ -2472,6 +2471,7 @@
- 	else:
- 		mysettings["PORTAGE_BUILDDIR"] = os.path.join(mysettings["BUILD_PREFIX"], mysettings["PF"])
- 
-+	mysettings["HOME"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "homedir")
- 	mysettings["WORKDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "work")
- 	mysettings["D"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "image") + os.sep
- 	mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre10-r4 b/sys-apps/portage/files/digest-portage-2.1_pre10-r4
deleted file mode 100644
index 3f6194aecb73..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre10-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ba74433ad7d1471074e79ac512ad6158 portage-2.1_pre10.tar.bz2 265067
-RMD160 5fa51f0ecc7ccf5072a9765c81cf3e0a593b1de2 portage-2.1_pre10.tar.bz2 265067
diff --git a/sys-apps/portage/portage-2.1_pre10-r4.ebuild b/sys-apps/portage/portage-2.1_pre10-r4.ebuild
deleted file mode 100644
index cfcb9a2832af..000000000000
--- a/sys-apps/portage/portage-2.1_pre10-r4.ebuild
+++ /dev/null
@@ -1,210 +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_pre10-r4.ebuild,v 1.1 2006/05/08 06:04:46 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 ~m68k ~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-r5"
-
-PROVIDE="virtual/portage"
-
-S=${WORKDIR}/${PN}-${PV}
-
-portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local my_patches="1000_r3291_bug_73350_configroot.patch
-		1010_r3292_bug_131820_noauto.patch
-		1020_r3293_bug_131820_noauto.patch
-		1030_r3304_fetch_digests.patch
-		1040_r3306_bug_117509_xterm.patch
-		1050_r3313_bug_126692_cache_corruption.patch
-		1060_r3317_bug_132182_assume_digests.patch
-		1070_r3320_bug_132338_config_clone.patch
-		1080_r3321_bug_132373_search_digest.patch
-		1090_r3324_bug_132410_missing_digest.patch
-		1100_r3326_bug_132442_root_clone.patch
-		1110_r3330_bug_130395_homedir.patch"
-	local patches_dir="${PV%_*}/${PV/*_}"
-	for patch_name in ${my_patches}; do
-		einfo "Applying ${patch_name} ..."
-		patch -p0 --no-backup-if-mismatch < \
-			"${FILESDIR}"/${patches_dir}/${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
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/sed
-	fi
-	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."
-
-	portage_docs
-}