gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
183 files changed, 1150 insertions, 2215 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 591193f234eb..b628b0db9249 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 c2507e1a6d41..c4fe562ebe06 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,14 +1,13 @@
 AUX binutils-libs-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
+AUX binutils-libs-2.36.1-bfd-ctf.patch 2861 BLAKE2B 18fe98e2352cfa7a63144f40df2ab6be925b4330bc7e4c0e65ee5d2911b9a5a9d5ddf3a118a7b2230c2b1d4d170b01b697ff66fcb5babc89815a7c628a008a73 SHA512 996b5e83efda52748c0f052fb32599c69c61674981c2f6a89cf5f148fa47b8932f763114ce69fd059600bb4ed2afa2d7757812cc7fc5f29a48215903e33c7f34
+AUX binutils-libs-2.36.1-ld-ctf.patch 1874 BLAKE2B 7bf0868b098e52dc58128507f6ea0cfa28c68de94ad5da3c4d62f7fed1119e34b7573a01333d216ed33931a3d9ab7c23be740277c1a47b24860762e6b7c04e29 SHA512 7e7a106bd8bc8f0f53a9d38368694f1cf56e66ca59c4bcac7ed233d751cb2f19acd8860cecf04ca39495610c766f94ff19598b4c83185051fad21313298fc864
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e941535f992150d86f25201cadd07b63daaa36bf76b07dc0aa8a4837da17d1672feb47a7b15f83efdeec5409e695965a10142147a SHA512 b704ebe82c4402f058f9c96991a89256a6b369d28f844bf020ed2c77766894d9a2ca0596cd609de7b389fa8cd52bfab674b6deb10ea2096e50aa57921be2083e
-DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
-DIST binutils-2.36.1-patches-1.tar.xz 11392 BLAKE2B 8112dda3f000d29952cbf58101f842ca519054bf9de6e22908881fe4d46cc1ea9a26db74ab00c64aedd3746eb058c19a978b8dc025ad8de07b6365c70a1803b2 SHA512 c6f5645b09d0c149f2eef8e992ff7181716dfb961f1155207a1349168f2d2fb76857cc224c27b4d764cfbc4ddec0630ef8c0a91d7bac489896f28de64651b367
+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 3686 BLAKE2B f6a8b9c39aa5946ca55e6e5dc0ea3cc0f4a7eeea780482364243e209193fc824e95cb9d2000473107c9f80b73dcbad9f01d33403d7cde6ec85400c6db08e0e9a SHA512 3f6e136ca78fc6ed1730480facf415eb916e1310a973cf5bc7bb234e3740247bf06b81f6939603a13b0f93c606d3819e8f93606f01113e5bb0880dd39253e67a
-EBUILD binutils-libs-2.35.1-r1.ebuild 4110 BLAKE2B 9eb6a7e3183329a676a0b11c0d81c876c700605fe69c9468332ecb6d7649652ac26c5d41b2e4c13f055240c89351d51650261dde29a207cfdb915a4a1c1c8e10 SHA512 92efc064aeb0d4fcbcec83717de53ce8ce73e8dc48923c036a0b00f6226213bcb6e0c7142c4548a934106e4f83b21e53ec5c886814bf70f5c1d69bd1ff1b791b
-EBUILD binutils-libs-2.35.2.ebuild 4117 BLAKE2B 6584f14caca79b6e60cf8f665f99a7cc84c1c47e20348b52ae8cb9fea71a903cb1f8098adb1d0bfca818e6b22f2dacab033da6a04087c755893c9dca22b1218f SHA512 5e3fc0fb67010c52dd3550fb18982d478f420cd2aad34df520444d89e58104252ea7f5620afbaaf3bf9b791eb887f6b2495a6c95195f9ad1a34be59942492b7d
-EBUILD binutils-libs-2.36.1.ebuild 4118 BLAKE2B dd483ae6775c2748cb8521f7a0b625773cd51fa1290cb73bb85a98f480ca5dd31b68936aabe7dc1bbcd15247ac36240a36cfb33449f362a8daa32fbf37cc10c0 SHA512 fbdfd9aae1fe384b9d76d0d0feafb1bf212e20ac0d9f3b1cf75f1e62d06876d4a092fdd0ea096a8c5af24edbe534ea661f26b6856569e02cd694ebaea7daf31e
+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.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.34-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index 250ddd0694e7..de8fcddd332e 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PATCH_VER=6
 PATCH_DEV=dilfridge
 
-inherit eutils libtool toolchain-funcs multilib-minimal
+inherit libtool toolchain-funcs multilib-minimal
 
 MY_PN="binutils"
 MY_P="${MY_PN}-${PV}"
@@ -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 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/binutils-libs/binutils-libs-2.35.2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
index ec44417459b8..f10651d7aa79 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PATCH_VER=1
 PATCH_DEV=dilfridge
 
-inherit eutils libtool toolchain-funcs multilib-minimal
+inherit libtool toolchain-funcs multilib-minimal
 
 MY_PN="binutils"
 MY_P="${MY_PN}-${PV}"
@@ -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/binutils-libs/binutils-libs-2.35.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.36.1-r1.ebuild
index c047eed3ff51..60e0e7e544e8 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.36.1-r1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PATCH_VER=2
+PATCH_VER=3
 PATCH_DEV=dilfridge
 
-inherit eutils libtool toolchain-funcs multilib-minimal
+inherit libtool toolchain-funcs multilib-minimal
 
 MY_PN="binutils"
 MY_P="${MY_PN}-${PV}"
@@ -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}]"
@@ -30,8 +30,6 @@ RDEPEND="${DEPEND}
 	>=sys-devel/binutils-config-5
 "
 
-PATCHES=("${FILESDIR}"/${PN}-2.35.1-cet.patch)
-
 S="${WORKDIR}/${MY_P}"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/sys-libs/binutils-libs/binutils-libs-2.36.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.36.1.ebuild
deleted file mode 100644
index 679f4177453c..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.36.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.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"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-config-5
-"
-
-PATCHES=("${FILESDIR}"/${PN}-2.35.1-cet.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# Fix cross-compile relinking issue, bug #626402
-	elibtoolize
-
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# We pull in all USE-flags that change ABI in an incompatible
-		# way. #666100
-		# USE=multitarget change size of global arrays
-		# USE=64-bit-bfd changes data structures of exported API
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
-		# fix underlinking in opcodes
-		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
-			"${S}"/opcodes/Makefile.in || die
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	# Prevent makeinfo from running as we don't build docs here.
-	# bug #622652
-	sed -i \
-		-e '/^MAKEINFO/s:=.*:= true:' \
-		Makefile || die
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch
new file mode 100644
index 000000000000..d7daf683669d
--- /dev/null
+++ b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch
@@ -0,0 +1,68 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
+https://bugs.gentoo.org/783777
+
+From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
+From: Nick Alcock <nick.alcock@oracle.com>
+Date: Thu, 18 Mar 2021 12:37:52 +0000
+Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
+
+This stops problems parallel-installing if a relink of libctf is needed.
+
+Also adds corresponding install-strip dependencies.
+
+ChangeLog
+2021-03-18  Nick Alcock  <nick.alcock@oracle.com>
+
+	PR libctf/27482
+	* Makefile.def: Add install-bfd dependencies for install-libctf and
+	install-ld, and install-strip-bfd dependencies for
+	install-strip-libctf and install-strip-ld; move the install-ld
+	dependency on install-libctf to join it.
+	* Makefile.in: Regenerated.
+---
+--- a/Makefile.def
++++ b/Makefile.def
+@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
+ dependencies = { module=all-binutils; on=all-gas; };
+ dependencies = { module=all-binutils; on=all-libctf; };
+ dependencies = { module=all-ld; on=all-libctf; };
+-dependencies = { module=install-ld; on=install-libctf; };
+ 
+ // We put install-opcodes before install-binutils because the installed
+ // binutils might be on PATH, and they might need the shared opcodes
+@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
+ dependencies = { module=install-binutils; on=install-opcodes; };
+ dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
+ 
++// Likewise for ld, libctf, and bfd.
++dependencies = { module=install-libctf; on=install-bfd; };
++dependencies = { module=install-ld; on=install-bfd; };
++dependencies = { module=install-ld; on=install-libctf; };
++dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
++dependencies = { module=install-strip-ld; on=install-strip-bfd; };
++dependencies = { module=install-strip-ld; on=install-strip-libctf; };
++
+ // libopcodes depends on libbfd
+ dependencies = { module=install-opcodes; on=install-bfd; };
+ dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
+ all-stage4-ld: maybe-all-stage4-libctf
+ all-stageprofile-ld: maybe-all-stageprofile-libctf
+ all-stagefeedback-ld: maybe-all-stagefeedback-libctf
+-install-ld: maybe-install-libctf
+ install-binutils: maybe-install-opcodes
+ install-strip-binutils: maybe-install-strip-opcodes
++install-libctf: maybe-install-bfd
++install-ld: maybe-install-bfd
++install-ld: maybe-install-libctf
++install-strip-libctf: maybe-install-strip-bfd
++install-strip-ld: maybe-install-strip-bfd
++install-strip-ld: maybe-install-strip-libctf
+ install-opcodes: maybe-install-bfd
+ install-strip-opcodes: maybe-install-strip-bfd
+ configure-gas: maybe-configure-intl
+-- 
+2.27.0
+
diff --git a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch
new file mode 100644
index 000000000000..012df3aed812
--- /dev/null
+++ b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch
@@ -0,0 +1,48 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
+https://bugs.gentoo.org/783777
+
+From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
+From: Nick Alcock <nick.alcock@oracle.com>
+Date: Tue, 26 Jan 2021 16:05:17 +0000
+Subject: [PATCH] ld: depend on libctf
+
+Since ld may depend on libctf (if present), and libctf may be relinked
+by the installation process, libctf must be installed before ld is,
+or the relink may fail if it calls on symbols or symbol versions that do
+not exist in any libctf already present on the system.  (If none is
+present, the copy in the build tree will be automatically used, but
+if one *is* present, it may take precedence and break things.)
+
+(This is a maybe- dependency, so it will work even if libctf is
+disabled.)
+
+ChangeLog
+2021-01-26  Nick Alcock  <nick.alcock@oracle.com>
+
+	PR 27250
+	* Makefile.def: Add install-libctf dependency to install-ld.
+	* Makefile.in: Regenerated.
+---
+--- a/Makefile.def
++++ b/Makefile.def
+@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
+ dependencies = { module=all-binutils; on=all-gas; };
+ dependencies = { module=all-binutils; on=all-libctf; };
+ dependencies = { module=all-ld; on=all-libctf; };
++dependencies = { module=install-ld; on=install-libctf; };
+ 
+ // We put install-opcodes before install-binutils because the installed
+ // binutils might be on PATH, and they might need the shared opcodes
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
+ all-stage4-ld: maybe-all-stage4-libctf
+ all-stageprofile-ld: maybe-all-stageprofile-libctf
+ all-stagefeedback-ld: maybe-all-stagefeedback-libctf
++install-ld: maybe-install-libctf
+ install-binutils: maybe-install-opcodes
+ install-strip-binutils: maybe-install-strip-opcodes
+ install-opcodes: maybe-install-bfd
+-- 
+2.27.0
+
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 2277a1135da4..b94311a2e2b9 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,17 +1,18 @@
-AUX 11.1.0/compiler-rt-prefix-paths.patch 3794 BLAKE2B f6e8992658e665bd9cc13bae00c9d7757d01438a73ffd8809be67bbcd1c6d3956e9965890fd84e573c9ef6cc74a7fc7a349e2e5eec21387150c8ef2ae2bf055d SHA512 23a05ce3805678e855be2a4678102e72fe81cb86208357df0dc95b85c7268fe95025603908dd114b27742f39432c4c860859904b287cf52f5a5b337b131bcb9e
-AUX 9999/compiler-rt-prefix-paths.patch 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
-EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4490 BLAKE2B 5bbce4ab70e2b1434698eae6a37c529c7ffa58ae90236c0ddef3023a00cf1bb6d3ed8b3ae767b81f0abb9759e33fb5e1d9e8f755505db72ceb9cc46f6cb1a179 SHA512 fda208adbbb4fa7e14d3a27956bce3a809c202ecf5eceb0fac956a0ec0879579f8f94f69172cd934481a98d84cdc36ea2fdc46b8ad906dbb48795673d2d7c4eb
-EBUILD compiler-rt-sanitizers-11.0.0.ebuild 5092 BLAKE2B 243f8ddf60558abf5d1ad9e6a1e31333769d1e0e33ff401c915b243297583de8f21be8ab15605a2744a981ff8cd0d1ba760aafc7bc13c43586a901b6050fd0a6 SHA512 04af5692fd79ba8fe51d69664d09f4c2ef2546559a5e5538363d22dbfb791e0f313ce289fdb56dcbfd116e399a3d34dab293a1f355acaf6700bb3003bd50e729
-EBUILD compiler-rt-sanitizers-11.0.1.ebuild 6080 BLAKE2B b276c7e47eea0a950ceb0aaac11beea427cc91e7c91adde1181fdf47e0aaa454ff9ede64ca3f9cf348a8e80336e916c26faf3c4318a42fc30d0a2f3856104c3a SHA512 75dc8e9bc49d82e5a1aeb2ff1b385095e9372200feeb8f3e0ffa2425f638ba89017b4a0262b57e6f24484ec39e35c3225def76f3330bada56cbcdffcbaf0e768
-EBUILD compiler-rt-sanitizers-11.1.0.ebuild 6083 BLAKE2B 6ad663e46a03683f5b2be6b910418e40151e3205b62cd50d575d0bb8a3b74564b23e1f548dbcb9f99b3381bf1362f276581565e476ee590afed008c6ad198d60 SHA512 8e9dfa7b2058b47e91fd2f9e2dee036a7438df89017a26ce4a245630afe64409415285982db96889ed9a22e880c7b5cb205fb50eb682bcb72ddef680ff898fa2
-EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
-EBUILD compiler-rt-sanitizers-12.0.0_rc2.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
-EBUILD compiler-rt-sanitizers-12.0.0_rc3.ebuild 6003 BLAKE2B 90595ab86e646385cf823452958c3f052093d12990c310917d55cff9f22c4e5a93e905e6e6731f31f8643340ccea08b46bccdb77dc8ebe9bf94b5e6bf313d3e8 SHA512 a0e0d604a1b87d07c262bf6ecdce01d5a301f3a6cc0d2192ffc0af671851a74cd167bf0b653e246f2a2429a796c3b69ed4f02724a3070993c43afd15b626aa0c
-EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
+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-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
 MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild
index 1107b97186c3..1bece33a48df 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild
@@ -10,6 +10,7 @@ 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=10.0.1-2
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
index adfe23a46b4d..61b07d7232e6 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
@@ -10,6 +10,7 @@ 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 )"
@@ -35,10 +36,6 @@ BDEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1-r1.ebuild
index d139a2006ac3..fcbac3eafef2 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1-r1.ebuild
@@ -48,12 +48,9 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=11.1.0-2
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild
index 726f400a85f7..fcbac3eafef2 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.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"
@@ -48,12 +48,9 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=11.1.0-2
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
index b9f483144cde..e96a02172283 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
@@ -48,12 +48,9 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc3.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.ebuild
index 7d274c79c99e..63517d145db7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc3.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.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=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +memprof +profile +xray"
@@ -29,6 +29,8 @@ REQUIRED_USE="
 		gwp-asan? ( scudo )
 	)"
 RESTRICT="!test? ( test ) !clang? ( test )"
+# Huge breakage with glibc-2.33.
+RESTRICT+=" test"
 
 CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
@@ -48,12 +50,9 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=12.0.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild
deleted file mode 100644
index b9f483144cde..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.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=""
-IUSE="+clang test elibc_glibc"
-# base targets
-IUSE+=" +libfuzzer +memprof +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.org_set_globals
-
-PATCHES=(
-	"${FILESDIR}/9999/compiler-rt-prefix-paths.patch"
-)
-
-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
-
-	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_MEMPROF=$(usex memprof)
-		-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-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
index b9f483144cde..e96a02172283 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
@@ -48,12 +48,9 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/compiler-rt-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch
deleted file mode 100644
index c27e3c44f684..000000000000
--- a/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/compiler-rt/cmake/config-ix.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/config-ix.cmake	2020-12-13 16:17:43.000000000 -0600
-@@ -424,10 +424,7 @@
-     ${DARWIN_COMMON_LINK_FLAGS}
-     ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
- 
--  if(DARWIN_osx_SYSROOT)
--    list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
--    list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
- 
-   # Figure out which arches to use for each OS
-   darwin_get_toolchain_supported_archs(toolchain_arches)
---- a/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:17:13.000000000 -0600
-+++ b/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:18:59.000000000 -0600
-@@ -102,23 +102,8 @@
- endif()
- 
- if(APPLE)
--  # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but
--  # not the command line tools (or is using macOS 10.14 or newer). If this is
--  # the case, we need to find the OS X sysroot to pass to clang.
--  if(NOT EXISTS /usr/include/c++)
--    execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
--       OUTPUT_VARIABLE OSX_SYSROOT
--       ERROR_QUIET
--       OUTPUT_STRIP_TRAILING_WHITESPACE)
--    if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
--      message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
--    else()
--      message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
--      set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
--    endif()
--  else()
--    set(OSX_SYSROOT_FLAG "")
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  set(OSX_SYSROOT_FLAG "")
- 
-   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
-   option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-12-13 16:21:32.000000000 -0600
-@@ -273,7 +273,8 @@
-     ${ARGN})
-   set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
-   add_library(${libname} STATIC ${LIB_SOURCES})
--  if(DARWIN_${LIB_OS}_SYSROOT)
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
-     set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
-   endif()
-
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-12-13 18:12:27.000000000 -0600
-@@ -277,9 +277,10 @@
-       if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
-         list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")
-       endif()
-+      # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake)
--      if(CMAKE_SYSROOT)
-+      if(CMAKE_SYSROOT AND NOT APPLE)
-         list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
-       endif()
-       string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")
-       string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
-              ${CMAKE_C_COMPILE_OBJECT})
---- a/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:02.000000000 -0600
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:38.000000000 -0600
-@@ -244,6 +244,7 @@
- # and Clang's versions. As a workaround do not use --sysroot=. on FreeBSD/NetBSD
- # until this is addressed.
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-+   AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"
-    AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-   file(GLOB _tsan_generic_sources rtl/tsan*)
-   file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
-
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch
+++ /dev/null
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b1676d08f9df..bc60e308dab6 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,17 +1,18 @@
-AUX 11.1.0/compiler-rt-prefix-paths.patch 3794 BLAKE2B f6e8992658e665bd9cc13bae00c9d7757d01438a73ffd8809be67bbcd1c6d3956e9965890fd84e573c9ef6cc74a7fc7a349e2e5eec21387150c8ef2ae2bf055d SHA512 23a05ce3805678e855be2a4678102e72fe81cb86208357df0dc95b85c7268fe95025603908dd114b27742f39432c4c860859904b287cf52f5a5b337b131bcb9e
-AUX 9999/compiler-rt-prefix-paths.patch 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
-EBUILD compiler-rt-10.0.1.ebuild 2759 BLAKE2B ef75dd0b6d96bf2dfb562ac59bc6bbb8aebc69684dd3acf302b4700fad90fd80e62088b0c141aa23958ec7f06dafd01f6d5f451b4c995fb01541eb1a39dcb127 SHA512 51a5c6fcb385651f5d91d5985396f176fc7405fc4a95321a8ff896f8c22b922bfc987aaa5462a6be3df3ee2ac179633226e97955b4ffd486ec414a4e82e9470c
-EBUILD compiler-rt-11.0.0.ebuild 3541 BLAKE2B d9847d05f37311727267169e5798e2cf3af779a565776b273e0041434774cbcf9544a85fd5ceef555326f59a94ad2a1978581529689a6c46d160937dbd2d7b8f SHA512 940e19da15e1f9af55e978155152e3ee65216c16cbfd96b32a0ffee2df5f7bf1ab1e14b3f214df858b116aec810f9ddef9a5c21d11d3f33eb56ea16116d69e7f
-EBUILD compiler-rt-11.0.1.ebuild 3544 BLAKE2B c12af62e30475143bd86e5b87042003bb9d1dbf3918d566210c7593ab12168095bf9a0f16f185e613c33c48a101e209b55288015b0b8c45168cc3ac098d805ca SHA512 5464a523dd54dc9dddc1de15a657c1f07dad4ab64cc6bbdab13cbf315451614400730281bd3c7c6e64580d003ca57bf074c061cd224a5a6a32f19c2157b31c3f
-EBUILD compiler-rt-11.1.0.ebuild 3547 BLAKE2B fa31c4be8bf49c9c803659cebc09d3caf3390da23a73ae925f44bed2c1026e8e80ffc753f02a418280a97f1b89bd7d155255da4ad6e09dca487142151e7b518f SHA512 2b6f62b854fef02b14fb0bbfcb88f80cf6a8cd632ff111c0bd5912e9518e4a26778c7eb86567fee06bc98810986a703aa675a9c79739b5edc0805a6ec7d177b9
-EBUILD compiler-rt-12.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
-EBUILD compiler-rt-12.0.0_rc2.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
-EBUILD compiler-rt-12.0.0_rc3.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
-EBUILD compiler-rt-13.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
+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-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
 MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
index 11bb6907be3a..bcd5f4b351d2 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
@@ -9,6 +9,7 @@ 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=10.0.1-1
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
index 5b81358551df..dce4982904c3 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
@@ -9,6 +9,7 @@ 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 )"
@@ -29,10 +30,6 @@ BDEPEND="
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
index 31085e5f5a71..1041a4553f3c 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
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 2503f211925e..1041a4553f3c 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 )"
 
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index e66cf796efb1..caf0b9268efd 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
index e66cf796efb1..bf024de10f4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc3.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.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=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=12.0.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0_rc2.ebuild
deleted file mode 100644
index e66cf796efb1..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc2.ebuild
+++ /dev/null
@@ -1,127 +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=""
-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.org_set_globals
-
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
-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_MEMPROF=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-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
index e66cf796efb1..caf0b9268efd 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
deleted file mode 100644
index c27e3c44f684..000000000000
--- a/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/compiler-rt/cmake/config-ix.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/config-ix.cmake	2020-12-13 16:17:43.000000000 -0600
-@@ -424,10 +424,7 @@
-     ${DARWIN_COMMON_LINK_FLAGS}
-     ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
- 
--  if(DARWIN_osx_SYSROOT)
--    list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
--    list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
- 
-   # Figure out which arches to use for each OS
-   darwin_get_toolchain_supported_archs(toolchain_arches)
---- a/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:17:13.000000000 -0600
-+++ b/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:18:59.000000000 -0600
-@@ -102,23 +102,8 @@
- endif()
- 
- if(APPLE)
--  # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but
--  # not the command line tools (or is using macOS 10.14 or newer). If this is
--  # the case, we need to find the OS X sysroot to pass to clang.
--  if(NOT EXISTS /usr/include/c++)
--    execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
--       OUTPUT_VARIABLE OSX_SYSROOT
--       ERROR_QUIET
--       OUTPUT_STRIP_TRAILING_WHITESPACE)
--    if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
--      message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
--    else()
--      message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
--      set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
--    endif()
--  else()
--    set(OSX_SYSROOT_FLAG "")
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  set(OSX_SYSROOT_FLAG "")
- 
-   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
-   option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-12-13 16:21:32.000000000 -0600
-@@ -273,7 +273,8 @@
-     ${ARGN})
-   set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
-   add_library(${libname} STATIC ${LIB_SOURCES})
--  if(DARWIN_${LIB_OS}_SYSROOT)
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
-     set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
-   endif()
-
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-12-13 18:12:27.000000000 -0600
-@@ -277,9 +277,10 @@
-       if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
-         list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")
-       endif()
-+      # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake)
--      if(CMAKE_SYSROOT)
-+      if(CMAKE_SYSROOT AND NOT APPLE)
-         list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
-       endif()
-       string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")
-       string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
-              ${CMAKE_C_COMPILE_OBJECT})
---- a/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:02.000000000 -0600
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:38.000000000 -0600
-@@ -244,6 +244,7 @@
- # and Clang's versions. As a workaround do not use --sysroot=. on FreeBSD/NetBSD
- # until this is addressed.
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-+   AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"
-    AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-   file(GLOB _tsan_generic_sources rtl/tsan*)
-   file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
-
diff --git a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
+++ /dev/null
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index d773b19c2fc8..c6ed2bee392d 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,3 +1,3 @@
 DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
-EBUILD cracklib-2.9.7.ebuild 2489 BLAKE2B c600fc873e4920d2a7f91e0bb6e1c7b25cb369a4c1badeed01adfe69728495dffe3b90acc274da3bcd7a5b5fb73f4cea5843022e4b8b99b60c72d8559dde3241 SHA512 94e252f639d6aee0362cf66f5405053b89820ded4febb323b9f5e32df5b1e592cc1962cab0c87ef4ba03ed6b1a03c97fb78e95b9cccd5e94f00eb3d9cf70eace
+EBUILD cracklib-2.9.7.ebuild 2490 BLAKE2B dadf2527fc0d48ecb40e0bc9d53ebe5b0ba869808125baa4ef541331c62fa6f55b684628e8cf7deafc497d7d163bacae355f7bcf9231378ee76e4886d63f2e14 SHA512 173d0385a15635041acc008f7a39687b7f9793b2a22ca47798ce889c8dc0f30f3d9a8bbc1d086b2ee9808001103f6fb62e44e5c9ff1a5ddeb32843d2ee982759
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 534b552abb88..65506cf48985 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest
index 9ddcc726a0b9..b8878147ec5f 100644
--- a/sys-libs/csu/Manifest
+++ b/sys-libs/csu/Manifest
@@ -2,5 +2,5 @@ AUX csu-85-arm-availability.patch 475 BLAKE2B 29612bef6ef28b2681452a77aecb661841
 DIST Csu-79.tar.gz 12719 BLAKE2B f44e979323da828ebe4546ef3077dc1fd6feaf832e0a55aa09a9ba69a83c64759548f34ede8f92769f37e88d78e248b74c4a7e042857f74a8b88fc5958481ea4 SHA512 1d47cce40d400241bdd0a4c24e332f999cb7ae08bd43b08b88e9b5fd5a0a53c9752816b0e07c5b6ffb78f7b5bc24f45986c6a50c661bc5cdd15fee5e465da1bb
 DIST Csu-85.tar.gz 13376 BLAKE2B 59aa275bf01bb785b848447ff1291e0018b2f2bc3c42f4f222957aa6c1f9fd344fa6dca9ee53fb8d9d3b11f6c03c37fff9178c40e5a009712f251f502e1f4957 SHA512 3cfeb7d37630fc9d6607da018b9ac1aeb3f41a4c190a67e7dc242ae48e7abd0026e25055b9459f2f187d3bb25644f516f079d1b2e943e8cb4cc6c132ad594467
 EBUILD csu-79.ebuild 1129 BLAKE2B 5c15a207edea72b24ca7fd22fe5fd6661e9ba5895c24cd0cc3bb85eb7edd61d7edd2b60b307ba5a82d994983c8f2cb85776361966793afef43a470687939d0dc SHA512 4e6d618f586d12b54a4f9ba663dc509c878d876c5549b6d40a8f562354965ab24d8f9858e84572d599476cb50bef2a7d2f6d2a7e750c4ca014af4bfb02607fb7
-EBUILD csu-85-r1.ebuild 1833 BLAKE2B f3079cd3283f83a638b321db091bcab6d72438f8307554a8a3d2f1ee60e367d99daf58d9afca97e59ca3bb23ba3e277d801477bdd5ecd612a69f5453cd9a4cdb SHA512 df49d1754f20c87f82b9b369210186a28e94c288c5b3d614ccfd2d9e596f7f28eeb27f045c5b743a5f9ff566d2f42fa097687e2d2cda51863674de42b0b46211
+EBUILD csu-85-r1.ebuild 1800 BLAKE2B c557d9bca5eaf45e2a5b855ec161efdf93b27e7a4b7716bc9e7ea15aef4fb3dbc11a2a04ea5fa4598770ea8a68ac04c0f573de89a37741b524d0043bc5f2532c SHA512 f07320b9fc2f051f950501ef45f12ab53df7cab29025e275f57c996f781ef23b6b551e1413fdcdf1fc7a86c88511caced2729254a846868f5df44ac8a36b95f2
 MISC metadata.xml 253 BLAKE2B a4b36b4be049f1d21e016d607880182f1cec9bed962515c57a38cf380f146696105267bf25064ed831d889c27030798245d96eaee47d098a017f5052f44bc24f SHA512 b87265dab4980faf3d32b53ab9ce7d4ebbe5cc9d12300903b1365b337bcd72c337fdec2ef1574615d2d02cf0664023c17c0d30b57ac0237412fd2b401cc0e2f8
diff --git a/sys-libs/csu/csu-85-r1.ebuild b/sys-libs/csu/csu-85-r1.ebuild
index f5c3553c3da2..24e82d76af36 100644
--- a/sys-libs/csu/csu-85-r1.ebuild
+++ b/sys-libs/csu/csu-85-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.10 version"
 HOMEPAGE="http://www.opensource.apple.com/"
 SRC_URI="http://www.opensource.apple.com/tarballs/Csu/Csu-${PV}.tar.gz"
@@ -13,7 +11,6 @@ LICENSE="APSL-2"
 
 SLOT="0"
 KEYWORDS="~ppc-macos ~x64-macos"
-IUSE=""
 S=${WORKDIR}/Csu-${PV}
 
 # for now it seems FSF GCC can't compile this thing, so we need
diff --git a/sys-libs/cygwin-crypt/Manifest b/sys-libs/cygwin-crypt/Manifest
index 0825c52c894f..d51159729530 100644
--- a/sys-libs/cygwin-crypt/Manifest
+++ b/sys-libs/cygwin-crypt/Manifest
@@ -1,3 +1,3 @@
 DIST cygwin-crypt-1.4.tar.bz2 4446 BLAKE2B a0644f036c55fd169a1d708d51fc7d3b1cc0a94fba845319357b4251eb379aa799ed39ba81b2551774c870944b19e6e1053453e1e99b48a93ed5a62272c37e25 SHA512 1ecc4256730f13161a651cfdf71b27c1042e6f56fb859943426c371d4b37b8b2bd6ea768f86e45f7b8cf3478e97ff9578b79e5c37178c8794ff9b87799f2cab3
 EBUILD cygwin-crypt-1.4.ebuild 854 BLAKE2B 82868e38fc34dc233ecd8b72dad6b24c82c2ac142d15807c4e64c4e48fbe3035b8e7c10341834c585f306395f60ae3d44243b72c4cfac9066884e92105d323cf SHA512 725f80eb0acf1d0a30ff8a0afef0abb67bf21ce32b1f86f9066f42eeb37b2d324373dad87709567454f9c90790df9a5bc7b02103476012ca35f113f64a9d2864
-MISC metadata.xml 517 BLAKE2B 08aee319193ca3b6efbeb61157a841554e9fe9891476ffad4addfc8156cc5f7844201fc7ce2eabca6c0dba72792959b90850bd58df198638c108e980baaa10fb SHA512 3434a72bc3776b411a6fa9cb4948a77c510002e145fb2986552731a1da3fb16152bcca762e72c12de5369a66ba9add93848783364f30e68b0de1cefbd2458e2c
+MISC metadata.xml 431 BLAKE2B 3cc18d93d612cd6f10ad28753043e9010a25ea52480a5d272f128d56b60a16a3f343e8031b37ca0272f71428bced5baa05dc10bc4d773efaf3c591d3a6c9f468 SHA512 00e17af6e754bc40fc9a5141a638a75025d6645f9feb520f9f7ecf42d647c5f4b26bfbae7482451cbf8503e89218ff274d0c93f25c79481c3f446ac1380a9407
diff --git a/sys-libs/cygwin-crypt/metadata.xml b/sys-libs/cygwin-crypt/metadata.xml
index 598620e9d7d7..e86f0c93724d 100644
--- a/sys-libs/cygwin-crypt/metadata.xml
+++ b/sys-libs/cygwin-crypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		This packages provides a library which exports the functions crypt(3),
 		encrypt(3), and setkey(3).  The created passwords are 56 bit DES
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 0325776f9c98..e0e7a9596062 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -63,24 +63,24 @@ DIST patch.4.7.25.1 2072 BLAKE2B 773fb96f9c5995cee22931fcd504b9962d0c3407f7b4239
 DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea26eb135b1979f330f354cd5016f56b86400118f13fe29a92798b0dcf19581738d3e9cf83b9be1ebb6d SHA512 d57746a527574966606955a8ad6b97742ff3979e85a0d087ae0c33b64b4fc2fd854f3ac145e2efc061b3479de5ee8172a02183cf54ada91fce3e331ab948ff18
 DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
 DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
-EBUILD db-1.85-r4.ebuild 1306 BLAKE2B ecd0cc2b53b8ef0a1cf0a0b3934d41d0f45e190dd62cdbac291d53e7512ed6abcbdcd06d94ba49abe1c722d5f912985ac68d31932fd12dd56180301de5f5a8ff SHA512 e8ecdcd559c6a9abc78d47f9efc011475105715be1d875ba2733b22d836dcc6228fb59999ef2a6d7dc8c26e4895f020e000200778070de7821ae2fab621fa510
+EBUILD db-1.85-r4.ebuild 1307 BLAKE2B eeec9e6466a0f172cf6a9692782ab6d6b5cabfdb72398b985f34f53151a2a8d3c3990ba9d263c9ed9e780ea464d1369143c0e1967465a52eb0d70d1072be2b3e SHA512 afed650be1e2f2e5de7b7088d536640af2148279b31f89982abcbbcc61813c84c76bffafd32a5cdf28bdce5ee043c37b3aab1ac54e8d2114a88d1d029d5a0f2c
 EBUILD db-18.1.32.ebuild 6945 BLAKE2B 5380160ea7ea9ad794f7b355d84ef95aa4e246d20d9736da50f44dd741613b49ca401871e5c32bb755cc9a8849a9468600549f46d22dd99f38682b19acd15969 SHA512 85e360cb0f32652493a04a7ba53dbb5dd63c9514cdcc08ac780b18991f5812402a59907de271d4caad4ced096f26d402fc821c93cc302cd81912bfbad320be62
 EBUILD db-18.1.40.ebuild 6877 BLAKE2B ae43f4356f053b3fcfe754b263a56053152d255c60d9c912d9ad76b3c8b3d8affde5174ef256b5fbf3de8ebb5e50ebdd1503afa67627e744aa445c68cc1c4bb3 SHA512 a68f87ad07bdce70a3254801b3f700a54fd807db87bbe9c0039c70b7dbe756710c8d4ff7ad20439734271d7e4c07d9187bea4f3a2652e2c1a87b462eae4c71d0
-EBUILD db-3.2.9_p2-r1.ebuild 4898 BLAKE2B ed7d56c9bfa4593755cfd5f769a099f6fdb4e2a091f938501be28fcc0a2e96c1642be763a4bffe0ea992b4063cf3b64f3f92999b88755fe4f43344a113803b71 SHA512 acadbbd870165059a9cf640126679974eb7034d53b878ca71a5117d3792f8224a7806a02c31a5b34619b60f6a733344d9ffebf0a19f3e65d3afd3fb98546e045
-EBUILD db-4.2.52_p5-r3.ebuild 4639 BLAKE2B 3a3d88d2be0361e9a80ac746bcaddceee73cc0e316c4994f25a6af08e66779bf3f7b54afda8ddb32c7516b9a500488ebd90b86f57b538610bc0ff1ea9f27951a SHA512 e806042667d98fc9f37f22980acc8e9ede0730363dc657c2e49e5aad597f47c05cfb35acd5286a22063697260a5c7f4ad0c32968ed88fec21ba9eff6365bca64
-EBUILD db-4.3.29_p1-r3.ebuild 4509 BLAKE2B 162b336146746333585bde2492a74e215aeeb93d96c890322d75971f99b736291649c27776d2cf441cd6b6e61e23006c49efc66042aba5eb9a8cb3d17d0bcd7e SHA512 d3cc3ce45b507334453eeb2ef42960993b54804c0f245067fff5397f7fdd8db7b520f49a7069ba5e2787d22891508ece677f9bcf6c7b12406623466447349bc7
+EBUILD db-3.2.9_p2-r1.ebuild 4899 BLAKE2B e1d4e490297d6b67a5eb6256dbcece49145e4d945eea7657299cf66c40de1cf568c225352b242b49c0b074e562a70f120d8a59e5466df12f89c8dedf98e8cd51 SHA512 b04f69b18482850065876efb507a8d418d9ee710d1e90caa80f1e894cb33baa875d86666809708e1b1577b0bd96afab6ba08279d78299b78da7725fa931b6b5a
+EBUILD db-4.2.52_p5-r3.ebuild 4640 BLAKE2B 9a35cb4990ca0891879f45df80f6681b244f9836a177630f43efca8e37f5df47bc6de5929bcfc035f8e4fe4591ddfbeaa6a5ba9de7242a8e9fb14f6107c8334c SHA512 bde537497192d33a6399c1f6ccca4f33fcd0b51bdbfa79efc0cf5ada23eb5525b0ab1e2860c50f4fa165c6c24527586997a51e04be1f410c826022d51bd59d09
+EBUILD db-4.3.29_p1-r3.ebuild 4510 BLAKE2B 9c0f28d7dd36f70b52c8230a4316186ee798fb691e774fc806443e3bb9a861dd66af827e16b06f32ed4270fe774089c07e823ca48a3169807da9a6c10707bc54 SHA512 baedf9357c28eb0b9a34bfd3b2a6c9766e9e2822b21c8a2ecba73ce42b4f5491237c49f35936a0b960a5d570cca45854c406d22789368df839e06fdabbc10673
 EBUILD db-4.4.20_p4-r3.ebuild 4398 BLAKE2B d22e57832389b5c87075e0a56e4780ed910182603ba597a566c455c51df3a3aa9ee2ecf2a8ebf0489aca6725c14b46ab9b1bbb162df5f7d07dc34c6b2a229d9c SHA512 42dd713000e20885212e6a89d975dc4846576a26210b471ef151ed69ecd1405106583dee17f991d900d65ca872fdd68dad7ebd7151873d7dc9848260a1484e82
-EBUILD db-4.5.20_p2-r3.ebuild 4637 BLAKE2B 2630002063ded48e2392d2414341630c384b86c2fd251dad829e8c77def56801f53ec700321ab8bf363bd397e435e5a1120c7233d1e7573dca33a71e0e0fd9f4 SHA512 c74533d711db1db7b420dcd23ca30b66a30b2bc920006f7d04207d510a2ba6f16617b5be9279ad3ea41c600f520b92422b5f3d9af7007811e9933cf635bce170
+EBUILD db-4.5.20_p2-r3.ebuild 4638 BLAKE2B 2e44e957e1a95497c81f23cf56927c51b4dfb42726b0ede4be331bdb45e642f1041f97aea52ee56f43932a1957232ee2e685aaf15d0908976d24a8160458a75c SHA512 a4dcdf4c85ad346a96ad43f0b2e67f085b784e4901cd880a192a7a11c57f2f481728d65a2ac3639805ae65132e40b06edd17f695e58e94ecf7a2ab729a2de7be
 EBUILD db-4.5.20_p2-r4.ebuild 4731 BLAKE2B 27698b3ff04d725be7c7da46d6794f3112c1c0f5efcbed48d1416dcb30400738aa86859e4adc96c45e71028654bb602ee9b0b31afbaae5e332cd52e12becaed7 SHA512 2c746dab898419f5982b7f8a02aa6a5dac19417c106fcd594f832fd2c67fe5ea2c8943b3ed32d0dd50551fa61f43d777a0685300cb51af6e0f7cf35358c72d3e
-EBUILD db-4.6.21_p4-r2.ebuild 4359 BLAKE2B cd393ea89844b4c8adc1a990f450f8ecf173ccf731df2727c54558ddaee7938b76256145a4730b6191feee63c9298625ca5bdb3300b524fc99f79b6e01731081 SHA512 0ae903240520a15c4c6ae02b71f948d33f482b0deb1e1aff5631658522fb97168ccfafc2d7a3fb1c127e2ac0b3b376e352ce55c84e74e4f710e4f55affd6b911
+EBUILD db-4.6.21_p4-r2.ebuild 4360 BLAKE2B 93bbf582dda813cbfc04ed8c404a5e94ed969d25918dcf39dd300f09319d0d678843675735ce07747bf60ea452133acc64b843281a02960a4b275242fdc5ec66 SHA512 36d5ffa42e3cbda676dfe7f80ca1de01ac5ecb37df792a91c6381293ca8453c237a3f586ee92e2cba0a95455a1397cf24907f2bbdc52a7e4d512e69c2dba86bc
 EBUILD db-4.6.21_p4-r3.ebuild 4453 BLAKE2B 5abe5f330275a3004c315f7ead9f1ae1c70f5e0ca208d6eb9d5b6914f75b8afa39938b36827530ff23ad93f8829c2d660f746f97c5ba25787c479106de58aba6 SHA512 44f0198ba923418e0153be75b7e5f179a379919175c3dc8032c0115d20f8c10de3c89dcbe4ab741e7db28d3da40944868dafaaff6abf19264716cbaaa82e91f4
-EBUILD db-4.7.25_p4-r2.ebuild 4685 BLAKE2B b50ead87904186eed5727b61107e341c32fc0bcb257e386b7c4d557a424da6f45bbcad5d18d7623643336fcae8854d60b2e99402fbc9ecf816136e9224c4ddc4 SHA512 001677dc65d232c6a0b55a26b73b8f8ad5b3b6eee8e412d64a5b61552964f79a02e9cb7b3db6d274844f826bed30e8d64a20cac4be8e248f8838af6fc34977e7
+EBUILD db-4.7.25_p4-r2.ebuild 4686 BLAKE2B 34b3f1b47be03abe89ec088b14d56a91161175e8ea811b5f74aeee65d0df5299dc841fe3d688c75729517afa63902252b232a8f954635a09fe77b732a3eeb5e4 SHA512 cf4e050a35e2c71f6d6b7c1f438feb8bc843f6614efa85d3398bbc339acb9d9828890f4511b90cfd23090f469e9e941baba1b059d48d6ec549a290aaa7028e7f
 EBUILD db-4.7.25_p4-r3.ebuild 4779 BLAKE2B 3b9ac03ca9e321f4d3d3805d4cc51fc38ede6d30805e1b73bf359637cab48c4dced6c1a8963550b829537092cf5414d35ba163a93c76ee9a8e2ce542553a6e8d SHA512 827dc6bc25d88f4628eead0c133703c309f9afde19740a6e5222acb75aaaa26e1ac1404e23313ce973717e5fdba1fcb4be5f9b66679d728fa4ef55e432eadec7
-EBUILD db-4.8.30-r3.ebuild 5181 BLAKE2B 2e5ae14b1410600ffe98cf46582289109ce834f190ccdb4f015c11f346e5e78cb0cc99a5b7f775aed8c93e523619456d9a7851d2aa387d51ce4d88202049d9c3 SHA512 195db05ade6bf2e8d089540c2966d81c3244c05bb7fefc02f88206bff93186987387b5ba9f3e8fe980fb1ba5b85ab0f916247b4cf5a66a1f38df18ad04fcf729
+EBUILD db-4.8.30-r3.ebuild 5182 BLAKE2B 80f6b5a6de5dc97dbaa42867d6eae7b3ebc9cd0cd8e42f41a1f7a78c37b4bf4ad69f1e1f96f3c2cb8cc6ffd6482ca7ff1d4b3f023d6c22fd8e7a09e5497c3b2a SHA512 4cd1881d3fb175a86ece7b06e58c198ff354e7cfe755680cee7eb7e100d12148eb75332315f2468cc7b7f7cccf73657830ae7c9f6cf8ec2697e124cd2401caf3
 EBUILD db-4.8.30-r4.ebuild 5275 BLAKE2B e636f2f29ad613afbb8b020f43d6be3327bbb404bd47f00d3650855bff8e2c3d25867f6992449b800a6c6a2b18bf916733860078e902c818dac52520d9ceaedf SHA512 57bdfcb2e5da6497aeba9089cb0fba08d86702b3e6323e9095adb8388cdb2bab77157f849e4de63b55fe053a31163ebf52e29e9ae72e15a64ece76e87f6fe833
 EBUILD db-5.1.29-r2.ebuild 5828 BLAKE2B 4a856ff3ebb4ca33a8349f0ea753766c034fd88e97340cad4ec7c4ef32606a744c18c0177d06c20646c5159f871732f2a3395e0597000367efad2803b7d43e22 SHA512 d027f886b27db0691c0a3f99abc6edc47d31bcdc2a7a1c2dae10023c88b06bbdfd1d44a48a62ffc5b71ace72f71005a8e476465386db2b884b9e979d3a47fee5
-EBUILD db-5.3.28-r2.ebuild 7139 BLAKE2B 6439c56d2c18b479c62dda318cd46ca2f9ec3be5b96b42cb5871b9b5d9c5778e18c5da7ead3316db4d2996f006fcb2e684e16a6da715e98877ae41f0a5432ca3 SHA512 ce1a4ee5d048f35fb0710aa9fc348eb9fe80072f12970a2a36cb317257c62b5b6318b1817389a4090b3548e232a512da4b45c097b2f668cc28882d031c20174e
-EBUILD db-5.3.28-r4.ebuild 7107 BLAKE2B 26435e7b7d970310d2efbd80729c9e3774300595c3ec9675472c5e10c06f52155748b90456c6f28d82c90dedcdbec75b1388641a9763aa3132a234bec320dd3a SHA512 bc8fee95b27a3db77796329de3e9507e0f0d9073ce7b81e1449ffbc20a3aac79da41910b2f685ea9b110a632261ca3701db1c534d6108276fad9c8d1bdbe099b
+EBUILD db-5.3.28-r2.ebuild 7139 BLAKE2B 0c40259c05a61910f482b0af34f0422df073e13eb770ec6bd484c88b094a231aa369591a0aeae724026c4a4d121238fc39dae778e9d7c8837601bddf89880d1a SHA512 1c9d8d9d3ab31c7652aaa03c0775371b9a34c34abe82d57dd71371f815fb13b30aa36f050436e5e40a91bdd3498d3591ad2f3140d80dd418f27ace042996a241
+EBUILD db-5.3.28-r4.ebuild 7108 BLAKE2B 2efbc2566ce164a6b38163dbb561c020ac25e58489cd2f77b46674f1a509bff787530105d5b0111476f6150346dc6f259d4067b3d00003beb9fd733852cd48dd SHA512 b243defee9d5ed5c0892182533dea7ae91b91c659bc74f124d162c6a8742b3170a012450fb1d48b02f66973214dc5cb54a33428cca89f4361804414abae23092
 EBUILD db-5.3.28-r5.ebuild 7199 BLAKE2B eb1a269cc68b6ba53e6829cc92fbd45a2c825e63d409c4dd98504f6632aede6d0938659b7cfd6eb7cc8d61231f92d6f7abac9aedde5da0a93784184738d79777 SHA512 c37de3183d6c3a1f2abe07b46e6f841cee535f00f9bc18af312b79946faad1014de974e4c75eeb35e28a07bd3950bb6d92b3760e00a044b6f517112aadb3001e
 EBUILD db-6.0.35-r2.ebuild 7109 BLAKE2B 852eb1f3a8ada53e5c5d876caad77f979e113f8d768c3f95373b4cfa0c386f6cbbba43cb6ec7bcdda7dc3bf90c0d1530c01b9e06f69a2fb4078abf7c04c27c96 SHA512 9120421a13a76cbc1b0e76640b761593b8e0ec3dd035aa1a04f8fbed596afd25c6cb98b9bf05718ea2e3de11dc7179c058a7a8c0b039fa21b6349cfbdf2cffd3
 EBUILD db-6.0.35-r3.ebuild 7194 BLAKE2B 09fb3e9e47182ca1a4582613345abdcf19f408aba107369c3e5bc6f15f0a54c1bf74d9a6361cda4ef148b67f342c9a590f8a79bcfd5d7d1f62dc9d3577338553 SHA512 6879cdaca7f58cec87ab4afde513e02b046d57f8247763c836af26ffc470d1e776358ddd3b3dc795ef9912106dac07f686b3eb9a6277b54b48c1eecc37ae5d65
diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r4.ebuild
index e643d4f2ed68..3efe710bb3e8 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r4.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
@@ -14,7 +14,7 @@ SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
 
 LICENSE="Sleepycat"
 SLOT="1"
-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=""
 
 DEPEND=""
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild
index 804eb7f92543..09e4131d8b99 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.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
@@ -28,7 +28,7 @@ LICENSE="Sleepycat"
 SLOT="3"
 # This ebuild is to be the compatibility ebuild for when db4 is put
 # in the tree.
-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"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index 9280a2a20aeb..e31ffdfadaac 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.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
@@ -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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild b/sys-libs/db/db-4.3.29_p1-r3.ebuild
index 6203db5bb196..e4bdf106da58 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -27,7 +27,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="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild b/sys-libs/db/db-4.5.20_p2-r3.ebuild
index daddf6588b80..df21a49880a9 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.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-r2.ebuild b/sys-libs/db/db-4.6.21_p4-r2.ebuild
index 4f065e64ff7b..10a378826ba3 100644
--- a/sys-libs/db/db-4.6.21_p4-r2.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r2.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-r2.ebuild b/sys-libs/db/db-4.7.25_p4-r2.ebuild
index f7474414846a..4f6c58ec0a7a 100644
--- a/sys-libs/db/db-4.7.25_p4-r2.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r2.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-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 1e116e00d1da..20f5227a5f68 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.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-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 69fbf19d0cf8..337084237488 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
+inherit epatch db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index 99876d1e9ebe..25079725abbe 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.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/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index db77da1d9ac7..411f48354dc0 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,7 +3,7 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fed
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
-EBUILD e2fsprogs-libs-1.45.6.ebuild 2160 BLAKE2B 05045fd69fc90c4206967059f6d2e288577682f0bc95f157fab766891d5a65daeece6e2091794becbda8b7d7f631927b5410b28948d92d640fb90de051e00394 SHA512 ea106e7c7879aa86f12c853445d6fdd18d969dabeff6da62d029b6bdeda78f89379305ef98b53fdcc2030d4b9b3584c5a36d91091e53752ab93b2cd8fa6a954a
+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
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
index 0112e42b9627..722e3a0df067 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.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/efivar/Manifest b/sys-libs/efivar/Manifest
index 46ae1345198f..add0dca91e79 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,4 +1,4 @@
 AUX efivar-37-ia64-relro.patch 1702 BLAKE2B faa170f1a0ce1a9c48764cd49b466db4cdc40b3d79dc17954dd4bb043b4a4cae9a3610d14a85ad56fac655ad8a16e00f04cd4f29f506c6d3402d243f272e38d4 SHA512 35b56b6d8c4c682c55b4b2051367aa3be9c8f46950de6f2f4e30b75fdb9abacca037044b35df2efbf37289a72e294314f469b78f2cbd106c989ce43ffd7b05ff
 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
-EBUILD efivar-37.ebuild 905 BLAKE2B a49a5201685f19450da982779f376c491c59542be8b30813359e89b9216577189a3cfb7e7c9bd48b9d9e7ebba8a93a0646fa7ae2ea69ee6c1f6d407f5dabea1c SHA512 99caaeb98d98f8b9ce1c09df5fdfaed3f3ea36e7bf2d6a4c7121b41b4caabec718770a69d57d5a2bb7e00817602b5ca9a799c8fb231569886de1cef2a1688471
+EBUILD efivar-37.ebuild 892 BLAKE2B 4f0b4921358304ab859dcd9c104314504b450894a50abe7dae7f3b9912f019e770be2462eff50d58ed613fc0841340261ad4de02b6a667cc95c1859a36723e01 SHA512 0c11ca070f106461c695872344f7769cb291b08a2a9321c146a05774e6e6dfe190edae02816bc6557217ac79dace19c9440692b88e0f022cba34f5fdd3ab7a7c
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild
index 40c8e6430d90..d581de9b58e7 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tools and library to manipulate EFI variables"
 HOMEPAGE="https://github.com/rhinstaller/efivar"
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 2d5787b32c65..1b7fbf909d04 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -6,7 +6,7 @@ AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb1
 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
-EBUILD freeipmi-1.5.7.ebuild 2369 BLAKE2B 9c2d64cd04e96409e6a1b5d1388ec20cd69092a0994556624b4dab33983695a6f65a92eef7b5ac29e2d2f4d95365f777fa503dcd981cdbe972eaef81a2cceb0b SHA512 cd19b406cf6f5d93d4cfb69da014fa548ac70ee60ddbd1f1ad2064ab449811570db8bebfa4397918f774de4a5d1f6fa25e5185758075ee9059a6edaca91699ac
+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
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.5.7.ebuild b/sys-libs/freeipmi/freeipmi-1.5.7.ebuild
index 3fddd3e7e889..c7545fd81b96 100644
--- a/sys-libs/freeipmi/freeipmi-1.5.7.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.5.7.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 AT_M4DIR="config"
 
-inherit eutils multilib
-
 DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
 HOMEPAGE="https://www.gnu.org/software/freeipmi/"
 
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 26ede14b8af2..837be83f0516 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -2,6 +2,6 @@ AUX gdbm-1.18.1-gcc-10.patch 1243 BLAKE2B d956231e7df353c203e37054438aa9c50f875e
 AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52
 DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
-EBUILD gdbm-1.18.1-r1.ebuild 1378 BLAKE2B 609ff481fd5f45a1d249ff381aa8d92ba1469f371a49512cd19ec3d3ca0521484a0e1001e50708ae529b628478f202a982354127883979178d09510a9dfecd72 SHA512 74e23c2d4b6047f8c6f212f7dba43a91609123a42565cb519e934932987b99a17213b8c775a097ce25a6e0bd2ee621a829ba311d37fd6c5288e175152d6c96a9
-EBUILD gdbm-1.19.ebuild 1346 BLAKE2B 2942e0a8811cf3fb5fe21b13d0a569956091d0e545e9900e0391a59620a2e1690d5f60c70073584383bcec4f1dc7ebae8a50936115726a9b39ece3bd86d379e9 SHA512 8db8d9bf20ac8802341b2c40c7e43e50dbbf7870c8470ff18038808425888a9f94252643ebd4018766698eec9eb241a50c8d0ebd6bc9b00d755a2e71ce680570
+EBUILD gdbm-1.18.1-r1.ebuild 1357 BLAKE2B aa2a7ab93463f3400b8760ebde02bd1a93164c96c3d7b68807fad6d68002373470583f9e9f9dab78b7171b7579940a171ba688330d3f679431b37b5054ac6e2e SHA512 3e86f0cf3eff1e4c5a8aad315992efd2cb452ef117b1b961612db186144ef42c2158adea2d998e2c2ac58472c379a3553abac0613419884c57922a8fb433eed4
+EBUILD gdbm-1.19.ebuild 1324 BLAKE2B 77e8e86bf88a87d704be53ce285af647b99d890270e5c52a30aa068f32ac35b65e77ffad715568b8285415d3eb78d2b22f8bbdb78310d080dc77c5293e73a4dc SHA512 2a8b8ea03dfa2ea968ae315076906db407c0b7edd955f8909bf07771a2238d9abc175db380c585cc171c9f034bdc65827de0e774affb4ed4f25e6e32b48114a9
 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index c09b44335626..87ad4ca3a375 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Standard GNU database libraries"
 HOMEPAGE="https://www.gnu.org/software/gdbm/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.19.ebuild b/sys-libs/gdbm/gdbm-1.19.ebuild
index 7765de06aff8..36ea91f14e6d 100644
--- a/sys-libs/gdbm/gdbm-1.19.ebuild
+++ b/sys-libs/gdbm/gdbm-1.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Standard GNU database libraries"
 HOMEPAGE="https://www.gnu.org/software/gdbm/"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 217ba5a7c909..980c68928f54 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -24,17 +24,17 @@ DIST glibc-2.32-patches-5.tar.xz 53116 BLAKE2B b2bd9d2cc7fb8f7d3cd96d8439842c30a
 DIST glibc-2.32-patches-6.tar.xz 54552 BLAKE2B 3c14b7849f53a3c9132c50c4ddcf6cfe42eabfabdfab21231bc1834e030ace88cc2121e4e1e8e74d9137e5b0692b5aca8b62762437317dc57665a1ea63d05014 SHA512 0e03891d992b211ffc5ef21d604f9f8a0adc783af46eea5a81c28024ff13f793dd236f83652eec19308645c9dd68c6017c64626f14edf30fdaeccd65af2167b7
 DIST glibc-2.32-patches-8.tar.xz 65532 BLAKE2B 00c572cff396e52313d0324f7bc28192a65f06b22fc5a04aa631b76b3016842365006399715531ee693f3519720edcebef7884247f2f8c19e3518c1ddafab7cc SHA512 5240bc3a6df46d12c03ea4ce7b1a0df85301256ae3bd003fd04c61dadaaec34998873bf20544d891f6eedf896302bb916010aebc1d8d646a3cce09a93b533d0b
 DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b
-DIST glibc-2.33-patches-2.tar.xz 14664 BLAKE2B dc29e11f5caa5a53311107755c0bcc8a9c4c602bc7e295ff727f0e050997b8b2969463586ba2d4229ffdd8ddee4f2857e108b37888e43351cd3bc9f6245ba2dc SHA512 681d62ffc5e6f288cbccf1aadd6c103058cb9c568d1e9ffef6ab6600f2f3cc1dc4a985bfe7c9de960f65331ce7bbad07fd20f743f744c14bf26c4119cc8fee99
+DIST glibc-2.33-patches-3.tar.xz 37076 BLAKE2B 718ab706df85c966145958fb6137b5499c1989ff27a62c22beaabd530d641e4937e6d6ab0cf00052b649dc99c3acc319997640eef95669235dab864f5e0afc9f SHA512 6d460976610a1c3bd3dabee9250008b5b3024ba486d598f85bc81cbd0b88188d125714b93a8b253f9b59b292e998f35118562e2a3ca90c418ff14fa53af2a7c3
 DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
-EBUILD glibc-2.19-r2.ebuild 38336 BLAKE2B f2cb2ce4e2c5a991279ae15aa3e423d0e1e8ffe195791bafff0f9dfe3872bd37197c17754ea26347dafe8e9f2b09de4545b0f5a6919462b9d0dc074e28dbe82e SHA512 a85b0ac343814ee6a3b193909715c372c9f2193f25a71fd48b2ffed080cfa32053667f11f2f1d0e57df8da3ed03e3c9f8ccc3f07263079e2c6ecc90da0406734
-EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd
-EBUILD glibc-2.30-r9.ebuild 43285 BLAKE2B 45b8676a5705d4ef9318b058ce99cf2bb81c7443ddc4c140fdea76de03d5897e033f4faa2ebd7cab8ec72d890b3d0987bc2d9a7230ac0a0ef99a0c4aea747575 SHA512 2d5601c314a0a2d8d104bdbeb6d52cc44a49e10d4579e76d3217cd38478de78382f7a265d70fe0c5e1508cfd07838950e89e575b3537484903a8642b4c6cf3d4
-EBUILD glibc-2.31-r7.ebuild 44403 BLAKE2B baf87ec423c82cea585c116918feba4004af01573f36f816c20027f87c023df00b522856ed7b962c2cd44db116bf068263bcbbc10895fbe20f314f46d148e6cc SHA512 fe7764927c3a9c547c8d35061450cbc9740eb6fa42a1a3996c46d74c07dcf4555b3f551b6e61b65749b2fa84c0650d1af0704fd8a6e7abde2266f86d9144c252
-EBUILD glibc-2.32-r6.ebuild 44731 BLAKE2B e56042edac080216524a950684834af6b1f41ae12bb8085adced31dfe8a83e6246a06aff0fe4eb27b1bf82cd2188a3e41a576f8a83a75da91a9a1f93f9867ff4 SHA512 a17953c22b97d7f45d3c19359cf2eedaeb0df87fbf284dfb8cec8b3ee556247c3717e34ad9557e318c7aac2332b7dfbf9c4adae7c987342e75cee03c0fc7cd4f
-EBUILD glibc-2.32-r7.ebuild 44736 BLAKE2B efbfc6d30383c97b30cbc042fc8b3e3c4dea2d8492dff8241d2f98fa69edcf317c0280c068d72eba3bce9312fbeae9387a9d2d35ff045a1a1d1cb418ab8bbc2c SHA512 1c5d8b1931f380d8ce63ecb4e3d72cd7ff24ff96453c18998554c16f6ab4bdf9b2836e42be70e7116a35df5379206dc681b2fd7cb1cfe80a73ccfe3048abc67b
-EBUILD glibc-2.32-r8.ebuild 44743 BLAKE2B 2f16601b7df47c5569d6d22dc1644a57362dd46869b03e3388ead2c8d8d42ee98f93eb1c616037651008279772d8f935064e48ad56321f9d5a625d5012516326 SHA512 f9e35074c7c1300d3b2fb88785610f198b87aa8555a1c00a04dbbf388e3edbfba6202f1e4d25b57869efa299b78cf5fddb9fa9cbd510b09ab632c1afa1a1e181
-EBUILD glibc-2.33.ebuild 44373 BLAKE2B 534c11b9648dd476472bbf4def577fae1748c0515e817fc1cef4dc385c11435422354426a91e96f522281d3a5cb47053049c5bd9081c91c71097908af44fedf0 SHA512 fcfcbe527d36ef18652df025620fe9165cec23b0e3f06154b932ccbdfb2528ef360f1e2dfe8369f992f56d2d97f9bf2104efb79a48ef5b457c26fd4b1a1c978e
-EBUILD glibc-9999.ebuild 44371 BLAKE2B dd6431480e03393e00d5e53aaa82fe335a2df2d9dd5ddd4b043f60ff4da08588073fbd450ff67bb3bd7ded3a37c81e0cf59145f8f351a06ae8240580efafb2e7 SHA512 6dcbf0fbbf654d9cfefef384531bc5c378589952c1472b88b1e9a37ee89ef9f386f5f7aabdaa252f3c5551e6df2ca920daca56348043676f32c9e8464848f189
+EBUILD glibc-2.19-r2.ebuild 38329 BLAKE2B 95d17a7eb672b99a74df49b6bba6a6634522dd992325b6c2e72dbd19518f634d6820be39fd4abb9c98930ff3663b3c631151468cdc9f244188045492acaf45e8 SHA512 60e72c109d18486e17126f5372656107fe202509424775a9bcc14e32bc59d2629c7e64bfeac4be22cce8f86fb424162b78939e1755e8c6626d98901e90f78671
+EBUILD glibc-2.25-r11.ebuild 6071 BLAKE2B aed6cdc8141eb47e7f734ca59e98314d0c5340f619a1a2bb0d895942e46835932f50ac240faa54d6926a6b30a951d4c3ec7e25ee16aa20050a2c581b3cf61098 SHA512 d83bfefb81b42ad7efc056eb7bb3054263356b98f475b29ce032a0a623eb51bd23fc6a5adb8941b14c1fcd1267b1eeac2eb52fa11827df3250ce4fb2fb1de010
+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-r8.ebuild 44736 BLAKE2B d0536afe64d441de0c19686699e956dd9bc90af7d15ac12d392904eef552d54ddb209fcc00f36ddb010d0c77fa55e58b11a37b510654dee4012adfb7712118ec SHA512 5dab53cf1c940cad56004a91d4ced422193272d3994e8ee272958c22702392c891273343f59c62ab4c9660bcc130bc477c4e54c2b07c6d448ea597296efe707e
+EBUILD glibc-2.33.ebuild 44352 BLAKE2B f74aeb29c1ddb8e5e4ca27e549d7d9931259288d09a121b0ae040bb5321d3feb024ca8ab235a261700bb2ffc897320ba5ff4c00234830a212c21e52ecd12337b SHA512 525f6b9c03ef8da12effb47f577ad267f7fa188faf2c1f0991d6166376a93d9e99574173e10004fefb96b91343eef15560b3c18f9dae0f899f634eba06cef428
+EBUILD glibc-9999.ebuild 44364 BLAKE2B 6b04446bab70a41ede93f1584795abd2a20fbce85bec8d97655be0f5b9742db09be7b065dc0c5144384edaafedcb74a2f1058dbb77569c42ff6b9e45c363db67 SHA512 72bdd35b8abbdf166deefa1890b2c580741e423a422421a85e646c4041776f5effadc6f96f16dbcdcfed734648262f840963bc38d9adf8a1130f201fe7639e5f
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index d9240e9aa5ab..74facde07363 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 TMPFILES_OPTIONAL=1
 
-inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 1946fcf4489c..145e3601f82c 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit toolchain-funcs toolchain-glibc
+inherit epatch toolchain-funcs toolchain-glibc
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-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"
 EMULTILIB_PKG="true"
 
 # Configuration variables
diff --git a/sys-libs/glibc/glibc-2.30-r9.ebuild b/sys-libs/glibc/glibc-2.30-r9.ebuild
index ba72c8d12edb..6999aab3d92f 100644
--- a/sys-libs/glibc/glibc-2.30-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r9.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index 0e8b9b9b849e..c9d28dcd752a 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -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"
 fi
diff --git a/sys-libs/glibc/glibc-2.32-r6.ebuild b/sys-libs/glibc/glibc-2.32-r6.ebuild
index ed0b3e0bf165..b22bf22729e2 100644
--- a/sys-libs/glibc/glibc-2.32-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -23,7 +23,7 @@ PATCH_DEV=slyfox
 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.32-r7.ebuild b/sys-libs/glibc/glibc-2.32-r7.ebuild
index 2ead5dd7c01d..d7bd947414fe 100644
--- a/sys-libs/glibc/glibc-2.32-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -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.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild
index 9f36987c95b2..d9bf2bc1beea 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild
index 07d8cb17a34f..332448bce7bc 100644
--- a/sys-libs/glibc/glibc-2.33.ebuild
+++ b/sys-libs/glibc/glibc-2.33.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -17,14 +17,13 @@ SLOT="2.2"
 EMULTILIB_PKG="true"
 
 # Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=2
+PATCH_VER=3
 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=""
+	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"
 fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e0cab3349348..7887443a98c7 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 78f6490f6690..d1c522b4e223 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -6,5 +6,6 @@ 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 2278 BLAKE2B a0ff6b3a2dae031f00dd42bf130c3a123c77354a7fe79aca5e61a08c4362e7120b548cdea1b1ae139c16c67b06cc774d64fcd89620d300b6c69fe13d3ff7e1f9 SHA512 a3bf25e877dea4e0564a97fd5f8afb921dac5aa24d9cea355265a7ad70ee0791275a065573b90069dffcc1849b779fc61772c13c884bd1587f330f9858ce8897
+EBUILD gpm-1.20.7-r2.ebuild 2263 BLAKE2B f45fabd30bdeb35161285283c74ff002e8fb53d45ad58823e428aa189b9591285f725a9c5a15748a54cb847b64498011fa151b4683aacfebffe22dd687cf5fc4 SHA512 192f200125c573faf7cc717ddf4bdd57c08b0d915a3858f4f7c431e2ca73e23fd78efb01df470811d72a562f133b2fa7b89294a0bbd91bf672b8de9b842c4791
+EBUILD gpm-1.20.7-r3.ebuild 2392 BLAKE2B ecac18d99e78814e945312f5ae6a22f1b1e434274bca189b9ef0de1ccb130796b6f1bb48b0b67e5de7634e48eb3a02e1404ed0bf5685258f6934bf7eca9bb05f SHA512 6a94c4386189e40c86c2aaaa4ed80f7a372f5a0786ca17e4cde80346ade3a2b28e50d7fd2727285a909c300b5af03c5d65b6c97d6694d3fa906f732668aed85a
 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
index e94da64bea36..15121136759d 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils systemd toolchain-funcs autotools multilib-minimal usr-ldscript
+inherit epatch systemd autotools multilib-minimal usr-ldscript
 
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="https://www.nico.schottelius.org/software/gpm/"
@@ -14,7 +14,7 @@ SRC_URI="https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
 
 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 static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/sys-libs/gpm/gpm-1.20.7-r3.ebuild b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
new file mode 100644
index 000000000000..22f9f5d1a4aa
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# emacs support disabled due to #99533 #335900
+
+EAPI=7
+
+inherit autotools linux-info systemd usr-ldscript multilib-minimal
+
+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"
+
+RDEPEND="
+	sys-libs/ncurses:=[${MULTILIB_USEDEP}]
+	selinux? ( sec-policy/selinux-gpm )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc"
+
+CONFIG_CHECK="~INPUT_MOUSEDEV"
+ERROR_INPUT_MOUSEDEV="CONFIG_INPUT_MOUSEDEV:\tis not set (required to expose mice for GPM)"
+
+pkg_pretend() {
+	check_extra_config
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-sysmacros.patch
+
+	# Hack up the docs until we get this sorted upstream.
+	# https://github.com/telmich/gpm/issues/8
+	eapply "${WORKDIR}"/${P}-docs.patch
+	touch -r . doc/* || die
+
+	# bug #629774
+	eapply "${FILESDIR}"/${P}-glibc-2.26.patch
+
+	# bug #705878
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+
+	eapply_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 \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/gpm \
+		emacs="${BROOT}"/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 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/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index 0d4a6340a065..67a4661abce5 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,6 +1,5 @@
-AUX kpmcore-4.2.0-kf-5.77.patch 1468 BLAKE2B 1dc930e1fb6cc01891ab3e9def4f843cd0e0d1c92e8f5ecd0105bd338a9f0f60c370039ee8aa2950385f846b18aab0169f89c3925198475e9908319f2e4cc96e SHA512 1e0ece24224bbfbe4d2a33c19834b55f84b0c2c08eb840b8ea63aeb45e9e8813f4ea069f5c2752e74b99144616b766a41a7fe77ae69c3b78bb474003cfa064e5
 DIST kpmcore-20.12.3.tar.xz 584264 BLAKE2B de80d48bb6becb3e8d6f5b9b4456e4ad4e220ca52d76700c6be33942c5d762e1fc39b43b3595894a3d28605d7010662ebec588c3f1d3a4525a9efe797dbf65ed SHA512 90083374bbc4b91e948e9ef8e3e272cf7bd6b038261414c7e08eea1a903bd61c723f29a4afe462e29c1a083c6771be435fd4dfbf8a364c2c167f1eed19d04323
-DIST kpmcore-4.2.0.tar.xz 441320 BLAKE2B 5eeae806e47a1d068b2052b7706fbe16acfd609e3d0bcb396758f2055154e43b5b1fc7b7a65795ba0804ebc34c7d0cda18995ce3975e16e74d015ac9d8203e1e SHA512 71c5411f3ec24149695bbc1ec0c2bb7423b1cfd24ea9c2f33492c6310b1e911ea14a0a46a53024d7a1afebf0cbc5b56fb7cf5be22b832fb49239a270b63404f0
-EBUILD kpmcore-20.12.3.ebuild 754 BLAKE2B a55d684d8b771c6a41bdf7474e2c8f99354be512f46b6cc0a45d6e2e75f395a3c9bac9b946b209864e1209a3fafc83d84898f6bb9ea4f7eec6835e4f28ac3d6b SHA512 8337a443e6a4fcd65dd841e11c1d85848783893a9aae99b7f282e2110e5cc505a504908bd9af99207d879d1d9537f0c7ab3fafeb2894240962d702b9f28ed034
-EBUILD kpmcore-4.2.0.ebuild 929 BLAKE2B 249aa44c720455172855b55169eb4d48cf78f0d7e32d5f958815f7115c149b415a0ec46c1d668d0438424d399178e9b4d0e867a16b25eb026762ab2504b49aaf SHA512 14534457c2155ab9529663fafbb85c14b85bb1d114ac2902cf50b3acd1ce7494507d0afd173d709fec4c1a3f8b8d38de483019fde694112020424c11b172cd42
+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
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch b/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
deleted file mode 100644
index f45ad5a682ba..000000000000
--- a/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 07e5a3ac2858e6d38cc698e0f740e7a693e9f302 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Mon, 16 Nov 2020 17:14:52 +0100
-Subject: [PATCH] Make plugins compatible to latest KPluginFactory code
-
-That one uses std::is_constructible<impl, QObject *, const QVariantList &>
-which will fail for our current plugin constructors due to being private
-and with only friend class KPluginFactory.
----
- src/plugins/dummy/dummybackend.h   | 4 +---
- src/plugins/sfdisk/sfdiskbackend.h | 4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h
-index 815b020..8d67158 100644
---- a/src/plugins/dummy/dummybackend.h
-+++ b/src/plugins/dummy/dummybackend.h
-@@ -24,11 +24,9 @@ class QString;
- */
- class DummyBackend : public CoreBackend
- {
--    friend class KPluginFactory;
--
-     Q_DISABLE_COPY(DummyBackend)
- 
--private:
-+public:
-     DummyBackend(QObject* parent, const QList<QVariant>& args);
- 
- public:
-diff --git a/src/plugins/sfdisk/sfdiskbackend.h b/src/plugins/sfdisk/sfdiskbackend.h
-index e709f61..0571add 100644
---- a/src/plugins/sfdisk/sfdiskbackend.h
-+++ b/src/plugins/sfdisk/sfdiskbackend.h
-@@ -27,11 +27,9 @@ class QString;
- */
- class SfdiskBackend : public CoreBackend
- {
--    friend class KPluginFactory;
--
-     Q_DISABLE_COPY(SfdiskBackend)
- 
--private:
-+public:
-     SfdiskBackend(QObject* parent, const QList<QVariant>& args);
- 
- public:
--- 
-GitLab
-
diff --git a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild b/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
index b8217a3ea9e6..74f4a58930cb 100644
--- a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/partitionmanager"
 
 LICENSE="GPL-3"
 SLOT="5/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild b/sys-libs/kpmcore/kpmcore-21.04.0.ebuild
index 6530cb3632d6..4bc7e9da2da2 100644
--- a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.04.0.ebuild
@@ -4,29 +4,23 @@
 EAPI=7
 
 ECM_NONGUI="true"
-KFMIN=5.74.0
-QTMIN=5.14.2
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
 DESCRIPTION="Library for managing partitions"
 HOMEPAGE="https://apps.kde.org/en/partitionmanager"
 
 LICENSE="GPL-3"
 SLOT="5/10"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 # bug 689468, tests need polkit etc.
 RESTRICT+=" test"
 
-BDEPEND="
-	>=kde-frameworks/kauth-${KFMIN}:5
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -38,5 +32,3 @@ DEPEND="
 	sys-auth/polkit-qt
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kf-5.77.patch" ) # bug 768249
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index fa81332ba077..1a9e45f2cc55 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,9 +5,9 @@ DIST ldb-2.1.5.tar.gz 1675898 BLAKE2B 0097a7437a96e4daa04fc77f574e6b27150e83be10
 DIST ldb-2.2.0.tar.gz 1676551 BLAKE2B 1ad84372b024e1ed680a09d215324027c9a37883204c2e69bb39d28a280cba639a4a46ec12b12d89f291f5505f55849eee880345412c6d95d9b6d6e9c00a4fd9 SHA512 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69
 DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
-EBUILD ldb-2.1.4-r1.ebuild 2817 BLAKE2B 0f54f80ad5ee3321d3a900e0ce7b38b8664a7f43d038d896d895653abd33385ac5803b91b8e2aa42afc947ac7b34026879193971c9eea23aca0079df3627980f SHA512 392f9878fd99545af347fac85c7ccd56960266540ee34c78989e05aa05cf0d5de4323d70d0d50b436e105538bf9507dfff40ae17e15df64f18e71d587ab74be7
+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 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
+EBUILD ldb-2.2.1.ebuild 2939 BLAKE2B 3f188e1b37a15ec4b5d5ee3e60ff39c0329e2d1f7f9a0d7b450b2fd6841b3fd64e8858a909d2de23c2f9ec03bcdae68e871d4636c65dd30bffcbd4b955a5373f SHA512 61543205c8c412d5b199ed1f712e205858400ffaf9fef46116cd061513dffab88bb76e2e165813feac96a8f01490443ddb5dd41ec75cab02c2601a017bba10b7
 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.1.4-r1.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
index 8471800f1a72..41520fcbd401 100644
--- a/sys-libs/ldb/ldb-2.1.4-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit python-single-r1 waf-utils multilib-minimal eutils
+inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="An LDAP-like embedded database"
 HOMEPAGE="https://ldb.samba.org"
diff --git a/sys-libs/ldb/ldb-2.2.1.ebuild b/sys-libs/ldb/ldb-2.2.1.ebuild
index c36e5d65316e..6c300b134754 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/libaal/Manifest b/sys-libs/libaal/Manifest
index b7ba3540578c..d73f18d6fcbc 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,4 +1,3 @@
 DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
-EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B 15e4af1abf762925174d00143fe5ca7ed2ee15cfd764da6c9dd6b10c0ac7538475dc1d66e546aee2f17af81dd948e1196f77558973796c5d491abc421bb6e386 SHA512 0749602dc24a50cd9b829de691d726a2f1e905fc8fa76a58bb9e9c4e905b115a86006edc9c7782e482732a92872dce4cc4da7afc10141d625bf9dbe70effe81c
-EBUILD libaal-1.0.7-r2.ebuild 914 BLAKE2B 926ddc5be6647a2e799a935e0e659e5551f4143dcc0c6de70b1bbf8fa4adde96d449a5429eaa2881e84d0e52fbed2f46677b147689c55bc5da739568417065a6 SHA512 dd9db007425607099a9df6189710b1d1d8f43890e7ba39e581e5935a6854bd62cb1b91d2830a98465cc7255b8bb34fe215978aa382d429cdf9284fb922acf773
-MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df
+EBUILD libaal-1.0.7-r2.ebuild 893 BLAKE2B 857f04ac3c66445447a663eea012c42bce415b58278480437514eec5a4fdf931381cb237a2e63661b3ccba28512d0b6fa612aba2527463c901675b72aa8fb6db SHA512 e4a690f993a16acba6289921091d65858e5c7a9a8509f7822aaee823d82cc0fb72b66c3a4fcd3409e3031d900dee0034608ce571526eee0a910ec0698caad3b4
+MISC metadata.xml 406 BLAKE2B 9a6a4205ff309320a2d6e3783c9908611a1b265dd43888d69408dfadd3cbf09a0379ef190f60651c3162a3a37a932bb4100fe3e432eeb8e808e358f2bd97a235 SHA512 223d47f1c4c2e47a91298667f7f64c5c0be6a22c22bfcf865ae81ae4c69176a2714b6d555b57e9b9ab87ed24d432cbebf9e96850177984f4a0980fb98556dce5
diff --git a/sys-libs/libaal/libaal-1.0.7-r1.ebuild b/sys-libs/libaal/libaal-1.0.7-r1.ebuild
deleted file mode 100644
index 8b3acfa242dc..000000000000
--- a/sys-libs/libaal/libaal-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs usr-ldscript
-
-DESCRIPTION="library required by reiser4progs"
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
-IUSE="static-libs"
-
-DEPEND="virtual/os-headers"
-
-src_prepare() {
-	default
-
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s@-O3@@" \
-		-e "/^CFLAGS=/s@\"\"@\"${CFLAGS}\"@" \
-		configure || die
-	printf '#!/bin/sh\n:\n' > run-ldconfig || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-libminimal
-		--enable-memory-manager
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a aal{,-minimal}
-}
diff --git a/sys-libs/libaal/libaal-1.0.7-r2.ebuild b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
index f25fd9d74e4b..7994ee19251f 100644
--- a/sys-libs/libaal/libaal-1.0.7-r2.ebuild
+++ b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs usr-ldscript
+inherit usr-ldscript
 
 DESCRIPTION="library required by reiser4progs"
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 -sparc x86"
 IUSE="static-libs"
 
 BDEPEND="virtual/os-headers"
diff --git a/sys-libs/libaal/metadata.xml b/sys-libs/libaal/metadata.xml
index 000768728e14..e11f73453156 100644
--- a/sys-libs/libaal/metadata.xml
+++ b/sys-libs/libaal/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 This is a library, that provides application abstraction mechanism.
 It includes device abstraction, libc independence code, etc.
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index aecce733d66c..91bed538ad23 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -3,7 +3,7 @@ AUX libapparmor-3.0.0-symbol_visibility.patch 354 BLAKE2B 292bb70c043908943ddc55
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD libapparmor-2.13.4.ebuild 2118 BLAKE2B 421f3894faaf837b8ced7ab06ae098e32214eb13223ff4411e5b82167973260a393f8e9dae7c7d7fdca75a2d60723917dc87c4cb85513c69429189e0e848d24c SHA512 0c9bc872216341d6e08b54c77a304517e43f0c36070a75bb147b26cc24d0fa895cd5ae3fa7cdd10c0837124c629dc89021113a70434d7e25a7e23837eb4841f7
-EBUILD libapparmor-3.0.0.ebuild 2153 BLAKE2B 26270b332303a5ad91972d3168091fe2aa36b5a0649ec43fd6c9af74a1e11e9d3678cf3ed36c0c8ea961dc4ba795ced84cf6e09326397191897fc7d457c8c676 SHA512 ad930b87aec8de7c0226f21cd52e7d61f7eae820d5c5b82c007c7004205f84a19f381a3759936f4eeab6644848eb6e2c772c4da4a0c3867740883167a9e6ebad
-EBUILD libapparmor-3.0.1.ebuild 2087 BLAKE2B de8779d0ea99170bd906ef35e1cd9e86ecc52bdd8d53dd153c32a7355e26fad9eb0342df9d33277cbc94adbeee4020b5368c091f1cdabb23a074b86d35a55ba3 SHA512 f9776f89a842dcac64ff149e891b9e3ccca21fbd878754136334847c53a253f50c57d9d7e399c38a3530bdb318d6504ef490d6fd1d22fb137ace5198773e3ca5
+EBUILD libapparmor-2.13.4.ebuild 2129 BLAKE2B c1cb757b4df3b1c0d285d6f22d43c921aff5ae091f27de6c1bd87273ab4bbddc8a0bcf073ed9183bf0f922ab9742b5a1533d71aad4eb4cfe4984ef0a3272e3ba SHA512 efb43e0bec424fe05204721f9361c5b1f51645f22ec617cc5e1e60e62b165ba61cb748c318f371fd86695e2198b496efdaa2e8ccf90f76f4a0c2786ae188ccd7
+EBUILD libapparmor-3.0.0.ebuild 2164 BLAKE2B 96091697a0d90ef481687b928e062946cef57e7f681146dd7587d909cedd969f4be2afd7391032ddfca4ea96dfd7c1f2d3f7873578e6cb8ca74c8488f1e7f1f8 SHA512 43ac5f822a3f764fb51296bc33b6da85530d64dd5c3171b8f0885ac01950d5ba918ab35e5ebac40e38f3ab375ffd8359fc09cefc568327ca58484fd3040a86a3
+EBUILD libapparmor-3.0.1.ebuild 2098 BLAKE2B e6988e862e07aacaf7ae9c9205c1e82b5e95bec205c88401d7e7d304881814c18148dacfbf2575469255135bf8a09c6585b6c1147c93b6f6bff8588adae8ca95 SHA512 f7b9f67a8297dade9946308ac6983b1e2365d555e3297f0acddaa56b2a1f916d08faebb1ffd743c83bc0f16ec6db2b09b565a2c65a46e93978c15c280b320355
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild b/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
index a854860ab42f..e87d5f295ebc 100644
--- a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.4.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
@@ -24,7 +24,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/autoconf-archive
 	sys-devel/bison
 	sys-devel/flex
diff --git a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
index 72eb80e6c283..a3bba356f5d0 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.0.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
@@ -25,7 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/autoconf-archive
 	sys-devel/bison
 	sys-devel/flex
diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
index 9d528d3562a1..65eb3d388ace 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.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
@@ -25,7 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/autoconf-archive
 	sys-devel/bison
 	sys-devel/flex
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 1def6435f5e6..dbc928b3c6d5 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,7 +6,7 @@ AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a5
 DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
 DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
-EBUILD libcap-2.43.ebuild 2172 BLAKE2B 94abe1f5d3ebb812f67f7d1170c4f1fa9766b75526ac1a088bd8019b76c76695784b8d57f5740f0c684f8a3fe4440bf8b61f5eec3fbfdd1bd1eb7543fe8710f5 SHA512 7593c942c3650af81cbd905d97f5265efb53a16ac9bd9156eada840ea10c85e64de2464fbc4088306a73e3761a1606f8000e9a95e9ee36b15db741e33aa08612
-EBUILD libcap-2.48.ebuild 2211 BLAKE2B 0fcb26a104e587f7eff0748d418adc37ed827740f1c0ae1e1047271683f69c1dd9a5079c5d6a1d68be0b7b31d4b4ad4ab22f42dc361076e6467c343bf4e19e7d SHA512 4db06e0129107b57def2ad8329b6b9c882408f8c51ec2359e54f936590585b6569f59219255bbc587083343e2bfede40c5faafb5ef04afda110d9d4caf927236
-EBUILD libcap-2.49.ebuild 2212 BLAKE2B 626c3af7ebdf8f55f5344ecaa8d7278a24cb5993eace8722ab4efcfa30772aa8618a0651d0a16ce7b2f1791ceab19319e37fd5314846502ae46ba01f7ecd3089 SHA512 e95d9c43b005e541699fc3ced59191dfedde0859dd849095493d5f73a41ab19cc02a5f7e4df3b6b05426e809970e521f2afbd663c54608956fe82473a916f0ed
+EBUILD libcap-2.43.ebuild 2164 BLAKE2B dce446ad76deb296dd6c526ada8b15e6d0965dae57acd3599a84fc28295ab1d30ebe9f3de7b346d8247ee782235037a30c60599c06a0db444aa6d4ab0434a0d6 SHA512 112e5c6fae86a2e3a01681853515eca16fd65e42d6c9857f451b5e6188259daf6d7e80a23371d3a97b4af3688a3e13cf339daa938381eae6206d7b4a63d720e3
+EBUILD libcap-2.48.ebuild 2202 BLAKE2B dec34ea59189902fec1554dd51f425a86c1cc74484b8ac8c5c8c3fbacd878a5c671db1c7028349cfadaf2e69ddd3947e854f0fc58bcc1936566b9d0ab63a3927 SHA512 1389c09e6dfda0a790b0974240de29ea958acc2cbb38b23e10408007a1feb19d58999f8c964a54f470f4dc630215cdf16ac8b9b48611e8da81862239ad3d5c2c
+EBUILD libcap-2.49.ebuild 2203 BLAKE2B 24f7c27fab4505bf3ddd8b682011f6b39433c8aa8692080c8649ecb5c660b1a9f2f0ad8d540992886d08a126c49c79ddcb7c06f40d7479b18602dc07170250f5 SHA512 5254d1d7982272cb0da280ff71d7da54d4701da35e59257f0cc82a7034e1655a0bf1115b2e3de3b08c3ea5d418fabc2351a786f9d818ae9e44c45eb022ea8426
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/libcap-2.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
index 1362bc3efe33..e167daea97bc 100644
--- a/sys-libs/libcap/libcap-2.43.ebuild
+++ b/sys-libs/libcap/libcap-2.43.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+inherit multilib-minimal toolchain-funcs pam usr-ldscript
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="https://sites.google.com/site/fullycapable/"
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam static-libs"
 
 # While the build system optionally uses gperf, we don't DEPEND on it because
diff --git a/sys-libs/libcap/libcap-2.48.ebuild b/sys-libs/libcap/libcap-2.48.ebuild
index 2c01dccada73..9cfc5eb049ed 100644
--- a/sys-libs/libcap/libcap-2.48.ebuild
+++ b/sys-libs/libcap/libcap-2.48.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+inherit multilib-minimal toolchain-funcs pam usr-ldscript
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="https://sites.google.com/site/fullycapable/"
diff --git a/sys-libs/libcap/libcap-2.49.ebuild b/sys-libs/libcap/libcap-2.49.ebuild
index 72541ceffde4..46812d6c1098 100644
--- a/sys-libs/libcap/libcap-2.49.ebuild
+++ b/sys-libs/libcap/libcap-2.49.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+inherit multilib-minimal toolchain-funcs pam usr-ldscript
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="https://sites.google.com/site/fullycapable/"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 3214d734ed8a..f5c095fdabb2 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,16 +1,18 @@
-AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
+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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
-EBUILD libcxx-10.0.1.ebuild 5966 BLAKE2B 230f37223e113c8f17020986b4fe65478d2bc65c5b4236f9709e556159e9118d0659172a59544b1767d9d55884549b51592d45fded05a91bf0e8762388c1baaf SHA512 4cf81cf1a0922d50c4357811169d4c2eda890ed6636fd2a0cee47c7181434bee76b36411ab487ef42d8179650d3c379336ad6c2ec1d18f109338e76d38e82f9d
-EBUILD libcxx-11.0.0.ebuild 6830 BLAKE2B a57ee66a8096c4456483bbb2a1d67a7e153dce97bdb7eb6a2d8e5ec5ac839d28c7c43f315f8399a5dc5bc157bd8b08cde156e1b3e962cfd05fe95dc6ca811929 SHA512 abaa0922a39380b3dffb65ea8a2c4774ae8c2fa561e9ceec30e70851779a13aedb2853bdf34c7586656dd389fb7b1e0c7dda9ac9de23ae52986b5392dd8ff12a
-EBUILD libcxx-11.0.1.ebuild 6831 BLAKE2B e1b3768dce61c69f4a4f4e7be022966b229e7cea11b1c24351a0c25a1ffe57ed8d4d04c20ce8811f39694849a52c20b980f664070482ffcbaa4e6b431fc8b414 SHA512 afb1ac8b1e5206c0b7988f9fc2644531b486840791beb8e997dfbd5c82a95cc3effab27fc28269d362d8c40873c1d0caf560c1e6a36880f6da72c28909f66802
-EBUILD libcxx-11.1.0.ebuild 6834 BLAKE2B 159ae462f29a3a5c9776d9176de1bbba916171e47875053b3f472407ec20b6176bca9dcee6fbcbba493b91b78b5cb415f2805c79b3513c70885bdb75854fed81 SHA512 a051209facb4b7aad7ff115704bd7216d0d500c00d4072ddd598f91fc6eab5a85e28cfa3517628c48f4c58a409a4cb5a3db723997b7b6cdf7bf6116bfa80ac87
-EBUILD libcxx-12.0.0.9999.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
-EBUILD libcxx-12.0.0_rc2.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
-EBUILD libcxx-12.0.0_rc3.ebuild 7002 BLAKE2B c3277780ae78ff0e1ed5affae0b76b89b6bb5d9782edc535a2092541b9ab2a745b33c2535a8c75317320c61cf6ee57216f575195cbd21bba2c3c5967f541bc30 SHA512 169a0c2ccc298989f0b2495675c93a4d908de03c94c10b1bcc0a825a032c98f8d3ed5b4e854ad4c9d70d6c4384ba084134ba0dbb76a09e5a51dcc4b795501d70
-EBUILD libcxx-13.0.0.9999.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
+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
+EBUILD libcxx-13.0.0.9999.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad
 MISC metadata.xml 621 BLAKE2B d8b68920ece0e3a700f1e425cf72a4ca7e75cf4b0b35e1ac6db9374d32020fc9f62b434da2108ad5b3538a46a2a7f4f5de7aa1640cd4b10046f2480ebb89450d SHA512 e1b0c874a6d229e098ffe7c0c2827502f2cdbf74fb7a0254687a0ca75dde74db06ef2bc79bfe8b526c413b13beac27b8261eab8d0b8df36011790dada3eae421
diff --git a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch b/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
deleted file mode 100644
index bef5bc187547..000000000000
--- a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d618e83..0e76525 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -293,6 +293,18 @@ remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
- # so they don't get transformed into -Wno and -errors respectivly.
- remove_flags(-Wno-pedantic -pedantic-errors -pedantic)
- 
-+# FIXME: this is cribbed from HandleLLVMOptions.cmake.
-+if(LIBCXX_STANDALONE_BUILD)
-+  # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO
-+  # build might work on ELF but fail on MachO/COFF.
-+  if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
-+          ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-+          ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND
-+     NOT LLVM_USE_SANITIZER)
-+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-+  endif()
-+endif()
-+
- # Required flags ==============================================================
- add_compile_flags_if_supported(-std=c++11)
- if (NOT MSVC AND NOT LIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG)
diff --git a/sys-libs/libcxx/libcxx-10.0.1.ebuild b/sys-libs/libcxx/libcxx-10.0.1.ebuild
index 4f386c128379..5c7c50377c3b 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1.ebuild
@@ -10,6 +10,7 @@ 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 )
+LLVM_PATCHSET=10.0.1-1
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -49,14 +50,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild
index f63adc4cf51c..8f948316ac8d 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.ebuild
@@ -10,6 +10,7 @@ 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 )"
@@ -57,14 +58,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-11.0.1.ebuild b/sys-libs/libcxx/libcxx-11.0.1.ebuild
index 58ec9289d186..16172647c295 100644
--- a/sys-libs/libcxx/libcxx-11.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.1.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 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() {
@@ -58,14 +59,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-11.1.0.ebuild b/sys-libs/libcxx/libcxx-11.1.0.ebuild
index 26e9ff250d52..16172647c295 100644
--- a/sys-libs/libcxx/libcxx-11.1.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.1.0.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
@@ -35,6 +35,7 @@ BDEPEND="
 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() {
@@ -58,14 +59,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
index 8ed99383fe0b..1f529867fb7b 100644
--- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 DOCS=( CREDITS.TXT )
 
 LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
 python_check_deps() {
@@ -58,14 +59,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-12.0.0_rc3.ebuild b/sys-libs/libcxx/libcxx-12.0.0.ebuild
index 9887227800de..21363361ae29 100644
--- a/sys-libs/libcxx/libcxx-12.0.0_rc3.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+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 )"
@@ -35,6 +35,7 @@ BDEPEND="
 DOCS=( CREDITS.TXT )
 
 LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_PATCHSET=12.0.0-1
 llvm.org_set_globals
 
 python_check_deps() {
@@ -59,10 +60,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
 	# Known failures.
 	rm test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp || die
 	rm test/libcxx/memory/trivial_abi/unique_ptr_ret.pass.cpp || die
diff --git a/sys-libs/libcxx/libcxx-12.0.0_rc2.ebuild b/sys-libs/libcxx/libcxx-12.0.0_rc2.ebuild
deleted file mode 100644
index 8ed99383fe0b..000000000000
--- a/sys-libs/libcxx/libcxx-12.0.0_rc2.ebuild
+++ /dev/null
@@ -1,218 +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=""
-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.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
-}
-
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
-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-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
index 8ed99383fe0b..1f529867fb7b 100644
--- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 DOCS=( CREDITS.TXT )
 
 LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
 python_check_deps() {
@@ -58,14 +59,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	llvm.org_src_prepare
-}
-
 test_compiler() {
 	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
 		<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index a2e0d9896a6c..d95faa3fec28 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,14 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+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 3562 BLAKE2B d9365f694b49f0bca2a0ca395e2ac88c85bb779a044885cfa606f02c69c54d85ba2e1a848bf9d21bce364adb1595b38c1734ef6ba59ed644232d68066e38003e SHA512 ecc2e706fc91193b0e5e87d39a4d53a96947bb9c623728be2705c3f3ba12618c39560460f8fe73e2d2adf9857b7e3c89bf59b541d236871107270b24b25578e8
+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_rc2.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
-EBUILD libcxxabi-12.0.0_rc3.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
+EBUILD libcxxabi-12.0.0.ebuild 3546 BLAKE2B b6accd4747ac9a1b30161de15e961062819e527c39a4d8a6e755e58a75862b1b12162539bf9716db2be8739b9aa2fefe16cede125b504e9d5e2d60f291fe8e35 SHA512 2fb42faa0ac7d7e5d1651494264163857561eb746ea381030bf03495152c8c060cb0be0793ba96f1ec5c4c9e3ea88b48644f587b4f52979c7eadad6992809e0a
 EBUILD libcxxabi-13.0.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
index 41331ecb05d2..fa0f31dbb563 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild
index 8c24d9691115..b8fb739a6ecd 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild
deleted file mode 100644
index 8c24d9691115..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.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 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=""
-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/cmake/modules )
-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/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index c499658c6fca..b3a7b72c1f2e 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,9 +1,5 @@
-DIST libfaketime-0.9.6.tar.gz 51333 BLAKE2B b9aab3da744e250f43eca4f837322932c3260d35550171d34da851740a415bf3d2c3bfe02cdf37782058d8524008743838757ed8326384ecb36d0d9839cadd1a SHA512 ab2e9c53f4ca2b9dcd2bbcd8de3ab9e27be57547ed9b52a17f07a6fe880fd3a283a6f10018736be2a6ba4e150f54e92161959ccb887be1f78ddfc96058729860
-DIST libfaketime-0.9.7.tar.gz 56277 BLAKE2B 62e10c4b3c33c203cde023cbc4e114c2ee1ad87298b1840bb2f7ea3610fdfd81c12a60c1c00a44409ca322e96408427fcad32f202737b75d28c5d69b85b579d6 SHA512 593e14e96dc0a49f65e93d25b7aace6e78fd2b4251f692c14bd6c6a2ac6360d997573aeac9005388bc49276078075c23a39fdaee912c2469acb8014127625537
-DIST libfaketime-0.9.8.tar.gz 70614 BLAKE2B a10a8859c216ce4c2edae3324515507f4c2b8a284d80da5a83d1b8046262ae5e624e358c809c2d473fdc21caa0d89f675beb3adfdb401411356145fdb9a1bac3 SHA512 87081024cab10462d4ed4d4ad9c3c56ab40fee3300d3a9ff180a4d96d418b3f25d80d7d5ad0a1af2fb87204f01a506d9fa273def7a8f9cc3be4cc0e9fef42aed
+DIST libfaketime-0.9.6.tar.gz 53540 BLAKE2B 5559e683d9d513fe60fe4b7f22a2ee794bccd8b1fe2a58735876fb9a0f05e1157d20485cfc2f0bcefa0b1f642f3b981de00471a36998867b0024dd8ac5a77466 SHA512 22cd796d4c6f7b327c664895df5b93b72a7243d886bf5241f932cc23fd54049c5fb6a8351078d036d78d12cb6f530ff66b98ef75df6eba5339ebfef1e7561225
 DIST libfaketime-0.9.9.tar.gz 78610 BLAKE2B 863e3aaf5f26a7b4d6104bdf5dd8fc0ac70547770d01cad302e476a7eeee63f0900ddc825aa75f6db7be08155d7ceb05f3b730fffb9e4928147fbdc097ee0df8 SHA512 b1aecf456753ccf771f0f80c92d57ffcd2c8349dde93a575862b4570a06812d4bce104f2efbcfd627a85a80fed99dbc37cb156dda0389892bfb4e71df816191f
-EBUILD libfaketime-0.9.6-r2.ebuild 1357 BLAKE2B d10887ac8b725f24397ccfcd398b972008ca208e42e0631f2aa33a71461f8b32186bad3e371ae4fb42d25f91e2e4ece6e5b208c416df3ad05e219aaedbda84a5 SHA512 98f40738a63b3190203b1bb01ac52b3633229cdc61db1ddea75cfe7c195b3a28fb64a572dbe9e0ae8ad298104c4329a9465f0e1dc3c3881a3edc610d80b6c794
-EBUILD libfaketime-0.9.7.ebuild 1383 BLAKE2B 7a61df366d1d8c8f5df3798f87d47c524a8eb5e02b90454d9b15b583d1af72a790c3e99251200f9ff854d90310f5b2cbb95b082860f18269dbf5b38e5f8f8e74 SHA512 8db6ca7f9e66b49ce4ef116ff8be3e2debc8ec1f9b31503ddd8f1a5cf785029ed4b10a7bddc7e026d548a3c00d6b7baf28ffe93dcfaac16e8d15758c5e7f955f
-EBUILD libfaketime-0.9.8.ebuild 1599 BLAKE2B d6d5c3ee1214ce58a1c324dabaa42465b61c75a850fc555d806f117dd5f12c71cb5ce421f8f571d80bd95a7e5228cf5ce1587ee3503a88708bc727ab8a350b41 SHA512 3c86330a7e4452da518afd79f641eeca175451eb40881f147946a1140e78fd647c5b3b92dd397956c2135c493bdb568472be349a34e19d079620abd3849364ee
+EBUILD libfaketime-0.9.6-r3.ebuild 1405 BLAKE2B 999273c6ac101056ad34a6f44b0400f96c1e878cd07d685efd5811672a4675bb8fa404086e7cefbb6b92ef909a11db9bf6ad69ff6d5a725fac125f6bc088a041 SHA512 8bae6e88b782a616c114a87be7255918f03e94c69f32244fca36d0b209c179067c6cd71023005f27b9cb1d237e009835ec50236f9301733d86dfd687e613db35
 EBUILD libfaketime-0.9.9.ebuild 1775 BLAKE2B dc603ba42319e8d6359805baabedbbf547feb4a80012d67e0513d857b26b013f59ebc64b977a49058693b855d1a220fd7be4f349a4933c6316addfcfeb970885 SHA512 fec54ad27961e625d2bec81056131cde46f8a14747302e5c151130df788df1a6fd154e0867555904e749e0deca44881ee0323df1d8c14fab4a27dd15a3250bd5
 MISC metadata.xml 844 BLAKE2B 55b522c415ccd092c6f940fafffe6d3ef871259265d125844b179f00c3fce55fd4b359c1b535a0ace47722938d2d2b744cf9062e1ff3e32bbea89b9b7a200691 SHA512 77924230fc18b29ee6c5891a73acde9158dabdec2d3f892ceeb84bc6e1b6f2b977dba05382a1da67fa8db6e57ca3be2161f6218e2f52feaefef690a0e1989893
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
deleted file mode 100644
index e416acd33536..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Report faked system time to programs"
-HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime"
-SRC_URI="http://www.code-wizards.com/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
-
-src_prepare() {
-	sed -i 's/-Werror //' "${S}/src/Makefile" || die
-
-	sed -i 's/-Werror //' "${S}/test/Makefile" || die
-
-	# Bug #617624 (GCC-6 compatibility)
-	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local target=all
-
-	pushd src > /dev/null || die
-	multilib_is_native_abi || target="${PN}.so.1 ${PN}MT.so.1"
-	# ${target} is intentionally not quoted
-	emake CC="$(tc-getCC)" LIBDIRNAME="/$(get_libdir)" PREFIX=/usr ${target}
-	popd > /dev/null || die
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake CC="$(tc-getCC)" test
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && dobin src/faketime
-	exeinto /usr/$(get_libdir)
-	doexe src/${PN}*.so.*
-	dosym ${PN}.so.1 /usr/$(get_libdir)/${PN}.so
-	dosym ${PN}MT.so.1 /usr/$(get_libdir)/${PN}MT.so
-}
-
-multilib_src_install_all() {
-	doman man/faketime.1
-	dodoc NEWS README TODO
-}
diff --git a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild
index ce73633752da..abb0ce44c96d 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit toolchain-funcs multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Report faked system time to programs"
 HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime"
@@ -11,9 +11,11 @@ SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 src_prepare() {
+	default
+
 	sed -i 's/-Werror //' "${S}/src/Makefile" || die
 
 	sed -i 's/-Werror //' "${S}/test/Makefile" || die
@@ -21,8 +23,6 @@ src_prepare() {
 	# Bug #617624 (GCC-6 compatibility)
 	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
 
-	eapply_user
-
 	multilib_copy_sources
 }
 
diff --git a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
deleted file mode 100644
index 88426ac5327e..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Report faked system time to programs"
-HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime"
-SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror //' "${S}/src/Makefile" || die
-
-	sed -i 's/-Werror //' "${S}/test/Makefile" || die
-
-	# Bug #617624 (GCC-6 compatibility)
-	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
-
-	# upstream doesn't want that we set this by default but
-	# I didn't find a single system where libfaketime passed
-	# CLOCK_MONOTONIC test without that
-	append-cflags -DFORCE_MONOTONIC_FIX
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local target=all
-
-	pushd src > /dev/null || die
-	multilib_is_native_abi || target="${PN}.so.1 ${PN}MT.so.1"
-	# ${target} is intentionally not quoted
-	emake CC="$(tc-getCC)" LIBDIRNAME="/$(get_libdir)" PREFIX=/usr ${target}
-	popd > /dev/null || die
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake CC="$(tc-getCC)" test
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && dobin src/faketime
-	exeinto /usr/$(get_libdir)
-	doexe src/${PN}*.so.*
-	dosym ${PN}.so.1 /usr/$(get_libdir)/${PN}.so
-	dosym ${PN}MT.so.1 /usr/$(get_libdir)/${PN}MT.so
-}
-
-multilib_src_install_all() {
-	doman man/faketime.1
-	dodoc NEWS README TODO
-}
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 22e1a835a85c..af6186689092 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -2,6 +2,6 @@ AUX libhugetlbfs-2.23-uncompressed-man-pages.patch 1515 BLAKE2B b43415a3059f1071
 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 4149 BLAKE2B 883d4ad357edce5f8855380ebc51c90d615a560667992bb736b4807e8de3028f6239adf1daec4a01ef27a273dff98d76b9938373b2ba0b37a57f92c9aa90ff3d SHA512 b855a410ff22962b4657f0bf27ea1ec2f7773ab6ab32d48a42c9b9a94b72c2622f17816f0b5c5514c02677191bfd055e855c961b5f9a3a37931cb5837cdfb69b
-EBUILD libhugetlbfs-2.23.ebuild 4204 BLAKE2B 3124956cdb9ad980fb1f602e6e08908f8ddff29f4745c365c46a29ba7a7bae0aebc5ec9ec24e382141de2adc54a999649011a62b06189aa6bb342bef333ea40e SHA512 3b840f03206070d0469ededbf0e3eed9c7ef331b7ca035fca1456870c2a57123d2560e9c7ef8b82b279a5a1384dbc387f3601607ac49e4de45231dd265276588
+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
index a6cbf04d56aa..8b11ae28651f 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 multilib toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
-DESCRIPTION="easy hugepage access"
+DESCRIPTION="Easy hugepage access"
 HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
 SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
@@ -56,10 +56,10 @@ src_install() {
 }
 
 src_test_alloc_one() {
-	hugeadm="$1"
-	sign="$2"
-	pagesize="$3"
-	pagecount="$4"
+	hugeadm="${1}"
+	sign="${2}"
+	pagesize="${3}"
+	pagecount="${4}"
 	${hugeadm} \
 		--pool-pages-max ${pagesize}:${sign}${pagecount} \
 	&& \
@@ -71,7 +71,7 @@ src_test_alloc_one() {
 # 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"
+	[[ ${UID} -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
 	emake -j1 tests
 
@@ -91,6 +91,7 @@ src_test() {
 		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
@@ -106,7 +107,9 @@ src_test() {
 	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=$?
@@ -123,6 +126,7 @@ src_test() {
 	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
@@ -133,6 +137,7 @@ src_test() {
 				TESTOPTS="${TESTOPTS} -b 32"
 				;;
 		esac
+
 		# This needs a bit of work to give a nice exit code still.
 		./run_tests.py ${TESTOPTS}
 		rc=$?
@@ -147,8 +152,9 @@ src_test() {
 	for alloc in ${allocated} ; do
 		pagesize="${alloc/:*}"
 		pagecount="${alloc/*:}"
+
 		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+		src_test_alloc_one "${hugeadm}" "-" "${pagesize}" "${pagecount}"
 	done
 
 	# ---------------------------------------------------------
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
index 94988481f11a..ce5da82ddfcd 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 multilib toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
-DESCRIPTION="easy hugepage access"
+DESCRIPTION="Easy hugepage access"
 HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
 SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
@@ -26,6 +26,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e '/^PREFIX/s:/local::' \
 		-e '1iBUILDTYPE = NATIVEONLY' \
@@ -35,6 +36,7 @@ src_prepare() {
 		-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:" \
@@ -53,14 +55,16 @@ src_compile() {
 
 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="${1}"
+	sign="${2}"
+	pagesize="${3}"
+	pagecount="${4}"
+
 	${hugeadm} \
 		--pool-pages-max ${pagesize}:${sign}${pagecount} \
 	&& \
@@ -72,7 +76,7 @@ src_test_alloc_one() {
 # 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"
+	[[ ${UID} -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
 	emake -j1 tests
 
@@ -92,6 +96,7 @@ src_test() {
 		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
@@ -108,8 +113,10 @@ src_test() {
 	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}"
@@ -124,6 +131,7 @@ src_test() {
 	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
@@ -134,6 +142,7 @@ src_test() {
 				TESTOPTS="${TESTOPTS} -b 32"
 				;;
 		esac
+
 		# This needs a bit of work to give a nice exit code still.
 		./run_tests.py ${TESTOPTS}
 		rc=$?
@@ -148,8 +157,9 @@ src_test() {
 	for alloc in ${allocated} ; do
 		pagesize="${alloc/:*}"
 		pagecount="${alloc/*:}"
+
 		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+		src_test_alloc_one "${hugeadm}" "-" "${pagesize}" "${pagecount}"
 	done
 
 	# ---------------------------------------------------------
diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index 51cbbf1c91d3..a6d6df775076 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -1,6 +1,6 @@
 AUX libhx-3.22-no-lyx.patch 495 BLAKE2B ae31b2ada8230a223413e4f7470b7743592191e829800b05124781660888bca1f153e287af5e79e106cd590539a64880e6d111054fb0ee31e9cd02cf65d59f01 SHA512 f4299755b65c7e3b64937df81feed58851bfe7e4938c4b47cd94f818bb7d5c80eecac34b7e80b1c051b07490b3730cc74d6f38cd47a7c4321882a8715ff4b802
 DIST libHX-3.24.tar.xz 876992 BLAKE2B 518b99e78acc0cb412f444c0dacaae830a853294a0ee549facfbe65a423a9f32d0388e30e255c87c3f5325102bea45e5e9d72d3fce5b89139b689fddcb299f93 SHA512 faf7af53b628efe1531568ccb2b7e9910db833b14583ab1487eb6a554b407a7546bc75348f7d2344c29ab53fd2df061f6f8de8db634bbd62c3672dc4347d27e4
 DIST libHX-3.25.tar.xz 890576 BLAKE2B d8e13a7fb0ea2cd033edc6b179ef3d4b30c37f522b1e90aea0de96d225655b654d1a7cb133834ef2f10044ccbe60e7559b2280ecbc136a458fd3a2237b8f83ab SHA512 221000fddd1316b6c452babbcb7e234683e3bad559a4b1a608936a086143ad8f17cec489606f8d50ea66775b9f8305ec52c7401d568f01b33372388f75bdea94
-EBUILD libhx-3.24-r1.ebuild 718 BLAKE2B 98cd19910cd4bc2535c24e85eda1b15a3556d718ca6331b0fc00a3d2d1b9314ab5334b1c9e2f2bdd35802edd8c99714add97bd64f154c1f30bfc1f26ed013543 SHA512 8deab8c5bdb21898166746cb5a15d9376137d6ca0cfe1a406438b8d511ec6e9bb5f25acb36c61b0af24425f800bf9356ff6c52706389b73ecf10ef5fc645fcf5
-EBUILD libhx-3.25.ebuild 739 BLAKE2B e4478d5df5eeebc711c811998580bbad28fbffeaf946d0119db2ec1589c36c7e897ad45a6e39c25a02aff6a172373b0a907db8656144bb5ef52829437da903f4 SHA512 980c17ce200985f49cd18831873404e5c9d1ba40d6694a243257d496b2243c0cc57d22d9b884eb94a363b8b0c70700841a53082ef37eb646ca0dbfefb24fb4c3
+EBUILD libhx-3.24-r1.ebuild 708 BLAKE2B 63537cbdd638a3a4244498ee6785a92058c1dc91b4df4fb1dbc369f3bae7cbe86471eae9f5bab9f838b6e19f132ea8ab14026eaa1254d5d302171119d8209e27 SHA512 5adfeb03eb3dca845f9116b90ef6e1a19196ab0dd6058e252c10f7cebfa8570c5e03d631d6fd1bb55318d8e069286239e3878bfb328610b36f2cc279d90a08e7
+EBUILD libhx-3.25.ebuild 729 BLAKE2B 729b113a5b455a53fb66773d4ead5a0689420427059bbba9f91629b14037b0d4f35e5eaf0c410f0034fecfdaea230aab117a3ee3f615dce760b285ab9a29e97b SHA512 75cbda30c6b583d641dc9ee68cdbb8173ce1c2ee913500c86b9f42e7cb6d1c97a93232c8c7b2d992a183052cc07669d20dd8e428cc182cdc0b0d900b0380bf0d
 MISC metadata.xml 291 BLAKE2B b50d1b83382b5b05dd6bf125793c09a517ce7fb79f9af0763b4098c03e3baf3ff74857981e20705ee0a8d0e196446184decd662757fa635e2505ca86a912bf82 SHA512 de452151608c3b92b1ab50eadbc25d215f79a375f345acbc9d9f5414fc41281cd1b2107a28b3bd16dc79205528f98af86d5e08c95b6dabc0a64bfbe45a37f8e8
diff --git a/sys-libs/libhx/libhx-3.24-r1.ebuild b/sys-libs/libhx/libhx-3.24-r1.ebuild
index e2938546ea0b..0a6b6a1a4974 100644
--- a/sys-libs/libhx/libhx-3.24-r1.ebuild
+++ b/sys-libs/libhx/libhx-3.24-r1.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
@@ -14,8 +14,7 @@ SLOT="0/28"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
+BDEPEND="app-arch/xz-utils"
 
 S="${WORKDIR}/libHX-${PV}"
 
diff --git a/sys-libs/libhx/libhx-3.25.ebuild b/sys-libs/libhx/libhx-3.25.ebuild
index 76c65740ee5a..398b3d8c5869 100644
--- a/sys-libs/libhx/libhx-3.25.ebuild
+++ b/sys-libs/libhx/libhx-3.25.ebuild
@@ -14,8 +14,7 @@ SLOT="0/32" # soname version
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
+BDEPEND="app-arch/xz-utils"
 
 S="${WORKDIR}/libHX-${PV}"
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 94b3188c1850..9cb9ec9bf999 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,14 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+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 2905 BLAKE2B 1a0e17f861b690031143fadc3f93c0a9def81e49b2c2786b085e921eb0ba93de7372a2a85ee1adbecc6ea877696e7912052e1b3ff78341b81e6e20f5e7a4c222 SHA512 c2365e3ed12b208478bb4ea064bd8899ebabbbc620877de074daed04678df9a4dc528be233a72ccdb26742da3c0c7f8460310991a37f56caae18e5cbae29356b
-EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 7e0c70445e2822d34c0f48f99debbe2f99e35601cfc3ce8e5d5a22888b29b6af5ca5090c66ebc7fb77990e2fdce37b958a2803d2a4be7e626359b48a7ad68c01 SHA512 8c7c35ed7c2d747d0d47a0d9588f2486a93852f31e7e1120688f41b09089e9507534fbae5d609b18bb28899de7dce2670ea1b87eb2e90cf06bbc116cac7daa22
-EBUILD libomp-12.0.0_rc2.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-EBUILD libomp-12.0.0_rc3.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-EBUILD libomp-13.0.0.9999.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
+EBUILD libomp-11.1.0.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
+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-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.1.0.ebuild b/sys-libs/libomp/libomp-11.1.0.ebuild
index 351b5006feff..6706c0daa20f 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.9999.ebuild b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
index 0e4b59de3db2..0fd7afe0ff42 100644
--- a/sys-libs/libomp/libomp-12.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.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
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }
 
diff --git a/sys-libs/libomp/libomp-12.0.0_rc2.ebuild b/sys-libs/libomp/libomp-12.0.0.ebuild
index 592037ef0b29..a1640af9cb73 100644
--- a/sys-libs/libomp/libomp-12.0.0_rc2.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=""
+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 ) )"
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }
 
diff --git a/sys-libs/libomp/libomp-12.0.0_rc3.ebuild b/sys-libs/libomp/libomp-12.0.0_rc3.ebuild
deleted file mode 100644
index 592037ef0b29..000000000000
--- a/sys-libs/libomp/libomp-12.0.0_rc3.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=""
-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/include )
-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-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
index 592037ef0b29..0fd7afe0ff42 100644
--- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }
 
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index a1540dfee604..37a867b8d074 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,5 +1,3 @@
-DIST libosinfo-1.8.0.tar.xz 273324 BLAKE2B 0d289df4eb1eb0f9793227b7925cfc37e253a4db0da5c420e7b058d4c060ae50a5609bd25f7d07822e0110e535561f675cf8eddbe6bce0875757f10ee30b2c22 SHA512 1d831443af9eea6a5ba1edccafcd47e56fc55e3cc43c0572044abc9c70c4eb8bbe0d95019d42bbdc3b680a2f52511863412ea9587c6eb553353b3802e94b2960
 DIST libosinfo-1.9.0.tar.xz 279376 BLAKE2B 9f231f022d80e96fc9b031ff8f16ea1e432e5e3ce079e384ad123043b89dd5e47ae119aec3052c8926965bf30c49b150f0ee727fb3b0e0391d393b1031aabeab SHA512 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
-EBUILD libosinfo-1.8.0-r1.ebuild 1517 BLAKE2B dddb734dbb4428417fa830d31f9e1bbc8f165d5d8a6d03ff8e929b3025a8106b1e7a2db2cc4191bbba2e0b77da85768a54a70fb85480569d9a2f772f63e4cc67 SHA512 541d1a76d09bd950909f4b754286095d48af5614e3552d56316272f846d8a5eefc5c8c5fa68d210be69f0c31fc3dfde226097b5dc747e378efef86e52c48d642
-EBUILD libosinfo-1.9.0.ebuild 1520 BLAKE2B b04063d0559ff79ae8c779afe4a9f3a745b28ba8ccb0e363228dddc5b99187559386a46f129dde7facb882a16f1339d8fb547135203131cb998a8ee0f422ab62 SHA512 619dbe2412b7dc5bb3b8a6fbfbe243e631c6e91cd8839b61a20d85061dd4fec518d5697534d03af54f92b735f3092abb6b8bdf408b51350dbabc436bceda9fff
+EBUILD libosinfo-1.9.0.ebuild 1517 BLAKE2B db0fed6c813fd82e47d27b9142470f492b9f7abde12dc8138c7c42802ba555ccd15f267bf1252b3710ba852f7448b0d32e25ef097c76f5a5f4c15a40ba496ab9 SHA512 ec614aed8f99fc76f570e43cffce9e1fa2307e29a8a20429e99785a26fa751d6ce5152c431d792202d41e841838f27770c4cf2a1db624730e0b69f9784cd3e17
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild b/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
deleted file mode 100644
index c2bc2665e86c..000000000000
--- a/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson udev vala xdg
-
-DESCRIPTION="GObject library for managing information about real and virtual OSes"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="gtk-doc +introspection +vala test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Unsure about osinfo-db-tools rdep, but at least fedora does it too
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	net-libs/libsoup:2.4
-	>=dev-libs/libxml2-2.6.0
-	>=dev-libs/libxslt-1.0.0
-	sys-apps/hwids[pci,usb]
-	sys-apps/osinfo-db-tools
-	sys-apps/osinfo-db
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${RDEPEND}"
-# perl dep is for pod2man for automagic manpage building
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_feature introspection enable-introspection)
-		$(meson_use test enable-tests)
-		$(meson_feature vala enable-vala)
-		-Dwith-pci-ids-path=/usr/share/misc/pci.ids
-		-Dwith-usb-ids-path=/usr/share/misc/usb.ids
-	)
-	meson_src_configure
-}
diff --git a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
index b019a119ace7..5b789d710cba 100644
--- a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk-doc +introspection +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 63cf2d18f100..fe29925faf07 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -2,8 +2,8 @@ DIST libseccomp-2.4.3.tar.gz 598147 BLAKE2B 272c9f1ca7e4059790f633a79cae8612831a
 DIST libseccomp-2.4.4.tar.gz 604420 BLAKE2B 04a2e22996d94f2525c1f4a890f325e7c75abb7ac84928a1ffde5e4cc569ef6355fcda8415e0c9937139e187f458602714cfd042008de74637c7bf30e9bd58e2 SHA512 53e5aa338a1c30ce826551e33be6ef877af43b1d8cfd2e1b6ffb70789eb2070d2610fb7cb5cec4a3a4c4a1221767f867f3d2bc07b6b1d9742719b1e053630b24
 DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae
 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af
-EBUILD libseccomp-2.4.3.ebuild 1032 BLAKE2B 3f2942ea4f43382a14eb139cb56b04d8dec31c9869ca21f5acc2114b647e15187348e42c60c0e5beb14e8827cff9a9c29072081cd5f5053f1dd023f9b5861046 SHA512 3baa16f3d3e6e0f897285a5243d8eef410d664bcd913e203b534bbfe978d9c351f4d5cfebff4975734e73ec5cf9b5a34d67a5ccbe7fe9365ea60d72d7ab08cb7
-EBUILD libseccomp-2.4.4.ebuild 1032 BLAKE2B 3f2942ea4f43382a14eb139cb56b04d8dec31c9869ca21f5acc2114b647e15187348e42c60c0e5beb14e8827cff9a9c29072081cd5f5053f1dd023f9b5861046 SHA512 3baa16f3d3e6e0f897285a5243d8eef410d664bcd913e203b534bbfe978d9c351f4d5cfebff4975734e73ec5cf9b5a34d67a5ccbe7fe9365ea60d72d7ab08cb7
+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
diff --git a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
index fb7d1492bd88..f6e555a5b8d7 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.3.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
 
 # TODO: Add python support.
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild b/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
index fb7d1492bd88..f6e555a5b8d7 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.4.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
 
 # TODO: Add python support.
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index e4ac99b07454..5431d52b9e67 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,6 @@
 DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13
-EBUILD libselinux-3.1-r1.ebuild 4224 BLAKE2B c2bf188a6ff42906814cf9416f603a8b4dc8989c37b6906192819314b7383f265cd6a0bc3f81c86a2715587704eeabaf8a4c753220abbf9a5a3fdf8cfeec31a8 SHA512 1b185b4d9bbed743116612cf0f00ab12e60cec2a02ecb763299e5b01de39ea5d56c3120c84f2b6e1481c4547cdce4e2663b558217d282373956348be56d5d144
-EBUILD libselinux-9999.ebuild 4226 BLAKE2B c99193817d80db37675b72fd0665bd7406539cb75dd922e9e63bb947b9d92c424642d26607fbbe80a284b1e31332cc249b43bff5819d8aec3d87e9f0491e9b1f SHA512 84ce0aa4ab0b31a6c519febb829e1c424d28c911ac5d2617336e75c0c177cc0886fb93444fc668ceab788def80b32376c8c6770e92406869508de3d14b1f3b3f
+DIST libselinux-3.2.tar.gz 206380 BLAKE2B 544eaaa87b9738c61929abe48713b530a8909eaea017890040f2fe299af86f09b6eb2cf4c9a68e06268ba09923b2b67703ac7a2b973906acb45f698e9ccaeed2 SHA512 18129ac0b9936e1f66021f1b311cf1c1e27a01e50cb70f08a3e1c642c5251e4538aec25a8427778569dfecf5333cf1fb84f1a59afdce8019328d0cff7e5833c5
+EBUILD libselinux-3.1-r1.ebuild 4215 BLAKE2B 36d801acf1836645c710ba451aee245317c85dca7452ee990b1ae4f409e758d1cbdd3e47bd839e642e04e6d0cc30a4413060470a47a613a503361182d51128d6 SHA512 1e62339dd7530ce1eed4884024960e2012b533bc7d1160ce3a821956c502af7eaefee69dddb166df44a5d2a26940d5357400f5019c7b62cfc0209161cfa33af5
+EBUILD libselinux-3.2.ebuild 4235 BLAKE2B 907af15311f4f5e94583ecd32a097021feb022ef997d95eaddf046c6d36c384f6d9ad4de9f2a58cdeb8a65a2993ea5faf4060a840a2af23fe7fd7c5c1e42fef0 SHA512 83b2dca2f27d387db7ce337a217ff3cc25f2271b9a57d0017aec52f4dbed53aab7bbdea3f5f930ad033dcb9bfa1ac3bd3f37ccaa72b31f4b2341919d0d739e65
+EBUILD libselinux-9999.ebuild 4235 BLAKE2B 907af15311f4f5e94583ecd32a097021feb022ef997d95eaddf046c6d36c384f6d9ad4de9f2a58cdeb8a65a2993ea5faf4060a840a2af23fe7fd7c5c1e42fef0 SHA512 83b2dca2f27d387db7ce337a217ff3cc25f2271b9a57d0017aec52f4dbed53aab7bbdea3f5f930ad033dcb9bfa1ac3bd3f37ccaa72b31f4b2341919d0d739e65
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-3.1-r1.ebuild b/sys-libs/libselinux/libselinux-3.1-r1.ebuild
index 437b4f6f1083..9734717e280c 100644
--- a/sys-libs/libselinux/libselinux-3.1-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-3.1-r1.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"
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 USE_RUBY="ruby25 ruby26 ruby27"
 
 # No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
+inherit python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
diff --git a/sys-libs/libselinux/libselinux-3.2.ebuild b/sys-libs/libselinux/libselinux-3.2.ebuild
new file mode 100644
index 000000000000..e2b8d9f65ed0
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-3.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# No, I am not calling ruby-ng
+inherit python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
+	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+		ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+		ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )
+	ruby? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			emake \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			rm -f src/selinuxswig_ruby_wrap.lo || die
+			emake \
+				RUBY=${1} \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				RUBY=${1} \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 6d2e9c244524..e2b8d9f65ed0 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-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"
@@ -6,21 +6,20 @@ PYTHON_COMPAT=( python3_{7..9} )
 USE_RUBY="ruby25 ruby26 ruby27"
 
 # No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
+inherit python-r1 toolchain-funcs multilib-minimal
 
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20200710"
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -30,7 +29,7 @@ SLOT="0"
 IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
@@ -54,6 +53,8 @@ src_prepare() {
 multilib_src_compile() {
 	tc-export AR CC PKG_CONFIG RANLIB
 
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
 	emake \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
 		SHLIBDIR="/$(get_libdir)" \
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 9b73e571e9c5..c671f4662ef6 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,4 +1,6 @@
 DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995fcea5208d17dca531ebc998aefbfec48fe91beffa3490e1502953aa550405fb696635d01b0eb8050c8f00f11106a SHA512 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197
-EBUILD libsemanage-3.1-r1.ebuild 4283 BLAKE2B b214507e91136ee6f954efdd8ab6c6122934297fdf3fcb9500ac2be8fad85c4abf7da137b6f58b213431986ca0dfa3f5a84319161b631e17fb51916818db5f02 SHA512 f386ed5eeb8c4e358cf6e9501a2fcfc2d2c77da404f09fc41c6d67d19e87b08a8c1381a933b0cedbfe49b33183e4a349d26deb34e8bd276e3c98624ea72ff1ed
-EBUILD libsemanage-9999.ebuild 4285 BLAKE2B 529929a3950623472a21a25a29592c9a3933ecb021f556092d3380d6b0c8a713f22ba338fa55913f7783f6aeb3188af6a5bae8ef687fcf6993d3c63f2bc07533 SHA512 a7b6de81aabc34061369b19aefa2a36991b67ab48539ae8d4c82637339c044c831b33d0ffac77dccc7468dbbbaca939181792da717d3f2f87baa66f6b2dae106
+DIST libsemanage-3.2.tar.gz 178839 BLAKE2B c0925812d784923a7a239ba919fc0a0e1d84cb528cbf4a357fb7938d3c06ebd2f0b60cd3eba40b76bf7c2922a081b99b16b32dc16638aa1bfce32553e241fb9f SHA512 6ad670bb298b1bab506217b12a3fda5d2209f4387a11410f0c1b65f765ffb579b0d70795dee19048909e0b72ef904fc318be60d5a01f80ab12742ce07647a084
+EBUILD libsemanage-3.1-r1.ebuild 4274 BLAKE2B eb0866da968e01b89d6ba51cdcdd89f8796b0beeac515a3dbb47a823d7d5b24b64e01a05948373e6a2159b80866394d98edef9d3048436e527b38f0e8a5cb40c SHA512 21cc2d83b6efd83a691010699104d7a5344c84665cc505d4cae13a1a5891c836c728760766ae9492bb1ab0ee03e4d9e764acf6d39aa52824a6e0175db72cfebf
+EBUILD libsemanage-3.2.ebuild 4275 BLAKE2B f1cb24ab333c9f3d565d7a3d5a4fb80b6339b84b17cc4c7fc445ab1748f443d8ae15c51ff52500e8404f2e635082d24f220afa023f0516214dc2802290518efc SHA512 d2c375e0bd73b51cc663550ecad5401e2a21951105cec6fe0d12ee18e70334a0284afd3ab9eb7454dfe7a172a974804bacc86bd3071c67c03681536e8dc2eeeb
+EBUILD libsemanage-9999.ebuild 4275 BLAKE2B f1cb24ab333c9f3d565d7a3d5a4fb80b6339b84b17cc4c7fc445ab1748f443d8ae15c51ff52500e8404f2e635082d24f220afa023f0516214dc2802290518efc SHA512 d2c375e0bd73b51cc663550ecad5401e2a21951105cec6fe0d12ee18e70334a0284afd3ab9eb7454dfe7a172a974804bacc86bd3071c67c03681536e8dc2eeeb
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild b/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
index cd108ff5894e..3fa67d4bf2af 100644
--- a/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit multilib python-r1 toolchain-funcs multilib-minimal
+inherit python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 MY_RELEASEDATE="20200710"
diff --git a/sys-libs/libsemanage/libsemanage-3.2.ebuild b/sys-libs/libsemanage/libsemanage-3.2.ebuild
new file mode 100644
index 000000000000..e48ea5a71f78
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-3.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/swig-2.0.4-r1
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi; then
+		building_py() {
+			emake \
+				AR="$(tc-getAR)" \
+				CC="$(tc-getCC)" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				"$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi; then
+		installation_py() {
+			emake DESTDIR="${ED}" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation_py
+	fi
+}
+
+multiib_src_install_all() {
+	python_setup
+	python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store
+}
+
+pkg_postinst() {
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
+		ewarn "If there are any issues, it can be done manually by running:"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store"
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+}
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 4ae63c472409..e48ea5a71f78 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -4,13 +4,10 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit multilib python-r1 toolchain-funcs multilib-minimal
+inherit python-r1 toolchain-funcs multilib-minimal
 
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20200710"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="SELinux kernel and policy management library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -18,19 +15,19 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/2"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
@@ -74,6 +71,8 @@ src_prepare() {
 }
 
 multilib_src_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 3b47bcbf2947..d6108ce80100 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,4 +1,6 @@
 DIST libsepol-3.1.tar.gz 473842 BLAKE2B ef1d596c4d53cc0a87e899ef4aeb5bf29c9d6b8303632ddc866c100d30debd8aedd0e8b38cb4ce3141b80421cd914148ff072e492d63dc2dacf03ac2ce59ca5a SHA512 4b5f4e82853ff3e9b4fac2dbdea5c2fc3bb7b508af912217ac4b75da6540fbcd77aa314ab95cd9dfa94fbc4a885000656a663c1a152f65b4cf6970ea0b6034ab
-EBUILD libsepol-3.1.ebuild 1175 BLAKE2B 328820118f6657851eded73262d8f7d34187a7b9598c19e1ab3f3735a12cd6c87152a3f311890daaa97d19aaba0c7a13f0a68d3040b58c0d03469a8bdaaa3cb1 SHA512 d46ed4792c0e215d82facbbe4b715e284e7f411357257a8bca7ba6fbbf31bfae876a6f60d9e01da41dea917115e78f4ab4b6eee88ad17857fd4a4cae3cb6daa5
-EBUILD libsepol-9999.ebuild 1177 BLAKE2B c57df83301d492f61448cf804de24e1f6d4eec6c50fb2215684e9321eb734ecd3d5542d6c9514fbcb6326cf3a18adf9ffac62e93c540608400798b16ba7ac609 SHA512 dabaaff3825a5e71fd0ad66d6de40fc03273115d018f91b0faba0a2935829983f2f39392afc5a5ade5091f65b9455cc0c332a514792a8fc8fde51bb35da68776
+DIST libsepol-3.2.tar.gz 477749 BLAKE2B 6f35387c0373869672080e151f212c081389f6799539124353aa1749ae2648669b2e237a271297c1c212b7a9e0c35f05edfff1bb724c8a15993e8fb8c599ac2e SHA512 1a6b3489ff766958a4b444b9be63a794267243aed303d3e7d87278f11be492dbf603a0c8181c4c5e01cb0e1ceb43810a77f738f0b9bd1d7d2be67053f9c67a6f
+EBUILD libsepol-3.1.ebuild 1136 BLAKE2B 7ea108a698f5701cff8eea482f58442c9e339ed0c720f4cc9a50c2fee7513dc3f4b0d5427cfd1f67d72c48ac4659f31ee653a13cab56b441980c44a850e37a92 SHA512 cfd3e50a39e3dc0b35f961515b8c6d643826280489cc720376641b5b098bab3f883f009b924ca238a1f45af725da0a498a811fc8b841c7d5330e3ea0b7576f43
+EBUILD libsepol-3.2.ebuild 1111 BLAKE2B 8ae2517a060279cb7be432e25697ef5905856b9f271b78f28ee25a73d94efb969c28efb26b34bba4a43ad52f1c316767682fbd8c90f09b825921aae6f945684a SHA512 023d89e557b8dfdc6bcb92b18d0433a23cf030b1c179d8fbb583edf5e4fb7b5fc005ba4305f402e62e818793430141b6a69cda791e99c7dadca4ec0d8feecb89
+EBUILD libsepol-9999.ebuild 1111 BLAKE2B 8ae2517a060279cb7be432e25697ef5905856b9f271b78f28ee25a73d94efb969c28efb26b34bba4a43ad52f1c316767682fbd8c90f09b825921aae6f945684a SHA512 023d89e557b8dfdc6bcb92b18d0433a23cf030b1c179d8fbb583edf5e4fb7b5fc005ba4305f402e62e818793430141b6a69cda791e99c7dadca4ec0d8feecb89
 MISC metadata.xml 401 BLAKE2B 8d8df536f4fc4276a16dd448cd50fc3344f4f934ec7a8bc34a69e86e368ba47e69d1b8522771229f24dcb6400b3256106b26f9662ec1173cacfd539bffd7ba9a SHA512 67f5d428e108ff13135a3260189f3a4ae70b50f52e1d342029c25fa7e2c8ff2bc1ad579117a0f0caa0cad427a6f1f2aa6b8a6c540551656dd61849b495e10029
diff --git a/sys-libs/libsepol/libsepol-3.1.ebuild b/sys-libs/libsepol/libsepol-3.1.ebuild
index 423969ff82d1..ccf481b3d44a 100644
--- a/sys-libs/libsepol/libsepol-3.1.ebuild
+++ b/sys-libs/libsepol/libsepol-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit multilib toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 MY_RELEASEDATE="20200710"
@@ -23,10 +23,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 # tests are not meant to be run outside of the full SELinux userland repo
 RESTRICT="test"
diff --git a/sys-libs/libsepol/libsepol-3.2.ebuild b/sys-libs/libsepol/libsepol-3.2.ebuild
new file mode 100644
index 000000000000..141803b9f569
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux binary policy representation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/2"
+
+# tests are not meant to be run outside of the full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR RANLIB
+
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		install
+}
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index 5b122e23e551..141803b9f569 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit multilib toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20200710"
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -14,19 +14,15 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
+SLOT="0/2"
 
 # tests are not meant to be run outside of the full SELinux userland repo
 RESTRICT="test"
@@ -39,8 +35,7 @@ src_prepare() {
 multilib_src_compile() {
 	tc-export CC AR RANLIB
 
-	# https://bugs.gentoo.org/706730
-	local -x CFLAGS="${CFLAGS} -fcommon"
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
 	emake \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index 6795dd1ed34a..e96bd2e719ea 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -1,6 +1,3 @@
-AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a6fca5be942b6381413544ae139c7f79d74f8e3fffd231423cf3f7a5d7468579f0fa567156fc83a3e6421ce9fb81c92 SHA512 71908cdac0684e4b6fae04f30156ca390d9bd525467f0954e94b5725e9ef5fe368cfd78ece333d8ffca5e02fc33b66e993655960a3cd1b9667a479be73943b6b
-DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6
 DIST libstatgrab-0.92.tar.gz 815262 BLAKE2B d8ca538f01d9e0b1d5c459c9c0da6df5b6806e02649d726c3ee8a2f69233a7183df6dda95980a8e6f8b438478ec28f4baa9d623d5372e5e3e28ea4909e905872 SHA512 a99c6be56d930779d0d8f6f81e64e2f31e19423009c39e925b39116a42aa2c6037651992ac2168c43a5c6ecadf3e4a58486ab6148cf96118c429b04fdcf65192
-EBUILD libstatgrab-0.91.ebuild 946 BLAKE2B b0cf0184f773911a205e417f7838d145e6d3204c9c394faa91b76b146ccd7dc714b57f23f46eaa739ca0e54cf327169197e1b7ecc5f85cdd9cfff1e0c819b389 SHA512 30b3af926914c5d515162b20d86e0c3f9ccb6c640f748a74f01bbff2cd80d7e07c3be5261f573a6eee25f946f99d28d2e653adebe36cd3b8af26ff1ea5e0e434
-EBUILD libstatgrab-0.92.ebuild 919 BLAKE2B 5efdf89cd5e69f96b8d045ad52a293fd71234aaf5165f0b43731876a4de606528d7dda25cd1f15f6c822de0246c5504b80a43a0de72f6d5438a18b286bc25293 SHA512 56ace8ffac5ddc99e7208504fe27c494ed01d494d7272aab75f822835e5418ad71d0fd4a1c178b08fadc967cc16e54dce84b7ed7895eb91cabdbedb3e0a9db2f
+EBUILD libstatgrab-0.92.ebuild 900 BLAKE2B 738aa0660e92467ae094ac2a6d7402445285ac8f5c2878eaf71cd9c458af3a7f8db715cdb436ae0cd847614204f4c76f9e5ad31ef257719d4173dd14677896b3 SHA512 2b1aee4c58ed0b05f2b49f491844cc313d29ee41ff8dd430d9fba532da32f21471960e456e7946969f15684e09403b05d4daccec6388b3b3b7687887c2627151
 MISC metadata.xml 255 BLAKE2B ba7d0981de71831366e07fb905548792571c3660154eed0b3988fb0e57ae92e133bfa15076550b754fbe848d07956764d68f03aa293270aba07d459561298301 SHA512 d099268b71914186aa1cb481cffe2d080ad5b16aa720a3d76e8d012e5adcca479bbbffb72c50a76bf95535bb5c89525b51786157c66476a0431e3bff317b0ece
diff --git a/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch b/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch
deleted file mode 100644
index b0eb94cbcd8e..000000000000
--- a/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/m4/ax_ncurses.m4
-+++ b/m4/ax_ncurses.m4
-@@ -12,24 +12,31 @@
- 
-   AS_IF([test "x$with_ncurses" != "xno"], [
-     AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [
--      LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
-+      LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses -ltinfo"
-       CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [
-         mp_cv_ncurses="ncurses.h"
--        CURSES_LIB="-lncurses"
-+        CURSES_LIB="-lncurses -ltinfo"
-       ], [
-         LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
-         CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
--        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [
--          mp_cv_ncurses="ncurses/ncurses.h"
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [
-+          mp_cv_ncurses="ncurses.h"
-           CURSES_LIB="-lncurses"
-         ], [
--          LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
-+          LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
-           CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
--          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [
--            mp_cv_ncurses="curses.h"
--            CURSES_LIB="-lcurses"
--          ], [mp_cv_ncurses=no])
-+          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [
-+            mp_cv_ncurses="ncurses/ncurses.h"
-+            CURSES_LIB="-lncurses"
-+          ], [
-+            LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
-+            CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [
-+              mp_cv_ncurses="curses.h"
-+              CURSES_LIB="-lcurses"
-+            ], [mp_cv_ncurses=no])
-+          ])
-         ])
-       ])
-     ])
diff --git a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild
deleted file mode 100644
index 8fa5c728d722..000000000000
--- a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool to provide access to statistics about the system on which it's run"
-HOMEPAGE="https://www.i-scream.org/libstatgrab/"
-SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc x86"
-IUSE="doc examples"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog PLATFORMS NEWS AUTHORS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--disable-setgid-binaries
-		--disable-setuid-binaries
-		--with-ncurses
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
index b62910109c58..0e29607923b6 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="A tool to provide access to statistics about the system on which it's run"
 HOMEPAGE="https://www.i-scream.org/libstatgrab/"
 SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index ceb7139779ad..e7ded52bcb6c 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,4 +1,4 @@
 DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-EBUILD libstdc++-v3-3.3.6-r2.ebuild 4903 BLAKE2B de1ae46e51894965a95123ac4e293b17ad3688371367a63661aab200f797d68f07f19d9a7afde895921bf1f121f34b7b6e7316a058b92ceeb7558d1ddb233b62 SHA512 399917ce88dfa3113fff48e0f68d68f053117db591512bb453e07c11e2d2a852b81ae683604458a4e101359ee31959bf6537de54e94fc5633edae60f20d20260
+EBUILD libstdc++-v3-3.3.6-r2.ebuild 4903 BLAKE2B c25085fdbfd7127adb8249ec9130708dfc421822fade2f5dbfd5df8a4a1944ea26843ae80cffec1f54bdee0c12a7f24dccf6006eb07d3020bf0dbe7da536ec05 SHA512 bcea5025c19f7ea41b3989f6b2d42084bc92ad8f944f19c8bc5d13163ba6ed23afcf03f87534414d69e2da3e2ecd607ff7ecb08981302c47ca31b59b47a2cad6
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
index 7540af559883..ad1fd1f8e097 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib
+inherit epatch flag-o-matic libtool multilib
 
 PATCH_VER="1.10"
 
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 80885f529438..7fce854cf377 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.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 cbfca61a73c0ebd486e798ca1c5f28f394b201fecdf932aeda0515f1e9fa885aa8fa83abca9ca3ee3680ddf7e0ca605956f23cd83b1ba02c10eed5d639b4daa3 SHA512 33ad94316a1dfa3a6c49fb11485aec1461945c4436598812e549fba768d75fae7ae566218df126d6697ccc2c0422ce1e1a9fe3bae3705a82ad24f5e1e46b1935
+EBUILD libtermcap-compat-2.0.8-r4.ebuild 1193 BLAKE2B af123a26a3a0ae71fa1f80c3acff4b330c7c2d52edf1dc6e2d19323c3ef4db84ce842f58c2f172d9c74540c83f61ecbfc64483095dfbb136e05956f584037f1f SHA512 25daf0b27b263d9179cb959a9dcb69b5c9356f4753779ceb6c83128d384a0e9b501097544af1f5bae08c34e48f8e49d2010b979b3a180205b464aaf2b6900981
 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 3eeb871e2b51..d89e95855853 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,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
@@ -6,7 +6,7 @@
 
 EAPI="5"
 
-inherit eutils multilib toolchain-funcs multilib-minimal
+inherit epatch multilib toolchain-funcs multilib-minimal
 
 PATCHVER="2"
 
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 96b879999dea..1bcc7a3c8ccb 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,7 +1,7 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
 DIST libutempter-1.2.0.tar.gz 17353 BLAKE2B 35e66a32e70fa59639f9a4fb71ba0e89c88aedac04e389cd29397c935daea66bd9f4f04795c977911f136b121d0445f79c0090a60a0353d04af98fe6b9b9ee09 SHA512 24b9fb59269b48bfee397520907c74746a7a38cf12cc002a8adcdd930460036caea7c72fe47b93badf678dc8306786bf4d87f23ee696a524bfc93722ea1eed23
 DIST libutempter-1.2.1.tar.gz 17429 BLAKE2B 88ae0a03a8a614b960082ce4d4006ec4e3eb8148b319ae964ac3ba3f684f08f5dd670e693f25d52d04a280f7b2aed6d2894cbbc0e2db3f71ab68e6910ffb58d1 SHA512 d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429
-EBUILD libutempter-1.1.6-r3.ebuild 1695 BLAKE2B 0d30556535a1c20985166a745205d31527d8974d90a7b38ec5807ac38d8e5d0bc21cd558b6807abbc4a6d053e5ffa402680d66a459365a4c6d425ef5755ba127 SHA512 73a89576e86ced443b827cf84b8ee3ae26ad2c5dff9abff6c48554e0238701e36a2434050fad9beec30d30809a2383f7598d2051fedf23a9be4ffc37d37d9c4f
-EBUILD libutempter-1.2.0.ebuild 1705 BLAKE2B 0421ad465302e3e8ccbd4369b1ae44043653d751e24168189e0a2dfb1912748fb7c29b0123a27db8587f3dd53697b0fdd95063929614e009ac348b95c59ca0d3 SHA512 8687abd08901b2577f0cf47a7c9820e45858a322c5cbb854c0f72dc362c7777c48f2fd5ed208d15dd574b798f7c300ff582afaeaf01e8fdda3ca5b98be1240ed
-EBUILD libutempter-1.2.1.ebuild 1712 BLAKE2B 2d69570c2dbb7737b81d6bbc84627fc2a9d432049b960fa8eb0e9abd5dcbf57456896de97d173d0e31be64526577c31d6d07a6adf6388aa674c535b5caceb982 SHA512 325e01ebe83551be24bc6022e8bde1e932c5a99ed7fb4ae95d226adb813d9da4d9f6c2571063cd38f0d56145202388b0d5cae0962d9d341019a722b227a0a2b9
+EBUILD libutempter-1.1.6-r3.ebuild 1565 BLAKE2B f53748b5ac0a11d8e0bc05f91e584cc98360096b69e7e08db71f0aa7a7af7dbbc26e6c06e589e79d142fcd8b2fdeefa3e94a7dec841271430109b04cd5a0cbde SHA512 03c8046a26ea3a3e269d49dd2ff96e45f50daa704f6a2f4973acd13e4e54287bf81eb02de313e8f6b298022f0b6719767f4b6a99e63600ea20f4ae7f9e1ee40a
+EBUILD libutempter-1.2.0.ebuild 1574 BLAKE2B af93129e8e46d48977500512f314c67a68ee3d38a87e5017a8c20794592d4966f8ed49fc92a2dcc049c489af037643a0886dcf3ca704a2f2edcd59aafc5fbc6d SHA512 f85a9e76740000f204ce2e1af77d8cd7cbcc317c578df84a4590ccabd7f84ec980307b2d17fed1ebcab6921e4ee78f97f3e08e17074980d588e0f7ff48bdb7f2
+EBUILD libutempter-1.2.1.ebuild 1582 BLAKE2B 73554273676e185d25cc6580aee654bba345be8d596777d80bb76e1d8ad06eb94e22d27ac11989634878ddeeb1ec6eb4ec78e55e0c79868e8fe0076def1f14e2 SHA512 a130f633f970daa98657e9ff198d3c5eaa24e9421c6a8a4688b8ca6e2639f11f683a184ae2bb19b592caf8a3207135743faf55c98637466d20953fa9debf80be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
index 0633a5a51eab..326b59190559 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs elibc_FreeBSD"
 
 RDEPEND="
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }
diff --git a/sys-libs/libutempter/libutempter-1.2.0.ebuild b/sys-libs/libutempter/libutempter-1.2.0.ebuild
index 271a41f8bde7..1df07ce3ed22 100644
--- a/sys-libs/libutempter/libutempter-1.2.0.ebuild
+++ b/sys-libs/libutempter/libutempter-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }
diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild
index bf423adf43ea..a6b93b7b049f 100644
--- a/sys-libs/libutempter/libutempter-1.2.1.ebuild
+++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		 args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 870d433c6a1b..331d53952773 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,7 +1,10 @@
 AUX libxcrypt-4.4.12-multibuild.patch 636 BLAKE2B 51fdf0b0f3ffe209c270cc2ff4bec7ea458bc5ec5267415aea8b7e151c24c49b70c7f12f1172c460e660fbbdf97901b833c5bc5e431e94e93341335da64ce686 SHA512 f7f581cf4ac375d4ff33b70f3d09ce7e9db88f6cae487303d62ff0f09abbff99c35cee4d4f774bf7360e496f3c92bf813424ea58f9d1aeded9e44449844e4974
 AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299c3e083bece50638d025649e2146325f78fa82427b7690f0df3e5a0eeb0fc66ddb13992e0d14ccf8380fc11f641c2d90a1 SHA512 dffbbfe09c4c8a93e1f6cf63acb5f237ce143585fe22eeb7c44f6929131137011c1777184f802ad86bda2e2c64de60131f6dbe18c8c309d6848d330c1cb13364
+AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781
 DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7
+DIST libxcrypt-4.4.19.tar.gz 534269 BLAKE2B 22c27fe2bfe32a7752f7be495a072c774a5a9ab9a7616fb80ff05afae4d9ff1ecfd1a04b4bd7c850df46f60aa5850225684464cf65d2a145302f128285ac8a9b SHA512 f5bd2598b5d0de47f3d805bbd4a045439e456d361a39e8725c40e2e1f32cf392bdc20b51840528f53cec052dff98be1a009fcd70b92e288584bedf06ef94b816
 EBUILD libxcrypt-4.4.16.ebuild 4191 BLAKE2B 64921e9c8bb070e5810504344ebda777acd45d685050e1b2dae8c0cf5530e1ef4ec148a13006be79a5d4252cf41ed08ff116e945bf75d7650ccf886b80ec5ace SHA512 0400b4078afff126f448286ca5f6285684278f1cb460ff536cfc71ac0aa5dafb843406cfdaeb2b465443d5bebd157d8264a073fb962d244c88ed270ceeeec957
 EBUILD libxcrypt-4.4.17.ebuild 4263 BLAKE2B 67b3d5d1561399d69c15912bfb4e3034e4a844e45ca31246acf12b0405e0dca26478e71d71e8fbd8df8c3aaa1eb09f687f20786fc8b92eaecf28ec0435b7c59b SHA512 dee010233c239ae089f211d908a706b1c6b5b4015e1ca80023d968b84a410a39aad4ea5b45efb27d7b32a9db280ec80d75ca1454eb32896cc6ff095c0f5cbbb4
+EBUILD libxcrypt-4.4.19.ebuild 4215 BLAKE2B 60b120aa9a9af60001c4180c2e7ba4bf9e0410b00a206aea3c4ce09e6c5af1c633b4a35e99d76a40435680e1be0a782dfed2c971a7d6d9d1b363d3f69a55e16a SHA512 0323090b8e5a909565000b7929174081a5a2fde35f08fc5b523a47c739375141c747b1d2d923f43fd80ef0913d02dc1d365eb23c8c082935560f87abfbc85acb
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch
new file mode 100644
index 000000000000..5b3958e091d0
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index d0cca1d..4a5d4a1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -86,9 +86,7 @@ noinst_HEADERS = \
+ 	test/des-cases.h \
+ 	test/ka-table.inc
+ 
+-if ENABLE_XCRYPT_COMPAT_FILES
+ nodist_include_HEADERS += xcrypt.h
+-endif
+ 
+ noinst_PROGRAMS = \
+ 	lib/gen-des-tables
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild
new file mode 100644
index 000000000000..6284f32749c5
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+
+DEPEND="system? (
+		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+		!sys-libs/musl
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="split-usr? ( system )"
+
+PATCHES=(
+	"${FILESDIR}/libxcrypt-4.4.19-multibuild.patch"
+)
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# remove useless stuff from installation
+	find "${D}"/usr/share/doc/${PF} -type l -delete || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+								|| die "moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 3ccc25308f92..bb695713c413 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,14 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 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-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+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 3219 BLAKE2B f0c036f8a6e3fdaa6f3d476a905cd65cb6442ddc1869b903c38c1866c836dd5c3581b8ffdcaef47fdd3633592eb984fde4b21856cf3a759c5269d181ade0c0a6 SHA512 ead13889ecd76740082f5ecb03308f7530f45a19a7ecdc96315d70b8c1c59d0b95af0de72ecceca775b3726b7a114cc5e8dca0918df9a2810b3c1916d6fed594
+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_rc2.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
-EBUILD llvm-libunwind-12.0.0_rc3.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
+EBUILD llvm-libunwind-12.0.0.ebuild 3239 BLAKE2B 04a0b9de0107e28b22fbbe4e94e55969cdd7040710e3d76d8f2c57ef820d556463cb8bda5b450221383f48b989cd923ce3ec3fd63a1514d8e6b95f4a91d797cb SHA512 6ff67dcd84b49c8092a18e27b4e9db3a745c1e77035d86134b8ff1150010f1f3e3b993d99d04c60529594df6e5b2260c0d1c01746dac333ef7e70fea9c1e257a
 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
index fe667842ccfa..f58da4d84141 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
index bf538b66689b..7f33378df74a 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc3.ebuild
deleted file mode 100644
index bf538b66689b..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc3.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=""
-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 libcxx llvm/cmake/modules )
-LLVM_TEST_COMPONENTS=( libcxxabi )
-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/mtdev/Manifest b/sys-libs/mtdev/Manifest
index 76b823fb7cdb..df3d91759312 100644
--- a/sys-libs/mtdev/Manifest
+++ b/sys-libs/mtdev/Manifest
@@ -1,3 +1,3 @@
 DIST mtdev-1.1.6.tar.bz2 295965 BLAKE2B 212cf0f0bea0fc295528c90c6685770e88cb135a714cbf21e53b75ab2eaedd210269d073520e44c5bffafe8a5ecca521221061193725cba916bc2cf703fd5166 SHA512 859fb0803f330ecaae69f80713ff5a5235c0cb00de6d5ac2717ad82cea856a92b866f0c272ecfe743186abcf925f95585149ba4828b4c91555cfeb2f2a1c98f1
-EBUILD mtdev-1.1.6.ebuild 532 BLAKE2B 72f8169dc05a8686bab6c125d44c19d3ae060bd4a735b1544dd79fb0727451753ecc27b2a12d5380fe8605c7eb946d265be9ac5def6efb7f7ee4faff31bc821c SHA512 0c4dd2d327ca1e62c4b33def9ad00714acdac5a21a1a0561e9b28d9b27bbd2462199036903f9d4aa9f55c350e5330431d1a2a0dcb56fd82792f18effa2bedd89
+EBUILD mtdev-1.1.6.ebuild 533 BLAKE2B 322b88200a31d8525337c0d9795b30bb03834d3a32805e1f1d8e2db9adda0643886bbdcec9d52699e41e5103a010c82a9b7c989b29f083a4736d9ffe97e80b86 SHA512 65c2a67804487848cad3456c917bef3c9394fee9d8ecbb4969605e2e60bc6549a0cb77ba1944f6e9dcd7f22642f95dc513730f1d1a3bc7e38630eaac6f6ef8d4
 MISC metadata.xml 307 BLAKE2B 111e26b23df5360c4b6326fe57a59b502da229e92c75a607db23174b31b5ecd9d5ddb2c14efc17aead6d1a17d4ba52f7fef09cbae87d9718c7c6ee6ccd630cee SHA512 5765f66767b8854edcb68efbed96d5ad33a6b9dee582020b742de2136c19050bde444ac16359cefbf7ee463c842eb2ab6c6a46564a034497683d158e2d841ad5
diff --git a/sys-libs/mtdev/mtdev-1.1.6.ebuild b/sys-libs/mtdev/mtdev-1.1.6.ebuild
index e5b67d21ce83..537a0e95a37c 100644
--- a/sys-libs/mtdev/mtdev-1.1.6.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.6.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
@@ -9,7 +9,7 @@ SRC_URI="https://bitmath.org/code/mtdev/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 0747585c2c48..545efc84a487 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,12 +2,9 @@ AUX ldconfig.in 2552 BLAKE2B c94f9900e8582d707519171c4b61079c801b60c555677b1740b
 AUX musl-1.2.1-CVE-2020-28928.patch 3787 BLAKE2B 25919e7bc18eef643a53bb1be1ed11b8385462c25a991ad306bc2275d523cb64e41a45f5e379de47ecfc59beac773cf8515b3130b68472905007dc49a9342da6 SHA512 07bd31861fa123e55800c9e685ee662b6d80892fdfed943893c22c5e4bd2c283d475a5714823db15c95f343af9ef2290543780fdeadcc2df79c7954a5b68de3d
 AUX stack_chk_fail_local.c 1798 BLAKE2B 380bcbb920bd40a5185246621ba93716f27d61cd0077cd796ff267e10c534c9cc64982b2a66c89b61395dc93d67dae77e8c59908f65f2903f16016180cf94bbb SHA512 bb0bdd7f205d57771920c7ea898c1f84a55d6f90ddd1f8203bfeed98d13ccefa6f68d5fd1c0761321b2732ca928ca81b425e3fe8321c936d1316dea6f1930091
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
-DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
 DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
-EBUILD musl-1.2.1-r2.ebuild 3491 BLAKE2B 4b5386cae5b34db357ee79e736c2baccf0183f8d639471c4be76c316105e381dc098aebbac7fb914649d0da101c8c2efd5503509f503645f761d71af9bd92636 SHA512 8d0e4d9e1adca782768cd121159093c39fc34ee8f84b5040538df5e42a0ddb98e2085a4690b7b4aa5c28b3061c0381f8284d17ac597d56fb771e141e612d124b
-EBUILD musl-1.2.2-r2.ebuild 3712 BLAKE2B a378c88dcf63b8ac393934c58a0c54d26607c883f29e171ee4e529a4f52ac962821a51294642927ba950ef67482996161a21821758e5d19b24462607e8796548 SHA512 68b38551946faf858139ee8c7a3c214ec4e01f6b01dd2fc831238964cdfeafcec02e9bb50cd2dcc1e12ba8ba293338da5ad50bf8cad216198bef1390cf295966
-EBUILD musl-9999.ebuild 3712 BLAKE2B a378c88dcf63b8ac393934c58a0c54d26607c883f29e171ee4e529a4f52ac962821a51294642927ba950ef67482996161a21821758e5d19b24462607e8796548 SHA512 68b38551946faf858139ee8c7a3c214ec4e01f6b01dd2fc831238964cdfeafcec02e9bb50cd2dcc1e12ba8ba293338da5ad50bf8cad216198bef1390cf295966
+EBUILD musl-1.2.2-r2.ebuild 3690 BLAKE2B 8ad2838c095828d5effda9fb200f6848d6877753f78d766cb784a17f069ccaeb4e3b9cb1d3a9a6eb60a65bf667ae4d763adf1fa24cc4f0332766012a908cff35 SHA512 66ce996146a15d02118f964d4ecbd22791aa42896cc0a004f532d9b31c0605f265a1c2d8f66829ee39f50ddbecd91d60465d1b8afcd4fe61075727c161be2cd4
+EBUILD musl-9999.ebuild 3696 BLAKE2B 0d613ea0b6812cc8c45939d7fe042db78a455cabc0f7b35f4f1d159930a382dd649d742e86026a0a22d25c09edcddd2b0334d066c22569d2562111f863729f37 SHA512 3fe236b993113f890ac25abf0761a1df8278a24bf65b442b8ce3bda328a28a0aad2e6712624b20ff47b12ca4015a5c0b8678c597c1580da5a61efd04b008cba8
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild b/sys-libs/musl/musl-1.2.1-r2.ebuild
deleted file mode 100644
index 02735e87688e..000000000000
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2020-28928.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${DISTDIR}"
-	fi
-
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index d9551e1c7e45..732b5c5364b5 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.musl-libc.org/musl"
 	inherit git-r3
 else
 	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
 fi
 GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
 GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index d9551e1c7e45..b4f43dbfc2b4 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.musl-libc.org/musl"
 	inherit git-r3
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index ce6af00c43ec..c8d3a59069d2 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -7,6 +7,6 @@ AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02
 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 6339 BLAKE2B 6c10bc51d57f7191ef5f6b986b47b87fd76273bf206aa7f1768c1516cd9b409d8920f5c9aa1fe7587f7de59cdbb1157ea4ea39590425aea5ec8cdec3b8bea68e SHA512 a11b53cfcee63232e72f7b3449d4bd376f617000b7bf832c9986cbfe6f941d93bea75e87c269a9b480ad0e4d675c1cbf6e6fe1b57ff19ac2a004c0e7b9ad74e8
-EBUILD ncurses-compat-6.2.ebuild 6347 BLAKE2B dc3d9d21d249e82238ad26d4008148d8eb196df7b870812e94c8b37c4b1fa92c0a42e9582364b1082497b9a1b7cbc508bb2e06d752dcbadfc5b0d13ff7821d94 SHA512 70222053eee9773ce7e002dad3b48b215a3bda54ee4fc860d46b4236588306dbf09101ff48d639b5b61f9d4fbaf356d7263edb2fa373523e5c2848bf6a0d564f
+EBUILD ncurses-compat-6.1_p20190609.ebuild 6326 BLAKE2B 7890df6ed17ce8520b5bcb9dcb61b93e1b8daeff464431acd88f4d08d1cada762014ac31139a84c9125f9a6ef017f962862d577fe422a727e9c14483cb4e7579 SHA512 8c4b8d1ff0432b01793fd9a5db0a99824956dfb4bd274a2ec52147355963a504cc4c826f5c97ed1666f5f174d85455cb963c8cb89a9cf89e0ab1abaed3c94004
+EBUILD ncurses-compat-6.2.ebuild 6333 BLAKE2B c4c2f0794236630dc8ddc9c60495edf8d95c245e23e7cfbb8cd8a175e7aa3aae04e9c69a92c4dc8956e8e85aeacdf7bb4c12d2f1f82f1ed2bc335195b8f3437c SHA512 e5f28598938d53b68c7bc9410f2801ed744997397bf91c48abb99fd334f24591ff6d1cc2ae7be300e3fd9dc21107156986f3a96b0de17ca698e0b06afe814a29
 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
index a111d7887698..0c319e1dadb0 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.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
 
 # This version is just for the ABI .5 library
@@ -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}] )"
@@ -69,7 +69,7 @@ src_configure() {
 	# 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 ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		local lbuildflags="-static"
 
 		# some toolchains don't quite support static linking
@@ -181,7 +181,7 @@ do_configure() {
 
 src_compile() {
 	# See comments in src_configure.
-	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		BUILD_DIR="${WORKDIR}" \
 		do_compile cross -C progs tic
 	fi
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
index 13a0da5e700c..0484acd9547a 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.2.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
 
 # This version is just for the ABI .5 library
@@ -69,7 +69,7 @@ src_configure() {
 	# 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 ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		local lbuildflags="-static"
 
 		# some toolchains don't quite support static linking
@@ -181,7 +181,7 @@ do_configure() {
 
 src_compile() {
 	# See comments in src_configure.
-	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		BUILD_DIR="${WORKDIR}" \
 		do_compile cross -C progs tic
 	fi
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 984654a066b4..56af8257b9f1 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -9,6 +9,6 @@ AUX ncurses-6.2_p20210123-cppflags-cross.patch 1246 BLAKE2B f2e6d5b3f106639435f1
 AUX ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch 1262 BLAKE2B 06de969e051fc167729318162500b529a0da243501e33c9cd915f5a853c78445147a6cee22b06e9577fd5821ec0820c05a908933fc9de64b672fdcaf60a74e08 SHA512 09f340e8359ea361e639af7d62f747e59e55b8a186724f6c833dd4a3067046d5b82400069900b7a3b8ca51bdee976e4eb550ad246cd843f85331d331db18e2f0
 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
 DIST ncurses-6.2_p20210123.patch.xz 519076 BLAKE2B 790ca80f0b7cdba2e75e3ace91e7f40a740594bdcb19930f64a5aaad8ba041f9ee6057e0a856050e5ef54f79ffe21f23897477dd186790fce9f8192d6149e8fc SHA512 f0d4ef317157472400f183e9ba65102e342e996c4f1d99924ece72305064c3d8616668bb2c81c6113b4bd145b1589844f8c948e6424d4372939752364bed6141
-EBUILD ncurses-6.2-r1.ebuild 10022 BLAKE2B cad77942242cec2929dc0199ada0dc92a42bf4f49eb490b49bcb8db0175d04d403d063de5fa4fb59649b07bc21ada8e72c4b9412329cd9817119cc0a04db7dc4 SHA512 b7693f3b64b11c80a7cab0ff1aee64b1a9f842e7ed682daa75850952c005e7f1b870f173ee78b5883c91f82d9ff42cfb3f45ba4f017a323daedaf7145a69e970
-EBUILD ncurses-6.2_p20210123.ebuild 10136 BLAKE2B 7b63b7a7ba3ac71e6df2f0eb1ed99b621b6463684577a3dd956c7d816434b61e351b6f188225aacc422c4d230d085f4e7e42b6c8c4de3b7c2b95d82eb43b4a97 SHA512 3e6155661224db0e5a3a3e81f257d1c2b2f6477d843b80abd61743aab5fba0f7070fd5c9535507abbf12f1edeb76e9aa82be6f69d332a94869033705e5feeac5
+EBUILD ncurses-6.2-r1.ebuild 10019 BLAKE2B 1dab9c2dfb96a3ee7af19c3e72c5cfaac44abbabf2193dcc9e5db801d76185b770938fe3ba01033e9b14ccecc139fc20a51c6528eafc13983f1bbe09f73f51ec SHA512 50c87e06dccda4d4837373e726839526f9500c6a406e3d985699c5c90500c47dbdbf60358affd6e491116d235ebf214c71f741046ae938c884e42144ca224b83
+EBUILD ncurses-6.2_p20210123.ebuild 10132 BLAKE2B 51a9717dcd8e5436fad19c7f1d0101a256a8a456829ab6b7fc50b8716fa23295d0d575677db0b1a389a46546bd878a6b13794a21f00477a40773574411189e8a SHA512 8f602f257a36ef8926397b31d6f73b89a7c9c599cce55f3b598f05cbfcd8457a320cc63d6d9648d1d6d26d2fa3c24d9e0df59a9494a0c232fed521d6d492b047
 MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
index 3876d51a41e1..718ab0d0f1f5 100644
--- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+inherit toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript
 
 MY_PV="${PV:0:3}"
 MY_P="${PN}-${MY_PV}"
@@ -19,7 +19,7 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-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="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild b/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
index df45a2a66cd4..a5e5c7d2fea9 100644
--- a/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
+++ b/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+inherit toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript
 
 MY_PV="${PV:0:3}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 135d48091bd0..36c00aac1794 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,4 +1,4 @@
 DIST Linux-PAM-1.5.1-docs.tar.xz 441632 BLAKE2B 1b3ad1b5167936b8c38977b5328ee11c7d280eb905a0f444e555d24f9d5332583f7e0ce0a758242292ff1244bc082b73d661935647e583e2ebcd8d5058df413e SHA512 95f0b0225e96386f06f5f869203163a201af3ac5c1a4fa8bd30779b9f55290e1a5b63fa49e2efafa1a51476bad1acf258b1f37f56a4bdc3935f9fe5928cbc1f7
 DIST Linux-PAM-1.5.1.tar.xz 972964 BLAKE2B a1714569587a383fa8211b23765c66b08b18dc2808c1521a904171dc2886cced56e9afa27408e8a9d5eec6226b31390dc8f14434071370f4e1147c77ce8b36ac SHA512 1db091fc43b934dde220f1b85f35937fbaa0a3feec699b2e597e2cdf0c3ce11c17d36d2286d479c9eed24e8ca3ca6233214e4dff256db47249e358c01d424837
-EBUILD pam-1.5.1.ebuild 3637 BLAKE2B 7899a80be008f3d02e8f01b66df989fd25004fe50e4c0a945037bc3b74bb84a8cb8bc46f991c9eb1bf20e46362f1ceec472f87c77f12e133f1fa86263be72be1 SHA512 b383c4dbbd1626401384b94fd88851822a3c72778e749a26342e657fd78e1594c86bac33f80a81a78f21db7975988df10f42d94400a275cf9944096d327ef303
+EBUILD pam-1.5.1.ebuild 3638 BLAKE2B b07f0bdc0d8a046da5e01a6df342a22e74aa41a1de87ac3f3cb2e8f75f28da52d474476389b30de34c9029fc0a463bc824f1f93966216654eef4825a0291c04a SHA512 ec971174aba7f5d9aaf9a2e41aed0aa4567c1a5560f621e462f2c493c1207261665afecb148b757d3f7de2978f91ce93c3c3bc487c2117b14eedea2f53e45133
 MISC metadata.xml 753 BLAKE2B 67c57ffe354542e68522d2f6bd2bd870d696cef99ac2c09f0999f09efba94d32f99d656b39c928c72ec5967571ed04e6501d43a6bd8c1272736f83a368721830 SHA512 f060d149e8d70bdd788e2d6bf6f466e66ba1786afb80640642e7c3871de30b019d8154b192c6a3b886cb75a6828b6fb587de7cb8a57462cbb5f8a312cc7344a4
diff --git a/sys-libs/pam/pam-1.5.1.ebuild b/sys-libs/pam/pam-1.5.1.ebuild
index d8b000a112c8..868d19db4770 100644
--- a/sys-libs/pam/pam-1.5.1.ebuild
+++ b/sys-libs/pam/pam-1.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}
 
 LICENSE="|| ( BSD 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="audit berkdb debug nis selinux"
 
 BDEPEND="
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index b5d77b2bf6d7..58883de3017f 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,5 +1,5 @@
 AUX pwdb-0.62-build.patch 2920 BLAKE2B e0d7362fd82f3c053a25c16d7f07aff8200a2904411a3b9a5c8921551320924aa8be41820bbb81a952ce46aed3c756d7a2b28e38c669585e1e55c415c0388e64 SHA512 fb6b1bb322daf4a343b31fd8cadb1c546682421775670a361721272ea5811cb87b8215aa1c7bad624334da826ddab4776a4809fce0613346a4560ffce8af3bba
 AUX pwdb-0.62-selinux.patch 10371 BLAKE2B bb6acd534be858c85b237d18a5e805d812db97178d9d79b3b84c5b724981aa102fe7eb58fa661719185b0b957a58c0929996a9b7aa025d49560cafe8631de70d SHA512 63cb33af31179183c32f738c90ac2144e8d8092034faa5bcd0c5420832e51018e7e9ffcea59c8354ee0ae598e53dbd120cd9338ab80b0e5df6cc1c53eb75b818
 DIST pwdb-0.62.tar.gz 133183 BLAKE2B f9b75e9875c8de1050d8eafa8b0c0c58b8c415c9b67683d1928100ce4f192f1b1cea3033264b6c31edd0709094c034ae3790ceaf0143d6b52ce2647a3ad62992 SHA512 baba1f42125a4773f2e645129be79e0e5fbd0b0da7c6624f4b1d13e59cb65f5807bd22997aa1ba360c7627f2aff93c9949b2bb5fbd27d74b516853bcbca96ef4
-EBUILD pwdb-0.62-r1.ebuild 1397 BLAKE2B 7bcae3371573ba87063c09fab0ec4751afa4dc7d90b83d47ab95553363d0b4ae8743515fba5e3c033ec2631aed6722ae4cb757375360edec289b4a75d6737c29 SHA512 80596307c214282c7d91e4b53bc7c8d63084aaa74f800e69d4123a582402d2026ee4f08f8846a244cd8d4f091a04d0c95c56f4013b111961de7a862b53ce74dd
+EBUILD pwdb-0.62-r1.ebuild 1398 BLAKE2B c71fc9f7e9e5f56e7ce143144168f2ad7386e1041970744de4053cde6d2ee1527a503dfb2dc955440569efca0933492c49c17a9f985411a5dd34f3dd3aa07c20 SHA512 7f42787666b7be50a190d6dba4444ee60f5fa6a83e792bc5662bb3edca307d8dd87ac33d4272d61eb0e94f1c8643a884334b4c2cd6d9fdaa1541bdb523e9a40d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
index 1aac533a8f7f..ea832e84206e 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs flag-o-matic usr-ldscript
+inherit epatch toolchain-funcs flag-o-matic usr-ldscript
 
 DESCRIPTION="Password database"
 HOMEPAGE="https://packages.gentoo.org/package/sys-libs/pwdb"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="selinux"
 RESTRICT="test" #122603
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index faecd51a4765..4ed23ae09b00 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -9,6 +9,6 @@ DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a7657
 DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
 DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
 DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
-EBUILD readline-8.0_p4.ebuild 4843 BLAKE2B 4466c69c466200c3da9528b4456c69c86d46ace2dd7fb98183e8a42a8e956d0a4a597db0c3658396dea9f0cb57e40dd7926a2ea83e8388c430fb3d145e7635a2 SHA512 0b768071df2aabb2ec3381c13fbb6a0ff30ae9da8471c37f93daf96aa6a2fda652864feddca458e10e28f4d595041575db3da118928251394b623f05d48d6458
+EBUILD readline-8.0_p4.ebuild 4844 BLAKE2B 911295cd0f230c2e08a5928b436c2a155304fae48a0c1cc9b797ada57addd7d0219f2d5dab1d7a03efd16c3a4b04ce7426f43f9916af2f21321707f096e0fa28 SHA512 dccdd6b34e34af2df1b04188360de701eb18b9701a73a6e4ec7b6529f3ea4316cfcdf307a4a8ab12f40f766676562378a8eb7d17689a93c611445577cd2b5a02
 EBUILD readline-8.1.ebuild 5383 BLAKE2B b262acbdd24af54859ccf1ac4e2cb84f845fd792c777f9ff1af154a5bb6b9a867bacba11fc63c99c689fc51729e8c19fa6eed0e6a40d99bedbf2abc39edb37d1 SHA512 f684d6ee7de81b95a88a23cb28c0f6f406b58d49428403ada8a1399c67ae9fd28b4bbec648b12044d2f13d49c7d8c3e523f88ee8a72265f0a9f617d2e14edf55
 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 89d0c6f52b78..e417adad0535 100644
--- a/sys-libs/readline/readline-8.0_p4.ebuild
+++ b/sys-libs/readline/readline-8.0_p4.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
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 19b5c73de7fb..b36a5a3329f6 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,4 +1,4 @@
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
-EBUILD slang-2.3.2.ebuild 2230 BLAKE2B 7f2485556d85bfaee6b9782c14b1ba57bd50e3c5f7a2fa8d3ac64744c2e04e7cf4dcc24117334b445db20e8749287bbda83cbdfa78bc793e7c8b7510cb96821c SHA512 629070aaad18e6e527c9faf1419eaf707e641b789746068b60604da3865ec22896ffc8ef90b7995c742c58c7135a2c63c70359094103ed26091d9e6412898bc4
+EBUILD slang-2.3.2.ebuild 2231 BLAKE2B 7a5fe6ce931fee1cbbe889f15dc03577f694e8a8f6aa0d6772d65a313c3dc6ff79af0364b46f125c4a0034e7d1e8a0f3b59afac923e370300712bb4af5126c79 SHA512 de7d1fd7d3141ec2fc612a0dc082ebee689aaafee67d7e29b72b008e915c62f3a6366b30e16625ed2fd27547ed5c64cabd48a03a17eaffd3c0e1247aee6883c9
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
index 31370451d21d..6a2d4ae7390f 100644
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then
 else
 	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index fdbf1b733da7..3361338b4ab7 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 3433 BLAKE2B 867d9fa020daacf98a59f80cc05ff6caafe4d44435a4ef7a32c2967fcb4e2a89ad944afd9b29688221f98272b9bd5b6dcb398dd76427716be622461a5b908473 SHA512 b0622dd96fbb4135ee23ba8182cb7534741cb146e507b5092eb553803680f3b1764cd1fdfaf9a111812e7a655bea059fc302d8657a143971bc4a07d030b4ade4
-EBUILD talloc-2.3.2.ebuild 3441 BLAKE2B 119d39cbd8a8805c25512f9b7da82f6b051e886ea5514157c7aa164deb93d20d81c1de0ea1d6cfa8e70cee8c7f33607a7cb78f8af04e1f458e9aeec2b3351b01 SHA512 fdb895679723043d8d96fc44f23ede5e2392ba30635071cacaa0f6bbbf59f5cf296fd7902836993519ffdb43b810305b368ccbf33434850917447233ac5e7ce2
+EBUILD talloc-2.3.1.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
+EBUILD talloc-2.3.2.ebuild 3430 BLAKE2B 15c3effe12347ea4f3795fac08f2195508a011593966ddf69cb102bfdeb3e86e2415f47b7e4e35e521f1d759000714d305f6b57266c97f40ffd2e205ac5d8b97 SHA512 3b49ce968168ee2c934bb9a92a95b8db2dee6bbfae25a94294dfaf16f1af1d44add4109598d6efb5d0d715eb937353da992cfa662273da4a8a7c4a1d2a999f2a
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
index 7d87968f3927..851fdbb724c4 100644
--- a/sys-libs/talloc/talloc-2.3.1.ebuild
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit waf-utils python-single-r1 multilib multilib-minimal
+inherit waf-utils python-single-r1 multilib-minimal
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="https://talloc.samba.org/"
diff --git a/sys-libs/talloc/talloc-2.3.2.ebuild b/sys-libs/talloc/talloc-2.3.2.ebuild
index 977354e2fcd6..c092b3fc0c14 100644
--- a/sys-libs/talloc/talloc-2.3.2.ebuild
+++ b/sys-libs/talloc/talloc-2.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit waf-utils python-single-r1 multilib multilib-minimal
+inherit waf-utils python-single-r1 multilib-minimal
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="https://talloc.samba.org/"
@@ -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/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 97eeb40fddd3..8da2d49c3bb9 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,4 @@
 DIST tzcode2021a.tar.gz 262204 BLAKE2B 4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328 SHA512 bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
 DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
-EBUILD timezone-data-2021a.ebuild 5676 BLAKE2B f9868622cbcb8290fe622a97a81830546c79d4ddecee7b0f9b0022c38a176b9a28e50eccc8d9b2f0518c16202d2febd953cfb431f97c26b9fc14e1c37163c31c SHA512 1a5d9dd6d24a3e333d0c3a6b22cc9b40de85b1ce357b926ee507e4c24117489711bbaa18df7a8b3419feff8fd1e24967ae53136e1457e248b10af9da13175c1f
+EBUILD timezone-data-2021a.ebuild 5677 BLAKE2B e04b67dcc57020012875092584eec7e3e22d129ff0d354901fdb6f8b02e57c6a9334333215ae025ff9ab7ea5c64d2c2478924368943654528d2a099feb5c794f SHA512 8eb8195b1df2210cef94c5bceb5357960cb35a0c295e2fbd15ceac4485b70d65f77b9af35da6707d4032efdcb7d83685a0084786297141f3c8c5b4bd9fe10a3d
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2021a.ebuild b/sys-libs/timezone-data/timezone-data-2021a.ebuild
index b7dce14ae8a4..2e39bb4f3ecf 100644
--- a/sys-libs/timezone-data/timezone-data-2021a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2021a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-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="nls leaps-timezone elibc_FreeBSD zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 377647b51eaf..fd026cfa8259 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -3,6 +3,6 @@ AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb
 DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
-EBUILD zlib-1.2.11-r3.ebuild 4180 BLAKE2B 11ad2994f6981193ab218e23b6936a099dc020f47a1522e5984b5a6eb6046972bddd7a8609b679bb9d9b8e0cc952b149829ff3fdd625387a8c0f636fdb9ae1a2 SHA512 f1678d18d8defd26ca0c7af83de426f1bb8afa6a12803db4db96bacb74710da95b4d0d7f830b6372c9a093658262f48ff6e9431ed18a3447ee3017768ef92ce1
-EBUILD zlib-1.2.11-r4.ebuild 4237 BLAKE2B d720cf66ca7dc3f1229dccaa3daf89985204f138972f3ae3e6f52aa3267ff9e4eb75e96ac83c84c1867dab8fa17bab21e79f9f4d5501a78e1ac50150d114ab96 SHA512 207d36cd81cceb9737525f837e276a37a5ddd37add62aa83efe1f0ee9e2906f821d9e21b5695db79724c1cb83f67940079c548fe8135c0b77b9e0a5673034ae7
+EBUILD zlib-1.2.11-r3.ebuild 4156 BLAKE2B 068f32e1a9d540d3e7d21b882e58ccf96eec11f22ce2c45234e9ab5817da23fbc54c58e9a47e613199e5f6a6a7f0103e18edd3624ae4dc1d83d7c934835a620c SHA512 029f420cee843bbdbb3f1831e435f383f42fc5d2e563d9ca5e6f4fc47070f34ab4d7827f297c869a5fd0192e997e9c4577f0c0a993f99d7414c6b75b8a993a6e
+EBUILD zlib-1.2.11-r4.ebuild 4212 BLAKE2B 9f33d6e40ce2511f812f415187f07565fce8d3c64badb70a59e6b76089d1c0836a5db12b4ef42761df758caf30a6083cc1ff5737346115634d899c3eeffe50bf SHA512 c79411f1bfb99196aba66d060968c51f0565fe9f8b3969fede6e7aa3721bd534badbbb7de523ad32dcaccd64e030fab7a182de0dee65a6bd15282a5705b97f35
 MISC metadata.xml 493 BLAKE2B 56454cd42e326bbf6d5b6c535cfcf49edeaadf748d7b7c2956dbabebf32a1372800c3bc5442b28ef1f153c846475f77f24ee0256f34f038d5903166e0cd4612d SHA512 fbf724610d52699ef2cbc59870fb09e786df2dc36f4c89955d12460a11070a153dc2bda31f4c9d207dba08638eaa965d359b20fce90d401528cb67f3947e3a60
diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
index c68284ca127d..cd37e9b956af 100644
--- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools multilib-minimal usr-ldscript
 
 CYGWINPATCHES=(
 	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="minizip static-libs"
 
 BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
index 8a3b7742a6fb..2a1bea3fe2ce 100644
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools multilib-minimal usr-ldscript
 
 CYGWINPATCHES=(
 	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)