1 |
commit: 8fea9a70696855a5acfd05df20cc725fc6aff186 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 2 23:11:29 2016 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 2 23:13:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fea9a70 |
7 |
|
8 |
dev-perl/Test-NoWarnings: Weaken dependency on dev-perl/Test-Tester |
9 |
|
10 |
Without this fix, Test-NoWarnings effectively needs perl-5.22 |
11 |
stabilized in order to satisfy Test-Tester from Perl-5.22 |
12 |
|
13 |
However, satisfying Test-Tester from a mechanism other than Perl-5.22 |
14 |
confuses portages dependency resolver, and confuses portage to not be able |
15 |
to upgrade perl, and not being able to upgrade perl means perl can't be |
16 |
stabilized, invoking a stabilization-needs-stabilization bug. |
17 |
|
18 |
Hence, the choice here optimises for assuming stabilization will |
19 |
happen/has happened, and removes any dependency on Test::Tester, assuming |
20 |
portage will eventually provide it for you. |
21 |
|
22 |
And just to be sure, we use perl before the test phase executes |
23 |
to determine if Test::Tester was /actually/ installed and then only run tests |
24 |
if it was. |
25 |
|
26 |
This means before stabilization, some people *might* install this and not have |
27 |
tests run, but everyone *will* get tests working after stabilization, as |
28 |
opposed to the opposite occurring and stabilization being blocked. |
29 |
|
30 |
-r bump required as Test-Tester was declared as a Runtime Requirement, even |
31 |
though source analysis indicated it was a Testing Only requirement. |
32 |
|
33 |
Bug: https://bugs.gentoo.org/584238 |
34 |
|
35 |
Package-Manager: portage-2.3.0 |
36 |
RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd" |
37 |
|
38 |
...-1.40.0-r2.ebuild => Test-NoWarnings-1.40.0-r3.ebuild} | 15 +++++++++++++-- |
39 |
1 file changed, 13 insertions(+), 2 deletions(-) |
40 |
|
41 |
diff --git a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r2.ebuild b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild |
42 |
similarity index 51% |
43 |
rename from dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r2.ebuild |
44 |
rename to dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild |
45 |
index 7b6dc41..39887b0 100644 |
46 |
--- a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r2.ebuild |
47 |
+++ b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2015 Gentoo Foundation |
50 |
+# Copyright 1999-2016 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Id$ |
53 |
|
54 |
@@ -15,7 +15,18 @@ LICENSE="LGPL-2.1" |
55 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
56 |
IUSE="" |
57 |
|
58 |
-RDEPEND="|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-Tester-0.107 )" |
59 |
+RDEPEND="virtual/perl-Test-Simple" |
60 |
DEPEND="${RDEPEND}" |
61 |
|
62 |
SRC_TEST="do" |
63 |
+ |
64 |
+src_test() { |
65 |
+ # Bug 584238 Avoidance |
66 |
+ if perl -e 'exit ( eval { require Test::Tester; 1 } ? 0 : 1 )'; then |
67 |
+ perl-module_src_test |
68 |
+ else |
69 |
+ einfo "Test phase skipped: Test::Tester required for tests" |
70 |
+ einfo "Please upgrade to >=dev-lang/perl-5.22.0 or >=virtual/perl-Test-Simple-1.1.10" |
71 |
+ einfo "if you want this tested" |
72 |
+ fi |
73 |
+} |