gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /sys-devel
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
43 files changed, 122 insertions, 554 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index bac0b264a651..0679373f9a49 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 2db70b768d27..64db9e25e450 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,5 +1,4 @@
 AUX binutils-apple-8.2.1-macos-12.patch 699 BLAKE2B 877fc19bcf884372138ed4cff6f49d67af1da793615decb25ca30ddf12d0c9831335b3608f8bd1523f3a01423450b5066f6a8d7ec3516791e5b1f508acdd715d SHA512 c2457e64c609d43b84003759b9dd9b85982e09fb2613354f7c47d73c30081958b9550f1d1fd5c25ad63979782902b33a8cbdd0dbf2a4aa761a1aea1f39b3f77a
-DIST binutils-apple-patches-11.3-r1.tar.bz2 9041 BLAKE2B c881117e19e119173dd8c126859f8ebab5ff4024697c9650b8ba145c021aa6e251086d3678d80fec2672e78637a5beca795b71ae871692e832ba4e69a7a8e04c SHA512 eda63cd89f67674556dc75de719cd318f534544db50165d4faac454f67c557c9944e7e024c4443e640f987ed8c8826ccd578427743a86d7220c2ba90ed2206d4
 DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
 DIST binutils-apple-patches-5.1-r2.tar.bz2 51642 BLAKE2B 1b44020a05e0a91cfe569273f1e3dc65afaeac4bcdb80a626bdcc1f30cf8fbba6cc7bb522ece93126d4035b2d309defefd17fe0cee5bcaadcc58c4fa0feb4827 SHA512 37ba0dcae6c10b54a07c6208f6893ab80b0de1bd1c2f677902f707c8290629f7671a481e256b57a18bf304b95e41e4d59519bc1c88f15de488c0ef7e142f5cd8
@@ -7,17 +6,13 @@ DIST binutils-apple-patches-7.3-r2.tar.bz2 44551 BLAKE2B 036cd2a2e4a66b046467f29
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
-DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
 DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
-DIST dyld-551.4.tar.gz 832297 BLAKE2B e65c5b2ed90af6ec94f1295efc984404af99f0e5dc666bfc854379f13fd2e98b8048fae84b7bc8864fe27112abf12f741a33cc404b18ae7c88b7abd6a1d9e3c6 SHA512 896281c4b2330c92ed538af58f1b60906ed0a9ffa3099a5e8ef9a15b7ed974259bf546fd2ab7562739f2c8cf1fdfb44ea0ea7567092c77f2ea2cab377da064b0
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
-DIST ld64-530.tar.gz 744871 BLAKE2B 8117160ffe55c02b463559a52fcbd109629d6e2b4707f36391ec2151785cc1ab5be911129397af7bea05f06b2c718bc345a1e3b6b0838dae943f4083612af38f SHA512 0197ec05f9fbaf9e1902bb6e0819d0562573a433e0445809f1020e76126d3af57222a8e9e187fce793a5b581f825b48bfb5ec5cca9ae3eb77758cbc7f20e9e20
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
-EBUILD binutils-apple-11.3.1-r1.ebuild 12061 BLAKE2B 8ab50ea0ebec56f3fa9aa6ef3a2b550b870119054d0533a283faaf8acc34bdf50cf36538ce73e99ec799688f084a671ebeb893548f97061c9f5a08151535d705 SHA512 e55d96d015321a987b3825a0cc500c4a639dd9d540e4e7158c9767ee1e8428c4bf49dc62c752e787de4a04b53d7cccce0a1242a3e4bc46b15b6fe3ade2499bc1
 EBUILD binutils-apple-3.2.6.ebuild 6926 BLAKE2B f21d41b62afb49a2aca002388c503797d61b3b92387098c8879982ef7eec9f77834ecdd99ff6e30c0fb9b2faad04edc67d484f5943d712f59578324e98334ed5 SHA512 048e828128b4436cdfe1df71ed01c686b5837327696533b455e38c28eab73cb395a1c40810e6d9c58e3224f6787275cbb32e569d13aa616be33833fda8124a9e
-EBUILD binutils-apple-8.2.1-r1.ebuild 11356 BLAKE2B b643a55991068539cc7f2f90095418efcb24a15fd07697044582c8726e08eb123daa867b689d23ed4be4c96a28ad09b6b362628c8a3d9b1012ba4705c874dd26 SHA512 1dabd8e789c0b6537c66680ce1b7df278aeae7d92164395f9b02706f842ac584e418c0ffa89dd24bf4809dc976a9be1fb51e18b9a9c8799145efedeb115d5153
-EBUILD binutils-apple-8.2.1-r101.ebuild 3394 BLAKE2B b48c3da9facee397f0e1077345776b82f8948c3f2f14ba668d949fe526081296b8c7248596db34728c5bafea22fea900aa57270c4251a626eba2eac95f47f756 SHA512 d677931bb142f08a740f085762043972352507ee6327571f47d88bf38787d075b0fa898c82cf70c0e54d67116389475ffc16bd8b9a45c0c550aed9e82144ea83
-MISC metadata.xml 502 BLAKE2B 97f4c34d1468f1fd675ec665c70fe04ec797130f6401e70978e7ad17fc7101d1f3de72c5b87f9c0a0e3307cf8e048ff7091b8107074ed6fb5e757be175c816ec SHA512 a10513a2d34e55b0326dcf4197bc949284836779660c8bd4c35658a3e22486f289d80aac8a31038607789e692e051914a3da39198955ec15c2d3a87b45ac73f4
+EBUILD binutils-apple-8.2.1-r1.ebuild 11961 BLAKE2B 737305c5c1d3bc486c5ed45e9e8af905c71897b4a433393190fc16abb121a8ea3c1c2266ef65a71343846f0f68906151a79e620e75e868335c035dd183887666 SHA512 3f640d97249bb1fde57b7e9c76d54550adb37d77fc2ee554571fcf056b0d3e468969c99d4e9fbb2a79894c59c06f5434a7f4179356e5b2246b1d4511544990a7
+EBUILD binutils-apple-8.2.1-r101.ebuild 3314 BLAKE2B e9a4b7dc06c54e4f3605be0a545f7797a0cf6b963166a00951d7785b4a86df01053e6c76657b04cea316bb1eeaa76ff23a9d4a4660eeb81e256c0a74c48e9a72 SHA512 99a298f2e54a72605fedbab256d1d0d281613ed05792dcf297f0ad4df3d78d773280e464d1a1c188d9933dec6493a0f06e32fda48402a1ed323b0a020f50d0e7
+MISC metadata.xml 436 BLAKE2B f120e4772814634938465022b29afcd08e96fe15150e5757a1b4f9e193bab557bd26a394d0cf67e2f58fdbf3d5e5c7156f6c19056eeeed2544fd102c1870bed2 SHA512 d8faccf2a0994f67be13f412a278c83250d234e9cda2657f1181d2a2865e5738c3caa488d69f27d2223d7043ba569d26bf62fccb718081f88136e69c96f77c26
diff --git a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
deleted file mode 100644
index 42f2f2808cb7..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs llvm prefix
-
-# versions:
-# XCode-11.3.1                 ld64-530        cctools-949.0.1
-# XCode-11.2.1                 ld64-520        cctools-949.0.1
-# XCode-11.0                   ld64-512.4      cctools-949.0.1
-# XCode-8.2.1                  ld64-274.2      cctools-895         <== binutils-apple-8.2.1-r1  (2019)
-
-# macOS-10.15.6                dyld-750.6                          Causes build failures with Xcode-11 tools
-# macOS-10.14.4-10.14.6        dyld-655.1.1                        Causes build failures with Xcode-11 tools
-# macOS-10.13.6                dyld-551.4
-# macOS-10.12.1-10.12.3        dyld-421.2                          <== binutils-apple-8.2.1-r1,8.1
-
-LD64=ld64-530
-CCTOOLS_VERSION=949.0.1
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-DYLD=dyld-551.4
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~x64-macos"
-IUSE="lto classic test" # tapi is now required
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massively uses
-# C++11 language features. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-libs/tapi
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="11"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-llvm_pkg_setup() {
-	# eclass version will die if no LLVM can be found which will break prefix
-	# bootstrap
-	:
-}
-
-src_prepare() {
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-530-Makefile Makefile
-
-	epatch "${S}"/ld64-530-nolto.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-
-	# workound llvm-3.9.{0,1} issue
-	# https://bugs.gentoo.org/show_bug.cgi?id=603580
-	# https://groups.google.com/forum/#!topic/llvm-dev/JY6nuKE__sU
-	# http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160829/169553.html
-	sed -i -e '/COMPILE_TIME_ASSERT/d' ld/parsers/libunwind/*.hpp || die
-
-	# provide missing headers dyld
-	mkdir -p include/mach-o || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# TARGET_OS_BRIDGE is undefined in TargetConditionals.h of newer MacOSX.sdk.
-	# We don't target BridgeOS. Disable it to avoid errors when clang adds:
-	# -Werror,-Wundef-prefix=TARGET_OS_
-	sed -i -e 's/#if TARGET_OS_BRIDGE/#if 0/' include/mach-o/dyld_priv.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch
-	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch
-	epatch "${S}"/${PN}-11.3.1-llvm-shim.patch
-	epatch "${S}"/${PN}-11.3.1-nolto-fix.patch # bugfix
-	epatch "${S}"/${PN}-11.3.1-segaddrtable-fix.patch # bugfix
-	eprefixify libstuff/execute.c
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# bugfix. args.c not built but args_expand_at is used in misc/libtool.c
-	sed -i -e "/^CFILES = /s, errors.c , errors.c args.c ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	eapply_user
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/"-g /"/g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	if use lto ; then
-		ENABLE_LTO=1
-
-		LLVM_INCDIR=$(get_llvm_prefix)/include
-		LLVM_LIBDIR=$(get_llvm_prefix)/lib
-
-		[ -n "${LLVM_INCDIR}" -a -n "${LLVM_LIBDIR}" ] || \
-			die "LLVM not found - LTO support can not be enabled"
-
-		# LTO and LLVM support currently both depend only on libLTO being
-		# present. So we can enable both.
-		CCTOOLS_LTO_CFLAGS="-DLTO_SUPPORT -I${LLVM_INCDIR}"
-		CCTOOLS_LLVM_CFLAGS="-DLLVM_SUPPORT -I${LLVM_INCDIR}"
-	fi
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	export CCTOOLS_CPPFLAGS="${CPPFLAGS}"
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want). Removed in compile_cctools.
-	append-cppflags -DNDEBUG
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		${LD64}/src/create_configure
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO} \
-		LTO_INCDIR=${LLVM_INCDIR} \
-		LTO_LIBDIR=${LLVM_LIBDIR} \
-		TAPI=1 \
-		TAPI_LIBDIR="${EPREFIX}"/usr/lib
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	filter-flags -DNDEBUG
-
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${CCTOOLS_LTO_CFLAGS} ${CCTOOLS_LLVM_CFLAGS}" \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,dyldinfo,unwinddump,ObjectDump,objcimageinfo,machocheck}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,dyldinfo,unwinddump}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	# upstream is starting to replace classic binutils with llvm-integrated
-	# ones. In Xcode, nm and size are now symlinks to llvm-{nm,size} while the
-	# classic version is preserved as {nm,size}-classic. When asked to do so
-	# by use classic we statically link to the classic version.
-	#   binutils-bin/<version>/<tool>
-	#     -> binutils-bin/<version>/<tool>-classic
-	#
-	# Otherwise we try to find and use the llvm version of the tool. Since our
-	# binutils do not live in the same directory as the llvm installation and
-	# llvm tends to move around, we use a shim that tries to find the llvm
-	# version of the tool in prefix. It will fall back to the classic tool if
-	# it fails.
-	#  binutils-bin/<version>/<tool>
-	#    -> binutils-bin/<version>/llvm-<tool>
-	#    -> $EPREFIX/usr/lib/llvm/<major/bin/llvm-<tool>
-	#    -> $EPREFIX/usr/bin/llvm-<tool>
-	#    -> binutils-bin/<version>/<tool>-classic
-	budir=${D}/${EPREFIX}/${BINPATH}
-	for tool in nm size ; do
-		use classic && \
-			ln -sfn ${tool}-classic "${budir}/${tool}" || \
-			ln -sfn llvm-shim "${budir}/${tool}"
-	done
-
-	# Also, otool is now based on llvm-objdump. But a small wrapper installed
-	# as llvm-otool remains, providing command line compatibility.
-	use classic && \
-		ln -sfn otool-classic "${budir}/otool" || \
-		ln -sfn llvm-otool "${budir}/otool"
-
-	# And finally, although our cctools don't actually contain dsymutil and
-	# objdump, we provide access to the llvm versions of them via the shim to
-	# be in line with Xcode.
-	for tool in objdump dsymutil ; do
-		ln -sfn llvm-shim "${budir}/${tool}"
-	done
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index 3d5c7e8105dc..06e3523c934f 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,10 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs llvm prefix
 
+# versions:
+# XCode-11.3.1                 ld64-530        cctools-949.0.1
+# XCode-11.2.1                 ld64-520        cctools-949.0.1
+# XCode-11.0                   ld64-512.4      cctools-949.0.1
+# XCode-8.2.1                  ld64-274.2      cctools-895         <== binutils-apple-8.2.1-r1  (2019)
+
+# macOS-10.15.6                dyld-750.6                          Causes build failures with Xcode-11 tools
+# macOS-10.14.4-10.14.6        dyld-655.1.1                        Causes build failures with Xcode-11 tools
+# macOS-10.13.6                dyld-551.4
+# macOS-10.12.1-10.12.3        dyld-421.2                          <== binutils-apple-8.2.1-r1,8.1
+
 LD64=ld64-274.2
 CCTOOLS_VERSION=895
 CCTOOLS=cctools-${CCTOOLS_VERSION}
@@ -22,7 +33,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos"
-IUSE="lto tapi classic test"
+IUSE="lto classic test"
 RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massively uses
@@ -31,7 +42,6 @@ RESTRICT="!test? ( test )"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	tapi? ( sys-libs/tapi )
 	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
@@ -200,7 +210,7 @@ compile_ld64() {
 		LTO=${ENABLE_LTO} \
 		LTO_INCDIR=${LLVM_INCDIR} \
 		LTO_LIBDIR=${LLVM_LIBDIR} \
-		TAPI=$(use tapi && echo 1 || echo 0) \
+		TAPI=0 \
 		TAPI_LIBDIR="${EPREFIX}"/usr/lib
 
 	use test && emake build_test
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
index 091e4e5990b4..da5d72becad1 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,14 +14,12 @@ SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -
 LICENSE="APSL-2"
 SLOT="8"
 KEYWORDS="~ppc-macos ~x64-macos"
-IUSE="tapi"
 
 # xtools uses c++11 features, not available in gcc-apple, hence gcc/clang dep
 DEPEND="sys-devel/binutils-config
 	|| ( sys-devel/gcc:* sys-devel/clang:* )
 	app-arch/xar
-	tapi? ( sys-libs/tapi )
-	!tapi? ( dev-libs/libyaml )"
+	dev-libs/libyaml"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -65,7 +63,7 @@ src_configure() {
 		-DXTOOLS_LTO_SUPPORT=NO
 		-DXTOOLS_HAS_LIBPRUNETRIE=YES
 		-DXTOOLS_TAPI_SUPPORT=ON
-		-DXTOOLS_USE_TAPILITE=$(use tapi && echo OFF || echo ON)
+		-DXTOOLS_USE_TAPILITE=ON
 		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
 		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
 	)
diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index e43e477505d4..481c99bd5bd5 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="lto">Add support for Link-Time Optimization with LLVM</flag>
 		<flag name="classic">Use nm, otool, etc. from this ebuild
 			instead of llvm-based tools</flag>
-		<flag name="tapi">Build against <pkg>sys-libs/tapi</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index b509d62f3a6d..201bf1a6b4a5 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,6 @@
 DIST binutils-config-5.4.1.tar.xz 7328 BLAKE2B 51f0ca625abfd964cc1b6c902017edc9790da1d33a44b3da64e3b2c68ed245fc1c0eb8b3fb999f6acb88e614f47e2f53e19b456b03c069bb61cd0f39e85d786d SHA512 af12644d591152f45d573bee0499b21c293b68a9b81626e9e1d46d5a7dc40e9a24642364bdb2bce52d61cbe3d2e045f4ab6e50a9827648a820bac885f20239cd
 DIST binutils-config-5.4.tar.xz 7332 BLAKE2B 1dd0fdebf028e9d95caa395948037d51ac1e627f370921b56fc99a6fe2e2100ddb202c8027ad1e67330306de8b4cbc6a03753105d401198e515b22fca94f760f SHA512 79411afcbec3a6cce960be1b06e4a6efdf55081992f6a92157737f7ef41fc61eaec0005078a4ce0cd78ad6af14583ab85f4f2b7b43808238088d521e1aa31af1
-EBUILD binutils-config-5.4.1.ebuild 1127 BLAKE2B bbf2a69d8c145e21623b8b24cd686ac5842c9ec572cac73a9ca890f337ba379f43e680d44a038139a4fd3ecf647e9496a76419959ac188c0de845239ea09650c SHA512 b4a78a1d9f4ffb93d26c196d31267de08c4fa3f27b9a0a3ab8de90186422b365bc53541a2657c96d18044c80365af29c34dea43b3c9846f70f4f5713bb00966d
+EBUILD binutils-config-5.4.1.ebuild 1120 BLAKE2B 3499ff799390cab547da990d05971b341fd874a53be6de4cd02da7250ccfb9f32bf0bb1962951dfcede2955ded0c991fd8f9d0af7e8aa8fd9b5ec482884dc620 SHA512 c482fbe62a79458239c81d5f73de0211380c0b5daf6834157661c07acddca6dccb2a40e48c9b528f83c09186ca777eef51c24223a63edd4ab790d71bb5621b46
 EBUILD binutils-config-5.4.ebuild 1101 BLAKE2B 407acd936b18ea59abe4eb231fa03683ca845c2654ff59ad419cd1fc171e45f27342346702b65e21a74df76e95e4ff95356a5f8ecda462f6c720eaf6d2010d09 SHA512 9c4821d7373d695690ac2bf239debf4aec1e8e80ad0200ab2310291cb6a2b69193132f2ca2aeb4c694295b9860dea444c759d59333c95844b3e79fdc1813ff68
 EBUILD binutils-config-9999.ebuild 1062 BLAKE2B 871d73773d58fb6daa77032d44a1cec845db2d17150182440a41f76c1cf8f9fbb28b66dc3d0455f0f5eff18ff4f9e27c91907d6e0c5a6258ef6a9211ee25d7d7 SHA512 5ee3b41b923e06e03b3e77cf329e83da6b22a4cce8a38375caf1aaf2965216a013df4de5ddc880235c1cebd3a03735e6bbdf9890763d32242c70e05a2d06bc28
 MISC metadata.xml 417 BLAKE2B f165e42734eb89e8c79fcd95bdbaef4ce0e80380867998cb649a669fea3ded3ce7326cca436cd6a5509b7a8948b3c7f01aea05b344f71ea5262517e67719448c SHA512 ed23d5be8b16265068b32816b4984e8cd07e62da7ab6a0adbcea1a826366f2844ad06b087c7b753d1b3a145b761608b83794133c0f84dfbe24b5703fb93344ac
diff --git a/sys-devel/binutils-config/binutils-config-5.4.1.ebuild b/sys-devel/binutils-config/binutils-config-5.4.1.ebuild
index 91b67f894d2e..6d0719229a99 100644
--- a/sys-devel/binutils-config/binutils-config-5.4.1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.4.1.ebuild
@@ -10,7 +10,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 change the binutils version being used"
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 1b13dd33670c..d79963378995 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,10 +1,8 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
-DIST bmake-20220116.tar.gz 785312 BLAKE2B 260ee10b5d295482477a9be92303c946139785f3c2a17cdb8a215322ac8876b708235af83f2c86f21c50da9a4b55b00300f08da40fc0d06ca2eda6caf1aafc50 SHA512 27e400f200afdb0ebc978bbd6a7422e570ab0a79ce609cffddbebb281d59ef752d840be14e08e989c83c14f2955f98d9549c8ae452450c75d03c59c61593fb5c
 DIST bmake-20220214.tar.gz 801006 BLAKE2B 70b86d04cd891d1bc0aa9a7e8aac09edcd486fc0419e5def8696846bf5b7977cdc48a20707b74f5f2a8e69d2ac2aa2f05f6d490efed74770dc80cce0cf21a32a SHA512 c5b17ca1128b0978f832e7c8ecb482d14021eb6c3ffc0c5a535ff7162162f8d5c32c688063f554ad1c37fd3ac26e67df57c66024132d301635e5854ac6c73802
 DIST bmake-20220303.tar.gz 802039 BLAKE2B 73dd831d463ff361a47eee016b962d8de2f7182083eb68f6f7de544c4af0ea94b4346b7c7c2a71f300930c4d1f0c67407059feeb98bf475df1966ceb1d22ff1b SHA512 c10a8aa4e3a0180904aaa3e6d3110be655eaa04365d75454291c837d79b0645da80a042118e2d9581b7399b73bcc472e13425e7ce768446392a3a3f5e2778c32
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20220116.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
-EBUILD bmake-20220214.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
+EBUILD bmake-20220214.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
 EBUILD bmake-20220303.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220116.ebuild b/sys-devel/bmake/bmake-20220116.ebuild
deleted file mode 100644
index a69c0ea95fc0..000000000000
--- a/sys-devel/bmake/bmake-20220116.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MK_VER=20210330
-
-DESCRIPTION="NetBSD's portable make"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
-SRC_URI="
-	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
-	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-# Skip failing test (sandbox and csh)
-PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
-
-src_prepare() {
-	default
-	cd "${WORKDIR}" || die
-	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
-}
-
-src_configure() {
-	econf \
-		--with-mksrc=../mk \
-		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
-		--with-machine_arch=${ARCH}
-}
-
-src_compile() {
-	sh make-bootstrap.sh || die "bootstrap failed"
-}
-
-src_test() {
-	cd unit-tests || die
-
-	# the 'ternary' test uses ${A} internally, which
-	# conflicts with Gentoo's ${A}, hence unset it for
-	# the tests temporarily.
-	env -u A MAKEFLAGS= \
-		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	FORCE_BSD_MK=1 SYS_MK_DIR=. \
-		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
-		|| die "failed to install mk files"
-}
diff --git a/sys-devel/bmake/bmake-20220214.ebuild b/sys-devel/bmake/bmake-20220214.ebuild
index 7b11aa7cebf4..a69c0ea95fc0 100644
--- a/sys-devel/bmake/bmake-20220214.ebuild
+++ b/sys-devel/bmake/bmake-20220214.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 22bb94d8be31..351f5cb31790 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -6,7 +6,7 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 EBUILD clang-common-11.1.0.ebuild 581 BLAKE2B 3e7e2e6c0b0a7f177aaf610a7be4bebb6eb23aec0f4677263555a37c57eb6547d94078465939f9062b562f0b5cc59bda22b2e293e0b2f7907f66dd76c95fe554 SHA512 1ce397f6029bc8ee03c8d0aac13e14b7faf77cc446ab390f1435c8c028364620e565e73cb5e97bb6c0093e0a20c34e8a4ceab9591707687567520c0192264bea
 EBUILD clang-common-12.0.1.ebuild 593 BLAKE2B b67b21c9d61f523ab9f32d53114763ce95348100e985d96c9ccbae2b9d5ad698fbc174001091c4f9184ecdf904a4d00a9449c28cd09a1e173d885dd1e7759949 SHA512 707eca3a5b53a104c3350cc42f5fe01df9ef17ba4863dbd00093b685a052da67825b7e837820ecd23087759fe2057ae1fbb00b391c79653dacf2c94fd1261342
 EBUILD clang-common-13.0.0.ebuild 593 BLAKE2B b67b21c9d61f523ab9f32d53114763ce95348100e985d96c9ccbae2b9d5ad698fbc174001091c4f9184ecdf904a4d00a9449c28cd09a1e173d885dd1e7759949 SHA512 707eca3a5b53a104c3350cc42f5fe01df9ef17ba4863dbd00093b685a052da67825b7e837820ecd23087759fe2057ae1fbb00b391c79653dacf2c94fd1261342
-EBUILD clang-common-13.0.1.ebuild 595 BLAKE2B ad04fb0853c57f5d4669eabc9bab4d592916bb08dc82d52092087d7a998b0f37c60ce36a06bd79044acd7a073f21b4e03894062c2b27456efed8ebed39901573 SHA512 81017df29a3ba2695a64c29777f7e122e40733af6c1358ebd48d62ab194e2468e979aa476acf273f81ebfcafdfb4f4c329f6c199408f75f5a6e922beed630580
+EBUILD clang-common-13.0.1.ebuild 594 BLAKE2B ba3c1b57a93660c14c8d00597853a247c0f57acf55d290f6d22eeba5e9e6ed80ff390f211d3eceda64a19fdee6add1a64423127f78f7c5dcda92b531f795e252 SHA512 0b62820f48a700abb94e65a5ca84fff5e72de9aa0c2d48266ff5bcdc8de37395547f3bf21f7d4b3c73546e81ccba365cdf462f830cfd378601715187dd7ca4bd
 EBUILD clang-common-14.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-14.0.0.ebuild 598 BLAKE2B 2f8544b82c215c7c39037a65fee3e2ec5ca193d3bf76431a0ac39fb0dbcaee0d41a037a5d75ca5fd046d0515b82fff4cdcc4adb01fb6c28fbda5cf702be2728e SHA512 5afb93b24bee955bea103434f6f31c9643e8aef379fafaa4cfcb7728effbc264a1b6691632d64576333fc7c6049b8a60099e2b3753a37752d8aecf1c8795fcc6
 EBUILD clang-common-15.0.0.9999.ebuild 514 BLAKE2B 5e58d945e4196b9b325f00941a0d207a7b322f7ada2c4fca817741024f9136dfc4a53aa01b49d46cd1a0ce4f01d59dd03d932823b23fead4b4b830614eebc1f1 SHA512 7eaffe432e88854aab2d505950cead217e9bcdbbfa8cb104b5d1c9a63cfb27c31ddd72ef5327b546772dff63f904da5eccf2e09525b137e0eccffddcbd08185b
diff --git a/sys-devel/clang-common/clang-common-13.0.1.ebuild b/sys-devel/clang-common/clang-common-13.0.1.ebuild
index f46caea2762e..0e0c8036501a 100644
--- a/sys-devel/clang-common/clang-common-13.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-13.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index f08ca83417b4..2b584eda39b7 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,7 @@
 EBUILD clang-runtime-11.1.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
 EBUILD clang-runtime-12.0.1.ebuild 704 BLAKE2B 5d728bf389420018e991091d36e5d289d1cc3f4c060b32287021764f6406dc5550c9c74a9b4ce9b57e106d500baa2aee697975c82c387f71f981d52eab5ec450 SHA512 1c8e8b81398526d51639af2363cc0bb434f422202ff89fdee90ba0b4ae0755e8714590ab682b1fe9174655a32c60fea5bc1ccce00ceed2afb9adf746b1eeb237
 EBUILD clang-runtime-13.0.0.ebuild 704 BLAKE2B 5d728bf389420018e991091d36e5d289d1cc3f4c060b32287021764f6406dc5550c9c74a9b4ce9b57e106d500baa2aee697975c82c387f71f981d52eab5ec450 SHA512 1c8e8b81398526d51639af2363cc0bb434f422202ff89fdee90ba0b4ae0755e8714590ab682b1fe9174655a32c60fea5bc1ccce00ceed2afb9adf746b1eeb237
-EBUILD clang-runtime-13.0.1.ebuild 706 BLAKE2B 348fc34b4127ee1f07cac2359f32542e288885a438bce05d68b0e9670905ca57fde17891f38a4aa9b83d17a361af6ae14b0d44f11d4f156ea50aba134851c4f2 SHA512 85982c4cc84a9247d9dcce1ddc292923cf7fcdf427be83ee63bc2d9e1a2c74522e0ef706403eff626234df6f47b6d2d18c0cb87e44a25d5b7ec8b2a80de274d2
+EBUILD clang-runtime-13.0.1.ebuild 705 BLAKE2B fc93f6850ff1b82520afe88d81c28bbc9f4b46921148aa14e6d0e1febe99d6c5ea20d16cfb87ef646208836370db67b95c7e56dbb8e3256c37106c6d17f3b3ab SHA512 7bd2718b55ef1303c22ebd0d1b60384b9788d2534f45c25f874898b466f077f25c016d20e9760a1ab247e458b69fe305a4ad02516a1bbc1bfbbb3514864794c2
 EBUILD clang-runtime-14.0.0.9999.ebuild 710 BLAKE2B 95ac09c95cfc7e9b18d957aa3a9a68ffc631044d8919b1d09ffe4f08a061407cd471a653c9bac09953d5f78dfff418ad470fdc55a242e9a6989b2dd715355b1b SHA512 00fcf69029f426afd5d254782a37cd15cc356da3da977822f53fac943c0b2aaf6e6a12262a5ac01c20c45f9c351bfc76b5abe6b851cf846418abc70abcf47f24
 EBUILD clang-runtime-14.0.0.ebuild 776 BLAKE2B c0abdf45df4a1fcabc55e9a6bc0c39ab8752c169f6e397b4bd156b86ad0efc74047c53f5366fb5ad6a4d7cb70601157f877546ad5f56bdb5959699641386ed85 SHA512 c024027bebd30844b333cd79b67dbc32a181ccc4cddbf748c4df7ac9cb4ac6b1eda2968fdb15ef64f54d8f21740137250165c90faf846399da9e865b54f7ddec
 EBUILD clang-runtime-15.0.0.9999.ebuild 710 BLAKE2B 95ac09c95cfc7e9b18d957aa3a9a68ffc631044d8919b1d09ffe4f08a061407cd471a653c9bac09953d5f78dfff418ad470fdc55a242e9a6989b2dd715355b1b SHA512 00fcf69029f426afd5d254782a37cd15cc356da3da977822f53fac943c0b2aaf6e6a12262a5ac01c20c45f9c351bfc76b5abe6b851cf846418abc70abcf47f24
diff --git a/sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
index 20f604bdc651..31065696892c 100644
--- a/sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c75368066860..35c28dc97d73 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,7 +7,7 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
-DIST llvm-gentoo-patchset-14.0.0.tar.xz 4076 BLAKE2B dc114e53fb878ca74489c420506b9dd9c417e2b97dff4d9441d78a0a256ca1e7243ea2ce38b8665d37b0f24436f9ea5771cd05d9b13887e7370a19ec5e05ba20 SHA512 7f7d08fc762d634692fb251a51c0d73a4a9098907f25451b9ca9453315b603331b65a454b2d631cfecbb3fbc11ab3a36f644c0d7b03e1bb8e96ce4aa08d60615
+DIST llvm-gentoo-patchset-14.0.0-r1.tar.xz 5500 BLAKE2B b8ddbf41f70fbe9293a9fb81617e0893647233a61c4e34f8861f37526325893188cdf734b5349c7d06f5f23311536b95a3232af39eb4eb4f509386d022747842 SHA512 a0c93137ce0ae1bd111276c114f24c248cb800eb6d3c6cbc7b2c9658fbcde20d66c060b05535d9ae40d046e37cae81a27b8a4f7c27f718ccb39b3314f92577cd
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
@@ -17,8 +17,8 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 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.ebuild 11304 BLAKE2B d274cbb907b3ae41f3755146242a1da3f98dedf405b245056294294d71b6c3e521f81631b16c2c589d068766ae9c7f2b3dcd03100e052d842c22b81b8d83accc SHA512 5e367d1ede076032041c58cd8ef558e7c67a148c9a602f6bf17db7af355ce6eb3873973ae3f324da240d6ab6682e824909f059d3c5991daf6d98d258f8ea6a45
-EBUILD clang-14.0.0.9999.ebuild 11352 BLAKE2B 5f6e9f05b99f03b181b8ae341f614f9cf3c0b8c384e0e6fb9a2b8ba6c746112d88a1507f69685425f55f7d37a0577e90c6447fe04a675d993a379e870395c30d SHA512 137bd65b74ed4380c454bd153c81cc68fbd4d17f857e05256672e018c0fa82b0745f4042ea8630aba9cc62c19063c03df9b4c8c6158567e95709b9e7e7b63b9b
-EBUILD clang-14.0.0.ebuild 11434 BLAKE2B 0b04b8d93270190de0b8d5bec68abbd225afc60020c37a5c0ae0a20594d249e63022b4d9008b1a31a5f31c50da4520f31d553e84daa70182a27baa3c18ff9f81 SHA512 ec95c300e9d730484083162d326cc3fb660d306ba8d45fd705b79dabddcf508402a846aac804376791ed9c82b1b6e7cc4b2716839c563cee8bd7ed94fcae5c11
-EBUILD clang-15.0.0.9999.ebuild 11352 BLAKE2B 5f6e9f05b99f03b181b8ae341f614f9cf3c0b8c384e0e6fb9a2b8ba6c746112d88a1507f69685425f55f7d37a0577e90c6447fe04a675d993a379e870395c30d SHA512 137bd65b74ed4380c454bd153c81cc68fbd4d17f857e05256672e018c0fa82b0745f4042ea8630aba9cc62c19063c03df9b4c8c6158567e95709b9e7e7b63b9b
+EBUILD clang-13.0.1.ebuild 11303 BLAKE2B 0fc98007c76c642736919936ca62907d0e1081956f3897b352965ddeb97c238c67ac224293658654dad1032803a9c509da619f9d8fcad74db0174deb154093fe SHA512 963990f22a1a839f292c6a0d22da6d9e31278f953c8713c56f18db6870433f2e9ab4295c96d7d756ce82cb996c841ed515c056eece0ccd1c3a28ce920c490edf
+EBUILD clang-14.0.0-r1.ebuild 11529 BLAKE2B 948bdbcf950375a78f238b530de8dde4c2582a89cc385ef419f855c36c253064526b3f9d86c1b36b1364497ad8450327cea774344097c787fb4887b22b53e502 SHA512 c65ccfb25f2f538c98c5a9305251b45a6dd8ab2a4bb55fc4b28186b8c97fed64f5c4075af79f20a2248de5780443163ed74a7982e762eb9cb03b0fd69095d4f4
+EBUILD clang-14.0.0.9999.ebuild 11644 BLAKE2B 4dda8010914a82e7a9f775e535477dd7e970b684d329d5b1d62bbde49f03670916b47ba77071805cf0287f5bdb9053cff10057ad22f1b4ae03bd38f3a79e1d5c SHA512 f9a7ad6cf75cdca1cc4eccfdc1fe260f9b60f2012d77f2a29a5154484d80f06919317d8025ec1a01576bce8e7faf2a178248c1d325b440b0092222373d25ca8e
+EBUILD clang-15.0.0.9999.ebuild 11644 BLAKE2B 4dda8010914a82e7a9f775e535477dd7e970b684d329d5b1d62bbde49f03670916b47ba77071805cf0287f5bdb9053cff10057ad22f1b4ae03bd38f3a79e1d5c SHA512 f9a7ad6cf75cdca1cc4eccfdc1fe260f9b60f2012d77f2a29a5154484d80f06919317d8025ec1a01576bce8e7faf2a178248c1d325b440b0092222373d25ca8e
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-13.0.1.ebuild b/sys-devel/clang/clang-13.0.1.ebuild
index 2aa75d0f943a..97b2f78365f2 100644
--- a/sys-devel/clang/clang-13.0.1.ebuild
+++ b/sys-devel/clang/clang-13.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 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"
+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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-devel/clang/clang-14.0.0.ebuild b/sys-devel/clang/clang-14.0.0-r1.ebuild
index 43eab1f8e735..e625b4c694ba 100644
--- a/sys-devel/clang/clang-14.0.0.ebuild
+++ b/sys-devel/clang/clang-14.0.0-r1.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -54,7 +57,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
-LLVM_PATCHSET=${PV/_/-}
+LLVM_PATCHSET=${PV/_/-}-r1
 LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
index 81598e69a80e..4cb70129b171 100644
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -102,10 +105,6 @@ check_distribution_components() {
 					clang-libraries|distribution)
 						continue
 						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
 					# tools
 					clang|clangd|clang-*)
 						;;
@@ -191,6 +190,7 @@ get_distribution_components() {
 			clang-query
 			clang-reorder-fields
 			clang-tidy
+			clang-tidy-headers
 			clangd
 			find-all-symbols
 			modularize
@@ -347,6 +347,7 @@ src_install() {
 	# Move runtime headers to /usr/lib/clang, where they belong
 	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
 	# move (remaining) wrapped headers back
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
 	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
 
 	# Apply CHOST and version suffix to clang tools
@@ -392,6 +393,11 @@ multilib_src_install() {
 	rm -rf "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-devel/clang/clang-15.0.0.9999.ebuild b/sys-devel/clang/clang-15.0.0.9999.ebuild
index 81598e69a80e..4cb70129b171 100644
--- a/sys-devel/clang/clang-15.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-15.0.0.9999.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -102,10 +105,6 @@ check_distribution_components() {
 					clang-libraries|distribution)
 						continue
 						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
 					# tools
 					clang|clangd|clang-*)
 						;;
@@ -191,6 +190,7 @@ get_distribution_components() {
 			clang-query
 			clang-reorder-fields
 			clang-tidy
+			clang-tidy-headers
 			clangd
 			find-all-symbols
 			modularize
@@ -347,6 +347,7 @@ src_install() {
 	# Move runtime headers to /usr/lib/clang, where they belong
 	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
 	# move (remaining) wrapped headers back
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
 	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
 
 	# Apply CHOST and version suffix to clang tools
@@ -392,6 +393,11 @@ multilib_src_install() {
 	rm -rf "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 281393eea509..110cc68f109d 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
 DIST crossdev-20211121.tar.xz 28700 BLAKE2B bfe637dcd3c5b6d45e289d6298de18cab4b70b5d21a817a9207b91360b489457b9ee10266a1c2641f8dfac09dffb166bf1565a7e519ba41f84c6d5c2000f5158 SHA512 5189fa7639b819dfffc8f994bb557d8d83f115b82cd61d938db77fdcf16a33cc9d0147f9708b3bed22fdc4ace27ac863436813ebad94876ae767172ac0cbb9ce
 DIST crossdev-20220205.tar.xz 29088 BLAKE2B 46e90557f0a6df49e4f6ab7be6495514a188c4366868290d3b6b879ad1e5741e1600bca237735290f7e9278d441534569853b582cd85b96581c6ae0517cb4c54 SHA512 72e7cf690d49a87b32f6fdad2462fd4156e4e35a3f0b5f30911012a2b7936bb999575f757547a7a805c0cfdd1fd0caa8b23bf61e72c4333096314043ed565f40
 EBUILD crossdev-20211121.ebuild 908 BLAKE2B b3e424f234669d19959b0ee39521a41f51751911576fd52b1d7b1f6792281b5880485c90750f0e644ed68a5f65857e159ae32d2fd9d621ed5234bcb0b0d05d8d SHA512 e9bdac44211ceaac37a25c05d7c86c5e522a2edfa01cad82e124d6e517190ca604921793dcd044589787b1b5930046eb9205c2804b1192d5ba3bb9ec05a686fd
-EBUILD crossdev-20220205.ebuild 916 BLAKE2B 75d836555ca608c1c2fa5714295e0c6706b52d593348e2c8831db8b542eeb545e72b92b0ac6ab9ad757ef3e9e2b1e5445c239706e7c1dabac14a486f1a618dea SHA512 27dcfb6aa0e753133f158dda306b7a0e58a86dce1648ba599da0d6c6452f1566b8526775757e1857dbc38e306bd513d5034cbcb433eed60d438141a2256a9931
+EBUILD crossdev-20220205.ebuild 908 BLAKE2B b3e424f234669d19959b0ee39521a41f51751911576fd52b1d7b1f6792281b5880485c90750f0e644ed68a5f65857e159ae32d2fd9d621ed5234bcb0b0d05d8d SHA512 e9bdac44211ceaac37a25c05d7c86c5e522a2edfa01cad82e124d6e517190ca604921793dcd044589787b1b5930046eb9205c2804b1192d5ba3bb9ec05a686fd
 EBUILD crossdev-99999999.ebuild 916 BLAKE2B fc8db87b2419cbe292c64b22ae699943619ccc91add4cd8ec0e148e0e90e52db49be940d998623209cdec950fdf5b16a80dd623316f8e73c7bfea38f00fe3b89 SHA512 93c02450f068588555ba09dc0d827b7250bcc26fdbe4ed4265cc9f48556396c4a2d5a94d73777860d3c615785fbdcff027159e33201af448dab3eb6ae3aaed71
 MISC metadata.xml 381 BLAKE2B 1d383a0b95cc180ed7be66205a9525f0a3e973a9b7e296c463e3a735163e1b673140a82dfc0a21ad30d71cad1b482770fb3a0028fef32593e6f7b53df127dcef SHA512 8074c54c17718021de7fcd8aef8b6c137eae75cd41c5dd02f86c987f7465d98af449f92a67fccd489a4f0ab0670ae89fb737e290be37a225acb81b8f1074446f
diff --git a/sys-devel/crossdev/crossdev-20220205.ebuild b/sys-devel/crossdev/crossdev-20220205.ebuild
index 605240d7bf07..fe3c418c3092 100644
--- a/sys-devel/crossdev/crossdev-20220205.ebuild
+++ b/sys-devel/crossdev/crossdev-20220205.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${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="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index b0c6216c291a..edc125b5eb51 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,7 +1,8 @@
 AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696
 AUX dev86-0.16.21-make.patch 2299 BLAKE2B 7bc53ca455c545fe72b71a0daae8de8fd54da6ec915edfabd0d44acef2d3525936272fa666de5f6126013491d4b9f8b93f2086106177210d3490620eeec7771e SHA512 d75913f1c340a4601ca56cda5ad9cf389c0bac874b8f23e2a1362150e26d02ca3da53aee96a47136a3daf06b3020744680e3e479870199f1304bb2f9afd1ab45
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
+AUX dev86-0.16.21-void-return-check-msdos-clang-fix.patch 512 BLAKE2B 41644161eeb5f28a016f5c70bd5a303217cea9eda2b9c81625779b7d07c01de625d63b53292eea876e48610c88bc836d7e63b41d169cd0be666a02aad178bf03 SHA512 97ef0ecf2294fe1bf6db6ad393023075a9713c4d44ea7acc4a0cb2569e25be8ee35e51d69d9cc2e554f36e8a022a6f686ec0ed1f84ae19560ec91c6da2bc6a81
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.21-r3.ebuild 1919 BLAKE2B 566770e3b438c41603beba8e763dfde921ebfaaccc265d9cd7b3e8d36aeb0df95ab17b06f31f7f2f4d11df93afa151b5aed464f6dbf7f0ee1dd20944881556ee SHA512 0a205a20255a1e0322cde64bfc1d860f06041b3044e63198e250456d6e9f8727358c182fd50e9537b2a85efdff235765260ce65c02e74b88247534e12677287d
+EBUILD dev86-0.16.21-r3.ebuild 1979 BLAKE2B 589d7ac1ef48e1deeb404f3e6b5dbd8d1da2b7a1b3a0639880cb81398eaad6e056029144f6e9270e63430506a8766426fa043698912c63b3f1fe71804cc94165 SHA512 5935239b7e3b4c0f60144424ffd01efc286bacabd3600b4dfbfa2d4e941cae37573b6f8ec9bb2d06b7b9968e14131fbca5391f6d00d50612d3271b4b005c876e
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
index 2af636abe3e1..e3784e658bfb 100644
--- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r3.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
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.16.19-fortify.patch"
 	"${FILESDIR}/${P}-non-void-return-clang.patch"
 	"${FILESDIR}/${PN}-0.16.21-make.patch"
+	"${FILESDIR}/${P}-void-return-check-msdos-clang-fix.patch"
 )
 
 src_prepare() {
diff --git a/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
new file mode 100644
index 000000000000..39e3a1296c21
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
@@ -0,0 +1,20 @@
+--- a/bootblocks/makeboot.c	2020-11-30 00:28:40.383078094 +0300
++++ b/bootblocks/makeboot.c	2020-11-30 00:28:26.969025659 +0300
+@@ -183,6 +183,8 @@
+ unsigned char bpb_flags[100];
+ int has_bpb_overrides = 0;
+
++static void check_msdos();
++
+ main(argc, argv)
+ int argc;
+ char ** argv;
+@@ -1122,7 +1124,7 @@
+
+ /**************************************************************************/
+
+-check_msdos()
++static void check_msdos()
+ {
+    decode_super(buffer);
+    if( dosflds[DOS_CLUST].value == 0 )	/* MSDOS v1.0 */
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 6b900f4f9859..14385e78683c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -15,7 +15,7 @@ DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa445
 DIST gcc-11.3.0-musl-patches-1.tar.bz2 3997 BLAKE2B 5ca064cc78b067f4a7822fa0341c37ae03c8024f871d2e274e481a583afa96c36e291be93fbdd633f203260ae2ea9ac1d45f666d134bac75bc9a715a369d7374 SHA512 0ab239c66cf62a737266377c19b8dda6af6df56380f6731c2c17f3e82778e7e023a68d31728490eea3ad946f4b71d4cab363a75548f74b4b7f653972469d9e91
 DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
 DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
-DIST gcc-12.0.0-patches-3.tar.bz2 10756 BLAKE2B e553a0f33eda8472fdf7eb4235c4818ebc67f9707987820c4711e013c30f98a7b683cc38afb204f9185a3871cb5cf5dcd55f79e5cf4cc286a5a1705e08cb4d70 SHA512 d621ddba9d51eb230960fc314e4e15b8a443085ab6dec4de10f351a5a755d1c89dd5d7be9d419d5788c275c70dd62e2c90f8f55415f61c25276330514aa7d194
+DIST gcc-12.0.0-patches-4.tar.bz2 10109 BLAKE2B 8169b76a32d39abb53c0f1259067e084fdcea836c7b7d8801149e6845435f277459d6c26c71af23a5a091a50669834d69daae831221caeb7c305e3ecf565dd9b SHA512 58ec31b740f07d0a7ed85b27d00c3b1afbc4991921526325d9ad99325fc18247ebc24234a44d46ff924156198f3047c027662983e311eb74d4404a58646afa3c
 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,12 +27,12 @@ DIST gcc-9.4.0-musl-patches-1.tar.bz2 2337 BLAKE2B 7bddc631c9f0e68884acb2bb603e2
 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 gcc-10.3.0-r2.ebuild 473 BLAKE2B c9061341ddfa8d143fed0ac5794db4a872527f479b2243e5a939d9e6b1837a2ad9badd6a77ff771aeb4801c1223b625d6e6348a5675191d36708b186400c9b84 SHA512 75e667562d45b1cd7ac48fab95e390131eb6530daa858b450f3d5530c7fc6dbab112e4bcb20f21fcf1c41a0169c8d3483d744b826b12b685a8603340963540d7
-EBUILD gcc-10.3.1_p20211126.ebuild 517 BLAKE2B d1a2009d37088ce3d8caa3a9dd4bc804fbdaf0e779d8b0bd7719686de4718c9f554d8abccb6dc885fffa6437be4d500990025bdc3186fbf5af4574a0ea0e7f65 SHA512 705660fe34d2e8d6e0d14aaf6c54848535d741e1b9d1fe40f8435ede421481aac72e4133ef6d7b8fb1392943690e8359be35b13668a1967a845004aad1ed0281
+EBUILD gcc-10.3.1_p20211126.ebuild 516 BLAKE2B c7e586e91d1da8b25b10eb84bc36e01d3797aa51b1f0134a1547f7ce9edb021f45c4550a3af96d6a4536d260537552743e3af70d325507efa742dcedc61a58c8 SHA512 2d5ae44da23c8962ddef3f8b0f27923c2ce6df0fc4849e022de0e45945f2a973a5c5cb27f49341b5344ee0f934e5967a9a4260ec456a77bf0555cbfe867bf3c6
 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_p20220115.ebuild 655 BLAKE2B 3cba25775eba16e17d9df7d4664561d518d4569abd51b44fc9f2a48eee4ad87c5c355e6ee76fc1e617e3abab797589f5906b81548e4eaa956509f9b86d0a2ae6 SHA512 bfdfdfbf5124318fa42cb1b603c61a9c550e679e62e5186266d2896e6a5dc7703441f0d90864302afa072f1156ac45c73398d86c7dbdef88e3cefbc3eb44e088
 EBUILD gcc-11.2.1_pre9999.ebuild 916 BLAKE2B 7d4536513bc200681534568a22efc5a06cb8b246f775b7465034c47f43a0dcd0f25a4ebff9ca67c47425fe6d1528918afc00e36b2b60ce87c0163fc8b552c9db SHA512 d2c88b671880e600b867f25eb9b7ae0e5c0df748d1171ec8f28a3a661974a8b4145ffd2ad004480fbfa6217ceeb3933ca4af9d9da91eb24c7fcab822466e22c6
-EBUILD gcc-12.0.0_pre9999.ebuild 930 BLAKE2B c22214d114cfa6fe18568cf5fe9b918491786068587d306d41559ee0ac91ee1bc9c5b92303026fcdf5f922e18cc4ee347765066f379757467b99c6db6259f27f SHA512 482644bb13a0e97442899247ca7db6aef3772721522ad93961d3c9bb64fb924cdf92007a17f2c30ae7b626c471c5f752808e4feebb31cd9c76c94d3d2f6d3223
+EBUILD gcc-12.0.0_pre9999.ebuild 930 BLAKE2B 34d93bb342bdc6057831caed296b55ba24ea5f638fd769b7de34e777ed9ed713a092cd16ea75b8c0cfb4fea172974f2693eec1fa9726ce14da617f078f12b3a9 SHA512 ecd1017fd82cc53439940730301b56ca16e64d4c8791a3faddeb3327997f3d5eff45733f1c725e608a7856f7466cbb00d6c4fa12399ac69707dc48f4a690b980
 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-10.3.1_p20211126.ebuild b/sys-devel/gcc/gcc-10.3.1_p20211126.ebuild
index f06487a91e3c..9cd4a9d0c988 100644
--- a/sys-devel/gcc/gcc-10.3.1_p20211126.ebuild
+++ b/sys-devel/gcc/gcc-10.3.1_p20211126.ebuild
@@ -10,7 +10,7 @@ MUSL_GCC_VER="10.3.0"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index 457e05cb4b97..5c39c8bc505a 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 TOOLCHAIN_GCC_PV=12.0.1
 
-PATCH_VER="3"
+PATCH_VER="4"
 PATCH_GCC_VER="12.0.0"
 MUSL_VER="1"
 MUSL_GCC_VER="11.2.0"
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 6c819787496e..c758acda3af3 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,7 +1,5 @@
 AUX icecc-scheduler.service 264 BLAKE2B 27b85732b81c77d419a3acecdc31442fa6ebd3cfb39847b61b056a266049ed4eda1fe533abec2216c6fa2b85914714b72796fe9c892c880671d9ad441a221831 SHA512 c9508266ac612cc6e9110da0d00351ef6b47855489fa9280a8e13dab1c213b0bc1b3e3e64a9bfc16ce89d295bb7418120bd46f8f2c22959d89d7178846abfe0a
 AUX iceccd.service 273 BLAKE2B 6d7ffa2776a8e2d813949185667f949a676240b231bf0c4d7640115fd79cb0b63a2a78506fdf4c557428390b56161bd1a296cb0f44a2505ce61a8de3aaa0b891 SHA512 1383cb4ef14bb673d49d000175dbc9363a55dc1eeb469abf2a393d7693eae0a9b25687a317431b02fd054c4f59bcba1a8eb7132c473c66236d7e2106b35fe079
-AUX icecream-1.0.0-libcap-ng.patch 195 BLAKE2B b6ff2376e02cfd0a1b486c53d5be1012223d16794c718a9aa64dcb89f720884c6a5d01656d99ea69cc44de2ad34731b744a9558702294189d01d01d0d330595f SHA512 31f69f07ad55465103587239249d2fd173dc3b920a026c7754635a3ada39696c1ccccbe636ced0ca2a2283b4adb8f23083a32586c2e803c1f18ad4afd3cc8746
-AUX icecream-r2 1733 BLAKE2B dbd919701df670e7cd1b47cb39fa55eb18c6e539ffa637e2a505ee60b15bb9febd54237b57f42214769e273f5a5fd29cfcc9e29a0a941807388fd9cc7d133226 SHA512 033ce0d49445db3afcbdd6724863651d4951b8f36f6253a13854abe9ee976419687579089aa1c5c808eed08aad357e34bb9f1e70570857cc39f2515ac2f211b0
 AUX icecream-tmpfiles.conf 103 BLAKE2B 4a263834594e0f1fe8cc8e356520f937cfc5f1abd9f019a2b88075643ff651d002d49de113d3ab4bcbc10e22b43e03ee85ea8f948765800ba74c43e5dd3ca0e2 SHA512 152d687a9fe18c71f08c002ee87d36fe18572a6e5b7ab976bbde784c6ff80c5ecda59f9cce4561868fa53ad76a040674af4b0579a97c78c9bf141bc0533f7631
 AUX icecream.openrc 1669 BLAKE2B 18726b8d8752f3db9a2864612423dedd00b347a6802012de5c0ca30d2516b1995c9bf4ae32d1d320a5e401d9a3466f8fc7165fa805e0b9991c16b0f4a96d59d6 SHA512 8c3c66ffd508284f0dc7c9e2695d02ff283048f82f80ac9b41982b6484967b39856a4e7651015d4bb10f74e3f0a7435bd59c0a0ec5eb62bc5aee49cae0354fde
 DIST icecream-1.3.1.tar.gz 224068 BLAKE2B d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5 SHA512 d850394b4093defcf2c50bb3f9306348a45bf17d21f4730baeee7125998c2a548b7b3a7597785855d7e388e84830769bf0ec1c4136330a4c8e359cbdd111f5da
diff --git a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch b/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
deleted file mode 100644
index 3dc0e3713b0a..000000000000
--- a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/services/icecc.pc.in
-+++ b/services/icecc.pc.in
-@@ -11,4 +11,5 @@ Version: @VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -licecc
-+Libs.private: @CAPNG_LDADD@
- Cflags: -I${includedir}
diff --git a/sys-devel/icecream/files/icecream-r2 b/sys-devel/icecream/files/icecream-r2
deleted file mode 100644
index 21cfddeda8c3..000000000000
--- a/sys-devel/icecream/files/icecream-r2
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-start() {
-	local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
-	local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
-	local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
-	local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}
-	local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}
-	local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
-	local verbosity=${ICECREAM_VERBOSITY:-"-v"}
-
-	[[ ! -d /var/log/icecream/ ]] && mkdir -p /var/log/icecream/ && chown icecream:icecream /var/log/icecream/
-	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
-		local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
-		touch ${slogfile} && chown icecream:icecream ${slogfile}
-		slogfile=${slogfile:+"-l ${slogfile}"}
-		ebegin "Starting Distributed Compiler Scheduler"
-		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/icecc-scheduler -- -d ${slogfile} ${netname} ${verbosity}
-		eend ${?}
-	fi
-
-	[[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir}
-	ebegin "Starting Distributed Compiler Daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${verbosity}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping Distributed Compiler Daemon"
-	start-stop-daemon --stop --quiet --name iceccd
-	eend ${?}
-
-	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
-		ebegin "Stopping Distributed Compiler Scheduler"
-		start-stop-daemon --stop --quiet --name icecc-scheduler
-		eend ${?}
-	fi
-}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index a39c96e55e84..c07882605fdd 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -16,6 +16,6 @@ AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 EBUILD libtool-2.4.6-r6.ebuild 3594 BLAKE2B 1af42af727a1aa0a7f7392ab253a34a93b76715b605291cd9ff136708c41ddede5e4cfbdec7b7059f6f40780ac8b6b17fa2a4d0ae17959565e29ed4dfe0846e3 SHA512 425c6a82232cdac39f598c7c8cff46a7594a5644ab30331d56ec92bbbad32fd099c89b7995be568f8ba60e489b3bb7c306fbf79ef40782ef4f2bc1552babcf40
-EBUILD libtool-2.4.7.ebuild 3337 BLAKE2B 08edf323d23e0cc1406e96dfa3bce6863fe00689d2f6f22bc33e3fe0aca56d64a6c38f48af402dadac5c18b51af5e231c7c6fd43d22d641d9b804209a8480aa4 SHA512 e768c94a0c48b820442db50d44220262e489d42cfbb34b7aff0be0ac7a3f9afce6fd60d08944bb42749329d1f5cea606f484755ee67c3567f5c980d07c80dfe5
-EBUILD libtool-9999.ebuild 3328 BLAKE2B 24d35d2257f24fb566bb8b9e771544f59c9951fc8061398c742ca37d81007396fbc8fbb21c471d6dddd1c3601918fb28f20467a2c67d6f1c589fc99d82a477aa SHA512 ac200adb173a7dd60f296ab2623ca067d3e587e747ccc7fdcdd2eaad09d23ff0db44131eb5db58bb005b58581e63ca458be8b345842ea052117c8e92d29e10ad
+EBUILD libtool-2.4.7.ebuild 3336 BLAKE2B 36dcee7ed3244cfe60193a8121ae148b475bdb4a8dae055bca39fc01755eb1ae2c64fd00d79858ff1be326584dd8487474aa85463399cff5837fa8761b19dd75 SHA512 85b068a6a64a4869cb715591123a5b57be4d75d6a52f5c8be83a1c7159340974870d1ad8838bd56d2312a5aeafc5cdd61abdaa5d330dd20bd66edf9ee08687a2
+EBUILD libtool-9999.ebuild 3336 BLAKE2B 36dcee7ed3244cfe60193a8121ae148b475bdb4a8dae055bca39fc01755eb1ae2c64fd00d79858ff1be326584dd8487474aa85463399cff5837fa8761b19dd75 SHA512 85b068a6a64a4869cb715591123a5b57be4d75d6a52f5c8be83a1c7159340974870d1ad8838bd56d2312a5aeafc5cdd61abdaa5d330dd20bd66edf9ee08687a2
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/sys-devel/libtool/libtool-2.4.7.ebuild b/sys-devel/libtool/libtool-2.4.7.ebuild
index 2eb522d28d08..65f0d1aab0da 100644
--- a/sys-devel/libtool/libtool-2.4.7.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 648487eec160..65f0d1aab0da 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69:*
 	>=sys-devel/automake-1.13:*
-	dev-libs/libltdl"
+	>=dev-libs/libltdl-2.4.7"
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 6ed210eab4fb..47f41c57df69 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,7 +7,7 @@ EBUILD lld-11.1.0-r1.ebuild 1250 BLAKE2B befcc678c9eda33c73806c12b2c24bb8f3b8c93
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf9351cd2fd262fb3cf1894013b3059800dd856bc0e896af7fc75b381bf353e1d22d43fe36d5859a2086b983 SHA512 6d1ba9cf7ab959da15975b4d1c3117f0a235618bfbf0bb743d73447105ab6672b25e839cadc34415b721c8755eb28abb2ddadb8c4793d3d7f4506f032e4d868b
 EBUILD lld-13.0.0.ebuild 1871 BLAKE2B 13ea83d64f25df0664fcedd0ebb44dd84ebb8828f0e52b7cd00eafd0d69d1c1d0c27a2da492d8a55ad4b0b39b6569e151ddde250db3cd19bb784bdc4ee1133f7 SHA512 24e2bda650f31508528896c761587a0abeeb061d4e4198449dc50b0794622fd8c87bb8d2d816bf90801dd6914b09e644ed2d3e97cb852f8ad8c005141f5e1bf4
-EBUILD lld-13.0.1.ebuild 1873 BLAKE2B b9ab202812bad456ce8c602df2060e365537d7ebe7815cc7d8242b6a9250d502c3ca7ea477301428dd72d0b97a259ad34d85067e0d081267f446d6caacf8e295 SHA512 942a50cf11859eab60ae1d3773efa25b131a3f6c4303bc1ac3584dbffe78e9b5b9ea36a5462c1a23ec0181c98f7e94f5d13f307e37e8321f4e34aee26ccac064
+EBUILD lld-13.0.1.ebuild 1872 BLAKE2B 057d0948b8367967888f3d618e46c15ec4585b0c40a6e9159fea657a57a48e6e52b49b2713b3854780432fe84be00ffcf04003af1b668ac6506bfc81e2514bf1 SHA512 d9ae57d1bb1ee67c3221dd39dd4df3ac2f11823ba6aa3fc328e7a0687a72842a2d455b5dcd64d9fa89033a0a4e5f6a16a2a5dbf3bb27b9f92ead79d197daa743
 EBUILD lld-14.0.0.9999.ebuild 1840 BLAKE2B c3123287f37b91ae5292bcf8ee990cce43fae431249ccd8589abd06a86b4ffcd10a6c5e8006e71e49ba6182379efa44061fdd4260c399d2d85e2be2b27406a79 SHA512 aff51dedd90e10007d272c2f2060ebab63937d86c4e2faf375379e18ce1fb1eee0fe55fd30c02493a7f2f6612f8215c37b2b6512204b5147b8a72cbb4e4e4af0
 EBUILD lld-14.0.0.ebuild 1882 BLAKE2B a1368fef8cf1bf6d9992ee4e02dc1997c7146db0a58d084f304b1d1b9dddb7543c91165d50bfd314371ac320623318c0b9879814ab7757546510558f9ae1bd65 SHA512 71c8c4e7d54edf807f183eeda354dd264d883a69575a08bd8d2c493ca2665e591b4635563387348fa3957856d6413099c7b09c9877c5c1bd24795be2417c65c9
 EBUILD lld-15.0.0.9999.ebuild 1840 BLAKE2B c3123287f37b91ae5292bcf8ee990cce43fae431249ccd8589abd06a86b4ffcd10a6c5e8006e71e49ba6182379efa44061fdd4260c399d2d85e2be2b27406a79 SHA512 aff51dedd90e10007d272c2f2060ebab63937d86c4e2faf375379e18ce1fb1eee0fe55fd30c02493a7f2f6612f8215c37b2b6512204b5147b8a72cbb4e4e4af0
diff --git a/sys-devel/lld/lld-13.0.1.ebuild b/sys-devel/lld/lld-13.0.1.ebuild
index 436f354f89e4..c66da239ad73 100644
--- a/sys-devel/lld/lld-13.0.1.ebuild
+++ b/sys-devel/lld/lld-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 1176746f6436..99da3f91b0de 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -6,7 +6,7 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 EBUILD llvm-common-11.1.0.ebuild 603 BLAKE2B 0a7273b73b30e1cfb707d232c8634368edf0c10ec938c78544c65ee8553f0916a271fbdacbd358fbafc8d02f1f3e2d8f48dc4ff5b77ef9f5d5f80ef3d2e05eb3 SHA512 520efa24caa6415e82461362659b7db6ea11d4bc3b6b93105cbdd45ce0f46dc35f2b14151425e989a45656e93a5d7b9a3288ff55ef0d585b4b376dfcd5908067
 EBUILD llvm-common-12.0.1.ebuild 608 BLAKE2B e34ba1cdf1c8522f3622106a88a56dc7c6cd5bd227db31dd610d1879f39842052feec45235a197fe63f8834c8bb77a410632895746b448e50931abe31275b49d SHA512 83df951b72eb186aa705ffdc3b688df2d0bba4884f76c526e1ae4b4f7acf5afc4ec420038bdb89eed41938d84ed1feb52df8bcf4454fe9d72e5cdd0d48788253
 EBUILD llvm-common-13.0.0.ebuild 608 BLAKE2B e34ba1cdf1c8522f3622106a88a56dc7c6cd5bd227db31dd610d1879f39842052feec45235a197fe63f8834c8bb77a410632895746b448e50931abe31275b49d SHA512 83df951b72eb186aa705ffdc3b688df2d0bba4884f76c526e1ae4b4f7acf5afc4ec420038bdb89eed41938d84ed1feb52df8bcf4454fe9d72e5cdd0d48788253
-EBUILD llvm-common-13.0.1.ebuild 610 BLAKE2B 6da5846ec8b3f9fd400fb9e4977c575ee2d7558c4436b224527e8d73cc2f2d2fc411487a56193d4a47da2c13d03b2df8b3421a16cd196a40a78dcc97ac0f05b0 SHA512 953d6d7e07163f3d38089f616abd58fb62698deb5bec369d6032b5974347abfe845a243fc4151f29d615436dc29ff59e0c85a72bfd0f297cd20ec0c26dae75a1
+EBUILD llvm-common-13.0.1.ebuild 609 BLAKE2B 0157281f2994ef9e51b10ebec0a8bd3ad2c9a80f711672b60e51e2d888c3da1e6499a907fb4014a7e654cddb964349fcccd799d9daa149c562e197c29ff11391 SHA512 6f395c066bc7bb79f7cfe3bc3ade4918d05711d4d8919717b55d63f529d759256cc76099d200056ebfd8113944fa6f299357ffe32f3e3df3b309316adc765e91
 EBUILD llvm-common-14.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-14.0.0.ebuild 613 BLAKE2B 4d0308c12985232c155bf35c4ed1d596ffbb765f7672b31a11f8e0d6346984e3d1b3898c61707f2f38df571a45f4ee949fa6cc86b06f71d48c94dbdaff848dd0 SHA512 592449ee083f16a562028ab523ffe56291044f2e3f0e030b6f333da8353112cdca7fdacad58665db77cce50e9eef3c9f08ee7d28eaf19f7b485c4549ae60cb74
 EBUILD llvm-common-15.0.0.9999.ebuild 529 BLAKE2B 7c870932616dfe5dfbb9a2e83a38f924dfe8a6f9fe345622fa27691880a34e64e24babbf36221badd0f44c33798e5e2a3b6e10dbb9f6516d1fd8da9b38d7bcf7 SHA512 63b7862eacfc17889d7582cdab20c7699f6626fc1dae202b35061a2616eeea01968cea570fd700fd7e617dcb1b2b5c774c07916cf4a9f1141834a1d513d0be8a
diff --git a/sys-devel/llvm-common/llvm-common-13.0.1.ebuild b/sys-devel/llvm-common/llvm-common-13.0.1.ebuild
index 758406a44587..e142b3745d56 100644
--- a/sys-devel/llvm-common/llvm-common-13.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-13.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 2dfe677e0e31..e354d48249ad 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -7,9 +7,9 @@ AUX llvm-roc-4.1.0-fix-missing-include.patch 665 BLAKE2B f1bf71ef746cb7bf2671e88
 AUX llvm-roc-4.2.0-add_Object.patch 439 BLAKE2B c59ab50959d94ea04d63b734d580f1e91e6fc12bab5ff94b2322a28388ffb2e9e2bd26905dc3095bc75c57248b6e9a0e8913a1d02054b06c7e5e3e72a05add93 SHA512 ed2ffebd3c79f2dbcdb77cbacffc9a546b35e11a7c523d524ad74b6b69eab7fca91e0d22af09bac42284865da1a332292dbe8a3df968e4364baf55996ea05823
 AUX llvm-roc-4.2.0-current_pos.patch 1217 BLAKE2B 693e79cb895918f5e1a56be8d6624c049e8aa5640c55c34fc3fe27f053b7642670310ece321548df58f23e73d145f00d5c95b1e462eee008070cf6a2fde1c66c SHA512 fa8f773ba230e01f83526e4ae644fb2e7aceae99720cb5219c1b22baaabc5008f9b0151aee4c44ba9a4415ef421a8bfeb268302ee70e8c56428bf56c08b15903
 AUX llvm-roc-4.2.0-cyclades.patch 3703 BLAKE2B 3250b2da548ffe759155fb673f0f81cfba1a918a8337aac72c8190edde18c0d14610b9734ac47c9e47570c35c6c28a525045f48acb446f70e7b6aa0706daab72 SHA512 694c38775a6353eba3c5bdcc39e2884a913f72b7a35dd5285ceed0ddf89456c9ca89fa2f5d801b6f4aa44f1301e3ceeb65f1641cd92d5128a91ebce5f42a261e
-AUX llvm-roc-4.3.0-hip-location.patch 7128 BLAKE2B 6756bcad1c0bdef0729d3e7f2c6ea3468777623fb1493209956f436e9f234a1728e052c31ff064f8125c72d2a8cf68f425f76fb21cecf02680e999a6d5e7e41b SHA512 09f42ce7a37e072aa813036b78efd38cdaee54a1155fb347bf22f3f9f87441a6af83014fbc798f4d6d11966f40cf9c9fe6d3a8662b58be7859ab5b167eee37c2
+AUX llvm-roc-4.3.0-hip-location.patch 7461 BLAKE2B a89cbc1bc69647b4fd5d6e757967d44ed15299fbf559305128b2ecba60446065382335e1d7a686143bf16b3bcdf65e5fa6690e95a8791c5e0e0fa4e24541c86e SHA512 fa8d0128a858973165fb6f651db06e68ac4b8569437be12292d5c131f6d5d4859131a9f7b2f5b9cf8ad5515a3d9b6ba261058082a6cb6706b70c77299c7e20df
 AUX llvm-roc-4.5.2-add_libraries.patch 342 BLAKE2B 74e4bd50143d8e369cd3cc805f2d15fbad94667adcb8b001faaa7ae038bd69b8b2a2f4a02572a7711dbdbb356b45c653371e1e90a6a3abbaf3261952d87fc2cb SHA512 24d5a6a3e3b710138c0795af5b93b222bcfe1739d650a13c9564e4d7452d77e6392229e2a1cc27005cf5d3a572d6533e25bb608b52e4d113449525cf766f0e25
-AUX llvm-roc-4.5.2-hip-location.patch 7108 BLAKE2B 1db4e922a3ec7ef3868c5adb7c811ddef2edf8e5b7bc02523a20fd41c9acd00ed904944c909fb8911b165c461832e38ec5eceeed0971680dfd3e4219f217c667 SHA512 a9fac99758a1ae98d3790e0b9f95056e852c62f2b53109a432514da60c1165f41533d6b94f9e9d88982bf22ef460d3813ca0532f5ffb801f184ec62778b6f856
+AUX llvm-roc-4.5.2-hip-location.patch 7441 BLAKE2B 602a96d5e7f8aaec4946eb9ff62b92e3a6d38b671c1acf3d8ef5f331887df41a41fa948b3cf321bc7ef70f075baa9c50a3da463289ac1e880d88c292c9340558 SHA512 159b116e6aab44b94fd5f2d582b0369ccace5edd73ae41801c4f306ea789958723b948486baf25cf212458987d2f8a16d94f8bbaee4ed4865784f858e2f7427a
 AUX llvm-roc-5.0.0-add_GNU-stack.patch 543 BLAKE2B 448b1c932ba9eb5c808277d4aa3caf835c44c5ef2564e0903ef4aa94c20c33dc1e0d4832d1338d0947079a3341eca59b919f1970e93dd878ef24da67fef90118 SHA512 961fd8a13bb9e9661b92ed994024eaff3629429499c40fe74649b0d8533c8e06bc5ae6f7eb5587d6361f253f8beb688e7150e11994244cd79680ad6863829096
 AUX llvm-roc-5.0.0-hip-location.patch 8082 BLAKE2B 3c468dfdf6eac3b85fcaa97bc33091042614f83be926c62b1750026fc131a425ee2b30a4ac285752b74b7120897327120b8825fa16577ab49e4e6fced76272fb SHA512 f0f86a18a5b60b10dee9214ae7504c5cdc1e38e4fd53c7fd8cae68f9181a8622b28a5796203f785199a8fdfc013567df4c8e4d6db767c6f62cc9f444d42a1880
 AUX llvm-roc-5.0.0-linkdl.patch 476 BLAKE2B 4854e08cbd4109eed02fb1154ff9dcf47d78b4a6670fbf65b5ce2dbfa0161a0e7a638299735c4edef4cac5799f1f88d3b781edb9738905ed118fc90f071fe47e SHA512 89097d32d2b5b7ff23192b5750771d2272b8ab34f248aa48f9570e778f94db61baffb6e8d2c3ddf017b745ee31edb03cc2d62439ddba8249d35692f32a4170cb
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch
index 1fe93a33db36..f3d22b996915 100644
--- a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch
+++ b/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch
@@ -143,6 +143,15 @@ Author: Yiyang Wu <xgreenlandforwyy@gmail.com>
  }
  
  RocmInstallationDetector::RocmInstallationDetector(
+@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev
+     // - ${ROCM_ROOT}/lib/bitcode/*
+     // so try to detect these layouts.
+     static constexpr std::array<const char *, 2> SubDirsList[] = {
+-        {"amdgcn", "bitcode"},
++        {"lib/amdgcn", "bitcode"},
+         {"lib", ""},
+         {"lib", "bitcode"},
+     };
 @@ -423,42 +298,7 @@ void RocmInstallationDetector::detectDev
  }
  
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch
index 7b5714e610a7..f6f60cfb1b0f 100644
--- a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch
+++ b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch
@@ -142,6 +142,15 @@ Author: Yiyang Wu <xgreenlandforwyy@gmail.com>
    return ROCmSearchDirs;
  }
  
+@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev
+     // - ${ROCM_ROOT}/lib/bitcode/*
+     // so try to detect these layouts.
+     static constexpr std::array<const char *, 2> SubDirsList[] = {
+-        {"amdgcn", "bitcode"},
++        {"lib/amdgcn", "bitcode"},
+         {"lib", ""},
+         {"lib", "bitcode"},
+     };
 @@ -424,42 +298,7 @@
  }
  
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 762c1f18e888..24c7726eaa17 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -17,7 +17,7 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 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.ebuild 12240 BLAKE2B 084a4c9f5c4223c323ef4cb9d824e6d066ec2500b757bbcdec6d1bd4b3f511ad966aa99885c0689ffe863949b71e8548e228504376a4d9bd770821724ad34b63 SHA512 6b50d0b0cb3efe664d00612d5ace6c564c78bb004c50a563a7d4503e917739d70681e01b21d210917186b8bbc629290fd39c6d699b405398a0fcf80b518bccc7
+EBUILD llvm-13.0.1.ebuild 12239 BLAKE2B 77866f33b2dfe9725da55b1d0735ba24d905073551164dfd97ac2ae7aab5a3e19e193bef1c563f06bb66cd26915a5816f79608e0672fd43b737b3c25011fc730 SHA512 11d5b853f541cb23fcf60ffb3487dbe805e084bbeee26ab7a5fd9e6cbab3cf52dd511073c798c4266330d9a98ec783137057daa6bc9b2b49aab74e943f8788d8
 EBUILD llvm-14.0.0.9999.ebuild 12360 BLAKE2B ef0d38029937a8e12aa1367fb0189f4624f93c401b1c6c43919fb41cf87503289ccbcc8a0e10bb4679df936e1dbc8ea7340443db932d258f08b73cfa80f35dad SHA512 c78112922664dbf8dec3ce46f80566f68b9de12f416a384f63a4b785495db54ca10dcc15a14dc5bd4f47d3c8ecdd625b334583de563f61ed3e0b4906c735e56a
 EBUILD llvm-14.0.0.ebuild 12453 BLAKE2B 767693f86f7461dc7d4095b31ec6806e25efe04b4f5eac0d3b70e5f1d727b8e8d25d360d5b3f0a12fe94c8139892803676858c3945aec11742314a5bda46836e SHA512 1191243720087401f451e344c88f2b1722e41f7b794a2f811f7d3a05d0ea62f93d621d8342ea948884673bc08ddc5784517c49313c7bd6f789ae14f71080470b
 EBUILD llvm-15.0.0.9999.ebuild 12385 BLAKE2B eeab657c8eb06b213880685d46d9fafe0fc1866c7f33ac332968f3fb905e9bbd958e1684c94f91653fa64444a139b316ae807326463c805e3c7002ed0f380ccc SHA512 59d26198f3e146ab0917ecd7cad1e687aa8ced229f94e3db50445b5356e5b972ec0a2515b52954438d70838c50f66f946305992207956a9c4268c476464dace1
diff --git a/sys-devel/llvm/llvm-13.0.1.ebuild b/sys-devel/llvm/llvm-13.0.1.ebuild
index 8fa41ea276d7..e39931e4d323 100644
--- a/sys-devel/llvm/llvm-13.0.1.ebuild
+++ b/sys-devel/llvm/llvm-13.0.1.ebuild
@@ -18,7 +18,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"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /sys-devel
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)