Improve dependencies; remove old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

4 files changed, 20 insertions, 19 deletions

diff --git a/virtual/perl-CPAN-Meta/ChangeLog b/virtual/perl-CPAN-Meta/ChangeLog
index 7dee78828192..6b028121f188 100644
--- a/virtual/perl-CPAN-Meta/ChangeLog
+++ b/virtual/perl-CPAN-Meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/perl-CPAN-Meta
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/ChangeLog,v 1.47 2014/07/06 09:41:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/ChangeLog,v 1.48 2014/07/18 18:00:51 dilfridge Exp $
+
+*perl-CPAN-Meta-2.120.921-r2 (18 Jul 2014)
+
+  18 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-CPAN-Meta-2.120.630-r1.ebuild, -perl-CPAN-Meta-2.120.921-r1.ebuild,
+  +perl-CPAN-Meta-2.120.921-r2.ebuild, perl-CPAN-Meta-2.140.640.ebuild:
+  Improve dependencies; remove old
 
 *perl-CPAN-Meta-2.120.921-r1 (06 Jul 2014)
 
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild
deleted file mode 100644
index 8f06e6db3efc..000000000000
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.630-r1.ebuild,v 1.1 2012/05/21 11:50:38 tove Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
index 3b6b0a3c3660..4cf1c5a25756 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r1.ebuild,v 1.1 2014/07/06 09:41:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild,v 1.1 2014/07/18 18:00:51 dilfridge Exp $
 
 EAPI=5
 
@@ -13,4 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+	|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
index 5e7ef6207570..693b86c228f5 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.1 2014/07/05 11:49:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.2 2014/07/18 18:00:51 dilfridge Exp $
 
 EAPI=5
 
@@ -13,4 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"
+RDEPEND="
+	|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"