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/ExtUtils-AutoInstall/files/, dev-perl/ExtUtils-AutoInstall/
Date: Sat, 21 Oct 2017 03:32:12
Message-Id: 1508554015.f4296657581e1a0899193e2ad5b60864c64fe92d.kentnl@gentoo
1 commit: f4296657581e1a0899193e2ad5b60864c64fe92d
2 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 21 02:46:55 2017 +0000
4 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 21 02:46:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4296657
7
8 dev-perl/ExtUtils-AutoInstall: Bump to version 0.640.0
9
10 - EAPI6
11 - Enable tests
12 - Migrate Makefile.PL hack to patch
13 - Patch tests to work
14
15 Upstream:
16 - Fix tests building properly with newer ExtUtils::MakeMaker
17
18 Package-Manager: Portage-2.3.8, Repoman-2.3.3
19
20 .../ExtUtils-AutoInstall-0.640.0.ebuild | 49 +++++++++
21 dev-perl/ExtUtils-AutoInstall/Manifest | 1 +
22 .../ExtUtils-AutoInstall-0.640.0-cpantest.patch | 111 +++++++++++++++++++++
23 .../ExtUtils-AutoInstall-0.640.0-no-dot-inc.patch | 27 +++++
24 4 files changed, 188 insertions(+)
25
26 diff --git a/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0.ebuild b/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0.ebuild
27 new file mode 100644
28 index 00000000000..67b5ca9597f
29 --- /dev/null
30 +++ b/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0.ebuild
31 @@ -0,0 +1,49 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +DIST_AUTHOR=INGY
38 +DIST_VERSION=0.64
39 +inherit perl-module
40 +
41 +DESCRIPTION="Automatic installation of dependencies via CPAN from within Makefile.PL"
42 +
43 +SLOT="0"
44 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
45 +IUSE=""
46 +
47 +# TESTS BAD. Wants to write to cpan's config on the live system
48 +#SRC_TEST="do"
49 +
50 +RDEPEND="dev-perl/Sort-Versions"
51 +DEPEND="${RDEPEND}"
52 +
53 +PATCHES=(
54 + "${FILESDIR}/${P}-no-dot-inc.patch"
55 + "${FILESDIR}/${P}-cpantest.patch"
56 +)
57 +src_compile() {
58 + echo "n" | perl-module_src_compile
59 +}
60 +
61 +src_test() {
62 + local MODULES=(
63 + "ExtUtils::AutoInstall ${DIST_VERSION}"
64 + )
65 + local failed=()
66 + for dep in "${MODULES[@]}"; do
67 + ebegin "Compile testing ${dep}"
68 + perl -Mblib="${S}" -M"${dep} ()" -e1
69 + eend $? || failed+=( "$dep" )
70 + done
71 + if [[ ${failed[@]} ]]; then
72 + echo
73 + eerror "One or more modules failed compile:";
74 + for dep in "${failed[@]}"; do
75 + eerror " ${dep}"
76 + done
77 + die "Failing due to module compilation errors";
78 + fi
79 + perl-module_src_test
80 +}
81
82 diff --git a/dev-perl/ExtUtils-AutoInstall/Manifest b/dev-perl/ExtUtils-AutoInstall/Manifest
83 index 7d2ee2edec9..18a76ec0af5 100644
84 --- a/dev-perl/ExtUtils-AutoInstall/Manifest
85 +++ b/dev-perl/ExtUtils-AutoInstall/Manifest
86 @@ -1 +1,2 @@
87 DIST ExtUtils-AutoInstall-0.63.tar.gz 26951 SHA256 829d4976e85d04dd18e24f500d03fb662e40aabf8609b633331b1925e0455299 SHA512 3836dbdd175732109c88a2c0e8d19929fbf59ef453c7149b6a6b6658cf419f241c91ba86fe7f4a1d7bf1af4d7ef42809e523f05e683e9bba75ca9aa9d47e1445 WHIRLPOOL 759e7802bb74821bb76d23ab1e554f70612f12487296ac27abc1c89a4911f99548866ebacfd29ecc1e23033a6ac7dd1697056afd7b2843a0c0b7d9c2cbb558bc
88 +DIST ExtUtils-AutoInstall-0.64.tar.gz 25886 SHA256 0fe48f78b5ee39acb3be38a7a039789abc46195af411297dabec294c2851027f SHA512 18f8d58673ea5c0f9654b2c39297e974c6e464250af63e569fbe5966ce7a59cb2ec0ea1190b84cb47bf061eb90fd9307b52ead38491f3220fc301fff342bf860 WHIRLPOOL ec5f4b52f7ccc762fb0c4280d626a362d66462a23dc2400574a0d2f99c495dbd8b8bf908f007031a327e40bba56ed3d607c88200b4b8cd1e727be37e1cdb1083
89
90 diff --git a/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-cpantest.patch b/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-cpantest.patch
91 new file mode 100644
92 index 00000000000..4040016fe9c
93 --- /dev/null
94 +++ b/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-cpantest.patch
95 @@ -0,0 +1,111 @@
96 +From fe02934c5a5bba11e351be5a2f3f95a4461779af Mon Sep 17 00:00:00 2001
97 +From: Kent Fredric <kentnl@g.o>
98 +Date: Sat, 21 Oct 2017 15:37:11 +1300
99 +Subject: Patch around annoying CPAN-initialization test
100 +
101 +This is a terrible way of doing this, but its good enough for now
102 +and convinces CPAN that its already configured and doesn't block
103 +waiting for input. A more sensible narrow set is probably viable,
104 +and OS specifics probably need to be considered.
105 +
106 +Bug: https://rt.cpan.org/Ticket/Display.html?id=96782
107 +---
108 + t/1-basic.t | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
109 + 1 file changed, 75 insertions(+)
110 +
111 +diff --git a/t/1-basic.t b/t/1-basic.t
112 +index dbf7e27..2cdffab 100644
113 +--- a/t/1-basic.t
114 ++++ b/t/1-basic.t
115 +@@ -10,6 +10,7 @@ my $mm_args;
116 + my @prompts = qw/y n n y y/;
117 +
118 + use ExtUtils::MakeMaker;
119 ++use File::Temp qw( tempdir );
120 + sub ExtUtils::MakeMaker::WriteMakefile { $mm_args = {@_} }
121 + sub ExtUtils::MakeMaker::prompt ($;$) { return 'n' }
122 +
123 +@@ -24,6 +25,80 @@ my $fh = Symbol::gensym;
124 + my $out = tie *$fh, __PACKAGE__;
125 + select(*$fh);
126 +
127 ++my $tempdir = tempdir( 'tmp-XXXXXXX', DIR => './t' , CLEANUP => 1 );
128 ++$ENV{HOME} = $tempdir;
129 ++mkdir "$tempdir/.cpan";
130 ++mkdir "$tempdir/.cpan/CPAN";
131 ++{
132 ++ open my $fh, '>', "$tempdir/.cpan/CPAN/MyConfig.pm" or die "can't open test MyConfig.pm: $! $?";
133 ++ print $fh <<"EOF";
134 ++\$CPAN::Config = {
135 ++ 'applypatch' => q[],
136 ++ 'auto_commit' => q[0],
137 ++ 'build_cache' => q[100],
138 ++ 'build_dir' => q[\Q$tempdir\E/build],
139 ++ 'build_dir_reuse' => q[0],
140 ++ 'build_requires_install_policy' => q[yes],
141 ++ 'bzip2' => q[/bin/bzip2],
142 ++ 'cache_metadata' => q[1],
143 ++ 'check_sigs' => q[0],
144 ++ 'colorize_output' => q[0],
145 ++ 'commandnumber_in_prompt' => q[1],
146 ++ 'connect_to_internet_ok' => q[1],
147 ++ 'cpan_home' => q[\Q$tempdir\E],
148 ++ 'ftp_passive' => q[1],
149 ++ 'ftp_proxy' => q[],
150 ++ 'getcwd' => q[cwd],
151 ++ 'gpg' => q[/usr/bin/gpg],
152 ++ 'gzip' => q[/bin/gzip],
153 ++ 'halt_on_failure' => q[0],
154 ++ 'histfile' => q[\Q$tempdir\E/histfile],
155 ++ 'histsize' => q[100],
156 ++ 'http_proxy' => q[],
157 ++ 'inactivity_timeout' => q[0],
158 ++ 'index_expire' => q[1],
159 ++ 'inhibit_startup_message' => q[0],
160 ++ 'keep_source_where' => q[\Q$tempdir\E/sources],
161 ++ 'load_module_verbosity' => q[none],
162 ++ 'make' => q[/usr/bin/make],
163 ++ 'make_arg' => q[],
164 ++ 'make_install_arg' => q[],
165 ++ 'make_install_make_command' => q[/usr/bin/make],
166 ++ 'makepl_arg' => q[],
167 ++ 'mbuild_arg' => q[],
168 ++ 'mbuild_install_arg' => q[],
169 ++ 'mbuild_install_build_command' => q[./Build],
170 ++ 'mbuildpl_arg' => q[],
171 ++ 'no_proxy' => q[],
172 ++ 'pager' => q[/usr/bin/less],
173 ++ 'patch' => q[/usr/bin/patch],
174 ++ 'perl5lib_verbosity' => q[none],
175 ++ 'prefer_external_tar' => q[1],
176 ++ 'prefer_installer' => q[MB],
177 ++ 'prefs_dir' => q[\Q$tempdir\E/prefs],
178 ++ 'prerequisites_policy' => q[follow],
179 ++ 'scan_cache' => q[atstart],
180 ++ 'shell' => q[/bin/bash],
181 ++ 'show_unparsable_versions' => q[0],
182 ++ 'show_upload_date' => q[0],
183 ++ 'show_zero_versions' => q[0],
184 ++ 'tar' => q[/bin/tar],
185 ++ 'tar_verbosity' => q[none],
186 ++ 'term_is_latin' => q[1],
187 ++ 'term_ornaments' => q[1],
188 ++ 'test_report' => q[0],
189 ++ 'trust_test_report_history' => q[0],
190 ++ 'unzip' => q[/usr/bin/unzip],
191 ++ 'urllist' => [q[http://cpan.kinghost.net/], q[http://cpan.dcc.uchile.cl/], q[http://www.laqee.unal.edu.co/CPAN/]],
192 ++ 'use_sqlite' => q[0],
193 ++ 'version_timeout' => q[15],
194 ++ 'wget' => q[/usr/bin/wget],
195 ++ 'yaml_load_code' => q[0],
196 ++ 'yaml_module' => q[YAML],
197 ++ };
198 ++EOF
199 ++}
200 ++
201 + # test from a clean state
202 + $ENV{PERL_EXTUTILS_AUTOINSTALL} = '';
203 + require ExtUtils::AutoInstall;
204 +--
205 +2.14.2
206 +
207
208 diff --git a/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-no-dot-inc.patch b/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-no-dot-inc.patch
209 new file mode 100644
210 index 00000000000..c85d8a362fb
211 --- /dev/null
212 +++ b/dev-perl/ExtUtils-AutoInstall/files/ExtUtils-AutoInstall-0.640.0-no-dot-inc.patch
213 @@ -0,0 +1,27 @@
214 +From 929dc970f0f6744e0124243840de287b48284275 Mon Sep 17 00:00:00 2001
215 +From: Kent Fredric <kentnl@g.o>
216 +Date: Sat, 21 Oct 2017 15:21:14 +1300
217 +Subject: Fix for '.' in @INC on 5.26+
218 +
219 +Bug: https://rt.cpan.org/Ticket/Display.html?id=121201
220 +Bug: https://bugs.gentoo.org/615830
221 +---
222 + Makefile.PL | 3 +--
223 + 1 file changed, 1 insertion(+), 2 deletions(-)
224 +
225 +diff --git a/Makefile.PL b/Makefile.PL
226 +index 80d276b..8b77462 100644
227 +--- a/Makefile.PL
228 ++++ b/Makefile.PL
229 +@@ -1,7 +1,6 @@
230 + #!/usr/bin/perl
231 +-
232 ++use lib '.', 'lib';
233 + use inc::Module::Install;
234 +-use lib 'lib';
235 +
236 + name ('ExtUtils-AutoInstall');
237 + abstract ('Automatic install of dependencies via CPAN');
238 +--
239 +2.14.2
240 +