gentoo resync : 24.12.2018

4 files changed, 23 insertions, 4 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 785032df3686..f3e3078d3605 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,5 +1,6 @@
 AUX autoconf-2.13-destdir.patch 604 BLAKE2B 4c3607a31a7e99820b49dea142e9b2445a70508cedf7407f7822f86fb4d1595ced6ab202bf6e42e422f41e44c256e62ee2a617f5ea01d1319c66f811333d5c1e SHA512 c69c7681b028f82735e0187dc9ea0d73906b74e32a6d51754e2c973a559895590fb5a1701d153445b772bcf0536a4688292895242910f20e6d4cf1a02f1a877f
 AUX autoconf-2.13-gentoo.patch 799 BLAKE2B e9d403d2e7e6ca2efafcf9b2e7108f8b383b107bc78290242f0ed2662ec8e05c5a178f8014e6317f260695cbaa0e4c6a2cce3221d1990b1fd2a96fa3db5ce611 SHA512 5712ad0d67cb5661c949700d5bc0d8c582b27562229400e7b8b1c0249020d13077af5ef3602adef7135cc8dfe529556d5a23f2ce494e3554322262510c2a9fb7
+AUX autoconf-2.13-perl-5.26.patch 387 BLAKE2B 21152b0df23fc2567b52a0f1afb27c85ccc343fadb0055b6e7d592a2de30120d4cabacb42355b9024a2058211e0fa8df1d64af6a4d467ff3c334a9e2cd3ff9de SHA512 0729e8478095b81d833f159fb3c8c242aa78220719af3cf5409034994f40de809fa308541c55c6de0a84f911a8eb74c7800f4a9b66342443fd0f2ba18e392234
 AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592
 AUX autoconf-2.61-darwin.patch 454 BLAKE2B c98084d8109ead961c446aecd38d150b244a83a62870e6820c10024085c023ebcbc75d2c388e170c3bdbd562e3a2b795271c52c02b3245ccc30195443d82d89b SHA512 7d11430a596cfa8624380fa21cfee4f4684a0144d4a4f93218656cedc0aeba2e7bf85dd52f7cdad3ef2a9aa4d5213c318b6cde8a33c09690ea4dddc7d8057101
 AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727
@@ -8,8 +9,8 @@ AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-2.13.ebuild 1515 BLAKE2B a98b8cb2e30b994ed2ccdea66b8d918f7a6320666ab2d8dcd95d64da1c8fd84ad70a433c55f70f8c42392b394f81e9812239986d34681e793a54f01644e30506 SHA512 417fd57c23711c2d972a20f34490023430f98737f124eed55d64f649b6766def6fbe3381d0fd0f564d350f9a2ffccba0bbdc495f4a800ed930aace08a3d69598
-EBUILD autoconf-2.64.ebuild 552 BLAKE2B 88d90f4e4a2a214df498b083fbb0741ff923a220e35847247f3b532e78b20fcda61529306634b426246b77ea0432013bae1702c42b39a35e72bceb62976f9244 SHA512 a66b76514a53e19bfe686cde8845af9d5bcf140fada158ab056d76bf60d0e9c3511836e28c6a21060dadc7dab9036d5dd3cc563d3a9b9c0e80f1a07de50e505c
+EBUILD autoconf-2.13-r1.ebuild 1554 BLAKE2B f8c92db68635490d5e33f46732eb3056e83f9f074dfaa9731d2291b853d403dcc8721e614badcbd92fc42f9a953be1475657bf8d28e34a130d8b0cd71340f1ae SHA512 c8b1323ad14331aa5340e48794b3512ad487c8985524e666ff6bc612a65f5cc0a3fbed509cbfb3e34330203ef7db27300c5ea9a658c7337fce7e0e762301a2c1
+EBUILD autoconf-2.64-r1.ebuild 650 BLAKE2B f0f562f4a0373aa2de4d67606413f9570d585a3bf2d6ba4d3c6c8dc48228ad983bfa07e43fa5d2f75965c91fa33cb0a3d91c1b4613be31bae170d7c635940b45 SHA512 174c8b6bf4f2f44aa9af66cb2f9655b4cff370488f7f41a40a7f4b83c0649d6b5bb7911d93319f02fa6dcb856ebd33addbd69f1d94b05262dad1d557139c59b2
 EBUILD autoconf-2.69-r4.ebuild 1351 BLAKE2B 00470ba20ab08efe4b76397cdcd0afcc97b1e3753b0a262d03bddb3bfbf4d636bfb9b01563d7b5684ba6b928f78048c36260e261829d77fa67c6ade522e53f66 SHA512 c0e14aabc53697c9a8df94d5e36b268e97f4a17cd9c9d18b30077619036d87b18943444662a9058547dccbaeed72dc4d875c4c6bdc5005ea57eecc6648f36d89
 EBUILD autoconf-9999.ebuild 1179 BLAKE2B 4dc490b61722e49a11748e846d019dd6736c22b609c411da87546c2fe3b7de23e63bb3b8d2855e58a125753e3b754bb15793e5caf138b0af8bd3fc7283c3c601 SHA512 64d1d9711f7590eff1234f0928dddb3a3b68beda9a81d527184ae273ca8f59d38297d3ec19878c7f5c8f7346c5d7f2c91fe9e6d8d551fa8579233471b7748047
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 760263724fb2..a908a4d5d6f7 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-destdir.patch
 	"${FILESDIR}"/${P}-test-fixes.patch #146592
+	"${FILESDIR}"/${PN}-2.13-perl-5.26.patch
 )
 
 src_configure() {
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
index 06375db737db..f5e7f1703a20 100644
--- a/sys-devel/autoconf/autoconf-2.64.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,3 +19,8 @@ DEPEND=">=sys-devel/m4-1.4.6
 RDEPEND="${DEPEND}
 	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
+		"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+)
diff --git a/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch
new file mode 100644
index 000000000000..6fbc0cd1bc89
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch
@@ -0,0 +1,12 @@
+diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl
+--- autoconf-2.13.orig/autoscan.pl	1999-01-05 14:28:42.000000000 +0100
++++ autoconf-2.13/autoscan.pl	2018-12-22 19:55:10.986732296 +0100
+@@ -232,7 +232,7 @@
+ 	# Strip out comments and variable references.
+ 	s/#.*//;
+ 	s/\$\([^\)]*\)//g;
+-	s/\${[^\}]*}//g;
++	s/\$\{[^\}]*}//g;
+ 	s/@[^@]*@//g;
+ 
+ 	# Variable assignments.