gentoo auto-resync : 24:12:2023 - 19:36:06

5 files changed, 42 insertions, 6 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e79114ed90a6..f1f3e66eadee 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
index aff644eed27b..f80307ddbe48 100644
--- a/sys-devel/autoconf-vanilla/Manifest
+++ b/sys-devel/autoconf-vanilla/Manifest
@@ -16,11 +16,12 @@ AUX autoconf-2.72-conflicts.patch 1659 BLAKE2B e91d4db800ac1343eb62e660c69962240
 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.69.tar.xz.sig 556 BLAKE2B 07eaae3429f4bbd3ea40b4b366db383d9e322b03def7956f8961a20a6759072e8c327d4723313097f75caba0513928c37270beda8f8b491888fdd47a2ee80ad6 SHA512 e54082e00522463ba7d6b6ea6d700b8799a41177b34e057dd72abbe46219f0ce58674575d60fb106e37deeee8871d4ccfd85746c2d0e096a71eb096ffdb3020c
 DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
 DIST autoconf-2.72.tar.xz 1389680 BLAKE2B 01caeced9e53d8bd39fb0cf4929322f0d463971b0a96368aa55892026897a9e98c2ca84a77db1b3c6c4483aea54b96da16a7bc00b7ac15e23c6b0471438012db SHA512 c4e9fbd858666d3e5c3b4fe7f89aa3e8e3a0a00dc7e166f8147d937d911b77ba3ac6a016f9d223ccdd830bc8960b3e60397c0607cc6a1fd2c50c7492839ddd17
 DIST autoconf-2.72.tar.xz.sig 833 BLAKE2B cc33101c5d2bd28f233e54a2843d3c81dc9729238b0900a8f23ef17b982aa0e0194892c07b1365246b6c9c0ea74becd288ae581ee34d593131b83538c69a6204 SHA512 7a0d350b23cf47c45811ae35928a4fec67ce1f3adb1965904fe6d9a0fad68139df4902662bcf4731a2f809381cae0b265a8f1f57d0a9a39777250a97a3c481d9
 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.69.ebuild 2563 BLAKE2B 382b4aafdc0e99a1a7501ab46c25402ba8b646319df3e9444f74099ce873d75b2578910efc5d8f4ef0681a97f6fe9aebbf9d2bbb7427a038b93fcd2d68b97598 SHA512 674e195c1989a22b22fc9b037bc960900fb7ff3cab8e9e926ad7bf8d424c90aba3d1312a2573d83c01135c1308bd199c8b372c4fc41e1e2bb5f03f60c4b70d75
 EBUILD autoconf-vanilla-2.71.ebuild 2186 BLAKE2B 696707e661faf922df2261d92ce93fd8b4d1a6be78931feadd4fdd70fe701b14c5f93aa6d84c7b3a0edbffb60da5156d75d7b3885db9087f32d0ebf062b38a2c SHA512 644f950236f5d9d2c0cd52b515a181b57fa3ca74c8f567b4fcb513552a522c5c3a5a1e65180927e0d40c58131b810357eca88a98c6f30c0b7ee400a0888d23e2
 EBUILD autoconf-vanilla-2.72.ebuild 2546 BLAKE2B d736e9da502afc9963ee5df171d83673d6ae8b2ae77505a72203a9fdb883a071ce35f182d322e902565f5704c0b27c085cdcd144c53e26d3fdd00f9f2f5fd480 SHA512 bcc9669aa753f0c602208cb1c8d67988030b42bfb7ee3fc1cd82c8d79d9f435cb22fd06567d09b842ef94cbfd5b29f8f496d35f1b8fc1538b15148066d35a2ab
 EBUILD autoconf-vanilla-9999.ebuild 2546 BLAKE2B d736e9da502afc9963ee5df171d83673d6ae8b2ae77505a72203a9fdb883a071ce35f182d322e902565f5704c0b27c085cdcd144c53e26d3fdd00f9f2f5fd480 SHA512 bcc9669aa753f0c602208cb1c8d67988030b42bfb7ee3fc1cd82c8d79d9f435cb22fd06567d09b842ef94cbfd5b29f8f496d35f1b8fc1538b15148066d35a2ab
diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
index e5e60776090a..9e8d6199ae93 100644
--- a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
+++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild
@@ -10,11 +10,18 @@ else
 	MY_PN=${PN/-vanilla}
 	MY_P=${MY_PN}-${PV}
 
+	# Eric Blake signed 2.69 so use sec-keys/openpgp-keys-m4
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/m4.asc
+	inherit verify-sig
+
 	SRC_URI="
 		mirror://gnu/${MY_PN}/${MY_P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${MY_P}-runstatedir_patches.tar.xz
+		verify-sig? ( mirror://gnu/${MY_PN}/${MY_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"
+
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-m4 )"
 fi
 
 S="${WORKDIR}"/${MY_P}
@@ -28,7 +35,7 @@ LICENSE="GPL-3+"
 SLOT="${PV}"
 IUSE="emacs"
 
-BDEPEND="
+BDEPEND+="
 	>=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6
 "
@@ -53,6 +60,15 @@ PATCHES=(
 
 TC_AUTOCONF_ENVPREFIX=07
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index b634e8349e78..013c7e768554 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -22,13 +22,14 @@ AUX autoconf-2.71-time.patch 1253 BLAKE2B 0f791c225bddb89dab42b3927e1993f260df90
 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.69.tar.xz.sig 556 BLAKE2B 07eaae3429f4bbd3ea40b4b366db383d9e322b03def7956f8961a20a6759072e8c327d4723313097f75caba0513928c37270beda8f8b491888fdd47a2ee80ad6 SHA512 e54082e00522463ba7d6b6ea6d700b8799a41177b34e057dd72abbe46219f0ce58674575d60fb106e37deeee8871d4ccfd85746c2d0e096a71eb096ffdb3020c
 DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
 DIST autoconf-2.71.tar.xz.sig 833 BLAKE2B a2641a0bec3b475874811dd21dc32d34672f4f084ea16d48bd0655df37251be810026c20e35869503e664701edcb64f260b142db671e160a554c2ee982838355 SHA512 83e6bf4504f5d188cad1387ce1f1ce4b14f5ee4961bbfd5c83dd281d724392a95b394079bfaa093eb81129873e668b6ca1eee013a60cfb76edf34454756f6667
 DIST autoconf-2.72.tar.xz 1389680 BLAKE2B 01caeced9e53d8bd39fb0cf4929322f0d463971b0a96368aa55892026897a9e98c2ca84a77db1b3c6c4483aea54b96da16a7bc00b7ac15e23c6b0471438012db SHA512 c4e9fbd858666d3e5c3b4fe7f89aa3e8e3a0a00dc7e166f8147d937d911b77ba3ac6a016f9d223ccdd830bc8960b3e60397c0607cc6a1fd2c50c7492839ddd17
 DIST autoconf-2.72.tar.xz.sig 833 BLAKE2B cc33101c5d2bd28f233e54a2843d3c81dc9729238b0900a8f23ef17b982aa0e0194892c07b1365246b6c9c0ea74becd288ae581ee34d593131b83538c69a6204 SHA512 7a0d350b23cf47c45811ae35928a4fec67ce1f3adb1965904fe6d9a0fad68139df4902662bcf4731a2f809381cae0b265a8f1f57d0a9a39777250a97a3c481d9
 EBUILD autoconf-2.13-r7.ebuild 1608 BLAKE2B b98fa629ade7ed517a13dc9b64a75c5b9d8e7cde6f43ebf33c81b0fb50d216ffa6b8b530a90a2f95c34b1d7c3b99f8db004eda2c8a53e3c9ff8a69fed19ff7d6 SHA512 7476c3ce80a3c2605de6f76895d477ea4e2028b2bcc6ba0e8e0597c9c35f90ade015a1a5b4dc8f4a224d14f053e8a8acb7459b64dc5b1a93140a1f6d2656bf4b
 EBUILD autoconf-2.13-r8.ebuild 1626 BLAKE2B c67df827c9eaf4763b5d97d9e827dd841badef188ba91d9fe56b5020db658b8c44640da66067afdb49d2c0f3927cd52de8ece121bf590e9dbabc2f3d3b749bb8 SHA512 13da1c910e92d6b446a75425ff390133d1fb6781babc377637f84093e5eec896a742ea24f52be0b783ea2dfb78f77a8eb8de96a0a7e483b74bdcab160537cd31
-EBUILD autoconf-2.69-r9.ebuild 1728 BLAKE2B 6ac68f95d41d1b090c85175d540177cd95f620ade4ab0d1433c4fc6c246f5aa4d8a5c7fa146e98d5af8affc681ce9961045936fff6eb70503b7de695c364fa63 SHA512 e5b3d2226c83f14ee0e655202e9af325758fcb679d8e1ece91a218259552828b23888b282b238e6a08bb695a2db5c32792962e79872cffaddeb01eee444b61de
+EBUILD autoconf-2.69-r9.ebuild 2165 BLAKE2B 8af0042c80bef18ab2eb92a047af3bc01d9a6803e2563109a6c2a7cb3a3b562059b78dc756ad766e712ac9c4f52ca5b1a7b544f9c10fb582cf02665860451622 SHA512 9243e6b6ce0f3d44109062e1259ac1151549f31e79422406978eebcb749ed1d78ea46cb5882b72d00bd40205bbb4b1df7a9e57ae7ef8e2fd2537d2ae76c5e4fa
 EBUILD autoconf-2.71-r6.ebuild 2396 BLAKE2B fe099ae66f3cc60ce49ddb81c6cdae8ae80c4c157142b9bc4ff66642c0e70cf3f4f974180869095dc58d5cd6f1141bb3c7c11ccaebe6790040e476e2d7ccdca9 SHA512 64f15ba6cd8cb5531834404d30e0b18df921581444a80e201ae713119117ff7b82663a96a0921c8a4c887f713df73aec4b91da0f7cd6748877336f777072f273
 EBUILD autoconf-2.71-r7.ebuild 2696 BLAKE2B b5dda502abb7d05066899c9e8062e5e05427482f5d20bcf8d4332dd3cf5f8d4f25f45fb063e5b8731d323dac71a5a1a417acc1623449c9f94caadbc973ef3ba9 SHA512 532677e9224c69810d8cdcd1bdd79ffd476bd17dbf6cd1dbe947c4c008237a0dda50a42c9ceb9e11c0739a691c2bfd4b014d73a570f5229158d72895beadf25e
 EBUILD autoconf-2.72-r1.ebuild 2585 BLAKE2B 821102f50d284ef8c73f02ea5a4bd450406f22d69f49deb259942da716d8f558f5d267873aed3a2f50ee6a405df5f0a61da0d2158b56ac072e967211ac8176b4 SHA512 99f6e11b001e952c46be17a1f1167330000c1bf2f7c507466920ca08eb34f5cde871dba1f149b1521b79df5ccba6477069be43789a91d15436f0b80fa0daa2d6
diff --git a/sys-devel/autoconf/autoconf-2.69-r9.ebuild b/sys-devel/autoconf/autoconf-2.69-r9.ebuild
index 7b16150352b6..75df5c300a16 100644
--- a/sys-devel/autoconf/autoconf-2.69-r9.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r9.ebuild
@@ -7,10 +7,19 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	# Eric Blake signed 2.69 so use sec-keys/openpgp-keys-m4
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/m4.asc
+	inherit verify-sig
+
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
+		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.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"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )"
 fi
 
 inherit toolchain-autoconf
@@ -22,7 +31,7 @@ LICENSE="GPL-3+"
 SLOT="${PV}"
 IUSE="emacs"
 
-BDEPEND="
+BDEPEND+="
 	>=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6
 "
@@ -46,6 +55,15 @@ PATCHES=(
 	"${WORKDIR}"/patches/${P}-texinfo.patch
 )
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then