1 |
commit: 6e01ba8b6f4e18bc758fee80cfd4a9f86af801d5 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 15:21:31 2016 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 15 11:15:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e01ba8b |
7 |
|
8 |
dev-perl/Convert-UUlib: Add IUSE="system-uulib" and disable unbundling |
9 |
|
10 |
Gentoo's uulib implementation and the bundled version differ in some way, |
11 |
making Gentoo's version less stable, causing mislinked .so files as seen |
12 |
in bug #559930 |
13 |
|
14 |
This pragmatic solution just defers this problem to the user so those who |
15 |
care about system purity can do that at their own cost, while making the |
16 |
default workflow both Work(tm) and Work as Upstream Intended. |
17 |
|
18 |
R1-bump required as it is expected people who have existing installations |
19 |
and did not run tests will have a broken installation, which can be |
20 |
confirmed by running: |
21 |
|
22 |
/usr/bin/perl -MConvert::UUlib=:all \ |
23 |
-e'SetFNameFilter(sub {});FNameFilter(1);SetFNameFilter()' |
24 |
|
25 |
Bug: https://bugs.gentoo.org/559930 |
26 |
|
27 |
Package-Manager: portage-2.3.0 |
28 |
RepoMan-Options: --ignore-arches --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd" |
29 |
|
30 |
.../Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild | 35 ++++++++++++++++++++++ |
31 |
.../Convert-UUlib/Convert-UUlib-1.500.0.ebuild | 27 ----------------- |
32 |
dev-perl/Convert-UUlib/metadata.xml | 3 ++ |
33 |
3 files changed, 38 insertions(+), 27 deletions(-) |
34 |
|
35 |
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild |
36 |
new file mode 100644 |
37 |
index 0000000..525945a |
38 |
--- /dev/null |
39 |
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild |
40 |
@@ -0,0 +1,35 @@ |
41 |
+# Copyright 1999-2016 Gentoo Foundation |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+# $Id$ |
44 |
+ |
45 |
+EAPI=5 |
46 |
+ |
47 |
+MODULE_AUTHOR=MLEHMANN |
48 |
+MODULE_VERSION=1.5 |
49 |
+inherit perl-module |
50 |
+ |
51 |
+DESCRIPTION="A Perl interface to the uulib library" |
52 |
+ |
53 |
+SLOT="0" |
54 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
55 |
+IUSE="system-uulib test" |
56 |
+ |
57 |
+RDEPEND=" |
58 |
+ system-uulib? ( >=dev-libs/uulib-0.5.20-r1 ) |
59 |
+" |
60 |
+DEPEND="${RDEPEND} |
61 |
+ >=virtual/perl-ExtUtils-MakeMaker-6.520.0 |
62 |
+ dev-perl/Canary-Stability |
63 |
+" |
64 |
+ |
65 |
+SRC_TEST="do parallel" |
66 |
+ |
67 |
+src_prepare() { |
68 |
+ if use system-uulib; then |
69 |
+ epatch "${FILESDIR}/${P}-unbundle.patch" |
70 |
+ ewarn "Building with USE=system-uulib known to be problematic and cause" |
71 |
+ ewarn " Convert::UUlib to segfault when used. ( Bug #559930 )" |
72 |
+ use test || ewarn "use of FEATURES=test strongly recommended"; |
73 |
+ fi |
74 |
+ perl-module_src_prepare |
75 |
+} |
76 |
|
77 |
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild |
78 |
deleted file mode 100644 |
79 |
index 9b64ae7..0000000 |
80 |
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild |
81 |
+++ /dev/null |
82 |
@@ -1,27 +0,0 @@ |
83 |
-# Copyright 1999-2015 Gentoo Foundation |
84 |
-# Distributed under the terms of the GNU General Public License v2 |
85 |
-# $Id$ |
86 |
- |
87 |
-EAPI=5 |
88 |
- |
89 |
-MODULE_AUTHOR=MLEHMANN |
90 |
-MODULE_VERSION=1.5 |
91 |
-inherit perl-module |
92 |
- |
93 |
-DESCRIPTION="A Perl interface to the uulib library" |
94 |
- |
95 |
-SLOT="0" |
96 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
97 |
-IUSE="" |
98 |
- |
99 |
-PATCHES=( "${FILESDIR}/${P}-unbundle.patch" ) |
100 |
- |
101 |
-RDEPEND=" |
102 |
- >=dev-libs/uulib-0.5.20-r1 |
103 |
-" |
104 |
-DEPEND="${RDEPEND} |
105 |
- >=virtual/perl-ExtUtils-MakeMaker-6.520.0 |
106 |
- dev-perl/Canary-Stability |
107 |
-" |
108 |
- |
109 |
-SRC_TEST="do parallel" |
110 |
|
111 |
diff --git a/dev-perl/Convert-UUlib/metadata.xml b/dev-perl/Convert-UUlib/metadata.xml |
112 |
index 4741d46..3999a21 100644 |
113 |
--- a/dev-perl/Convert-UUlib/metadata.xml |
114 |
+++ b/dev-perl/Convert-UUlib/metadata.xml |
115 |
@@ -9,4 +9,7 @@ |
116 |
<remote-id type="cpan">Convert-UUlib</remote-id> |
117 |
<remote-id type="cpan-module">Convert::UUlib</remote-id> |
118 |
</upstream> |
119 |
+ <use> |
120 |
+ <flag name="system-uulib">Use <pkg>dev-libs/uulib</pkg> instead of bundled version.</flag> |
121 |
+ </use> |
122 |
</pkgmetadata> |