gentoo resync : 29.10.2017

3 files changed, 93 insertions, 2 deletions

diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index 542a8efc7972..b239751ccd13 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -18,5 +18,5 @@ RDEPEND="sys-devel/gettext"
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
-
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
 S="${WORKDIR}/${PN}-${DIST_VERSION}"
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index 120b6a0c3670..445c5743d8f8 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1,8 +1,9 @@
+AUX Locale-gettext-1.70.0-no-dot-inc.patch 2576 SHA256 21ddc19a3a5d0255529ebcdce7d446d53d0a2233d6381491a836c8bab427e086 SHA512 af169db6991e968e29dcc760030919cc619e4bd9f13b4f20d707914674aa5c53dabeaec0e9f29254dbf9250fc96e6ace36a86a50b1dc5af0e1573bf4485047d2 WHIRLPOOL 487034322afab3532b2be210f7826be9d0c0856a43184c3192665642dd66bf71b145db8db327d0b353781d3d46efaf87fd11df230d3ae68db67b0d3db4e89edf
 AUX compatibility-with-POSIX-module.diff 449 SHA256 e40b9911008c65719f8f890856d1fb77dc5f7f728f68231ec48264e86aae8008 SHA512 079d36e570bbfb6d940c5b02ecd14f685ca004c07e747b019dfb086b4017d0f59e76e94d4f423fe6d43a619d446f5b90443f60731f6008b789822b48d98e9b78 WHIRLPOOL c70513623e3518b419d3b8ce4d42a7f453100f840ab4928be9913b454def0f928bbd52f07d70030343e57b59c98a5359f5944b7be146387c9d3414195e6cb5df
 DIST gettext-1.05.tar.gz 7693 SHA256 27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694 SHA512 ce58940be16b7f2b3bde8f321f142486b38874018d37267ecf0587f44a0ea6c7a2d86fc22ce4ac78f3c9cc521e1ef7142009dd8d050aa45bb12a0e64959d37b1 WHIRLPOOL 87b64aae4d24435fcd38804fbcb9d41747f703a004b40b48a0e91718a67bd42958ede87d79deb462325d2bc6d81ba78a0babb9f879ca9176601ab247540bff0c
 DIST gettext-1.07.tar.gz 8651 SHA256 909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15 SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6 WHIRLPOOL d41dc69e46d9ae533989cb8eee3e055f968cff87d45deca91d0a6cad40a7cef584713df965f445eb217304696a7f84cb21882a10653dbe8a43882ca7cdcc272a
 EBUILD Locale-gettext-1.50.0-r1.ebuild 668 SHA256 e79790e442279d8fc2f12115d95f92e90fef69a824f6727a033ce38e82fd1918 SHA512 062fb86104b0a2c79a383a8cfc1922a526edc95ae84b9011b8986db407bff7588d523455329642d98b833d10f0675e48b863e1e169ef2646e461d69da9f03247 WHIRLPOOL 88f9531f5b5a55304505ca7c3913f0130437cfd88b6fad572e1395580e263b3d70459f9f5c4da7cf425c33e92d0d9a2d59e9d4aced9f3d82740eaad0627d2c84
-EBUILD Locale-gettext-1.70.0.ebuild 625 SHA256 81dabd75554f1968ad14f4911a33d7e576339da142d4abf69022238e0323d304 SHA512 c67cd437f8e977e51e6d6d7cb129fa1d894984e6d3060db228e19e09dd6f7f91e363309d9ed15bb9bf2d4b9bf17193c0e238cb862a50ac9f3436205532d3d953 WHIRLPOOL de8b9cd0167dce780eb220f427ec49493cd70c46de88c9d7c87b4097aa5b3fb4f0de75c22d99b25b5eb5a9fc49ddeee1dc279af821537cddb2654820fee46ad0
+EBUILD Locale-gettext-1.70.0.ebuild 670 SHA256 b8f83bde0261aa9a0b65c27e3d5bffc0fdb2e1cc70bae8f22b9e34169d780f1b SHA512 b8dac3bf877dd7d8ebb99c4463b6e8e193735c77e575607cc14e7b76716680c77940adb7de47e8c6579dae81cacadc7fe316deefcd7c9dcfe3dc6c4a634a1a46 WHIRLPOOL a76aaedaf425976b052151606caf2ad3c81f6ddd1cf4e19882c6f4dcbd65b585ec9a2cd6720baa247563da1da65f8658de9cd5dc8eeaa7d031023d1f233a7e5e
 MISC ChangeLog 2697 SHA256 f9c56a5d8cae92cbfd4356e47dba2aadded07330ccf33ec23a667375827f19c0 SHA512 2c65896075fbe6d0062b185505ff67fde3731d22c7689b4fc6c17efc4db67b3edafd045b5a7685c7bd4a28de8bc7309130fc8df8ad84451f8e41597dce80b584 WHIRLPOOL fc0fb4c56a1438c4b18958bc8f9effa361174d1dfdbb42b30c964cc0fc25d978dd584718b8735db0669ee55e35b4f63f3b3c8b3292b5878ca5697542b9880d27
 MISC ChangeLog-2015 6394 SHA256 1ca5cad5f7f234db21a7f273bb7178fccad5102d7df1ad3b76e82248e48abc55 SHA512 0440cc0e560df5b25f8d67164617f23870443a5e1c0acda2a22444a617cfd8441bc58502984d35a27a33319bb395d036b858ded22dcd249b6510c0ef3923acf9 WHIRLPOOL 2d0cede5efb0714619877398f8cc5cf82e845cfb69d776451ee144265a0eb5f4a834674410d27b57f3a4f3a9ba44e4e4b31c830245bc0a7372ed6e926a125408
 MISC metadata.xml 393 SHA256 5682047b2c98cd0d61d48c9d33c749ed17c361eb7679b620d569fdc36b601405 SHA512 368d7a37c00a186733e33eeaa01c12fdfed50f2f45c66bc88d0dfddcfd063aacb6c0953aa76737d8f9f5c2ed392e0eef41279975cf2cfad7fb423b8ca29592b0 WHIRLPOOL 1002806a98a7640b8604aaf60875b017f5ca1dea6ee5b76364f8c25a8ba6ad2507271d96d459d2d1c5570cd14a80eafefb4e536250fb6e235850eafe552dbd64
diff --git a/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
new file mode 100644
index 000000000000..962d90cdae7c
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
@@ -0,0 +1,90 @@
+From 08c1f219ae209b2475e5a1b025caceb10cb4a41b Mon Sep 17 00:00:00 2001
+From: Kim Vandry <vandry@TZoNE.ORG>
+Date: Sun, 28 May 2017 19:11:30 +0100
+Subject: Update tests to work with @INC that does not contain '.'
+
+Perl 5.25.11 removes '.' from the default @INC, and this breaks
+`require "test_data/gen_test_data.pl"` due to not being able to assume
+./test_data/gen_test_data.pl is in the @INC load path, and due to
+`require` treating paths without leading "/" or "./" as search paths.
+
+This change implements the first solution suggested by the reporter of
+the bug: Re-organise test dependencies into a dedicated directory such
+as `t/lib` and load that path into @INC with `use lib 't/lib'`.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121458
+Bug: https://bugs.gentoo.org/617048
+---
+ MANIFEST                              | 2 +-
+ t/frconvert.t                         | 3 ++-
+ t/jaconvert.t                         | 3 ++-
+ {test_data => t/lib}/gen_test_data.pl | 0
+ t/raw.t                               | 3 ++-
+ 5 files changed, 7 insertions(+), 4 deletions(-)
+ rename {test_data => t/lib}/gen_test_data.pl (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index 9604b91..e9f6e08 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -8,7 +8,7 @@ t/jaconvert.t
+ t/raw.t
+ t/use.t
+ test_data/foo.po
+-test_data/gen_test_data.pl
++t/lib/gen_test_data.pl
+ test_data/jaeuc.po
+ MANIFEST
+ META.yml                                 Module YAML meta-data (added by MakeMaker)
+diff --git a/t/frconvert.t b/t/frconvert.t
+index 2bca28b..9a4f4f5 100644
+--- a/t/frconvert.t
++++ b/t/frconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("foo");
+ use Locale::gettext;
+diff --git a/t/jaconvert.t b/t/jaconvert.t
+index 5794dc4..b95c883 100644
+--- a/t/jaconvert.t
++++ b/t/jaconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("jaeuc");
+ use Locale::gettext;
+diff --git a/test_data/gen_test_data.pl b/t/lib/gen_test_data.pl
+similarity index 100%
+rename from test_data/gen_test_data.pl
+rename to t/lib/gen_test_data.pl
+diff --git a/t/raw.t b/t/raw.t
+index 1e1cf14..7439397 100644
+--- a/t/raw.t
++++ b/t/raw.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("foo");
+ use Locale::gettext;
+-- 
+2.14.3
+