| 1 |
commit: df9d4aa2a2775d6924ef7388dc7f1bb0e13aae9c |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 8 12:02:51 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 12:07:58 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9d4aa2 |
| 7 |
|
| 8 |
dev-lang/perl: stop installing config_data files #553726 |
| 9 |
|
| 10 |
The Module-Build package now always installs the config_data files |
| 11 |
which leads to build failures in the default config: |
| 12 |
- FEATURES="collision-protect -protect-owned" |
| 13 |
- perl creates orphaned config_data symlink |
| 14 |
- Module-Build fails during merge when it installs config_data |
| 15 |
|
| 16 |
Since this version of perl and Module-Build are stable now, there's |
| 17 |
no need to install the config_data files at all. Simply delete them. |
| 18 |
|
| 19 |
dev-lang/perl/perl-5.20.2-r1.ebuild | 4 +++- |
| 20 |
dev-lang/perl/perl-5.20.2.ebuild | 4 +++- |
| 21 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-lang/perl/perl-5.20.2-r1.ebuild b/dev-lang/perl/perl-5.20.2-r1.ebuild |
| 24 |
index 31c32d1..17997be 100644 |
| 25 |
--- a/dev-lang/perl/perl-5.20.2-r1.ebuild |
| 26 |
+++ b/dev-lang/perl/perl-5.20.2-r1.ebuild |
| 27 |
@@ -57,13 +57,15 @@ dual_scripts() { |
| 28 |
src_remove_dual perl-core/ExtUtils-ParseXS 3.240.0 xsubpp |
| 29 |
src_remove_dual perl-core/IO-Compress 2.64.0 zipdetails |
| 30 |
src_remove_dual perl-core/JSON-PP 2.272.30 json_pp |
| 31 |
- src_remove_dual perl-core/Module-Build 0.420.500 config_data |
| 32 |
src_remove_dual perl-core/Module-CoreList 5.201.502.140 corelist |
| 33 |
src_remove_dual perl-core/Pod-Parser 1.620.0 pod2usage podchecker podselect |
| 34 |
src_remove_dual perl-core/Pod-Perldoc 3.230.0 perldoc |
| 35 |
src_remove_dual perl-core/Test-Harness 3.330.0 prove |
| 36 |
src_remove_dual perl-core/podlators 2.5.3 pod2man pod2text |
| 37 |
src_remove_dual_man perl-core/podlators 2.5.3 /usr/share/man/man1/perlpodstyle.1 |
| 38 |
+ if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726 |
| 39 |
+ rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die |
| 40 |
+ fi |
| 41 |
} |
| 42 |
|
| 43 |
# eblit-include [--skip] <function> [version] |
| 44 |
|
| 45 |
diff --git a/dev-lang/perl/perl-5.20.2.ebuild b/dev-lang/perl/perl-5.20.2.ebuild |
| 46 |
index 0385c8c..f652574 100644 |
| 47 |
--- a/dev-lang/perl/perl-5.20.2.ebuild |
| 48 |
+++ b/dev-lang/perl/perl-5.20.2.ebuild |
| 49 |
@@ -57,13 +57,15 @@ dual_scripts() { |
| 50 |
src_remove_dual perl-core/ExtUtils-ParseXS 3.240.0 xsubpp |
| 51 |
src_remove_dual perl-core/IO-Compress 2.64.0 zipdetails |
| 52 |
src_remove_dual perl-core/JSON-PP 2.272.30 json_pp |
| 53 |
- src_remove_dual perl-core/Module-Build 0.420.500 config_data |
| 54 |
src_remove_dual perl-core/Module-CoreList 5.201.502.140 corelist |
| 55 |
src_remove_dual perl-core/Pod-Parser 1.620.0 pod2usage podchecker podselect |
| 56 |
src_remove_dual perl-core/Pod-Perldoc 3.230.0 perldoc |
| 57 |
src_remove_dual perl-core/Test-Harness 3.330.0 prove |
| 58 |
src_remove_dual perl-core/podlators 2.5.3 pod2man pod2text |
| 59 |
src_remove_dual_man perl-core/podlators 2.5.3 /usr/share/man/man1/perlpodstyle.1 |
| 60 |
+ if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726 |
| 61 |
+ rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die |
| 62 |
+ fi |
| 63 |
} |
| 64 |
|
| 65 |
# eblit-include [--skip] <function> [version] |
Archives