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

17 files changed, 187 insertions, 562 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 619aff37d850..e898689422b0 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 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() {
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 58cac4ef4d43..9b083ec24d58 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -23,19 +23,14 @@ 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
-DIST autoconf-2.72d.tar.xz 1383632 BLAKE2B d177e7435643415836b9a1b414fe63000be089590fbcaac78a84ef2ee1099132b745a5dafd64857dc03f8e55e7264cb7ad5746874b469d24df5ccf511d62664a SHA512 6068e3bf7d9c7f0bfa962d0605d2a50c244a8a5a59907ddd39f4a774be02056a0a77cd66826a0a0be1e33cc3f9f98136e15294de834f0cbb6b56cf4d19578a99
-EBUILD autoconf-2.13-r2.ebuild 1513 BLAKE2B f00bcaafe96be66dc686449ba2cdf9ab727efd04c7e0637a1549b670fab726295ecd2f09b5d618c6b1b7e36728b37aecec163cfa9e203006d5aa21c613b48015 SHA512 4faa98eb35de3eab97c34bb15ed43cafd1c80e20e6e8d75f1a63d4ab75fe50dbb2d816f5655c8efef815caa2092b281e87402c6e93ae6198e5ad94f02d22b408
+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-r5.ebuild 1806 BLAKE2B 739c1a44b953b09391c2d0d5c0c7b0aa056d6a9aba24191e3dbf1095c400a9cdc77d24c89f183694ed75269d4eb9454356e5b9e6b65db88193d9aeb9eefefa32 SHA512 b1a515253a692978e63b0493311b5a219999c046f44a7efd4fc37b862cdbec8b35e55c97f9b7f92c190c85e98448fc77c73c999a7509c19334437dcbd306a4dc
-EBUILD autoconf-2.69-r8.ebuild 1757 BLAKE2B b8d7f29b6bf0a9c6b3ea1993cadb83dee51a8013a755e8c834d7eb716c6b587b20c4dfc6b595298e9da93281b0ea4ef9e2d8113edb9c00bf01c9dbf32c4cfec5 SHA512 a34448a9bf6874c74ee253689033c1428f15b2372bb78501a7c6ebfdc27d409f3b309c68f5e308598125ac7ebb9e268ec9b3d8ab41a7d6c2e6531028543480a3
 EBUILD autoconf-2.69-r9.ebuild 1728 BLAKE2B 6ac68f95d41d1b090c85175d540177cd95f620ade4ab0d1433c4fc6c246f5aa4d8a5c7fa146e98d5af8affc681ce9961045936fff6eb70503b7de695c364fa63 SHA512 e5b3d2226c83f14ee0e655202e9af325758fcb679d8e1ece91a218259552828b23888b282b238e6a08bb695a2db5c32792962e79872cffaddeb01eee444b61de
-EBUILD autoconf-2.71-r1.ebuild 2209 BLAKE2B e745a44ee3abd6536c74a5206e67a9468d1a7c75e1448e023fbf66ab059f9b0242fb81bf03986a128eed8f13d6dd7fcc4b299c083393cafe58769a59a4cecf95 SHA512 5c03752ec0a15fdec87cbe53d976ec81b6d441bb1b175311dc19c6e78973a1865c06a26a8fd30cb0c28708f7f22ca6bc523f1fca33abe33fcd166e23780c400a
-EBUILD autoconf-2.71-r5.ebuild 2425 BLAKE2B 136d90bc2514c86c3575cc225d133b560d66effbbe23a7fbd05043b69a000a42e78d258704ab182485bd5b2cba0705294f90f2cf4288135f3b2351404e176cb1 SHA512 42fe4a6c6f5a414d836ecf1cbfa9d04cd15810de23d3b5f5bbf909862015127b303ffe4bcedcfa8f171cb860923bc7b5b654593d6e20fc479866885d8cd3c47f
 EBUILD autoconf-2.71-r6.ebuild 2396 BLAKE2B fe099ae66f3cc60ce49ddb81c6cdae8ae80c4c157142b9bc4ff66642c0e70cf3f4f974180869095dc58d5cd6f1141bb3c7c11ccaebe6790040e476e2d7ccdca9 SHA512 64f15ba6cd8cb5531834404d30e0b18df921581444a80e201ae713119117ff7b82663a96a0921c8a4c887f713df73aec4b91da0f7cd6748877336f777072f273
-EBUILD autoconf-2.71-r7.ebuild 2473 BLAKE2B 5c6669471edf46bd997818f942c904fbc1479c8eab94eac3bcbf85546b78c5c70a55a3d51a06a900a8e4ddd23e5f73721accc6bebd059a997f891889e1f69dd8 SHA512 040f0e9c61bb79931fefba2c2a86ffc96a2894a1ebbafda69769ae84ad1ac4fc01c6b46739551312b8b717291ed4f6b7ada1a72a6df54023f8e7c348634ed9dc
-EBUILD autoconf-2.72c-r2.ebuild 2215 BLAKE2B c52deed1b7ed04fa617715dfd0c088f21795d02bab3b67992e3e05d0030acaab6b4a72943242e9894a5a8c2a1d12cfec9946f78bdcc4d736f2ad1eb1a0b6112d SHA512 487f779dad6916f23e227681fca838f45efcfb7b8fe7eb22ac6083cb7d6d61a79e6c0401e744d3e2fabfa67c18a7ed43a73e0010380ec97f22ed052db72d84cb
-EBUILD autoconf-2.72d.ebuild 2215 BLAKE2B a85da5dd16cf89df7d7f061772c74e306173d72e813da8f3c2a8a4dd9796c392529f8172759ff2dd5f732dc71f7d45716234db9b67369ee7e173e840b5463381 SHA512 0ae21bc78eb698e4fb2b2396626cc70d632f14c0928952e3e5ff747b6974371b0f903e953340750e1dd4bf3b208550789b9f1e71daff641c0e8016d365352c0b
-EBUILD autoconf-9999.ebuild 2215 BLAKE2B c52deed1b7ed04fa617715dfd0c088f21795d02bab3b67992e3e05d0030acaab6b4a72943242e9894a5a8c2a1d12cfec9946f78bdcc4d736f2ad1eb1a0b6112d SHA512 487f779dad6916f23e227681fca838f45efcfb7b8fe7eb22ac6083cb7d6d61a79e6c0401e744d3e2fabfa67c18a7ed43a73e0010380ec97f22ed052db72d84cb
+EBUILD autoconf-2.71-r7.ebuild 2696 BLAKE2B b5dda502abb7d05066899c9e8062e5e05427482f5d20bcf8d4332dd3cf5f8d4f25f45fb063e5b8731d323dac71a5a1a417acc1623449c9f94caadbc973ef3ba9 SHA512 532677e9224c69810d8cdcd1bdd79ffd476bd17dbf6cd1dbe947c4c008237a0dda50a42c9ceb9e11c0739a691c2bfd4b014d73a570f5229158d72895beadf25e
+EBUILD autoconf-2.72.ebuild 2425 BLAKE2B f55090c0755fd0c3d4baa6fe2bfe92cf22b97b5631694d5e6179e34ffe721d62d55a0561a8df6a0a18fabd4e3ab573b2c44f7d802f676c4a0b29303657d36273 SHA512 caac386e2dbfdf45f2d4592c42767d6d972334ef580a5de4f4a75edaa37097fe31e6c00da39dde8c40e0191fe9ea5554816c744892816018d374bf5e3a457f1b
+EBUILD autoconf-9999.ebuild 2425 BLAKE2B f55090c0755fd0c3d4baa6fe2bfe92cf22b97b5631694d5e6179e34ffe721d62d55a0561a8df6a0a18fabd4e3ab573b2c44f7d802f676c4a0b29303657d36273 SHA512 caac386e2dbfdf45f2d4592c42767d6d972334ef580a5de4f4a75edaa37097fe31e6c00da39dde8c40e0191fe9ea5554816c744892816018d374bf5e3a457f1b
 MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf/autoconf-2.13-r2.ebuild b/sys-devel/autoconf/autoconf-2.13-r2.ebuild
deleted file mode 100644
index f71a4f702f9d..000000000000
--- a/sys-devel/autoconf/autoconf-2.13-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-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}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-destdir.patch
-	"${FILESDIR}"/${P}-test-fixes.patch #146592
-	"${FILESDIR}"/${PN}-2.13-perl-5.26.patch
-)
-
-TC_AUTOCONF_BREAK_INFOS=yes
-
-src_configure() {
-	# make sure configure is newer than configure.in
-	touch configure || die
-
-	# 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.
-	ac_cv_path_M4="m4" \
-	ac_cv_prog_AWK="awk" \
-	LC_ALL=C \
-	econf \
-		--exec-prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--program-suffix="-${PV}"
-}
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
deleted file mode 100644
index 7928a63bb524..000000000000
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${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
-
-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/${P}:2.5
-	>=sys-devel/autoconf-wrapper-13"
-[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
-	"${FILESDIR}"/${P}-fix-libtool-test.patch
-	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
-	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
-
-	"${WORKDIR}"/patches/${P}-runstatedir.patch
-	"${WORKDIR}"/patches/${P}-texinfo.patch
-	"${WORKDIR}"/patches/${P}-runstatedir_info.patch
-)
-
-TC_AUTOCONF_BREAK_INFOS=yes
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${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
-}
diff --git a/sys-devel/autoconf/autoconf-2.69-r8.ebuild b/sys-devel/autoconf/autoconf-2.69-r8.ebuild
deleted file mode 100644
index f222672bb8be..000000000000
--- a/sys-devel/autoconf/autoconf-2.69-r8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${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
-
-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}"/${PN}-2.69-perl-5.26.patch
-	"${FILESDIR}"/${P}-fix-libtool-test.patch
-	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
-	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
-	"${FILESDIR}"/${P}-K-R-decls-clang.patch
-
-	"${WORKDIR}"/patches/${P}-texinfo.patch
-)
-
-TC_AUTOCONF_BREAK_INFOS=yes
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${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
-}
diff --git a/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
deleted file mode 100644
index fa90d993df6e..000000000000
--- a/sys-devel/autoconf/autoconf-2.71-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	# For _beta handling replace with real version number
-	MY_PV="${PV}"
-	MY_P="${PN}-${MY_PV}"
-	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.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}/${P}-time.patch" )
-
-TC_AUTOCONF_BREAK_INFOS=yes
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${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/autoconf-2.71-r5.ebuild b/sys-devel/autoconf/autoconf-2.71-r5.ebuild
deleted file mode 100644
index 0f44081849a1..000000000000
--- a/sys-devel/autoconf/autoconf-2.71-r5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	# For _beta handling replace with real version number
-	MY_PV="${PV}"
-	MY_P="${PN}-${MY_PV}"
-	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.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}"/${P}-AC_LANG_CALL_C_cxx.patch
-	"${FILESDIR}"/${P}-time.patch
-	"${FILESDIR}"/${P}-AC_C_BIGENDIAN-lto.patch
-	"${FILESDIR}"/${P}-K-R-decls-clang.patch
-	"${FILESDIR}"/${P}-make-4.4.patch
-	"${FILESDIR}"/${P}-K-R-decls-clang-deux.patch
-)
-
-TC_AUTOCONF_BREAK_INFOS=yes
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${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/autoconf-2.71-r7.ebuild b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
index db7dca39d2e7..fec14a8ce2f0 100644
--- a/sys-devel/autoconf/autoconf-2.71-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
@@ -11,14 +11,23 @@ else
 	MY_PV="${PV}"
 	MY_P="${PN}-${MY_PV}"
 	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
+	inherit verify-sig
+
+	SRC_URI="
+		mirror://gnu/${PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
+	"
 	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
 
 	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}
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
 fi
 
 inherit toolchain-autoconf
@@ -32,12 +41,16 @@ 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}
+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"
+	!~sys-devel/${P}:2.5
+"
 [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
diff --git a/sys-devel/autoconf/autoconf-2.72d.ebuild b/sys-devel/autoconf/autoconf-2.72.ebuild
index 1d16fd0663b4..2381a9c5fd5b 100644
--- a/sys-devel/autoconf/autoconf-2.72d.ebuild
+++ b/sys-devel/autoconf/autoconf-2.72.ebuild
@@ -12,16 +12,22 @@ else
 	MY_P="${PN}-${MY_PV}"
 	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
 
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
+	inherit verify-sig
+
 	SRC_URI="
 		mirror://gnu/${PN}/${MY_P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
 		https://meyering.net/ac/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
 	"
-	 S="${WORKDIR}"/${MY_P}
+	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
@@ -33,7 +39,7 @@ LICENSE="GPL-3+"
 SLOT="$(ver_cut 1-2)"
 IUSE="emacs"
 
-BDEPEND="
+BDEPEND+="
 	>=dev-lang/perl-5.10
 	>=sys-devel/m4-1.4.16
 "
diff --git a/sys-devel/autoconf/autoconf-2.72c-r2.ebuild b/sys-devel/autoconf/autoconf-2.72c-r2.ebuild
deleted file mode 100644
index b4a4e1ccac5a..000000000000
--- a/sys-devel/autoconf/autoconf-2.72c-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	# For _beta handling replace with real version number
-	MY_PV="${PV}"
-	MY_P="${PN}-${MY_PV}"
-	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-
-	SRC_URI="
-		mirror://gnu/${PN}/${MY_P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
-		https://meyering.net/ac/${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 )"
-
-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}"/${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/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index b4a4e1ccac5a..2381a9c5fd5b 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
@@ -12,16 +12,22 @@ else
 	MY_P="${PN}-${MY_PV}"
 	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
 
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
+	inherit verify-sig
+
 	SRC_URI="
 		mirror://gnu/${PN}/${MY_P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
 		https://meyering.net/ac/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
 	"
-	 S="${WORKDIR}"/${MY_P}
+	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
@@ -33,7 +39,7 @@ LICENSE="GPL-3+"
 SLOT="$(ver_cut 1-2)"
 IUSE="emacs"
 
-BDEPEND="
+BDEPEND+="
 	>=dev-lang/perl-5.10
 	>=sys-devel/m4-1.4.16
 "
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7279961dcfc8..08dce689f35b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -11,6 +11,7 @@ DIST gcc-11-20231123.tar.xz 76227160 BLAKE2B 20fb3d3ec58c0c78a795ffbd154d76b2036
 DIST gcc-11-20231130.tar.xz 76233368 BLAKE2B c5675854585458e94b743eb98f6cf43b72f672fb2cdbd2f185b411f8943f70fff97f5613863bbe6a9eb85d4d8469ee13f2c0a601540c791dc249e2bd5e6f9373 SHA512 c1e611e2dee35448ff162c0be32a67937db45535e2f93c3fc7bfbb24dd57e2cd6bf840b47cc8d60183e5aec9ff87de56e85ddf491b3304307ca584e911d1b1f0
 DIST gcc-11-20231207.tar.xz 76225664 BLAKE2B a5e8391a23b5f8769b49f64a92f770b591990d9e2c2cc2b32bbb75f4342144a99cd9880e1e364b55fbfcc8b511a56ff68e2463f7588a4e5593059fbb784a24bf SHA512 2359e2fb379a5573ddd05b9cdea1c3d7fd531014d436f32ed49c8cd8b830c722b7a4e03b2c51d871c880795762df70aeb9d9ebde0f05fd74483e75e89e80fefb
 DIST gcc-11-20231214.tar.xz 76228348 BLAKE2B fded6ed91e9376d23652490f6b36cf847d1e01c449a26f756a7aee753dd82af37e3583f0cdae3c987923bb8938ed5a199db2b9a7a0c7fe7c8ceb6c8046029c4a SHA512 4e7a644fcd6c51d82b7b4fea368f0c26a887ccc694cddc0ca80af8dad289fe05f92b8036403075e62302a03f6f93a41291e2e925dd6f63e738772ea8f67b432a
+DIST gcc-11-20231221.tar.xz 76242656 BLAKE2B 279076c197fc9f666985c3f0a5f7e1dc0879ef2fa677e2fb5aeecbd605f52727f5591c58e8e9380f98c4de43f4aedfacd10ee78e450f6f549ac8424df901784d SHA512 004f5380a558f03195fd2988a03d6f1988d5ef13ab8be99a1ca0560950764019001fcd09178bc587e7c0a5c90cd7c147538d3e68d9194d1bf1888011e5565c1f
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-11.tar.xz 14268 BLAKE2B 7650366a8ff48855efb7ff7e7e61b2ccada669f95154bb176d6422fb6d2da3c3f332987338164350295683687283004733dae90ef5e0a11fb0803b0e37e1dfad SHA512 707f741977de0f13abf45e90595ecfbdcd6a94d0583a7568a69333d5a717d3f82a08c1c1b695cdbf956b1eea3b6d325fdb27bba4b931216c03f591684d93b959
@@ -21,6 +22,7 @@ DIST gcc-12-20231124.tar.xz 79820140 BLAKE2B 8a4ea2e35955d72d6b87c3f352d2fadc859
 DIST gcc-12-20231201.tar.xz 79793864 BLAKE2B b5c19bb9cb5c03138f20baa1d199f8784ddf52980a30d8c22a69a4e7885d976da9b94f139c6d82fc520c033ee29992e3aabb23c8508c6b1a8913ec3d89b2db51 SHA512 c17383259cbf7bda6b10be954430676846cc443e0d83309dbe4e2f5b4ea53006c6d7cb1ce3d564a2a5d5b773af59cf2a0c7ce7f82cfd8da71060be233d7a986f
 DIST gcc-12-20231208.tar.xz 79805176 BLAKE2B 6c280bafb849a59d68f77b52703686967230eb7ee56628160a955dfd45c32c2c7492f0f2eebdfe9985b96b670615e6e01af103d9f4c033245a0c699b6c8c3a18 SHA512 b53a83f13b2583466b135e4bbf868a59970ec17f779b1b333ce45e506380308a439ea2a8e1e9adc10c777ef1f6498c8011f3a340e90c326e9e323d908bf1abdf
 DIST gcc-12-20231215.tar.xz 79804016 BLAKE2B 547def0a166db31d8654a8b85ec1320f0dfe30f3f340968a67761e7907f56eb135d5a7e28c582d74dabc835027e09eb282c2f01a7be1e830f5f73145739a3084 SHA512 72a0d0721c9d09b6afaf8f6214dec1a577debf0167569166f0fc7c808d90bece35bb088f810b36dc873cbf199b1ae91d5c64e1d6557c92abbf6cf3feb6fbcbfa
+DIST gcc-12-20231222.tar.xz 79814136 BLAKE2B b50d336adb38d4c45d4097cc8772246d75646e2a3731af65c0b58eb1289508c4e08227eed15b6b1e88843b94933fd241388e5c634ecaa0cf432fc3d4fc71e618 SHA512 78886eb891ed89d9047e12222d7211e4c4e184554c8ce71274314f42afd2c573b8e4a512dab4d013aa26332e02cd1bf90b56607a0437a912d6e0bc2a096ea52f
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-13-20230826.tar.xz 84285788 BLAKE2B c25be594e322dd7145245c42ae21b98aa9e3e6ae69f1fa313830e40bf2e8fcb8435762f1c9d3f1ca1dbf31653bdc76a658bec708b7850fe40a7c55504ac30618 SHA512 3d47632e90651bd50a881c727c1ef2aa3322b4fc3e082919ae430270901abf8a05a34fe93f8b678c10dc9a0758f93dc3b33ed5947c8743dab453d2b50c063722
@@ -55,6 +57,7 @@ EBUILD gcc-11.4.1_p20231123.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167
 EBUILD gcc-11.4.1_p20231130.ebuild 1615 BLAKE2B 342f5f6f67158fe91dca0868faedcfcaf912a627696e793dca7e4fcbca4603d917e14f58cb34c2a239c3ca88cd685075f8729c7369bb487ac043370e932e13d3 SHA512 c25fbb764707821629f7ef38d684f5c6f79ac2d66170026de62056a238ea4a46e2f763ba9b68ddd5f31bd50cf56fdf5ebad9a108475e789379c53328f28378be
 EBUILD gcc-11.4.1_p20231207.ebuild 1615 BLAKE2B c5e2cb6b3f33a4b191291cbacf881c5ac3a1cc96f0f96d1956a0e53c5bb8150d8d78d46637c8fb7281da81b7b6f36a2a05c24bb72551258a04e8a2104a1c4c3b SHA512 7ac5f6c291498e8853ef945c5996b10f7572c068170613e1f2b4132ff1c6b35c836ee8c23d6b01c712f071e89d261f524b5e43fc54318295b3b0ad2536c21427
 EBUILD gcc-11.4.1_p20231214.ebuild 1614 BLAKE2B 034251f9a0ccff2432eeec6f8ad98fbfe2f7f686f375faf85ec9a15d3dd7a011aa4add049d2f8be305cbf4eeeebe948f4e56ed3e9ed4ae66243a41c56d746fda SHA512 dbd264ddff5ee65a0e745940a14f69aff5c5590237cbce6ff64cbd065758c84bde68dcc32227afe5c487d3a10fdb21f69b5595c65bc66a10726bb3e1b93e8db1
+EBUILD gcc-11.4.1_p20231221.ebuild 1615 BLAKE2B c5e2cb6b3f33a4b191291cbacf881c5ac3a1cc96f0f96d1956a0e53c5bb8150d8d78d46637c8fb7281da81b7b6f36a2a05c24bb72551258a04e8a2104a1c4c3b SHA512 7ac5f6c291498e8853ef945c5996b10f7572c068170613e1f2b4132ff1c6b35c836ee8c23d6b01c712f071e89d261f524b5e43fc54318295b3b0ad2536c21427
 EBUILD gcc-11.5.9999.ebuild 1582 BLAKE2B a5b94704a65afc32a3079ad0732b544c03413a9f4965ccf1c2718fd763dc29b7a64e54b8cbb492d52e93527e3f0d4966d17eb6b6cb81fd609c6629d19f6b124d SHA512 bd165193f6ef2b12930bac05c8c3f75f6bafd143a13ed5c2960f7a1d8039608ca23ccbffe9a6b235d42c789d117e29cb3d47998c71a4a3eba30a63b8b9e0f116
 EBUILD gcc-12.3.1_p20230825.ebuild 1613 BLAKE2B d0c6b99a1c529b7a518fc86b5d03c279dba37d111b0a356e416b8601f066cec460761ed14d0a4ef5faa6f16fb9af29baaf9bcb17edd55f5604d9bf012c579fd3 SHA512 b23bffb263e68b7f5045bfdf79538cb1e1abf4a4d789db7b915d586f10ebecf74a9d59715c8db5c2dd57545e559bdf72bec39a76ba50ddb13efc9db66982d56e
 EBUILD gcc-12.3.1_p20231117.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
@@ -62,6 +65,7 @@ EBUILD gcc-12.3.1_p20231124.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc7
 EBUILD gcc-12.3.1_p20231201.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
 EBUILD gcc-12.3.1_p20231208.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
 EBUILD gcc-12.3.1_p20231215.ebuild 1620 BLAKE2B 3866983ddc8c6811e00c12af0051e80bfc7f0651a5ef6ca4af9ee651e2efea89a095a616908cccdbac88d8c1baa5ba2eaba7ce7e94f9aae6ff3a56ff52bcd0c2 SHA512 81a426e6392a42d3a28eb6aa5a2de535771fdb87224eafb60ea369c902f27a42c8265565b354d4bbac8daa968849a20370c529c62c9367f0cf58756124d08e0b
+EBUILD gcc-12.3.1_p20231222.ebuild 1621 BLAKE2B 830b5c20e6bda5a28297bfbfd92a9cc74b5f371fe22eb06913c3dbcbe0d794b198dff9cda6f35bb7b34821ae0601afbe66a01e4c3686e9ba1a5cc049d9cf7868 SHA512 7144d0759578fb3db8ff377f2224e551e6fe5e669660baa712b5fa90e4e2875ac3e37f62ee66b0f1664b0f3d29b8d0acf144e7f52ef26bc23638d04770bd772b
 EBUILD gcc-12.4.9999.ebuild 1589 BLAKE2B 8de913409a3303b99e08e719751855382983fc3208de45a45e9f42d334c3f5b2b387b910791af804cae0c646c139d735235802bad96b4b84fe54f3cafd46cfec SHA512 fc445103363a11b7628e3f46ad8dc4b4c8e1f942dfd25078b41638779f7e4580fb9acff78812fb1039e5410e6dbdbaeea71b99f2d52ce3c4f04ec30dbf72ef7c
 EBUILD gcc-13.2.1_p20230826.ebuild 1672 BLAKE2B ddcf137ec925acd9450d0fb920bee8984b62c77517a4801786205a56632dff5ec987c511208779a6578304b1dc83c11ade6bd36dde9246d897dd4e9f8be8581d SHA512 494cf07c899941c6a612eb0dbfa5e2f4d52696f6e2d644b07ac3c49df9eafb4cf03fa78808385342a0aa02aba80676b33d9d14311898eee85bfbfbd919dc37fb
 EBUILD gcc-13.2.1_p20231014.ebuild 1680 BLAKE2B 7e1dad8f75e29c2bf25028424d186cf5659278c6e8c395cae86f3f676f0bd08b1ff757fbe7969be1e09173cf9f040069f1853897d77b9dd83b4b06192cbd0ca4 SHA512 33fd7cce36d141955b71f3757eb93e168a58bd47974bd6e6fa172b65fc3ba49d1bf50566837c10d839d68025a87522f535776b20e26d9738d8400ab8ce1d234a
diff --git a/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild
new file mode 100644
index 000000000000..0a84d9888218
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="12"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild b/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild
new file mode 100644
index 000000000000..1ffe2b97a4bf
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="12.3.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+	        MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}