From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C6FBE13888F for ; Thu, 8 Oct 2015 12:09:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C533E07F7; Thu, 8 Oct 2015 12:09:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1476E07F7 for ; Thu, 8 Oct 2015 12:09:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C32D340D1F for ; Thu, 8 Oct 2015 12:09:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A3DFBFB for ; Thu, 8 Oct 2015 12:09:18 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444306078.df9d4aa2a2775d6924ef7388dc7f1bb0e13aae9c.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/perl-5.20.2-r1.ebuild dev-lang/perl/perl-5.20.2.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: df9d4aa2a2775d6924ef7388dc7f1bb0e13aae9c X-VCS-Branch: master Date: Thu, 8 Oct 2015 12:09:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8eeae18f-e59d-455a-9fa5-6eb0371388a4 X-Archives-Hash: c53fb3cd1bee365885134e742e5711d7 commit: df9d4aa2a2775d6924ef7388dc7f1bb0e13aae9c Author: Mike Frysinger gentoo org> AuthorDate: Thu Oct 8 12:02:51 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Oct 8 12:07:58 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9d4aa2 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. dev-lang/perl/perl-5.20.2-r1.ebuild | 4 +++- dev-lang/perl/perl-5.20.2.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-lang/perl/perl-5.20.2-r1.ebuild b/dev-lang/perl/perl-5.20.2-r1.ebuild index 31c32d1..17997be 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] [version] diff --git a/dev-lang/perl/perl-5.20.2.ebuild b/dev-lang/perl/perl-5.20.2.ebuild index 0385c8c..f652574 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] [version]