gentoo auto-resync : 08:06:2024 - 00:08:11

8 files changed, 254 insertions, 25 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index a7e9cd85cf93..e9e9e99886ee 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/automake-wrapper/Manifest b/dev-build/automake-wrapper/Manifest
index cfe7c96b908b..6fcfe0cb3eaa 100644
--- a/dev-build/automake-wrapper/Manifest
+++ b/dev-build/automake-wrapper/Manifest
@@ -1,4 +1,6 @@
 DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
+DIST autotools-wrappers-at-20240607.tar.gz 3648 BLAKE2B 2b63c6b71b0a1eff801d011ed0829b42944dd5fa409464644036b4b312f2fd27862fa169c8d915db7daf1fb9862d52bbf9e606b274e82dfda3395e568120e6a4 SHA512 3754c34520109e4f2d2cbf45fe24cfc788c61210864a1199c7cc208e91c400d45533fb02934c61a5662f1402ba8464a0aa4ef16de17460646c8c176ab09df0af
 EBUILD automake-wrapper-20221207.ebuild 1264 BLAKE2B 5dc877348c370466c07fbd28b61f1802444fa9f324877b11a6eab0d27e8e73ad85fb83261534095178382032d5b812fdb59e95ee2e328d156debed15c6e79797 SHA512 22b9381903b709b8086b1c0306d07e6e055ff3571bccee334210d6e15d8ee9ada0900efdfb047ba4cc2a04531ddeb3eacc5adaeabe8dfc5f603e84077e868fa6
-EBUILD automake-wrapper-99999999.ebuild 1272 BLAKE2B e6bb7c6257f56a45f4450bed227e6d0f59f60de9c95b7c1b3983625738dfce9cdc867c00a4076d65b8b02764ab40fdb7583a1f59f854f1e98c7b0383a5b1ed88 SHA512 b3f7981b62809a7675f55801960b336914f3037bbedb9a2a478c0cb3e9c279e43e8848e6b58118e3447193292d45787d72b52a68c0926c29729a761ae40a5752
+EBUILD automake-wrapper-20240607.ebuild 1273 BLAKE2B c0a9c6a521eecd14bc24b72b0954f2ed49bd2fecc7bf92803c51be6b80fd05da8084bd73dcccc9304a8ee69050e65db48d500f98f4770658d8dae32b2448ee27 SHA512 e49ec2b85436e342236ae2de018c4ca08088a4f9eab4eac4c7b7cf03e2fc8d1ebf256187d9176942ab6e00c40d851f925efc2e803398e5da6a27a455672773a9
+EBUILD automake-wrapper-99999999.ebuild 1273 BLAKE2B c0a9c6a521eecd14bc24b72b0954f2ed49bd2fecc7bf92803c51be6b80fd05da8084bd73dcccc9304a8ee69050e65db48d500f98f4770658d8dae32b2448ee27 SHA512 e49ec2b85436e342236ae2de018c4ca08088a4f9eab4eac4c7b7cf03e2fc8d1ebf256187d9176942ab6e00c40d851f925efc2e803398e5da6a27a455672773a9
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild
new file mode 100644
index 000000000000..0573bd599fbb
--- /dev/null
+++ b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' on new automake (major) releases!
+
+MY_P="autotools-wrappers-at-${PV}"
+
+DESCRIPTION="Wrapper for automake to manage multiple automake versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/autotools-wrappers.git
+		https://github.com/gentoo/autotools-wrappers
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+
+	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
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper.sh || die
+	fi
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	doexe am-wrapper.sh
+
+	local x=
+	for x in automake aclocal ; do
+		dosym -r /usr/$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x}
+	done
+
+	keepdir /usr/share/aclocal
+}
diff --git a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
index ea8e3bb63674..0573bd599fbb 100644
--- a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
+++ b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-# Remember to modify LAST_KNOWN_AUTOAKE_VER 'upstream' on new automake (major) releases!
+# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' on new automake (major) releases!
 
 MY_P="autotools-wrappers-at-${PV}"
 
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index c812db88f4a6..b76beade9062 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -10,7 +10,11 @@ AUX automake-1.16.5-py312.patch 1102 BLAKE2B 31b63e6945e1c1b731cd27bd3108269baf0
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
 DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
+DIST automake-1.16.5.tar.xz.sig 833 BLAKE2B a79fcdce97e13ac3bf39d73e183da92703681ff80011974d95a41be20169f95414551985f7a46602fba3558e33f24d6dcb76222d99f9de4fef0d3dc59b88807e SHA512 032a7c39abb4cabbefa4eb9c15263baec0902e48c0c81364307361a41fd55be282b9640707c789f5ae572e8e60240e34d1b575a671b5710f5d2a5716fafc2d51
+DIST automake-1.16.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
+DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
 EBUILD automake-1.11.6-r4.ebuild 2205 BLAKE2B aaa67917d5b192613f8ad1584f9b4beef2c69ee2433db94dbc289d5fb6791f41f2762e6f088ef4a2456e39c2448de97c61bfc5c84c247581802fc122307e2931 SHA512 697e10303e70987f1d5be84775b191e0b6e95b761a408f06c754398fc73e548a01c0f83a8d89b778499f1a9f9a36f84d0c1ca5b858c22591f95c05d279574f38
-EBUILD automake-1.16.5-r2.ebuild 3799 BLAKE2B 5df0de857161e1c32a674984f7990549a6e774c6c9b6d74733d1e43f8fa0e8d615218b12ed179ba35a8727f4449238321a092a735edea3ef64f1a9fe1d81156c SHA512 596dedc07aceff1d887e5c068f59d470c34f2ed1f06e8f6959c63df91a8b6409b111fbf6e0dbf33874a1cf68987b82feaf37abf5f7e9e249388d21d8c4a25497
-EBUILD automake-9999.ebuild 3315 BLAKE2B 6c637905a158c864885f1d5a6e3a6eac6e36dddbc2410c5e865b775c1c1ab55ceac72819290a87bafa26966f23e5a27ba3d62cba03629189f2f4ed9e28c497da SHA512 7912f410dbf56bc14897680bf287a14e42bec1a6873ed4605552d471886e294f5a1a4a7c327df5ba59c4c81c3279eaa5834bd1a7363e9db650988361ee540a4b
+EBUILD automake-1.16.5-r2.ebuild 4154 BLAKE2B a7e4eeaede39cb353cf156aeea25203ebb8ce9c8eecc57db609a0fb3dfa391aafe751178c4cd45c5ec0ecb882bf54274791ebddbbbf4d90b2d81a8b856d64672 SHA512 afbf0d0715070a45a61eece7371e3a784c1af99e7a8efe69f4be24c233112cb59fd3aadf25a64a3d5b7e4e748557adbbe9b5ca870cb173ff85a3003f711d43f6
+EBUILD automake-1.16.90.ebuild 3633 BLAKE2B cf6d4d7d6611a5d32ada61bd6ca773506c68ab2bda39dfe4d7e6bcfc46680f2acdc9db7abda0ab2e72f7a09ee2c66f940acefaafed820744771d367b826f4db4 SHA512 947eb92e2277f366fd4070171107f1ee30fec1ce0273b7da09592112dc6b2f96db2f60562643f852f397fbc9f61d6d9e959343c85a72a7853aec04c473cbab3a
+EBUILD automake-9999.ebuild 3633 BLAKE2B cf6d4d7d6611a5d32ada61bd6ca773506c68ab2bda39dfe4d7e6bcfc46680f2acdc9db7abda0ab2e72f7a09ee2c66f940acefaafed820744771d367b826f4db4 SHA512 947eb92e2277f366fd4070171107f1ee30fec1ce0273b7da09592112dc6b2f96db2f60562643f852f397fbc9f61d6d9e959343c85a72a7853aec04c473cbab3a
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/dev-build/automake/automake-1.16.5-r2.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild
index d4553e58b66f..b1b2b9fb6761 100644
--- a/dev-build/automake/automake-1.16.5-r2.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -10,7 +10,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit python-any-r1
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+inherit python-any-r1 verify-sig
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
@@ -22,6 +23,10 @@ else
 			mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
 			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.xz
+			verify-sig? (
+				mirror://gnu/${PN}/${P}.tar.xz.sig
+				https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz.sig
+			)
 		"
 		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"
 	else
@@ -61,6 +66,7 @@ BDEPEND="
 		sys-devel/bison
 		sys-devel/flex
 	)
+	verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
 "
 
 PATCHES=(
@@ -78,6 +84,11 @@ pkg_setup() {
 	:
 }
 
+src_unpack() {
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	default
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-build/automake/automake-1.16.90.ebuild b/dev-build/automake/automake-1.16.90.ebuild
new file mode 100644
index 000000000000..ac793c1acd3d
--- /dev/null
+++ b/dev-build/automake/automake-1.16.90.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes:
+# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
+# on new automake (major) releases, as well as the dependency in RDEPEND below too.
+# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1 verify-sig
+
+MANGLED_SLOT=${PV:0:4}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_MIN_CLONE_TYPE=single
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+	if [[ $(ver_cut 3) -ge 90 ]] ; then
+		MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
+		SRC_URI="
+			https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+			verify-sig? (
+				https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
+			)
+		"
+	else
+		SRC_URI="
+			mirror://gnu/${PN}/${P}.tar.xz
+			verify-sig? (
+				mirror://gnu/${PN}/${P}.tar.xz.sig
+			)
+		"
+		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
+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="${MANGLED_SLOT}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=dev-build/automake-wrapper-20240607
+	>=dev-build/autoconf-2.69:*
+	sys-devel/gnuconfig
+"
+BDEPEND="
+	app-alternatives/gzip
+	sys-apps/help2man
+	dev-build/autoconf-wrapper
+	dev-build/autoconf
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+		sys-devel/bison
+		sys-devel/flex
+	)
+	verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
+"
+
+pkg_setup() {
+	use test && 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() {
+	# Also used in install.
+	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
+	econf --infodir="${infopath}"
+}
+
+src_test() {
+	# Fails with byacc/flex
+	emake YACC="bison -y" LEX="flex" check
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.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/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${infopath}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	if [[ ${PV} == 9999 ]]; then
+		local major="89"
+		local minor="999"
+	else
+		local major="$(ver_cut 1)"
+		if [[ $(ver_cut 3) -ge 90 ]] ; then
+			local minor=$(($(ver_cut 2) + 1))
+		else
+			local minor="$(ver_cut 2)"
+		fi
+	fi
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "06automake${idx}" <<-EOF
+	INFOPATH="${infopath}"
+	EOF
+
+	docompress "${MY_INFODIR}"
+}
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index a5d0371f5253..ac793c1acd3d 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Bumping notes:
 # * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
@@ -10,27 +10,33 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit python-any-r1
+inherit python-any-r1 verify-sig
+
+MANGLED_SLOT=${PV:0:4}
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_MIN_CLONE_TYPE=single
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
 	inherit git-r3
 else
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P="${P}"
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.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"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+	if [[ $(ver_cut 3) -ge 90 ]] ; then
+		MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
+		SRC_URI="
+			https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+			verify-sig? (
+				https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
+			)
+		"
 	else
-		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+		SRC_URI="
+			mirror://gnu/${PN}/${P}.tar.xz
+			verify-sig? (
+				mirror://gnu/${PN}/${P}.tar.xz.sig
+			)
+		"
+		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}"
 fi
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
@@ -38,13 +44,13 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
+SLOT="${MANGLED_SLOT}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.6
-	>=dev-build/automake-wrapper-11
+	>=dev-build/automake-wrapper-20240607
 	>=dev-build/autoconf-2.69:*
 	sys-devel/gnuconfig
 "
@@ -56,12 +62,14 @@ BDEPEND="
 	test? (
 		${PYTHON_DEPS}
 		dev-util/dejagnu
+		sys-devel/bison
+		sys-devel/flex
 	)
+	verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
 "
 
 pkg_setup() {
-	# Avoid python-any-r1_pkg_setup
-	:
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -80,12 +88,16 @@ src_prepare() {
 }
 
 src_configure() {
-	use test && python_setup
 	# Also used in install.
 	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
 	econf --infodir="${infopath}"
 }
 
+src_test() {
+	# Fails with byacc/flex
+	emake YACC="bison -y" LEX="flex" check
+}
+
 src_install() {
 	default
 
@@ -121,7 +133,11 @@ src_install() {
 		local minor="999"
 	else
 		local major="$(ver_cut 1)"
-		local minor="$(ver_cut 2)"
+		if [[ $(ver_cut 3) -ge 90 ]] ; then
+			local minor=$(($(ver_cut 2) + 1))
+		else
+			local minor="$(ver_cut 2)"
+		fi
 	fi
 	local idx="$((99999-(major*1000+minor)))"
 	newenvd - "06automake${idx}" <<-EOF