gentoo resync : 14.07.2018

3 files changed, 123 insertions, 0 deletions

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");
+     }