Add perl-5.20 version; improve dependencies; remove old

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

4 files changed, 28 insertions, 21 deletions

diff --git a/virtual/perl-Time-Piece/ChangeLog b/virtual/perl-Time-Piece/ChangeLog
index 329a36537a29..f1b866549946 100644
--- a/virtual/perl-Time-Piece/ChangeLog
+++ b/virtual/perl-Time-Piece/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for virtual/perl-Time-Piece
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/ChangeLog,v 1.30 2014/01/20 20:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/ChangeLog,v 1.31 2014/07/15 18:19:54 dilfridge Exp $
+
+*perl-Time-Piece-1.270.0 (15 Jul 2014)
+*perl-Time-Piece-1.20-r1 (15 Jul 2014)
+
+  15 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-Time-Piece-1.20.ebuild, +perl-Time-Piece-1.20-r1.ebuild,
+  -perl-Time-Piece-1.22.ebuild, -perl-Time-Piece-1.230.0.ebuild,
+  +perl-Time-Piece-1.270.0.ebuild:
+  Add perl-5.20 version; improve dependencies; remove old
 
   20 Jan 2014; Mike Frysinger <vapier@gentoo.org> perl-Time-Piece-1.20.ebuild,
   perl-Time-Piece-1.22.ebuild, perl-Time-Piece-1.230.0.ebuild:
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.20.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild
index 669dbdb51772..c6fb7e314586 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.20.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.20.ebuild,v 1.8 2014/01/20 20:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.20-r1.ebuild,v 1.1 2014/07/15 18:19:54 dilfridge Exp $
 
-DESCRIPTION="Object Oriented time objects"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
 SRC_URI=""
 
@@ -11,4 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE=""
 
-RDEPEND="~perl-core/Time-Piece-${PV}"
+RDEPEND="
+	|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.22.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.22.ebuild
deleted file mode 100644
index 3f7a3f8df519..000000000000
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.22.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-Time-Piece/perl-Time-Piece-1.22.ebuild,v 1.2 2014/01/20 20:47:28 vapier Exp $
-
-DESCRIPTION="Object Oriented time objects"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="~perl-core/Time-Piece-${PV}"
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild
index 8b33ddc51b30..a684750e3a25 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.230.0.ebuild,v 1.2 2014/01/20 20:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-Piece/perl-Time-Piece-1.270.0.ebuild,v 1.1 2014/07/15 18:19:54 dilfridge Exp $
 
-DESCRIPTION="Object Oriented time objects"
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
 SRC_URI=""
 
@@ -11,4 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 IUSE=""
 
-RDEPEND="~perl-core/Time-Piece-${PV}"
+RDEPEND="
+	|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"