2.1_pre4-r1 regression fix release

Package-Manager: portage-2604-svn

5 files changed, 91 insertions, 7 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index fedef40e6f29..b088e3790d07 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.73 2006/01/28 07:28:43 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.74 2006/01/29 12:03:46 jstubbs Exp $
+
+  29 Jan 2006; Jason Stubbs <jstubbs@gentoo.org>
+  +portage-2.1_pre4-r1.ebuild:
+  Regression fix for ebuilds that use or deps without a default atom.
+  Also specifying version on pycrypto due to amd64 issues.
 
   28 Jan 2006; Jason Stubbs <jstubbs@gentoo.org>
   Add pycrypto dependency to 2.1_pre4.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7687e51a6436..c5deaedf936d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,13 +1,52 @@
-MD5 66726e79869558ea90aee29af7e7f16b ChangeLog 4258
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dad7d00ebd9e26bd3f59891a19e3afdb ChangeLog 4468
+RMD160 ba796a1b09d3f0284b6d96eb1ce89e3a0ad651f9 ChangeLog 4468
+SHA256 6260d6673b63fbea25483998a1536c8d895f819d35d63e8ae0c1e9334f3c4f90 ChangeLog 4468
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
+RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
+SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
+RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579
+SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579
+MD5 e3d8f54d06dce6fa8c4b9a9ff660f96e files/2.1_pre4-r1.patch 1581
+RMD160 6bb0f83e5c562b71ce63b2ab51af89144f28cce4 files/2.1_pre4-r1.patch 1581
+SHA256 057f3599ccda5f07091b3e9da51575fe56f3e9307e51224c68b9e63887ff99da files/2.1_pre4-r1.patch 1581
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
+RMD160 7a4eb3a3dd71444d5e67f55d6d81b5fb4e8803f7 files/README.RESCUE 1911
+SHA256 80c6f2910eec073805f5f421b200a34842ddd3333502e645d9f2a0a66282d399 files/README.RESCUE 1911
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
+RMD160 83622ce2dacdcd61f98cf30e2074f887dd704bf5 files/digest-portage-2.0.51.22-r3 70
+SHA256 b5dc4e877796440a39d3db5cd425e3ba3255184aff90fa69b3f484df433cd5ec files/digest-portage-2.0.51.22-r3 70
 MD5 ca24230fc57489944e69c7dd6aaa88b3 files/digest-portage-2.0.53 67
+RMD160 31981560e6fc52427f65c13e80068f2ac1b7a97a files/digest-portage-2.0.53 67
+SHA256 e5661b26e9c043f3794557ad15362848435ed610d187500185274c5a744c601d files/digest-portage-2.0.53 67
 MD5 4101f8f17ec33dc7b8c39e4d318cb79d files/digest-portage-2.0.54 67
-MD5 ab666914bfcfa91049d1df6dee3980b1 files/digest-portage-2.1_pre4 253
+RMD160 41074091123631ce46f52648e7d2489f135a467c files/digest-portage-2.0.54 67
+SHA256 107cb0415db823c2126df69b267bdf88607daa7df697240aad28384b8a081d32 files/digest-portage-2.0.54 67
+MD5 ab666914bfcfa91049d1df6dee3980b1 files/digest-portage-2.1_pre4-r1 253
+RMD160 441595004e217e45c80c5bb793709b2414bcf875 files/digest-portage-2.1_pre4-r1 253
+SHA256 c5fe2a7d208a3e73056160d113ebe433bd4f039b1d0edf0261afe657a47bdb57 files/digest-portage-2.1_pre4-r1 253
 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
+RMD160 ec986e8b7f4016018c27b127114f671a8a9304a8 metadata.xml 220
+SHA256 52eb00c9449f0740fbdd83232f30c5384ccda4ad35862fbb53deb91becd9b4ce metadata.xml 220
 MD5 041933f6c691e72021c0dc4340b525d2 portage-2.0.51.22-r3.ebuild 5796
+RMD160 25b81190a037096717f44060db6f96c40403c6cf portage-2.0.51.22-r3.ebuild 5796
+SHA256 030012a01342884e7d99ef02329a761b1f9b0e99c30976f1ccf8012d4caabb86 portage-2.0.51.22-r3.ebuild 5796
 MD5 74f65b9f31d3d8baef97314065d2d720 portage-2.0.53.ebuild 3696
+RMD160 4eeb5fabedcb6ab4f51c076218fbab279e31ec65 portage-2.0.53.ebuild 3696
+SHA256 f167640e6dfcaaf626a9dfd6614c1b712f895410eaa77ea23f524956167aa4eb portage-2.0.53.ebuild 3696
 MD5 5039dc82682399a41dfdf6e10384446b portage-2.0.54.ebuild 3697
-MD5 502187d339610ed099b70884a940ad5d portage-2.1_pre4.ebuild 4664
+RMD160 c63024b4a73e5b3a2462e2dc4eaea61510de6a26 portage-2.0.54.ebuild 3697
+SHA256 919667b991cbe8ab1439ceee4f1c96cf4ed0d2a68a8758798e18e01ee828bc22 portage-2.0.54.ebuild 3697
+MD5 670feedb9f42abe8a54cb0a51667f91e portage-2.1_pre4-r1.ebuild 4704
+RMD160 7abbc6f0a15996da456a7579a6a956cd4cd5da38 portage-2.1_pre4-r1.ebuild 4704
+SHA256 b7c09be4b08d362e38b795a6accbaab3a21db209855830ccaee7beba7da6ede4 portage-2.1_pre4-r1.ebuild 4704
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD3K84xvWNPsk/ZP4RAhZ5AKDBYtHZbmZxq9Lck9MeSrGAUOEfdgCcCLQP
+DMeH+l5RFR1PbZbfcIP+ts4=
+=8p7Y
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre4-r1.patch b/sys-apps/portage/files/2.1_pre4-r1.patch
new file mode 100644
index 000000000000..eeca37cedaa3
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre4-r1.patch
@@ -0,0 +1,38 @@
+diff -uNr portage-2.1_pre4/pym/portage.py portage-2.1_pre4-r1/pym/portage.py
+--- portage-2.1_pre4/pym/portage.py	2006-01-28 09:50:04.000000000 +0900
++++ portage-2.1_pre4-r1/pym/portage.py	2006-01-29 20:52:51.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.1_pre4"
++VERSION="2.1_pre4-r1"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
+@@ -3161,6 +3161,11 @@
+ 					return 1
+ 			elif x==1:
+ 					return 1
++		#XXX: unless there's no available atoms in the list
++		#in which case we need to assume that everything is
++		#okay as some ebuilds are relying on an old bug.
++		if len(deplist) == 1:
++			return 1
+ 		return 0
+ 	else:
+ 		for x in deplist:
+diff -uNr portage-2.1_pre4/pym/portage_dep.py portage-2.1_pre4-r1/pym/portage_dep.py
+--- portage-2.1_pre4/pym/portage_dep.py	2006-01-28 09:49:48.000000000 +0900
++++ portage-2.1_pre4-r1/pym/portage_dep.py	2006-01-29 20:52:51.000000000 +0900
+@@ -87,7 +87,9 @@
+ 			if additions:
+ 				rlist.append(additions)
+ 			elif rlist and rlist[-1] == "||":
+-				raise portage_exception.InvalidDependString("No default atom(s) in \""+paren_enclose(deparray)+"\"")
++			#XXX: Currently some DEPEND strings have || lists without default atoms.
++			#	raise portage_exception.InvalidDependString("No default atom(s) in \""+paren_enclose(deparray)+"\"")
++				rlist.append([])
+ 
+ 		else:
+ 			if head[-1] == "?": # Use reduce next group on fail.
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre4 b/sys-apps/portage/files/digest-portage-2.1_pre4-r1
index f9762f85aa4c..f9762f85aa4c 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre4
+++ b/sys-apps/portage/files/digest-portage-2.1_pre4-r1
diff --git a/sys-apps/portage/portage-2.1_pre4.ebuild b/sys-apps/portage/portage-2.1_pre4-r1.ebuild
index 010ff85af045..e27b2f33cc88 100644
--- a/sys-apps/portage/portage-2.1_pre4.ebuild
+++ b/sys-apps/portage/portage-2.1_pre4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_pre4.ebuild,v 1.3 2006/01/28 20:49:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre4-r1.ebuild,v 1.1 2006/01/29 12:03:46 jstubbs Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc-macos ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 SLOT="0"
 IUSE="build doc selinux"
@@ -22,7 +22,7 @@ RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
 		!userland_Darwin? ( app-misc/pax-utils sys-apps/sandbox ) \
 		selinux? ( >=dev-python/python-selinux-2.15 ) \
 		doc? ( app-portage/portage-manpages )
-		dev-python/pycrypto"
+		>=dev-python/pycrypto-2.0.1"
 
 PROVIDE="virtual/portage"
 
@@ -31,6 +31,8 @@ S=${WORKDIR}/${PN}-${PV}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/2.1_pre4-r1.patch
 }
 
 src_compile() {