From f894f2cec57d9eb8e85e1b48e38a39c4c65b5596 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Mon, 30 Oct 2017 20:50:33 +1300 Subject: [PATCH] dev-perl/Module-Info: Fix '.' in @INC test failures, bug #617110 Bug: https://bugs.gentoo.org/617110 Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- .../Module-Info/Module-Info-0.370.0-r1.ebuild | 3 +- .../Module-Info-0.370.0-no-dot-inc.patch | 63 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 dev-perl/Module-Info/files/Module-Info-0.370.0-no-dot-inc.patch diff --git a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild index f2f6294b5a9f..2db9e5994a95 100644 --- a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild +++ b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,6 +21,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/perl-ExtUtils-MakeMaker " +PATCHES=("${FILESDIR}/${PN}-0.370.0-no-dot-inc.patch") src_test() { perl_rm_files "t/zz_pod.t" "t/zy_pod_coverage.t" perl-module_src_test diff --git a/dev-perl/Module-Info/files/Module-Info-0.370.0-no-dot-inc.patch b/dev-perl/Module-Info/files/Module-Info-0.370.0-no-dot-inc.patch new file mode 100644 index 000000000000..39a70cc5ff81 --- /dev/null +++ b/dev-perl/Module-Info/files/Module-Info-0.370.0-no-dot-inc.patch @@ -0,0 +1,63 @@ +From 35d199fe62f7185ac03fec4cd1cb06aaf21f0172 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Mon, 30 Oct 2017 20:07:40 +1300 +Subject: Fix test failures without '.' in @INC on Perl 5.26 + +Where: PERL_USE_UNSAFE_INC=0 + +Bug: https://bugs.gentoo.org/617110 +Bug: https://rt.cpan.org/Ticket/Display.html?id=121035 +Bug: https://github.com/neilb/Module-Info/pull/3 +--- + t/Module-Info.t | 4 ++-- + t/lib/Foo.pm | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/t/Module-Info.t b/t/Module-Info.t +index bb62479..5c59214 100644 +--- a/t/Module-Info.t ++++ b/t/Module-Info.t +@@ -203,8 +203,8 @@ SKIP: { + my @mods = $module->modules_used; + is( @mods, 8, 'modules_used' ); + is_deeply( [sort @mods], +- [sort qw(strict vars Carp Exporter t/lib/Bar.pm t/lib/NotHere.pm +- t/lib/Foo.pm lib)] ); ++ [sort qw(strict vars Carp Exporter ./t/lib/Bar.pm ./t/lib/NotHere.pm ++ ./t/lib/Foo.pm lib)] ); + + $module->name('Foo'); + my @isa = $module->superclasses; +diff --git a/t/lib/Foo.pm b/t/lib/Foo.pm +index 956a79f..2602df2 100644 +--- a/t/lib/Foo.pm ++++ b/t/lib/Foo.pm +@@ -2,7 +2,7 @@ package Foo; + + use strict; + require Exporter; +-require "t/lib/Foo.pm"; ++require "./t/lib/Foo.pm"; + use vars qw(@ISA $VERSION); + $VERSION = 7.254; + +@@ -56,13 +56,13 @@ sub croak { + + return sub { + main::wibble('call insde anon sub inside sub'); +- require 't/lib/NotHere.pm'; ++ require './t/lib/NotHere.pm'; + } + } + + BEGIN { +- require 't/lib/Bar.pm'; ++ require './t/lib/Bar.pm'; + } + +-my $mod = 't/lib/Bar.pm'; ++my $mod = './t/lib/Bar.pm'; + require $mod; +-- +2.14.3 + -- 2.26.2