[gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/, dev-util/intltool/files/

[Andreas Hüttel]

commit:     1105187fc65d8bf643e682fcef39620dcfd9326a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 22:54:58 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 22:54:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1105187f

dev-util/intltool: Revision bump for bug 614698

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../intltool/files/intltool-0.51.0-perl-5.26.patch | 12 +++++++++
 dev-util/intltool/intltool-0.51.0-r2.ebuild        | 30 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch
new file mode 100644
index 00000000000..4af2ed8647e
--- /dev/null
+++ b/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch
@@ -0,0 +1,12 @@
+diff -ruN intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
+--- intltool-0.51.0.orig/intltool-update.in	2017-06-28 00:47:20.889269294 +0200
++++ intltool-0.51.0/intltool-update.in	2017-06-28 00:48:14.592271529 +0200
+@@ -1068,7 +1068,7 @@
+ 	my $untouched = $1;
+ 	my $sub = "";
+         # Ignore recursive definitions of variables
+-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
++        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
+ 
+ 	return SubstituteVariable ("$untouched$sub$rest");
+     }

diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
new file mode 100644
index 00000000000..d93d95a74f0
--- /dev/null
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x64-cygwin ~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
+	dev-perl/XML-Parser
+"
+RDEPEND="${DEPEND}
+	sys-devel/gettext
+"
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
+
+PATCHES=(
+	# Fix handling absolute paths in single file key output, bug #470040
+	# https://bugs.launchpad.net/intltool/+bug/1168941
+	"${FILESDIR}"/${PN}-0.50.2-absolute-paths.patch
+	"${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch
+	"${FILESDIR}"/${PN}-0.51.0-perl-5.26.patch
+)