7 files changed, 66 insertions, 5 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 03cd562a5b2d..990ffcfe5baf 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index f1463a59c75c..9874f9bd1c2e 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,13 +1,14 @@
 AUX automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2ae72f8d687e785be6dde22429305cdbbb2b441a05ad268d5a7f019b087e090d7b93cb5ff033d004a8344fc9056172f1a16bd0bfa98501e1c55cf6933c54 SHA512 0f6c6ee15c895b64742113156f9864396daa6d7680897e4795909c78cb300df0d96c63091a39e901c2d62e76852fcbb49a5be747cb4b381c4346b81c0c570149
 AUX automake-1.11.6-perl-5.16.patch 3555 BLAKE2B 8128b27ade89b12445b02532d9837ff469e6d0e1be3ebab6969d8d68c3a57a27e25ff89db82ed8abf3eff6d392bbd3b91a0b5b6b0827e7eec1279bc5345dc024 SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc
 AUX automake-1.11.6-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3
-AUX automake-1.16.5-apostrophe-in-tests.patch 1596 BLAKE2B 2460e0d3c57ad477d4260a5ca92542dfaaab629660441dab418046d1770f65531d5d7d0aabff1390ca080be6af54c60abd2716dcbee0e670ba07f747fc2d2f4d SHA512 35b09584e2fb8ec264e9b60642830f812aa25801bcfdcf026c35ac72bfa389585cb4914bdd5eea55af78185435e71d52cf263e2246ef35504d258ff0c2e7e744
+AUX automake-1.16.5-apostrophe-in-tests.patch 1695 BLAKE2B e52093f7a19293d727060c1ba0e38f4d551530bfb77aa999dc68e70b3b1b8eee0a67eed3bfb24660af8f424f9d3bfc69998ff66c17a9be15261191dd6fb13b4a SHA512 f6c34a3d70b260c6923cf062fac107d00e04b58b99702f07e142051ed07a8a8a5c7591a49d6893f06d283a1464772252ef69d70d5ae62e049f72c363d7433299
 AUX automake-1.16.5-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0
-AUX automake-1.16.5-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
-AUX automake-1.16.5-py3-compile.patch 2418 BLAKE2B 1286da7c9b62a5d80432a2ab82b02e1947ff98b98b19c88fb909db6d9d85d65d1f01f900122b1841dfa24f9b55f172d54e17d0528c922c9420aaabafff10634d SHA512 9bde8745981536f69fb84ac2922c89f939dcca4f1f8eaea815806f35021bcc8f3e26f4ad146f4226fd65e8d239701d7fb7e62797193e867442ad3018cf7be61b
+AUX automake-1.16.5-fix-py-compile-basedir.sh-test.patch 1084 BLAKE2B 12cef1fb8287ae77a180611d8f8bfa18da1e7cb6e473bcc7b55a4b01ee7ee052863ce156820916b08a193d0b1e2c85580bcd68301c3780865c08d5b274f3af0a SHA512 ef9af5b799c0f7341dfeac5358a05dbcc7547e1d98661e37185b3b3d24971c8db690e9ddf0b471db96254c44ff4ce878c7951e5b5afe96942d5ce21f998ba294
+AUX automake-1.16.5-parallel-build.patch 2142 BLAKE2B 68f6664b563f07d7d3a4abcee006955f5fab4611834be80ba856a70a1d2a58d848abacfe259c0dbf7b60945d52b8fab90b538d0054145001b8ac446c2d2ea749 SHA512 1128cbd5766658258c164825a49f7cd03362187640102c1f581ecb3d1552408b22677deaf5dd538d1527dbfcac658545d786637c252a595fb81ceb7c10f82492
+AUX automake-1.16.5-py3-compile.patch 2517 BLAKE2B 35ba0af05e84c632b1e2b0e68376316b1ae3eb190521243fd02b3a78d9c13c2fd2853e052af214da8a6fc8139745bbf5f55af34ec5d00a39a99623fbc72c57f4 SHA512 50d7c7f36762abc148a692198da437394890f85ff1c2820c03d5120fbb351253b245e47e6e1b0f8a9a4f532f4e92c3e11524a3d24a9626b7eaa6c7f94216990d
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r4.ebuild 2176 BLAKE2B 9785a8dad5f9c4a347e21b0f4cf0b0915110ae0435ca567bd1c55582111970799c584bdb933f302636360c7e4926601bf474c8a7cea991fc7bd3c0454a8ce6ef SHA512 c7c120b536fb1c37b5fd151b16173ac3c6deb8a4c6908f3907065237a9b31860e3dbbb9404b1d31dd2069beb44c9e380ac44dc70077f0d132a308edeb453db58
-EBUILD automake-1.16.5-r1.ebuild 3139 BLAKE2B 1ba47b968da833d9d3b5e4ec62a121a3c43931f309f14885aaa36d7c65d8edab93567e2cc103d167950b3586f676fe8f9a8ba7f255ae55beb31d86d8fe5ac0a9 SHA512 f4b45e63df331cffde5ac4343b618b808aaf0c5ecf5471aafdfce3d8043f8467a6f7a24ce2d8cb8dfb7e7d3288acef1943b6395c0596e279b1591a9f692a6e2c
+EBUILD automake-1.16.5-r1.ebuild 3174 BLAKE2B 069776c1b8064eae8109a47cbe67ba92f0eca5833a96c3f040112d9420d1ed9f6d4a0fcffafb57026fb996c32b2d4caff7338077a0b0d55dda3e196ff07ccb90 SHA512 08252984ae42cfe8bb3a1c1fe2273665adf305b2a1793f804bba91bef60ef2cbd3df2bbee69ce59a69e754281da53396c93ab9334135f0d9aea53ea1ed6642bb
 EBUILD automake-9999.ebuild 2959 BLAKE2B b12b05d379c84b3fa24c8c8a9f29a8939886d39d57a454ba7157ac5035c6664d5f878a245d5d773405213288e226023712d0d37bf3d9a697d30d361bad40c9ca SHA512 812661059a3ebd1a2753165752e4a7481fae39bf2c2819a8a0450a1fc2f8aaddd63cc7ceac0fadf479e1f2cc7bdeafe1172db8fc40c15c8effadfe32b0482634
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 029332afd7db..0e6ed8d0b1dc 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -56,8 +56,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.16.5-py3-compile.patch
 	"${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
 	"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
-	# upstreamed
 	"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
+	"${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
 )
 
 pkg_setup() {
diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
index 866284dfd185..2c1c99d57367 100644
--- a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
+++ b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ed1368e8803e8934a8bbab52a38753484dba2a37
+
 From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
 From: Karl Berry <karl@freefriends.org>
 Date: Mon, 12 Dec 2022 14:50:33 -0800
diff --git a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
index f49dd253c2d6..85273d6aaf03 100644
--- a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
+++ b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ae8fb00111ba0c4922609cd9beb552fb41b66cc6
+
 From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 20 Nov 2020 02:13:56 +0100
diff --git a/sys-devel/automake/files/automake-1.16.5-parallel-build.patch b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
new file mode 100644
index 000000000000..985e86aeb32c
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
@@ -0,0 +1,54 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=5d02285845acfc20a4900a471c0e7c5e2ff390a0
+
+From 5d02285845acfc20a4900a471c0e7c5e2ff390a0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 18 Jan 2022 04:47:09 -0500
+Subject: [PATCH] build: fix race in parallel builds
+
+As reported by Hongxu Jia:
+> The automake-$(APIVERSION) is a hardlink of automake, if it is
+> created later than update_mans executing, there is a failure
+> [snip]
+> |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl ../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16
+> |help2man: can't get `--help' info from aclocal-1.16
+> |Try `--no-discard-stderr' if option outputs to stderr
+> Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
+> [snip]
+>
+> The automake_script is required by update_mans and update_mans
+> invokes automake-$(APIVERSION) rather than automake to generate
+> doc, so we should assign `automake-$(APIVERSION)' to automake_script.
+>
+> The same reason to tweak aclocal_script.
+
+However, rather than update the _script variables to point to the
+hardlinked copies of the programs, we can have the help2man steps
+run the existing scripts directly.  This makes the relationship a
+bit more explicit and avoids implicit dependencies on names.
+
+* doc/local.mk: Pass $(aclocal_script) and $(automake_script) to $(update_mans).
+* THANKS: Add Hongxu Jia.
+---
+ THANKS       | 1 +
+ doc/local.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/doc/local.mk b/doc/local.mk
+index a29363d2d71b..06c78823a574 100644
+--- a/doc/local.mk
++++ b/doc/local.mk
+@@ -46,9 +46,9 @@ update_mans = \
+ 	  && echo ".so man1/$$f-$(APIVERSION).1" > $@
+ 
+ %D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+-	$(update_mans) aclocal-$(APIVERSION)
++	$(update_mans) $(aclocal_script)
+ %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+-	$(update_mans) automake-$(APIVERSION)
++	$(update_mans) $(automake_script)
+ 
+ ## This target is not invoked as a dependency of anything. It exists
+ ## merely to make checking the links in automake.texi (that is,
+-- 
+2.43.0
+
diff --git a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
index 5333520b5db1..003b391b04ac 100644
--- a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
+++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=bde43d0481ff540418271ac37012a574a4fcf097
+
 From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sun, 3 Nov 2019 11:51:19 +0100