gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-libs
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
71 files changed, 169 insertions, 2376 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8b8dfd168c53..b4e4fa10ddfc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index f1bbe474e112..40b43c9c81a9 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -6,6 +6,6 @@ DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 EBUILD binutils-libs-2.34-r2.ebuild 3680 BLAKE2B 96fbeb96af93c6db271250870c4df85773db022aa7dd070ccfa33ed2dae57ecb0d543d93cb2ff0666e1b403f325e035a1f9988a05a16f53c167d168e3d6bec4a SHA512 9d540bd681a08451091742e9dba7044ab77a9d8c7920b8f078146fa7eacaa31b872f20c30477a33ec5bec3070408e1b2ac51e145af86d56fae794ace5f2972a2
-EBUILD binutils-libs-2.35.2.ebuild 4104 BLAKE2B 965abdd5084b8db655b27928c4e3103bc22052a7da72a96e871409de1c78d9f43be9c1f4276912bc20a60151713fe37000e93081bb07dfaa3816793321969b8b SHA512 001405e75e9323f73249f64b501f9f9c019656b93d9c0081652c83b211a426eee4be94e8abc4bedbfd39a808921813ac3809162c4cabb5b7318bc6aa321dc0a7
+EBUILD binutils-libs-2.35.2.ebuild 4102 BLAKE2B e988ab2daeb4f77f469f76af9a56d5509100d6dda39cbebfd41e554d944ef2f4aba2f4c320477947b2979ede808dc4b9a06747e10f878d885e8339e58e7e4f24 SHA512 384c2b9e3819516b9191e65793e32c54b492f31fefbe17c6cb61357452ffb5e6916f9b1dc6bb90ae8c9603f805e3c601aca12b7bd66ebafb2b3106f436185a03
 EBUILD binutils-libs-2.36.1-r1.ebuild 4062 BLAKE2B 0e41ac1f70816696b908c79376acb43c313d6337e39420a1b6f03a961e3e599c9b75ff1e18dd7c1998375b0b15b49f00812bfb50d114f2c3d87c93d2070a0410 SHA512 5c62e3511ed4d6eaa21671a2c1332b8b1857863f0adaefffe23f23f0d0455e916665a6c5a047b8bfa85484a52be1ddfc3a03a1ca4317b52926220fe8c7edda61
 MISC metadata.xml 611 BLAKE2B 6093d3768ff4bc40fa0f8d1ebb3d9a5454f5e492030892d4791e7aafeef0ab4bd2902b818602725bf54e9045be762c1f495eeaf3742ec3ec4c4beda127e2c8d6 SHA512 21b771eb04b2e6f642e3ac48f13c2db19b728c8ed13821c39bfae696b8726f6f68ee65bb89ec0e90adfcee0e7f07a3109ab35e0699fd555ce0b84ad23ef81d1b
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
index f10651d7aa79..cf18b9ed65f9 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd cet multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index b94311a2e2b9..c57ec965efbe 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,17 +1,12 @@
 DIST llvm-gentoo-patchset-10.0.1-2.tar.xz 9016 BLAKE2B 50cebbc89f962e741111d0cd6ed108c0ad1bd4f3c83d27be592af7607c8cff953be7ad797ba03dc9fae403c39a2dd1dc942a84be064c2a574a0e234ac0e5593d SHA512 d610dde051e1e797f02ce7c0543187cf850465665fe5c51d3b8af8a944478803837dc05abca6636072ca7249a4a3d2884130b3f94c88e56be1aa75c7c5b6c747
-DIST llvm-gentoo-patchset-11.0.0-2.tar.xz 6752 BLAKE2B a2b8f88500844e277423e019e20bdfb53da761f33c0cf01ef028cb73b01273420bd492590821b28a6afbeaaaca8ef4d4eb410d86e44d918124ccc2c064bc8df8 SHA512 33fb68077960714a33bd1d86ad0e8981ee3a9de44b3e147c1d5333da59170b5fab8b21474b49e22b21929def27847c93dcd8bf41a5940b937b3e04a59a2f417f
 DIST llvm-gentoo-patchset-11.1.0-2.tar.xz 4732 BLAKE2B 5ec43d404e9ba446171f743609717ca658db3e03ea197866569aca180ec733cf3b7a1880ef3e52f9912538f83ca8ddeaf4dccab4622a1e574f5b499745b0be1c SHA512 845ed0defdb3742a814e6b2283788c7c9e6e28eabcd48f9fb5c5a99063514af7c7610415619f4a8b993312866ac7a316a1f1408cd8086bae85db52ec652327b9
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD compiler-rt-sanitizers-10.0.1-r1.ebuild 4513 BLAKE2B be188f8bef66099999a98b033ff18f132a1697beb8606f44a7bcaacabff7123439b09e4a34e03be51eebba4b4059461b5953888a99753fa7c58dab7ae3f89337 SHA512 97bb314099bdc4b4f237eca31da1d0ac5bf548c05a2691fa0c6c5308979fd654649ccf8e121cb1529b6261bd1045d55ca6e0bd851d3b8896d46f13f8becee821
-EBUILD compiler-rt-sanitizers-11.0.0-r1.ebuild 5049 BLAKE2B 157b4ebc7c5c538a7d5a674a6ba54e329c4dfd7d7bdb45c4fc0fb155aa66ad62dbdba72c62720eb512ea56e44135413276818894e27c19ca5b3e8dbca659441b SHA512 6c0679617c9d4dba9cb43f13fab331f7a5d30cdfa3e181133758747a6a0a2c5d14937d0c608a52cdd38480799b26ca3d8d0d459f116341f677f916ed33879f68
-EBUILD compiler-rt-sanitizers-11.0.1-r1.ebuild 6037 BLAKE2B c03918cf0839fae32b3891d150ddaa7e97ed66708bc44cb16f1856f36166021b0b1099e28dc9ad37bda18cac318701670823e9ecd7dc2ac74c802ef2cd308cdd SHA512 f19e2201f3d03b0e4b513553bebf859e738944abaa4de843ba924c94a8fa99cc44a596da1cf501c19bca852b3a502f249db88c5c00d23b5bf71d0178c1999ff2
-EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6037 BLAKE2B c03918cf0839fae32b3891d150ddaa7e97ed66708bc44cb16f1856f36166021b0b1099e28dc9ad37bda18cac318701670823e9ecd7dc2ac74c802ef2cd308cdd SHA512 f19e2201f3d03b0e4b513553bebf859e738944abaa4de843ba924c94a8fa99cc44a596da1cf501c19bca852b3a502f249db88c5c00d23b5bf71d0178c1999ff2
+EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 0b573d9345f36f750283574bd5f2efe8d60ced8448a700b3571a2303a26a79fa1240c6347d28ba810f7619afc58afcd3e369b2a7769b3a2ebc303919701eddbe SHA512 960d2f6ee96dcefbe3cb9b6637676cc1f16cbb2904bb6913b6d1807afae61229d7774bebe0d3e50fff62bf7fcf5c289ad8b7a5c614ae2589b9b3c891103606ef
 EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a
 EBUILD compiler-rt-sanitizers-12.0.0.ebuild 6085 BLAKE2B 4571a815cf55d95ad179e22ae351163e4df99634db9b89217b1ba17281b4945521bb99f03934fc97385d2854902dcd606939c4219a633935f78673c2475cbe9c SHA512 650437aa5152276a2cedfe8dbb2e1a43405f134702670f94f0434f54ccd837a5ec062417c7536581e9778a12012724872f4eaa9fbae5d2e51645d8016d39d262
 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
deleted file mode 100644
index 61b07d7232e6..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=11.0.0-2
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
-# FIXME: libfuzzer does not enable all its necessary dependencies
-REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
-	${PYTHON_DEPS}"
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error while building tsan if SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1-r1.ebuild
deleted file mode 100644
index fcbac3eafef2..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+clang test elibc_glibc"
-# base targets
-IUSE+=" +libfuzzer +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT}
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=11.1.0-2
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	# broken with new glibc
-	sed -i -e '/EXPECT_EQ.*ThreadDescriptorSize/d' \
-		lib/sanitizer_common/tests/sanitizer_linux_test.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
index fcbac3eafef2..66eed5f8f3d1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +profile +xray"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index bc60e308dab6..85d3fc133cb0 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,17 +1,12 @@
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
-DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD compiler-rt-10.0.1.ebuild 2782 BLAKE2B cdc7937f616e86c3394d1cc68eeea05f3eebdcac051ca48e477d3a2cb765be1d616159f72a2b77ac21a0c2a4ebf1cc79f9d9cd23a2a1c7b26a4a252142c3af21 SHA512 4380bb10112f745e0034d36be105a1b4df159f34adafdd2b24157dc3652881ab8792e7758555ce167f59e2c3360b5d36b5d4f8d456df44fa5ee754f3c310677a
-EBUILD compiler-rt-11.0.0.ebuild 3504 BLAKE2B e470e57b3569979600cd1cb60c04cd5544f2c4e74c3e8df3378ea5a5707741081fd613a344e46c94a89474ab94b4ea3cafa49f62521007bb137c6b7d0d94a6f6 SHA512 d9ee8220a476e83274a5a045ab9ff67b02d8c70777bf4e7ce31e30fbb950de6cde8ad55c1d3942d155c694a7a311944575f8dc86de8c534925802232df2f883a
-EBUILD compiler-rt-11.0.1.ebuild 3507 BLAKE2B aefd0b6345b3e96d52163d253ca4699f2341b515e5702eccd214c950271fa304e4e412d24ffcd017264fea3448c74d3ffa92f71795b079928acc19c973ee18ab SHA512 8ce124013fd5d0c10722cdb378ce840ab90631c2cbc95d08783f9b8cd5031c5efaa691f826ce1852f9451dff7fc7ae0d899a557d3f971c65e667853b8a805e19
-EBUILD compiler-rt-11.1.0.ebuild 3507 BLAKE2B aefd0b6345b3e96d52163d253ca4699f2341b515e5702eccd214c950271fa304e4e412d24ffcd017264fea3448c74d3ffa92f71795b079928acc19c973ee18ab SHA512 8ce124013fd5d0c10722cdb378ce840ab90631c2cbc95d08783f9b8cd5031c5efaa691f826ce1852f9451dff7fc7ae0d899a557d3f971c65e667853b8a805e19
+EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da
 EBUILD compiler-rt-12.0.0.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
 EBUILD compiler-rt-12.0.0.ebuild 3545 BLAKE2B 98aa5cd6f5ad6f5570d432811731dc96ed330f7d923628edbf5fd58a24f28f2c70c5e7ef912f5c367c0de6a38e4b06cca4bfc8f412f377d507e64df611757ffd SHA512 e4345c91a92b697641eeb621102a35d287c8c690eba039a160f98ef12f93f33bcf1d35f5f3c6341eb07be62678a601567152cc908786fb3d4f70995fe94ace58
 EBUILD compiler-rt-13.0.0.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
deleted file mode 100644
index dce4982904c3..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_PATCHSET=11.0.0-1
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
-	${PYTHON_DEPS}"
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
deleted file mode 100644
index 1041a4553f3c..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_PATCHSET=11.1.0-1
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
index 1041a4553f3c..46345babf318 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index e09fbcf726ab..f617602743a8 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -71,18 +71,18 @@ EBUILD db-4.2.52_p5-r4.ebuild 4640 BLAKE2B 75d2682fa7ba0276391079b38ee7b7f2809de
 EBUILD db-4.3.29_p1-r4.ebuild 4510 BLAKE2B 35b4742c38626b3caaafc16c4424321ca603b7fcf1c3e987d983e6e17d124e8008922a2987c05439c2628d94918251204d17bde5cf45a9e0dae30c5a10c1f4f4 SHA512 144c0095632395b6ab7f9279f4e00f40a7f823fdefa28f39ee54cc4019c631b91e3f2e1da8bd9d7afe46378647424a29c86356fd27394d1e19be53ced97038a3
 EBUILD db-4.4.20_p4-r4.ebuild 4398 BLAKE2B db3ddc7a2b706889692d2c06063215128cc71da6b6ecd4488a87c8b363f6b26bb3f795df602ad1b19202d930f9e2bc0eb9b5ef9d0fad3e7b896ff99fe60d0826 SHA512 219b0d8fd4e8c12a59d5856f71b6dd3f8b6b53229ea86b774967a5c082715e215ac73962a747802f1804b30d152581434d2a75c4521b84483f688c2871b69a21
 EBUILD db-4.5.20_p2-r5.ebuild 4638 BLAKE2B bb3dcfd57bbd3be6e6d0a199f83a46d6ad709665100aad59854cd7914bec63fbe16fb76945d2f0ea6ec5fdc8d5215b27e72d7e6a2ec520eeeff257ea5f4bfd5d SHA512 0a0d8b5cf67fe9073331e14f4402a1eeaa2e274f2459291c76f52ab4fd5f566301919bab26688a30e49504c85b1f6e643a11c0464ab9378c2c778ada4537c21d
-EBUILD db-4.5.20_p2-r6.ebuild 4731 BLAKE2B e6cadc392a5c172a8549d365a9f517bfae1e02bdf9d7b70251fbde385a6e8c74144406374ec7bcb75aaea3e255be17eeecc0546642e64a679c8c99bf89d8c380 SHA512 82245f88bd06c5b8a11efe10cdf6c7d9cdcc08bbb20d4ec038159b5298e49b819376a9a7db2e335a2068272b55874e193877c555c1a6c6cd2f49e76aef00816b
+EBUILD db-4.5.20_p2-r6.ebuild 4730 BLAKE2B 5fbdec2c6b458eb55916d529917f89bb7ae25a47e0b04098984c5f241f185aa3506f03d0382fc89c40d44b7746dc65801c9b81711735d817bbe2de0547203544 SHA512 0ab94fd004a83a947e71d0d99f2c7edb5a3c6ed7159d2db01ad7664dfdb8547b20fb2e4a6127294ab37799db96ad4093d914a58b457e6a4deb518b7004ed906e
 EBUILD db-4.6.21_p4-r4.ebuild 4360 BLAKE2B 1bd0a69c3f1f099f96471b9f8633db6847096d55aca14862e1136d59efba1557958ebf5af2b7aa6d32e93d1aec1da32c11ac70b96180fdd586fffff1f28a8379 SHA512 cbb70c4687aae61ed8c8c523cedb60cdd7664e1fd62b2d8d171758fe08611dd01483e573ba44a90594d9090c8adaa0246ddd95600e670ce211f5c3b54555e138
-EBUILD db-4.6.21_p4-r5.ebuild 4453 BLAKE2B ee2092f72e4b259eab6357af0cfb3f44e3923cfa426fa55603bfd88826760ae9dc0eef27fb025640655a9f97df5fdda42b47ede22680c73a5437c391d4d57b45 SHA512 f921dba6ef09c563e31d05ef784398a6ece1d06e7956df0deea5e709ec986d01e15d814f90e4877eb825355a1b3f592848ab4ee339dec779545f36d8f7ed6a68
+EBUILD db-4.6.21_p4-r5.ebuild 4452 BLAKE2B 16af0a958c82ce5dbe764803d14600733623d2c3cb1db83d0809c86f8843f66d159398cf0423347f84838d4f07c27c925eb8f15560f3d1b6d949563d5b7924f0 SHA512 c9c3ab66ecbcd50feecbde59090c970319062fa61e9447500a9c2a0c4f689abb58039b6f9df369ca8c0c7921f394cf74998de2440644e5aad0dbd97cc14bb7d7
 EBUILD db-4.7.25_p4-r4.ebuild 4686 BLAKE2B 452bc3e8e62c91843a58a69e77d4678daf23a749124f54aeff0b7bc20bd621d008cdeb79e21db92a4a072c7df67e7631d27e1868930222896ce3b44ed8298038 SHA512 ef7db867c191686d9ad538b12df98bab7c4c56d0a26a3b1bbb17051208f0163645566aa76bf98de95b92fe788540e81b697b747818f1e82220a1f4f407049678
-EBUILD db-4.7.25_p4-r5.ebuild 4779 BLAKE2B ec785c0278fe330e0cbf54f5f363de66f8627e2954d75e29aeedfbb45d606cdaf6cee5daf54e3f05e5a05d7518b94ab5e9fcdc34d791acf46ee21148cf2ad865 SHA512 c852ef9399511f80a80fc2fc8d9a4ef455484781cb9f6e45ee2ef2a0788e8e10ecff8a98ba23c2654c1c7c695a42471f5d8ff4d3e22def7ebe3123bddc854271
+EBUILD db-4.7.25_p4-r5.ebuild 4778 BLAKE2B 49a5cdb4883142aedd0587e5940d117a614e71faf375df75b37971466e8b97de5f94ce074838fe250cbacb38fe2e1aaf522efc765ca2b84ff0269bd9d2fa4f5f SHA512 3500e60bdddd264d8ffac7a808ab0ee17bddad7f01e737bd3913c661270dc8e2a7410b806b453159b9f7697cfe27f2d21924524ad5e796a6b3f4a50770316ff4
 EBUILD db-4.8.30-r5.ebuild 5182 BLAKE2B f977515df746d0c59fa2914f33b4b9e53c80d0085da522b2f547101a72524a784de854561b4d6b065f8cb2c4d7e228bd85bd073bed0c618ee0185df7802f4767 SHA512 2efd06d524a24846f50363311aa3957a6b1ad5fe6816d44343d303d41673922cced9acc1cf418fd72a4802c3eef9e2434559965aaa61853e8182ea52d1e5376b
-EBUILD db-4.8.30-r6.ebuild 5275 BLAKE2B 264b58a8b576872bb8d0b78739a526d03da1f28e076a8157542f33226e9990f97791805d5c7fffaceb1ceb40d5065469676172820058b57b2a1d1c2c6f2258be SHA512 d4f046a0e6c77b728eb919189bcbb7fba2879834825867bb3cf9687fdf794885acfc406845f7128d03961a787a0173e2a4d8dd567b3daf6411ca604184522f5b
+EBUILD db-4.8.30-r6.ebuild 5274 BLAKE2B 1ab6c49e551eed1889424b87ba7d9bfd033cf29ea281dcb8683a94076e821edbb1badddffd9ea5751b9e580a9e4a6ddbd157b0b14f703f17fa730a1a3bc31365 SHA512 3e76acc49b757b3a67c7852b4cb0fb9476afcb926f1ba828d253933e3cfe5fbf0b1c81fed66850f0b667aef132eb917bf921fa605dcc95f7a93c8fb2e1d730fb
 EBUILD db-5.1.29-r3.ebuild 5828 BLAKE2B c6c95e2ca50f73ac706130c111c3e6522cc7472ea34add7c7edac1578a872a6660fb7d5621051f8cd2cc04d165ee9667fd1ce3785c870602347f934832e824ff SHA512 ccab98198f26be0be79b82c715cd6f773f246af4c8cb61150c5af25ae954fc0e48d5aeec26309dbe5669b0fd1ed516f7e56f42d49fbba6012e0e466e24e9071b
 EBUILD db-5.3.28-r6.ebuild 7139 BLAKE2B 508d61e239e3c06b2f3f44fb785bb422730c3a4e556d5551def14a6415a6448892dca5579bfa9f800c2a5f4c2963951312491a43f462249f3be0e371ae1039cf SHA512 df7c1cb37380acd7cf7f0ad61a80d95749c677cade232578a6a76fc5aa5170bdff273d419145ca29ecb788739c3818d4ee31b905ea3edf7beceddb66dcbcdd61
 EBUILD db-5.3.28-r7.ebuild 7107 BLAKE2B f12a047d497b4f97aadaa6793fc44b6a0cde50a2c57dadc915758e0960fe6e7dcc91b55c0c108d8446d3f8792d47a8197be7a8cf022be99c702d70e395f15370 SHA512 db7f69e1f612211ce4611b986a06a05c5b7e5dfde66c4bf24647ebdad98d76f7582297d79aa6f3fe57f1ace72ba28346d71079dcb2cf18e9a97154f4b9fd616f
-EBUILD db-5.3.28-r8.ebuild 7199 BLAKE2B 6f3449bd1a5485480e472a888b65541278ca7b93406496a3f2e943def6764d91fa8095350c97a7f518ee4a1b89d3fa0e9bf6a6a0355d9589e4c8f89dc0f3ba8d SHA512 77763f2da4ca9ef43d739e3dcc49a12dd7ea4a34b69c9ee20376bef56d1a7867a787094b7f0542be456d958612abeda3f3017456416b3e55cd91c69df7f75f07
-EBUILD db-6.0.35-r4.ebuild 7198 BLAKE2B 62bc1e62fe26328d845bd5109fbe4a01d97c30cb276f28da565d36637c2e98cee559f04162ea6b4b1a27939c7447267768ceb6308b0bdb9d6e22268c8c79a075 SHA512 76dd5be13a23950e0740a75d713024cb2cd558cb549cc6f98c090ebd2e3c9a742faf34ea00fd7de20af0e95913fd22ffcf07ae5b86bb4430bbf4a7aecd5380c1
+EBUILD db-5.3.28-r8.ebuild 7198 BLAKE2B c53c9450e0068917f70ed7bb37fc53e68310494e50f2099228311cbfd1c06dd39e7ac14604a10f06c63d947e420c6d68195e19e7983bd00090e8a98d7f20963d SHA512 af99d2b29a4ddd538228ef6319f502a1634a0c8b4cc31b262616a4f4b458ebafe32b4f086e29ac07fc010014d6f6dae6ba2a1b6da60715a742b3cc2c59cb29be
+EBUILD db-6.0.35-r4.ebuild 7204 BLAKE2B 03972ccaf500cc7672bbc720959f9f96a7fb704925990b353920276537879f3273cdfcf0f4691ebeb721b4bfa6e6b7c38bb4c89c0ce722aa3a50f9cc300e97a0 SHA512 c6a39885e9149c8615599403129dc8b948ad4afd997f680f868919c6823fbd318174fffd83ad3cef692b3672b78e05ca59b481c67887345010aa1abe9525a52f
 EBUILD db-6.1.38-r1.ebuild 6994 BLAKE2B 56473fd89c18fbf475bb95802c19a9ecba67b9bc4749f986a684f39da755e3509d183252bca1c4afd73c84db35758b91cc33f9cbaaa6434ce938e48447836253 SHA512 3edfc11463f76723f179f5a683cab25ca67b3a4dbd38a1d0f0b149879b420fbf2c328f622269a63e113a7e542e3454f2ee3b350c8bfa75f65a635ae671508456
 EBUILD db-6.2.38-r1.ebuild 7174 BLAKE2B d66ce4b678328c88a8c97f899780177e3ba3a369f42ab50bde09d1097434cd9210639356797559cd88069f70d69d40e98a82c964c84b8ad6966ae5b18fb9ba2f SHA512 59bd01603384927a3a45846b9064a3a63522113ff3d9f9384d4b6eb7c1edbe272495104b4c45582e2e35aef295ea80f81a25e3346bac4a8264eef7d0a3f034ad
 MISC metadata.xml 1260 BLAKE2B e98fbefa3a80d0fa577c4b5afdda7652db360f86026c356e2f52581189d63a492747857acd8b8f2627a184580a6a98b3c6d144d209e08850cd6e89581e169a68 SHA512 63b883d28b987d8fdc58399d6ed5d942fad361c75cfb62a39dce7d50b155ecba82c17139542d1311effb061e535077a1903052b7f5c2bd3700464af77ef39fa0
diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 5d76d20b0084..04445720d1c0 100644
--- a/sys-libs/db/db-4.5.20_p2-r6.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index d69c3c32c2a1..6d51c0e1eb95 100644
--- a/sys-libs/db/db-4.6.21_p4-r5.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index a4d8f87a8e48..d7c527220db6 100644
--- a/sys-libs/db/db-4.7.25_p4-r5.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality
diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index 80ec7706ca17..0b56bb919ef3 100644
--- a/sys-libs/db/db-4.8.30-r6.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 6a25488eddc3..7da5133f3c77 100644
--- a/sys-libs/db/db-5.3.28-r8.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 9e9b623e0489..282cf0680da4 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 411f48354dc0..53e9c4723705 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -6,5 +6,5 @@ DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c1346
 EBUILD e2fsprogs-libs-1.45.6.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec
 EBUILD e2fsprogs-libs-1.45.7.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec
 EBUILD e2fsprogs-libs-1.46.1.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120
-EBUILD e2fsprogs-libs-1.46.2.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120
+EBUILD e2fsprogs-libs-1.46.2.ebuild 2163 BLAKE2B 4639597cc9afb9ff6d4d35ea0140e46ac7cda3f3ab92f9b16c407b16e604e273143d01856699ac82f901867d6eac55d7262d168ca4a399e90c5d740b5a4289de SHA512 74add4937b3cb7a47f99b66a93d30e32bbab1f96ccf0e307556f093d6f6483423179edf9fd63df20398006479329d09dc00193252b136fa09a0bb38a6a1d151e
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild
index 41da9ca3221d..6da62233ed6d 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 1b7fbf909d04..f976717fef65 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -4,9 +4,9 @@ AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5c
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
 DIST freeipmi-1.5.7.tar.gz 3321187 BLAKE2B c6f7e9c4e0a03ce1d50972fee99741ec00a8f5beb0323d61d9217b3773eed33cb04e7bb92e1f293cb39c8012872babdc4774e6d81cf808615b8b283510e1e67c SHA512 a4d39d11d4e4b9635c272ee3a197729ac61c3e1c909c202498fb480c41289116eb933cd716fe2e0b5aa6dc258751ee204892bfb009398b6d5c2c65ee1cc58544
-DIST freeipmi-1.6.6.tar.gz 3419134 BLAKE2B dbdb8bf4440548b0b7885a7c940f810e5266245004c42b5d4acad2acc6058cdd580bd0e2908a6c66b62c7417101cec49981038145c743096fd6294d8ae2a7e75 SHA512 8a7be74bf003b8858c054bac24615f6fba0133e38e6f759ce81ed734a9ab107eb286c70554ad9663062c92eeccf342b80536aac0da74e4ede1ec51eedd497366
 DIST freeipmi-1.6.7.tar.gz 3419196 BLAKE2B 6e07afb7e93ec41c18c82725e781177d8a5fef78054ffca784cb951e360be9132ee35805014cd1ee92e1c167b2ec7dcfd07152b43f09a53eefff3e05c6f73789 SHA512 2077dda7acb868fb551a29fc2f6bcf9172c79d69bacb6b0fbf90855c5eca9c8e5bb0bb493bee8a67dc18147ebec46699790f2cb707e17297e59604fc8edfa54a
+DIST freeipmi-1.6.8.tar.gz 3426706 BLAKE2B afe3238955786b13aae0e0062028f5c969a8e686b46bea3850696361355b3bd82a55bd93523ea7fe2223fe5bb04922c26b46023f783bd879bbd01e34ffd6d59e SHA512 66cae2aed95ddb3fd9301146d5a1065b61267232d6ced726b106402bf3840a17364a29d7bf6bbe4db7955b77dcd23510f1258aac85ead5c295c876c6fa4333c3
 EBUILD freeipmi-1.5.7.ebuild 2344 BLAKE2B 7329bb06a60524102ce6840ed5dfe32034595b84d46fcffc053c7ab94b0f8076259905bfc4aff90161d24720bcfc51e7c1b7bbcb5087d75f4ba9ca73dc8e1e1a SHA512 01db52e96fb2e0e5c599ee235a4c8693242d086298fcee903c43f8708e0afca77fd480ecde02a3b14ee0dd44826334272ecf901f4a6a7b95a78cd74355f44bac
-EBUILD freeipmi-1.6.6.ebuild 2427 BLAKE2B 13803c71cc7e590a4c33b7fd29a35c07aeeb94dd9c9c6ec80ad7d591262678bc9ac2fbb83a31aa145141151b50aeb5814e40f75e6b3147cb2b9beea13e3de615 SHA512 9d1a889e1d5c2f77b9316ac4e24c42b79df2f6b796592ef947a890b049869370614fcd62fac38aac5ce24db3bdadf641fac21a55d3f956fb9c25643dbffddd07
 EBUILD freeipmi-1.6.7.ebuild 2427 BLAKE2B 260fb05d6e2a0ac544b13038e7dcf67a4281334194cc797ca1e9e38befc20f813ff8ba4c19a85b70f918685f33ef6fe681f40c60983c22f754a34e84aa68042d SHA512 fd127efe81afb6913604de4db0e0c670ca09307fb5fd02f8cc2039e6825135e2af579436a785722021272fb7fc341a3954bbfda6f11e6ebf7b7ea5b5125b099a
+EBUILD freeipmi-1.6.8.ebuild 2451 BLAKE2B b94f3860235a034a2913f9a976babc84a35fe7398dad26df4861915d15d5a66718aa81900bfcbdf8400e574d1ad022cdb0170a5128a8728c8495cf663bb47295 SHA512 03eeaeb10a4168e53b71b89c5b336faae0bb1f573bb02b2e2824bec2ce991aa7680d5d8493fd44783c1a79ccfb799fd42d604d4fabda459dd2819fe5603e6f7d
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.6.6.ebuild b/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
index a4fc52d4d3cb..2778e0c06997 100644
--- a/sys-libs/freeipmi/freeipmi-1.6.6.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,6 +74,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
 
 	keepdir \
+		/var/cache/ipmiseld \
 		/var/cache/ipmimonitoringsdrcache \
 		/var/lib/freeipmi \
 		/var/log/ipmiconsole
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3ea8f24c1dcb..12790b76133a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -33,8 +33,8 @@ EBUILD glibc-2.25-r11.ebuild 6071 BLAKE2B aed6cdc8141eb47e7f734ca59e98314d0c5340
 EBUILD glibc-2.30-r9.ebuild 43278 BLAKE2B 836802d5e28a4202964e13f708f61bd65be495b43baebfccb26935b78bf8e6493bc74483f7c5d88649c186476f0c12459d09b62688b67eadcc75af4e89390b74 SHA512 a2579650e72968a516cdf7c115ef7d72a46c8ce5ca3f52e7a762cccb9c4fff31de7d8856ac2ecd28613055c2b2265f07df60d583289fd375d12512cdef75cd7c
 EBUILD glibc-2.31-r7.ebuild 44397 BLAKE2B c43a3104751b92239d2bba5121d2d03d0c1279ea5b84e6c62a3e23d5ef9f76cad1fe5177baec2085db75c5a5f9d8005acd85b9fa470589142c3974b5c1206163 SHA512 2b96b8b1fac60df14d6f4853380356d87715fca652f575b163e9e06541dc6b80c3cd9add0022ffcac4aa9aa6ff113e55866575422882333f197a8b0e7aa89720
 EBUILD glibc-2.32-r6.ebuild 44725 BLAKE2B d1bbd4f9362d42c262ccd2f2f99802d000fab7268347056bffcd9af24646bf8f9d64f24ac6efea50189cecb26c8b011853b1775ac7e070e8a4dd87072ecf0c68 SHA512 8127942411ae8494552f75a2134221df085c5d1330a1671173acae951c880786c8da4293fc23d206736cffd821c40e5a28eae862318b4c1983cb1fdefb45f3c8
-EBUILD glibc-2.32-r7.ebuild 44730 BLAKE2B b08d0de058282a9b974382d0856d9cb1bdf8df57a3d836aa3a1e6545270c75a63c648528b879573cb11da199814982f845cf191ee360ca3de1cbae86d8e23ff0 SHA512 239ce557537fb5eec32818f0aed9965913fa273d547c85b8f998196a3e9f98a04e02a937b5c09e432ffcfe464ef2f4e63c278226d467e0a79f50720ff16f87ac
+EBUILD glibc-2.32-r7.ebuild 44728 BLAKE2B 56b47e092aab1918b0a9b5bf6b804322a7045a2d17522411312204b82911514e5278aa4b6d063b158ab29d5501c44de62033834debe5ccc1ccb9c40844128c7a SHA512 aa741cb727653c6896b8d3c4382eb232d1847ba54244f7a644d2c07ec393d7edd97e77acd6cd73252f3d44ced99ce637a291047e9ba4b4ff4dff117ca4cce10b
 EBUILD glibc-2.32-r8.ebuild 44736 BLAKE2B d0536afe64d441de0c19686699e956dd9bc90af7d15ac12d392904eef552d54ddb209fcc00f36ddb010d0c77fa55e58b11a37b510654dee4012adfb7712118ec SHA512 5dab53cf1c940cad56004a91d4ced422193272d3994e8ee272958c22702392c891273343f59c62ab4c9660bcc130bc477c4e54c2b07c6d448ea597296efe707e
-EBUILD glibc-2.33.ebuild 43872 BLAKE2B 1fa02900ff3267b5dcdba8ac22689b7de885187d30be8bc2d846e5ea58a0cb4b7fcf19cce90c40982e60c902b009af576fbf3ed7e3865c804fbdcf3a2dcba5c4 SHA512 cc0aeb068c178a4863bd9f25a5a48793afd683328b3b751cfb9634bc05d5b8e562856501dd1475ae5025d8f84aae51bcd9c006eb176d3a067d5862193fac959c
-EBUILD glibc-9999.ebuild 43884 BLAKE2B fdd6469d7669c168908fa1837dd14548d8001b526ab7973bc7fcd5e7841bc88abe25842812670fd57999b3d11fbc77e6863919a63e2b7aa2b5daa7caa25197f5 SHA512 b5f3ee60e142caf8fc652fdb2914b8cbf3a0ce497fb8d9d0d411a40d013b8a24ae226f25ba7f40dd6570ba6a4325803bf8e136ca0f0ed71b3248d84e78febdab
+EBUILD glibc-2.33.ebuild 43875 BLAKE2B 6c6e540497fbe25a2b663ad98b34ec5db7ff473f0b74698f6f89b9f634c3cfcc7d94a2a20451ef3002af82935c73bf38c05ca83dc5635764cfd832a280722f75 SHA512 df82b1f210b7aa3339187c441beea50e69d1fe796fbfeaf924abb35c6d53f9d667d8c40289921b18221ab55af98b18027c2819a96cf522f49df60cf05e05c44c
+EBUILD glibc-9999.ebuild 43887 BLAKE2B 760b8d67d86cc1f7f10c2c955deadeb82b7e7d2d8a84c687bc9b264a3264aed63941028e1191a6ed227c8286acceb9099c3db1a21f8ba72ffcb378529ef1a811 SHA512 35a11056f3faff6df0fdc7beebdb3ce17562012b2cd3dc799efa1ec4b67f3cea0abc4810451d9d063fa5e2d47009f67c3ece50c26757ebd47cd178839643d294
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.32-r7.ebuild b/sys-libs/glibc/glibc-2.32-r7.ebuild
index d7bd947414fe..f8798e21fcf5 100644
--- a/sys-libs/glibc/glibc-2.32-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r7.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	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"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 	SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild
index f2eabcd84c0f..db0be61369f3 100644
--- a/sys-libs/glibc/glibc-2.33.ebuild
+++ b/sys-libs/glibc/glibc-2.33.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 TMPFILES_OPTIONAL=1
 
 inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index d99367f1bca2..fd820a1d5235 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 TMPFILES_OPTIONAL=1
 
 inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index d1c522b4e223..2368db65fd64 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -6,6 +6,5 @@ AUX gpm.rc6-2 553 BLAKE2B 609a2fe28fc0539e50eed703e2ed6c5a37d98737add953fe4f7d7a
 AUX gpm.service 218 BLAKE2B 728726976390bb394d479e424d5c1fafb9bc17d00e23a90218991527326c3fe88eb8d37b84707febbf28017ecaf5ec3559534e9d0571bfd100beec8c60ac25c0 SHA512 b3b258a2b0ed42256b16ae05e9c13baa3bca0d6d9d5d1ef489e2f8fbfc2a6a4d8f570a595f50f79fba9ad94ad3acbf0dfe098887f0ce799006916a08101f5bc2
 DIST gpm-1.20.7-docs.patch.xz 41668 BLAKE2B cab4649d0eda83c37474b68ac141fab84cbfaac4e18f0f42ad7c0a90d14bc39697b17c450e8a8dc8b1c960f6d9e7ff344ec15791df240f61a27ccfcd7d0a9171 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4
 DIST gpm-1.20.7.tar.lzma 789691 BLAKE2B 5dbceedaa330d5f1ead8b2267fb5844cfd284627e085edd784a72365830a700f9a6a97f96afb4aa00a44ddbae735ef23be7eafc97a65f6250d72e15b359486c7 SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9
-EBUILD gpm-1.20.7-r2.ebuild 2263 BLAKE2B f45fabd30bdeb35161285283c74ff002e8fb53d45ad58823e428aa189b9591285f725a9c5a15748a54cb847b64498011fa151b4683aacfebffe22dd687cf5fc4 SHA512 192f200125c573faf7cc717ddf4bdd57c08b0d915a3858f4f7c431e2ca73e23fd78efb01df470811d72a562f133b2fa7b89294a0bbd91bf672b8de9b842c4791
-EBUILD gpm-1.20.7-r3.ebuild 2392 BLAKE2B ecac18d99e78814e945312f5ae6a22f1b1e434274bca189b9ef0de1ccb130796b6f1bb48b0b67e5de7634e48eb3a02e1404ed0bf5685258f6934bf7eca9bb05f SHA512 6a94c4386189e40c86c2aaaa4ed80f7a372f5a0786ca17e4cde80346ade3a2b28e50d7fd2727285a909c300b5af03c5d65b6c97d6694d3fa906f732668aed85a
+EBUILD gpm-1.20.7-r3.ebuild 2384 BLAKE2B b54374cfe57825cac1cd3dbea8994b9087333316bcd858d6d0e94af55cdb7d840adb7884824a87b10b1e7714f43cdb61a41bc61af6136265f9de6cb7ab9c6083 SHA512 ff917fae60b9398a205ca3cefb477f4f872867192ca540abc69cf21d59b25af2b51b01d0255d73838a7ceb6630f885e2a6140a1d1ea72357fe82af248c1deb2e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
deleted file mode 100644
index 15121136759d..000000000000
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# emacs support disabled due to #99533 #335900
-
-EAPI=5
-
-inherit epatch systemd autotools multilib-minimal usr-ldscript
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="https://www.nico.schottelius.org/software/gpm/"
-SRC_URI="https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
-	mirror://gentoo/${P}-docs.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	app-arch/xz-utils
-	sys-apps/texinfo
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-
-	# Hack up the docs until we get this sorted upstream.
-	# https://github.com/telmich/gpm/issues/8
-	epatch "${WORKDIR}"/${P}-docs.patch
-	touch -r . doc/* || die
-
-	# bug #629774
-	epatch "${FILESDIR}"/${P}-glibc-2.26.patch
-
-	# bug #705878
-	epatch "${FILESDIR}"/${P}-gcc-10.patch
-
-	epatch_user
-
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	# Rebuild autotools since release doesn't include them.
-	# Should be fixed with the next release though.
-	# https://github.com/telmich/gpm/pull/15
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-
-	# Out-of-tree builds are broken.
-	# https://github.com/telmich/gpm/issues/16
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-_emake() {
-	emake \
-		EMACS=: ELISP="" \
-		$(multilib_is_native_abi || echo "PROG= ") \
-		"$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	_emake check
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-}
-
-multilib_src_install_all() {
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-	systemd_dounit "${FILESDIR}"/gpm.service
-}
diff --git a/sys-libs/gpm/gpm-1.20.7-r3.ebuild b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
index 22f9f5d1a4aa..7554d790cd56 100644
--- a/sys-libs/gpm/gpm-1.20.7-r3.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index 67a4661abce5..26ec0664d69a 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,5 @@
 DIST kpmcore-20.12.3.tar.xz 584264 BLAKE2B de80d48bb6becb3e8d6f5b9b4456e4ad4e220ca52d76700c6be33942c5d762e1fc39b43b3595894a3d28605d7010662ebec588c3f1d3a4525a9efe797dbf65ed SHA512 90083374bbc4b91e948e9ef8e3e272cf7bd6b038261414c7e08eea1a903bd61c723f29a4afe462e29c1a083c6771be435fd4dfbf8a364c2c167f1eed19d04323
-DIST kpmcore-21.04.0.tar.xz 586064 BLAKE2B ff20312c979ca63879ed95df29585c9423ed5da17bd909245065831bb763e2b0daf70f7f9b64ef327533c349c4046893f1f602d18d5252cea09076406950a5cb SHA512 1f135323b214f6bc316523457684775836f7e8840a81148fc3ab90e066dd2b30c2bddeccef24afb44a39bf112e2fc6c487ffbe80635060dc11f0571044a6d421
-EBUILD kpmcore-20.12.3.ebuild 751 BLAKE2B 1f792d39061db8e1e86815638a848bafb6210a59fc789d2969c2a3a51a1abd4a1171af3ab4e5642a9d91e3d57c5d097c75416d7cf453d4a4c715cfe242fbe446 SHA512 f9d0d3b38b36ce11e5c46d7ef9d1710b9570b1f6e7ee3d971b62fe76f56527a84b895e867ee0807f06f681b8c10a1ac6c9b7fda53fede0c03b841e0e7023fe56
-EBUILD kpmcore-21.04.0.ebuild 743 BLAKE2B 903dbd9320fb5fcb6a4e393703cd147b4fc9f500c64267c0aa2fae744d17d7135c118ea5e867765887fd4b2693b31997874f92a74cc6677aa67f6289c982728f SHA512 49c6a3ca2f8495b0b1b38593eeeb3e7031d80c43d8792ae3b3eecdf3da53c24d36d8a235b96d0a781ad6a553a4b693b3d73e4e3550e1c0c4f10f3d95d5240ffa
+DIST kpmcore-21.04.1.tar.xz 586056 BLAKE2B 1d80fb3ea54853537ccf58297237b94ddbd5dc5889afb18013f1774f448e31c365f7d77a6955b1962427037eaa1a95aafb5d460e622833e1b011683aba993db0 SHA512 7b55399f2a923c61eb381f691c95c32751cde0666bf84d270cad3bbbabc39392e754ed77be0bd4996e365b95a5383b8f8ca20bd6f7ab856153b3d3d7b03088fb
+EBUILD kpmcore-20.12.3.ebuild 749 BLAKE2B 0e0cd54e67d6fed17f721cf615ac5ebb0a405ed67a7338834d235e15e156119cbd0f8fe9489abb13231e47b89b975314f0fc84f7576833b1262cd6823a4cc1ba SHA512 4db6919ded366d2c343f68c84e929727a0cc6cc2762f886f4a087829b1c30b1f350d20fdaa57fe89cc041f96b30150e79f5966b7f9f968c41a5b79cc63af67d9
+EBUILD kpmcore-21.04.1.ebuild 741 BLAKE2B 41fa2450cc6387ee771ba56aa2e62343b656fd6dcf55076a3105550205dd10f72d0a974fcde784117a1c94274e2c2b4ad2c29c3891391b091944ba130cb39a4e SHA512 c9e94cf51a85e97536686f65011166b5d88504348c99d2d0ceab5fc259f3f42c06d46a986806ed963042b93419c67e41c753df38fe222b58485f2e4f25f9bdc3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild b/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
index 74f4a58930cb..7b9e3fb35fe9 100644
--- a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://apps.kde.org/en/partitionmanager"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5/10"
diff --git a/sys-libs/kpmcore/kpmcore-21.04.0.ebuild b/sys-libs/kpmcore/kpmcore-21.04.1.ebuild
index 4bc7e9da2da2..202540698757 100644
--- a/sys-libs/kpmcore/kpmcore-21.04.0.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.04.1.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://apps.kde.org/en/partitionmanager"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5/10"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index cab8f10e94bb..da6b81bb001f 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -8,6 +8,6 @@ DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835
 EBUILD ldb-2.1.4-r1.ebuild 2810 BLAKE2B 651d9396e96ecc9cd9aed25498dc39fb2a1ef14b3c570a6af6508ae64c89cfbe29e36d77dc9b00e57b78285d096d9b7e9f7e438bbc437f7dab7bc33dd94d07eb SHA512 068466a5d6523c6ebb8990786ac74b65e954d1bd5803cb73112d6e892a823984dc3c1507ad9b4f595d3ee6e2461b06fb1393dae344a58a2e14bb2b51cd0a7d31
 EBUILD ldb-2.1.5.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
 EBUILD ldb-2.2.0-r2.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
-EBUILD ldb-2.2.1.ebuild 2937 BLAKE2B 2da9934bf6aefee7e25de019c4ade882d967e1f4a8a9f10cdf7938185bce45ea3ed2006770b4f06eaabbed5412159ad607668119a04d1bd5ed52ecc0ba6b2353 SHA512 da3da4809a35ac64f17803bec5acdde395b427705abca3ad1fd4355a872f9e74f19777807c332115e66c2ab5ee3f8f0ddab85c72f5d29cc5b72bac9a6e33fd9e
+EBUILD ldb-2.2.1.ebuild 2933 BLAKE2B 2da626474cc1e846f539bacdaa6b03b71881ce4c1a812845aad18e2374b3606ee31b03bd73826709506ac4db412203d5d8b3d46858b4ef8a597d29e09d2901fa SHA512 926b82a29f8ab2d77186f871357c162e07ef659725fb0ac166d1a5dc648e40ed2dadb1de479eebf37911237ea001386808493669cdf160ca2c29609c9d0f6c01
 EBUILD ldb-2.3.0.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.2.1.ebuild b/sys-libs/ldb/ldb-2.2.1.ebuild
index 6efccafcba0c..2ec72bff2115 100644
--- a/sys-libs/ldb/ldb-2.2.1.ebuild
+++ b/sys-libs/ldb/ldb-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index f5c095fdabb2..21fc6a8b8c82 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,16 +1,11 @@
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
-DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD libcxx-10.0.1.ebuild 5796 BLAKE2B c3c1e4d49ad96de1338998d35b0495ba2aa448db3558988bbbc9e5d4603d3d2ded354b1c04b186b0134be930edd72c931240ac3a068744e72e18087fc1550160 SHA512 7fbae29d2658305ddac7854a96e353ccf1901fcc6b1c15370d7a69a602f41b7d9f1afdd91018ea5be949955b3f8f1424903b5bac13d840e8f8c72ffcf7d7d34d
-EBUILD libcxx-11.0.0.ebuild 6660 BLAKE2B c6ddfeb1a40f994beb13635ea5044dd22dfdcb3947b9436b4fcb6241063835203adc8550006b4e20e415d5ba8b11c98c482f640f18a49e9426ddbc7dbd9026d9 SHA512 40961350fce1664140e1ca1df071fc4f1334dcdf0f3bcfd1074de3ee6ca9ea7f154e83e23b52c4b6da6d8e76a78c73f454cc17121e1edb0be96181c350f40172
-EBUILD libcxx-11.0.1.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62
 EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62
 EBUILD libcxx-12.0.0.9999.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad
 EBUILD libcxx-12.0.0.ebuild 6914 BLAKE2B e06a7f82b838785de55c9c936cedd9d4bd3ca819812cf43a98ce533c5f7551d60dec4040f11820068850a23af1111d0a156d398ad8dafefbcc301ed41254855f SHA512 76afcac7759e44a70bc10adc1217446c7c1665f9f1264c2c49363732023e684683df2490d0bc4abd565a04ca1dbf355c8e1bc4d7b88bb2932e0fe35527e0e746
diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild
deleted file mode 100644
index 8f948316ac8d..000000000000
--- a/sys-libs/libcxx/libcxx-11.0.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
-LLVM_PATCHSET=11.0.0-1
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
-REQUIRED_USE="libunwind? ( libcxxabi )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
-# llvm-6 for new lit options
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		>=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)"
-
-DOCS=( CREDITS.TXT )
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			   ${LDFLAGS} -print-libgcc-file-name)
-			if [[ ${compiler_rt} == *libclang_rt* ]]; then
-				want_gcc_s=OFF
-				want_compiler_rt=ON
-				extra_libs+=( "${compiler_rt}" )
-			fi
-		fi
-	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
-		# clang-based darwin prefix disables libunwind useflag during
-		# bootstrap, because libunwind is not in the prefix yet.
-		# override the default, though, because clang based libcxx
-		# should never use gcc_s on Darwin.
-		want_gcc_s=OFF
-		# compiler_rt is not available in EPREFIX during bootstrap,
-		# so we cannot link to it yet anyway, so keep the defaults
-		# of want_compiler_rt=OFF and extra_libs=()
-	fi
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-	)
-
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake_src_install
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-11.0.1.ebuild b/sys-libs/libcxx/libcxx-11.0.1.ebuild
deleted file mode 100644
index 16172647c295..000000000000
--- a/sys-libs/libcxx/libcxx-11.0.1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
-REQUIRED_USE="libunwind? ( libcxxabi )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
-# llvm-6 for new lit options
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		>=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)"
-
-DOCS=( CREDITS.TXT )
-
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
-LLVM_PATCHSET=11.1.0-1
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			   ${LDFLAGS} -print-libgcc-file-name)
-			if [[ ${compiler_rt} == *libclang_rt* ]]; then
-				want_gcc_s=OFF
-				want_compiler_rt=ON
-				extra_libs+=( "${compiler_rt}" )
-			fi
-		fi
-	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
-		# clang-based darwin prefix disables libunwind useflag during
-		# bootstrap, because libunwind is not in the prefix yet.
-		# override the default, though, because clang based libcxx
-		# should never use gcc_s on Darwin.
-		want_gcc_s=OFF
-		# compiler_rt is not available in EPREFIX during bootstrap,
-		# so we cannot link to it yet anyway, so keep the defaults
-		# of want_compiler_rt=OFF and extra_libs=()
-	fi
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-	)
-
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake_src_install
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index d95faa3fec28..9d6c56bb239f 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,11 +1,7 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e
-EBUILD libcxxabi-11.0.0.ebuild 3557 BLAKE2B 17ffd28ae4044bfa72830f1ee5614e2d89e8b3382c6fde88e6725bc5ef9bb374632c4abefa334931e8c2c52e232e0b4a74ea53be59d777acc3a80f33290ee499 SHA512 bf185e151c0926ccf5e87d30a4f42f1b4a6fbfe175c7cd40ce0f2abee0b2450d3fedf74366d786796ccb55193ad7ffdd01d9a9c6ee97529bf9f6dc7080ae6289
-EBUILD libcxxabi-11.0.1.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
 EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
 EBUILD libcxxabi-12.0.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 EBUILD libcxxabi-12.0.0.ebuild 3546 BLAKE2B b6accd4747ac9a1b30161de15e961062819e527c39a4d8a6e755e58a75862b1b12162539bf9716db2be8739b9aa2fefe16cede125b504e9d5e2d60f291fe8e35 SHA512 2fb42faa0ac7d7e5d1651494264163857561eb746ea381030bf03495152c8c060cb0be0793ba96f1ec5c4c9e3ea88b48644f587b4f52979c7eadad6992809e0a
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
deleted file mode 100644
index e0342a38384b..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-# libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} )
-LLVM_TEST_COMPONENTS=( llvm/cmake )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="+libunwind static-libs test elibc_musl"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
-	)"
-# llvm-6 for new lit options
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# link against compiler-rt instead of libgcc if we are using clang with libunwind
-	local want_compiler_rt=OFF
-	if use libunwind && tc-is-clang; then
-		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			${LDFLAGS} -print-libgcc-file-name)
-		if [[ ${compiler_rt} == *libclang_rt* ]]; then
-			want_compiler_rt=ON
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild
deleted file mode 100644
index fa0f31dbb563..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="+libunwind static-libs test elibc_musl"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
-	)"
-# llvm-6 for new lit options
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)"
-
-# libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} )
-LLVM_TEST_COMPONENTS=( llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# link against compiler-rt instead of libgcc if we are using clang with libunwind
-	local want_compiler_rt=OFF
-	if use libunwind && tc-is-clang; then
-		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			${LDFLAGS} -print-libgcc-file-name)
-		if [[ ${compiler_rt} == *libclang_rt* ]]; then
-			want_compiler_rt=ON
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index af6186689092..c769f1da2254 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,7 +1,5 @@
 AUX libhugetlbfs-2.23-uncompressed-man-pages.patch 1515 BLAKE2B b43415a3059f1071f0fc04ec834cd51d87a8bd93f2df6b428a33296b1b55745f23861415a463d5899b12699c5f4a3e5bdd837a8ec2894d1fc89039924330d77d SHA512 ea3ef19a688866676315af59422233681a41338fd049cfa50ed91f660f0baf1950ba056b9fcd540e6694b8ec348c0d1fbb3aa6b8c1840e22a77634e26555c9bc
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
-DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8
 DIST libhugetlbfs-2.23.tar.gz 175459 BLAKE2B f469ff9a65364e9f0e04c11c8010c958855ebd4d50e1dd719576cda7c280586623404304be64a794907a5fb1d97bd9c0620a91d7a2492577e04fa40ff432b4c7 SHA512 fc9a7d59bcda9d3ca9c9e43a3a348f989c9cbdbbb77f21a43a06e71eacd05bbe5a7b2b51e20ae9ea00da9f1c4d1130da529bbfb702e8c9d11cab6efadd3dc168
-EBUILD libhugetlbfs-2.22.ebuild 4159 BLAKE2B 269220039f048cdc23ec2907c504e30e5034e47431e065c90f527d25aec9f487a82cf983de1f3d915ea43ab6e9d19e4038d4a6f4c0653e6a298d754ab5597c93 SHA512 ee8a77c529de300c43c27355ae6efbf3cc5cfdee88e7d9a344cbb7f9b7185cdb3b698c3cea674563663b1258350487d4a0039998333cf43bdf0b7913d4ea694a
 EBUILD libhugetlbfs-2.23.ebuild 4218 BLAKE2B bd527e5c16ef3f0f9a4a4a7743755d1dc1aac2a6caad747182347600d04ff26ff72b2ea7f4a874ac1e34bfddd38845e69186ae864c7408d759320ca1ff777fe3 SHA512 60facbec943112d3eedfbc66133ee26a9300271ba4e9bca14e7e2f0c01145eedba2d6dbfb9e79183f827e9707be9ae5e3ddd087bdb415fd34aaaed3939e57f63
 MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
deleted file mode 100644
index 8b11ae28651f..000000000000
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Easy hugepage access"
-HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
-SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^PREFIX/s:/local::' \
-		-e '1iBUILDTYPE = NATIVEONLY' \
-		-e '1iV = 1' \
-		-e '/gzip.*MANDIR/d' \
-		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
-		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
-		-e 's@^\(ARCH\) ?=@\1 =@' \
-		Makefile || die "sed failed"
-	if [ "$(get_libdir)" == "lib64" ]; then
-		sed -i \
-			-e "/^LIB\(32\)/s:=.*:= lib32:" \
-				Makefile
-	fi
-
-	# Tarballs from github don't have the version set.
-	# https://github.com/libhugetlbfs/libhugetlbfs/issues/7
-	[[ -f version ]] || echo "${PV}" > version
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" libs tools
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
-
-src_test_alloc_one() {
-	hugeadm="${1}"
-	sign="${2}"
-	pagesize="${3}"
-	pagecount="${4}"
-	${hugeadm} \
-		--pool-pages-max ${pagesize}:${sign}${pagecount} \
-	&& \
-	${hugeadm} \
-		--pool-pages-min ${pagesize}:${sign}${pagecount}
-	return $?
-}
-
-# die is NOT allowed in this src_test block after the marked point, so that we
-# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
-src_test() {
-	[[ ${UID} -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
-	einfo "Building testsuite"
-	emake -j1 tests
-
-	local hugeadm='obj/hugeadm'
-	local allocated=''
-	local rc=0
-	# the testcases need 64MiB per pagesize.
-	local MIN_HUGEPAGE_RAM=$((64*1024*1024))
-
-	einfo "Planning allocation"
-	local PAGESIZES="$(${hugeadm} --page-sizes-all)"
-
-	# Need to do this before we can create the mountpoints.
-	local pagesize pagecount
-	for pagesize in ${PAGESIZES} ; do
-		# The kernel depends on the location :-(
-		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
-		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
-	done
-
-	addwrite /proc/sys/vm/
-	addwrite /proc/sys/kernel/shmall
-	addwrite /proc/sys/kernel/shmmax
-	addwrite /proc/sys/kernel/shmmni
-
-	einfo "Checking HugeTLB mountpoints"
-	${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints."
-
-	# -----------------------------------------------------
-	# --------- die is unsafe after this point. -----------
-	# -----------------------------------------------------
-
-	einfo "Starting allocation"
-	for pagesize in ${PAGESIZES} ; do
-		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
-
-		einfo "  ${pagecount} @ ${pagesize}"
-
-		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
-		src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
-		rc=$?
-		if [[ ${rc} -eq 0 ]]; then
-			allocated="${allocated} ${pagesize}:${pagecount}"
-		else
-			eerror "Failed to add ${pagecount} pages of size ${pagesize}"
-		fi
-	done
-
-	einfo "Allocation status"
-	${hugeadm} --pool-list
-
-	if [[ -n "${allocated}" ]]; then
-		# All our allocations worked, so time to run.
-		einfo "Starting tests"
-
-		cd "${S}"/tests || die
-		local TESTOPTS="-t func"
-		case ${ARCH} in
-			amd64|ppc64)
-				TESTOPTS="${TESTOPTS} -b 64"
-				;;
-			x86)
-				TESTOPTS="${TESTOPTS} -b 32"
-				;;
-		esac
-
-		# This needs a bit of work to give a nice exit code still.
-		./run_tests.py ${TESTOPTS}
-		rc=$?
-	else
-		eerror "Failed to make HugeTLB allocations."
-		rc=1
-	fi
-
-	einfo "Cleaning up memory"
-	cd "${S}" || die
-	# Cleanup memory allocation
-	for alloc in ${allocated} ; do
-		pagesize="${alloc/:*}"
-		pagecount="${alloc/*:}"
-
-		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "${hugeadm}" "-" "${pagesize}" "${pagecount}"
-	done
-
-	# ---------------------------------------------------------
-	# --------- die is safe again after this point. -----------
-	# ---------------------------------------------------------
-
-	return ${rc}
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 9cb9ec9bf999..7595fa6de63c 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,13 +1,9 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591
-EBUILD libomp-11.0.0.ebuild 2900 BLAKE2B 8dd6c10719ec67cb10e15610cb99276e8e802994a19c3e3028e365458fc02cb2514cbb6032a1d62528776d31a023de81a08935f923520c1d4ec055e285aacf1b SHA512 855a5730ac4e786506ce70d92bf7c46e11531ef73e0a663e9512b9861e7bdf441113a484d1aa583313f6990bfc81e56eb536dcf8d81d95a8375a3073efca2ebc
-EBUILD libomp-11.0.1.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
-EBUILD libomp-11.1.0.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
+EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d16092aa5e58b5c38197461a0b4ca5967ec161140b2a63835a0cfa601eb31fc08cbaa492088269808d6d803c7a47a SHA512 23a429ded341114ea3c4282b974520146ea0734e01b5863c837d119517b39365b537126091f5efcf752ca7860bccf0e0e2d763b507e903321532db87bcd42b79
 EBUILD libomp-12.0.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157
-EBUILD libomp-12.0.0.ebuild 2946 BLAKE2B 6e9857ff95e8a802b6d66852b17ac26c09fb0b4cebb05e47beede3ade25c745b04b4612630d4411cb895e3cd6d0467f753e93ebd59a9473f732e004c7a4bb4c1 SHA512 63b93ae10d91d666d0c44c417a5c2c6eb8d66d6e2b3bebdd3ce2ba0eb28d82822e4c803beef2905a5443b18a527871cc3ad339683e16be0fb820576d61543d09
+EBUILD libomp-12.0.0.ebuild 2951 BLAKE2B 347b96e146742f7127314e3eb35ee13a3f040b3ab87aba7570a12cf1a2d44f918b110059d7a821b349224b7233d13be0ad110acf5cd2e4328762ed1e52bd665a SHA512 acb0a94b89b6f9f7a67a8cb20976e0cf0cfddc05d3e7fcd198d4cf3ab3742f5b80f88c4b39be71d3c89201010f936bf4981736ed2a21975b0a43e3898cc90693
 EBUILD libomp-13.0.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157
 MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-11.0.0.ebuild b/sys-libs/libomp/libomp-11.0.0.ebuild
deleted file mode 100644
index f42b4f80658a..000000000000
--- a/sys-libs/libomp/libomp-11.0.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib linux-info llvm.org python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-LLVM_COMPONENTS=( openmp )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-IUSE="cuda hwloc kernel_linux offload ompt test"
-# CUDA works only with the x86_64 ABI
-REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		virtual/libelf:=[${MULTILIB_USEDEP}]
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	)"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig )
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		>=sys-devel/clang-6
-	)"
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-	)
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-11.0.1.ebuild b/sys-libs/libomp/libomp-11.0.1.ebuild
deleted file mode 100644
index 6706c0daa20f..000000000000
--- a/sys-libs/libomp/libomp-11.0.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib linux-info llvm.org python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-IUSE="cuda hwloc kernel_linux offload ompt test"
-# CUDA works only with the x86_64 ABI
-REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		virtual/libelf:=[${MULTILIB_USEDEP}]
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	)"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig )
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		>=sys-devel/clang-6
-	)"
-
-LLVM_COMPONENTS=( openmp )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-	)
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-11.1.0.ebuild b/sys-libs/libomp/libomp-11.1.0.ebuild
index 6706c0daa20f..5e55d6e82803 100644
--- a/sys-libs/libomp/libomp-11.1.0.ebuild
+++ b/sys-libs/libomp/libomp-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/libomp-12.0.0.ebuild b/sys-libs/libomp/libomp-12.0.0.ebuild
index a1640af9cb73..3c8aaca6ce95 100644
--- a/sys-libs/libomp/libomp-12.0.0.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index fe29925faf07..5303f1ccde35 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -5,6 +5,6 @@ DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc3
 EBUILD libseccomp-2.4.3.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02
 EBUILD libseccomp-2.4.4.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02
 EBUILD libseccomp-2.5.0.ebuild 1949 BLAKE2B bcecd01bcbfa1e7d3efa6ea6808d5e9e3d1a029596d486a3a716b7fd613a163dafd6e036233ae1014190eacdfaab6e01f2a09f2bb754c052dc59c8a592836103 SHA512 b09eb1a9895bb0ce45eb41f623419a6976feaaff5ef10d4726fa94a362f325f424b40ec813cffef93adf652a1a3ef48eaee7dc6500e20b009508ac7d4f20abfe
-EBUILD libseccomp-2.5.1.ebuild 1990 BLAKE2B a90bdd2e3c1765c93464402df007d1826bc903608d70cbf079a962b8dbe6f78f40da77b9c9f7b8e70c095230f7b0ec733c479a1eb7a4b057c4295f5b707f864c SHA512 184da973322de4826f74311fb0d1304b407b3089ad37cb3ecbbc434dc64f0fa2c26944f7053b3a4b6dd5ab03f5bd949e6ef9b41f589bf48dd2cb5b45e46b8161
-EBUILD libseccomp-9999.ebuild 1949 BLAKE2B 65939b38924638fd17dfc5faa037a65c141dbcd3d0b89af5613e75a598e2dca8ed7ce6549591ceaff23116f3520b637f97160da7768d2abf386ccc6d564732a3 SHA512 80eae89f5fb7f8dd86480e359b30aec90aa56770e3194a16dd7b86b2f47e8a1ebcc6a8e7ed12e666213199e6161c74814682e4da4457d4da9e903494b6db1cf1
+EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B 12d3454c73d6df8cd486a0cbf3074bfd22bd84c83a6bd3c122f9b10c9c6ba50673cd40a2d2701e0eaf2e8fe7c12fe6ce7d55c022f1b41dc04e81b4eb15810733 SHA512 c37c4f2cd29baa6d63b9f6a47843d55a7e25000d86885a50592a160711e285d685abaada0b28f7975034365b322661df02d32fd5f74f625ebc03f2efd53c0cdd
+EBUILD libseccomp-9999.ebuild 1994 BLAKE2B fc3087eab99a3760febb6996beef0018c25b071d4143a06ec94f4898c846cbb1399009d42af45aed4e09e691aec3e5e3ef00488136479fc2ef7975dc3b735c19 SHA512 f834293582bc68e2e381e81b3ab0db49ff8748df113b39cec396be1069e3ffd6f7d1436040344edbeebc1c1ff581dec73d68eb4a06151644e7e03266b03e2261
 MISC metadata.xml 468 BLAKE2B f09a751736d4f5f5b5d1cacfbbce2280f2c07f2a435882e833ecd0db3f363ae9e4e7aafaea23d21946279fef27a55d93af9549d75a5f929d6a965dc82f53cfb6 SHA512 3fb402831ab2522948f9514cf0dfad2ed1b035c773eeadb78d958766b92b480b1fb55a274e0990f1913b5be5e4c7de734f8f691f4b3c111949f68f604fb3edc9
diff --git a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
index df4feff97243..b68cd3835b8d 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
@@ -30,16 +30,12 @@ REQUIRED_USE="
 		${PYTHON_REQUIRED_USE}
 	)"
 
-BDEPEND="
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}
 	dev-util/gperf
-	python? (
-		${PYTHON_DEPS}
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )
 "
-DEPEND="${BDEPEND}"
-RDEPEND="${DEPEND}"
-
 # We need newer kernel headers; we don't keep strict control of the exact
 # version here, just be safe and pull in the latest stable ones. #551248
 DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
index 1d93b9496521..9df6cc592e47 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,13 +30,12 @@ REQUIRED_USE="
 		${PYTHON_REQUIRED_USE}
 	)"
 
-BDEPEND="
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}
 	dev-util/gperf
-	python? ( ${PYTHON_DEPS} )
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )
 "
-DEPEND="${BDEPEND}"
-RDEPEND="${DEPEND}"
-
 # We need newer kernel headers; we don't keep strict control of the exact
 # version here, just be safe and pull in the latest stable ones. #551248
 DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 7fce854cf377..09459b229480 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,5 +1,5 @@
-DIST termcap-2.0.8-patches-2.tar.bz2 11589 BLAKE2B 8fec4befa009a8dd53fd949435eba30a06523cf731ec35a7565608dd0fbcddcbb01b56c94815a79851e0e7afd75d31475cde682c0d419b86cb4750ec9a543bed SHA512 24d871007191a051dca604635f6d4e2dec67b675c2c9a0c728a0458a6a501ac268f5d4c4203356a6f64e718edba5c8ec970276c244435a25bef11c6fba0e837d
+DIST termcap-2.0.8-patches-2.tar.xz 11116 BLAKE2B 537342e45333f0373754eb5390ef1c37369531f32e2ecc4004809c800c172d370690a232b3cbd0c3ef90f977a456d97ac306e55a42e13244a0c47f4973ad94a1 SHA512 0261a9c21385578507e5c8e8f7064879904ba2b0d1ff9dce90d77ed2ad5e0c7fc49880ddc4fbc77df70f425a3fe4765bbac827824d4b59e99d77374ab4183d0f
 DIST termcap-2.0.8.tar.bz2 211523 BLAKE2B 4ea7c4cdc26be4e1262a8e75e125b4349c75976c297c2389e034635d2d5324275486525fe93fd8628e8a5cd0980c7e97eba55f5a05d6b3b537337b2fb55cf2cd SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad
 DIST termtypes.tc.gz 228329 BLAKE2B 988b91c6c3c624963e078b424f24b26eb37fe32ca34b0ece0ca4ddf734ee1513f399a4f584f41a92c6ef2edb64144c13820677b419e58b4bfaf0e0fa2c5686a7 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678
-EBUILD libtermcap-compat-2.0.8-r4.ebuild 1193 BLAKE2B af123a26a3a0ae71fa1f80c3acff4b330c7c2d52edf1dc6e2d19323c3ef4db84ce842f58c2f172d9c74540c83f61ecbfc64483095dfbb136e05956f584037f1f SHA512 25daf0b27b263d9179cb959a9dcb69b5c9356f4753779ceb6c83128d384a0e9b501097544af1f5bae08c34e48f8e49d2010b979b3a180205b464aaf2b6900981
+EBUILD libtermcap-compat-2.0.8-r4.ebuild 2193 BLAKE2B cc8492e9d4c545ba9876f4c236a527abbbbc4836dbb231b89b397cebfc8344979f82c168562334af51f7363667b11ce7308b5d5d769286bdd0d8e6f0219086d6 SHA512 faec0c30a82380821bac4541c3ffecf016c439eb90567aee6adc2d51fe4d00bae3dcd721639a2fab0df10ad5366b3539128c7770a7eca7c096d379338d8d05df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
index d89e95855853..a11fc69bc9a9 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# we only want this for binary-only packages, so we will only be installing
+# We only want this for binary-only packages, so we will only be installing
 # the lib used at runtime; no headers and no files to link against
 
-EAPI="5"
+EAPI=7
 
-inherit epatch multilib toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
 PATCHVER="2"
 
@@ -15,23 +15,41 @@ DESCRIPTION="Compatibility package for old termcap-based programs"
 HOMEPAGE="http://www.catb.org/~esr/terminfo/"
 SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
 	mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.bz2"
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCHVER}.tar.xz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2 LGPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc sparc x86"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	# Gentoo patchset
+	"${WORKDIR}"/patch/002_all_termcap-setuid.patch
+	"${WORKDIR}"/patch/003_all_termcap-inst-no-root.patch
+	"${WORKDIR}"/patch/004_all_termcap-compat-glibc21.patch
+	"${WORKDIR}"/patch/005_all_termcap-xref.patch
+	"${WORKDIR}"/patch/006_all_termcap-fix-tc.patch
+	"${WORKDIR}"/patch/007_all_termcap-ignore-p.patch
+	"${WORKDIR}"/patch/008_all_termcap-buffer.patch
+	"${WORKDIR}"/patch/009_all_termcap-bufsize--needs-011.patch
+	"${WORKDIR}"/patch/010_all_termcap-colon.patch
+	"${WORKDIR}"/patch/011_all_termcap-AAARGH.patch
+	"${WORKDIR}"/patch/012_all_libtermcap-compat-2.0.8-fPIC.patch
+	"${WORKDIR}"/patch/013_all_libtermcap-compat_bcopy_fix.patch
+	"${WORKDIR}"/patch/014_all_libtermcap-build-settings.patch
+	"${WORKDIR}"/patch/015_all_libtermcap-only-shared-lib.patch
+	# termcap
+	"${WORKDIR}"/patch/tc.file/001_all_termcap-linuxlat.patch
+	"${WORKDIR}"/patch/tc.file/002_all_termcap-xtermchanges.patch
+	"${WORKDIR}"/patch/tc.file/003_all_termcap-utf8.patch
+	"${WORKDIR}"/patch/tc.file/004_all_termcap-xterm-X11R6.patch
+	"${WORKDIR}"/patch/tc.file/005_all_termcap-Eterm.patch
+)
 
 src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patch"
-	EPATCH_SUFFIX="patch"
-	epatch "${EPATCH_SOURCE}"
+	mv "${WORKDIR}"/termtypes.tc "${S}"/termcap || die
 
-	cd "${WORKDIR}"
-	mv termtypes.tc termcap || die
-	epatch "${EPATCH_SOURCE}"/tc.file
+	default
 
 	multilib_copy_sources
 }
@@ -47,7 +65,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	insinto /etc
-	doins "${WORKDIR}"/termcap
+	doins "${S}"/termcap
 
 	dodoc ChangeLog README
 }
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index bb695713c413..59aa83330d51 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,11 +1,7 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de
-EBUILD llvm-libunwind-11.0.0.ebuild 3207 BLAKE2B 38d6419d35871059220e6d43672454fd29a8155da65cd4a729679a01c8bf8a9c97078bd01256126370d2caf48f91bcc44b12c33a8f93f3a737b1128d09e684e7 SHA512 7d450f6dcbf347679c9ac33e8838d9f334bd000e971cdc4c0cd8cfdee0ffe5eee253172fa3c7418e0fa13d6e439e95cd8d816fb69aa2253510c9943486ac1638
-EBUILD llvm-libunwind-11.0.1.ebuild 3209 BLAKE2B 1d083ebb9be360918af9e89a9eaf98c84b6290414cb8870120d34d2c62c98369e942782a330d654bc80ff62817120dcf676288edabc22ead93b6e18c9d9b87ce SHA512 5c8ff80f595b24bf7cda3d724dba2946a47f57177db716246115c9865320bed3ca7bc8dd90547796d2baafce4036fecc4d7351d57ac925984c5b39ef4fb82e1b
 EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1
 EBUILD llvm-libunwind-12.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-12.0.0.ebuild 3239 BLAKE2B 04a0b9de0107e28b22fbbe4e94e55969cdd7040710e3d76d8f2c57ef820d556463cb8bda5b450221383f48b989cd923ce3ec3fd63a1514d8e6b95f4a91d797cb SHA512 6ff67dcd84b49c8092a18e27b4e9db3a745c1e77035d86134b8ff1150010f1f3e3b993d99d04c60529594df6e5b2260c0d1c01746dac333ef7e70fea9c1e257a
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
deleted file mode 100644
index 8d86e39b63fb..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=OFF
-		-DLIBCXXABI_ENABLE_STATIC=ONF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	# build local copies of libc++ & libc++abi for testing to avoid
-	# circular deps
-	build_libcxxabi
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# install headers like sys-libs/libunwind
-	doheader "${S}"/include/*.h
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild
deleted file mode 100644
index 30fb0519d758..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)"
-
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=OFF
-		-DLIBCXXABI_ENABLE_STATIC=ONF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	# build local copies of libc++ & libc++abi for testing to avoid
-	# circular deps
-	build_libcxxabi
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# install headers like sys-libs/libunwind
-	doheader "${S}"/include/*.h
-}
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index c8d3a59069d2..6f995a3174bc 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -4,9 +4,6 @@ AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983d
 AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3
 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
-DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
-DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
-EBUILD ncurses-compat-6.1_p20190609.ebuild 6326 BLAKE2B 7890df6ed17ce8520b5bcb9dcb61b93e1b8daeff464431acd88f4d08d1cada762014ac31139a84c9125f9a6ef017f962862d577fe422a727e9c14483cb4e7579 SHA512 8c4b8d1ff0432b01793fd9a5db0a99824956dfb4bd274a2ec52147355963a504cc4c826f5c97ed1666f5f174d85455cb963c8cb89a9cf89e0ab1abaed3c94004
-EBUILD ncurses-compat-6.2.ebuild 6333 BLAKE2B c4c2f0794236630dc8ddc9c60495edf8d95c245e23e7cfbb8cd8a175e7aa3aae04e9c69a92c4dc8956e8e85aeacdf7bb4c12d2f1f82f1ed2bc335195b8f3437c SHA512 e5f28598938d53b68c7bc9410f2801ed744997397bf91c48abb99fd334f24591ff6d1cc2ae7be300e3fd9dc21107156986f3a96b0de17ca698e0b06afe814a29
+EBUILD ncurses-compat-6.2.ebuild 6326 BLAKE2B 7890df6ed17ce8520b5bcb9dcb61b93e1b8daeff464431acd88f4d08d1cada762014ac31139a84c9125f9a6ef017f962862d577fe422a727e9c14483cb4e7579 SHA512 8c4b8d1ff0432b01793fd9a5db0a99824956dfb4bd274a2ec52147355963a504cc4c826f5c97ed1666f5f174d85455cb963c8cb89a9cf89e0ab1abaed3c94004
 MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
deleted file mode 100644
index 0c319e1dadb0..000000000000
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This version is just for the ABI .5 library
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
-
-MY_PV="${PV:0:3}"
-MY_P="${PN/-compat}-${MY_PV}"
-MY_PN="${PN/-compat}"
-
-DESCRIPTION="console display library (ABI version 5)"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
-
-if [[ "${PV}" == *_p* ]] ; then
-	SRC_URI+=" ftp://ftp.invisible-island.net/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2
-		https://invisible-mirror.net/archives/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2"
-fi
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="gpm tinfo unicode"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the ncurses-5 that installs the same lib. #557472
-RDEPEND="${DEPEND}
-	!<sys-libs/ncurses-6:0
-	!sys-libs/ncurses:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/ncurses-5.7-nongnu.patch"
-	"${FILESDIR}/ncurses-6.0-rxvt-unicode-9.15.patch" #192083 #383871
-	"${FILESDIR}/ncurses-6.0-pkg-config.patch"
-	"${FILESDIR}/ncurses-5.9-gcc-5.patch" #545114
-	"${FILESDIR}/ncurses-6.0-ticlib.patch" #557360
-	"${FILESDIR}/ncurses-6.0-cppflags-cross.patch" #601426
-)
-
-src_prepare() {
-	if [[ "${PV}" == *_p* ]] ; then
-		eapply "${WORKDIR}/${MY_PN}-${PV/_p/-}-patch.sh"
-	fi
-	default
-}
-
-src_configure() {
-	unset TERMINFO #115036
-	tc-export_build_env BUILD_{CC,CPP}
-	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
-
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
-	# The naming is also important as we use these directly with filenames and when
-	# checking configure flags.
-	NCURSES_TARGETS=(
-		ncurses
-		$(usex unicode 'ncursesw' '')
-	)
-
-	# When installing ncurses, we have to use a compatible version of tic.
-	# This comes up when cross-compiling, doing multilib builds, upgrading,
-	# or installing for the first time.  Build a local copy of tic whenever
-	# the host version isn't available. #249363 #557598
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		local lbuildflags="-static"
-
-		# some toolchains don't quite support static linking
-		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
-		case ${CHOST} in
-			*-darwin*)  dbuildflags=     ;;
-			*-aix*)     dbuildflags=     ;;
-		esac
-		echo "int main() {}" | \
-			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
-			|| lbuildflags="${dbuildflags}"
-
-		# We can't re-use the multilib BUILD_DIR because we run outside of it.
-		BUILD_DIR="${WORKDIR}" \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		do_configure cross --without-shared --with-normal
-	fi
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
-	done
-}
-
-do_configure() {
-	local target=$1
-	shift
-
-	mkdir "${BUILD_DIR}/${target}" || die
-	cd "${BUILD_DIR}/${target}" || die
-
-	local conf=(
-		# We need the basic terminfo files in /etc, bug #37026.  We will
-		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-		# src_install() ...
-		##--with-rel-version=5.9 ??
-		--with-abi-version=5
-		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
-
-		# Now the rest of the various standard flags.
-		--without-hashed-db
-		--disable-pc-files
-		--with-shared
-		--without-hashed-db
-		--without-ada
-		--without-cxx
-		--without-cxx-binding
-		--without-debug
-		--without-profile
-		# The configure script uses ldd to parse the linked output which
-		# is flaky for cross-compiling/multilib/ldd versions/etc...
-		$(use_with gpm gpm libgpm.so.1)
-		--disable-termcap
-		--enable-symlinks
-		--with-rcs-ids
-		--with-manpage-format=normal
-		--enable-const
-		--enable-colorfgbg
-		--enable-echo
-		--disable-warnings
-		--without-assertions
-		--enable-leaks
-		--without-expanded
-		--with-macros
-		--without-progs
-		--without-tests
-		--without-trace
-		$(use_with tinfo termlib)
-
-		# The chtype/mmask-t settings below are to retain ABI compat
-		# with ncurses-5.4 so dont change em !
-		--with-chtype=long
-		--with-mmask-t=long
-		--disable-ext-colors
-		--disable-ext-mouse
-		--without-{pthread,reentrant}
-	)
-
-	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
-	else
-		conf+=( --disable-widec )
-	fi
-	# Make sure each variant goes in a unique location.
-	if [[ ${target} != "ncurses" ]] ; then
-		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
-	fi
-	# See comments in src_configure.
-	if [[ ${target} != "cross" ]] ; then
-		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
-	else
-		conf+=( --with-progs )
-	fi
-
-	# Force bash until upstream rebuilds the configure script with a newer
-	# version of autotools. #545532
-	CONFIG_SHELL="${EPREFIX}"/bin/bash \
-	ECONF_SOURCE="${S}" \
-	econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-	# See comments in src_configure.
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		BUILD_DIR="${WORKDIR}" \
-		do_compile cross -C progs tic
-	fi
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
-	done
-}
-
-do_compile() {
-	local target=$1
-	shift
-
-	cd "${BUILD_DIR}/${target}" || die
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.
-	emake -j1 sources
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
-	emake "$@"
-}
-
-multilib_src_install() {
-	local target lib
-	for target in "${NCURSES_TARGETS[@]}" ; do
-		cd "${BUILD_DIR}/${target}/lib" || die
-		for lib in *5.9 ; do
-			newlib.so "${lib}" "${lib%%.9}"
-		done
-	done
-}
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
index 0484acd9547a..0c319e1dadb0 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
@@ -23,7 +23,7 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-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"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 58883de3017f..86957edf31fe 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,5 +1,6 @@
-AUX pwdb-0.62-build.patch 2920 BLAKE2B e0d7362fd82f3c053a25c16d7f07aff8200a2904411a3b9a5c8921551320924aa8be41820bbb81a952ce46aed3c756d7a2b28e38c669585e1e55c415c0388e64 SHA512 fb6b1bb322daf4a343b31fd8cadb1c546682421775670a361721272ea5811cb87b8215aa1c7bad624334da826ddab4776a4809fce0613346a4560ffce8af3bba
-AUX pwdb-0.62-selinux.patch 10371 BLAKE2B bb6acd534be858c85b237d18a5e805d812db97178d9d79b3b84c5b724981aa102fe7eb58fa661719185b0b957a58c0929996a9b7aa025d49560cafe8631de70d SHA512 63cb33af31179183c32f738c90ac2144e8d8092034faa5bcd0c5420832e51018e7e9ffcea59c8354ee0ae598e53dbd120cd9338ab80b0e5df6cc1c53eb75b818
+AUX pwdb-0.62-build.patch 2948 BLAKE2B 430bdb7b027c75b7c0abd38ee921270d6dc83daffa0f44945d432145bf122085f3308bd81fdeda465930d9ba5971a20d9e19aff5c6475564fce0dd874eb7014f SHA512 e0b25062a2dee7c836098bb5e4b56f7b985ebe57e5980bdf60ec7cdfdd04f44897365f58bb9809a1cab9cc32cd4e640e003cb2135dba63fdc06a84ee3d8f3bca
+AUX pwdb-0.62-disable-static.patch 531 BLAKE2B 7900485fdad6a71460b79d439b903ae6dd2016dfd3aba90443f4d42f7b395f2b6c6a77fc87a65d7283bc3675487528dde1a5608a8866c2e22d03feebc0589596 SHA512 5bc22e79ddc068b78003c5756ead055e860ac97dcae5369fed2ac293ae7cd74d020041aad51aa235fb2e27a6dce1557c10a544159be1113d68ec4e52c2c28e08
+AUX pwdb-0.62-selinux.patch 9771 BLAKE2B 1be94b7a39c5a72cbaa8c6671ea15d817413f613d9dcc5aca34be344c4ac057ad4d17f9c8b83fe0e763edbdbb2cff9a2a58296a12db3b2f8b2ec9a2e5a1e9d98 SHA512 f965d70db75fe8f6d0f26d39cefae616e77f95fdd9a2f29437cb4e2a84efae110a6f396039e4c8b8f6365c9186d7dc229d6ab7388e220b1ab3f776f787cfde36
 DIST pwdb-0.62.tar.gz 133183 BLAKE2B f9b75e9875c8de1050d8eafa8b0c0c58b8c415c9b67683d1928100ce4f192f1b1cea3033264b6c31edd0709094c034ae3790ceaf0143d6b52ce2647a3ad62992 SHA512 baba1f42125a4773f2e645129be79e0e5fbd0b0da7c6624f4b1d13e59cb65f5807bd22997aa1ba360c7627f2aff93c9949b2bb5fbd27d74b516853bcbca96ef4
-EBUILD pwdb-0.62-r1.ebuild 1398 BLAKE2B c71fc9f7e9e5f56e7ce143144168f2ad7386e1041970744de4053cde6d2ee1527a503dfb2dc955440569efca0933492c49c17a9f985411a5dd34f3dd3aa07c20 SHA512 7f42787666b7be50a190d6dba4444ee60f5fa6a83e792bc5662bb3edca307d8dd87ac33d4272d61eb0e94f1c8643a884334b4c2cd6d9fdaa1541bdb523e9a40d
+EBUILD pwdb-0.62-r2.ebuild 1513 BLAKE2B da67343b0afcf43b50941dd5fcb53cc2566d240a6818e839242ef903e120d11a0cd6fbcb791b6df2113a42683544687a3ce9720262eaeb85e5dc7c80200a1961 SHA512 6c2190a69ca56c81ce34311ee4ac16f4689afcdf83f635597c8e0b95e8829c5fe441dd5badc0817eabe30bf5e1a0ca733beedf2d810700120cf2eeaf3eaf18d9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/pwdb/files/pwdb-0.62-build.patch b/sys-libs/pwdb/files/pwdb-0.62-build.patch
index ecef517b1ca3..92c77c28d101 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-build.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-build.patch
@@ -11,8 +11,8 @@ http://bugs.gentoo.org/126695
 http://bugs.gentoo.org/137134
  - don't show traditional warnings
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -71,7 +71,7 @@
  
  WARNINGS += -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
@@ -22,8 +22,8 @@ http://bugs.gentoo.org/137134
  	-Wnested-externs -Winline -Wshadow 
  INCLUDEDIR=-I$(CRTDIR)/include
  
---- libpwdb/Makefile
-+++ libpwdb/Makefile
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
 @@ -50,7 +50,7 @@
  
  
@@ -42,8 +42,8 @@ http://bugs.gentoo.org/137134
  	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBDYNAME)
  	$(INSTALL) -m 644 $(LIBSTATIC) $(LIBDIR)
  
---- libpwdb/posix/pwd.c
-+++ libpwdb/posix/pwd.c
+--- a/libpwdb/posix/pwd.c
++++ b/libpwdb/posix/pwd.c
 @@ -7,6 +7,7 @@
   */
  
@@ -52,8 +52,8 @@ http://bugs.gentoo.org/137134
  
  #define PWDB_HARD_CORE 1
  #include <pwdb/pwdb_public.h>
---- libpwdb/posix/undefined.c
-+++ libpwdb/posix/undefined.c
+--- a/libpwdb/posix/undefined.c
++++ b/libpwdb/posix/undefined.c
 @@ -5,6 +5,7 @@
   */
  
@@ -62,8 +62,8 @@ http://bugs.gentoo.org/137134
  
  #define PWDB_HARD_CORE 1
  #include <pwdb/pwdb_public.h>
---- libpwdb/pwdb/pwdb_helper.c
-+++ libpwdb/pwdb/pwdb_helper.c
+--- a/libpwdb/pwdb/pwdb_helper.c
++++ b/libpwdb/pwdb/pwdb_helper.c
 @@ -18,6 +18,7 @@
   *
   */
@@ -72,8 +72,8 @@ http://bugs.gentoo.org/137134
  #include "pwdb_public.h"
  #include "pwdb_module.h"
  
---- libpwdb/pwdb/interface/shadow/group.c
-+++ libpwdb/pwdb/interface/shadow/group.c
+--- a/libpwdb/pwdb/interface/shadow/group.c
++++ b/libpwdb/pwdb/interface/shadow/group.c
 @@ -533,7 +533,7 @@
  
      static const char *supp_entry[] = {
@@ -83,8 +83,8 @@ http://bugs.gentoo.org/137134
      "groups",               /* these are serviced by requests */
      NULL
      };
---- libpwdb/radius/radius.c
-+++ libpwdb/radius/radius.c
+--- a/libpwdb/radius/radius.c
++++ b/libpwdb/radius/radius.c
 @@ -145,7 +145,7 @@
  		      const char* password,
  		      RADIUS_RESULT *rad_result)
diff --git a/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch b/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch
new file mode 100644
index 000000000000..a3395e169079
--- /dev/null
+++ b/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch
@@ -0,0 +1,19 @@
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
+@@ -46,7 +46,7 @@
+ %.o : %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DYNAMIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
+ 
+-all: $(LIBSTATIC) $(LIBDYNAME) 
++all: $(LIBDYNAME)
+ 
+ 
+ $(LIBDYNAME): $(LIBOBJ)
+@@ -70,7 +70,6 @@
+ 	$(INSTALL) -m 755 $(LIBFILENAME) $(LIBDIR)
+ 	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBSONAME)
+ 	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBDYNAME)
+-	$(INSTALL) -m 644 $(LIBSTATIC) $(LIBDIR)
+ 
+ clean:
+ 	@rm -f *.so *.a core a.out `find . -name "*.o" -print` `find . -name "*~" -print`
diff --git a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
index 106be5645176..02ba3c50c38c 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
@@ -1,5 +1,5 @@
---- pwdb-0.62/examples/Makefile.pwdbselinux	1998-10-06 19:57:04.000000000 -0400
-+++ pwdb-0.62/examples/Makefile	2003-07-09 14:45:54.702663000 -0400
+--- a/examples/Makefile
++++ b/examples/Makefile
 @@ -4,6 +4,8 @@ PROGS	= posix gentest tpwdb radtest grou
  SRCS = $(addsuffix .c,$(PROGS))
  OBJS = $(addsuffix .o,$(PROGS))
@@ -36,8 +36,8 @@
  
  clean:
  	rm -f ${PROGS} *.o *~
---- pwdb-0.62/libpwdb/shadow/shadowio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/shadow/shadowio.c	2003-07-09 14:45:54.705662544 -0400
+--- a/libpwdb/shadow/shadowio.c
++++ b/libpwdb/shadow/shadowio.c
 @@ -16,6 +16,12 @@
  
  #include "../_pwdb_internal.h"
@@ -133,8 +133,8 @@
  }
  
  int __pwdb_spw_update (const struct __pwdb_spwd *spwd)
---- pwdb-0.62/libpwdb/shadow/sgroupio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/shadow/sgroupio.c	2003-07-09 14:45:54.704662696 -0400
+--- a/libpwdb/shadow/sgroupio.c
++++ b/libpwdb/shadow/sgroupio.c
 @@ -16,6 +16,12 @@
  
  #include "../_pwdb_internal.h"
@@ -230,8 +230,8 @@
  }
  
  int __pwdb_sgr_update (const struct __pwdb_sgrp *sgrent)
---- pwdb-0.62/libpwdb/unix/pwio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/unix/pwio.c	2003-07-09 14:45:54.707662240 -0400
+--- a/libpwdb/unix/pwio.c
++++ b/libpwdb/unix/pwio.c
 @@ -16,6 +16,11 @@
  
  #include "../_pwdb_internal.h"
@@ -326,8 +326,8 @@
  }
  
  /*
---- pwdb-0.62/libpwdb/unix/groupio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/unix/groupio.c	2003-07-09 14:45:54.708662088 -0400
+--- a/libpwdb/unix/groupio.c
++++ b/libpwdb/unix/groupio.c
 @@ -11,6 +11,12 @@
  #include "../_pwdb_internal.h"
  
@@ -422,8 +422,8 @@
  }
  
  /* update an entry */
---- pwdb-0.62/libpwdb/Makefile.pwdbselinux	1999-04-10 05:31:20.000000000 -0400
-+++ pwdb-0.62/libpwdb/Makefile	2003-07-09 14:45:54.709661936 -0400
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
 @@ -22,7 +22,7 @@ HEADERS	= pwdb/pwdb_public.h pwdb/pwdb_c
  
  # needed for generic interface compilation
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r2.ebuild
index ea832e84206e..d44cdd852dd0 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs flag-o-matic usr-ldscript
+inherit toolchain-funcs flag-o-matic usr-ldscript
 
 DESCRIPTION="Password database"
 HOMEPAGE="https://packages.gentoo.org/package/sys-libs/pwdb"
@@ -16,22 +16,32 @@ IUSE="selinux"
 RESTRICT="test" #122603
 
 # Note: NIS could probably be made conditional if anyone cared ...
-RDEPEND="selinux? ( sys-libs/libselinux )
+RDEPEND="
 	net-libs/libnsl:0=
-	net-libs/libtirpc"
+	net-libs/libtirpc
+	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS README doc/pwdb.txt )
+HTML_DOCS=( doc/html/. )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-disable-static.patch # bug 725972
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
 
-	use selinux && epatch "${FILESDIR}"/${P}-selinux.patch
+	use selinux && eapply "${FILESDIR}"/${P}-selinux.patch
 
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
 	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libtirpc)
 
 	sed -i \
 		-e "s/^DIRS = .*/DIRS = libpwdb/" \
-		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
+		-e "s;EXTRAS += ;EXTRAS += ${CFLAGS} ;" \
 		Makefile || die
 	sed -i \
 		-e "s:=gcc:=$(tc-getCC):g" \
@@ -53,6 +63,5 @@ src_install() {
 	insinto /etc
 	doins conf/pwdb.conf
 
-	dodoc CHANGES CREDITS README doc/*.txt
-	dohtml -r doc/html/*
+	einstalldocs
 }
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 53e302f33a46..2aa05428e817 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -10,7 +10,7 @@ DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64
 DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
 DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
-EBUILD readline-8.0_p4.ebuild 4844 BLAKE2B 911295cd0f230c2e08a5928b436c2a155304fae48a0c1cc9b797ada57addd7d0219f2d5dab1d7a03efd16c3a4b04ce7426f43f9916af2f21321707f096e0fa28 SHA512 dccdd6b34e34af2df1b04188360de701eb18b9701a73a6e4ec7b6529f3ea4316cfcdf307a4a8ab12f40f766676562378a8eb7d17689a93c611445577cd2b5a02
-EBUILD readline-8.1.ebuild 5383 BLAKE2B b262acbdd24af54859ccf1ac4e2cb84f845fd792c777f9ff1af154a5bb6b9a867bacba11fc63c99c689fc51729e8c19fa6eed0e6a40d99bedbf2abc39edb37d1 SHA512 f684d6ee7de81b95a88a23cb28c0f6f406b58d49428403ada8a1399c67ae9fd28b4bbec648b12044d2f13d49c7d8c3e523f88ee8a72265f0a9f617d2e14edf55
-EBUILD readline-8.1_p1.ebuild 5383 BLAKE2B b262acbdd24af54859ccf1ac4e2cb84f845fd792c777f9ff1af154a5bb6b9a867bacba11fc63c99c689fc51729e8c19fa6eed0e6a40d99bedbf2abc39edb37d1 SHA512 f684d6ee7de81b95a88a23cb28c0f6f406b58d49428403ada8a1399c67ae9fd28b4bbec648b12044d2f13d49c7d8c3e523f88ee8a72265f0a9f617d2e14edf55
+EBUILD readline-8.0_p4.ebuild 4853 BLAKE2B 824ab50dd5f2c7ad40349ba4c13060cc70eadc7cb0a78c45a399206f0fda71659d1c75824662757f66ef221e3ef0c2e21a856f9cb0feaac55ff116e097a225f0 SHA512 f8cd28033c92c430de345a1c8bcf73a50c61557a7e4332bfe1023510d5915e14a62ccb7aeb1056a8cb9b120c176229dcb9f0edffa4c4a74ee1604e5a56db7e21
+EBUILD readline-8.1.ebuild 5384 BLAKE2B 9015a53e47b6e4817c55e35f74c27ba2d342867278f75213724995ae36bcacab7c5116f1c6cd7e96f568b150013c3167b2342aefd35dfeb126a19ba3f3228f7d SHA512 dd794ef79438984744cfee22bb5d67030ac027337e7c354b75d7537a922ab7a1dfcbda2bf3bfe7a230eb367eef4bd1ae591fb7c9af2964ca530fbbb76311a33a
+EBUILD readline-8.1_p1.ebuild 5375 BLAKE2B caeb17536a6fb372ca472aa89acc9888e101f5fa2bc126778b9a57d74a61167c3875642201c671868015937fd799b285fae6a98e370aecfa77b35d17c55132e3 SHA512 6d3b8d7e6b57689d45c5615c494cc226880e29e04a19223205bbc7c69e85a8e2af4e82cea4bf43e4ed652b8cf075db35d8de0a7eaca2c7ab83c04e01d700897a
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
index e417adad0535..3918add9dde6 100644
--- a/sys-libs/readline/readline-8.0_p4.ebuild
+++ b/sys-libs/readline/readline-8.0_p4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild
index f9e927fcc6a5..4a4f8c7b6f2c 100644
--- a/sys-libs/readline/readline-8.1.ebuild
+++ b/sys-libs/readline/readline-8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
@@ -42,7 +42,7 @@ esac
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 [[ "${PV}" == *_rc* ]] || \
-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"
+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"
 IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-8.1_p1.ebuild b/sys-libs/readline/readline-8.1_p1.ebuild
index f9e927fcc6a5..944bdc746894 100644
--- a/sys-libs/readline/readline-8.1_p1.ebuild
+++ b/sys-libs/readline/readline-8.1_p1.ebuild
@@ -42,7 +42,7 @@ esac
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 [[ "${PV}" == *_rc* ]] || \
-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"
+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"
 IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 4a92e7c6a695..551e6a12b25c 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,5 +1,5 @@
 DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
 EBUILD talloc-2.3.1.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
-EBUILD talloc-2.3.2.ebuild 3428 BLAKE2B be56e1ea8a8f80877ca7758be1a782476ba52f5f150f4e0b5342269fff310e94e89f15f4101dd68ae782cef70104b6c255d10dabcfd47393b3a3ecb2e2fd26a8 SHA512 1b4a0a499c841793fc60cb219af4a78f9aa0cc05c351a3349c46a68b5d2e349f77f03686d590368777b368f9d13e2fa2eac278a068dc6895bb8eb355638a574f
+EBUILD talloc-2.3.2.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.3.2.ebuild b/sys-libs/talloc/talloc-2.3.2.ebuild
index 3ed16153927b..851fdbb724c4 100644
--- a/sys-libs/talloc/talloc-2.3.2.ebuild
+++ b/sys-libs/talloc/talloc-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 763a814dd750..211d0776ebe0 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,3 +1,3 @@
-DIST zlib-ng-2.0.2.tar.gz 698033 BLAKE2B 97645b054daddfe77aa23ec90e0beccc631c33f9ea841b8305ee7d2fb82dc61b2d60e924187d0012f7e99760669dd9d3c5f4e19dc64a0d2b253d333e21c898fe SHA512 d40a4fe036783fbc46225a49ff026cc12cd335103aa6f24e14e724c23d034019ed392337072879bc014223fe7b74a68f8d1d7dc1dfdbda95af864020e14272a8
-EBUILD zlib-ng-2.0.2.ebuild 1971 BLAKE2B 6c6f5f9b1af80c9a7dfa525c849990a590d140c382ee99a9c7965426f4974e34bffc6a18e6b047b336b5d41bf3939e4e6a039f29837ea6add42f0b9dac64b68e SHA512 6305b130787419a29e6c70a7af35e24ed04fb2365898e6a38c46894f6e2660686805d381f30dda00377db30c2088010c1308a9aa3665f678cb518dc4b5f0928b
+DIST zlib-ng-2.0.3.tar.gz 699927 BLAKE2B 12776377ddc729b783ddbd5fab007869d941368e8abb6697ecd416732b20879fa5a995d6e613b9874f06721caa64e73ac5db2dc0cd9035edbed74b848897eb6b SHA512 e1afe91e1a8b4c54a004b672f539ae68f7dc1f1b08ba93514c0de674230354c944d496753f00ad272f16ef322705f275b5b72dac6c2a757ec741ef3f1ea1d59a
+EBUILD zlib-ng-2.0.3.ebuild 1971 BLAKE2B 6c6f5f9b1af80c9a7dfa525c849990a590d140c382ee99a9c7965426f4974e34bffc6a18e6b047b336b5d41bf3939e4e6a039f29837ea6add42f0b9dac64b68e SHA512 6305b130787419a29e6c70a7af35e24ed04fb2365898e6a38c46894f6e2660686805d381f30dda00377db30c2088010c1308a9aa3665f678cb518dc4b5f0928b
 MISC metadata.xml 430 BLAKE2B 6c9dc67624e11d0cad0e9cdd748ba6e759e09a15fe5c4188c289ca234ce304f128a4150d835214a3035d570bb9b576c752d31bf194ec4e91058ac778fb24352c SHA512 a43ac0b952306ed54935ca12f5aa2d4e425a3b6056dc52df6e7f8b9a11f992222328ef8a363939bccf0e0d5b4251a9d5479aae79a2332ec535b2e1e546b6e2e0
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.2.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.3.ebuild
index 35316b265096..35316b265096 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.2.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.3.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-libs
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)