gentoo auto-resync : 23:12:2023 - 19:46:41

3 files changed, 12 insertions, 97 deletions

diff --git a/sys-devel/autoconf-vanilla/Manifest b/sys-devel/autoconf-vanilla/Manifest
index f5ae87a52462..5388058a3210 100644
--- a/sys-devel/autoconf-vanilla/Manifest
+++ b/sys-devel/autoconf-vanilla/Manifest
@@ -17,10 +17,8 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 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
+EBUILD autoconf-vanilla-9999.ebuild 2546 BLAKE2B d736e9da502afc9963ee5df171d83673d6ae8b2ae77505a72203a9fdb883a071ce35f182d322e902565f5704c0b27c085cdcd144c53e26d3fdd00f9f2f5fd480 SHA512 bcc9669aa753f0c602208cb1c8d67988030b42bfb7ee3fc1cd82c8d79d9f435cb22fd06567d09b842ef94cbfd5b29f8f496d35f1b8fc1538b15148066d35a2ab
 MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
deleted file mode 100644
index ba5dad5a496c..000000000000
--- a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
index 2386d2432452..f1a04c4b3fb3 100644
--- a/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild
@@ -13,16 +13,22 @@ else
 	MY_P="${MY_PN}-${MY_PV}"
 	#PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01"
 
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
+	inherit verify-sig
+
 	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
+		verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
 	"
 	 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
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
 fi
 
 inherit toolchain-autoconf
@@ -34,7 +40,7 @@ LICENSE="GPL-3+"
 SLOT="$(ver_cut 1-2)"
 IUSE="emacs"
 
-BDEPEND="
+BDEPEND+="
 	>=dev-lang/perl-5.10
 	>=sys-devel/m4-1.4.16
 "
@@ -47,6 +53,10 @@ RDEPEND="
 [[ ${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() {