1 |
commit: 5224522045c4266b7326e2a9dbb657249d89ec59 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 2 23:58:28 2016 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 00:00:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52245220 |
7 |
|
8 |
dev-perl/Test-Output: Weaken dependency on dev-perl/Test-Tester |
9 |
|
10 |
Without this fix, Test-Output 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 |
Keyword Note: Stable keywords for arm64, m68k, s390 and sh are not |
31 |
satisfied by dev-perl/Sub-Exporter. This was a residual issue and remains |
32 |
to be fixed. |
33 |
|
34 |
Bug: https://bugs.gentoo.org/584238 |
35 |
|
36 |
Package-Manager: portage-2.3.0 |
37 |
RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm hppa ia64 mips nios2 ppc ppc64 riscv sparc sparc-fbsd x86 x86-fbsd" |
38 |
|
39 |
dev-perl/Test-Output/Test-Output-1.30.0.ebuild | 14 ++++++++++++-- |
40 |
1 file changed, 12 insertions(+), 2 deletions(-) |
41 |
|
42 |
diff --git a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild |
43 |
index e1af282..5aae85a 100644 |
44 |
--- a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild |
45 |
+++ b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild |
46 |
@@ -1,4 +1,4 @@ |
47 |
-# Copyright 1999-2015 Gentoo Foundation |
48 |
+# Copyright 1999-2016 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Id$ |
51 |
|
52 |
@@ -23,8 +23,18 @@ RDEPEND=" |
53 |
DEPEND="${RDEPEND} |
54 |
test? ( |
55 |
virtual/perl-Test-Simple |
56 |
- || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-Tester-0.107 ) |
57 |
) |
58 |
" |
59 |
|
60 |
SRC_TEST=do |
61 |
+ |
62 |
+src_test() { |
63 |
+ # Bug 584238 Avoidance |
64 |
+ if perl -e 'exit ( eval { require Test::Tester; Test::Tester->VERSION(0.107); 1 } ? 0 : 1 )'; then |
65 |
+ perl-module_src_test |
66 |
+ else |
67 |
+ einfo "Test phase skipped: Test::Tester required for tests" |
68 |
+ einfo "Please upgrade to >=dev-lang/perl-5.22.0 or >=virtual/perl-Test-Simple-1.1.10" |
69 |
+ einfo "if you want this tested" |
70 |
+ fi |
71 |
+} |