Add Perl 5.22 version, remove old

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

3 files changed, 18 insertions, 23 deletions

diff --git a/virtual/perl-CPAN-Meta/ChangeLog b/virtual/perl-CPAN-Meta/ChangeLog
index eb1d75d8f65c..03f7eb352861 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/ChangeLog,v 1.64 2015/04/19 17:42:51 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/ChangeLog,v 1.65 2015/06/04 16:38:46 dilfridge Exp $
+
+*perl-CPAN-Meta-2.150.1 (04 Jun 2015)
+
+  04 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-CPAN-Meta-2.120.921-r2.ebuild, -perl-CPAN-Meta-2.132.510.ebuild,
+  +perl-CPAN-Meta-2.150.1.ebuild:
+  Add Perl 5.22 version, remove old
 
   19 Apr 2015;  <monsieurp@gentoo.org> perl-CPAN-Meta-2.143.240.ebuild:
   Add =virtual/perl-Parse-CPAN-Meta-1.441.400 dependency back. Thanks to Kent
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
deleted file mode 100644
index 214961a3ab05..000000000000
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 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-r2.ebuild,v 1.3 2015/04/04 23:51:26 vapier Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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} )
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.1.ebuild
index 3cb185dcbc20..5a114f862c24 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2015 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.132.510.ebuild,v 1.4 2015/04/04 23:51:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.1.ebuild,v 1.1 2015/06/04 16:38:46 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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="~perl-core/${PN#perl-}-${PV}"
+RDEPEND="
+	|| ( =dev-lang/perl-5.22* ~perl-core/${PN#perl-}-${PV} )
+	>=virtual/perl-CPAN-Meta-YAML-0.11.0
+	>=virtual/perl-JSON-PP-2.271.30
+	>=virtual/perl-Parse-CPAN-Meta-1.441.400
+"
+# see bug 519974