From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57E3E139694 for ; Fri, 16 Jun 2017 20:29:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BDA621C06B; Fri, 16 Jun 2017 20:29:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0655121C06B for ; Fri, 16 Jun 2017 20:29:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D4743418AD for ; Fri, 16 Jun 2017 20:29:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C48C746C for ; Fri, 16 Jun 2017 20:29:40 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1497644973.df371dfd1f6bb2a1d2a6646674eb5e5c464f8ef2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/po4a/, app-text/po4a/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch app-text/po4a/po4a-0.45-r3.ebuild app-text/po4a/po4a-0.47-r1.ebuild X-VCS-Directories: app-text/po4a/files/ app-text/po4a/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: df371dfd1f6bb2a1d2a6646674eb5e5c464f8ef2 X-VCS-Branch: master Date: Fri, 16 Jun 2017 20:29:40 +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: 95895804-1d07-4079-a758-e904cfa5f331 X-Archives-Hash: 022e735f83dc4b169fb2c10dbfb6e155 commit: df371dfd1f6bb2a1d2a6646674eb5e5c464f8ef2 Author: Kent Fredric gentoo org> AuthorDate: Tue Jun 13 09:34:57 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Fri Jun 16 20:29:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df371dfd app-text/po4a: Fix broken library path tweaks re bug #614122 The original code already had a "use lib" incantation that clearly intended to imply ".", but ... did so by quoting it twice: q('.') == "'.''" That's too much ' Bug: https://bugs.gentoo.org/614122 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../po4a/files/po4a-0.45-614122-no-dot-inc.patch | 26 ++++++++++++++++++++++ app-text/po4a/po4a-0.45-r3.ebuild | 3 +++ app-text/po4a/po4a-0.47-r1.ebuild | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch new file mode 100644 index 00000000000..226fa0e9b6e --- /dev/null +++ b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch @@ -0,0 +1,26 @@ +From: Kent Fredric +Date: Tue, 13 Jun 2017 21:10:34 +1200 +Subject: [PATCH] Fix broken use of lib '.' + + "'.'" is not "." + +Bug: https://bugs.gentoo.org/614122 +--- + Build.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Build.PL b/Build.PL +index 43c6f80..9ee443b 100644 +--- a/Build.PL ++++ b/Build.PL +@@ -1,6 +1,6 @@ + #!/usr/bin/perl + +-use lib q('.'); ++use lib q(.); + use Po4aBuilder; + + my $build = Po4aBuilder->new +-- +2.13.1 + diff --git a/app-text/po4a/po4a-0.45-r3.ebuild b/app-text/po4a/po4a-0.45-r3.ebuild index 985f6b206af..3523e66bb77 100644 --- a/app-text/po4a/po4a-0.45-r3.ebuild +++ b/app-text/po4a/po4a-0.45-r3.ebuild @@ -55,6 +55,9 @@ src_prepare() { einfo "Your LINGUAS lists the following languages: $LINGUAS" einfo "Removing locale files not listed in it ..." + # Fix bad escaping of '.' in @INC modification + epatch "${FILESDIR}/${P}-614122-no-dot-inc.patch" + # perl_rm_files also updates the Manifest file # and therefore silences Perl as to .po files we're about to clean perl_rm_files "${locales_to_remove[@]}" diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild index a935ce38894..87a6be51c2a 100644 --- a/app-text/po4a/po4a-0.47-r1.ebuild +++ b/app-text/po4a/po4a-0.47-r1.ebuild @@ -35,6 +35,10 @@ DEPEND="${RDEPEND} # Running tests in parallel fails DIST_TEST="do" +PATCHES=( + # Fix bad escaping of '.' in @INC modification + "${FILESDIR}/${PN}-0.45-614122-no-dot-inc.patch" +) src_prepare() { # Check against locale files in ${S}/pod/bin for mismatches # with languages listed in PLOCALES