Add Perl 5.22 version, remove old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 28 insertions, 33 deletions

diff --git a/virtual/perl-CPAN/ChangeLog b/virtual/perl-CPAN/ChangeLog
index a6a4d945bbaa..672c44282756 100644
--- a/virtual/perl-CPAN/ChangeLog
+++ b/virtual/perl-CPAN/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/perl-CPAN
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/ChangeLog,v 1.44 2015/04/11 17:40:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/ChangeLog,v 1.45 2015/06/04 16:31:47 dilfridge Exp $
+
+*perl-CPAN-2.110.0 (04 Jun 2015)
+
+  04 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-CPAN-2.0.0-r1.ebuild, -perl-CPAN-2.0.5.ebuild,
+  +perl-CPAN-2.110.0.ebuild:
+  Add Perl 5.22 version, remove old
 
   11 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> perl-CPAN-2.90.0-r1.ebuild:
   ppc64 stable wrt bug #545510
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index b5059d1e5ba3..2adaaebaec0a 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-CPAN-2.0.0-r1.ebuild 533 SHA256 adef8612b9c4f342bf9b49bff30413339fc6f0c2a70122f9be06bc93a8dea171 SHA512 50c7607e8ce7eaab238aaa1cd55abfc3f7b4e53cf992f68d19a80bf76b8629b8f1e93e3b873db3bb225bb781fe4a4ead6609aff1082a9606bd262a8db36deead WHIRLPOOL 2f6ffc41e2edc156d4184ca449213b994e73aedc9e82b2fe557d955f42fe7fa0954a3160e92d0bfe0e6880b298a2fea63ddea6992af43afe39ce5c32573705ef
-EBUILD perl-CPAN-2.0.5.ebuild 555 SHA256 c3a016b22313298a177dd33a5afb72081a4ba052dda88cd37d05f368b534d44d SHA512 20374723c5e8bfff3a25a1ca8d66039bd6157f2f5aefdf71cb6b188ab34d10aad4500512eff5dc76174358c91e8e50952842f0a378304c55a9273c78dddf15b0 WHIRLPOOL 0792549d22d5a96f481413782036908a084f90e0d27546e34f54296f4618b2908f05ce1c08187cf2566648beef60685b59fc2f630ab54b4993ceedef92313eab
+EBUILD perl-CPAN-2.110.0.ebuild 592 SHA256 367ce0c7e9d115452f049b9fdbd4a4f655dc911e087e71d53d6f3e2c90afee7b SHA512 4a4ee9624e9a49cc6fa7f81992edf520929b006dfff5ab5bf6a1e11b527ba7c7b3e55045452f461f818038f763801c8d4aafaea7f7bd242cbced8e44cb12e564 WHIRLPOOL b2bc836f8017d3a5ade38295d3b98d2bba90d53220cabc3368ba0d9b7d9765f201d4f6b32e2c35d1ee52e614dc08f42ab7ba194a0f1ca5659f77a425b1dd42d1
 EBUILD perl-CPAN-2.90.0-r1.ebuild 540 SHA256 abc0c5d3d1e6b94c726d9c8a68382316140403bb3121ca2939a0696e0b36302e SHA512 b682933f73b6925e97de7fc80519e8e62533d8a8ecae2e6e9dc53cd509cd1652ffd227cb302a1f01745e8d524cd539139ab23306c3668d7d244479aa0b55f898 WHIRLPOOL f69b8d982708f98d9c3fed8cd312ab3478cf10c6a36f04fe15183a28d8ef5f3b61f51e5bc9c9645c22690363e3cb393f5d38390b67046bb71d7a73ed5dd74de7
-MISC ChangeLog 4977 SHA256 19fd12b3eccdea31759aff86084a6f4a0e4d80f1e7369a102021fb649ec1566c SHA512 17595273762677ea5805992635257014aaed20bea5c15a3ca750eebb3ddb5f5496154de7e5f5581bfa8d1d6599920031d9e9f5feb2035e62c5e3d0c0ba8c39bf WHIRLPOOL 59282261b9b04359b9df5db9317e1e4d3ff57377d51ddb20127dc1a7f4e01a4f89c34bc8403a3f2bb4ef48ae2783be6b54b8645532d84e62df3781569eacf78d
+MISC ChangeLog 5191 SHA256 51115c370f1fbf1871f5d66022c72e6e753a8bcb14915bfd013bb2f2f2b7e938 SHA512 5a87b8b36f0bb601a07fdbdacf9df59cf2f2bfa4357339453b6e3dc7b91e57c1ffccdf5c4c1bffdc25eb560c9a0c7b0f61ec9c768f95559a845a0b9c704840d6 WHIRLPOOL ad55ab6299ccc061766427e20b2d946ad0b4fa89d298a16efd8c35c639645e539fbe4c89a9308b2cd5744a1bba294511696494c335de5b78cc4d293df3bb0133
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlUpXDMACgkQG9wOWsQutdZU3wP/WmtcwwFmC3IQiOMLr+gK/uO2
-r7BOSs5i8k9slBKfK4PXOi2AVSxtkW81ntvYjRbyZWhurXatEoBQ0zv29ETQ8Iki
-aNdHdmJhbmrhJtEoRaXFPFwR2i0VAqc10kNgPS6I/eL/jUfr4T1km4YHcYv6Rbtw
-HnWZMapS+2wQwZVndHg=
-=F67h
+iQIcBAEBCAAGBQJVcH5oAAoJEB9VdM6hupKVHzMQAJM8OcyV+KKpwoi4TpxG43CW
+LY6cewSufriWNBtopEsvfPPJj6LNNYMbrDEoOKSVovDGtJAuGo1ewHqfxqBX3TFD
+gqh/Xd6e1otuSqpmd6rMbidepSy2/8pP58rIpbT1TjJnxjcHJOD9Yu50a54sgGa3
+cDydBtwAihEcjcG4C6L3wLzO6f3cOkqiyZjqaxXMV2Aql1e1B3tm2gDdNyoPb/JH
+FJeMrtVDarjzkBVH/l4RlBuyoO2JLgRwvwmpX99A0NRGJ3TwS1oYobPzsET0PBxJ
+lknXsWSOtU9ipJfyqRbWzzvcIUgSmcRaDM6/BY9cu3csTcHPI3hRt2F7nBKPBFED
+2mWWq1JJGBZejB+iVwfSrLnNPdv5SgG8M3nzz/5o0arqkjFiKBEvLO5j/FkF5e7e
+MchL0WDXwLJDLnoQQM+6oA8/w5eFhLUcAF4g+TnjGWZYffxQUjfDSkYCWAL+8bi/
+xJKS0fC0oFAp/K3si5QIVvR8rAXQgDsMmf//gr2TeZFUnsaCFngNS85yIHsauVMU
+KLtMqabF6vkfxw7F90hhafsD3hynbioVdKjiI7lJUJvfhnJlnKui/F5p3rNOpt19
+mVkbaQJKt50FOZKFm15bELSDONnFtU/KSNgO4ZbZf9hcUMpFXCOZZXm4fCsy74Kq
+roa3NlyCCmD7+4t6qIj7
+=x1i+
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild b/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild
deleted file mode 100644
index f3c14be5bb85..000000000000
--- a/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.0-r1.ebuild,v 1.10 2014/09/23 09:56:51 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-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/perl-CPAN-2.0.5.ebuild b/virtual/perl-CPAN/perl-CPAN-2.110.0.ebuild
index 943f496962b8..66791c5a7d10 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.110.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild,v 1.12 2015/02/18 08:36:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.110.0.ebuild,v 1.1 2015/06/04 16:31:47 dilfridge Exp $
 
 EAPI=5
 
@@ -10,12 +10,14 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="
-	|| ( =dev-lang/perl-5.20.1* =dev-lang/perl-5.20.0* ~perl-core/${PN#perl-}-${PV} )
+	=dev-lang/perl-5.22*
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
 "
+
+# special case: Perl 5.22 version does not correspond to any separate release...