gentoo resync : 07.01.2022

37 files changed, 203 insertions, 120 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index deaab9c5e98c..8502d2a0e789 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 7e403130ef2b..37eaa9a2d5da 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -14,7 +14,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 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
-EBUILD autoconf-2.13-r1.ebuild 1520 BLAKE2B 4b98ba08406846f4556eb46c223dd98e0ec034bd5a1246af248581542a3c9254d8b2fc879362095ad99c6bb842243ed582df27dc865c0b29d30482ec2e2aeee4 SHA512 1cdb6bca636c241af2a3dcc314929ac690bcef2ff12b5748ab335aacde795a25821dd4c4ed4053c3af10e48693c6c691d7b0904e67910e9462cd554ab9b4b024
+EBUILD autoconf-2.13-r1.ebuild 1429 BLAKE2B 9dfa55512c3ba137bb6a7448a9a8838d56041694784803c592758890cff0912376c0687ef30016c03847a3c111e0323ca735468137eda9f69a08bca9ae3d3227 SHA512 4bf118fb1fd07b94e27590662bf486de71f612d438abef8866338dec278476b4ff1d4a3efb3d4d31480c05e8b6ec87844f3c1b82791a76f01495629c4885f98b
 EBUILD autoconf-2.64-r1.ebuild 648 BLAKE2B 02c8390b16a7efe5900562658ec4797d21a8958f4eb40874104928b9eb256c3a50e0d1a7f5de24f2c71f6343c50149049f184f3d1d3ae2aea75444aeb4f42c50 SHA512 7d101553e2175ccdda97570402dad92ae6ae8224aa95549e035fea6fa15347e2ae3a2cf7f74a119e1c70bf7685bf3dfa46b394611b700f850268c8d99a3a88e0
 EBUILD autoconf-2.69-r5.ebuild 1820 BLAKE2B 3b103cb825ca98cb30cc358029a99f91121ed5dddd29a6ce1d4496c6be41cfa9c6175ad6ffda44e7dad54ae54db51df774ba68a4138210dc8d0d64f8b1bd5241 SHA512 eb60a3e852d5ed3722ad3d03405cba0eb9840d056af86039078426b687ef34522ea8b8090645a56502e4afd0095e1faa4305474901890b72bf6ec00aaeb38835
 EBUILD autoconf-2.71-r1.ebuild 2129 BLAKE2B 5d6e2e3297569338a31cafa98c9b7e5f640642732786e8bd239330edb9b07fec5847278a131e8e2198be06924874edcf651825d7f9d75d260011a4e77529ce42 SHA512 5cb7e35d1387a4e1cfc6c1eb1dfe73affb2cc7a81d624694a9fe4a03af597d5fc1ee33ad93f9fec16c5a5cb8e49c5424dc9ab7a606a7f32e084788e455119686
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 51e415706fdb..64ebbe280198 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
 	=sys-devel/m4-1.4*
@@ -40,10 +39,8 @@ src_configure() {
 	# 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.
-	local prepend=""
-	use userland_BSD && prepend="g"
-	ac_cv_path_M4="${prepend}m4" \
-	ac_cv_prog_AWK="${prepend}awk" \
+	ac_cv_path_M4="m4" \
+	ac_cv_prog_AWK="awk" \
 	LC_ALL=C \
 	econf \
 		--exec-prefix="${EPREFIX}"/usr \
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d3b40e472a54..61550df90789 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,12 +17,12 @@ DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a5
 DIST binutils-2.37_p1-patches-0.tar.xz 1392 BLAKE2B 128930a381022fea5d1fcb0695953e8dada2513b088b8540fe08d4e0da93ec18b6bf9c78acad6ec5a8982ae2c115d143462ef0bb7bfd63cfeb06c10ad472c2f8 SHA512 44666821f96349e96685ffcfd53a80a94659e38fc63eeeb980d0eed13aab03ae3e2d5059b4932cd9018f2f7698cdb5e15b443d60c01b2bd1385eeb0c698e0e24
 DIST binutils-2.37_p1-patches-1.tar.xz 28956 BLAKE2B 3bc14fcc52a6d11992ad9ed88fa3347ca3d5facd59de094a178a5f720d0eed6297dadf9a8fea7189076eb81274612c0b71c01f15a8f58deeaed8c8f6135ef50d SHA512 f6b2a09bfc692cf90f6cd56be81f424a68831db48054dc150eb6ec28bfa18d35933203c2d3b502f0c80e38771353c373446aec2488469fe2df20d8066033f59e
 DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28
-EBUILD binutils-2.32-r2.ebuild 11940 BLAKE2B 49b0ad2f630a8918afb5935685cc7d48598bd68bc06fbcc4e6581cfa79292b26c655cc29c044d593111981c79132f1561eb110f20a53878f4f8d35c4283e0259 SHA512 f910aef956f00297ec0bb3765b4b3828064303ab7388a8a03d095d874ef0acdd2ebd379db369a16ae2ce6bbf68f9d99cb50243ce20b3ba542145365dcd33b92d
-EBUILD binutils-2.33.1-r1.ebuild 11676 BLAKE2B 87436ee3cc0e66c5115800d08f7cc2f4bc6851a49a038c155588e8154d582fbc342737204ad7db9c1128453f8a1ab50580f1ac50a0f90818de89a65cdc6f193e SHA512 bfb2d85e5a6c84a1cabf392cc9d5a67a7d7a22c5e364b27bec783477436d73a0894845a588de4e4e7ec78f4cad5ca896cf576e302aa7688ccf4a9aa510321c5e
-EBUILD binutils-2.34-r2.ebuild 11772 BLAKE2B 57f1301428b0f5829642c2da696f2b94d9a724bd3f286a933bbbe6801e44ecff62b1317efae14459d1bcd26b678b9987a05963afcd8c978f0e35d7c9dfab2dcd SHA512 35392a4390388b1e96b25fba1df5bf172c2d30cbf64a6b8437580c77a6937707923fb0132d5de158e05719cbdb7306cef0cf2935d467860fa99c56d620d34af0
-EBUILD binutils-2.35.2.ebuild 12653 BLAKE2B 757b66f97d2815bbab5305584da5bfdf16c40bbe3ee97184663f7c97e582c84cb6f26b9958af1dfb34b6580dc9ddc83e3060469842c2594715e767df47aab134 SHA512 278a9f3eefbbac6873314199685486bf7a4525588abc477474b54cca52041088dedc08806459014997c185e7fe446b2005a9a49f8c13380a130feafe684927c0
-EBUILD binutils-2.36.1-r2.ebuild 12555 BLAKE2B d49beac34dfab315a66da81a1b10d1fa2a2da410f4ed80d520df644ed5ca935eac98b9776209098d57bb4de5210945b29e36d316fb5bc05ad2d42481f09f0aeb SHA512 98297799b7aa2d6b68b390221f7220e746790cb19355082d1c3a78735ec579fd5a181513e9d317119dc01494260994d4da2ff0bf0fc45451550c26124b0dbaec
-EBUILD binutils-2.37_p1-r1.ebuild 12895 BLAKE2B 977c4cac38f111130c1337cc77a2cd1522b1ca87297f294df41f641dcfd4fa71aacd7c8572e5376eba975c4fba6a49d90166265e210b25891e4d18ed4e93be2f SHA512 a96bd01f81eb670843d28b9f79bca83ee28500f0850166ee51fc8bd81336fb49a6132a76af9b09f48c411026ec4364c57d3c24eba661db5c5df5f30f96f81839
-EBUILD binutils-2.37_p1.ebuild 12841 BLAKE2B d727eafc9ea10c3e7d1b1dfc45cf24548ee2a008b1ef7259b4abcf3555244c851977c603550b37a9978e44ed9a6dbf275b2ab5b52dd4701bd0c05edd312f185d SHA512 9e764751d8ee44005846c8176d1dff10696e24e97c31454c29955460517067d68c5ac9b90e62bc94cb69379c551f60850d0e519d9ca4297f45bd71742dc0f9f9
-EBUILD binutils-9999.ebuild 12911 BLAKE2B 928d1313680636c79d9edda0b5f233187ff66f70b3a46cd2b7536db68ed425aee027b9267a0695e3884039ead515548922885951be053b23e882d6b4783e897a SHA512 5005ffc4286813de39849a27bb0c3dee12b6c6e24b925b363f804a7c9e9fd9a4d01480365457cda379afda8c1f5c5c3424c16bd053a14e24af77d67af3e00510
+EBUILD binutils-2.32-r2.ebuild 11938 BLAKE2B 428c753cea3114b7989cc4f23ceff28a021087d07fda9a268a183c5ce89bb7043cefd4379e767115a67354231231668ff79f6c032e5f2c01b990f67bf04c1ccc SHA512 c42dccb27be0ce260d3f1b0e7e59dad7b8de3c95c4c6344ae7007018236255b81c8e36fc75e29888d4bd6ff99c51d9ef44f77ee15cfdebec4fd9e83a5fa5fc69
+EBUILD binutils-2.33.1-r1.ebuild 11674 BLAKE2B fb92231ebf9e3b39d7ccaece8d77053670e76885c0081fa9de93bdc79743c150570325fe157d2906d63a313d515917a4c75ee120082a16c3a6569bb1835165c9 SHA512 f773a86401ded701a46c75ad939537dc429678163a86e55fd7362bd7e95ce196214c34cde070f093f41716d29cf1e581b928c6d6c442bb52666d5e8311486997
+EBUILD binutils-2.34-r2.ebuild 11770 BLAKE2B 7cb3c8bbeb0ae93677d13f8c036a8886e2d5c18263492f6cd3e56479585a4981e097e091458042941ccf0f04cf1221cf51361bde6152d45e3a78c7b9226da570 SHA512 14019b84833a7a626c225174da50efb6537f1e1423614592cb8702015bc201132ef29959d5bf888b54dcda8056317b37ad4000c517b716be78d773ced522e03b
+EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39cd62ffc686982598a8041b6bda0358ab39fcf4cfdd6fda3b444859db97c39a50971032008dbd982301e1afff94b41 SHA512 6c6820a8206cb8cf5d4df8e1c1e5448e0a3ba77ab067bc49525787beadad464aef27fb04debbfde4720a3a44b02a4206fd4b3c4d18eb19428a7d98254753fd05
+EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
+EBUILD binutils-2.37_p1-r1.ebuild 12893 BLAKE2B 55fb00ec7c769b8675fd33e8ac5887681c9ee974eddcf1274172d4578b851d42f1fbe32ef7fae1343b56e90250a3a4cd16181b8432e910568929e500d14c5c2e SHA512 5d635a9ed125e047dfda42f2f5bfc13ef633be8bc0c8aef64bb920beceac809d7f767f5aa928547226642db545292aa3165d44d0d9680cdcda3b47496e934e88
+EBUILD binutils-2.37_p1.ebuild 12839 BLAKE2B 6ddb1dd33f47b27784bde21981e8ab8fd70499660a22ff09383c501007e92336ffa07355325c9eab1aa729fa6cd058e1eccc0937ca69a7ee4f93183ff79ac7f7 SHA512 59949998a9d1ba991839262e8e48c5178c24df1b74d66b2556766f3afe53c1ac041dcb5058b5c09508e9cb97d33f06b3c3357446039c6a9806e1c0cbfb3a1099
+EBUILD binutils-9999.ebuild 12909 BLAKE2B fbf051ba26d9e2ebf14c5f9ad672d0cf770e8e4c87e3f3f30d79ea0b43338fcbe3aacdf64b0168a6da53c0fa183a37837d671ab4ecac4b21dc48bdd7b371a8c2 SHA512 165b1233f1941cd939c2fcefec316cafe2feab5fbf1358bc6eaf6d475b636e397b21a65ca7871dc8f5fefc90c7cdf5081ec566db724b567211bd8548606e3c0c
 MISC metadata.xml 727 BLAKE2B 4ee6dbcec8f8ec7e5fe028344dcad9689e6d4edd1871a4b9f6b28952edafa2dd41df7e03f3a72d3fcf5853a791f7a77a5aa08108d24ae9589e7c0c98b564ddad SHA512 999c1f33f4a25ab6b8e1ede0862e9ad849dd44366236914f2558cc9377336d49989e592973625d9833ad238645e918d7341817e2170ff6a6029b40f7addb775c
diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
index 0af482adee3a..40db4705c2a9 100644
--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -97,7 +97,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
+	if [[ -n ${PATCH_VER} ]] ; then
 		# Use upstream patch to enable development mode
 		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
 
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
index 65720a202f5d..785ea17b6542 100644
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -93,7 +93,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
+	if [[ -n ${PATCH_VER} ]] ; then
 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index e6087c134ba8..c61503139101 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -90,7 +90,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
+	if [[ -n ${PATCH_VER} ]] ; then
 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
 		eapply "${WORKDIR}/patch"/*.patch
 	fi
diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild
index f894e07dec7f..cdb4d4b87ec3 100644
--- a/sys-devel/binutils/binutils-2.35.2.ebuild
+++ b/sys-devel/binutils/binutils-2.35.2.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
 	fi
 
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
 		if ! use vanilla; then
 			einfo "Applying binutils patchset ${patchsetname}"
 			eapply "${WORKDIR}/patch"
diff --git a/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
index c1e7c2faf584..faa27e272c6c 100644
--- a/sys-devel/binutils/binutils-2.36.1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
 	fi
 
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
 		if ! use vanilla; then
 			einfo "Applying binutils patchset ${patchsetname}"
 			eapply "${WORKDIR}/patch"
diff --git a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
index 93c7ccdee616..2333d6b11deb 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
@@ -105,7 +105,7 @@ src_prepare() {
 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
 	fi
 
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
 		if ! use vanilla; then
 			einfo "Applying binutils patchset ${patchsetname}"
 			eapply "${WORKDIR}/patch"
diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild
index d9eb8d68712e..7bac92e076f5 100644
--- a/sys-devel/binutils/binutils-2.37_p1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
 	fi
 
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
 		if ! use vanilla; then
 			einfo "Applying binutils patchset ${patchsetname}"
 			eapply "${WORKDIR}/patch"
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index d3789f18d809..2609713b2a04 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
 	fi
 
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
 		if ! use vanilla; then
 			einfo "Applying binutils patchset ${patchsetname}"
 			eapply "${WORKDIR}/patch"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 350d57265d44..6a97639378cf 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -10,10 +10,10 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
-EBUILD clang-11.1.0.ebuild 11781 BLAKE2B e23c30f931cd121b8cc56687faa5900cacc71699a53b06ad2a9daa139537c9fb98bb2b1a0e9ab0dd997299f4afb013187e6f68e93942a0015a223332186ae082 SHA512 ce653ca4ebf0283e2ef9008d0781841a422703f81a9b6eaae61229a203fd65d6ee8ea58c577c5a917f8385c127ab246585b8576838d0e3c28d57afed834c7917
-EBUILD clang-12.0.1.ebuild 11934 BLAKE2B 475676d2f39c8fd4943613f38d370c38e54003843b3b9d66a36a8d922e61e284270ad0ce418e5654e3d68836e3e5a2da18f7632e6b7c69efb006ccf24cc1d04b SHA512 a0e45bb854a63cd79d10971d43c80a9db61b2841f0ff7d2ea74d4032ddd7cee1aa6cc46ab3774373310e005924fc92fe45ba0cd0dd2a3fbbd320bc4f2a7685b6
-EBUILD clang-13.0.0.ebuild 11496 BLAKE2B 8f13ce96f6a736a5877b7ac01ca2b6dfe1584f33cfbb104b97a1662eaedd4cc1fc90ee9827303e3aa88e1fffd8733d07b005bf71bf318c577c8cbf7abc499f1a SHA512 0b4823110e8ae21b02216069a071ae0d299a02f1903ea97b9fcaba70bb47c243b31aa2fdc80977ad15180e9a054a79e01be7578363386122b73fb250baecbdc1
-EBUILD clang-13.0.1.9999.ebuild 11432 BLAKE2B de320c8dbe6cb5370445de891b152527985d9f1c7b95c7b2f9c05a52992379313494710e2de6d0efa6875d83c7ea0b9b78d7934fa56c23e5c4aabe03370425f7 SHA512 37670f1a64b7397c2548f13d0bb82190b8c13e8c9fe051baafbe04408ae14d8a5925db0e330498e2d4badc1a1e3e0b90792a802032038c6f3b4d1bce114d91e3
-EBUILD clang-13.0.1_rc1.ebuild 11438 BLAKE2B 57732231a9c7aba72a4226e21baa8385b217a57a3820d5ac4214a4a8887bd8d79e981dbd9cdb98e580ed1ecb35f4a7213a9ce3a2051b8f14b86c6346248b93d5 SHA512 3809e39542c449a1171e69afb91afbe0c2e69220584f55ec307c51d3290903497fd97a21ed044d4699f087a70df71a185a4747514896e2c1241c2b369b065d1c
-EBUILD clang-14.0.0.9999.ebuild 11482 BLAKE2B 72fbcc1554a11a7425658adb293a2cebe78cba415739d958af3b466f22f8c13294f69d3369301f1e45d06a020dda7f61fb7d3f7b6fc0c34fc6300fe97609a811 SHA512 cc4f6effcca92a09f949a490e786519dde1a9b6d84af48c78603a5888bc82c0a846a9adc74c5a31363dc8d29d4b104cb2f838e58d8e13df7fad5f98f8f060cfd
+EBUILD clang-11.1.0.ebuild 11573 BLAKE2B adb4fc733f04605c63c711d3b9c9ce3358108efd013bcda58fe776dd5be0f978475dc686bfa2ca1c22bece3e13f60e412e33ebcd907e1e08d27932e254f6996a SHA512 a6fe29ca8c599f022147aae1fe8c0af8aacf33de2f02c19c9850bc06147f968cb579070c2a6763615cf04740c131719e17495b07b8f2ba9d32874587a2e20784
+EBUILD clang-12.0.1.ebuild 11726 BLAKE2B 2dca51da0a8683bac8cf7b0d3a45cbe97e829b6699b25c477245fa7c891b899ae2cdc40a0e628f4f3830fb18bfeb2ce5b9493651c6498c841986018f5ded69b6 SHA512 c7e81f72c28ea11e698ecfab7bc3075002503105df65d938a87079b1d28ced24dbce23fdb9acfbc7c2972d9dca69205f102635f5cba62110c02c8ac8bc8b8764
+EBUILD clang-13.0.0.ebuild 11288 BLAKE2B 6a49d6681c081e713e17679ea3ae1d87ee98a3229426a0f3e6d481c1a8fb78a00d267402687373ffcab3c48b4b8888fb8509779cb118ff63d4cb2f10306439e7 SHA512 e17c03e45d1c522e837e76f3ef5ebbbf6ec91c4b248cd874e4b0fe1dbb2f3ee4264fd318ebabb4d466929bd4f087922609356d3212ce696741e98faa2fd9ee47
+EBUILD clang-13.0.1.9999.ebuild 11224 BLAKE2B c5769810a83527aa2270af32f4e3e9dbc605ee91d7e21084b0987cb64f173166c4d3d9bdbbc664f15c0be201e79150274e3ff0fac257bf3dd024d643259783a8 SHA512 45fdaf62140809b0818862eb820bcbb43c40dd2d8072ca843c6b1b794752b21c6455cc4a46bc1bbabe3f2ccfdfea3a0d2ea8e04be5169501a372cb9459ffcde6
+EBUILD clang-13.0.1_rc1.ebuild 11230 BLAKE2B bee3039166543ec9a18a92335d2cc68acbba871cee649451f5c09a27770c1df2f5347db129cd6a5168532f13f7ec429a86212441b5254ae4e295ff7a5ac3015c SHA512 944bdb05787ef37347d223963e97f69e46350304927715ae51e90325e58184efa66d05ab901babc01acf2ffcaac987c7d7455d443ca520994859dde396aa6303
+EBUILD clang-14.0.0.9999.ebuild 11274 BLAKE2B 566f200c0b119de45cb0a4802d8dafb79188ed35e31d604594cc9d2d6ecc86642ead18c3ee945a746f5efe994c437d0d087b76c4ce031dc954c5db0d7fd575ee SHA512 035f6e47bfc469916da71047c8af3877fcbc727cfb2e68ffb159906327d6f4bd94d99bda62f04051205102fed002d43cafbdea3029a894023586be2366f5849d
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-11.1.0.ebuild b/sys-devel/clang/clang-11.1.0.ebuild
index 844348ccef0f..70f90cdc03ee 100644
--- a/sys-devel/clang/clang-11.1.0.ebuild
+++ b/sys-devel/clang/clang-11.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc +static-analyzer test xml ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -383,11 +383,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT%/*}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/clang/clang-12.0.1.ebuild b/sys-devel/clang/clang-12.0.1.ebuild
index b3ddd17937e3..e4b38d294772 100644
--- a/sys-devel/clang/clang-12.0.1.ebuild
+++ b/sys-devel/clang/clang-12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+	doc llvm-libunwind +static-analyzer test xml ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -387,11 +387,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/clang/clang-13.0.0.ebuild b/sys-devel/clang/clang-13.0.0.ebuild
index 707bb762d95f..5aeac025e36c 100644
--- a/sys-devel/clang/clang-13.0.0.ebuild
+++ b/sys-devel/clang/clang-13.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+	doc llvm-libunwind +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -376,11 +376,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/clang/clang-13.0.1.9999.ebuild b/sys-devel/clang/clang-13.0.1.9999.ebuild
index 0a01ce5254cf..c9cdf6cd226b 100644
--- a/sys-devel/clang/clang-13.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-13.0.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+	doc llvm-libunwind +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -377,11 +377,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/clang/clang-13.0.1_rc1.ebuild b/sys-devel/clang/clang-13.0.1_rc1.ebuild
index 6d0789546970..cf79f953833e 100644
--- a/sys-devel/clang/clang-13.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-13.0.1_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+	doc llvm-libunwind +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -377,11 +377,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
index 26a32f2542ff..1de9a1a3a542 100644
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+	doc llvm-libunwind +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -378,11 +378,6 @@ src_install() {
 				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
 		done
 	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 4d204be62467..a64cc6872324 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
 DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83
 EBUILD gcc-config-2.4.ebuild 1248 BLAKE2B f37d9bc45e4b934ff696719aa437076c514f477b2eced5f1c2c46c71145c072be1be89aa8396c6495d2e8a914c60567d3ad2fe7a89bbdd2c3b2af70e440a6b87 SHA512 89646c3f10a395dd703bed306b64ba19920b82513aec1d88d450c839a1b34e39d839f3296d97a37e76d8f60612b9480a1133f8424813bf78ab9abcf55e392b5f
-EBUILD gcc-config-2.5-r1.ebuild 1666 BLAKE2B a400214c0eb8a0d053ce6c9e7fa23f5688e2641bef426b6ecde1c015804f2dbb75fc480750b71e4f12cbd85155244ba01d6f825226d986c680858c5ac39fa45a SHA512 81c207ef97555f186e21121a8692943de8711cc232a688c3cc0a061b5f1172cd90191a5b72dba190f234817eb8ee837debe519f7bac2aaeb81b22620f95962a9
+EBUILD gcc-config-2.5-r1.ebuild 1664 BLAKE2B f6559df4ea1a175e3fdfc8ccf2010201e333ddb178070c40579fa721c4f24d6b717b69b7d168e763b8d028d64585fe08b437aaff9def81d1d461332da4c39423 SHA512 5cbc042b4c59cad71985d67080072c9275ca88009a36ed19eacccb37c8309db1cbe38bf428301d7e7722f2ffa7657be5662e2a5d354dd060ae3315bc93b0b468
 EBUILD gcc-config-9999.ebuild 1672 BLAKE2B cef3f7b2430791ec1947ccdb3bff48697789d7f7d855b2e76030e11a6f1cbf8325c77794cbda9c02e2f406e31df1014536566b3a9b8e54778491b2ad765ebbc4 SHA512 412e883870259486d752f1285cabfe0538cae24c61bf8d6137af93e04c6dec042104ddf99ae1b61bf064801bc1aabae83a257dd981634a2fbc71e67af52f01fb
 MISC metadata.xml 533 BLAKE2B 09d7ad23670553dc578f92d35dddd92b9421d7ef75e8920498bb16e451cce64a626a7479ece4c1ae1f8d7b67b5cd79c7033d0cf87cd48a788639b6f746fda5cc SHA512 ce12b8cbbe543ee3a1f51cd06c577ec5e99f48863445053858f36ae50ea68e1100da598dd44cef787de0cce8ad392350f95e7fd9071b70aa488a0d31cce7e22c
diff --git a/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
index e774fc29e7bc..6d93f7de87f9 100644
--- a/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9577cdfc54a7..22aa36abf84a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,7 +13,6 @@ DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa26
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
 DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
-DIST gcc-12.0.0-patches-2.tar.bz2 11564 BLAKE2B 5954ee8dd5edb30ecde54275d9ffd4d2f5671de82fe7789688d1220b181fbcdeed3d5305858d8af1fd016e627687ca6f2ebc76bb6b49e9b903e8d63c3de2baea SHA512 6299a1f46fc3f29934db7af20651c0c3e1266bef89b222fc9e3bc6a7e7cd2869301c5b227a4105157456474ae8a626ec550c15971bceb2f844476a9f5bc56284
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
@@ -27,9 +26,9 @@ EBUILD gcc-10.3.0-r2.ebuild 473 BLAKE2B c9061341ddfa8d143fed0ac5794db4a872527f47
 EBUILD gcc-10.3.1_p20211126.ebuild 524 BLAKE2B 5336b4951c7a7a8ce88f03bd6d56118a244fdc23ed11d6925c901f4516f7a6a3b9ef8bc6df601b5dd7fbb1a2d3df82cf596c46af164528366cc6a0055de2f6eb SHA512 7f0b6c7bff11e5dcca4d6c247be9c901612dd116c25978bcf9093d32d46241ce50e2d4ad178f83261f97e26228249a2ad7def4367db607caa8f138db46351910
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
 EBUILD gcc-11.2.0.ebuild 466 BLAKE2B 9897dc608217b7fbfd44fc14446638d23f18c0516a19b73e317aaeb328f82ea89452bf93888628a7d22d0892f6ca0a959cfc6e620a5afb9b8ee7063a4a6a173d SHA512 425b789e1c7f495b2581e9aa6a435fa7c1c23b0e167c44e81451ef2e7896b35bdbe9772bdff7b78c9deb0e4f6357f956f28151072b35fbb233ec5f9e771bf458
-EBUILD gcc-11.2.1_p20211127.ebuild 517 BLAKE2B 2973b22de421d640bd01d6c3a7bd3144dc975ef28a930e30e2632bfd5392c1277da3e70af8dd90484273e0b20975eebe85de79abbe8ccdbfd4553d08900d998e SHA512 441265bace96793569c96f9dc154f16b774a27d1a2cfa25d8a0036ba91908d2d9cb002991bb031560bd9090c3b74e19047a95abb54c960d48edaad14775ecfcb
-EBUILD gcc-11.2.1_pre9999.ebuild 527 BLAKE2B 69ad8ded1819b6b584ddac3ad639750d5d13f465854bf88093d0a48f5f83f5919ff66014ff0ae67167e88d3282cb108291a0ffe86147f7f505396c77a887a017 SHA512 0011d0d43953cbcd1afa201005f52bc13bedffeab1a45469d6d7b60e2e04343b1a4385dd8bf684e442858ab80b314aa849184e3353e0e3adf44839c3753de4ad
-EBUILD gcc-12.0.0_pre9999.ebuild 367 BLAKE2B f4d4fae47ad12381f9f25e4c97964d7a155f7b1c186a324c8c96109559da063f5f568a168e32a078e1afe39bfa786260a7a3785bfed648c68156fe14ad3bce56 SHA512 2a4e545ba1ee6f16f0301a367097b0253dd9f786873b45b31be2b0284605dbb9bc8d6c34d4f0a2d7825e92fa6c8fcedca4b680e1cb7d4446574c0d993c8918c9
+EBUILD gcc-11.2.1_p20211127.ebuild 777 BLAKE2B bc729fc7cda621c2ad6335d8c26c7684e95d59d4ad5854047c887590771c5fafd13fe0f1608651ca3bace1b6ccd151d1dfd6c489ffde7b420a135f795fba6fcb SHA512 ecec9ab3d4fa2b9e9ccd85a34fd9cf29dbfd086a5de450e2eb3a0bc286873197ec8257a1f92a965865e7a07dd35b7c7af18c56eda88c5ac61754e5f942fed5a1
+EBUILD gcc-11.2.1_pre9999.ebuild 916 BLAKE2B 7d4536513bc200681534568a22efc5a06cb8b246f775b7465034c47f43a0dcd0f25a4ebff9ca67c47425fe6d1528918afc00e36b2b60ce87c0163fc8b552c9db SHA512 d2c88b671880e600b867f25eb9b7ae0e5c0df748d1171ec8f28a3a661974a8b4145ffd2ad004480fbfa6217ceeb3933ca4af9d9da91eb24c7fcab822466e22c6
+EBUILD gcc-12.0.0_pre9999.ebuild 853 BLAKE2B 6520c289987f8be0fe391f9262bb35b3ea09e8649d18ec8c7ab6c990c282cdb0d2e952ed3b142f4629ec9e0dcd759936261917a03853888604fde009d818f17a SHA512 1796e67b502b6ca9ff2c9ea76171ab8002badd83dc2f6ef7f09057ae9b1ca9135b6163dd651a621fd499d00201aca2f29a3aa8482118ced360b543f344fc1be8
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
 EBUILD gcc-8.5.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
index 8450a6540338..cf332f7e6ce2 100644
--- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
+++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
@@ -12,8 +12,12 @@ inherit toolchain
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
+# 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[cet(-)?]"
 
 src_prepare() {
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
index 500dca96a088..b17d87e21b4f 100644
--- a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PATCH_GCC_VER="11.2.0"
-PATCH_VER="1"
+PATCH_VER="3"
+PATCH_GCC_VER="11.3.0"
+MUSL_VER="1"
+MUSL_GCC_VER="11.2.0"
 
 inherit toolchain
 
-# Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
+# 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[cet(-)?]"
 
 src_prepare() {
 	local p upstreamed_patches=(
@@ -23,4 +28,11 @@ src_prepare() {
 	done
 
 	toolchain_src_prepare
+
+	if tc-is-cross-compiler ; then
+		# bug #803371
+		eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch
+	fi
+
+	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index e8889dee6ccd..3571c4605330 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -1,17 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=7
 
-PATCH_GCC_VER="12.0.0"
-PATCH_VER="2"
+PATCH_VER="3"
+PATCH_GCC_VER="11.3.0"
+MUSL_VER="1"
+MUSL_GCC_VER="11.2.0"
 
+EGIT_BRANCH=master
 inherit toolchain
 
 # Don't keyword live ebuilds
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
-EGIT_BRANCH=master
+# 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[cet(-)?]"
+
+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
 
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
+	eapply_user
+}
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index ef509e7d3e6d..5dceb4760d53 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -5,9 +5,15 @@ DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c8353
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
+DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
+DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
+DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
+DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
 EBUILD kgcc64-10.3.0.ebuild 977 BLAKE2B 3aaeff6ba1015f1b59edb16080d21dac13f6714a62747e2b9dee4883899134fe6b7c4b64addc4c04b89c17ccfca093e8d713c5c13bd90c26987b3634d085b2af SHA512 f06028f32cb4febfb78d567c8070648d8f511ee5f3f68a5e0a38830aaab24c9c6cc60a406b7ff797f26536dd58f2fe5089ab1d8382e855fab83be1ffcb44416e
 EBUILD kgcc64-11.1.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
+EBUILD kgcc64-11.2.0.ebuild 978 BLAKE2B 4ac0242d3750c8c36c4a81ae21dc63bc92bd340774d12094cb943bdc5b0888e50d273a46732807eaa36d25a6d80f06d310bf36e3fddf673464040520e43a3383 SHA512 bfdbd013c43abb2cbf3b18191e70441aca73ba87263c2cc1aecd5d880d570fb3cf8a31b46fea3a6503259af846e2710ae7c2a99e31ecff1c8df122c9d596118a
 EBUILD kgcc64-9.3.0-r2.ebuild 977 BLAKE2B 2e96cd95ee42508f3b2889fdf679233523897c1800c8a64eaccb1bf2fe9a600d585b78d9f1b4dd225a083923e1f90f208e6eff82475ce2a0da3ef792be5a9d18 SHA512 ff5328502339d065bf38686cd77506e654819331d4c59eb84e8d46d0d9c0a1abd2c024b9e2e908da1552931b21cc04dbce8ea9fc1d1ba0de5e6d1a5573ac378c
+EBUILD kgcc64-9.4.0.ebuild 978 BLAKE2B 4ac0242d3750c8c36c4a81ae21dc63bc92bd340774d12094cb943bdc5b0888e50d273a46732807eaa36d25a6d80f06d310bf36e3fddf673464040520e43a3383 SHA512 bfdbd013c43abb2cbf3b18191e70441aca73ba87263c2cc1aecd5d880d570fb3cf8a31b46fea3a6503259af846e2710ae7c2a99e31ecff1c8df122c9d596118a
 MISC metadata.xml 268 BLAKE2B 8482f168e8ebdc914b137d3b41df6840c3478b8898d5278c5d43742538d0edb403505d66583f44b142b094f8735777d79637b69b6fcb3b7cd7026e415eb48e58 SHA512 433cd6a955f0104f3767d50ab08e08e79c8ca4276a56c2cd284692472cf5f19918d1ff22539eedf0232224193c15d6c84198c95647ed390f2b520d05211de721
diff --git a/sys-devel/kgcc64/kgcc64-11.2.0.ebuild b/sys-devel/kgcc64/kgcc64-11.2.0.ebuild
new file mode 100644
index 000000000000..e6b50adde92e
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-11.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-9.4.0.ebuild b/sys-devel/kgcc64/kgcc64-9.4.0.ebuild
new file mode 100644
index 000000000000..e6b50adde92e
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d965cbf6ff17..ddf4f04e098a 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,10 +10,10 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
-EBUILD llvm-11.1.0.ebuild 12505 BLAKE2B 180cee21c2a2797ba77ab078aca29e603992a65f77f6d570da33491843a64a864cca20997aff674b1c8dc03d7a1bab317ce43c6640f3d627df32d8087ab173b0 SHA512 88984b684b403e4ee5bb6696b4e6b04f1d66ef80fdb867f8809a617d941920cba4df1224f9d79c7ccb65614b2bb9141710f87f87c5773f35219740ed25ded51c
-EBUILD llvm-12.0.1.ebuild 12621 BLAKE2B 5e5351a80d5229a7a357c788271c30d5d0ea63e982b5ca808fa81dda85f73f39f376badcc9418cc63b83fd82067c52d399c85ee726da86622084c22a09c13729 SHA512 9cb100f28d9e63e81afec91cf937e9e6a2989972fb5cfdbbeaa4cf34e2c46a917b6c1255ac20fa7f735e9ac9af70d444b19ed371c1cabf2644afaf84ea78c8b6
-EBUILD llvm-13.0.0.ebuild 12187 BLAKE2B 8c22021c580fa0cd5fb28a4b1d2384627774e24a37a398d0c9eb008ce0951a797a7a9404031c69f845dc7f764387ea6183e20cefe9f27cd7e7372aa5a682d7c5 SHA512 381d29cd899dbe86a6a4f6fd78e7fee2d583d2f6b92a2767f3583f9953e9b85e617eec1abb8ebff48bab65f0cdcfb95b5232769c580351ead82619a689c39df5
-EBUILD llvm-13.0.1.9999.ebuild 12164 BLAKE2B 25e4f6bd720a1c1546eec4368f37c6a25c9c8cffb15745c2ebcbcf4e7808b4376495c288e553be85850f7bdb203893487fb3d63ab209be670b821d0f61e8f1ac SHA512 ba07d30a8b29c4ad075632a3bd32bb565d49edd74a5ea243c1475c2a8fef2aa287c2c9d1bcd71dc10e247404cc47b5f35af72825ff4902a2d9cac46186adcd15
-EBUILD llvm-13.0.1_rc1.ebuild 12167 BLAKE2B 255c9511db2b71aec24ca782c4e336b6470f7868a86fdd31184bb3bd12ff22e05a9c9492c4b490e24dcfa1fa79d4f8fa802eb9b3bf5d01f5a2847e8c4aa3dee3 SHA512 e64411b7389da1789b98a52eafcdf3eb9dd21777c938e4caf73735d7419cfc7bad754b7d1594311e31bbd62147852746c89db85efc4b814642c818a4eef6e72f
-EBUILD llvm-14.0.0.9999.ebuild 12176 BLAKE2B ebbe9b9d91cdf4071cf5b6376c686f65b9d2d7656c54fd04020f2f1465f834a96dc0562e39d79cdf256097fae26027f5f800237a25c9f639aec14cf9a2e37f96 SHA512 ec947a833b901487cf5c1b68ed82dbf70b8450d5eaffcfa7df8a27ae74e8b1730959013ed19d5788130c35dfabee619948c43df48fb6fdf4e5ae2fc0c218e6cf
+EBUILD llvm-11.1.0.ebuild 12490 BLAKE2B 17ec5620c4b1d155deb6a2b14dc49c6a439dc595b457b73d2e3f112fc913d6b7eb475b34284bd61a1bc7f8771069e54dff2a4888b762a43b3b62acd9c7b5abbe SHA512 f918a32bb9417186d127910d12766613554eff3127f50f4b4d7824ecb4b87ae9139fe8a30bf4a3779168dd10565869ee674c943b32c7b49762848ae3d2cf26f1
+EBUILD llvm-12.0.1.ebuild 12606 BLAKE2B 58c112a32620c890d2c7d88d8d6d8fcac961adad27033d23bb78b3b2e68497fddb9c0be1400c318ccc95a0d54a4aedaee1130fa45a389a98b2c00d29cfe60905 SHA512 283685e0186ccf6bcf40ce96165fe6ff52fdeed156da4d87f760c9c4ed5dffdee143a72363e133941898b2ebe5ef78359051b7af4bf138620cb207a19beae9b2
+EBUILD llvm-13.0.0.ebuild 12172 BLAKE2B 45cd85048de3487a9d9274031fdffd33956df69b1050563017f0a183ea76a44c1f62f588d715496ff121e07412ef8d4c7a723830494f59fff12700120793deb1 SHA512 3c180cdd684326a8dcf4ce2c1f3ce8dede7f31e534d2526ba7da539b42626057ab06acd2597735f91ee569bcada637e3ecbd868d53fcc18f19356f93d074ea54
+EBUILD llvm-13.0.1.9999.ebuild 12149 BLAKE2B 7cc44ed170ebcfb1fdda7be1380c80b7c59888e24ebe860beb935fba820c4473b49461f19545a123b3e7c598cca7c0541620bce754930c2733b833bb50a3b7c7 SHA512 c8637e532ba07e00afe72df782c8a41289d352cbd904e05a6503a56199ac4d51d913c172958e008654356da800767df55aeaeac0ff06e9bfeda350cd3bc29a84
+EBUILD llvm-13.0.1_rc1.ebuild 12152 BLAKE2B ef0e60da0b7875e2347cb7e12f6f0fe221ec03fc3af9b1e2d91a06220fda1136315150db3e61c95286544f510ee02cd09e6f4602afad081dedc4ee4794951376 SHA512 4df2950d660acf15eb63e9680903f4c81175f1a7910fa89c73260a5e95b235c8b74cd4eb2d4ad2c695c1fc2290241c7833ab12443c65fa8710318149659da3cd
+EBUILD llvm-14.0.0.9999.ebuild 12161 BLAKE2B a5a54339b16268303910d999adbebfc7360fdb8867670d0239486496df9d21d1686e7a154902709315bb677d1400d2271e338bbcf8da6e91fb9d5f2b751a84b8 SHA512 d94ccb772593db7f926dff66249d7d4bc6a8dfadf3a378c96e897f66dc12d1f40551a2a4889b40c277193949801abb6be506c9acae57c527fb050d17b61cf414
 MISC metadata.xml 2625 BLAKE2B 1017e4672b3ccd5a4f83d9df6a9db3661f548da9d75ad2c5b63e9843bfd737ff1fb64624678704f632544ac403efd8dbb35a006542023153733a6d4037b7245d SHA512 130444ec537891dc43754057c5a68666f52cb2959f351ee5be076ed41e39d49d8fafa2d0dca78d1a751b3a3190db81910b4472e75f9bad571ae42da51a5b25dd
diff --git a/sys-devel/llvm/llvm-11.1.0.ebuild b/sys-devel/llvm/llvm-11.1.0.ebuild
index 33f5e0968efe..aa2dcac73291 100644
--- a/sys-devel/llvm/llvm-11.1.0.ebuild
+++ b/sys-devel/llvm/llvm-11.1.0.ebuild
@@ -27,8 +27,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3 ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm/llvm-12.0.1.ebuild b/sys-devel/llvm/llvm-12.0.1.ebuild
index be1a91f9655c..673ce8591884 100644
--- a/sys-devel/llvm/llvm-12.0.1.ebuild
+++ b/sys-devel/llvm/llvm-12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,8 +27,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3 ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm/llvm-13.0.0.ebuild b/sys-devel/llvm/llvm-13.0.0.ebuild
index 4b33fd905852..9f6396c849a1 100644
--- a/sys-devel/llvm/llvm-13.0.0.ebuild
+++ b/sys-devel/llvm/llvm-13.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin"
+IUSE="debug doc exegesis +gold libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-devel/llvm/llvm-13.0.1.9999.ebuild b/sys-devel/llvm/llvm-13.0.1.9999.ebuild
index a12b04fb2138..789047901490 100644
--- a/sys-devel/llvm/llvm-13.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-13.0.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
-IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml
-	z3 kernel_Darwin"
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-devel/llvm/llvm-13.0.1_rc1.ebuild b/sys-devel/llvm/llvm-13.0.1_rc1.ebuild
index 16dc1da25def..f5d3be283708 100644
--- a/sys-devel/llvm/llvm-13.0.1_rc1.ebuild
+++ b/sys-devel/llvm/llvm-13.0.1_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
-IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml
-	z3 kernel_Darwin"
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-devel/llvm/llvm-14.0.0.9999.ebuild b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
index 85c62d774844..f89b54bbb6c4 100644
--- a/sys-devel/llvm/llvm-14.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
-IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml
-	z3 kernel_Darwin"
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 1c27dc81a0f9..f9f0370e6378 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -11,5 +11,5 @@ AUX patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch 860 B
 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382
 AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d691d34d38b9652a9434544db10c3e28adf412071a14b5f6e4fcb1cead5e6ec0c20f786b061c96eb3fed4d9e8744a18bb02a SHA512 626256394ca2df1fadfb6cfaaa4458b86912ba70debac88d959ce3c34d2f5791284fb2b9b38b88b3e38a50a1e0f6585f0c860a9866f27c40be4884e95d7d83f2
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
-EBUILD patch-2.7.6-r4.ebuild 1654 BLAKE2B b2dfb104feab6a203faadeaeab4926173ed4f01a701b4ec4231669beef4011a1236cf14048a67a2aff76d100bf081e3b230416e8b87c77817c525f26cf1c9903 SHA512 0fb15c878827fcb0e0a9b14552c4de2694f94d73b734aaeb37ad8c854da49f8c70632d20fe2c51c0dcc928606a251ea4777ae9a38843e0e2e256a776f1682254
+EBUILD patch-2.7.6-r4.ebuild 1603 BLAKE2B f98eeadf4d339042d5df8c3268ad141fbe8c2699099f6258a71a9ba610f50085b9248cc8dd1fe6ecf195daca95017ab9a6019967851565e831ded67ad340691f SHA512 fb991fcfee576d6c32736570263ee222fdadbc804f3f027ffc7f6d8503d13bdcfa347c0e629e350014bc789e555793bd3a1360609684154ed02214d3c55bc006
 MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index 5919bbb39640..30d831025c06 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -39,7 +39,6 @@ src_configure() {
 
 	local myeconfargs=(
 		$(use_enable xattr)
-		--program-prefix="$(use userland_BSD && echo g)"
 	)
 	# Do not let $ED mess up the search for `ed` 470210.
 	ac_cv_path_ED=$(type -P ed) \