[gentoo-commits] repo/gentoo:master commit in: dev-perl/Olson-Abbreviations/

[Andreas Hüttel]

commit:     594876bd35d46eb8873eb93b26714d514f961eb2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 20:00:00 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 20:00:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594876bd

dev-perl/Olson-Abbreviations: Add build fix for Perl 5.26, bug 617140

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../Olson-Abbreviations-0.40.0.ebuild                   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild b/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
index c55cdf8999f..1cabdda601b 100644
--- a/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
+++ b/dev-perl/Olson-Abbreviations/Olson-Abbreviations-0.40.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-MODULE_AUTHOR=ECARROLL
-MODULE_VERSION=0.04
+DIST_AUTHOR=ECARROLL
+DIST_VERSION=0.04
 inherit perl-module
 
 DESCRIPTION="Globally unique timezones abbreviation handling"
@@ -22,10 +22,9 @@ DEPEND="${RDEPEND}
 	test? ( virtual/perl-Test-Simple )
 "
 
-SRC_TEST=do
-
-# MI's fault
-src_configure() {
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
 	use test && perl_rm_files t/pod.t t/pod-coverage.t
-	perl-module_src_configure
 }