Change to any-of-many dependency for eselect-news, bug 271447.

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

7 files changed, 33 insertions, 17 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 9cd0ba6c2061..b9d76704290f 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.137 2009/08/01 15:58:45 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.138 2009/08/19 19:42:02 ulm Exp $
+
+  19 Aug 2009; Ulrich Mueller <ulm@gentoo.org> paludis-0.36.0.ebuild,
+  paludis-0.36.1.ebuild, paludis-0.38.0.ebuild, paludis-0.38.1.ebuild,
+  paludis-0.38.2.ebuild:
+  Change to any-of-many dependency for eselect-news, since eselect-1.2 will
+  provide its own news module. Bug 271447.
 
 *paludis-0.38.2 (01 Aug 2009)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 9e6337afdae9..6677da3cb649 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST paludis-0.36.0.tar.bz2 1544013 RMD160 f331db2c84e9c4933ba704e365ef76beb54e4414 SHA1 ae8f7428b5629efbe2c6a3de655eb2b26b4752da SHA256 ec6bd979ef1b6f3ff7f77a2b302875e8fcf6806d0f48f302deaa7a62ba95090c
 DIST paludis-0.36.1.tar.bz2 1537169 RMD160 d19f15dfe02bf62d67a17f3ce259265817b63e86 SHA1 094a098b08db3fe7b777a48dc2725433152f7e13 SHA256 cd374c9b41191f7a431d839ef0f6c968a7fbcabf541852a9a3d3fcf1e0d9d64f
 DIST paludis-0.38.0.tar.bz2 1567408 RMD160 ddb74547bccc2ec86044986ea3a2253762658b61 SHA1 e211a148eea98849d19ecf91f634557fc2d588bd SHA256 dd0878eee15cde18b6718b6692de3e6430602d8c794c1c311c1775ad040610bf
 DIST paludis-0.38.1.tar.bz2 1567679 RMD160 bf2438c4d50c4faf775660add2469960dac628bd SHA1 4942da7a3a8dca6bcdbd08d314b03a27090119b7 SHA256 d5c1d62fecb2ad3468351f1a68330fb738c3abd8dfb1e19af21062dc313e11c5
 DIST paludis-0.38.2.tar.bz2 1568025 RMD160 5ed04be5ec6c632bee07a3231b7b457e55a576a9 SHA1 7e5425fd2add885292fed82e9cdb1b8693409ce9 SHA256 a970a2ec0d8ea8f1f7ff616aeeffea46079cb4bd10469581fa685d20f3e1ee92
-EBUILD paludis-0.36.0.ebuild 4183 RMD160 e21baf93c6a57e13bb06db675f9e05575eb2a532 SHA1 6dc986124a16c2839fab8f52177411fab2c17bd2 SHA256 0fe22987b109e3b64b4a0283e266406ac23c5579385ad2bfbd8ee6e7bd21fecf
-EBUILD paludis-0.36.1.ebuild 4412 RMD160 67d03b42545c3e2c364810ccc2d550a750d82de1 SHA1 2809db4fd1cc95c74dcd9111c1eb6b93f7195453 SHA256 d895e30f48a5351794988aefe6fa797569a76f8d55af221417edad34cadbad6f
-EBUILD paludis-0.38.0.ebuild 4414 RMD160 b902510ebc7ae03ffb05b52fd7a610c8cbb0d808 SHA1 b22b6c7bb43acc5e841ae4fd9c58e61ad0e49d0b SHA256 8aa94299aa84fd1e153b3e521a7222d4146fb7cd7bec4e621bcc8c5a504af39e
-EBUILD paludis-0.38.1.ebuild 4694 RMD160 348fe84689bb6f575ad3c03e9388aa0c07895fa7 SHA1 7cfc6d5b9ba05ab5fd616eec96ab43ddda3f6c6e SHA256 861d03ce8fde26849807a952016518f756d4cff1846fab388d037b41353bb18e
-EBUILD paludis-0.38.2.ebuild 4695 RMD160 006a029e6ebad4038a7464f7dd1e1bb06e956585 SHA1 2131a6a4a8615de578725a31f1e3fe942c2a6703 SHA256 b6efcfb487d79a298e25a8a972f694466fc9f76fbfb1de951a55f34cd1bbeccd
-MISC ChangeLog 21410 RMD160 09f5c2260cb69c4dea98e3258687661b7ce484f8 SHA1 ddf01ac8e01581ae9d2c6cc3e433ddfdcba45c8b SHA256 f1da007d0eb6cc3d0ef57099c675181b2628c2fba2b54f9ca5a14cf1e77919b0
+EBUILD paludis-0.36.0.ebuild 4210 RMD160 3d50c1f08f1b44a9dbae0b97a3681c27ecdff1ea SHA1 2212f8e0b345869ad8a38753615384a718217a56 SHA256 f8666e9ba13a27d444f9b9311342e1d7d5202436c4d957bf86cd0fa5e50ecb3b
+EBUILD paludis-0.36.1.ebuild 4439 RMD160 c5d1724f1231f2becb92393f7ed540cc935c4aed SHA1 dbd5ebc1243b487dad7c5cb859a157dac7853c0c SHA256 511377c86b5d0943e9ae7c7065b725b9922d612bab8ce4ae9c971b0879756532
+EBUILD paludis-0.38.0.ebuild 4441 RMD160 3e53d5935d0c3d79efc59d2bfae00df56b9cf9a3 SHA1 7fbfbd8ba76d0fb4c4ca8c28fa595aedf8d78a49 SHA256 b343f7b33f5f18e3187b6a19c1244865fe5de0d325f2d0c377463f1dcd909905
+EBUILD paludis-0.38.1.ebuild 4722 RMD160 5a0b8ae5ad2f423c57fdc31f3629bc77dbb1e5d7 SHA1 cdbb56fd1ac74ee0011419f6d59d9bc6a25e8a9b SHA256 dfa6b35eab45885a1505ddefe82c401fa759d40c768e3ff011c6406851e0901d
+EBUILD paludis-0.38.2.ebuild 4722 RMD160 de6b44860c4ca4248269138548978b71335ae03b SHA1 a317ca906fe21648d3784315458979ab4ebd35ce SHA256 cbba83fcb8b12dfd819c692ac71face07478dae08ba34ff2231c25bf10d6adb7
+MISC ChangeLog 21688 RMD160 13acfb2f05ffcf8656def821c338b363aa688d06 SHA1 4f8bcf4b58a30b195d78f8a9552bbb9630375b0d SHA256 0b3bf188d46e0c0d2b23f84eda75d03ad4c5d7b85118e4bad8af36e30de73767
 MISC metadata.xml 975 RMD160 fb36c01bbf6c835766edb96d37074ce94fe0086a SHA1 88baadaa2a4631fb6da8033394714980396bf1e8 SHA256 fc90ea78538e9d99ddee426cd5e4420bbc1ff8fe5b074b465241082ced08a150
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkqMVgEACgkQOeoy/oIi7uwYXwCfe1AmLGPEcbC7KWO1/fDr/yob
+iNEAnR+Fjz+nE7Cqs/4j2410ny4c/0SG
+=Acqj
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/paludis-0.36.0.ebuild b/sys-apps/paludis/paludis-0.36.0.ebuild
index 7175df964a75..37d9e1e675a1 100644
--- a/sys-apps/paludis/paludis-0.36.0.ebuild
+++ b/sys-apps/paludis/paludis-0.36.0.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/paludis/paludis-0.36.0.ebuild,v 1.2 2009/05/30 09:40:56 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.36.0.ebuild,v 1.3 2009/08/19 19:42:02 ulm Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
+	|| ( >=app-admin/eselect-1.2_rc1 >=app-admin/eselect-news-20071201 )
 	>=app-shells/bash-3
 	inquisitio? ( dev-libs/pcre++ )
 	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
diff --git a/sys-apps/paludis/paludis-0.36.1.ebuild b/sys-apps/paludis/paludis-0.36.1.ebuild
index cd2886e1eca6..833163556049 100644
--- a/sys-apps/paludis/paludis-0.36.1.ebuild
+++ b/sys-apps/paludis/paludis-0.36.1.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/paludis/paludis-0.36.1.ebuild,v 1.3 2009/05/30 09:40:56 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.36.1.ebuild,v 1.4 2009/08/19 19:42:02 ulm Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
+	|| ( >=app-admin/eselect-1.2_rc1 >=app-admin/eselect-news-20071201 )
 	>=app-shells/bash-3
 	inquisitio? ( dev-libs/libpcre )
 	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
diff --git a/sys-apps/paludis/paludis-0.38.0.ebuild b/sys-apps/paludis/paludis-0.38.0.ebuild
index 65f91611506b..55dcee873ae9 100644
--- a/sys-apps/paludis/paludis-0.38.0.ebuild
+++ b/sys-apps/paludis/paludis-0.38.0.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/paludis/paludis-0.38.0.ebuild,v 1.1 2009/07/08 18:35:21 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.38.0.ebuild,v 1.2 2009/08/19 19:42:02 ulm Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
+	|| ( >=app-admin/eselect-1.2_rc1 >=app-admin/eselect-news-20071201 )
 	>=app-shells/bash-3.2
 	inquisitio? ( dev-libs/libpcre )
 	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
diff --git a/sys-apps/paludis/paludis-0.38.1.ebuild b/sys-apps/paludis/paludis-0.38.1.ebuild
index 63417d6aa993..d6136c6bc701 100644
--- a/sys-apps/paludis/paludis-0.38.1.ebuild
+++ b/sys-apps/paludis/paludis-0.38.1.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/paludis/paludis-0.38.1.ebuild,v 1.3 2009/07/25 09:26:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.38.1.ebuild,v 1.4 2009/08/19 19:42:02 ulm Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
+	|| ( >=app-admin/eselect-1.2_rc1 >=app-admin/eselect-news-20071201 )
 	>=app-shells/bash-3.2
 	inquisitio? ( dev-libs/libpcre )
 	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
diff --git a/sys-apps/paludis/paludis-0.38.2.ebuild b/sys-apps/paludis/paludis-0.38.2.ebuild
index e0ad0b180d07..4b60796b9d52 100644
--- a/sys-apps/paludis/paludis-0.38.2.ebuild
+++ b/sys-apps/paludis/paludis-0.38.2.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/paludis/paludis-0.38.2.ebuild,v 1.1 2009/08/01 15:58:45 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.38.2.ebuild,v 1.2 2009/08/19 19:42:02 ulm Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
+	|| ( >=app-admin/eselect-1.2_rc1 >=app-admin/eselect-news-20071201 )
 	>=app-shells/bash-3.2
 	inquisitio? ( dev-libs/libpcre )
 	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )