Bugfix release for 2.1

Package-Manager: portage-2509-svn

6 files changed, 15 insertions, 46 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index df29c7f12d13..e6f7968d80cd 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.59 2005/12/31 03:17:02 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.60 2005/12/31 07:25:17 jstubbs Exp $
 
 # See the gentoo-src Portage ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*portage-2.1_pre3 (31 Dec 2005)
+
+  31 Dec 2005; Jason Stubbs <jstubbs@gentoo.org>
+  +portage-2.1_pre3.ebuild:
+  Bug fix release for 2.1.
+
 *portage-2.0.54 (31 Dec 2005)
 
   31 Dec 2005; Jason Stubbs <jstubbs@gentoo.org>
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c41b4cd22f1c..7e61114ae7ac 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aa190327191798e46b4e2ac3e7c0d5ec ChangeLog 2725
+MD5 d97349b30e0f2dab0838753dcfb4a678 ChangeLog 2863
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
-MD5 d1f288b00103bbffaf09651615dc97ca files/dep_zapdeps.patch 1325
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
 MD5 ca24230fc57489944e69c7dd6aaa88b3 files/digest-portage-2.0.53 67
 MD5 4101f8f17ec33dc7b8c39e4d318cb79d files/digest-portage-2.0.54 67
-MD5 91b9d8bfe9d78f862a501b51754755be files/digest-portage-2.1_pre2 69
+MD5 27384bf8f13f5f4f633f79c735c98dba files/digest-portage-2.1_pre3 69
 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
 MD5 9ee139d992535438d3e51a4842e7dc13 portage-2.0.51.22-r3.ebuild 5745
 MD5 3ecd328547abf187d4880541e16a1f95 portage-2.0.53.ebuild 3653
 MD5 cd1e4d4b0b9c94702261818a26aef134 portage-2.0.54.ebuild 3665
-MD5 f778ca91770efc76c4895fd397e0c10a portage-2.1_pre2.ebuild 4397
+MD5 035e818019685712d4034d5e8f278250 portage-2.1_pre3.ebuild 4345
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDtfiFxvWNPsk/ZP4RApbQAKCaqXM/V/wQHB/0pHkT3Tsy4oBtlwCgp08J
-nbIYKbhl9WaXb8JRG0DgEVw=
-=cqim
+iD8DBQFDtjKyxvWNPsk/ZP4RAoE9AJ9D2M+e9uAw/mQMQKv9l2qH00U4agCgmnY5
+2UyGIOddkw1SEc1YTDpczRs=
+=hIhS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/dep_zapdeps.patch b/sys-apps/portage/files/dep_zapdeps.patch
deleted file mode 100644
index 8ba0eefa3e21..000000000000
--- a/sys-apps/portage/files/dep_zapdeps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -uNr portage-2.1_pre2/pym/portage.py portage-2.1_pre2-patched/pym/portage.py
---- portage-2.1_pre2/pym/portage.py	2005-12-25 13:54:35.000000000 +0900
-+++ portage-2.1_pre2-patched/pym/portage.py	2005-12-25 15:55:57.000000000 +0900
-@@ -3159,7 +3159,7 @@
- 			atoms = dep_zapdeps(dep, satisfied, myroot, use_binaries=use_binaries)
- 		else:
- 			atoms = [dep]
--		missing_atoms = [atom for atom in atoms if not db[myroot]["vartree"].dbapi.match(dep_getkey(atom))]
-+		missing_atoms = [atom for atom in atoms if not db[myroot]["vartree"].dbapi.match(atom)]
- 
- 		if not missing_atoms:
- 			if isinstance(dep, list):
-@@ -3176,6 +3176,12 @@
- 			if not missing_atoms:
- 				target = (dep, satisfied)
- 
-+	if not target:
-+		if isinstance(deps[0], list):
-+			return dep_zapdeps(deps[0], satisfieds[0], myroot, use_binaries=use_binaries)
-+		else:
-+			return [deps[0]]
-+
- 	if isinstance(target, tuple): # Nothing matching installed
- 		if isinstance(target[0], list): # ... and the first available was a sublist
- 			return dep_zapdeps(target[0], target[1], myroot, use_binaries=use_binaries)
-@@ -3196,7 +3202,7 @@
- 		available_pkgs[pkg] = atom
- 
- 	if not available_pkgs:
--		return [unreduced[0]] # All masked
-+		return [relevant_atoms[0]] # All masked
- 
- 	target_pkg = best(available_pkgs.keys())
- 	suitable_atom = available_pkgs[target_pkg]
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre2 b/sys-apps/portage/files/digest-portage-2.1_pre2
deleted file mode 100644
index 5a3681055ae2..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9db320fc2380402d01ac47f3de41c801 portage-2.1_pre2.tar.bz2 247250
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre3 b/sys-apps/portage/files/digest-portage-2.1_pre3
new file mode 100644
index 000000000000..3ba10b0ec641
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1_pre3
@@ -0,0 +1 @@
+MD5 e64ac58e6e6a71f60eac3fc547379032 portage-2.1_pre3.tar.bz2 248017
diff --git a/sys-apps/portage/portage-2.1_pre2.ebuild b/sys-apps/portage/portage-2.1_pre3.ebuild
index 13f4bacf1bef..9713fde074de 100644
--- a/sys-apps/portage/portage-2.1_pre2.ebuild
+++ b/sys-apps/portage/portage-2.1_pre3.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.1_pre2.ebuild,v 1.2 2005/12/26 15:53:21 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre3.ebuild,v 1.1 2005/12/31 07:25:17 jstubbs Exp $
 
 inherit toolchain-funcs
 
@@ -22,8 +22,6 @@ S=${WORKDIR}/${PN}-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/dep_zapdeps.patch
 }
 
 src_compile() {