Gentoo Archives: gentoo-commits

From: Kent Fredric <kentnl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Module-Info/files/, dev-perl/Module-Info/
Date: Mon, 30 Oct 2017 07:51:13
Message-Id: 1509349857.f894f2cec57d9eb8e85e1b48e38a39c4c65b5596.kentnl@gentoo
1 commit: f894f2cec57d9eb8e85e1b48e38a39c4c65b5596
2 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 30 07:50:33 2017 +0000
4 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 30 07:50:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f894f2ce
7
8 dev-perl/Module-Info: Fix '.' in @INC test failures, bug #617110
9
10 Bug: https://bugs.gentoo.org/617110
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild | 3 +-
14 .../files/Module-Info-0.370.0-no-dot-inc.patch | 63 ++++++++++++++++++++++
15 2 files changed, 65 insertions(+), 1 deletion(-)
16
17 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
18 index f2f6294b5a9..2db9e5994a9 100644
19 --- a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
20 +++ b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 +# Copyright 1999-2017 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -21,6 +21,7 @@ RDEPEND="
28 DEPEND="${RDEPEND}
29 virtual/perl-ExtUtils-MakeMaker
30 "
31 +PATCHES=("${FILESDIR}/${PN}-0.370.0-no-dot-inc.patch")
32 src_test() {
33 perl_rm_files "t/zz_pod.t" "t/zy_pod_coverage.t"
34 perl-module_src_test
35
36 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
37 new file mode 100644
38 index 00000000000..39a70cc5ff8
39 --- /dev/null
40 +++ b/dev-perl/Module-Info/files/Module-Info-0.370.0-no-dot-inc.patch
41 @@ -0,0 +1,63 @@
42 +From 35d199fe62f7185ac03fec4cd1cb06aaf21f0172 Mon Sep 17 00:00:00 2001
43 +From: Kent Fredric <kentnl@g.o>
44 +Date: Mon, 30 Oct 2017 20:07:40 +1300
45 +Subject: Fix test failures without '.' in @INC on Perl 5.26
46 +
47 +Where: PERL_USE_UNSAFE_INC=0
48 +
49 +Bug: https://bugs.gentoo.org/617110
50 +Bug: https://rt.cpan.org/Ticket/Display.html?id=121035
51 +Bug: https://github.com/neilb/Module-Info/pull/3
52 +---
53 + t/Module-Info.t | 4 ++--
54 + t/lib/Foo.pm | 8 ++++----
55 + 2 files changed, 6 insertions(+), 6 deletions(-)
56 +
57 +diff --git a/t/Module-Info.t b/t/Module-Info.t
58 +index bb62479..5c59214 100644
59 +--- a/t/Module-Info.t
60 ++++ b/t/Module-Info.t
61 +@@ -203,8 +203,8 @@ SKIP: {
62 + my @mods = $module->modules_used;
63 + is( @mods, 8, 'modules_used' );
64 + is_deeply( [sort @mods],
65 +- [sort qw(strict vars Carp Exporter t/lib/Bar.pm t/lib/NotHere.pm
66 +- t/lib/Foo.pm lib)] );
67 ++ [sort qw(strict vars Carp Exporter ./t/lib/Bar.pm ./t/lib/NotHere.pm
68 ++ ./t/lib/Foo.pm lib)] );
69 +
70 + $module->name('Foo');
71 + my @isa = $module->superclasses;
72 +diff --git a/t/lib/Foo.pm b/t/lib/Foo.pm
73 +index 956a79f..2602df2 100644
74 +--- a/t/lib/Foo.pm
75 ++++ b/t/lib/Foo.pm
76 +@@ -2,7 +2,7 @@ package Foo;
77 +
78 + use strict;
79 + require Exporter;
80 +-require "t/lib/Foo.pm";
81 ++require "./t/lib/Foo.pm";
82 + use vars qw(@ISA $VERSION);
83 + $VERSION = 7.254;
84 +
85 +@@ -56,13 +56,13 @@ sub croak {
86 +
87 + return sub {
88 + main::wibble('call insde anon sub inside sub');
89 +- require 't/lib/NotHere.pm';
90 ++ require './t/lib/NotHere.pm';
91 + }
92 + }
93 +
94 + BEGIN {
95 +- require 't/lib/Bar.pm';
96 ++ require './t/lib/Bar.pm';
97 + }
98 +
99 +-my $mod = 't/lib/Bar.pm';
100 ++my $mod = './t/lib/Bar.pm';
101 + require $mod;
102 +--
103 +2.14.3
104 +