gentoo resync : 08.01.2018

4 files changed, 89 insertions, 2 deletions

diff --git a/dev-perl/ShipIt/Manifest b/dev-perl/ShipIt/Manifest
index c30533ff3f71..6080569dad4a 100644
--- a/dev-perl/ShipIt/Manifest
+++ b/dev-perl/ShipIt/Manifest
@@ -1,3 +1,5 @@
+AUX ShipIt-0.60-version-test.patch 1729 BLAKE2B 8b650406966330e2d48a1f81065948e7d0a5a09b470fb3cf55f1a9e4acf41063d504277e8e36f9cf4df4cd15d07e1ee1c3819452329bba170ff4662a3e2d5271 SHA512 f99e2b8982e953acaf7ce5c5964fad3d1748a79b5628fe094b6308cb7ae58ab2b08762e302ce0d718fe208e52db7089a39c192691bdd5a6b88e6fc2d20fa096d
 DIST ShipIt-0.60.tar.gz 20650 BLAKE2B be320e97bfb651ce4b9d04e63269f3e1fb030e1a36fa948981bb76aaf15ff824c49dd6b3f487cfd026c60a432e8f53d5a9fc4dda0b17f66cb9ea16d896186e47 SHA512 89cc0e03ce0c24cfdce5f09f3dbde32a550692f5734c456d90f51e1266ea2e3bdd74966c2f041054e7a6c62549a62cdeb6cfe1ff24012b2055054fedca22f61f
+EBUILD ShipIt-0.600.0-r1.ebuild 479 BLAKE2B 2011fa01890604e9577a51ae2caab5e13ca1117c6468d7e1bbfb673f42f4d9e594fa378b2deee26abcea8fa403a30e27fe9cef30d9599a0488cf480eb669acf3 SHA512 10825b046fc2607421ded7dae32e7f41c68dfb62931f3958b813327af7f7bd938b2ada39a020c71bfcde4c05dc7f5c77758a8a8b00be067a7955f121b2d6e0d0
 EBUILD ShipIt-0.600.0.ebuild 438 BLAKE2B fc314500b596527ede2afc3550ae37b926fcdae267f49d2fa88debc7f8500a1c751ab37e17d977823cc9a9e8199257b2cd2e0b8dfa4e5ae3cbb68ac9f0ab0f51 SHA512 fd38a5fa7a0823431279f5ae555a4fc06573e3e51339c02f552b2f1f74a3031fbd7db8cd7d8b41b06fe99b649c5c8c0bb236984cb49fb46d329b2cd15716a44e
-MISC metadata.xml 2159 BLAKE2B aead25be493814f8fba9b969ac913ccfaef67f8c9a4f57f708d43ed4d3c506d823420de78d9426c90b04b6cf07e2290559135e80a90a67e52b79974c56247bb2 SHA512 cd808373f0979856c09727776e9306ef41f8fba9819708e56d69138a9da994544e80cb0e3622c364b0f693fa86cc560d520c2a863a35535cbd059dbc3ec79774
+MISC metadata.xml 2091 BLAKE2B 9cddb54b1d6f4b54da207e2bf225ac8900f6abbb70b1168cb012fd9dc088584f423b68e98192b236ffed0fc38a5c48e6353b1a715ebac268330d8585db2fc591 SHA512 81cff8ea10a1c2e5d88e98f7c1561debe645e1899e1004832df41ece52fefecf1e04e6c4c695e10309a3d597149d23231cf15d13ec615fdb2aff526b3624b3c8
diff --git a/dev-perl/ShipIt/ShipIt-0.600.0-r1.ebuild b/dev-perl/ShipIt/ShipIt-0.600.0-r1.ebuild
new file mode 100644
index 000000000000..5425b69cda07
--- /dev/null
+++ b/dev-perl/ShipIt/ShipIt-0.600.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MIYAGAWA
+DIST_VERSION=0.60
+inherit perl-module
+
+DESCRIPTION="Software Release Tool"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${PN}-0.60-version-test.patch" )
+
+pkg_postinst() {
+	elog "Please note that ShipIt does not depend on any specific VCS."
+	elog "You must install a supported VCS (CVS, SVN, SVK, GIT, HG) for use."
+}
diff --git a/dev-perl/ShipIt/files/ShipIt-0.60-version-test.patch b/dev-perl/ShipIt/files/ShipIt-0.60-version-test.patch
new file mode 100644
index 000000000000..e4efb4937f7e
--- /dev/null
+++ b/dev-perl/ShipIt/files/ShipIt-0.60-version-test.patch
@@ -0,0 +1,65 @@
+From 7d72ab2c8127e6728b60ffdc63af50e522366428 Mon Sep 17 00:00:00 2001
+From: Shohei YOSHIDA <shohei.yoshida@dena.com>
+Date: Thu, 19 Jan 2017 14:58:10 +0900
+Subject: Remove alpha version test
+
+version.pm changed alpha version specification so that its test
+makes no sense with latest version.pm
+
+Bug: https://bugs.gentoo.org/623102
+Bug: https://rt.cpan.org/Ticket/Display.html?id=112501
+---
+ MANIFEST                   | 1 -
+ t/data/Perl/04.pm          | 5 -----
+ t/version_from_file_perl.t | 4 ++--
+ 3 files changed, 2 insertions(+), 8 deletions(-)
+ delete mode 100644 t/data/Perl/04.pm
+
+diff --git a/MANIFEST b/MANIFEST
+index b9b3cc1..a13981a 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -34,7 +34,6 @@ shipit
+ t/data/Perl/01.pm
+ t/data/Perl/02.pm
+ t/data/Perl/03.pm
+-t/data/Perl/04.pm
+ t/data/Perl/05.pm
+ t/data/Perl/06.pm
+ t/data/Perl/07.pm
+diff --git a/t/data/Perl/04.pm b/t/data/Perl/04.pm
+deleted file mode 100644
+index 1744dd1..0000000
+--- a/t/data/Perl/04.pm
++++ /dev/null
+@@ -1,5 +0,0 @@
+-package something;
+-
+-use version; our $VERSION = qv('v1.5_0');
+-
+-1;
+diff --git a/t/version_from_file_perl.t b/t/version_from_file_perl.t
+index 286930a..c85d6f7 100644
+--- a/t/version_from_file_perl.t
++++ b/t/version_from_file_perl.t
+@@ -12,7 +12,7 @@ ok($proj);
+ 
+ my $basedir = catfile(qw(t data Perl));
+ 
+-for my $filenum ( 1 .. 7 ) {
++for my $filenum ( 1 .. 3, 5 .. 7 ) {
+     my $origfile = catfile( $basedir, sprintf( '%02d.pm', $filenum ) );
+ 
+     # check we read in the version correctly
+@@ -33,7 +33,7 @@ for my $filenum ( 1 .. 7 ) {
+ # cleanup
+ END {
+     eval {
+-        for ( 1 .. 7 )
++        for ( 1 .. 3, 5 .. 7 )
+         {
+             unlink catfile( $basedir, sprintf( '%02d.pm.new', $_ ) );
+         }
+-- 
+2.15.1
+
diff --git a/dev-perl/ShipIt/metadata.xml b/dev-perl/ShipIt/metadata.xml
index 8b51f807fde9..1ab717495ded 100644
--- a/dev-perl/ShipIt/metadata.xml
+++ b/dev-perl/ShipIt/metadata.xml
@@ -33,6 +33,5 @@
     <remote-id type="cpan-module">ShipIt::VC::Mercurial</remote-id>
     <remote-id type="cpan-module">ShipIt::VC::SVK</remote-id>
     <remote-id type="cpan-module">ShipIt::VC::SVN</remote-id>
-    <remote-id type="cpan-module">__ShipIt_Temp_Package</remote-id>
   </upstream>
 </pkgmetadata>