gentoo auto-resync : 22:11:2023 - 05:13:16

38 files changed, 1822 insertions, 3 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2af90cef4d77..b4ad12e27ff4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-vanilla/Manifest b/sys-devel/autoconf-vanilla/Manifest
new file mode 100644
index 000000000000..f5ae87a52462
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/Manifest
@@ -0,0 +1,26 @@
+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
+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
+AUX autoconf-2.71-AC_LANG_CALL_C_cxx.patch 1376 BLAKE2B 475ece38cc5e4c4990db922e1500817df22af5303fab4f7f8810391aa2c6ddde799edf72c68c9f87db51be2ac327e7a1db8af845c5e804dbb540701fac0fbafd SHA512 c82eee93927952826385ecb4eb72e495632b73ff317173180e3823b434be6be50c81e135ddd78e63e5d8479232c49d6bbe3788a4df751a794a70fae818eb5463
+AUX autoconf-2.71-conflicts.patch 1587 BLAKE2B a8ccd285f3946dd4be9475e665de442748d3a1edc418a93f33f33bdaa4bf6aa2701d33867ebd22ad27bf5c8cf66b0b8cd6aec1f8eeb1265dbdfca03eaffc0145 SHA512 f0f422bdeb67c0455d1486f750d705a199092b7e46d3736de6c359aab9fcc0cece4f7c26ea51e551e56134ac45526bba3c1af0834f1b23d088fd23bde0d53e5d
+AUX autoconf-2.71-darwin.patch 525 BLAKE2B 641a98ccc5070ed46480c65c3966b7c047a48bc44930b0ca6039e492d383857140fa7da152eb60ad6bc51ad129cfbf66bd9863dea25672f985b38422a4ce3160 SHA512 92c528f416c6dbc413bd027c6684b8bf14b397164e13d5a2e754e23ac0803b09b20bf54ec89e495736b122eb6b519013c94b54d36fa7aff2715454a6321d0a05
+AUX autoconf-2.71-make-4.4.patch 966 BLAKE2B 0dfcd9aa7240085aef73b8f5a72e3c4dfbce61f1eed2149295318707435343a19a7aa71f6d3aa355638094791e04339b73af9869accbb602895c35ee1a2a25ac SHA512 7f968ddb2305ce03993dce735ff7b7e71f3f8cf06f3ddba7d40e2f8bc059f4bae4427102d247928a433d8e0af7cd1ec4b6f2654415da361111427ad05af33754
+AUX autoconf-2.71-time.patch 1253 BLAKE2B 0f791c225bddb89dab42b3927e1993f260df90de3a80bf0360f573231abd2c99128fccbc88eec82e9a7a07b7c9b4aa2dd8a7db1832d4ac5dbada34b4b2c4a213 SHA512 e84f4d0a700653ba244c6169f516666b4ce3328c90a5461690f6109649504350b5823fd109cc2298ddf05e81fab3aceea955547b02c7472acb44dcc31ba79b70
+AUX autoconf-2.72c-conflicts.patch 1629 BLAKE2B 41e01eb20345f57183ed821253346458fa27a19874accaba3cb581a6082849a3c7343c7bfdd25ec22f2530bec3e016e02ca90d74eb7136eed970789242a89e77 SHA512 080c1a7f06de8f3ce8e7be2cd23ee3892df1ed3a9153929ff43e7eafc2010a50d71b70a3e49cb0beb4fc32296731579c0eebae57435e5ae2d9fc0339bd8bd84a
+DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
+DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
+DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
+DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
+DIST autoconf-2.72c.tar.xz 1374524 BLAKE2B 066a1687d66f22f31dfc889c89e618b3b8f3887162639d5349e95517fba7784d88355310f6ec22b3f85838be5e1dbf27b27e618e079e1fefd0358d835e718443 SHA512 7baa0af656879ef446ffca75763cde3a2391851fcc2dc08ddd00846fa474bb7a6beccc694a5ccb72fc5e0261a90f14b4aa72b6b91a8689ff8c651aa7706b55d5
+EBUILD autoconf-vanilla-2.13.ebuild 1585 BLAKE2B 7d3c5b3bc2d0c01e0732706a641d35f5f9172ba78189c10d1a5be2391e7a4f8f85bc4f55d9bdc76322cb13418dbb9672fa13ec238a000d7c74423c1addef2a97 SHA512 b9a9e695852fa3491a5bcf69bd1f056895b21976835161ca1cb8d6f4023fe31e0b6ee823351bddf6beccbee8116588698ce90493753c85b8c2d29b66478e3483
+EBUILD autoconf-vanilla-2.69.ebuild 2120 BLAKE2B 99f4b5d0afcb8d7b45529d22a3983dccf75bb813ddaa3897d0b93187dc9ddfc316afa139f8d6fce068d5ef5549291c07d5ceb5b3b77ca24fb6b4383e70b13660 SHA512 8de0684f9990b37a0ea1b92f022fa92f87cef8699d9d8e383da294afe57f189ddcb92fef5f1b807765fb537191de1777c61cd4306f530c4a9fda8b4c0f99d9c6
+EBUILD autoconf-vanilla-2.71.ebuild 2186 BLAKE2B 696707e661faf922df2261d92ce93fd8b4d1a6be78931feadd4fdd70fe701b14c5f93aa6d84c7b3a0edbffb60da5156d75d7b3885db9087f32d0ebf062b38a2c SHA512 644f950236f5d9d2c0cd52b515a181b57fa3ca74c8f567b4fcb513552a522c5c3a5a1e65180927e0d40c58131b810357eca88a98c6f30c0b7ee400a0888d23e2
+EBUILD autoconf-vanilla-2.72c.ebuild 2335 BLAKE2B a4a97c66e8d0abb9a98c6d3d2a4261cf2ae24189202a4ee7ffbeb882f7778a360a508a3e22fd8ce7a044db1b0e20d77b0c85dc8952765d447babe716f6dd9061 SHA512 4b9ab7d3a0e5c4901d5dec9effe5d4e10a49bf3cf2152b331d4e33ab6f6e006097141025a09ea6647668870a49508a7973e0a47e86397a73fc84a5d0daaa7b3c
+EBUILD autoconf-vanilla-9999.ebuild 2281 BLAKE2B 22570603a4d94b1cf2a8b0ff942a40ac7255d7c67821a2aa9f1096acd9e781426f46cb7ef44126a2f7407946c1ebea5016128e992ae963b915b39fc922c68f44 SHA512 2ed31d743014123ea204a1302995999a7bc16cfe4f16bf2c450a71f6fa0882b8a83b44bbf0e4b3ec58d774764cd20e7cb9c6a921118b282188ee72903bd4d42e
+MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
new file mode 100644
index 000000000000..a1101e7c7dee
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-autoconf
+
+MY_PN=${PN/-vanilla}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/m4
+	test? ( dev-util/dejagnu )
+"
+RDEPEND="
+	${BDEPEND}
+	sys-apps/texinfo
+	>=sys-devel/autoconf-wrapper-13
+"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_P}-gentoo.patch
+	"${FILESDIR}"/${MY_P}-destdir.patch
+	"${FILESDIR}"/${MY_P}-test-fixes.patch #146592
+	"${FILESDIR}"/${MY_P}-perl-5.26.patch
+)
+
+src_configure() {
+	# need to include --exec-prefix and --bindir or our
+	#	 DESTDIR patch will trigger sandbox hate :(
+	#
+	# need to force locale to C to avoid bugs in the old
+	# configure script breaking the install paths #351982
+	#
+	# force to `awk` so that we don't encode another awk that
+	#  happens to currently be installed, but might later be
+	# uninstalled (like mawk).  same for m4.
+	export ac_cv_path_M4="m4" ac_cv_prog_AWK="awk"
+	export LC_ALL=C
+
+	toolchain-autoconf_src_configure \
+		--exec-prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${EPREFIX}"/usr/share/"${P}" \
+		--infodir="${TC_AUTOCONF_INFOPATH}"
+}
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
new file mode 100644
index 000000000000..e5e60776090a
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	MY_P=${MY_PN}-${PV}
+
+	SRC_URI="
+		mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${MY_P}-runstatedir_patches.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="${PV}"
+IUSE="emacs"
+
+BDEPEND="
+	>=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6
+"
+RDEPEND="
+	${BDEPEND}
+	>=sys-devel/autoconf-wrapper-13
+	!~sys-devel/${P}:2.5
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PN}-2.69-perl-5.26.patch
+	"${FILESDIR}"/${MY_P}-fix-libtool-test.patch
+	"${FILESDIR}"/${MY_PN}-2.69-perl-5.26-2.patch
+	"${FILESDIR}"/${MY_P}-make-tests-bash5-compatible.patch
+
+	"${WORKDIR}"/patches/${MY_P}-texinfo.patch
+)
+
+TC_AUTOCONF_ENVPREFIX=07
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${MY_PN}-2.61-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+
+	# This version uses recursive makefiles.  As this code is dead by
+	# now, and this 'fix' is getting hacked in from the future back into
+	# the past, I doubt that the sins committed below will have a wide
+	# impact.  Don't copy this code.
+	find . \
+		 -name Makefile.in \
+		 -execdir sed -i '/^pkgdatadir/s/@PACKAGE@/&-vanilla/g' {} + \
+		 || die
+}
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild
new file mode 100644
index 000000000000..51b9ab8bb9b6
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	MY_P=${MY_PN}-${PV}
+
+	SRC_URI="
+		mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+	"
+
+	if ! [[ ${PV} == *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
+# (vanilla upstream for 2.71) to 5.8.
+BDEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.8"
+RDEPEND="${BDEPEND}
+	>=sys-devel/autoconf-wrapper-15
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_P}-AC_LANG_CALL_C_cxx.patch
+	"${FILESDIR}"/${MY_P}-time.patch
+	"${FILESDIR}"/${MY_P}-make-4.4.patch
+	"${FILESDIR}"/"${MY_P}"-conflicts.patch
+)
+
+TC_AUTOCONF_ENVPREFIX=07
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	local pdir
+	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+		if [[ -d "${pdir}" ]] ; then
+			eapply ${pdir}
+		fi
+	done
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	toolchain-autoconf_src_install
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
new file mode 100644
index 000000000000..ba5dad5a496c
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	# For _beta handling replace with real version number
+	MY_PV="${PV}"
+	MY_P="${MY_PN}-${MY_PV}"
+	#PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01"
+
+	SRC_URI="
+		mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+		https://meyering.net/ac/${MY_P}.tar.xz
+	"
+	 S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="$(ver_cut 1-2)"
+IUSE="emacs"
+
+BDEPEND="
+	>=dev-lang/perl-5.10
+	>=sys-devel/m4-1.4.16
+"
+RDEPEND="
+	${BDEPEND}
+	>=sys-devel/autoconf-wrapper-15
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5
+"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/"${MY_P}"-conflicts.patch
+)
+
+TC_AUTOCONF_ENVPREFIX=07
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Avoid the "dirty" suffix in the git version by generating it
+		# before we run later stages which might modify source files.
+		local ver=$(./build-aux/git-version-gen .tarball-version)
+		echo "${ver}" > .tarball-version || die
+
+		autoreconf -f -i || die
+	fi
+
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	toolchain-autoconf_src_install
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
new file mode 100644
index 000000000000..2386d2432452
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	# For _beta handling replace with real version number
+	MY_PV="${PV}"
+	MY_P="${MY_PN}-${MY_PV}"
+	#PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01"
+
+	SRC_URI="
+		mirror://gnu/${MY_PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz
+		https://meyering.net/ac/${MY_P}.tar.xz
+	"
+	 S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="$(ver_cut 1-2)"
+IUSE="emacs"
+
+BDEPEND="
+	>=dev-lang/perl-5.10
+	>=sys-devel/m4-1.4.16
+"
+RDEPEND="
+	${BDEPEND}
+	>=sys-devel/autoconf-wrapper-15
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5
+"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+TC_AUTOCONF_ENVPREFIX=07
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Avoid the "dirty" suffix in the git version by generating it
+		# before we run later stages which might modify source files.
+		local ver=$(./build-aux/git-version-gen .tarball-version)
+		echo "${ver}" > .tarball-version || die
+
+		autoreconf -f -i || die
+	fi
+
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	toolchain-autoconf_src_install
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch
new file mode 100644
index 000000000000..47605af5f59c
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,18 +41,18 @@
+ 
+ transform=@program_transform_name@
+ 
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+-exec_prefix = @exec_prefix@
++exec_prefix = $(DESTDIR)@exec_prefix@
+ 
+ # Directory in which to install scripts.
+-bindir = @bindir@
++bindir = $(DESTDIR)@bindir@
+ 
+ # Directory in which to install library files.
+-datadir = @datadir@
++datadir = $(DESTDIR)@datadir@
+ acdatadir = $(datadir)/autoconf
+ 
+ # Directory in which to install documentation info files.
+-infodir = @infodir@
++infodir = $(DESTDIR)@infodir@
+ 
+ #### End of system configuration section. ####
+ 
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch
new file mode 100644
index 000000000000..44f09cba92f0
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch
@@ -0,0 +1,36 @@
+--- a/configure
++++ b/configure
+@@ -654,12 +654,10 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$PERL" != no; then
+-  SCRIPTS=autoscan
+-else
+-  echo "configure: warning: autoscan will not be built since perl is not found" 1>&2
++if test "$PERL" = no; then
++  PERL=/usr/bin/perl
+ fi
+-
++SCRIPTS=autoscan
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+--- a/configure.in
++++ b/configure.in
+@@ -14,12 +14,10 @@
+ AC_PATH_PROG(PERL, perl, no)
+ AC_SUBST(PERL)dnl
+ AC_SUBST(SCRIPTS)dnl
+-if test "$PERL" != no; then
+-  SCRIPTS=autoscan
+-else
+-  AC_MSG_WARN(autoscan will not be built since perl is not found)
++if test "$PERL" = no; then
++  PERL=/usr/bin/perl
+ fi
+-
++SCRIPTS=autoscan
+ AC_PROG_INSTALL
+ 
+ # Work with the GNU or Cygnus source tree layout.
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch
new file mode 100644
index 000000000000..6fbc0cd1bc89
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/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.
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch
new file mode 100644
index 000000000000..b8a7e3b8ce99
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch
@@ -0,0 +1,18 @@
+newer gcc versions don't provide g77, so if it doesn't exist,
+don't bother trying to test it (and failing)
+
+http://bugs.gentoo.org/146592
+
+--- autoconf-2.13/testsuite/autoconf.s/syntax.exp
++++ autoconf-2.13/testsuite/autoconf.s/syntax.exp
+@@ -5,6 +5,10 @@
+ set macros [exec sed -n $script $srcdir/../acspecific.m4]
+ 
+ foreach mac $macros {
++    if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then {
++        send_user "XFAIL: $mac\n"
++        continue
++    }
+     send_user "$mac\n"
+     autoconf_test $mac $mac
+ }
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch
new file mode 100644
index 000000000000..83f450e6f5af
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -110,7 +110,7 @@
+ my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+ my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
+ my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize';
+ my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
+ 
+ # --install -- as --add-missing in other tools.
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch
new file mode 100644
index 000000000000..e75eba621606
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch
@@ -0,0 +1,31 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: "Gary V. Vaughan" <gary@gnu.org>
+Date: Mon, 3 Nov 2014 07:25:03 +0100
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+---
+ tests/foreign.at | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose.  And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+ 
+ # Older libtoolize installed everything but install-sh...
+-- 
+cgit v1.0-41-gc330
+
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch
new file mode 100644
index 000000000000..1afcec15bb4f
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/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
+
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch
new file mode 100644
index 000000000000..6becf807c43e
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/625576
+
+--- autoconf-2.69/bin/autoheader.in
++++ autoconf-2.69/bin/autoheader.in
+@@ -173,6 +173,12 @@
+ # Source what the traces are trying to tell us.
+ verb "$me: running $autoconf to trace from $ARGV[0]";
+ my $quoted_tmp = shell_quote ($tmp);
++my $perl_tmp;
++if ( $tmp =~ /^\// ) {
++  $perl_tmp=$tmp;
++} else {
++  $perl_tmp="./".$tmp;
++}
+ xsystem ("$autoconf"
+ 	 # If you change this list, update the
+ 	 # `Autoheader-preselections' section of autom4te.in.
+@@ -182,9 +188,9 @@
+ 	 . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl");
+ 
+ local (%verbatim, %symbol);
+-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
+-do "$tmp/traces.pl";
+-warn "couldn't parse $tmp/traces.pl: $@" if $@;
++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
++do "$perl_tmp/traces.pl";
++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@;
+ unless ($config_h)
+   {
+     error "error: AC_CONFIG_HEADERS not found in $ARGV[0]";
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch
new file mode 100644
index 000000000000..b3d7888ca722
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'.  This avoids a
+feature that is deprecated in Perl 5.17.  Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+     {
+       # Strip out comments and variable references.
+       s/#.*//;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Tokens in the code.
+-- 
+1.9.1
+
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
new file mode 100644
index 000000000000..5b53d17135bc
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch
@@ -0,0 +1,35 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc
+
+Note: we drop the comma from the comment because some packages
+have bad quoting, and while that will need to be sorted when/if
+autoconf 2.72 is released, we've got our hands full with the
+Clang situation right now (bug #871753).
+
+From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 31 Aug 2021 16:30:46 -0700
+Subject: Port AC_LANG_CALL(C) to C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++.
+Problem reported by Vincent Lefèvre (sr #110532).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)],
+ m4_if([$2], [main], ,
+ [/* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
++   builtin and then its argument prototype would still apply.
++   The 'extern "C"' is for builds by C++ compilers;
++   although this is not generally supported in C code supporting it here
++   has little cost and some practical benefit (sr 110532).  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ char $2 ();])], [return $2 ();])])
+ 
+ 
+cgit v1.1
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch
new file mode 100644
index 000000000000..d9829d1ae213
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch
@@ -0,0 +1,47 @@
+From 0d784a60bb65eb730a1b5f2b24887192d058629b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org>
+Date: Sat, 4 Nov 2023 00:32:48 +0100
+Subject: [PATCH] Append '-vanilla' to pkgdatadir
+
+---
+ Makefile.am | 3 +++
+ Makefile.in | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 17e1f8f..73d2ea7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,6 +18,9 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
++# Work around file conflicts against sys-devel/autoconf   -- Arsen
++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
++
+ ## All of these will be incrementally updated later, here or in included
+ ## makefile fragments.
+ ETAGS_ARGS =
+diff --git a/Makefile.in b/Makefile.in
+index dcd27f7..704248f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -195,7 +195,6 @@ am__make_running_with_option = \
+   test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -401,6 +400,7 @@ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+-- 
+2.42.0
+
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch
new file mode 100644
index 000000000000..c122aee4b22d
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch
@@ -0,0 +1,11 @@
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -122,7 +122,7 @@
+ my $autom4te    = $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@';
+ my $automake    = $ENV{'AUTOMAKE'}    || 'automake';
+ my $aclocal     = $ENV{'ACLOCAL'}     || 'aclocal';
+-my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'libtoolize';
++my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'glibtoolize';
+ my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize';
+ my $gtkdocize   = $ENV{'GTKDOCIZE'}   || 'gtkdocize';
+ my $autopoint   = $ENV{'AUTOPOINT'}   || 'autopoint';
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch
new file mode 100644
index 000000000000..4dcf05996180
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch
@@ -0,0 +1,25 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a
+https://savannah.gnu.org/bugs/?63040
+https://bugs.gentoo.org/869257
+
+From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Fri, 9 Sep 2022 16:54:11 -0500
+Subject: Port to GNU make 4.4
+
+* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding
+use of the shell entirely if PWD is set, as it should be.
+Problem reported by Sergei Trofimovich in:
+https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html
+--- a/cfg.mk
++++ b/cfg.mk
+@@ -18,7 +18,7 @@
+ # This file is '-include'd into GNUmakefile.
+ 
+ # Build with our own versions of these tools, when possible.
+-export PATH = $(shell echo "`pwd`/tests:$$PATH")
++export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH)
+ 
+ # Remove the autoreconf-provided INSTALL, so that we regenerate it.
+ _autoreconf = autoreconf -i -v && rm -f INSTALL
+cgit v1.1
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch
new file mode 100644
index 000000000000..8ecfe10f40a3
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch
@@ -0,0 +1,49 @@
+From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 1 Aug 2021 19:07:48 +0200
+Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/Autom4te/FileUtils.pm | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
+index a182031b..27a5fd91 100644
+--- a/lib/Autom4te/FileUtils.pm
++++ b/lib/Autom4te/FileUtils.pm
+@@ -34,12 +34,12 @@ This perl module provides various general purpose file handling functions.
+ 
+ =cut
+ 
+-use 5.006;
++use 5.008;
+ use strict;
+ use warnings FATAL => 'all';
+ 
+ use Exporter;
+-use File::stat;
++use Time::HiRes qw(stat);
+ use IO::File;
+ 
+ use Autom4te::Channels;
+@@ -115,10 +115,11 @@ sub mtime ($)
+   return 0
+     if $file eq '-' || ! -f $file;
+ 
+-  my $stat = stat ($file)
++  my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
++    $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file)
+     or fatal "cannot stat $file: $!";
+ 
+-  return $stat->mtime;
++  return $mtime;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch
new file mode 100644
index 000000000000..2ff6418a3a34
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch
@@ -0,0 +1,48 @@
+From 8eee2e2b910c6c3d837a4708d4d5d3d80afd8ef9 Mon Sep 17 00:00:00 2001
+From: Arsen Arsenović <arsen@gentoo.org>
+Date: Sat, 4 Nov 2023 00:20:05 +0100
+Subject: [PATCH] Append '-vanilla' to pkgdatadir
+
+---
+ Makefile.am | 3 +++
+ Makefile.in | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 28bb494..dfc8932 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,6 +18,9 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
++# Work around file conflicts against sys-devel/autoconf   -- Arsen
++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
++
+ ## All of these will be incrementally updated later, here or in included
+ ## makefile fragments.
+ ETAGS_ARGS =
+diff --git a/Makefile.in b/Makefile.in
+index 2cde4d0..cf17242 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -197,7 +197,6 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ am__rm_f = rm -f $(am__rm_f_notfound)
+ am__rm_rf = rm -rf $(am__rm_f_notfound)
+-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -401,6 +400,8 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ distcleancheck_listfiles = \
+   find . \( -type f -a \! \
+             \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
++# Work around file conflicts against sys-devel/autoconf   -- Arsen
++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+-- 
+2.42.0
+
diff --git a/sys-devel/autoconf-vanilla/metadata.xml b/sys-devel/autoconf-vanilla/metadata.xml
new file mode 100644
index 000000000000..4ff4a48125bc
--- /dev/null
+++ b/sys-devel/autoconf-vanilla/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">autoconf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-devel/automake-vanilla/Manifest b/sys-devel/automake-vanilla/Manifest
new file mode 100644
index 000000000000..7cd77e9984e0
--- /dev/null
+++ b/sys-devel/automake-vanilla/Manifest
@@ -0,0 +1,15 @@
+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-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
+DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
+DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
+DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
+EBUILD automake-vanilla-1.11.6.ebuild 2484 BLAKE2B 890c1aca2e3b83f15e2ab19a0d5b3d0d01345b085ea4a630dd9f7773e0f97d390a940572d76af307af80bfbf9845ff41653d595207975e118b816e0ffdafe4e2 SHA512 e25fbf2fb638965f0ee44164aaba27c72821f470016c60835a313b0b06658f920a4709ae869c0ddd5461010a19a5db9d85e8d3591861714186b00ca5458eb103
+EBUILD automake-vanilla-1.15.1.ebuild 2583 BLAKE2B 10dec90367a9079fee6880673dbde36694fba2b35a8da6a9e0e14408b5707e9d3014cd37385e98f8444f3bc84b3be4bce58959bd500855e4310882b5d9b873ba SHA512 2ef677458b1562832f307ae28a9317a7eec61eaee3a6b7a7b8aa8de2e419d02824b4f30ca50814a4db3f33e980961d05ff680e180ce5bb01b94860eae7fe16ac
+EBUILD automake-vanilla-1.16.5.ebuild 2849 BLAKE2B d4a3bc8cc335e5984b1625bd26fc70790285354976fca31ceb5b30aa9e919a5f0a28ac9e4a2d6bf452ba51dae7b39ac1bb979802ba2524925f7e43112c1b5cf1 SHA512 dc12102a88ec882b4a831a1c4947042bb96355e37d95db142ac5979516885e92a01aef9248e396a56bf3dd5c18acaa3790e625adf365a454d41988f004735776
+EBUILD automake-vanilla-9999.ebuild 2662 BLAKE2B 1d0f6140ccd99d8fa705a31a736d202a3b5f4f04773fe9e2cadd2d99029dc4746b87b211fdeba2ae16c5b6baeeca2aadf61e59c2ca97c8253bb9677f057eeac6 SHA512 5ccd45268b428ea0f20941afe1d9735b46865e343447996f02f986a41f1d52f390a6f504670463ab53eef251bf298bc4de600b57bfd1b1577366c2fd3edb9331
+MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild
new file mode 100644
index 000000000000..ae731a0451ef
--- /dev/null
+++ b/sys-devel/automake-vanilla/automake-vanilla-1.11.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN/-vanilla}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-10
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/help2man
+"
+BDEPEND="
+	app-arch/gzip
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_P}-perl-5.16.patch #424453
+	"${FILESDIR}"/${MY_P}-install-sh-avoid-low-risk-race-in-tmp.patch
+	"${FILESDIR}"/${MY_P}-perl-escape-curly-bracket-r1.patch
+)
+
+src_prepare() {
+	default
+	export WANT_AUTOCONF=2.5
+	export HELP2MAN=true
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+	export TZ="UTC"  #589138
+}
+
+src_configure() {
+	# Also used in install.
+	MY_INFODIR="${EPREFIX}/usr/share/${P}/info"
+	econf \
+		--datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \
+		--program-suffix="-vanilla" \
+		--infodir="${MY_INFODIR}"
+}
+
+src_compile() {
+	:;
+
+	# TODO: This was missing a || die originally and fails now...
+	#local x
+	#for x in aclocal automake; do
+	#	help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1 || die
+	#done
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake}-vanilla \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${MY_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-vanilla-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "07automake${idx}" <<-EOF
+	INFOPATH="${MY_INFODIR}"
+	EOF
+}
diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild
new file mode 100644
index 000000000000..8416c83e8723
--- /dev/null
+++ b/sys-devel/automake-vanilla/automake-vanilla-1.15.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	MY_P=${MY_PN}-${PV}
+
+	SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz"
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-11
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/gzip
+	sys-apps/help2man
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
+"
+
+pkg_setup() {
+	# Avoid python-any-r1_pkg_setup
+	:
+}
+
+src_prepare() {
+	default
+
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools - this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+src_configure() {
+	use test && python_setup
+	# Also used in install.
+	MY_INFODIR="${EPREFIX}/usr/share/${P}/info"
+	econf \
+		--datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \
+		--program-suffix="-vanilla" \
+		--infodir="${MY_INFODIR}"
+}
+
+src_install() {
+	default
+
+	#rm "${ED}"/usr/share/aclocal/README || die
+	#rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake}-vanilla \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${MY_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-vanilla-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "07automake${idx}" <<-EOF
+	INFOPATH="${MY_INFODIR}"
+	EOF
+}
diff --git a/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild
new file mode 100644
index 000000000000..ad6816d67687
--- /dev/null
+++ b/sys-devel/automake-vanilla/automake-vanilla-1.16.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git"
+	inherit git-r3
+else
+	MY_PN=${PN/-vanilla}
+	MY_P=${MY_PN}-${PV}
+
+	SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz"
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-11
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/gzip
+	sys-apps/help2man
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PN}-1.16.5-py3-compile.patch
+	"${FILESDIR}"/${MY_PN}-1.16.5-fix-instmany-python.sh-test.patch
+	"${FILESDIR}"/${MY_PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
+	# upstreamed
+	"${FILESDIR}"/${MY_PN}-1.16.5-apostrophe-in-tests.patch
+)
+
+pkg_setup() {
+	# Avoid python-any-r1_pkg_setup
+	:
+}
+
+src_prepare() {
+	default
+
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools - this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+src_configure() {
+	use test && python_setup
+	# Also used in install.
+	MY_INFODIR="${EPREFIX}/usr/share/${P}/info"
+	econf \
+		--datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \
+		--program-suffix="-vanilla" \
+		--infodir="${MY_INFODIR}"
+}
+
+src_install() {
+	default
+
+	#rm "${ED}"/usr/share/aclocal/README || die
+	#rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake}-vanilla \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${MY_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-vanilla-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "07automake${idx}" <<-EOF
+	INFOPATH="${MY_INFODIR}"
+	EOF
+}
diff --git a/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild b/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild
new file mode 100644
index 000000000000..d6c826dc6125
--- /dev/null
+++ b/sys-devel/automake-vanilla/automake-vanilla-9999.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit python-any-r1
+
+MY_PN=${PN/-vanilla}
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz"
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-11
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/gzip
+	sys-apps/help2man
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
+"
+
+pkg_setup() {
+	# Avoid python-any-r1_pkg_setup
+	:
+}
+
+src_prepare() {
+	default
+
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools - this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+src_configure() {
+	use test && python_setup
+	# Also used in install.
+	MY_INFODIR="${EPREFIX}/usr/share/${P}/info"
+	econf \
+		--datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \
+		--program-suffix="-vanilla" \
+		--infodir="${MY_INFODIR}"
+}
+
+src_install() {
+	default
+
+	#rm "${ED}"/usr/share/aclocal/README || die
+	#rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake}-vanilla \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${MY_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-vanilla-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	if [[ ${PV} == 9999 ]]; then
+		local major="89"
+		local minor="999"
+	else
+		local major="$(ver_cut 1)"
+		local minor="$(ver_cut 2)"
+	fi
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "07automake${idx}" <<-EOF
+	INFOPATH="${MY_INFODIR}"
+	EOF
+}
diff --git a/sys-devel/automake-vanilla/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake-vanilla/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
new file mode 100644
index 000000000000..c435b9004f8d
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
@@ -0,0 +1,77 @@
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Sat, 15 Aug 2015 04:40:57 -0400
+Subject: install-sh: avoid (low risk) race in /tmp
+
+Ensure that nobody can cross privilege boundaries by pre-creating
+symlink on '$tmpdir' path.
+
+Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not
+safe because '/tmp' directory is usually world-writeable and
+'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by
+attacker (at least for shells where $RANDOM is not supported).
+So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p.
+This step would fail early if somebody wanted catch us.
+
+Note that systems that implement (and have enabled)
+fs.protected_symlinks kernel feature are not affected even without
+this commit.
+
+References:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455
+https://bugzilla.redhat.com/show_bug.cgi?id=1140725
+
+* lib/install-sh: Implement safer 'mkdir -p' test by running
+'$mkdirprog $mkdir_mode "$tmpdir"' first.
+(scriptversion): Bump.
+
+--- a/lib/install-sh
++++ b/lib/install-sh
+@@ -345,34 +345,41 @@ do
+ 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ 	    ;;
+ 	  *)
++	    # $RANDOM is not portable (e.g. dash);  use it when possible to
++	    # lower collision chance
+ 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++	    trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ 
++	    # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
++	    # create the $tmpdir first (and fail if unsuccessful) to make sure
++	    # that nobody tries to guess the $tmpdir name.
+ 	    if (umask $mkdir_umask &&
+-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++		$mkdirprog $mkdir_mode "$tmpdir" &&
++		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ 	    then
+ 	      if test -z "$dir_arg" || {
+ 		   # Check for POSIX incompatibilities with -m.
+ 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ 		   # other-writeable bit of parent directory when it shouldn't.
+ 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
++		   test_tmpdir="$tmpdir/a"
++		   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ 		   case $ls_ld_tmpdir in
+ 		     d????-?r-*) different_mode=700;;
+ 		     d????-?--*) different_mode=755;;
+ 		     *) false;;
+ 		   esac &&
+-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++		   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
++		     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ 		   }
+ 		 }
+ 	      then posix_mkdir=:
+ 	      fi
+-	      rmdir "$tmpdir/d" "$tmpdir"
++	      rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ 	    else
+ 	      # Remove any dirs left behind by ancient mkdir implementations.
+-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++	      rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ 	    fi
+ 	    trap '' 0;;
+ 	esac;;
diff --git a/sys-devel/automake-vanilla/files/automake-1.11.6-perl-5.16.patch b/sys-devel/automake-vanilla/files/automake-1.11.6-perl-5.16.patch
new file mode 100644
index 000000000000..19fe249e0c00
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.11.6-perl-5.16.patch
@@ -0,0 +1,128 @@
+https://bugs.gentoo.org/424453
+
+From 6bf58a59a1f3803e57e3f0378aa9344686707b75 Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini@gmail.com>
+Date: Mon, 28 May 2012 13:32:03 +0200
+Subject: [PATCH] aclocal: declare function prototypes, do not use '&' in
+ function calls
+
+This change will also fix automake bug#11543 (from a report by Matt
+Burgess).
+
+* aclocal.in: Declare prototypes for almost all functions early, before
+any actual function definition (but omit the prototype for the dynamically
+generated '&search' function).  Add prototypes to any function definition.
+Remove '&' from function invocations (i.e., simply use "func(ARGS..)"
+instead of "&func(ARGS...)").
+* THANKS, NEWS: Update.
+
+Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
+---
+ NEWS       |  4 ++++
+ THANKS     |  1 +
+ aclocal.in | 42 ++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 39 insertions(+), 8 deletions(-)
+
+diff --git a/aclocal.in b/aclocal.in
+index dfb851b..e8855d5 100644
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -152,8 +152,34 @@ my $erase_me;
+ 
+ ################################################################
+ 
++# Prototypes for all subroutines.
++
++sub unlink_tmp (;$);
++sub xmkdir_p ($);
++sub check_acinclude ();
++sub reset_maps ();
++sub install_file ($$);
++sub list_compare (\@\@);
++sub scan_m4_dirs ($@);
++sub scan_m4_files ();
++sub add_macro ($);
++sub scan_configure_dep ($);
++sub add_file ($);
++sub scan_file ($$$);
++sub strip_redundant_includes (%);
++sub trace_used_macros ();
++sub scan_configure ();
++sub write_aclocal ($@);
++sub usage ($);
++sub version ();
++sub handle_acdir_option ($$);
++sub parse_arguments ();
++sub parse_ACLOCAL_PATH ();
++
++################################################################
++
+ # Erase temporary file ERASE_ME.  Handle signals.
+-sub unlink_tmp
++sub unlink_tmp (;$)
+ {
+   my ($sig) = @_;
+ 
+@@ -350,7 +376,7 @@ sub scan_m4_dirs ($@)
+ 	  next if $file eq 'aclocal.m4';
+ 
+ 	  my $fullfile = File::Spec->canonpath ("$m4dir/$file");
+-	    &scan_file ($type, $fullfile, 'aclocal');
++	  scan_file ($type, $fullfile, 'aclocal');
+ 	}
+       closedir (DIR);
+     }
+@@ -361,12 +387,12 @@ sub scan_m4_files ()
+ {
+   # First, scan configure.ac.  It may contain macro definitions,
+   # or may include other files that define macros.
+-  &scan_file (FT_USER, $configure_ac, 'aclocal');
++  scan_file (FT_USER, $configure_ac, 'aclocal');
+ 
+   # Then, scan acinclude.m4 if it exists.
+   if (-f 'acinclude.m4')
+     {
+-      &scan_file (FT_USER, 'acinclude.m4', 'aclocal');
++      scan_file (FT_USER, 'acinclude.m4', 'aclocal');
+     }
+ 
+   # Finally, scan all files in our search paths.
+@@ -380,7 +406,7 @@ sub scan_m4_files ()
+   my $search = "sub search {\nmy \$found = 0;\n";
+   foreach my $key (reverse sort keys %map)
+     {
+-      $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key
++      $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key
+ 		  . '"); $found = 1; }' . "\n");
+     }
+   $search .= "return \$found;\n};\n";
+@@ -403,7 +429,7 @@ sub add_macro ($)
+ 
+   verb "saw macro $macro";
+   $macro_seen{$macro} = 1;
+-  &add_file ($map{$macro});
++  add_file ($map{$macro});
+ }
+ 
+ # scan_configure_dep ($file)
+@@ -465,7 +491,7 @@ sub scan_configure_dep ($)
+     }
+ 
+   add_macro ($_) foreach (@rlist);
+-  &scan_configure_dep ($_) foreach @ilist;
++  scan_configure_dep ($_) foreach @ilist;
+ }
+ 
+ # add_file ($FILE)
+@@ -931,7 +957,7 @@ EOF
+ }
+ 
+ # Print version and exit.
+-sub version()
++sub version ()
+ {
+   print <<EOF;
+ aclocal (GNU $PACKAGE) $VERSION
+-- 
+2.1.3
+
diff --git a/sys-devel/automake-vanilla/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch b/sys-devel/automake-vanilla/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
new file mode 100644
index 000000000000..bf8819adcf4c
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
@@ -0,0 +1,37 @@
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
+
+From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Tue, 7 Jul 2015 10:54:24 +0200
+Subject: [PATCH] bin/automake: escape '{' in regexp pattern
+
+Based on perlre(1) documentation:
+.. in Perl v5.26, literal uses of a curly bracket will be required
+to be escaped, say by preceding them with a backslash ("\{" ) or
+enclosing them within square brackets ("[{]") ..
+
+References:
+https://bugzilla.redhat.com/1239379
+
+* bin/automake.in (substitute_ac_subst_variables): Escape the
+occurrence of '{' character.
+---
+ bin/automake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/automake.in b/bin/automake.in
+index 0c29184..c294ced 100644
+--- a/automake.in
++++ b/automake.in
+@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
+ sub substitute_ac_subst_variables ($)
+ {
+   my ($text) = @_;
+-  $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
++  $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
+   return $text;
+ }
+ 
+-- 
+2.1.0
+
diff --git a/sys-devel/automake-vanilla/files/automake-1.16.5-apostrophe-in-tests.patch b/sys-devel/automake-vanilla/files/automake-1.16.5-apostrophe-in-tests.patch
new file mode 100644
index 000000000000..866284dfd185
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.16.5-apostrophe-in-tests.patch
@@ -0,0 +1,51 @@
+From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Mon, 12 Dec 2022 14:50:33 -0800
+Subject: test: avoid apostrophe in test document.
+
+From automake patch https://bugs.gnu.org/59989
+(though a different solution), suggestion by Frederic Berat.
+
+* t/txinfo-include.sh: avoid apostrophes in test document,
+since Texinfo 7.0 turns them into UTF-8 by default.
+---
+ t/txinfo-include.sh | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
+index 8a15f01..10fff07 100644
+--- a/t/txinfo-include.sh
++++ b/t/txinfo-include.sh
+@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi
+ sub_more_TEXINFOS = sub/desc.texi sub/hist.texi
+ END
+ 
++# We avoid apostrophes in the test document since Texinfo
++# turns them into UTF-8, which is not easy to grep.
++#
+ cat > main.texi << 'END'
+ \input texinfo
+ @setfilename main.info
+@@ -61,8 +64,8 @@ END
+ 
+ cat > three.texi << 'END'
+ @node three
+-@chapter Chapter two
+-GNU's Not Unix.
++@chapter Chapter three
++Quux quux quux.
+ END
+ 
+ mkdir sub
+@@ -106,7 +109,7 @@ check_info_contents ()
+   srcdir=${1-.}
+   $FGREP "Foo bar, baz."                        $srcdir/main.info
+   $FGREP "Blah Blah Blah."                      $srcdir/main.info
+-  $FGREP "GNU's Not Unix."                      $srcdir/main.info
++  $FGREP "Quux quux quux."                      $srcdir/main.info
+   $FGREP 'It does something, really.'           $srcdir/sub/more.info
+   $FGREP 'It was written somehow.'              $srcdir/sub/more.info
+ }
+-- 
+cgit v1.1
+
diff --git a/sys-devel/automake-vanilla/files/automake-1.16.5-fix-instmany-python.sh-test.patch b/sys-devel/automake-vanilla/files/automake-1.16.5-fix-instmany-python.sh-test.patch
new file mode 100644
index 000000000000..5cddb4cfb83f
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.16.5-fix-instmany-python.sh-test.patch
@@ -0,0 +1,26 @@
+From 50daac4f15d207b6b69011b9cdde62b56c1c8b10 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Fri, 20 Nov 2020 02:17:31 +0100
+Subject: [PATCH 2/2] tests: fix instmany-python.sh: increase limit
+
+Still failing with 4500 on Gentoo. Passing with 7000...
+---
+ t/instmany-python.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/instmany-python.sh b/t/instmany-python.sh
+index dce3594b5..1c482520d 100644
+--- a/t/instmany-python.sh
++++ b/t/instmany-python.sh
+@@ -21,7 +21,7 @@
+ required='python'
+ . test-init.sh
+ 
+-limit=4500
++limit=7000
+ subdir=long_subdir_name_with_many_characters
+ nfiles=81
+ list=$(seq_ 1 $nfiles)
+-- 
+2.29.2
+
diff --git a/sys-devel/automake-vanilla/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake-vanilla/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
new file mode 100644
index 000000000000..f49dd253c2d6
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
@@ -0,0 +1,26 @@
+From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Fri, 20 Nov 2020 02:13:56 +0100
+Subject: [PATCH 1/2] tests: fix py-compile-basedir.sh: add missing test call
+
+Fixes: b279a0d46 ("tests: in python tests, do not require .pyo files (for python3)")
+---
+ t/py-compile-basedir.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
+index 13a22ff1d..1a16ee2d7 100644
+--- a/t/py-compile-basedir.sh
++++ b/t/py-compile-basedir.sh
+@@ -43,7 +43,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
+   py_installed "$d2/sub/$f.pyc"
+   files=$(find "$d2" | grep '\.py[co]$')
+   # with new-enough Python3, there are six files.
+-  test $(echo "$files" | wc -l) -eq 4 || $(echo "$files" | wc -l) -eq 6
++  test $(echo "$files" | wc -l) -eq 4 || test $(echo "$files" | wc -l) -eq 6
+   case $d2 in
+     .|..) rm -f $files;;
+        *) rm -rf "$d2";;
+-- 
+2.29.2
+
diff --git a/sys-devel/automake-vanilla/files/automake-1.16.5-py3-compile.patch b/sys-devel/automake-vanilla/files/automake-1.16.5-py3-compile.patch
new file mode 100644
index 000000000000..5333520b5db1
--- /dev/null
+++ b/sys-devel/automake-vanilla/files/automake-1.16.5-py3-compile.patch
@@ -0,0 +1,73 @@
+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
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index e56d98d6e..5b9ae5d5d 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -126,12 +126,10 @@ if test "$python_major" -le 2; then
+   import_lib=imp
+   import_test="hasattr(imp, 'get_tag')"
+   import_call=imp.cache_from_source
+-  import_arg2=', False' # needed in one call and not the other
+ else
+   import_lib=importlib
+   import_test="hasattr(sys.implementation, 'cache_tag')"
+   import_call=importlib.util.cache_from_source
+-  import_arg2=
+ fi
+ 
+ $PYTHON -c "
+@@ -159,7 +157,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, $import_lib
+ 
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+     sys.exit(0)
+ 
+ files = '''$files'''
+@@ -173,7 +171,30 @@ for file in files.split():
+     sys.stdout.write(file)
+     sys.stdout.flush()
+     if $import_test:
+-        py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
++        py_compile.compile(filepath, $import_call(filepath), path)
++    else:
++        py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, $import_lib
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++    sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
++for file in files.split():
++    $pathtrans
++    $filetrans
++    if not os.path.exists(filepath) or not (len(filepath) >= 3
++                                            and filepath[-3:] == '.py'):
++	    continue
++    sys.stdout.write(file)
++    sys.stdout.flush()
++    if $import_test:
++        py_compile.compile(filepath, $import_call(filepath), path)
+     else:
+         py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || exit $?
+-- 
+2.25.2
diff --git a/sys-devel/automake-vanilla/metadata.xml b/sys-devel/automake-vanilla/metadata.xml
new file mode 100644
index 000000000000..6e5b45d8c011
--- /dev/null
+++ b/sys-devel/automake-vanilla/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:automake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index f0739e972428..f1463a59c75c 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -9,5 +9,5 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e40
 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-9999.ebuild 2878 BLAKE2B 247ef5dd998ea96c5d75c83abb7bbf47b9c767dca89dd39769c88fa4fdbeee4f50ba4331f7d6c7fcf1c6fe54e5a3f032046f6907607cf2812174b20ff11eccb8 SHA512 67ede6719f09e4f84e6795ff45d77483a3b7f528157efa97a072ab20c305ecc564db215a12323be2209a97aed158552feff70608e4764f8ae61c525bdbb1f05f
+EBUILD automake-9999.ebuild 2959 BLAKE2B b12b05d379c84b3fa24c8c8a9f29a8939886d39d57a454ba7157ac5035c6664d5f878a245d5d773405213288e226023712d0d37bf3d9a697d30d361bad40c9ca SHA512 812661059a3ebd1a2753165752e4a7481fae39bf2c2819a8a0450a1fc2f8aaddd63cc7ceac0fadf479e1f2cc7bdeafe1172db8fc40c15c8effadfe32b0482634
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 0fef18d0c6d4..0c72cfe6e473 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -109,8 +109,13 @@ src_install() {
 	done
 	popd >/dev/null || die
 
-	local major="$(ver_cut 1)"
-	local minor="$(ver_cut 2)"
+	if [[ ${PV} == 9999 ]]; then
+		local major="89"
+		local minor="999"
+	else
+		local major="$(ver_cut 1)"
+		local minor="$(ver_cut 2)"
+	fi
 	local idx="$((99999-(major*1000+minor)))"
 	newenvd - "06automake${idx}" <<-EOF
 	INFOPATH="${infopath}"