| 1 |
commit: 53e16648f33346bc5c67f7385fdeac8f46ef3355 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 14:48:20 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 17 15:12:37 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e16648 |
| 7 |
|
| 8 |
dev-util/intltool: fix runtime warnings w/newer perl |
| 9 |
|
| 10 |
.../intltool/files/intltool-0.51.0-perl-5.22.patch | 48 ++++++++++++++++++++++ |
| 11 |
dev-util/intltool/intltool-0.51.0-r1.ebuild | 31 ++++++++++++++ |
| 12 |
2 files changed, 79 insertions(+) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..097c511 |
| 17 |
--- /dev/null |
| 18 |
+++ b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch |
| 19 |
@@ -0,0 +1,48 @@ |
| 20 |
+https://bugs.launchpad.net/intltool/+bug/1490906 |
| 21 |
+ |
| 22 |
+fix warnings w/newer perl: |
| 23 |
+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. |
| 24 |
+ |
| 25 |
+--- a/intltool-update.in |
| 26 |
++++ b/intltool-update.in |
| 27 |
+@@ -1062,7 +1062,7 @@ |
| 28 |
+ } |
| 29 |
+ } |
| 30 |
+ |
| 31 |
+- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) |
| 32 |
++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) |
| 33 |
+ { |
| 34 |
+ my $rest = $3; |
| 35 |
+ my $untouched = $1; |
| 36 |
+@@ -1190,10 +1190,10 @@ |
| 37 |
+ $name =~ s/\(+$//g; |
| 38 |
+ $version =~ s/\(+$//g; |
| 39 |
+ |
| 40 |
+- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 41 |
+- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 42 |
+- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 43 |
+- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 44 |
++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); |
| 45 |
++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); |
| 46 |
++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); |
| 47 |
++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); |
| 48 |
+ } |
| 49 |
+ |
| 50 |
+ if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) |
| 51 |
+@@ -1219,11 +1219,11 @@ |
| 52 |
+ $version =~ s/\(+$//g; |
| 53 |
+ $bugurl =~ s/\(+$//g if (defined $bugurl); |
| 54 |
+ |
| 55 |
+- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 56 |
+- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 57 |
+- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 58 |
+- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 59 |
+- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); |
| 60 |
++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); |
| 61 |
++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); |
| 62 |
++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); |
| 63 |
++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); |
| 64 |
++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); |
| 65 |
+ } |
| 66 |
+ |
| 67 |
+ # \s makes this not work, why? |
| 68 |
|
| 69 |
diff --git a/dev-util/intltool/intltool-0.51.0-r1.ebuild b/dev-util/intltool/intltool-0.51.0-r1.ebuild |
| 70 |
new file mode 100644 |
| 71 |
index 0000000..7fef558 |
| 72 |
--- /dev/null |
| 73 |
+++ b/dev-util/intltool/intltool-0.51.0-r1.ebuild |
| 74 |
@@ -0,0 +1,31 @@ |
| 75 |
+# Copyright 1999-2015 Gentoo Foundation |
| 76 |
+# Distributed under the terms of the GNU General Public License v2 |
| 77 |
+# $Id$ |
| 78 |
+ |
| 79 |
+EAPI=5 |
| 80 |
+inherit eutils |
| 81 |
+ |
| 82 |
+DESCRIPTION="Internationalization Tool Collection" |
| 83 |
+HOMEPAGE="https://launchpad.net/intltool/" |
| 84 |
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" |
| 85 |
+ |
| 86 |
+LICENSE="GPL-2" |
| 87 |
+SLOT="0" |
| 88 |
+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" |
| 89 |
+IUSE="" |
| 90 |
+ |
| 91 |
+DEPEND=" |
| 92 |
+ >=dev-lang/perl-5.8.1 |
| 93 |
+ dev-perl/XML-Parser |
| 94 |
+" |
| 95 |
+RDEPEND="${DEPEND} |
| 96 |
+ sys-devel/gettext |
| 97 |
+" |
| 98 |
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO ) |
| 99 |
+ |
| 100 |
+src_prepare() { |
| 101 |
+ # Fix handling absolute paths in single file key output, bug #470040 |
| 102 |
+ # https://bugs.launchpad.net/intltool/+bug/1168941 |
| 103 |
+ epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch" |
| 104 |
+ epatch "${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch |
| 105 |
+} |
Archives