Add perl-5.20 version; improve dependencies; remove old

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

5 files changed, 27 insertions, 34 deletions

diff --git a/virtual/perl-Module-Load/ChangeLog b/virtual/perl-Module-Load/ChangeLog
index d9c26a08cbb1..56475f07bb40 100644
--- a/virtual/perl-Module-Load/ChangeLog
+++ b/virtual/perl-Module-Load/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for virtual/perl-Module-Load
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/ChangeLog,v 1.38 2014/01/20 21:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/ChangeLog,v 1.39 2014/07/10 22:34:36 dilfridge Exp $
+
+*perl-Module-Load-0.320.0 (10 Jul 2014)
+*perl-Module-Load-0.240.0-r1 (10 Jul 2014)
+
+  10 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-Module-Load-0.180.0-r1.ebuild, -perl-Module-Load-0.200.0.ebuild,
+  -perl-Module-Load-0.220.0-r1.ebuild, -perl-Module-Load-0.240.0.ebuild,
+  +perl-Module-Load-0.240.0-r1.ebuild, +perl-Module-Load-0.320.0.ebuild:
+  Add perl-5.20 version; improve dependencies; remove old
 
   20 Jan 2014; Mike Frysinger <vapier@gentoo.org>
   perl-Module-Load-0.200.0.ebuild, perl-Module-Load-0.220.0-r1.ebuild,
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.180.0-r1.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.180.0-r1.ebuild
deleted file mode 100644
index bf9ac32f5c99..000000000000
--- a/virtual/perl-Module-Load/perl-Module-Load-0.180.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/perl-Module-Load-0.180.0-r1.ebuild,v 1.2 2011/07/07 23:11:34 aballier Exp $
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.200.0.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.200.0.ebuild
deleted file mode 100644
index 1f865aa9e5e0..000000000000
--- a/virtual/perl-Module-Load/perl-Module-Load-0.200.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-Module-Load/perl-Module-Load-0.200.0.ebuild,v 1.2 2014/01/20 21:01:43 vapier Exp $
-
-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 ~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-Module-Load/perl-Module-Load-0.240.0.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.240.0-r1.ebuild
index 3252b5f8e50c..3b6d97ca6df8 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.240.0.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.240.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-Module-Load/perl-Module-Load-0.240.0.ebuild,v 1.15 2014/01/20 21:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/perl-Module-Load-0.240.0-r1.ebuild,v 1.1 2014/07/10 22:34:36 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +13,8 @@ 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.18* ~perl-core/${PN#perl-}-${PV} )
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.220.0-r1.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild
index 7978152d6698..8be26f777624 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.220.0-r1.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.320.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-Module-Load/perl-Module-Load-0.220.0-r1.ebuild,v 1.2 2014/01/20 21:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild,v 1.1 2014/07/10 22:34:36 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +10,11 @@ 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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.16* ~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
+"