Add perl-5.20 version; improve dependencies; remove old

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

4 files changed, 40 insertions, 22 deletions

diff --git a/virtual/perl-Test-Harness/ChangeLog b/virtual/perl-Test-Harness/ChangeLog
index 740b81ac034e..906a01400d95 100644
--- a/virtual/perl-Test-Harness/ChangeLog
+++ b/virtual/perl-Test-Harness/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for virtual/perl-Test-Harness
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/ChangeLog,v 1.87 2014/01/20 20:46:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/ChangeLog,v 1.88 2014/07/13 15:11:41 dilfridge Exp $
+
+*perl-Test-Harness-3.330.0 (13 Jul 2014)
+*perl-Test-Harness-3.260.0-r1 (13 Jul 2014)
+
+  13 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-Test-Harness-3.260.0.ebuild, +perl-Test-Harness-3.260.0-r1.ebuild,
+  -perl-Test-Harness-3.280.0.ebuild, +perl-Test-Harness-3.330.0.ebuild:
+  Add perl-5.20 version; improve dependencies; remove old
 
   20 Jan 2014; Mike Frysinger <vapier@gentoo.org>
   perl-Test-Harness-3.260.0.ebuild, perl-Test-Harness-3.280.0.ebuild,
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index e1950433f659..8f3f8b02c40c 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD perl-Test-Harness-3.260.0.ebuild 695 SHA256 f6267878c7c71a02e31541eb91ea6d69f196a2b86917b7bcb021c0c5fe43de0d SHA512 30057f5d5e4524a340896067c587906de2e575de40e92010da95cc1eb1b90c0be6bd037ee4f0a10b5ca06395b2a5095a3923a7145d97d1c5d32cac613f65d7a6 WHIRLPOOL dbd24051c3e702d5e49d9052653e47287a05c2936f5e7e328abaed9d83b3d76f1af70cd51ba12e6f9f5a8c26136f67f4b5068dff1bfa7a21eda17c0151d67e60
-EBUILD perl-Test-Harness-3.280.0.ebuild 707 SHA256 65e9adc93a2e5ac57442ef81af69e159f8f7b4b8d6af85ff75133fb9dc5e900d SHA512 9ae27de973549f5d2c83b746726a3da37dba42f9b878f661036d31b939fb9d3657d973acbc09c10c8c1d2c0f8f88c989ce1d3602e3555c8723a56020eefc70ff WHIRLPOOL 001745f38f5509e1fa995ca4bdc19a9bc2fae611dc381e6a308ea4e889c906b3bed0ffc05096560acce0687795efafb7879610f32aa9ab5a26f733dab66bdf68
+EBUILD perl-Test-Harness-3.260.0-r1.ebuild 770 SHA256 8c71e20f12031b5884a79e9449e18455aef8b030279dcdeaa92663ac0d4e94a0 SHA512 fba44c243dfff2d131e50f1535c33beb78da1cf759fa0b67cfbfd15de911b233925e54b3faf8981d5d5a83b7136a0ad0be460c04b9db4b5659ce78db4d9cff27 WHIRLPOOL f5ff075f903b8104a225e08a1e7087290158cce5f9ae8495e13fc21b82a07728bfe10751591e165227a22da4e7a7624886b1026bd22f125ae93ec2619b2d83d6
 EBUILD perl-Test-Harness-3.290.0.ebuild 707 SHA256 aa5bdc7b1c79c3e71d392d0d2e6c002248c322d579a6c0a4f602564e8208706f SHA512 f0844e6d7d39018e07a03178b8eab6508f67f8fdced57aafad9f9c8f5c41564d5f5f36b32c898048514302ab70fcb687b63f08132d89b0365931c187c0735605 WHIRLPOOL 8f62ce0a888ffcd76dab51e0c0240bc6c2475c040bc927a0b7238171ac8e83d9ba43e3d09e39ec7e740de432de691595871d6cae7cbba3638f882d1b1d9b67ef
-MISC ChangeLog 12076 SHA256 1d3d18af4347b9475271cbffb4ed61bef057a9a4e4f7e193737eb478c49c9fe8 SHA512 425abdc49865f4a6322f00ff2fb8e8412baf96431e60e272e3ccb481982f8a1bc5f787b4ce4e57914a2be981f2979f9bf0ba999ea7b9b51f0f84181755a231e0 WHIRLPOOL 58faf04d600f42ff6e6c2306e0600da6d19661fab249c057d325fa636a0a42a9f17409ced2d4837582eb23ca7c2a287910151c95ff2000eb5ab0435b6e5b71f0
+EBUILD perl-Test-Harness-3.330.0.ebuild 780 SHA256 d665c89e2de9b32075a2e303f5788e057324e814eeb72b9210830dfdd6f4ad44 SHA512 9ffef604b5ee564697483531d101da041ae179506549078ea9bcd232236e238da1bedc368cc9b21a08076732b80b069bc536749f0e2304d7bd5c91a926c1914d WHIRLPOOL 3e230ded595565dc36e04d7e3ded6a80b716061930eea2e051835c000321bbc51686eba033f852d9387536eea8d3014670757987df8f7d733121ab1ebec23af0
+MISC ChangeLog 12428 SHA256 57be687e12dc632ec68b370c40e82942639a3e0181d272faaad41b85f4190385 SHA512 7c7a2bd76c1bfc922a097f00c99c4105bffd072cc4558c4a0879b83be358dfdbe633a3e43068795d0dce8301200e024b239f894fbc816d689a62facfc5b0e342 WHIRLPOOL 33ab9c5c226252059397f2b4a3aec729d7919c74b984d78c5ddc44a2a8cb0aab2197c1b0ef169df97c5f57ff7983c286c4d1ceeb8d4a173be2859eb2bbc023e5
 MISC metadata.xml 158 SHA256 1fef4c0af5f71b777110f54d9dfbd27d6c85c750fca007f4a2fb38345ebbb710 SHA512 0b83af178d8e59a07953fc2582b6e4177ec933439a6638de4f222e4e9b6c21135ca1702f7f4838624e283d39db0d3f4d4227ddb6108dbb06cdcc09ebf9d6bc55 WHIRLPOOL 696c0536d7047d00bd1590ddb9bebd01caec0e15b3a970828eebe526b46f14d61eec5bd541db7d4628bdff743461198158832e2bdb47e31a5523ad63f16708bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS3YsRAAoJEPGu1DbS6WIAW6MP+wePEv6yU4d16/KGst2KwBIq
-wnPy+NXmrqPE9vSxuLGZJ5jj5wrXF00zXA+nEGJO0vvng/znyc3Hdy/v00MagcOd
-ofslljkyYTCzi7o3GtJqBdhLAIx/Sq14urzMA2kQ/rPs0zrMLuC1QkRpRryLx+Bo
-ZBpNXVmm08nJNaygwgx5yEN3goTt/iFss1tz4oauz5cFrDR/3Ab2nst+001Iw/+O
-4XgNmPcJZ7NV1gG9hD2Et6q29qinBii5hCZoYJU27HgshZJk3LYfw/BXo7H/ze0p
-b/FD2o8VmM9I48pqAecUov8A50+D5KlgrHRlPp5vRMbqUHmbGg7B+B/AzkbKzEgP
-XzfiwipV0p1AS0Ei7etu5AlKxgWBlI06RkQSXOotkhKjr72KQV7BOOwcyqMgu5yK
-Gd4c0gS8x+KLWTA1z5wFRj/1+F2oRs8pp1MWLr5C40I2ldheQX5lqdkvvQey2Lmn
-jgo3R6n91YZT17EI+IC5u5Jah8iyIzf1gKlIF/tLnAdIVjOI7Hz4bC3yT7lveAez
-zq9GDE/xjixM/zhYAkRrrVCm4zfPOYIc/tgFmncwCA2V32dhcZq02QZOURAA3Tr5
-6WbeyPShXpYz8oO2MjdVXVOsudXvOh0AZe6qHPdU5FhjAZMV5tTkI1QVS0KxvMcl
-Mq+RvjddYa7BumV5Nmos
-=i7yu
+iQIcBAEBCAAGBQJTwqL7AAoJEJS/30SErRQvQjAQAJM8kQuRS/Eo4qbQWJD+Dxou
+3QYTRpvhJJXJ8e2bA0IgwrAWaHs1c0tGusYSaLc7nCjNU7nwIDBfk8kMtpXbvAMF
+6mZilrUMij4B30pr+diZRo7+NvUubkfnEsSYOMbSvYhsKKkfnC2zNFFW/hr3ArNt
+JGT3I/aWxFPhEM9mKYfPT3MNPB2qq+/IxjrB/90SLbz//g8LAQWLp3cgo5ENwPEg
+9Bu7gnWd25zO1XTMAp6kc4HEESJUs32L9r09zlKFDi7tUmwxXiMCEyjxWZXbZLQW
+7qYrd5hBShxasg0Et8D5TnXqRAq/8d6YSKRwjJF0RIEOchinYpBtSN0vi5XLE/15
+DZzZbcfQaFwtIMJOAu1BXJy9ivf0kHvE3Dusu8IzPLoJZUVXcZuCjz7fD+WoZLUK
+3faVjudiuSSPRteAPloiHBpVjzwgTlX0AhVDRilIz+Ni5nMNzkynUZLoVGI56aBq
+k5s9o6kfeb11MYk6GDVqylOw0/KLJKyupKvyXnb96bzM1h569je8Yi9QxyCeBs/d
+gvkOLyZEUQx1uaYlG7ZFYmTjwbcjhp0hp6dnDL9RxczQM07/IocFspyM1Ck7nShD
+9ih/nOb2rJGdUiJlt5PE2Eazj8PnoUcJqOLELaaqXRvufapga7UNsF6O2xom9wgq
+yh4OO0hqAY3NtPj0eysJ
+=j7pr
 -----END PGP SIGNATURE-----
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0-r1.ebuild
index 7d5b1ddbeca3..f79d8947cac5 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0.ebuild,v 1.15 2014/01/20 20:46:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.260.0-r1.ebuild,v 1.1 2014/07/13 15:11:41 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +13,7 @@ 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 ~hppa-hpux ~ia64-hpux ~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} )
+	!<perl-core/${PN#perl-}-${PV}
+"
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.280.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild
index 8a39765a8ed7..1a01b4bb0dec 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.280.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.280.0.ebuild,v 1.2 2014/01/20 20:46:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild,v 1.1 2014/07/13 15:11:41 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +13,7 @@ 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 ~hppa-hpux ~ia64-hpux ~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} )
+	!<perl-core/${PN#perl-}-${PV}
+"