dev-build/automake: add 1.16.90 (unkeyworded)

This forward ports ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8 and syncs
live too. We also add verify-sig.

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 182 insertions, 20 deletions

diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index 8ba58d3e3240..a9cb10527626 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -1,3 +1,5 @@
 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.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
+DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
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..99d1c3dc731d
--- /dev/null
+++ b/dev-build/automake/automake-1.16.90.ebuild
@@ -0,0 +1,146 @@
+# 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
+	)
+	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..99d1c3dc731d 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
 "
@@ -57,11 +63,11 @@ BDEPEND="
 		${PYTHON_DEPS}
 		dev-util/dejagnu
 	)
+	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 +86,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 +131,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