Fix warnings with Perl 5.20, bug 526188

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 94 insertions, 5 deletions

diff --git a/dev-perl/Shell-EnvImporter/ChangeLog b/dev-perl/Shell-EnvImporter/ChangeLog
index e269e8d0f15c..39e7d0c9892b 100644
--- a/dev-perl/Shell-EnvImporter/ChangeLog
+++ b/dev-perl/Shell-EnvImporter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Shell-EnvImporter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Shell-EnvImporter/ChangeLog,v 1.38 2014/08/22 21:14:51 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Shell-EnvImporter/ChangeLog,v 1.39 2014/12/20 17:26:34 dilfridge Exp $
+
+*Shell-EnvImporter-1.70.0-r2 (20 Dec 2014)
+
+  20 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +Shell-EnvImporter-1.70.0-r2.ebuild,
+  +files/Shell-EnvImporter-1.70.0-perl520.patch:
+  Fix warnings with Perl 5.20, bug 526188
 
 *Shell-EnvImporter-1.70.0-r1 (22 Aug 2014)
 
diff --git a/dev-perl/Shell-EnvImporter/Manifest b/dev-perl/Shell-EnvImporter/Manifest
index 9535d815cc8a..89d80ccc4e73 100644
--- a/dev-perl/Shell-EnvImporter/Manifest
+++ b/dev-perl/Shell-EnvImporter/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX Shell-EnvImporter-1.70.0-perl520.patch 1830 SHA256 ca6a9855d53ab73104c3ebc09b7bac57092f2b678e5b3eb939e713393a9bc6de SHA512 f4f4d2d4d0fbdfdea984791d5a1d7065a9d8346d390d4eb29bae877e2f121cf0b80ae05b35d8e88d389186df46ca7e3cac79a2e21671a406c9dce12466eae164 WHIRLPOOL 5d2c0fab28ddc2f53c8489ba29051551abc697cadc4f76605f377f36272495ff49c8751f08d8d62fb5ff1d59db82923b11339b6b7e1547d694b0b59fc0e023cf
 DIST Shell-EnvImporter-1.07.tar.gz 15655 SHA256 db747657fa725968f5fb3b09e763c1fed7bef64b740eba80786906d0db55c909 SHA512 44988bf8a13d6a8d73d4c0a2f40b23506af4cfab979beed4a135df92876697fa7831d51549bd77a46a32598818c6f50ad1742766e2e0295afb2bf09eecbfcd4d WHIRLPOOL 7ccb948b74632b002a7ad5ad171e700bb23c77da3abad3eba4f7a63f273538138dd668a2d8083d34a9363ea565aadc275a9d74e768736e7a60aea94b256d08ef
 EBUILD Shell-EnvImporter-1.70.0-r1.ebuild 683 SHA256 8baa968b62932a3927d038ea8b6ac2831e98d496f3fc46bd460d4f9a02d48779 SHA512 03d79c452296594e8f0093402da57041bd5856731a78ebf48b4f202aef0aa321bf9855cdbb4b60b28225bb79dbe3687dc48bb576268300b89a9660cc5bba576d WHIRLPOOL bc0608d530de33ceb866fcd5cce14135f97199b5ef3253a06fc6e715c9a6d2f84e322d9f6e936ea33c3e026e04baf0892b84da03cfc6cf1b40cb1388dcf83728
-MISC ChangeLog 4711 SHA256 aed36a9e824c02960bc1fd794d03c192c86d5e7d8c4e3f72a5d372f4b5bcb779 SHA512 32b7f99926c87094f7fbe9e61a52ab5809b28e08acb7ef6f2763aa72f5dc7a30df586736ed404829e95b6324c5b2029802fb0b40ee3bd7df07a1b30f1270c5f9 WHIRLPOOL db4b5a03f161361d4e3a74fca5966095676ba266d5ddbf37f7211ebdb9305680f2aef418b3f69c16ea60e3a9c8a33cfe092d69ca9c4cb78aaf75e72b01ce0216
+EBUILD Shell-EnvImporter-1.70.0-r2.ebuild 746 SHA256 87d775add7ea70e2c3a6f68238b986a64245fe2160da224d9f216f58d9e6e631 SHA512 3781e7fc7e569668a24576564762a9a1b8398f4deebfa857def2d4efca0808d3905b4835417061132efa8ba693aacf83286d8fd1831fbf3547ab7808dbc58002 WHIRLPOOL 2211cefee6cc110b300e39279f9a13448be898c96feace6dbcea5f2d7e7182ec0b860cd1b10efe50b79c6486041c08ea60ae5980681a6993a358380e9cdf1788
+MISC ChangeLog 4949 SHA256 f9c2dcdd2e5bd8fd2dc8a7c4435a64f19328c159b6e6878abb3b284afac0c28d SHA512 78bcbe2a7d5c2733bcea23d61e06a60ce6bb63f0f7a27ba78bd3431ba26fe6173e35d2fb63f14d1d4e665a9819afc7f120c89b68bb0104900af1a2bfef98b717 WHIRLPOOL cc8e49d120feed076257c75eb85107e4536938f1605cb6672ae66a0c566dd2488129eae990bbea99fdb13bd291019782846dba17947a35905ee52f85794b27fe
 MISC metadata.xml 1067 SHA256 eb9c4de936e40396393312b33f8ecdbaeb52f960a9149c9f9dd73396f4b2ecb5 SHA512 cae1027c55778651d44f0a21f9fe404436fef76de83d6cc5b9c70513f13169e6b094a65e2499194668627ea28b858335e4a43bb2e3075e123a6a7e4b0db27103 WHIRLPOOL 3bc00f6cc515a63f3db01e44a114bc1b6cd44cef8a541dd6e78c1eafd92c52cb7a3477db36803c4e417b68e9302c4d8fffebb2c4444358fb7a505d799c1e7a06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlP3ss8ACgkQ2ugaI38ACPBCRAD/VvA2GeTeZJbCIczM+vTYz7JT
-A9dISzAil/LGlsJkdE4A/jgPxC6O2bhfoLEhTooRg/kolsgCU3HBAjPLVyGkSdxG
-=GxJ7
+iQIcBAEBCAAGBQJUlbGiAAoJEJS/30SErRQvNWkP/A2ocIZ+TFYQ4JVity0VbA2g
+BneBSlqiyBJQF5IPY1O0YMwKNUAmPKxxjD2A1/c9O/1pRbeajo7R592svDjaQXov
+Ljgxe8wfkeeNx1NLH6OneSV7pufMcWhDQXJENSKNcfW9YfcvnziVXAraJXuaXCHD
++K9HurXLaupjC710krK2RwnVUnI4tz0+OvXblY9zNjD5xsv0VapQFPlYHD7AIy3N
+pyDNcemPY51IgWYLAoSOWYnDZc4jbH3EP3flTXDN0TM/Lv/pTRQaXWAFO6emyM0a
+2qheXkpV6SahiLbYXW2ztDTjGdNcbhA+hPL1nq+SBdEjOAF1J93nQBWwgLS1rwLP
+gprAitVM/01MuM2YfeNGmrKL7rxv2YDjvY8XTO+fMy/qb6loXQcGqOsoYt4luaxv
+drVLwMRW9PB/cRDO3exgT1CA8/vL3kZg0UwsPEm/YjSrYsNItBpKwbYKkIgox1cR
+B9Y+AIKNLCS/1n0rmwUfMopqymFyrgWu9XI5+e/nUMEdoWidAVi0TZvk5qDhRTZl
+Q0VeyrwP1oh7bBbEUp9hJEceZ6kUqxVX802JbylzpAsGoBWtG+Nv+Cfh3LkcS+LM
+onQ1nTAQ/VHFYnMO0bz1MdLfQlCElQiDWc3kQGNjvn5ba4adVnI4AioOf3yZUDcV
+Z7TaKZWM5R7JFXY84iP7
+=/Ssl
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
new file mode 100644
index 000000000000..aadac995c21d
--- /dev/null
+++ b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild,v 1.1 2014/12/20 17:26:34 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DFARALDO
+MODULE_VERSION=1.07
+inherit perl-module
+
+DESCRIPTION="Import environment variable changes from external commands or shell scripts"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-perl/Class-MethodMaker-2"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-perl520.patch" )
+
+SRC_TEST=no
diff --git a/dev-perl/Shell-EnvImporter/files/Shell-EnvImporter-1.70.0-perl520.patch b/dev-perl/Shell-EnvImporter/files/Shell-EnvImporter-1.70.0-perl520.patch
new file mode 100644
index 000000000000..4ccf44166f39
--- /dev/null
+++ b/dev-perl/Shell-EnvImporter/files/Shell-EnvImporter-1.70.0-perl520.patch
@@ -0,0 +1,48 @@
+Avoid warnings on perl 5.20.
+
+"Possible precedence issue with control flow operator
+ at Shell/EnvImporter/Result.pm line 88"
+
+This one is due to the fact that "return ..." binds more strongly than
+"and", so the function would simply "return $self->shell_status == 0",
+disregarding $self->command_status and $self->env_status.
+Changing "and" to "&&" solves this issue.
+
+"Use of uninitialized value $_[1] in read at IO/Handle.pm"
+
+This is because we don't initialize the hash "%buf" into which we read.
+Initializing the relevant keys with the empty string solves this issue.
+
+References:
+* https://rt.cpan.org/Public/Bug/Display.html?id=86171
+* https://github.com/gentoo-perl/g-cpan/issues/6
+* https://github.com/gentoo-perl/g-cpan/issues/6
+
+2014-10-21 Martin von Gagern
+
+diff -ur Shell-EnvImporter-1.07/lib/Shell/EnvImporter/Result.pm Shell-EnvImporter/lib/Shell/EnvImporter/Result.pm
+--- Shell-EnvImporter-1.07/lib/Shell/EnvImporter/Result.pm	2006-09-01 03:53:30.000000000 +0200
++++ Shell-EnvImporter/lib/Shell/EnvImporter/Result.pm	2014-10-21 09:34:00.814867969 +0200
+@@ -84,8 +84,8 @@
+ ###############
+   my $self = shift;
+ 
+-  return $self->shell_status   == 0 and
+-         $self->command_status == 0 and
++  return $self->shell_status   == 0 &&
++         $self->command_status == 0 &&
+          $self->env_status     == 0;
+ 
+ }
+diff -ur Shell-EnvImporter-1.07/lib/Shell/EnvImporter/Shell.pm Shell-EnvImporter/lib/Shell/EnvImporter/Shell.pm
+--- Shell-EnvImporter-1.07/lib/Shell/EnvImporter/Shell.pm	2009-07-03 07:00:30.000000000 +0200
++++ Shell-EnvImporter/lib/Shell/EnvImporter/Shell.pm	2014-10-21 09:35:08.010881726 +0200
+@@ -183,7 +183,7 @@
+   my $s = IO::Select->new($fh{'STDOUT'}, $fh{'STDERR'});
+ 
+   my $t0 = time;
+-  my %buf;
++  my %buf = (STDOUT => '', STDERR => '');
+   while (1) {
+ 
+     my @ready = $s->can_read();