2.0.53_rc3 release

Package-Manager: portage-1.524.2.76-cvs

4 files changed, 54 insertions, 9 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1f3cddbeeba8..6bb3dbb6fbcf 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 MD5 fc0f2ec6f18f9744037a47705057b9d1 ChangeLog 1108
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 MD5 f29e1e5ab80c7078b004e60002173ccb files/2.0.51.22-fixes.patch 9339
+MD5 1842c95301d35f46a1458b967d3c8fd4 files/2.0.53_rc2-to-rc3.patch 2017
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r2 70
-MD5 b295a36d15f82fa34eeb24929920b0ab files/digest-portage-2.0.53_rc2 71
+MD5 b295a36d15f82fa34eeb24929920b0ab files/digest-portage-2.0.53_rc3 71
 MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
 MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r2.ebuild 5708
-MD5 fb71edf86a44d8a79da19c49bfe60fbe portage-2.0.53_rc2.ebuild 3653
+MD5 12fab18de41960812bed2702a50cc145 portage-2.0.53_rc3.ebuild 3775
 MD5 7c109f64a1b96c1134ac490d0233fa3b portage-2.1.0_alpha20050718.ebuild 2566
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDP4hkxvWNPsk/ZP4RAiOSAKCSg463Md8x1dQLBRNt6uCJsk+vyQCfU8qL
-SJebyc56D8OKjIRmkZxkA7o=
-=2G5C
+iD8DBQFDP/nZxvWNPsk/ZP4RAjWnAJ9dZJP1JFilI0aB/CK66wt54NBwyQCdEIu0
+uPyv0q3FW0+LEA3Oce+6VC4=
+=34PK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch b/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch
new file mode 100644
index 000000000000..98786e749912
--- /dev/null
+++ b/sys-apps/portage/files/2.0.53_rc2-to-rc3.patch
@@ -0,0 +1,42 @@
+diff -uNr portage-2.0.53_rc2/bin/emerge portage-2.0.53_rc3/bin/emerge
+--- portage-2.0.53_rc2/bin/emerge	2005-10-02 13:21:56.000000000 +0900
++++ portage-2.0.53_rc3/bin/emerge	2005-10-02 23:50:57.000000000 +0900
+@@ -1489,7 +1489,7 @@
+ 			else:
+ 				if (x[0]!="binary") and ("fetch" in string.split(portage.portdb.aux_get(x[2],["RESTRICT"])[0])):
+ 					fetch = red("F")
+-					if portage.portdb.fetch_check(x[2], portage.settings):
++					if portage.portdb.fetch_check(x[2], self.applied_useflags[x[2]]):
+ 						fetch = green("f")
+ 
+ 				#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty"
+diff -uNr portage-2.0.53_rc2/pym/portage.py portage-2.0.53_rc3/pym/portage.py
+--- portage-2.0.53_rc2/pym/portage.py	2005-10-02 13:32:43.000000000 +0900
++++ portage-2.0.53_rc3/pym/portage.py	2005-10-02 23:52:46.000000000 +0900
+@@ -4,7 +4,7 @@
+ # $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $
+ 
+ 
+-VERSION="2.0.53_rc2"
++VERSION="2.0.53_rc3"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
+@@ -2759,7 +2759,7 @@
+ 			print "!!! mydo=qmerge, but install phase hasn't been ran"
+ 			sys.exit(1)
+ 		#qmerge is specifically not supposed to do a runtime dep check
+-		return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings)
++		return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings,myebuild=mysettings["EBUILD"])
+ 	elif mydo=="merge":
+ 		retval=spawnebuild("install",actionmap,mysettings,debug,alwaysdep=1,logfile=logfile)
+ 		if retval:
+@@ -5367,7 +5367,7 @@
+ 
+ 			if metadata["EAPI"] != portage_const.EAPI:
+ 				# intentionally wipe keys.
+-				map(lambda x: metadata.setdefault("x", ''), auxdbkeys)
++				map(lambda x: metadata.setdefault(x, ''), auxdbkeys)
+ 				metadata["EAPI"] == -1
+ 
+ 			else:
diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc2 b/sys-apps/portage/files/digest-portage-2.0.53_rc3
index ac48d55e01bf..ac48d55e01bf 100644
--- a/sys-apps/portage/files/digest-portage-2.0.53_rc2
+++ b/sys-apps/portage/files/digest-portage-2.0.53_rc3
diff --git a/sys-apps/portage/portage-2.0.53_rc2.ebuild b/sys-apps/portage/portage-2.0.53_rc3.ebuild
index 65db2c5a51b2..b50a10c84f5c 100644
--- a/sys-apps/portage/portage-2.0.53_rc2.ebuild
+++ b/sys-apps/portage/portage-2.0.53_rc3.ebuild
@@ -1,12 +1,13 @@
 # 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_rc2.ebuild,v 1.1 2005/10/02 07:11:55 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc3.ebuild,v 1.1 2005/10/02 15:15:54 jstubbs 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/~jstubbs/releases/${PN}-${PV}.tar.bz2"
+#SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
+SRC_URI="mirror://gentoo/portage-2.0.53_rc2.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/portage-2.0.53_rc2.tar.bz2"
 LICENSE="GPL-2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -16,11 +17,13 @@ IUSE="build selinux"
 DEPEND=">=dev-lang/python-2.2.1"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )"
 
-S=${WORKDIR}/${PN}-${PV}
+S=${WORKDIR}/portage-2.0.53_rc2
 
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	patch -p1 -s < ${FILESDIR}/2.0.53_rc2-to-rc3.patch
 }
 
 src_compile() {
@@ -56,7 +59,6 @@ src_install() {
 		newins make.conf make.conf.example
 	fi
 
-	Removing until next rc as the compile script points to python-2.2
 	if ! use ppc-macos; then
 		cd "${S}"/src/python-missingos
 		./setup.py install --root ${D} || die "Failed to install missingos module"