gentoo resync : 14.07.2018

6 files changed, 169 insertions, 0 deletions

diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
new file mode 100644
index 000000000000..4198263ec722
--- /dev/null
+++ b/dev-util/intltool/Manifest
@@ -0,0 +1,6 @@
+AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d558cdb7bc2a87c8211c88cc7defe41faacca6a5acf52c4cc47dde6aa8378d269b9c8ae42a0ae3d5b74c8257c2d5829b1de296e SHA512 f4fe5452b81d448d19ec58196ecb1a0fa619daedd67c86fc16dcd8f45b4fa449890a0fed14d6fdb259f7c6b13cf8a1ffe064d540305913a0d9df80bb5042aa17
+AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
+AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
+DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
+EBUILD intltool-0.51.0-r2.ebuild 997 BLAKE2B a9bff97f430cbdec2805e1be36eb7d3e4ea2007e8f57601807571056852c6f8f95beaed8d002fbffeaecb5064f6a9e593d74bcd46dd9b0e49ef7e7146e806c01 SHA512 19cd0a94029c03cc8a4b9d59a57908c139c5a8f8409244a1ba67605fbb7764d8d245cb2588754ccf2a2e60829b6af8accbe8035279c1e8721b361bed00eab22c
+MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
new file mode 100644
index 000000000000..117f4a30c29b
--- /dev/null
+++ b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
@@ -0,0 +1,63 @@
+From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Apr 2013 20:41:41 +0200
+Subject: [PATCH] Fix handling absolute paths in single file key output.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
+---
+ intltool-merge.in | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/intltool-merge.in b/intltool-merge.in
+index 1afa2a4..47dbbdf 100644
+--- a/intltool-merge.in
++++ b/intltool-merge.in
+@@ -1108,13 +1108,20 @@ sub keys_merge_translation
+ {
+     my ($lang) = @_;
+ 
+-    if ( ! -d $lang && $MULTIPLE_OUTPUT)
++    my $outpath = "$OUTFILE";
++
++    if ($MULTIPLE_OUTPUT)
+     {
+-        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++        $outpath = "$lang/$outpath";
++
++        if ( ! -d $lang )
++        {
++            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++        }
+     }
+ 
+     open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
+-    open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++    open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
+     binmode (OUTPUT) if $^O eq 'MSWin32';
+ 
+     while (<INPUT>)
+@@ -1159,7 +1166,7 @@ sub keys_merge_translation
+     close OUTPUT;
+     close INPUT;
+ 
+-    print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++    print "CREATED $outpath\n" unless $QUIET_ARG;
+ }
+ 
+ sub keys_merge_translations
+@@ -1174,7 +1181,7 @@ sub keys_merge_translations
+     }
+     else
+     {
+-        keys_merge_translation (".");
++        keys_merge_translation ();
+     }
+ }
+ 
+-- 
+1.8.1.5
+
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 000000000000..097c511ce18d
--- /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/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 000000000000..4af2ed8647e9
--- /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 000000000000..ed23a567ce19
--- /dev/null
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 ~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
+)
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
new file mode 100644
index 000000000000..525c1a60b10b
--- /dev/null
+++ b/dev-util/intltool/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">intltool</remote-id>
+	</upstream>
+</pkgmetadata>