Fix perl syntax to work with latest versions

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xD2E96200

4 files changed, 48 insertions, 17 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index c97a5a7ce643..a4df437d4c6d 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.216 2014/11/15 06:30:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.217 2014/11/15 06:42:33 vapier Exp $
+
+*automake-1.4_p6-r2 (15 Nov 2014)
+
+  15 Nov 2014; Mike Frysinger <vapier@gentoo.org> +automake-1.4_p6-r2.ebuild,
+  +files/automake-1.4-perl-dyn-call.patch, -automake-1.4_p6-r1.ebuild:
+  Fix perl syntax to work with latest versions
 
 *automake-1.10.3-r1 (15 Nov 2014)
 *automake-1.11.6-r1 (15 Nov 2014)
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 74fe635e5b4c..d8a971067a31 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -11,6 +11,7 @@ AUX automake-1.4-ansi2knr-stdlib.patch 249 SHA256 8a29de01493b888f392388a0cffc0e
 AUX automake-1.4-libtoolize.patch 542 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846 WHIRLPOOL f2fa419cd4ccd5889929795d70358304d805fb2f4142b7987e8828050b575997d537c01a885effca25515b50697b1f23a6090a1f1a1314a9455e89d48ba64b48
 AUX automake-1.4-nls-nuisances.patch 746 SHA256 aa35eb06e5aff390812e31c705976a11fbdff38a5567737f0b234a3fb00fd002 SHA512 5821637eb9cec970feb4cf1b09dc6efcd5b84cfce804915d31eccf810983e0b837c3fb6c9a4af857f4bb0545244f3d824138ad364c2073fab34d858aa8ff7d8c WHIRLPOOL bdd1e2334e52e3e09fdc71e7dbb9f2104310077f1d6d1ddfca307e62de1368a2129bfbf2547edaba1aeb2f9df0c5e91c2a7737f2eb35a8130cf827a1d78168ee
 AUX automake-1.4-perl-5.11.patch 839 SHA256 4b795f3a721a88034699cb451df251a36f92b2a144b3e088687a4b64588b19d3 SHA512 f604c8334a942c345c4f63a07a18d91123f840a66d9314d99853a3133caf032f8dd6ad65b124f78f89c9494451babb3245a8ed7e771dbc9e479c302938fb62d5 WHIRLPOOL 6af58b295f522cd94585cf8d88099be37bb62987852608a4f6a0ba90c81dd34fa6a9808b23a72f7b94befc6ba4c4440ba0603a076e07d30c552d68c46e7a37a9
+AUX automake-1.4-perl-dyn-call.patch 738 SHA256 ff53c08dca459d9c2f7edeefae6938fe64edaa74de27f7bfb8eca905e7fd442d SHA512 69a1d2ff4265e2cc3935313e95337b3b4c3b52210888ef15c15a83aa35e2b564e04f03bb8c8bca6877913abb2ccc5ea4351eb245b4b6e5f48f19f8010941e24c WHIRLPOOL 31699984c0251a5ee794b976f8fa5b8f68cc8aff69038fafe3041565dc3fb0280bc420dcb096a8eac422374496674b7cc629b52121aacfa907ccc6aded22c519
 AUX automake-1.4-subdirs-89656.patch 944 SHA256 94e279bc6479b1753ad76334837d236e8b1f13d6a1be712da634fa7498247640 SHA512 3aa2d98bf64294f608c081df2c316064ae86d7d7b05b60f79a571049e8d125a91309771edeb460ff8d29bf2536e0fe0542c0c247764338be9af37c0d32686670 WHIRLPOOL fda2479ea2e4bf02581a5cd19027ee77df643095761580fcc339e8b2de694963856a0025841402056a9286bb0fd3bbe750b87e658f1fecbdea4f0bc0e1c3c5b4
 AUX automake-1.5-CVE-2009-4029.patch 2316 SHA256 b31c72cc038c89d118ea33d73eab11f539f5f2358db40fe51dd7563e2ad365ee SHA512 2961ce03774e55623362b041214e8b1ecc98c193ca1b080938b848c3069e25438fd023a41ac73ca6aaf51d537e836fa8bcfbbd3e6e32494ba758ecbcbe2458ee WHIRLPOOL 53ee3b6b15cc4801fc443b8815c1f3aef7a26e1d9eae4820215dabe7ff00c77864a2ef7a5600bc24a9e59b5af817579382956a0a7945150612362a1d5b252ced
 AUX automake-1.5-perl-5.11.patch 806 SHA256 117185ff77405d4265bf152f2a5bba2edf9e1bfc4e0be5d49c49d1628400bf2d SHA512 1eb9314be86d7e775c1bbdc35d86d3f0e8b5ca81e4c170a6fec63dea3895c81c770e101660e4337a942fa2c34aeaa6b8b1e7eaed3d310921c23292dbcd25febe WHIRLPOOL a98e59cb11aa252795497799173d176d077afc6bab54315e8e7dd5b8a349e1b35111f700cd220f7a947f7ebf55f87ba4d774418173a53404e3bf4a19b85b850f
@@ -46,29 +47,29 @@ EBUILD automake-1.11.6-r1.ebuild 2513 SHA256 d0b0900c6e4fc7de7eb857d4211f4c9d53f
 EBUILD automake-1.12.6.ebuild 2409 SHA256 60dfd2b9e32917e4701fcdca48c3c3c55f78173733ead21b89c8e22576889c5a SHA512 93c4f6423a6cee06d433b9255e98cfcdac8a61761b4f0380db2b1f83df1f1d696bbf57dea750476fde97e065b234ca5d8118c463f31b7c617dfd5820d78c9b30 WHIRLPOOL 6a90b12d0997ecc99d7231fb591c746f63bedbea669c66b650769b4559191ecb15b17a28da5adbbd794fcd709efeccd07d1e882017ec8f157241cc5e2e3bec10
 EBUILD automake-1.13.4.ebuild 2490 SHA256 741ac41c84d9ec10189b9442d838c7862e35e8c0d6ece70bef942d33d3e3aa87 SHA512 52f4d65dbcbc7079acac9d23c5024e595301f4fa397afd74f356c430e42b3d59cba53c40855ca2ab9317ae50fd52670f435b5e147ba45f424ace5e35df62cd71 WHIRLPOOL 55ff2f7283cd600b52a7a747f7b95a9e7b0ad471c4fad43203cf60e2eb1a5956295d2ba8b363cd2e722e675301b4405e3a6e42ca1887cab111c987ca99b55887
 EBUILD automake-1.14.1.ebuild 2814 SHA256 24a11e32c79673a1bd08be6a26019f7dc91dc8597d5728f9612d5f4723c7d77f SHA512 3c7d8d8125cfc9627e8a648f51cf8cd2db7d8da65e76d24295a70760d170864c34542d1b8fe8d62b7970221a64cb7d8050cd9e3c8f2d9704d9b0cb7c1b10f6d9 WHIRLPOOL a4ce0d0a5425d367288af452a1c7247452789408e10f41906aa0447fbccd840d6e0c071f7bcbaea4ea908d3f1bb8d21ae39d79b7bd40158c9f003cabf9f7dff6
-EBUILD automake-1.4_p6-r1.ebuild 2557 SHA256 2d4a81a64eede435252f3453c794310fcbc25e1bdc529f4d87774eb3d608d5b0 SHA512 d01ad2f65d1feff960507bd580061637913e8b4b7d40b1ea186573433074255a856d13f5f9b06c0f80ff8c054d4eb2e172c98817dd6f190da6e805243e4d66b1 WHIRLPOOL c0b63f5db5474ab5d8c1af3707289bd3ec97fcf9bf524380574f40c23789773644ff0d27acc388ae2d01210dc6cbe36f04948008eefde0e82aa22d3c0ef564da
+EBUILD automake-1.4_p6-r2.ebuild 2608 SHA256 e34520565a3536bd9280f3561f97cda772a4eb23edef41658af4a12ad2c762b3 SHA512 daac3e6a24cd44220d3781bba2a9f0d1f5fe371e95757764ec1461e567022c30600473a2d3a2437fc0fd48c7535d4be7177251b285681fd7946f2a8f55900b96 WHIRLPOOL 12ec941143e339305938b626eb16ef92dd038e77f8d65a10c02e0d5b68e11e14e7cea6e95589a2aff2f40e200b1ce267d4ec7fd821c3fa0d6f061c7f9c6933ff
 EBUILD automake-1.5-r2.ebuild 2422 SHA256 92531c8c8d946fdcc620b849ad73b3fb9dcbf70de15364aa4833f053e45701c5 SHA512 9bb3f5804af8826bc8b1a404f843a2434cd67b251556d5246ce234b1be32261f833d384cffd7cda4d40f36acf82f3addc9f12815b4d3da9faec00465113e2143 WHIRLPOOL 29ddabce7698e7250012c2cee6d4f7471d68aa9e993ed315f5f2b86cc8e3cdbdb1ef8d4d85af201516be223ca666324c601a61d70e8416f4350e503ee419ff53
 EBUILD automake-1.6.3-r2.ebuild 2173 SHA256 5ca9573da1b70e92e8bd680bcf2464af030f7046ad242a9cf0097a13d2447339 SHA512 eb0fb0e5187ccc553d91bc1fcfc887c6de393518e51613f80dd965c389427479972d05f4f27978639a2f7a4edeedb874f397ca45d0902114e7210a56ea69f81d WHIRLPOOL 985135cfc3b34fb697c68499b5386e49f04eedbb171defc580b27700a7fb39f185e4916ff78da4f3271ab3eacc8a19394511bea2b5f9d86df81927e6a5e03ac7
 EBUILD automake-1.7.9-r3.ebuild 2328 SHA256 ebd7195e8eafef26cb530170f94cde2eab53ca9d72c57dd7597c584d60c303d2 SHA512 214a5d076506f0700399a9545a98efa334807a3e5227f004d41374a0e762a1230217bcd1951a360f05204fab240040a6be3adc700fd7321da01e73ad0b228535 WHIRLPOOL b6536578390d2b5df2db2885b3354cbc49655090f8402cab98af900e7bd656404e3e4fe5d762769c36e1a498efea3a7f170a24380a720c6d48616cb79a3faa7e
 EBUILD automake-1.8.5-r5.ebuild 2355 SHA256 aa4b891c02831da0cad9cf71934e505a0b94a3fd7203fe276cf3f044b701c128 SHA512 f9a61040a35ef23cc06e2a2633607e21fc187d8401a31cbd5b35ea327762730d879422aca27f17b7a31d69996917d8df69bd39dc10759451b36c839f21e6c631 WHIRLPOOL 3f05fabaa6865cba2aa3aa168d080cb3b763c4655f6c6c0d04cab2bbd3ebfddced9a95d8f0c6c9748ca779cd511102ea0e5644d6908095640950d833d72fbbe6
 EBUILD automake-1.9.6-r4.ebuild 2570 SHA256 27caa6b7d9bfc123e3cc1adea83b2d2b569e80adc6116054a4cf9510e70a43e1 SHA512 19dd8f56decc964729d6d110bd4d08b8fbb16d686559201b5a5ff6a2431c74fbe30df69a7851da768551cbdd42beb1a074d4f1179104fefbff672c73fe3d6e2b WHIRLPOOL 2f4561d15accb4c006238e70a7e7387f7bd5fd9896cd58de30de89cd5e5de9360e762de49c3ab1e66bd3c66c1d7c79a6c2cf67de4ccc079f3ed4baded6855ac9
 EBUILD automake-9999.ebuild 2319 SHA256 2d00ad3957f8bf90e9307933123554bb1597d5357412d75d971f8d961ebcc842 SHA512 aff32d1b74c61dd9a2166719791e68f24ebff27c425f57f56b95dfc9b9a66507fa27c118c1a17a2b92245e3f907322c9765c984d15978a0ac57d2cf39bd8b7aa WHIRLPOOL eeab6d04f10f5ca3bae12980f6367a7e96fe919ed49974425c8b1efe9689670e423849ca82c402766aee14420e80a4e63d92c1ff94104fb9b773b3799fcb1228
-MISC ChangeLog 35743 SHA256 c39d18316cbf39dd269afa93f3db085bbf14efd151b3a82a7715c8928c509627 SHA512 34ae4fae3375547fd1f8f50b3ccf8ffa3e888459b06d05884c536c197197584e5b0604af804b1ed97abe2772733e0577f8889ec407bd370b6f61ee420150abee WHIRLPOOL 77d6fe2fc15b8066964fbe080d813f77552116da6b65de208e88271b8ca7f56f6d391df52cdc0ca714c1129cb0293273350041fe5465860a6ccf897cd7d497d6
+MISC ChangeLog 35975 SHA256 020b8fb2723bcd00170233ab216be4c374f0e0455f1fe60849e68b025d1d7236 SHA512 3ef2057630bc93e3a00aec9ac1663fc268e61f02e9a5eebbee8aca48f8175c3d8e66e3f787cf62452729902601f9bb5047dd089b2a7b995788134eb8006dfc1b WHIRLPOOL 2503313b8b01ce860f96204686a544f806a8277b9744f888d3f447b5fbdba84e3d7cfcc6f42978ea0e17d61c18bb3d45ffe60a42393bbad0eca9f6b6c13f2df9
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUZvMOAAoJEPGu1DbS6WIAvMkQAJCjWQnAs5bP3UulUyThpxw4
-B4C7EgPUW2wZpul0U168KsAq6aiA7UWZM5GwKQmFMglTZW2FTd0N24LgGOehUpZU
-LRTqlX8TRo58KoTrrac4Vr/2us0Z1uIrpS/59Pzh1XiOuLE/Vtdi32MJijbU+ToC
-oDDE8B6TltJsR9NJjHBt/4k2/xRIJ1jgtdcaJQM5+VrrNgnR9Zl1G8eTu28T6RQc
-aAe8n9fPUdWOpQd9NeUxGQ5rXvZjEDT67h8S2PBNilPKXLKzsOjXrgdgDW3IdcM1
-QNmufax0NrOTGQ+jA5TgU3d7paL6y60ZYBS4r+kUHmEOW+Kg7sSv+aiM5Gu33/a0
-WOJMQJtj8nioBXjRd9O/zVdgkErumoWTZTRNSwGkahZN2eg9wKaVrJD8CmDOm6Xd
-4w7I/unGJDusH3K+RSddZYj/mQjzhVRRMxoA7/EG6K0fX3FdF3UT1/pbPz26md+y
-vF9JQHBvaXOVs16FM3yTa9lxFsjI096kv3rSOrgOIufs6k2ZK9rzb+n6CKhnEwKw
-J/NQLNZZNG+8aq/ok8MdAdUNrjCX5eAoStzQ8WScfPHVEuBU32G6M1ComBVXaYUW
-0hHOqTdkBMrhos4YbT3fjUOdsfPmXg0UMatMNYpm0trGUMZL9RHLkaDVaFlh0k5T
-iV50Ik8JLMMpYUbWRv7h
-=GLic
+iQIcBAEBCAAGBQJUZvXbAAoJEPGu1DbS6WIAc3gP/2vnVVSMr6mXMjGfm6lcFDBq
+4ePDntz//I5+31oEskvUsbyW3/LspEu9UN2rrkw8ZClx4+8LmwMAMKfnebFPoRbv
+dt5q8foObk9XwmGOwH10/dA2+gbEznEMXJs39p+L+AN26hBp1OjVSpS/8hWNqWKE
+BYU4z6OkyVw5ivMHiZL44ODzvLz1vfzKPXqH7kdWm0pehayuglTXityz6DCU674h
+7/FATSMw2Gh6BCrXml3ayAxDV25UQfR1aLGVbSuViwYjWyGmj1RAe3Nhr3l69820
+D7rpkO97YTK6JJSsa1cg4OyLU+EKxfBvXdiTo6ib7EU8iRxb4dQPjjv+CxGn0Hpo
+g3YBuG6L5NnchvD8nPQuqSJOC1x7iMrknEkXZab+GgAM+iOa0DEk6MA2ba3/iOFe
+DO4k0hQ2VxhxKSqysdW4RimbBeIXWKecosalZQQk4KTK2L6UMNjJD5cC5KtpPwfi
+7X10w73VkVCE0rAour/ba+7qEC2HqQSJcND9wTKOEOdcQyQGQhq8LIQA9fkiwHKv
++Dsc/J3wlBiEhIJ4A6K3VRY318u6BB6w0IUrcWbvTtGfEUeXue3xTwhzC64fTH9Y
+HhEMOTk+78n4SmBj9t6Ip1XPFSUqJkQed9DPU8d1pw5q8qNhcAJ2cRyBRxUby6M3
+wZ9JG0kaufuQHwSSLkdK
+=40z+
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.4_p6-r1.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index cf96aaeb4b1a..f5bd9b6279b0 100644
--- a/sys-devel/automake/automake-1.4_p6-r1.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.13 2014/11/15 06:21:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r2.ebuild,v 1.1 2014/11/15 06:42:33 vapier Exp $
 
 EAPI="4"
 
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
 	epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
 	epatch "${FILESDIR}"/${PN}-1.4-perl-5.11.patch
+	epatch "${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch
 	sed -i 's:error\.test::' tests/Makefile.in #79529
 }
 
diff --git a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
new file mode 100644
index 000000000000..9a140aa50510
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
@@ -0,0 +1,23 @@
+at some point, a perl update broke this syntax.  use a newer style that works
+with at least perl-5.16.
+
+--- a/automake.in
++++ b/automake.in
+@@ -983,7 +983,7 @@ sub finish_languages
+ 
+ 	# Compute the function name of the finisher and then call it.
+ 	$name = 'lang_' . $lang . '_finish';
+-	do $name ();
++	&$name ();
+     }
+ 
+     # If the project is entirely C++ or entirely Fortran 77, don't
+@@ -1144,7 +1144,7 @@ sub handle_single_transform_list
+ 		# Found the language, so see what it says.
+ 		local ($subr) = 'lang_' . $lang . '_rewrite';
+ 		# Note: computed subr call.
+-		local ($r) = do $subr ($base, $extension);
++		local ($r) = &$subr ($base, $extension);
+ 		# Skip this entry if we were asked not to process it.
+ 		next if ! $r;
+