gentoo resync : 02.09.2020

3 files changed, 67 insertions, 2 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 138054a6d86c..9b1a0a274404 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -4,6 +4,7 @@ AUX autoconf-2.13-perl-5.26.patch 387 BLAKE2B 21152b0df23fc2567b52a0f1afb27c85cc
 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
+AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
@@ -13,6 +14,6 @@ DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7
 EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 30a8d2ddaba7e878177c86ef825d41122c7c99f24ab77169833e0172bc3c3fb6f9879c3ad48863c4c0a2f305a9ce304f072b1afd02d3c01fa1ee5585dd14cf8c SHA512 033383d86e1b2097992a79e9078a931557041af2ddc09f02a3f256343a40ba5dc5ef5380232d1c88b6f0716936cb599ecb789a9a3b9af5be8bdd713f1b9b4ff9
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
 EBUILD autoconf-2.69-r4.ebuild 1331 BLAKE2B bfc38c5419976a69f7c8e80c26656760dfd2305f3fe6c18571cd9367017b5d564d761e314171da186b0f9e1a02a72b3287269f52fd9bada941f064b2da8dbdfc SHA512 77ea183450866b03f924af1455fd499c95e7db55493d457234d28966cae1edbaf267bdabd019d11b7260bb071a1f067aaaf6c5175aad3625119988148a3f5020
-EBUILD autoconf-2.69-r5.ebuild 1805 BLAKE2B 006a2fdbb1de006d068a5d32e0fc7ad287e489b5403fb372a6bbcffc5504b6b344cf52c5c1e2283dfcec3b430c2a4db89c9347cb1685df94c1aea940e9ea8494 SHA512 1b6d01f3be4f96d015d7d566766538c48929007105ac160ad95a5fec7ec8d91fe5f258d91132de299484df3839a2f8e81d84aca4f7af3f696f00f21262348a9d
+EBUILD autoconf-2.69-r5.ebuild 1853 BLAKE2B 5fc97c9166859167f707c7bf91715513ecbb849006415eb22a65410147a6ae4668454fa286c2fe7966aca0a6c0ed3a4feda078189ebfc2c8aec0badfb6fae99c SHA512 403483fc7ca30fa2cc0abe35bf4d549b3c2fc3852899ad7f48c9f889f123288b4b3a74778f0b0e878b546d76def3ce166d75de1063bb8755f74f82ca5d4d134d
 EBUILD autoconf-9999.ebuild 1201 BLAKE2B 54056afab7ae1d33423957ee088defa5210313283b1287dadacd86291e8029b2337707c75bc28cadb9c33c5933ac94142684ffed93112fffff5e59aa045a1cc2 SHA512 5fda1ae65b6831eaffbcb1ad1f63bfd0cbb98aabafa0abc183038e394931d7feeeba98a5d9824a54ca937aa9f62f332b3b363970b7a239c4a81faa0a3a22fb0e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 7694eca770a3..6201e196ab53 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
 	"${FILESDIR}"/${P}-fix-libtool-test.patch
 	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
 
 	"${WORKDIR}"/patches/${P}-runstatedir.patch
 	"${WORKDIR}"/patches/${P}-texinfo.patch
diff --git a/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
new file mode 100644
index 000000000000..1afcec15bb4f
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch
@@ -0,0 +1,63 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at  | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c0..852be285 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
+       [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+       [GREP|[EF]GREP|SED],
+       [[_@]|.[*#?$].],
+-      [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++      [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+      $act_file ||
+        test $? -eq 1 || echo failed >&2
+     ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+ 	/'\'\\\$\''=/ d
+ 	/^argv=/ d
+ 	/^ARGC=/ d
++	/^BASH_ARGC=/ d
++	/^BASH_ARGV=/ d
++	/^LINENO=/ d
+ 	' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b02..cbdfcb62 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+ 
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+ 
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1],                          0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+ 						   0, [expout])
+-- 
+cgit v1.2.1
+