gentoo Easter resync : 12.04.2020

4 files changed, 23 insertions, 58 deletions

diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index cc3fc7c1ccbd..3ff4ee89e4d4 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,3 +1,4 @@
+AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc90cc47412ca79fa58a29ecebd6ba1f201aafca7262c7eec30749e684148ae845fb1db1f8687b15b9a332e12462a12a0 SHA512 27489e5fd3a9df979a43c479d30e8566e863cd70d20ebf5788582aeaf8144912b7153f42f8df7156cd11b21ab849ff984f5042667500ee041af76de85a8eea3e
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
@@ -6,6 +7,5 @@ AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a
 AUX autogen-guile-2.2.patch 1033 BLAKE2B a18e884010f48b43b17bb5c78a4676a364503943f5144991ad2ab6acb8a9ba6f08044bd613f0763b5c863b380ecbcc7207df6cd29d08da3d034f07a386204bde SHA512 19c25fff1ca0427ff18627a14dab223b92da8670487351808df892fff77a8e33895e2ecc51acd8b03f3a89a5e19813fa12fb93c0aa54e47796812e99fd4ac7bf
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-EBUILD autogen-5.18.16-r1.ebuild 1887 BLAKE2B 480d7158392793a40acddbbe6554ff136af5a6b5574a575c4bf970c04f570f4c9d2e4d5d815916277bd003fa6645e03c2ad1c56a0495e36b80547a749ee8cd85 SHA512 933945998b67f7d1e8a5ff8d57ab11c7fe68ab5cf31a818a921ea5f349747139e8659a5cd43db035b3df140de513717335cd96d886a92f4edd4b7cbcb2451f62
-EBUILD autogen-5.18.16.ebuild 1546 BLAKE2B efe55c13c8f5fba579dbdf9cf7257e2685ffb68e1fc48a3b3e9eda384bcd7c852acfb783afbf2ec2e3067de586fe61293266e62c88cadb44dbb834215e660334 SHA512 673b244d04ed4996c8e2464827fde72c9901ef678370f3123b1971a5428aa2403c4962949849f6a579fc74fb5a184e7f8ad16803206e4fae9b0574ef120b96b5
+EBUILD autogen-5.18.16-r1.ebuild 1928 BLAKE2B 0ebeb5529ba766673b297dc8d084593255fe6505cf9bcf83e66b883be8f78f721be6ef7156bc14e911b1c3aae27314bac33315abb06cdb63fe82712c45dbddd1 SHA512 1cb2e9d9baa0b1265a750089a4bef2649088b3b188aba40493231bc7da31207fc04b2051cd4397507496ddf78413043103d03f285a16790fdbaace7f5588bf3b
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index 93712b018dfe..fd490fb216c4 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
 	"${FILESDIR}"/${PN}-5.18.16-rpath.patch
 	"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
+	"${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
 )
 
 src_prepare() {
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
deleted file mode 100644
index 6dadf34a2187..000000000000
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
-	https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-RDEPEND=">=dev-scheme/guile-2.0:=
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
-)
-
-src_prepare() {
-	# no-werror.patch fixes both configure{.ac,}
-	# avoid configure echeck
-	touch -r configure.ac orig.configure.ac || die
-	touch -r configure    orig.configure || die
-
-	default
-
-	touch -r orig.configure.ac configure.ac || die
-	touch -r orig.configure    configure || die
-
-	# missing tarball file
-	cp "${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h autoopts/verify.h || die
-}
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch b/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch
new file mode 100644
index 000000000000..a91fc8cc7928
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-make-4.3.patch
@@ -0,0 +1,19 @@
+Without this change 'make check -j9' on make-4.3 hangs indefinitely.
+Older make versions just leak process. Ideally 'run_ag' (or 'defs'?)
+should be fixed to stop process leak.
+--- a/agen5/test/directives.test
++++ b/agen5/test/directives.test
+@@ -120,9 +120,10 @@ echo '#assert `echo true`' >> ${testname}.inc
+ run_ag x2 ${agopts} ${testname}.def
+ test $? -eq 0 || failure ${agopts}-2 failed
+ 
+-echo '#assert `echo false`' >> ${testname}.inc
+-run_ag x3 ${agopts} ${testname}.def
+-test $? -ne 0 || failure ${agopts}-3 failed
++#leaks process and makes make-4.3 hang on leaked process
++#echo '#assert `echo false`' >> ${testname}.inc
++#run_ag x3 ${agopts} ${testname}.def
++#test $? -ne 0 || failure ${agopts}-3 failed
+ 
+ ${FGREP} -v '#assert' ${testname}.inc > ${testname}2.inc
+ mv -f ${testname}2.inc ${testname}.inc