Reorder any-of-many dependency for eselect, bug 271447.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

9 files changed, 32 insertions, 27 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 99139832d64a..d6113c7af6c7 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.625 2009/08/10 09:15:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.626 2009/08/19 16:36:18 ulm Exp $
+
+  19 Aug 2009; Ulrich Mueller <ulm@gentoo.org> portage-2.1.6.7.ebuild,
+  portage-2.1.6.13.ebuild, portage-2.2_rc33.ebuild, portage-2.2_rc35.ebuild,
+  portage-2.2_rc36.ebuild, portage-2.2_rc37.ebuild, portage-2.2_rc38.ebuild:
+  Reorder any-of-many dependency for eselect, bug 271447.
 
 *portage-2.2_rc38 (10 Aug 2009)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f23fae0d8ece..5fcaab32b18f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,19 +15,19 @@ DIST portage-2.2_rc37.patch.bz2 24066 RMD160 99cd9d488c73fdc599a6a5ae0278424a420
 DIST portage-2.2_rc38.patch.bz2 25756 RMD160 6e508dffda5d416c0cdb892fcd35a0da501d9e2d SHA1 2063e728072f424258acb0b484ed4b560b03162f SHA256 7a5820041257d30e5e130ba7580c8ddd615156ff59d4ce5d675b5502f77c38c7
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.4.5.ebuild 8038 RMD160 bbe69fdad5ee1226bccb1ccfdcf2d6cf6fb07f36 SHA1 d1177651b3af538eeda9de938ef791d584dbf197 SHA256 0277f7ee9197b4bb8747a7381f9b7ce8809b09aebcc30b7832b284a72ea4cd3c
-EBUILD portage-2.1.6.13.ebuild 10215 RMD160 58fb8c6c49fb72d488b7b750d945e211de1e8abf SHA1 f4ec18ae4b2660e7a2ecdb2253aeb0260d124393 SHA256 83b014ff8c799e8f56f4488e6684aff62061eddbec17bd095b29104a64a74780
-EBUILD portage-2.1.6.7.ebuild 8867 RMD160 f9353e1b287b79d2eb519c92915bffbc7311c463 SHA1 24f9b94d52c4e7b76313b98736a0c650a3ffd449 SHA256 4029dfa13c7460afbc7f8500c3327840df4c17fb3c3cedc30173262e2de7d495
-EBUILD portage-2.2_rc33.ebuild 10623 RMD160 ca1e72257d144f37ffc4e3f46d10985faa71e979 SHA1 7748084e5178731931f21158f40d5874891cc910 SHA256 c08c7be4068097f8611e832e93ae51b5f0141e37d7f016df49660c94f7e13af2
-EBUILD portage-2.2_rc35.ebuild 9907 RMD160 f45a95c80886af44509f7347f1100492d6cfefb6 SHA1 7786743bd8889be27a5942ffd04992aed28dc4db SHA256 63d3d8ab74939e554a66ba6f68316e05fdcceae4869f58736f4527c9073d89cf
-EBUILD portage-2.2_rc36.ebuild 9915 RMD160 aacdc58e7fefe0a44768647cd7db748e47cdf364 SHA1 ac7eb9559053d047681cfcc83d5a73a7a1a2972d SHA256 10875c47c3e33df2f30865f12e26266f85e4e572d04e71424c6a6701ece2b3c4
-EBUILD portage-2.2_rc37.ebuild 9902 RMD160 94edb69f3b4475830bf53ce4f1f18f012c41e79e SHA1 48b04ed9f211e9ba29b56e3871fdccc70789349e SHA256 d859291564b1ff57dd897f5da1575e7792837f9df8547033f79b41450128225a
-EBUILD portage-2.2_rc38.ebuild 9902 RMD160 c54f4b1b0fe6afd859a68d35690e724458f20595 SHA1 bef91d2c6dc2d407233cc14c72c6ed7c9dc53fe1 SHA256 68c2c02382ab05d23b57b806f4e0fa0ef2540879a981a779d4a2d20d5cef4c14
-MISC ChangeLog 38039 RMD160 cb2c30efcfbd1a6575ac1c13209e24b500f8f9b2 SHA1 5bc4ca002d8c661aa2708109af21430898f68ade SHA256 9c50d22fbb2500d9449ddf84cd7f96fdc775d887b79c454ef55f61f4cd52a23d
+EBUILD portage-2.1.6.13.ebuild 10211 RMD160 8d9d95171980acf439af3f82b1b3ce4eae9348a9 SHA1 85cfe53cce8fe1a91b0373e5c4b4af61068dc918 SHA256 e82f4c2fc9b9f99a04f3da6e0da9cc8c7c969b0a3731c21303d51bf1c0448fe4
+EBUILD portage-2.1.6.7.ebuild 8863 RMD160 79a6496a6c0cdc8fb8d77c2f9394508d920ad518 SHA1 6a136c97499bcf499dd23685d67199724a45b11b SHA256 b7de5096a38c858ebe32f0448809aaea9b942971c5752c120b4b3fb203187e30
+EBUILD portage-2.2_rc33.ebuild 10619 RMD160 6eb7b8deba593bdc3fdd12ac10036433a6a451fc SHA1 7d6253f9c7bfcbc6b21ebe928729977a52572172 SHA256 ea781d7b7c34ba3d32d23a42dc5bf245871ce7c68a12fa5103f10016a4580f36
+EBUILD portage-2.2_rc35.ebuild 9903 RMD160 85ebd41d85ad0728bf87506b7a586ebe3a0ddb4d SHA1 19b80b63d3bf31a84ec6e9c27d98c61077402d21 SHA256 aa6e2a0b8dbbfce67de6f5bb16ee3fff81426378338caafef984b5d6e7c1f161
+EBUILD portage-2.2_rc36.ebuild 9911 RMD160 61ce62dfd0dc54414a6e43497ec170dd189a816b SHA1 a12e23d537fb468d464f603a62372faec14a9b66 SHA256 4312755b8be554b61626a652fcc8db7fbc033ebe565d910e427288da7e1b2079
+EBUILD portage-2.2_rc37.ebuild 9898 RMD160 8b4e70bc97e47f305c1f51f1742fb92e3823ddb7 SHA1 9101fc6a1644991f7cc0041eeadcfc265de72451 SHA256 a378a20d393cdecd620ebf16488867820225e8415d27f9d17aa4dfea412d4009
+EBUILD portage-2.2_rc38.ebuild 9898 RMD160 5012dfc04526843dfbb175ffe45a6afff66de9dc SHA1 5e1697a2bd51b91544e04482caf92512289163f1 SHA256 a54f7e6427d8b8b2081cd48f7aeaca791a859f6318a225019914470f6c06f5b8
+MISC ChangeLog 38319 RMD160 ba2284d076fff22db9fcb6871707d558f00ff54d SHA1 b355bfbeb4b43660c41c02500dd569a877acac7c SHA256 431172405e4939f911182e48ea8375b1223c9edee7814f8165adadcb132e7b52
 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkp/5VwACgkQ/ejvha5XGaNDvQCg7eKL8aJ+jw4Qavt8yZ96tvqS
-X3cAoIilGtncJj1AxlWKxzSPWvrS5hZr
-=HdEH
+iEYEARECAAYFAkqMKnwACgkQOeoy/oIi7uwKowCcCTr83n8oOkmpWCl//Zahl3yq
+hLQAn3UtfDt3+qfSiya34zkz3mOGUZ4g
+=JENQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild
index b7414ec97ee7..eb240e99c869 100644
--- a/sys-apps/portage/portage-2.1.6.13.ebuild
+++ b/sys-apps/portage/portage-2.1.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.12 2009/08/02 19:51:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.13 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild
index c63652c159c0..1f92a33afbba 100644
--- a/sys-apps/portage/portage-2.1.6.7.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.11 2009/08/02 19:51:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.12 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
diff --git a/sys-apps/portage/portage-2.2_rc33.ebuild b/sys-apps/portage/portage-2.2_rc33.ebuild
index 7f6b75ce94f9..ff3bbedf0ab6 100644
--- a/sys-apps/portage/portage-2.2_rc33.ebuild
+++ b/sys-apps/portage/portage-2.2_rc33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.6 2009/08/02 19:51:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.7 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
diff --git a/sys-apps/portage/portage-2.2_rc35.ebuild b/sys-apps/portage/portage-2.2_rc35.ebuild
index 2ee16e7893b1..e2e617ab85c9 100644
--- a/sys-apps/portage/portage-2.2_rc35.ebuild
+++ b/sys-apps/portage/portage-2.2_rc35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc35.ebuild,v 1.1 2009/08/04 00:42:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc35.ebuild,v 1.2 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
diff --git a/sys-apps/portage/portage-2.2_rc36.ebuild b/sys-apps/portage/portage-2.2_rc36.ebuild
index 5ae189f4bf2e..d4b24c95948a 100644
--- a/sys-apps/portage/portage-2.2_rc36.ebuild
+++ b/sys-apps/portage/portage-2.2_rc36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc36.ebuild,v 1.1 2009/08/05 01:13:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc36.ebuild,v 1.2 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
diff --git a/sys-apps/portage/portage-2.2_rc37.ebuild b/sys-apps/portage/portage-2.2_rc37.ebuild
index 7497fd8a0303..bb54adedddf0 100644
--- a/sys-apps/portage/portage-2.2_rc37.ebuild
+++ b/sys-apps/portage/portage-2.2_rc37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc37.ebuild,v 1.1 2009/08/10 00:19:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc37.ebuild,v 1.2 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
diff --git a/sys-apps/portage/portage-2.2_rc38.ebuild b/sys-apps/portage/portage-2.2_rc38.ebuild
index dc14b40813fc..fad2e0bf88fc 100644
--- a/sys-apps/portage/portage-2.2_rc38.ebuild
+++ b/sys-apps/portage/portage-2.2_rc38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc38.ebuild,v 1.1 2009/08/10 09:15:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc38.ebuild,v 1.2 2009/08/19 16:36:18 ulm Exp $
 
 inherit eutils multilib python
 
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
 RDEPEND="${python_dep}
 	!build? ( >=sys-apps/sed-4.0.5
 		>=app-shells/bash-3.2_p17
-		|| ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
+		|| ( >=app-admin/eselect-1.1 >=app-admin/eselect-news-20071201 ) )
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-1.6 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )