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 CE5721384B4 for ; Thu, 17 Dec 2015 15:12:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEC7521C037; Thu, 17 Dec 2015 15:12:51 +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 2C8E6E0896 for ; Thu, 17 Dec 2015 15:12:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E4CC34045C for ; Thu, 17 Dec 2015 15:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B076BA0E for ; Thu, 17 Dec 2015 15:12:46 +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: <1450365157.53e16648f33346bc5c67f7385fdeac8f46ef3355.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/files/, dev-util/intltool/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch dev-util/intltool/intltool-0.51.0-r1.ebuild X-VCS-Directories: dev-util/intltool/ dev-util/intltool/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 53e16648f33346bc5c67f7385fdeac8f46ef3355 X-VCS-Branch: master Date: Thu, 17 Dec 2015 15:12:46 +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: faf4a1e0-d9c6-44ee-bc27-2e9338ca9236 X-Archives-Hash: 6c0fc3cfeb918a9852ddf34e23603122 commit: 53e16648f33346bc5c67f7385fdeac8f46ef3355 Author: Mike Frysinger gentoo org> AuthorDate: Thu Dec 17 14:48:20 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 17 15:12:37 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e16648 dev-util/intltool: fix runtime warnings w/newer perl .../intltool/files/intltool-0.51.0-perl-5.22.patch | 48 ++++++++++++++++++++++ dev-util/intltool/intltool-0.51.0-r1.ebuild | 31 ++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch new file mode 100644 index 0000000..097c511 --- /dev/null +++ b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch @@ -0,0 +1,48 @@ +https://bugs.launchpad.net/intltool/+bug/1490906 + +fix warnings w/newer perl: +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. + +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? diff --git a/dev-util/intltool/intltool-0.51.0-r1.ebuild b/dev-util/intltool/intltool-0.51.0-r1.ebuild new file mode 100644 index 0000000..7fef558 --- /dev/null +++ b/dev-util/intltool/intltool-0.51.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="Internationalization Tool Collection" +HOMEPAGE="https://launchpad.net/intltool/" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + >=dev-lang/perl-5.8.1 + dev-perl/XML-Parser +" +RDEPEND="${DEPEND} + sys-devel/gettext +" +DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO ) + +src_prepare() { + # Fix handling absolute paths in single file key output, bug #470040 + # https://bugs.launchpad.net/intltool/+bug/1168941 + epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch" + epatch "${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch +}