2.0.53_rc5 - the last rc?

Package-Manager: portage-1.524.2.76-cvs

5 files changed, 7 insertions, 76 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7e26df5ec2ef..de16ce0e87be 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,19 +4,18 @@ Hash: SHA1
 MD5 bee328fe9e36c1f64e2052f82a84caa3 ChangeLog 1231
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
-MD5 300a16d3815f2bc5de26e422b4743c20 files/2.0.53_rc4-extras.patch 1899
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
-MD5 e7dd6886b72835785333e5c081009a4a files/digest-portage-2.0.53_rc4 71
+MD5 e78f188ee88c7cb5b3ee471749004a79 files/digest-portage-2.0.53_rc5 71
 MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
 MD5 c292522590607e4bae9337f1097e194f portage-2.0.51.22-r3.ebuild 5708
-MD5 5a216de25fa2a854aa5db1440bc990be portage-2.0.53_rc4.ebuild 3689
+MD5 2c8c946b6259a5432bcd08203655bb68 portage-2.0.53_rc5.ebuild 3689
 MD5 c7250b47d02fe3891edabf2a687dc0ce portage-2.1.0_alpha20050718.ebuild 2573
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDRCYSxvWNPsk/ZP4RAtPiAJoC2TvP/vU/Tldo/t4KU+MAkJZnPgCgpbPs
-oIbhglMMjkSx3nY6qu+DZJA=
-=5Aw4
+iD8DBQFDSgD9xvWNPsk/ZP4RAqXeAJ49Pr/V2TcOXmOEEplJz/fsP4xavACgrdKH
+koLdtxcUunUOZTCg0E8qHjQ=
+=KOun
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.0.53_rc4-extras.patch b/sys-apps/portage/files/2.0.53_rc4-extras.patch
deleted file mode 100644
index 940899545089..000000000000
--- a/sys-apps/portage/files/2.0.53_rc4-extras.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- bin/emerge	(revision 2106)
-+++ bin/emerge	(working copy)
-@@ -1827,6 +1827,7 @@
- 
- 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
- 			self.pkgsettings.backup_changes("EMERGE_FROM")
-+			self.pkgsettings.reset()
- 
- 			#buildsyspkg: Check if we need to _force_ binary package creation
- 			issyspkg = ("buildsyspkg" in myfeat) \
---- bin/ebuild	(revision 2107)
-+++ bin/ebuild	(working copy)
-@@ -44,52 +44,15 @@
- 	reload(portage)
- 
- 
--if "noauto" in portage.features:
--
--	arglist = []
--	cleanse = False
--	for arg in pargs:
--		if arg == "clean":
--			cleanse = True
--		else:
--			arglist.append((arg, cleanse))
--			cleanse = False
--
--else:
--
--	cleanse = ("clean" in pargs)
--	while "clean" in pargs:
--		pargs.remove("clean")
--
--	actionmap_targets = filter(lambda x: x in portage.actionmap_deps, pargs)
--	others = filter(lambda x: x not in portage.actionmap_deps, pargs)
--
--	def recurse_it(target):
--		l = portage.actionmap_deps[target][:]
--		if l:
--			l.extend(map(recurse_it, l))
--		return l
--
--	kills = portage.unique_array(portage.flatten(map(recurse_it, actionmap_targets)))
--	actionmap_targets = filter(lambda x: x not in kills, actionmap_targets)
--	
--	arglist = []
--	for arg in actionmap_targets + others:
--		arglist.append((arg, cleanse))
--		cleanse = False
--
--if cleanse:
--	arglist.append(("clean", True))
--
--if len(arglist) > 1 and (("config", False) in arglist or ("config", True) in arglist):
-+if len(pargs) > 1 and "config" in pargs:
- 	print "config must be called on it's own, not combined with any other phase"
- 	sys.exit(1)
- 
- 
--for arg in arglist:
-+for arg in pargs:
- 	try:
- 		tmpsettings = portage.config(clone=portage.settings)
--		a = portage.doebuild(ebuild, arg[0], root, tmpsettings, debug=debug, cleanup=arg[1])
-+		a = portage.doebuild(ebuild, arg, root, tmpsettings, debug=debug, cleanup=("noauto" not in portage.features))
- 	except KeyboardInterrupt:
- 		print "Interrupted."
- 		a = 1
diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc4 b/sys-apps/portage/files/digest-portage-2.0.53_rc4
deleted file mode 100644
index bf69570128d0..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.53_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69d9cbb422a1c18327eb3294102b36cc portage-2.0.53_rc4.tar.bz2 226290
diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc5 b/sys-apps/portage/files/digest-portage-2.0.53_rc5
new file mode 100644
index 000000000000..6d1d797ce287
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.53_rc5
@@ -0,0 +1 @@
+MD5 7cd7187b816dcf8a0eec3a1990bdcc4f portage-2.0.53_rc5.tar.bz2 226198
diff --git a/sys-apps/portage/portage-2.0.53_rc4.ebuild b/sys-apps/portage/portage-2.0.53_rc5.ebuild
index f5a62e714495..392ed4ea0a5a 100644
--- a/sys-apps/portage/portage-2.0.53_rc4.ebuild
+++ b/sys-apps/portage/portage-2.0.53_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc4.ebuild,v 1.1 2005/10/05 19:13:26 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc5.ebuild,v 1.1 2005/10/10 05:48:48 jstubbs Exp $
 
 inherit toolchain-funcs