From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 8 Oct 2015 12:02:51 +0000 (-0400)
Subject: dev-lang/perl: stop installing config_data files #553726
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df9d4aa2a2775d6924ef7388dc7f1bb0e13aae9c;p=gentoo.git

dev-lang/perl: stop installing config_data files #553726

The Module-Build package now always installs the config_data files
which leads to build failures in the default config:
 - FEATURES="collision-protect -protect-owned"
 - perl creates orphaned config_data symlink
 - Module-Build fails during merge when it installs config_data

Since this version of perl and Module-Build are stable now, there's
no need to install the config_data files at all.  Simply delete them.
---

diff --git a/dev-lang/perl/perl-5.20.2-r1.ebuild b/dev-lang/perl/perl-5.20.2-r1.ebuild
index 31c32d1a0c22..17997bee9497 100644
--- a/dev-lang/perl/perl-5.20.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.20.2-r1.ebuild
@@ -57,13 +57,15 @@ dual_scripts() {
 	src_remove_dual      perl-core/ExtUtils-ParseXS   3.240.0      xsubpp
 	src_remove_dual      perl-core/IO-Compress        2.64.0       zipdetails
 	src_remove_dual      perl-core/JSON-PP            2.272.30      json_pp
-	src_remove_dual      perl-core/Module-Build       0.420.500    config_data
 	src_remove_dual      perl-core/Module-CoreList    5.201.502.140 corelist
 	src_remove_dual      perl-core/Pod-Parser         1.620.0      pod2usage podchecker podselect
 	src_remove_dual      perl-core/Pod-Perldoc        3.230.0      perldoc
 	src_remove_dual      perl-core/Test-Harness       3.330.0      prove
 	src_remove_dual      perl-core/podlators          2.5.3        pod2man pod2text
 	src_remove_dual_man  perl-core/podlators          2.5.3        /usr/share/man/man1/perlpodstyle.1
+	if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726
+		rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die
+	fi
 }
 
 # eblit-include [--skip] <function> [version]
diff --git a/dev-lang/perl/perl-5.20.2.ebuild b/dev-lang/perl/perl-5.20.2.ebuild
index 0385c8cdb8d8..f652574f2b5c 100644
--- a/dev-lang/perl/perl-5.20.2.ebuild
+++ b/dev-lang/perl/perl-5.20.2.ebuild
@@ -57,13 +57,15 @@ dual_scripts() {
 	src_remove_dual      perl-core/ExtUtils-ParseXS   3.240.0      xsubpp
 	src_remove_dual      perl-core/IO-Compress        2.64.0       zipdetails
 	src_remove_dual      perl-core/JSON-PP            2.272.30      json_pp
-	src_remove_dual      perl-core/Module-Build       0.420.500    config_data
 	src_remove_dual      perl-core/Module-CoreList    5.201.502.140 corelist
 	src_remove_dual      perl-core/Pod-Parser         1.620.0      pod2usage podchecker podselect
 	src_remove_dual      perl-core/Pod-Perldoc        3.230.0      perldoc
 	src_remove_dual      perl-core/Test-Harness       3.330.0      prove
 	src_remove_dual      perl-core/podlators          2.5.3        pod2man pod2text
 	src_remove_dual_man  perl-core/podlators          2.5.3        /usr/share/man/man1/perlpodstyle.1
+	if [[ ${EBUILD_PHASE} == "install" ]] ; then #553726
+		rm "${ED}"/usr/bin/config_data "${ED}"/usr/share/man/man1/config_data.1 || die
+	fi
 }
 
 # eblit-include [--skip] <function> [version]