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

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

[Andreas Hüttel]

commit:     3fbc2fc8a2d0aaf822cf711ffe33ee928b3b450a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 23:03:38 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 23:03:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbc2fc8

dev-perl/Test-SubCalls: Fix Perl 5.26 dot-in-inc as recommended by upstream. Bug 615696.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild      | 14 ++++----------
 .../Test-SubCalls/files/Test-SubCalls-1.90.0-dot.patch     |  7 +++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
index d0e120168fe..4231a50ee12 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.09
+DIST_AUTHOR=ADAMK
+DIST_VERSION=1.09
 inherit perl-module
 
 DESCRIPTION="Track the number of times subs are called"
@@ -17,10 +17,4 @@ DEPEND=">=dev-perl/Hook-LexWrap-0.20
 	virtual/perl-File-Spec"
 RDEPEND="${DEPEND}"
 
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install::DSL /use lib q[.]; use inc::Module::Install::DSL /' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}"-dot.patch )

diff --git a/dev-perl/Test-SubCalls/files/Test-SubCalls-1.90.0-dot.patch b/dev-perl/Test-SubCalls/files/Test-SubCalls-1.90.0-dot.patch
new file mode 100644
index 00000000000..0be86a6037d
--- /dev/null
+++ b/dev-perl/Test-SubCalls/files/Test-SubCalls-1.90.0-dot.patch
@@ -0,0 +1,7 @@
+--- a/Makefile.PL	2017-03-31 09:05:12.495038191 -0400
++++ b/Makefile.PL	2017-03-31 09:05:22.634214621 -0400
+@@ -1,3 +1,4 @@
++use lib '.';
+ use inc::Module::Install::DSL 0.83;
+ 
+ all_from      lib/Test/SubCalls.pm