* [gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/files/, dev-util/intltool/
@ 2015-12-17 15:12 Mike Frysinger
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2015-12-17 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 53e16648f33346bc5c67f7385fdeac8f46ef3355
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 14:48:20 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/files/, dev-util/intltool/
@ 2017-06-27 22:56 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2017-06-27 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 1a0088dc98a2c556852ecd9b6284174893efae0b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 22:56:01 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 22:56:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0088dc
dev-util/intltool: Remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-util/intltool/Manifest | 1 -
.../files/intltool-0.50.2-localedir-fix.patch | 70 ----------------------
dev-util/intltool/intltool-0.50.2-r1.ebuild | 32 ----------
dev-util/intltool/intltool-0.51.0.ebuild | 29 ---------
4 files changed, 132 deletions(-)
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 7e9e239e98e..2dfc13a3855 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -1,2 +1 @@
-DIST intltool-0.50.2.tar.gz 189483 SHA256 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 SHA512 9f7f0746e77a1a6765b49e16f65438103bc031f3fa8cac42c061deade4291703b95aa336eba2500c8f05d19e35620cf01a120c71a7b6816c1bfecbb9fd747b11 WHIRLPOOL b026ab99921aaddb376823f1eb06e7d669bcc0a3cfb12431676e4e041343a370d7f715d39d60ef991e86e4f8441228713fc82a7ecb3cae2dc3273f7f01ce66a3
DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd
diff --git a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
deleted file mode 100644
index a887c41d3b5..00000000000
--- a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-=== modified file 'Makefile.in.in'
---- Makefile.in.in 2013-05-12 18:38:08 +0000
-+++ Makefile.in.in 2013-05-22 13:43:26 +0000
-@@ -33,8 +33,7 @@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+localedir = @localedir@
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -108,7 +107,7 @@
- install-data-yes: all
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
-- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
- if test -r $$lang.gmo; then \
- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-@@ -142,8 +141,8 @@
- uninstall:
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
-- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
- check: all $(GETTEXT_PACKAGE).pot
-
-=== modified file 'intltool.m4'
---- intltool.m4 2012-02-20 14:50:33 +0000
-+++ intltool.m4 2013-05-12 17:08:09 +0000
-@@ -155,31 +155,6 @@
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
- AC_SUBST(ALL_LINGUAS)
-
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
-- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[]],
-- [[extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr]])],
-- [DATADIRNAME=share],
-- [case $host in
-- *-*-solaris*)
-- dnl On Solaris, if bind_textdomain_codeset is in libc,
-- dnl GNU format message catalog is always supported,
-- dnl since both are added to the libc all together.
-- dnl Hence, we'd like to go with DATADIRNAME=share
-- dnl in this case.
-- AC_CHECK_FUNC(bind_textdomain_codeset,
-- [DATADIRNAME=share], [DATADIRNAME=lib])
-- ;;
-- *)
-- [DATADIRNAME=lib]
-- ;;
-- esac])
--fi
--AC_SUBST(DATADIRNAME)
--
- IT_PO_SUBDIR([po])
-
- ])
-
diff --git a/dev-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild
deleted file mode 100644
index ce380d8f20a..00000000000
--- a/dev-util/intltool/intltool-0.50.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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() {
- # Use plain localedir to install mo files to, rather than trying to
- # guess one, bug #432848#c11
- epatch "${FILESDIR}/${P}-localedir-fix.patch"
-
- # Fix handling absolute paths in single file key output, bug #470040
- epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch"
-}
diff --git a/dev-util/intltool/intltool-0.51.0.ebuild b/dev-util/intltool/intltool-0.51.0.ebuild
deleted file mode 100644
index cfd5ea16f0c..00000000000
--- a/dev-util/intltool/intltool-0.51.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-27 22:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-17 15:12 [gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/files/, dev-util/intltool/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2017-06-27 22:56 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox