Improve dependencies and remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

6 files changed, 31 insertions, 52 deletions

diff --git a/virtual/perl-CPAN-Meta-Requirements/ChangeLog b/virtual/perl-CPAN-Meta-Requirements/ChangeLog
index ccd23b4a211e..f02af83b1728 100644
--- a/virtual/perl-CPAN-Meta-Requirements/ChangeLog
+++ b/virtual/perl-CPAN-Meta-Requirements/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/perl-CPAN-Meta-Requirements
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/ChangeLog,v 1.18 2014/01/19 20:52:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/ChangeLog,v 1.19 2014/07/05 11:56:52 dilfridge Exp $
+
+  05 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-CPAN-Meta-Requirements-2.121.0.ebuild,
+  perl-CPAN-Meta-Requirements-2.122.0.ebuild,
+  -perl-CPAN-Meta-Requirements-2.123.0.ebuild,
+  perl-CPAN-Meta-Requirements-2.125.0.ebuild:
+  Improve dependencies and remove old
 
   19 Jan 2014; Mike Frysinger <vapier@gentoo.org>
   perl-CPAN-Meta-Requirements-2.122.0.ebuild,
diff --git a/virtual/perl-CPAN-Meta-Requirements/Manifest b/virtual/perl-CPAN-Meta-Requirements/Manifest
index fbeb31c80619..544f54655f87 100644
--- a/virtual/perl-CPAN-Meta-Requirements/Manifest
+++ b/virtual/perl-CPAN-Meta-Requirements/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-CPAN-Meta-Requirements-2.121.0.ebuild 683 SHA256 56ccd40acd5d54461551157b3f6ee467bbbfb3d792e5d4200f0bcdb2b5952f50 SHA512 c6966427bf7fa76a6278758ab5d76af65f2bdf8424d23cc4131246c63488d2a9a501aa659d7976fc92495866a2476bc1620a52238b5a1b624c027fd9def52c24 WHIRLPOOL dc478709cc1442f0886a9e81166b379fbbfb1b14b1e1ac90933ed57ac2fffbb0530e43a0dbe0bce52080d6f4f4df8c8c352331ab7b075db98352a5bef725b231
-EBUILD perl-CPAN-Meta-Requirements-2.122.0.ebuild 688 SHA256 4cb9007a88143b58079e37b6f464ea21b401464cafd15dfa6062dbce24918660 SHA512 25780160da5a7ec10b4cd23cbf5ea021799816f573a4f3c85600086dac19c2e07ec3b53dc255fb336b8ff6610082ecc3220be0d0182338ab79628c859cf322e8 WHIRLPOOL 53ecb61344af25ef9faaff57bd00abc69760dd343405909b12524c850f226035bee11f5a78031b198d492b46a6510253d2f6d508335fdc79eabb003002ae158e
-EBUILD perl-CPAN-Meta-Requirements-2.123.0.ebuild 699 SHA256 291c34429d826f900246f82c95e754a17321736142e47b3acab6880a90e771b8 SHA512 186570382673495a030b57f0831054ab495ed08e93162325013f65620ae7fb5f1ad3c5bc9ef29a28fdb90af6f0fcef3ac441d1570c8a76aea10c4df858221da9 WHIRLPOOL 6da20831bdd167041e2cdfedb2a16e8290d1f7ec9510c857531a80c7f49d249aca4beb889d5cd11ae280c4944f78f171b97f6fa7ba07e4ba70714e7d89003c52
-EBUILD perl-CPAN-Meta-Requirements-2.125.0.ebuild 699 SHA256 664534e733f8ddeb7df047b85fe064975013b463ce2d1d8d7e3c7158af941ded SHA512 a8f4d6de6081bdf091e100970dfa4305e992c4f1980552a3e6b0e22bb8c4c98c2732fe2dad87227412a4ad68c955c7de851610dca2091395d2fd0fead4f420e8 WHIRLPOOL f912ef14c968fb90c1b87f67d97c29c570f5361b3a0df9ac44a55546d14c1003f1908fadd5979f3bff3e2425c50bdb8d5c71629eb051ada5d754e4144e7d11de
-MISC ChangeLog 2788 SHA256 6450d42d67f6b3673e20a966ce2b33aff599778f5a99d31898f95a0ccb3f1608 SHA512 89ad719d17d40946359056a64b0ee212c3cc838b9b41ad28ac6610ec1fde39ff0492891dcf9a5fd61b900a2214f1ee8314a70f5ac43740be6f7f7c8749e8891c WHIRLPOOL 0719db8e8fa91ae54b23051bbcb452221ccbd5877f875b69a61caa7ff9629c05921755342ddbaf552cfcfc6466665fdb1d6a6142686949ffe02dc1714b0ed93b
+EBUILD perl-CPAN-Meta-Requirements-2.122.0.ebuild 719 SHA256 8eba502a0c43311d52b1f4ba87b6ef96cafbbdb0c7c0526503a61c5043d1e49c SHA512 a5310636a957b5a69bfe71aa513496fac9e35abf67cbbafb8f096a43f14c979571048ef7a17e16a1ff3fd735a94d812098f51b9aa0b0b05d1818eee1ed167d4c WHIRLPOOL e243214fc99aebeb35c0a91f70944bd277c262157a01d1f10cf38b3cfc580480509a8109f8031f96b4db1783068da20597fa9aafd454bfab7c9a4e2053cbda4f
+EBUILD perl-CPAN-Meta-Requirements-2.125.0.ebuild 730 SHA256 c12fe462da687e9237a44b0e8ae33b1471bfd9927ceec3b2a986f2c08c8457e0 SHA512 344c2a72206e864c61191a1ab2a4fc7fc4373061e6e2fd5adfa68b2c54cb1a70552a90374c8b3714e6a956e15116dcf6840d5fa785171ed1b5ecb85cffc8b45a WHIRLPOOL e830e4d27f51d788cc1240d91dd88e2adf84f2324ec8ce30ff8f7600182ceea3fdb010d7f9053e9c481a92e84a648f3089cc142473b03fb831ee61e551e61038
+MISC ChangeLog 3073 SHA256 759328d33a64ade616ef7023c11ed988dfda713c25e071b91987de599c74bc51 SHA512 0d70342e8a10bb29b95a68dc84fe033f222711dcb03ac774b41ccd7d71ff16d2096fc01c40b67f3bdef0a939159d36b0e780336bdca020cbcfcff2915c4c0d10 WHIRLPOOL cb08964ab43cc07c36d3714530ad98a89d91e35fd6ee5208c9bada56e57ae6f2a4b21559d6c0cb6533cdec15d5213120dc34e83e7aa785d56ce8f002063828f8
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS3Dr4AAoJEPGu1DbS6WIAnzUP/RCZQ0YHV2PpLWvatdd6FcTl
-muteNNkdv1XTLue+S1jaBdT6s+rJRyyM6GEf22EpIzryaCkHpl/JkLugl8YXTql3
-x4tiPjHLZocWURFK9a4qZSpy174FtAxaNwWMKPKOJNYy3odBPO9DZklnQ5zVQWFV
-4JO+hf43ew9TEsHVWJBzBdQb1QQzO+QBqwV2mddRDYSAM+76d9NxC7u3LOfhYJm4
-b+3nKYYxzU5wlwP5K5QrVAzdPShjYihAOBjLscdMDLO0HOo6oXL4ZjiQ6+GhGLdD
-tiyL823okDLUmsZbEd6foEBS4T5L5RFDKqGu5RZi/VeC/y5r+12hhJo2xs1eV3FL
-SOfJ9FLwRvDa5KrY4WThpkR5wzkxpIjA8NK6l9kvG5xhQmGx+xGNBxmhGXmqiJxu
-KGSgpH0NcaFRlR+34/hkql+t/8McDaKPyIFcYFrJ8xOAcjEoRxZJ810r3XvnoFMx
-BpfZrRjsxta1enBJ38leK/4pRSAZ8smtn79Q3KuOqRymMkMSqMvw5g9zJ9czqXL/
-CP8i9ej/9vKPdE6CQsWh1ECgyWCIu3U8YhOoJXW54x+64UerpsFSA3Rt0+GyfIzQ
-w0YB23UUzKRU6dS5lslcyHSYbYB6nxerZpCBa8eTyPTL8x9Daxd2t+F8OLZH7IZY
-niJYzXZd9F6WzQCqZvOM
-=eyni
+iQJ8BAEBCABmBQJTt+gFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZuYQAI65yZc7LCqkGymHhoNqrrL0
+V5c1fSaLi2KFcaLPU4NQeN2Cz56rz/MDUVLbnuyCoCrVDYCiWDPjBF7fYltpLeD+
+cw6UuNxUiOt8hE/ucaDm74eQpDJ1LJAYSFev7a6kYEqLLvlrfQpm6HXSvrpENcAl
+7nJfFdcD8gYIErot2sGub90IklHVtUnv3HgzX6ObrPSstsA8AIAjiKNQNu0Y+y5S
+ybVJEaJdmOn9UJGjVn83dS12+flNhkuk8J0WAipS2dIlG3lgZFbMmvbbJ14pA7wh
+trGq63QajW/n+O28nozZV9XBjNM0PZNvYhpdy/y17jPUqbsSSlvpFaQMnH+mVO9u
+DLaHGoUDFtyUNmaCgT/xBhA7NLphANngmw3/BRW31paldMjbcHazO0sobb2kaccv
+qBOuuQlcxzGfQCKVZcJ2PbOZqm8ZtpZ2V6nuwReqTU21w94M6bOxN1+YDyhMXFyf
+bpYxBasVgo90DCqZLUnn//ghCpb1SfXIU2GYS8fDn/hEhgAJeRk2Rr+JDPCItTqB
+tU9zNdNEM20+ILtWV8FmYETzUqw4hen+Xm9A7J1Yc8oLoaol6AnogQnf/ISdq3vW
+tAooThDTulsPuWc83dRwoaaYgIqwHD3WR3r0UV8FGwBK0/xkmBX00MRJN199wDUI
+4PCtkdZvj6YYiyeeWXDs
+=VdTd
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.121.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.121.0.ebuild
deleted file mode 100644
index b16b0c360678..000000000000
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.121.0.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-Requirements/perl-CPAN-Meta-Requirements-2.121.0.ebuild,v 1.2 2012/04/28 02:36:35 aballier 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 ~amd64-fbsd ~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="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild
index aae4de264937..a9464ff2707a 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.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-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild,v 1.14 2014/01/19 20:52:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild,v 1.15 2014/07/05 11:56:52 dilfridge Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +11,4 @@ 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="~perl-core/${PN#perl-}-${PV}"
+RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild
deleted file mode 100644
index 1749977cb84c..000000000000
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild
+++ /dev/null
@@ -1,14 +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-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild,v 1.2 2014/01/19 20:52:03 vapier Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-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="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
index 5cce382723bb..29416336e128 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.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-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild,v 1.2 2014/01/19 20:52:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild,v 1.3 2014/07/05 11:56:52 dilfridge Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +11,4 @@ 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="~perl-core/${PN#perl-}-${PV}"
+RDEPEND="|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )"