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

(Portage version: 2.2_rc38/cvs/Linux i686)

6 files changed, 17 insertions, 11 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/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 )