[gentoo-commits] repo/gentoo:master commit in: dev-perl/ShipIt/, dev-perl/ShipIt/files/

[Kent Fredric]

commit:     cb9d5dce67e0539e09e281382905e0647d18e098
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 18:34:35 2018 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 18:34:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9d5dce

dev-perl/ShipIt: Fix test failures re bug #623102

- EAPI6
- Fix test failures
- Remove bogus CPAN remote-id

Bug: https://bugs.gentoo.org/623102
Package-Manager: Portage-2.3.18, Repoman-2.3.6

 dev-perl/ShipIt/ShipIt-0.600.0-r1.ebuild           | 21 +++++++
 .../ShipIt/files/ShipIt-0.60-version-test.patch    | 65 ++++++++++++++++++++++
 dev-perl/ShipIt/metadata.xml                       |  1 -
 3 files changed, 86 insertions(+), 1 deletion(-)

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 00000000000..5425b69cda0
--- /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 00000000000..e4efb4937f7
--- /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@××××.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 8b51f807fde..1ab717495de 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>