gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /sys-libs
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
128 files changed, 2776 insertions, 186 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 03e3a6c79cab..90b46cd2c658 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
index 82af2f288f0a..6c2fa43ecf18 100644
--- a/sys-libs/argp-standalone/Manifest
+++ b/sys-libs/argp-standalone/Manifest
@@ -1,5 +1,5 @@
 AUX argp-standalone-1.3-shared.patch 1407 BLAKE2B 6d838b7b65b38562eca560bf094a74bb671cc0e911aed8e858e37768f12756cb579d9d984fe9444dd9b78f33b28ab080a7f6d0160dfeaf3ca4f0758c2d732d4d SHA512 2ee3386b1f63d64abff6a6b58dd7d0a7724bc07fd20f3f9daf24de1abb39d1ef35e3c616926fe3e939ccd491e84a82373e9554566a78683c3622494be2071d72
 AUX argp-standalone-1.3-throw-in-funcdef.patch 2500 BLAKE2B 050476f7dec2ff8d79e09f717eada121bc07ef26e0567c2d89ed18d44a4905741494d660ce82df8fb39f19020cf529b513d0e21b651197066d781250a921177e SHA512 5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4
 DIST argp-standalone-1.3.tar.gz 130255 BLAKE2B 0848a0e7a98cfa09de52fa152eb9a793a9bf25c1edfc7401851ef134b62c051ad6ef2134d6f528e167046be582be23f311e74614c5511d659060addc14de6b2f SHA512 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
-EBUILD argp-standalone-1.3-r2.ebuild 811 BLAKE2B f6025acf9bf7bc1ced7b72705f1ec55365c861ec0f365add0ea54d5ad68cf0a2ce40e8e60e073c2150b017429ee1ac86b65288152437d2ab2bb6b1d46bb6cf1c SHA512 4712c81b428da9f4fa8d72f8d444a488afb4ec173fd7056dec348510c9e5296e5f34e87b1147c6b96ceb7be12226f154996da0864e70c37b76e17ac501d060f4
+EBUILD argp-standalone-1.3-r2.ebuild 817 BLAKE2B 2a017f20956486697257aa0ec8550338c201fa5b124b3fd65070e009a822b88a42baae9339addf0ad5242e5c52cde4bb0e5e339ca8fdaa7b01f8985aefdd342c SHA512 d985716b11ff40df12cce2a934784e8403abcc5dd8cdbd3199940c07b7cf4b5971cf0f2ed5223bb8e3b155a9ac619e0b65e2e6f52ec986544bbca6f8a64e1e6b
 MISC metadata.xml 253 BLAKE2B 1d5af623950024db87f3016a93014ce876894828c8bac85ae8b157f8e2851ca96384c8e195c9693e09e7a76f4fb7033ee466057b930198a6416135eebbb6a8c1 SHA512 66f53c08df7430d7052861b4c483e36d54db4d937be2fd4e3a6135d36992e041aa88d60205b47c3749b54c36925ca4c45c88fa7b44fee283de48ab8aa75b738b
diff --git a/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild b/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
index 398d9d2d1cc7..ebea5b9c470e 100644
--- a/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
+++ b/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz"
 
 LICENSE="public-domain GPL-2 GPL-3 XC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~mips ppc ~s390 ~sh x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
 IUSE="static-libs"
 
 DEPEND="!sys-libs/glibc"
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 2636c3dce2d0..daa905ef1eb5 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -3,7 +3,10 @@ DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-EBUILD binutils-libs-2.32-r1.ebuild 3674 BLAKE2B 89d175ce636893bf35ad719eee7b60fdbd18ad6bf21841bba1e619681e7d9ea485bc3d10de6513d6a0b1251687f6c787862320a3c4b3089845abdf55a058914f SHA512 b2da4f468ee714b7dbaf7fcb1d72039330d45442dc1ff10aad72478ee3ed85b22ff33656143c0d9a4116cca063744199d96145fd1bb788f4b4647e571a5af3bf
+DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
+DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
+EBUILD binutils-libs-2.32-r1.ebuild 3675 BLAKE2B 4cc16130780b920a5c38639b8ff2de96e4a1b36ec939d7d3f608995ce6d7ddd1097dfcdd0e504764eede62fa33f9e53b2589f92dddb81f58aa021d02198980d5 SHA512 fdf9d1e5f7066fcbbe80a6035e92d48fbc8b81453d941611f54b35b70cf8dcaaa77e7be5b324c81defa98d9d3b0b8091439db9f01fc4e24b9360ba3139a7cac3
 EBUILD binutils-libs-2.33.1-r1.ebuild 3562 BLAKE2B ee2e68e19fec0661f8e64d98837571a1eef1b23c43d936554bc86ee64bd34aef2709b13986cc25c2eda3fabab24f38d0d88695f82d780dca10476a17884c7920 SHA512 f5d6758d1478306d03b4b2b3a85d823b6c1ed212c0836f911b8a9a6862459357ef891a64cdd2447b3e3be90984f518c80ea46ac8fa9a29e55827f329086a0833
 EBUILD binutils-libs-2.33.1.ebuild 3565 BLAKE2B a21ad6b0ee10f11cb18c20201b96dff49f7ac7f59e4fef4dd3e42d50393a16fc2ba981ec48784d5522da00db24af3f37544ea05c796ee00adeb88bc0e66c90f1 SHA512 209fd420f25471252989896e1b715bf7876a72019354e379d82ba32a157a4e9f98e1a835984292ec8a2e0ff476a8121de5e9d4a83ff403b773a05f8a29ed9f20
+EBUILD binutils-libs-2.34.ebuild 3684 BLAKE2B ede17bb101a2d72f8a79cb0821e0a2ab304c917ae4828b7a9ad3bea6aaaed9b8c610bb26cefe8498256dfcecd3ab28f2d1e6b79228e9ed057ffd00e2a8f8bb90 SHA512 f0d1c31700a04d58f157d480d1a73971aa870e462d1b2523733fc423ab78822aff5e93ceab0a33f25db7d0f0467f490b4913cd81f6a0c77d40e45cbd5a393dae
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
index cdfb8cbc6410..b481d6d892d4 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34.ebuild
new file mode 100644
index 000000000000..8cd6943af76b
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.34.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=1
+PATCH_DEV=slyfox
+
+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 multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${COMMON_DEPEND}
+	>=sys-devel/binutils-config-5
+	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		# Use upstream patch to enable development mode
+		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
+
+		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)
+	)
+
+	# 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 )
+
+	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/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 9ceff1a6c01e..285690e32d48 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,10 +4,12 @@ DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
+EBUILD compiler-rt-sanitizers-10.0.0_rc1.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
 EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5483 BLAKE2B d7feface9713919185a9d167fb34a4bb4ab97c63227e7ce280df81fb1d3382a18f6e29983276a9bab0f23fdb1437a528d974eaf7174f370cd61ed2f772b29b4f SHA512 1e540c5c7b555d6782098dc6e43e195b2e151b6075831b53848b10664f0a855d9d903b3f07bc9c815668964ab64566652cc2c7e39b1a614bb31f71cbf8cdc842
 EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5281 BLAKE2B 7041973d68007ccc56115a9748e901dc07b9228a8c513c30c234fd98253fb04072fc19faff4bcbb544dea7ac5aa2b17c7ce545083949ab6d54020c9dfa02bfa7 SHA512 19f5be642bc47a77beca5241f95b58c8b11fb580dee1db829eadbda00542d56a7b17cccc300b1eb7ebde2ec419f38e677d9800de00067e66df98f7cfdd2d47cd
-EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4855 BLAKE2B c268b6aa078c97afde3f4019b7eeabde19550fb504daac767ce326448916e13ab9136de2fbf071232e0cb153e4d3ef2baf966cff4edc7cdaaaa965698b0f42d2 SHA512 8ef02256aff4d273f8b5751592d6463e488d1facd7afaec2a01436c6ca57343079b3dd352d0d9c7ad93371d271de4384e46f4e2068c4135b57874e22a4a496c9
+EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4854 BLAKE2B f8e09ea26b0a232612d85487b8f451c52a9c4b649964850ad56721f5ebcb90503a0b806347108cf7b7c94176ac339eee0089f42961875fd9fc35c9e2155d8200 SHA512 edb3eec7dea4cd3fa0a44070b3e03a7bafec09bb9e011c33a347b2f619e7f0b6e649c1b15c860f448facb088913ddd793c46a705acd4c411f64f91ad2f54bc61
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..72ee582f5c26
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
+	multiprocessing python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	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}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+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() {
+	cmake-utils_src_prepare
+
+	if use test; then
+		# remove tests that are (still) broken by new glibc
+		# https://bugs.llvm.org/show_bug.cgi?id=36065
+		if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
+			rm test/lsan/TestCases/Linux/fork_and_leak.cpp || die
+		fi
+	fi
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+			# 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+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake-utils_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-utils_src_make check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
index 571d0c8a5b80..6923b7faedde 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 1ab2d90bfab5..89bb8db6dfbd 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,9 +1,11 @@
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.9999.ebuild 2843 BLAKE2B ce9cf6dfdcd08882526e0d5b9b84e00e4e6b7a4d1510f93be4696e79c1cc617ad610d8e7571f816c0443d5864ba983db7323b9860b9b4dc5e3eb85e14e781cbb SHA512 f96067ed94567f092edaea97d7bc3c5f0071e65bfcd529c434e86230e790ee47973d5503f898b233f4f9ee661e184c2665a3cf0688355de1ad5c1c7dd8bea831
-EBUILD compiler-rt-11.0.0.9999.ebuild 2843 BLAKE2B ce9cf6dfdcd08882526e0d5b9b84e00e4e6b7a4d1510f93be4696e79c1cc617ad610d8e7571f816c0443d5864ba983db7323b9860b9b4dc5e3eb85e14e781cbb SHA512 f96067ed94567f092edaea97d7bc3c5f0071e65bfcd529c434e86230e790ee47973d5503f898b233f4f9ee661e184c2665a3cf0688355de1ad5c1c7dd8bea831
-EBUILD compiler-rt-7.1.0.ebuild 2995 BLAKE2B 6dadabb0e600a0490dd409eb07a618fa2eaddafa4adb815247cc0e0cbe2bf1fade0236edaac2a7bae62bcfcc6114b62055ace58ef85d2c077bb547c7da906d86 SHA512 0320889d2965f435dd84565da30a3f2628cf98f84c31a2323e628aff351ba3361427ec6b63d1dd0eb7063ee9ed0bc0ccaebbd2b1372f9fdeb0ab998f71e71918
-EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B f3c7a9dcca8b2858718999a35f1d36929935647ab35e9101de27343e56ae6c2cf5601aca85efd555956316c89c8d66e4a4c61c878c7ac6c3048c758be5ceb405 SHA512 37f75965dff847a4670022a8cc8a22724169b2b2529b88ac1d8862af80a25a8bf426c779623c02bfe7dbd8ac151fcb184bd37d6ad78816521d6f9025feecc872
-EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 13721d25f8927c7936d5dcdd501c166694868c1db3770fb6b0a06226a367df5257a607fb61e0725aac52a9ace16380b2096b57bddcbd01807253db41167eb45e SHA512 74b3348cce05d87fdcf7cfd07691e00c03c112e84173d3e1a474ddb84fd78c6e587afa93c7ae6f6dcf52eaed41105a682c1c0e361e37eb15b3e9d58d96cd3d8c
+EBUILD compiler-rt-10.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-10.0.0_rc1.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-11.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-7.1.0.ebuild 2995 BLAKE2B 59d478fc487ca1293bd34d719b119d2a4a89a5d623e4b0d0e487c4c7df31bc096dc9ff072b3b5eed94807c3f88d8b2d84daa464a556ba27714efbca22b098207 SHA512 7d5207c13be7861eb07872de640b8bbc5e2a2a732f0a541dc78b92cc0e048b555b2a3378294366b317032afb4f7b3e67cf8da44518cab6d554c49a6d217287e4
+EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
+EBUILD compiler-rt-9.0.1.ebuild 2923 BLAKE2B f987a6708cf56b8f13b331d9e82e958a6e6c18c597d0bb921641fa45d383223a5fee6989b7af1a57ec5621aa9d0298bb44cdc300d96a28a03562f92c3eaf86e8 SHA512 6fabe2784e7c0cee3073f3b38617ed69e9a8b0fb4f0320619837fcc0733a2e01749c6af97ba010c3ba6e51408961269b397b260f3ecd9f413fe429a0e34466e1
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
index 7a7778ae76b9..fb90bbaab7cf 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	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[*]}"
-		strip-unsupported-flags
 	elif ! test_compiler; then
 		if test_compiler "${nolib_flags[@]}"; then
 			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..fb90bbaab7cf
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+	python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
+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="
+	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}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+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() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+			-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-utils_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index 7a7778ae76b9..fb90bbaab7cf 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	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[*]}"
-		strip-unsupported-flags
 	elif ! test_compiler; then
 		if test_compiler "${nolib_flags[@]}"; then
 			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
index 8339d3420ba3..1962c02d2f22 100644
--- a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
@@ -66,9 +66,9 @@ src_configure() {
 	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[*]}"
-		strip-unsupported-flags
 	elif ! test_compiler; then
 		if test_compiler "${nolib_flags[@]}"; then
 			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
index 5049bf3761b8..403e394f7446 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -67,9 +67,9 @@ src_configure() {
 	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[*]}"
-		strip-unsupported-flags
 	elif ! test_compiler; then
 		if test_compiler "${nolib_flags[@]}"; then
 			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
index f93feb036d6c..f5ce47c037e8 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	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[*]}"
-		strip-unsupported-flags
 	elif ! test_compiler; then
 		if test_compiler "${nolib_flags[@]}"; then
 			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index b03fb0b74614..096e0cf227fb 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -2,6 +2,6 @@ AUX cracklib-2.9.6-CVE-2016-6318.patch 3288 BLAKE2B ed213c5d5228ded6ceed088bed2b
 AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f0200e8b3e35c376f176c137c8ab9a75e4364e4fd285ac85d1b2e59327eb34bb21f29e0b638199cf4f9c9603b8e747d52e62978fd392b13ce89d SHA512 e4a2f9f467d3f0ce8acd4c9ea6ca19787dca6bd2bfaa80ddbf9ec1214a5e2b519c088b07760349adac9bd6805a4b512c015181863d679643cc12c68104c29a6d
 DIST cracklib-2.9.6.tar.gz 642402 BLAKE2B 4d7a0d12d1e7101c82d03f76e073407481078747c283fe3251f947542017fff03fbc5e98505c6a7a8987a2bbcea99dab558c15b1eb8fd16755859ce5a4440ed2 SHA512 2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786
 DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
-EBUILD cracklib-2.9.6-r2.ebuild 2805 BLAKE2B 8366ed419ed46c8f0eb99cd90bc78865ff98949a600c992fedef9149329e31761d8e6d0873c84dcbf7c265f75799bd23a16a887aa1f2ccacd65a7b397873a663 SHA512 059a85d8f5549fb2334e439e25256c7ec8ece66bf3d6c703b3062396082672d7d3bcd7d32dfe8b23e72242f33a222179db7a2a79f6f095247967e5c77c47720a
-EBUILD cracklib-2.9.7.ebuild 2533 BLAKE2B 4f6354f8c940ac4d5a36ad3b2dc7d1ed0ea09fc7c9527ed651d5cdcb81f22356bfc93db08444736fba36eacf31a75bfb9d7e5e875fd12c16be212c6f2eee0e72 SHA512 846d886f6c53de3dfbe3a19e6eef21648f0da57da288b947170b4ad6c3b9ced3aadeec321ec53388a926ad4172920420490fb2fe12b76f155a24021fed4bb69f
+EBUILD cracklib-2.9.6-r2.ebuild 2806 BLAKE2B 92215ea8356252bd5db08b7a8fa8c1a1cdb371a75179a0c9584d7f5234e15d74e7160edb26bcb48e23a6cdee80882f4f9a78fcb9d88b1b416d560dfba7b8cb6f SHA512 743966c9b9c6e98038423a89d0a9ffba7f693a4e11efac724a5c542874b177ae2cbc59a9556e249962c76e4c94750916f4f5d5968f35bc1f7ab3cff743fe50e8
+EBUILD cracklib-2.9.7.ebuild 2534 BLAKE2B fe4c19a88b3d6b31519ad4665b7968d8d80e8ec4117616c79b5538e58ca530b96d1d016c9c692438fd5183c087b4b4deb9ccb954ecd90d8b98eb2ea6a2faf834 SHA512 40533b61b449b11f7d8523acaeda8b7b7d309ec59993da1fcf8d09222fa8dcd2d3b1d8147a0a2f0107016823adcf758925ee10b39a69525ed32527888c35570e
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
index 9307ba147f67..67b01c26b8d7 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 0844aa3bb62e..32d12db7d665 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 27ace9ca6001..b24498aa67f7 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -61,18 +61,18 @@ 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 1486c5fda2f806ae456ce0291ae9b356be90e27282dbc0ca801567d7bce1e7d468acd6bfb40cb944fd319c4d55ce3367a7100fa25ae3f26d185482602ddc1a40 SHA512 120786a3a06cb8c59e24fce7bb4c4f1660f19bfd972b84d59e4afa4ff0e261ea8432b3414ef2a7176d04df6c726d0b0f191bf3921c0d3e48e4150c5fdae9d2aa
+EBUILD db-1.85-r4.ebuild 1307 BLAKE2B 98fdc06e479698eb32ddf529a0c03bdd03d3c7389b084c7bdbb2209b66775dee9838adb65680c4f0e39696748569dd090386a94d5b97862a7933ff9fb89e84c9 SHA512 13c2ca404e9f62b8205741ef51ff99de83e66b2e81fb2428ab6aa877d5788b36ccf0adc2f0a1ff4ef5ccfb06f2af488fd2e9bf04baccbf14607e44ee3de3b1bb
 EBUILD db-18.1.32.ebuild 6944 BLAKE2B d0966b541e93b454809eca92f092b84e9dfeea3cb2414bac6b20c767f5339f65c5c756680989c14d3b435394125024d8f99f7ba6bc2d0c696d8f9bb76bc2a6e7 SHA512 b123767db77cc67fd02a99c146249cfb311fa0d1f883563abef464eab75d307dd2867dcb18b8707e9a2dddd39a87404f27465fcfe63c046fe4a9aeb479134fc6
-EBUILD db-3.2.9_p2-r1.ebuild 4898 BLAKE2B 9bc27e772d9e01dc86e45510dd564f77ecc3221517ca1ed9363aa1cd6ef719191f5dd8ef13b9b34956e5b0de9b1c42dc68c755b6fb3128fefd7be72c1e580b10 SHA512 9be7f38b93fc4fa6e8b172b2ad7fb37f018e7e06fcdf1f9c6614c4bc9f986e198cd2cc6db0de865665fb55f63d600f42f800aa1a551b459819e4ec5be7135f7b
-EBUILD db-4.2.52_p5-r2.ebuild 4636 BLAKE2B 630d229bbcec68d85f0c874c150b632c441dd5cb9bc16fe1b0a5d08fb3ea4b018010520070f1278d1ee71876a8ed7e3a843aa9d1588d37f586f533787d6baa6e SHA512 a2daa7406c6b974c9d10c71386b3c6eba81e2283964915f589c060bd073ce7408354965b417947d95f8d5564c24d421c5637bae59ab596d3106f0cd942a1915a
-EBUILD db-4.3.29_p1-r2.ebuild 4546 BLAKE2B fbfa335acab145679b4d8cc496de0b20900407052e8a11863cfc30327c5d10e4065f4271662ba755f075c34528dc3f53757c06bb2850702daa71817ea1abe25b SHA512 65912e51a8ac13aa88d27d3ac3e797912432ba2614c7427af02fbc65f3a38589c517500dc096b68473f705a0053aa7031818ac66cf51683b968f868dbd87c290
+EBUILD db-3.2.9_p2-r1.ebuild 4899 BLAKE2B f5a3e75afccaa9160bc2deffef2507ab8f5c73f5edc5832f26acfea9b25cac143a76563d5237d1499629dba886e684e8f07fa0809dea3ab629d433bd3e833bc7 SHA512 c06cb177975c6f9078c46afb6315a971b7556075bcbbc28d9cb089dee556cfa3429034cf5cf9be822d7e176496e24aae8b77aa9c8d28f712513054c1ccae0921
+EBUILD db-4.2.52_p5-r2.ebuild 4637 BLAKE2B fa648bcff62a0dd2bb30887dda896d89c7b2870b9cc7563a5049c54f7e018436769103cebf298fca71bee09923963350473e02c06e50bd250cf88a3f73720949 SHA512 88d4c64ec3d5b4e35d2b27697e2cd9b1c5eaa030acc327631b760bed3e4d222b36a630567fef3d1ba056da31207afdbe2f39096227f8b307c63e1b9d5b147c11
+EBUILD db-4.3.29_p1-r2.ebuild 4547 BLAKE2B 5e3215801aeca7fca8ad83f639a194c511406ed4f2544738da533671a6c31e67ad9f7515d4dd6a297b5b90f7231fa568c42b970069804930ebe2adfde65476e4 SHA512 c58752c823dbdba8e6c0dbfff7d7d42a9376d214b1800cb3188a7e69e84966002b807c7f17f213a0c5eac8b9515e33ea1a48f398836fbe99c6788da2909bc906
 EBUILD db-4.4.20_p4-r2.ebuild 4439 BLAKE2B ea7c61757bd534a41c0b1702dcbb198ba81b8c89b5066c23d5a4a89a946a05d3d2bc6389a00d7bd8902334f5d4acc48ae07487ed49d357fb7848c0fc7a2eead8 SHA512 42d912533b4f611c70f7941e24760fbb603dad6634fe037cd9c2767d98549cfe6843e613e0e445f5c413ec4d6a4cc8ac7db0d490b1a059867414503f38557cef
-EBUILD db-4.5.20_p2-r2.ebuild 4674 BLAKE2B 08da47a505ef950a50084d48752af4882b73b91b542b8786be4c8a77c571fd22ac217e8d9baa145785c77cf0b1d6de5676b327dd5e4f863b35e75254a5345a56 SHA512 177ae0adc22a3b99ef45b8fba770bf7ca64ff328ccc4c532b376674a7b30dcd34ce54625507a5f429b47caf7bacbab78a44008761cd913f059b44e90823d439f
-EBUILD db-4.6.21_p4-r1.ebuild 4396 BLAKE2B 9f4ea4e63bc4f00361ecabe2294c30bc2a1f0d944139ef109e624134a48fd6dc988d2a50f76ae3908ae50c87a2fafda962329968a75048342f0ca6ccd1f6a9c5 SHA512 3503bf925fd7c4a746a9ebb3c2c5c2ae0173aa468e1fecb45cea77d67d5149b83471a6057f889311071643d4c27499be5fd68abd1b8624c195773b0dbd43657d
-EBUILD db-4.7.25_p4-r1.ebuild 4722 BLAKE2B 481048e5bff155bd38ed9f332979ea85242af57a97b65b6eadb8d8d69dfd6ce9579727a11a8fc5f89f7f69200acdbaf947e3e98717a00f0dbe3471ba6b29ec39 SHA512 0998d13f3594daa5258ba2b5e5d07d0034574625f9dcd2abc74919d07e09bdbcbdbcb4b58db22b1fb7afaeaf1fd6d1f8392b9e601716773e8526548106b11093
-EBUILD db-4.8.30-r3.ebuild 5205 BLAKE2B ce19afaec900cc61fb9bb8f97ed115f22c9e3380f2ecc7843fce392329ed78b8327ea816a7496d47ed3f4c1f4017efa3b353d94f78ad64ef5a2a2e1e0f8bfdd4 SHA512 2e1854df2993d9228d423ab6569b51dfd689f447125902e1020445acb3be728d4af3368969718186dbdd34abd7791c5d2c5d09d339a77e844b5b538db06ab55a
+EBUILD db-4.5.20_p2-r2.ebuild 4675 BLAKE2B d9b1c116c33a296190bb72b7f2b74b3c809043832c98682358c26d007d998136d3ce8ec87578c9feb631db824fe5562382ff6250d3338e93866c6cbfe3481e19 SHA512 0c2414f39aa71660bec6ed6009b573d63a744036494d976999e2c34acf10d6735c64465fb76b34436c367c1455ae9d33627d2b5dfd9bded0b44fe9d51687c1cd
+EBUILD db-4.6.21_p4-r1.ebuild 4397 BLAKE2B 37e942be47d668e7b61fd99343bda6ae224eccc63c7ceb985b5592d3663d916e540e80e2e5901dd5e06bdd3a9477142c3509f22fb3044b3f005a386c3c006976 SHA512 9f6fc29765c93560b14d2f2afc3f9013e04b797a19a4155ca22e9881e26a8d7fef4283d26788c82b90c2ef4c36ce6a568a327682f1da318b3d6961a38337affa
+EBUILD db-4.7.25_p4-r1.ebuild 4723 BLAKE2B fa58bc738812afed719e7b63e5dcc9c2522f00f5e8774c8e14ae9bd18e01bed80cda5bb9d769e8c0683911168fea07a545b814bd8196d9408769eac4e585de5d SHA512 495be4e17053bbfbf71701a41685b3591bffd3b5af154f82b916ec9f6ce12bba00973bc4de6a421b6405deeed04d8513448c517462b2a39e934ef3561ce05481
+EBUILD db-4.8.30-r3.ebuild 5206 BLAKE2B c6927ef454930596345ddffdee31f774c9de52c96ecb109af7fc54dd04c6fec099d9a4deb3287379ae2bb660c5615ddba4986e62f343bf407acfd0f8f68e538b SHA512 6a834b9c77d6a7be4afe7dec074dc33596f7366f3a2e3b8b5617f4557d166c76b60d0893cb0ad252ebd8b18da1e2dd6266d8f068d01b2459932b185a0d5af388
 EBUILD db-5.1.29-r2.ebuild 5856 BLAKE2B 21b51a72428a7523df6c0688f0082d825016ed270684c0a066733304a9857a21bb933078b45b2263ce728b68e6c9c2ace1697d58111be77162ba62cade3ed2c9 SHA512 de70e02208eac3c925e0cdf1ca72d8eb338787643a3583e6ce63dccbca8d83710494cfa8e20f2b104f0c6bbd519ac15ec3280fa3f432627e0eaae8b3d7c272bf
-EBUILD db-5.3.28-r2.ebuild 7136 BLAKE2B 03d87bc6fdfac302fd281e05354d739fd5d1d5bf5a010274a7840ecb50305782668713fc60e7353190131be004adfd8364946d0f16ab0b9159435f678f04d6bf SHA512 7821923642541e718acce6a5b74826faceeedf5849e1bec47314252b132e851f4a46dc567f340be3a5631e4bca11f175f551bfbf6bdfdf129c4560d6a2829292
+EBUILD db-5.3.28-r2.ebuild 7137 BLAKE2B f491cf1a089a134c8eeaf3d9acaf57d1ab8a7991992605aa6ad418d88472b3e95ab661d336b63078432ae4a7ef1bc8e73faa17a1b5907488c16f04ccfc1cd4ad SHA512 325ced1cf397a6fda52323541e808dbf540da21789e328c5b88346378e69ef96aebe9c6e3268f7fb0d49170bdf27f10a839fb350ad6893612f136a1815b54c53
 EBUILD db-5.3.28-r4.ebuild 7142 BLAKE2B c8d9a8441051754c85174cca506c752f14c8d2b331d25231ae969181fcbefb63bbbbaf215ca348a8e0531e641351bf9b26eb0a61edd54641ab7fdf345c485d43 SHA512 ce16c3a580082df7a9aa1497b47a6fa3124df7fd100626f359824afa0d67b92adca05a0a6dadabbca54498c3408215af2e2832a0f76b25f1817bcc5d2915f513
 EBUILD db-6.0.35-r2.ebuild 7137 BLAKE2B 1dd77dd052e145d829449135c3c53498e112643737949ad7f2d575c135901df0c84c64e537f6a5f04237c32ea4f3e28bce70b71effad2eb1b231db859a5ddb0b SHA512 86088bfe60d3ab9b05e930a486352eb41ef57b51f8a76784c75c3b9cf38732484a576f1cc9fdab8f3240e445327b5a4185c58e58765ccd125710f85b81fcea8b
 EBUILD db-6.1.38.ebuild 6908 BLAKE2B 836b5c1b5cdc670e99fadcc7d1ce491f468d8ad82d93046323754ef41fd21ca9014a7e36fa46fcf4ea62625c26b2bbe781a8000ce68995ece393459a6c0a4e5d SHA512 c7e1d9c525bedc9062c29de090f06fca1c5d60b1eaa141ca3bcd6704060b27bc913da0b2acb76e74a995765422de9394a2abd1ce38ef8ef9f2fe1a991c91372d
diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r4.ebuild
index 055296208c6a..1dd8ec178407 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r4.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 7a7212b3fb4d..faee5ea89388 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.2.52_p5-r2.ebuild b/sys-libs/db/db-4.2.52_p5-r2.ebuild
index a612717f5682..036d93f3a307 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild b/sys-libs/db/db-4.3.29_p1-r2.ebuild
index 0f5a92f4d33e..918a9d049741 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.5.20_p2-r2.ebuild b/sys-libs/db/db-4.5.20_p2-r2.ebuild
index b0224a1b6b35..8aff40d22f4c 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.6.21_p4-r1.ebuild b/sys-libs/db/db-4.6.21_p4-r1.ebuild
index ac6d71e9f2f7..318109c6f71c 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="tcl java doc cxx rpc"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-4.7.25_p4-r1.ebuild b/sys-libs/db/db-4.7.25_p4-r1.ebuild
index 58f152d09e46..77493e0b6ce7 100644
--- a/sys-libs/db/db-4.7.25_p4-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r1.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="doc java cxx tcl test rpc"
 
 # 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 2ab7720ed8e0..f1cb91fd2cec 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 65935b031707..976a5b239e39 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="5.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh 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 cedb21b18582..1dcea3e6de6e 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,6 +1,6 @@
 AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
-EBUILD e2fsprogs-libs-1.45.4.ebuild 2218 BLAKE2B 69299aeb12ba130f124645c42388521ed964de35272d20a08aa93345e38d0e6199c8c7372f0836837b449943e0503c9537a7d5a7b373c6519263661ac6864209 SHA512 7bb676f6f42c3a4cb2a9e0f5401d29742cec6bca14eb161788f3824e914db6bd6d5a9ba446a1523e5dfb5aa51448de1bf119bf89b992063f1994e1155ddba846
+EBUILD e2fsprogs-libs-1.45.4.ebuild 2219 BLAKE2B e6b987715fa3e076c5aa532896f85094450770855f481c5dfc61a965d281b72cbfe4dad4e027749b0541f493d142389b8420d97f9eb4a30d5c267db013775cb9 SHA512 e8d49934ebfce4533167de2f02fbbf2829b3446ee6e4f7a7fa9855a89bf77430deca0e1470fbc8c2b6881c65467c522fddd6f12d0c7fb0ac8b7da94530bf90c8
 EBUILD e2fsprogs-libs-1.45.5.ebuild 2231 BLAKE2B 316854e2292d4e44226474c871cdc82a0fbea593cd50100c0e50aed4ff138cb0ab7deda304c5b7261c0262a141162c8c5e5eedaa342b630888d4da4f7e78e4cf SHA512 28c1fe8f47384862d1c334b8f0c16aa7b93bba1a336e635cf78ecafc3f9a5cd52df92c07db92572a060a77717b2c2c09c6983b8c86ad645b08bec7f9645608b1
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index 24859270ad92..ec60d6a6012e 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/fts-standalone/Manifest b/sys-libs/fts-standalone/Manifest
index fb25e3cf4ac2..3d41bf683913 100644
--- a/sys-libs/fts-standalone/Manifest
+++ b/sys-libs/fts-standalone/Manifest
@@ -1,5 +1,5 @@
 DIST fts-0.2.tar.gz 339498 BLAKE2B 3800196fd67d03c5e732dec1cf6aeee85d417720c3e89f650f2c7238f60d57e4e51a69eb11dc67fdb8ca19093726d0f3f8b48e60c20ceb08b9173767ab895586 SHA512 4f31182f4ebce7f663db893def0e2380b87ef1a262a021837fc6fc9965803a829217142df140c67b1cd83b292eb8862fa0a470cf795a312494674e6e94f02f79
 DIST fts-standalone-1.2.7.tar.gz 19336 BLAKE2B 045cfc32dffd18b58093dfe578a029ca15083eec98812ea2849acf37fd2c8e7272840b15b4966201421624d96ba69208a36b58d5420cef2563c107cfae98ea93 SHA512 949f73b9406b06bd8712c721b4ec89afcb37d4eaef5666cccf3712242d3a57fc0acf3ca994934e0f57c1e92f40521a9370132a21eb6d1957415a83c76bf20feb
-EBUILD fts-standalone-0.2-r1.ebuild 525 BLAKE2B 69878ba35048a77fc19dd2d93877d6d4bd35175b0953a8e77ebaf8a4dae9ce0996db1310ba3ca1ac086e3f02176de2b26391d14ea1e0f8419d2a9284c7d31c51 SHA512 063e7e8c5505871d0340145f31197227d0aa724d1ffb55fbe4b5637e56673bf749406528164c82196094c5d91065658ad431406eca54bc6d3d1bf76d260c0f98
-EBUILD fts-standalone-1.2.7.ebuild 733 BLAKE2B 0e25d81a35be9b79a20cb8dd0d92e14c3f50b3e1842c5078145d1790a9870d9b7c090f2a6eaea56e3e57934607a9821e080e1e184dc1e8750eb77a2dae0c0c5c SHA512 aa4c439bcca0e4376869fc53182a0420abc788c8fe5946957fafb3e5bb283520153d648c3a532bef245ae25c61dbf77d7057d23ae7e36bc9476ea9d8a016725a
+EBUILD fts-standalone-0.2-r1.ebuild 529 BLAKE2B 827b54285e26354155bc0ddb7baea086642d192a5245c039f344b4004d98c32204c3688bf4f3a2e6c74ef5952200cb1bc246e84b7582812c4699399cb5b943f2 SHA512 8054bb5de4170dc8890b058713dd5ca56266e629c8a2e4e83fa17bbb572fa54eabc3050cbd32ebdf293bcb7de99d0e2ff6b9f935a3c5d0138de4ceed3f021917
+EBUILD fts-standalone-1.2.7.ebuild 739 BLAKE2B d5c775ccb42a8a803389897ca19ccc474dedb017cf7af17a4fa0fe94627b30a10bf4ba560f9217b58b0d342eb10130521b07aeb67a0d40ca9424444a756516de SHA512 1546100a8a6b394685188dd00100feeff9550777304cb32442fa6a6518061a6f486e1bef3d977ea7d97b9ec4d0dacfa06441d48d2f8658758693fbfb11f4ba62
 MISC metadata.xml 334 BLAKE2B b0cf07fe22c503cef4450546f0825c6e72df4e7b6fb85de9bc7d6e206e96efbb0f2d50391aa1fc3d5ffb6376aa290481253ca2ff8762bc1686b6057df9401d76 SHA512 f42362781a8bd718ddb3cc00aba96d8f7c5104a3dd0722cb189e827d2c0f7e78cec8d7dffbf3cf9ee82b5fba00330427486ae48247e3a2b3c0308e68d45702ab
diff --git a/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild b/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
index 8226697e49c2..ed2a00b5d132 100644
--- a/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
+++ b/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~blueness/fts-standalone/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild b/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
index 8ac75e5880ac..d816d53c4048 100644
--- a/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
+++ b/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pullmoll/musl-fts/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 9fd75fe7af67..b1ef96bf53ce 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -7,7 +7,7 @@ DIST gdbm-1.17.tar.gz 938173 BLAKE2B bef5d449b250af139e5c660ba700694bac28af3e7f2
 DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.18.tar.gz 939352 BLAKE2B c4b84abc6bda852c486634cf03668f189f57debe4034244c51e738f1ff791469e7b1cb6514ae03514f5288b550a436dccaaee79b9de5594a5b307d84be2ad88d SHA512 57c7e5dc52464e97ad955e28d49fdb3557d8e3bdf280f7d3cee69539e4878f055db17cb9dd591f82fadb8fa5041a5a56d8a571d34f6e115470a3a82537f872a8
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
-EBUILD gdbm-1.13-r2.ebuild 1847 BLAKE2B 93d6849394f9da0af3e45d421198ced5bc16d82f963f196c21a39164910b20b79c56e903b5104f8e1b6358691519a2aa09fb74126b2bcf3b16e704896f142606 SHA512 be21cedd6dc355503b6fa41c3faea036af31e7c6cc5515a79eaee23805c2c034f7dbf0c37944a7b7c63ff65d88d865a5c197132440b1b5364ef4ac31447dcb1c
+EBUILD gdbm-1.13-r2.ebuild 1848 BLAKE2B a273e7c25f8eef749602b831ce6a501170b24bdf50ef79bf61502c46a54aee725eaba558c14153388e0e0f043f19098dac2094adca9c906ce59e61043104be83 SHA512 a32fae85dae1b5133fcab3bb77cf09c5f55e99586c5225951b808a6c234a0fd544543dae0d3b458716787b9d25f3d2ee4e203d27406c91871aaf6d71c5c0c71c
 EBUILD gdbm-1.14.1.ebuild 1769 BLAKE2B 3caa98c88d1ffc4f229cb6ab4eeffde2db20f5893035bdf7fdcba64a032740ebb838098e9805aec784f983666312df3112ea4e7bdd70d9fdd6ee59477dbff659 SHA512 e5ea573946cf5038bc0588d2a30ece6adefe3f980823d784e31d0a5e0362a556a6c67d4ce772ba22c467a3d2201a221528c914429f26bbddf8c5b0cdf461b5f3
 EBUILD gdbm-1.17.ebuild 1365 BLAKE2B 0fc50ea6f4f93feadef093fc3c9e0a90e3c884b3f6e42c7241822bd3758e0b17376f070e04f2e8ffc42652aaa34de50e8b85b41ec2f4c7c8d71fb6f61e216497 SHA512 beb214cc57561af36420d58e2ae138d371cb3dad574af64dada58c689b659a283d9863c79ebc94ab537e4c30bc2057360335c4d576cfb22e5dfc4a51b1866214
 EBUILD gdbm-1.18.1.ebuild 1313 BLAKE2B 91c8af4949aab3752e837843d47ba59046399ce0f4ce543ecd65ef4f2573627048ce18c0ab86b788e7c01dcb4731ae475a2be2072faa3ff560d96504caf30b12 SHA512 187891382309a023acf08b68b759d60348d351ced29e857e077e98be2900a2d9978b449800345b7024fd105256f4df9ddc0a1134864215446713671446c119ae
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index 521dc60f2f46..5db1e60b308c 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/1.13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 847785c551f2..703874511343 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -24,16 +24,19 @@ DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc
 DIST glibc-2.30-patches-3.tar.xz 20412 BLAKE2B 8cd588284bf07985262a0289d8cbae03b0a75c48110fed6152c0431dc4f729a9695df910b1521a6072e9736b26145bf372d5b60163f64f4556f17f2f9f223e11 SHA512 0da9107518117a1cf901d282f2b84a2f4780130ab9eb7025ffd8b7e629aa6fd5f05b293dd49fc3c300bc2e74e7f81fc1f8a7cb12428b2be086a160d429715758
 DIST glibc-2.30-patches-4.tar.xz 32428 BLAKE2B 7bdcf6f64b22d19b1ef79f466ed0c6e7a289900fbde46eec2a0f4c5458f2088928c1c3f7534eb9794659598d39d2bca21e0922d0cd0f8a459e744abe9197807c SHA512 a80c3a304bcb1acf3a71e5f55782c8aed09747139d6f554bd81b66cef77fcdf33fb943a30cc29e0b9f34cc3d005b08f11f74365b3f9ab32754ce63cbc530ad46
 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
+DIST glibc-2.31-patches-1.tar.xz 17796 BLAKE2B ba843ec675b094de63e0d8e76f8583f5a930cc355825aafd013aa650b57c766051ffb1825da8bf46290cb797cf4a7ca1d553e8f8ad3c5518bf499bedd98f1414 SHA512 cdf1238391c2e7973b0d82e37672b49205a273c5d2b1df2b47aba710f7cc5fbebf4fe76af5dd219327e22de62e1ff1c7c36092952a5a80ed6276f869e40dc718
+DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
 DIST glibc-9999-patches-15.tar.xz 17792 BLAKE2B fe351b7c71418a4707c96fbc6832f831947515bb2ce01fcfa9a9ea410f543a50b8c013e26f10587b283acbab4e988272e8db770112b2961b11c89b20b4a408f7 SHA512 37db45d1d04ad1130319a58d04774a2ada0f026bacd444625782b4dcf5a98a7019a17e132dd1e497968f43fde2c974bbe09a41e164831769a9e95bc8e2117103
-EBUILD glibc-2.19-r2.ebuild 38418 BLAKE2B d39c9e77cb0065a9ece754ada6ea0e71d400078abb0c5e03a95aba49d6c7c62d3346166dae97bb9e5052527f7422c3e5c1800e84c559381ea74f37352813fae6 SHA512 f5e1c1e0f2dd126ee8733ddee6df933e534d79c72471e044ca84afe2fd86e950d91ac96b831a9f75726ca9bdbbf558633c0b82289f30e6e32e180da97abfbe4a
+EBUILD glibc-2.19-r2.ebuild 38287 BLAKE2B 6537e90257900cfb0abd28c3391fb530fa24ce74cdcf870ce340f8ee605b941550329120b1598266ed9ace251f5d12980a20d0297c04fdff633ab92baed66ed4 SHA512 7082dfd299db188b9fad3a3807e723d7b274520cb579b8681030b10d8807520ccbc960ac47d03ad7c6788add345caaeae894e2f2bce2bc1394e564540707c488
 EBUILD glibc-2.24-r4.ebuild 6059 BLAKE2B 1a60188d7c70d8506b0b53d90cf02b102456cef7e5bdac4aa87497f8785301351e632c9875757339b69bd4f66ef48bcccb7d53060b75935e3d2ae90ea0b6c1e0 SHA512 2620d81a38cb61dbbf011750e4bc7db1226c532a10fb794261f20d0c631ad67229f3ddcc5ded9d590e40fd62273a311317c4eec7a265a5c7e6baae8cafbd58c7
-EBUILD glibc-2.25-r11.ebuild 6045 BLAKE2B 6d867cb24295b8cc104ba62cea22b078f1c8186fb891b4a6230c0b3e79c799805b36292e1561daeb1151926bfa5913b620a2480b0139df3c4ee9f7fff6b3c4d4 SHA512 542637308d559fc0938a9aac3406f2b2b32d0f4361974c842fce5e7f869ccc9e966015fddfa9042c113a0ec16e4867a80b4482bc787800a1ab7eb0b9ed7e48c1
-EBUILD glibc-2.26-r7.ebuild 26559 BLAKE2B deab1b5f7db522d7fb0aa6c856603c7bc009a1a1bd3590d66185ceeb58f4fda7664353e0bd3de71b6996295852c829c8170a3c88da5ab9a265cc467c2a077ad2 SHA512 b869ef88b921389b75e0576b52ea75f45a1732a88cfb2169d872b27da20ecbe8a1f9acd2a6dff36972fb48350c6919e46ed6c8e5f32c7aac341860b906282f09
-EBUILD glibc-2.27-r6.ebuild 41926 BLAKE2B 404d2f1d8343de67e6bcae7244ec4fa66f9ee4b8853f952c35a41707af4d93f45c5701e69936a300d444d09e6ccd06523bcd41d29bdd7160e52928009d73f9ee SHA512 eb3a404e99ec783b10b8959dfe032fafeb92de0deb80635f8a7f421cd2654a08189a6a3e73e92a73afbe9d8c179cd17bbcba634fee4200e616c6da644167bd61
-EBUILD glibc-2.28-r6.ebuild 41714 BLAKE2B 930ad194d060b769ae07add5b9623986c58c70a2a3f72c850af5315ee55f2565a3400769c1fe05b26e56d28d64c6cf8117b48b9c3be7e50a9988f261eedc1815 SHA512 73d0ef235fd6e282ba665c4b4afbec979bb58aaf2d6f2ee22602bee5a66344da99d6db698933e6cd40034ca3c68c5f48b7d5fde94cbfcd321ebc9950141afffa
-EBUILD glibc-2.29-r2.ebuild 43001 BLAKE2B 35ef7e660d3b8293d50c561dabfd766059f4df61487e2901a48e3cd65146bd9150bf0970574acc9da860630c7bb0e6bce45e7a41e5377e5ce49f3c3e7f0ae4fa SHA512 44218ce47cdeb246a692c948494ba2b09120a338d55498de6b5f8a41534d870c1b83e7661973c94cd0b71e1deb8ef9efa7a7f5b1198c3aeab56e192affe2312f
+EBUILD glibc-2.25-r11.ebuild 6046 BLAKE2B ad419f84c3a03eaac926ffd8fb6c2b858ba3b61a8591e1d805d6884820dee1a995192ee2fbfef0c38d92c950c70a8275a13f51c3396ec0d2593a32c631cea96c SHA512 e30cfcf7cbc30df4aadd6f758ab4a0299730e466c995015f676277f262135e975ae517839961dd6291dc838ad148e5363e6eafcdc1ed4f16e8b2c3e446cba8ca
+EBUILD glibc-2.26-r7.ebuild 26429 BLAKE2B 7e5378a43af9a1ab3db2f94b59ffc2caee54b30f1e3157c26108a5d5960311eabb9bbd9c1216049ec72b068b90421cc18d631d9f6d40b47266dce2a8c3490889 SHA512 9e501245502831e0ee9d03d3d910161a7732ab43ab643e29758840c3f50d4508e1527b86ad23e39f83835fb93a1df051deb8262f379e35b96ab273c21b93a5b8
+EBUILD glibc-2.27-r6.ebuild 41796 BLAKE2B 449b3a6ad7ae5574107442f1d9db166ee39b66b6dce78d82fc45d944c9ec87e7a5c0cb2592db4b52365fbbcdf5c18952ccde4bad94e01e013eb3909dd9a59456 SHA512 216bf0d12719300db725d75c9e41783204db697e1c6facc0c870faafd358a02b336c68295a908cbc73fc6b3738255b7942e494a51be0d22319f21171e861d6f5
+EBUILD glibc-2.28-r6.ebuild 41584 BLAKE2B f0799aa7128e1278c054e95a08335eceff935ada71f366028ce3eb6386e08229f75211f3b4ad77091a13ffbf7a0b0b77c7479c305b49c85afa73e9ee311e4301 SHA512 423333a4c946077eccefcb7fd5654cff7bc77a5d38f5c623a10740bcc91487895780317829390ed136a656dd4bb8b77cddf7216649ae7fd932527f6af5613848
+EBUILD glibc-2.29-r2.ebuild 42871 BLAKE2B f31bdb0cabeee12797151656366b49084bcae923d026d8ec2073b5fc89fa2de3fb77ef055192486b14175c162c8f604643bc41bb992a0200042f1da36e38c248 SHA512 9d813f2a2bdced3b52b73fcaa41e37ef98d5d89c915b1c6be0e8fcb7231a0807533c75b7c9bfc0ebdeeb52fe7a4e2663e48e5f79ab0788e5f5668a6b493b0619
 EBUILD glibc-2.29-r7.ebuild 43541 BLAKE2B aaef26c903b3a5f28012b5a85f6427f2d5a3d622ff29663fd0662ff883f9f9bdd4782c962422e79ed29b6f24bb7baf58e94f9f701ddb82e50fa35b1017b7de18 SHA512 bc6b7ae5567fd7a9eef1fa06ec60649e12dce3c2f3d042b0b7f18e038d6a75cc46e4f337026210450ea4ccf4bc299964c28074acab038800ab08ae3744cfbe93
 EBUILD glibc-2.30-r2.ebuild 43846 BLAKE2B 8f42856cc2f9a732a6c34864f77d17e0e8a59890c6312fe83c5625c6369fb1acc4f3912f71d7c55b8d3183b0803bec088fda4eca56b61e0aa369dc1caaa6ac36 SHA512 75470998d6eea485bcb9786628ca6ccb2662f88010856b3765372ec3a62cf7b2f2b9e7bd9d4c8976ee61c34b2e6ffbccb92f2509844605e10386c3081d3c9790
 EBUILD glibc-2.30-r3.ebuild 43932 BLAKE2B 8b0d4bd1b55ee88d9b583e704c9ae321f0f2af00d222b7647accd2ef8f0d7f6949509fe094aede0c4af0e330a727dadc815e1461b1bc4ede4be41879c7c716fd SHA512 5265d3ebdca246869760b61ee0e059a838db0b0b6090e80306a333da892fd3efef23084eb1821690cdb55876e4e4c4f6519dcb3288e361b63459ff80709a4066
+EBUILD glibc-2.31.ebuild 43955 BLAKE2B e51f309933b8f61bc2e8916a401cba68e147cedbe4b1cc3dea01180a3e1c6f983fd5a840c2c16cb4bcf4a5e206429c4854ae27da9b181ec0ffc7e8f54d15766b SHA512 a084ad140dc3479dfbf60b43cc481bf2d29013ce715893fa2a2d977a5eb71ab77c7083b5eadfca6a2c9afac43d9f04555d9311626cd5e988357d5f27496a5d8a
 EBUILD glibc-9999.ebuild 43921 BLAKE2B f421ef56a8e829e60fe4135a244f96d582e1822186eba6be888208a2981c0d87b4bdf51ac751a1b7a9e48f21094d66b8d4ac60aaf1aed96e66f358af27b3ba48 SHA512 36de88e38bf0cbdd9496a1a8eb1e6340c2f9a9bf1ed9d8374f85919365fb7e6f7ba521d2ec5c772078829dee2b056c16239ef6ac9c16ba63f46a7483d18c0b8f
 MISC metadata.xml 1389 BLAKE2B 370c6cba7ea2da43dea6d37be3674d878df557a4850589b53be2d1b1b93e46944682e26444f27527988637deb0327d315ba12813ce65194aa3d44b1eed66316b SHA512 764d61e3df0894575d1e1c441c2f76c8e30273f536379f6451b03c44e2741322feecfda785f3c6e0b5c87baba637c2eb5f118dee7ff4af2ce90a16f0ba5ba3b9
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index b30a924271ce..e8877a90634b 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -1290,10 +1290,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 14686840b804..1de9b6ffae4d 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -9,7 +9,7 @@ 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 EMULTILIB_PKG="true"
 
 # Configuration variables
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index 7194206b39a5..b859afdc2fad 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
@@ -831,10 +831,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		# if the host locales.gen contains no entries, we'll install everything
 		local locale_list="${EROOT}etc/locale.gen"
 		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index 39bd251ae522..bc34884497c1 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
@@ -1395,10 +1395,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 8752c87248c9..d39698a15a8d 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
@@ -1393,10 +1393,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 6cdbcb207a48..acd8a7e30fe8 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
@@ -1435,10 +1435,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 
diff --git a/sys-libs/glibc/glibc-2.31.ebuild b/sys-libs/glibc/glibc-2.31.ebuild
new file mode 100644
index 000000000000..141efdc9e251
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.31.ebuild
@@ -0,0 +1,1491 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	# needs minimal testing
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=1
+PATCH_DEV=slyfox
+
+SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	!<sys-devel/bison-2.7
+	!<sys-devel/make-4
+	doc? ( sys-apps/texinfo )
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=net-dns/libidn2-2.0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.0.5
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparc64v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparcv9v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ -n ${ROOT} ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=$(usex ssp all no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# riscv
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	# HACK: If we're building for riscv, we need to additionally make sure that
+	# we can find the locale archive afterwards
+	case ${CTARGET} in
+		riscv*)
+			if [[ ! -e ${ED}/usr/lib/locale ]] ; then
+				dosym ../$(get_libdir)/locale /usr/lib/locale
+			fi
+			;;
+		*) ;;
+	esac
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		elog "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 249985e7918e..b7516d39644c 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,3 +1,4 @@
+AUX gpm-1.20.7-gcc-10.patch 365 BLAKE2B 5650d6d25eb70c97fc5092d035b7ff5a2780ae50bc23fb797ebece2202cd55bb6ac2b1de3f173c81afe1fc408113b98482cda844bc066218fd5f714ebae871a6 SHA512 d0e354e15f0f969a64e606067c1417a5034060e03e6ba9db8c39f421712b368942c7fa50d43e1d87ff8a927125d5c8df3a5b28376a11488ffcee23779172814f
 AUX gpm-1.20.7-glibc-2.26.patch 425 BLAKE2B bb148784e2ef78cfd6fcb9ccd7e4d29739f6de17f4ef0279972f76851da8b05604c340a8366a04f5ed00a733329491d0b314cca6faeb9f8e791d4e61fbb6f694 SHA512 d8d240d07d4aed4080e6066fb1c43f24812ada8ea6254531e657ee598406b7bb7ec46e81755e6d58f8888730c4a1fd5b624f1038034e43022a845decca4d6ba4
 AUX gpm-1.20.7-sysmacros.patch 1011 BLAKE2B 01ccb2fc4f18c2f12af67f7fd03783ebf7c607c780417a51f25cb566a497163bc1e2606d89bd6406776a2133e25c39f150a8558a490f4845403cb346c4298e8a SHA512 05ff1649182eb5223f1835945df8590e83b92d3948461ac55424ade8711a45a1fef61ebacd9497ef0f2c98f8e008e0ba3995eaf02ea567841b77a5ffd5b1e2fe
 AUX gpm.conf.d 580 BLAKE2B cd5618d1ca362a2602d0b8a83c4a572e7a73f76fef4fb372297d978002306b0c4c837102e2ce7d08c6a3de8f73a01ae57b7691858d4852ed70433ccd0e100ccb SHA512 14a4306a7454d1a12fda29973b51aadd6d1a5cf4833b1be5298cfe0c1ebc63a479cc79490007ae92c6ae24368e19215dfc4bd50ef5b0cfa0fef88cf69db67065
@@ -5,5 +6,5 @@ AUX gpm.rc6-2 553 BLAKE2B 609a2fe28fc0539e50eed703e2ed6c5a37d98737add953fe4f7d7a
 AUX gpm.service 218 BLAKE2B 728726976390bb394d479e424d5c1fafb9bc17d00e23a90218991527326c3fe88eb8d37b84707febbf28017ecaf5ec3559534e9d0571bfd100beec8c60ac25c0 SHA512 b3b258a2b0ed42256b16ae05e9c13baa3bca0d6d9d5d1ef489e2f8fbfc2a6a4d8f570a595f50f79fba9ad94ad3acbf0dfe098887f0ce799006916a08101f5bc2
 DIST gpm-1.20.7-docs.patch.xz 41668 BLAKE2B cab4649d0eda83c37474b68ac141fab84cbfaac4e18f0f42ad7c0a90d14bc39697b17c450e8a8dc8b1c960f6d9e7ff344ec15791df240f61a27ccfcd7d0a9171 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4
 DIST gpm-1.20.7.tar.lzma 789691 BLAKE2B 5dbceedaa330d5f1ead8b2267fb5844cfd284627e085edd784a72365830a700f9a6a97f96afb4aa00a44ddbae735ef23be7eafc97a65f6250d72e15b359486c7 SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9
-EBUILD gpm-1.20.7-r2.ebuild 2222 BLAKE2B 42c1eaceedc20ef769a7b35684c74f90e4a7d8a34f6d38e2b6cd9b2bd7716c6c349c22f3d900a01a77074af22b80634f293ebdf25e27a680aa3a4d457f8d7832 SHA512 d64e2af1f746b6614869535411bf6342fdbf8e7000df8324fd4839e40256ebf91e1c502bda28fd14c5adfffcb9500caf919e0e6211b2b5c1ae54e314e0e0d283
+EBUILD gpm-1.20.7-r2.ebuild 2279 BLAKE2B f2eab7ac3e2e0cb9850f655c1a809488ced2f303f1f73139ad4ba5826c902bb33675bf66eb92848ccefc414fbffdc8008f17817577f6eeb952b64bf424490838 SHA512 d7f91f90cac9b51433c8e089ac813a04559afb1cc7da3860921b7cc484cc0a054026b3c9d3dc4f46a8fef51e4e5ec6ddce4834be630f7c4740d6dec15b61a545
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch b/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch
new file mode 100644
index 000000000000..a55c44fae556
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-gcc-10.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/705878
+https://github.com/telmich/gpm/pull/37
+
+--- a/src/headers/daemon.h
++++ b/src/headers/daemon.h
+@@ -180,7 +180,7 @@ extern struct mouse_features  mouse_table[3],
+ extern Gpm_Type         mice[];
+ extern Gpm_Type         *repeated_type;
+ 
+-time_t                  last_selection_time;
++extern time_t           last_selection_time;
+ 
+ 
+ 
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index 4738990b77e9..df485bea459d 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # emacs support disabled due to #99533 #335900
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="selinux static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
@@ -35,6 +35,9 @@ src_prepare() {
 	# bug #629774
 	epatch "${FILESDIR}"/${P}-glibc-2.26.patch
 
+	# bug #705878
+	epatch "${FILESDIR}"/${P}-gcc-10.patch
+
 	epatch_user
 
 	# fix ABI values
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index ac5a4c74c124..11f32c2f57ba 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -17,7 +17,7 @@ DIST ldb-1.5.6.tar.gz 1637795 BLAKE2B ac70f6dcaa1cd34bfdae8bf7844f1084282ea947a3
 DIST ldb-1.6.3.tar.gz 1628668 BLAKE2B e9b6535eddf49496151e544f6879641c58a614f6de95463f7d0bf1953744953a5d55dde935d39b690d4c87e66914d8de0f0f5d4816a61fdecc81f8797584013e SHA512 a41b1fd2afa9a02dec37519f28e0e720b649c2a0aa6caebeb6697dbefdc6a055ef26500c5ccb0439b495d8c03218920b389fb9601d1cf5ca4d5046f192a5fefd
 DIST ldb-2.0.7.tar.gz 1674063 BLAKE2B e61f7bf4cfefcb5c1bf735c19a00027ce20ef393b613117e5637f7680ba7fcab1798744505b0db88e8bbdab41e0264e0fd1e643110ec47864de02ef315bd0dfd SHA512 0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a
 DIST ldb-2.0.8.tar.gz 1676902 BLAKE2B b86b24a597bd81ae11382311f3b60aeb8aca78ddbe63413b9a8cdbbfa4f52b05a0d2e325d483e260b15aa396c2ad9f2828ac4b6214af86d891281d05b24125b5 SHA512 23a44968c9b4b57deb3f7b7b2466f140b4d8534a07a5e866545dd108c3d305ee4b0ea9bceec3177fcd09a4efcb4876a8283ca58b5c496fcf323b810666e1e79a
-EBUILD ldb-1.1.29-r1.ebuild 2531 BLAKE2B d6efba4a507cdff74607aa0cb879ec57484899338484ef3fe2722cbfd880359fb5efbff481c099dd0cab4e78a429e0b587096e82806f565648ab2a883bbfcff5 SHA512 328107ca1c2938f9fa7e2c8f8dad0f03e405440cfbcfce0fbb1194889499be51126bb319a040d97c7b8c94e21439a2a41337407af4843fa501f3e567e464e558
+EBUILD ldb-1.1.29-r1.ebuild 2532 BLAKE2B 3a64ae9ffe871833a05e955e57ddd80820e1da14b14d5cc01ca945722d9fc4500ffed945fa02604734cf5f99cd6788a4e70e3f50cfe59da7c14a8e312aedb54e SHA512 5d7695e96495a5e177af729ea8264294c598190c1509c6877b756ffce47e5ccd1359271ba22ef3d58e33929a749b870b53fe8f026f8e49903562a99908e40012
 EBUILD ldb-1.1.31.ebuild 2665 BLAKE2B 05df725cd7827565bbfa3292b8d94e6ca1c7e257c26451ce4fa9b4817c1cd83f2cb1227b23cb06131af2d9c02129b155c1fd56050e67131934e1e4a83f7f9df0 SHA512 6f7746e2d6d8ae4405ada1597d75a6345b6043b653cced671fccd6bcee34bf627d9fcd9670a63e3ce4233dbefa33a0493d1df8418a7062cbd2f995960edf76e4
 EBUILD ldb-1.2.4.ebuild 2593 BLAKE2B 61f60e67593d2c60da0dac603249b210527d7c7ecd305d031dc9bef7965dcf0292928a811d8075a9fba2523a07f3f7c7b0f9058dec960bc95e9cccc82245b981 SHA512 4e68eee121bb9cfa147e996470b738a9ca8d73336dc982df01bd73689f10a9e837edd31ba3a988e522e90b1577b09d680cafc6bd1fc824327bded7c88533c169
 EBUILD ldb-1.3.6.ebuild 2540 BLAKE2B 6383c2b1c2ca31db675ad6565bf8b9da414a0182ff9a4a53c22c9886999161a4acddeb3b6ce7f2866ae360b1765d4697ad669cad8b33066cbe569e1e203337a6 SHA512 2c940f146e02db9f5e5e1ea66d544459c0e6b5e5a62571f990edb8bbf9d92c483d6b92923086f7e730d939bcfc16d2198b5026e15636518a3a172a24cc61ee38
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index 49de3add19b0..aa24c1677181 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc +ldap python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index 8358464729c1..fbda37b39e21 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -1,4 +1,4 @@
 DIST libavc1394-0.5.4.tar.gz 341679 BLAKE2B c27cf10b8769c1602488fa1a9a2536dee169e0e07185090e719946ca1da4b210aa61b37d816fb5b019d8b199b1c9285e2b212545f4332c8aad48af39c2dadf20 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a
-EBUILD libavc1394-0.5.4-r1.ebuild 552 BLAKE2B 33bb9a32c5bd3420cdca1facfc1595608accd680134d69e7fe207dd712216b730086f366880058ae73e8feae7a18d8c02a5b29d20ede67da4b95d0b3697335ba SHA512 66c6fc63f5806b6a87ec57b872c4dcb82c6e647cea1b2389662ddf180ae97beba7e7d9cefbdd634d56eb3fa22e34563cbfaaa7547c4c719ae4a5615f3c53bb0b
+EBUILD libavc1394-0.5.4-r1.ebuild 553 BLAKE2B be3a6e5fd6e16d78d57391851922f2431a745db5decffaca213ed3c9bbeec22a1ae902130b37fa10d4736ecd62f3d8173b0ea778ce0253a1da274d9b60d6f3e8 SHA512 6bc0be407791dfadf64a07def0d9601a4cd2e1350f9dbe2a2d37c67895ec28ccb3b01c1fd73c7702d74ec361fa0632d3614e5e2f67d26bb442d6b7a94f3450c5
 EBUILD libavc1394-0.5.4-r2.ebuild 735 BLAKE2B 36fd739b8c392a6f76bc11adc138b62ddcff13f7d444714ecfe660061d09f005053c75d699c78dd8bf4aab2b9c3a469f58e303734361df3e7582f9672a30c6d6 SHA512 27579259abdcaa468ea94539145f34ff7a2dc251333cad9ed2bd49d1a77cca1c760220cf960953d86c5e5d5420c83e2a7138f4eb6d9df149b493ba85cfb30034
 MISC metadata.xml 330 BLAKE2B a1bbe65ce97eb3a0c038333183e4fde5b7f0f0384d2fcacb78c569f6df4afd74cfe8ab34c9404daf7bd0870b983372bc35d3e3dd3ac50793fb47fe25b509a9b7 SHA512 3b2a188bb90d59ac6acb66b90e0231db783a6364f4e91a955df28346422061b99837ecf4038f6d42eb570630029623797c0e874737151065343b63352bd082f2
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
index 0c3baf39f988..bd2994497cd2 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index aca62d16e41b..254827901a40 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +1,7 @@
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
 DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45
 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
-EBUILD libblockdev-2.20-r2.ebuild 2018 BLAKE2B f01098bfae0910050bc9404526d00d341587d1f311f3378abbf40bb99d717e46dd1be5699fa400600083a6d8522cba6ed049f0956aa9f35618a3fb035c286659 SHA512 fce318ed4b088885d4a8bc5604be7951fa8f6f499a0e88ed9e2abb43e505f6b5d90829a707ce31c3f08c056fe07c5a5686a2df6c97da4b8c0278f4e0ffc2a03d
+EBUILD libblockdev-2.20-r2.ebuild 2019 BLAKE2B 82122f62718f8e755c2185664e34bdc3529249bd0ee46d7ebbd5bde6ad329b2ae945acffb96eadb1de7b16a7b81d581adbf9fa55eb1dc900b4d1169e23b8467e SHA512 1a4e662dc6bf836f42b456efcdf6cdbce88704d433eb4e1b18ec14330a6397737dbe54b1a2803ed563ee1b83dc30588aa336207b2db7978a786b0f2ffcb567dc
 EBUILD libblockdev-2.22.ebuild 2522 BLAKE2B 6b108f706a6033f1546c1d65103a7823237a27043eb7cfb54e3cb0c2df257516347c540ce231ed6abaa769774ec4afca9a3021020ee9645c65949bc63f8e6d62 SHA512 0e15940170e9e9620959857317de0966c3d9c8e11c9ca61656f53044ccebc5b6605e59a2dc4e1a935f5a5917de5b4f37f944fff8dbd289bdd247b6c0f22f2115
 EBUILD libblockdev-2.23.ebuild 2585 BLAKE2B 99cd18b7177c746c5b757bb347f96e14f716bf4e5b602931d90c0f1f9f9491bfc066a3b70b259b2aaf635b4757a3dd179a497f57f2a8fef84eb0ea1ceb083def SHA512 3fee230564befbe4f3cbc11851142f387c48fa0a9f1542fedbbd374839d25fbd9a5bc0928621be007edf50bab26f143d9235266567bfd7e8c972dd787b46dd65
 EBUILD libblockdev-9999.ebuild 2585 BLAKE2B 99cd18b7177c746c5b757bb347f96e14f716bf4e5b602931d90c0f1f9f9491bfc066a3b70b259b2aaf635b4757a3dd179a497f57f2a8fef84eb0ea1ceb083def SHA512 3fee230564befbe4f3cbc11851142f387c48fa0a9f1542fedbbd374839d25fbd9a5bc0928621be007edf50bab26f143d9235266567bfd7e8c972dd787b46dd65
diff --git a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index 605fda2719ec..fd10c36035a1 100644
--- a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/storaged-project/libblockdev"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index af0ee6b8228b..160a7a45e35e 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -2,6 +2,6 @@ DIST libcap-ng-0.7.10.tar.gz 450243 BLAKE2B 8eb21b0309e46b05fa42752b9c814d90bc1e
 DIST libcap-ng-0.7.8.tar.gz 447946 BLAKE2B a26af2dcdd1af26cf03ca668dc95eed7bc1d0344729031497f46bba865bcb23ded2f1ea2ca5cb500b9419bbbd7ed75501921485257a3c8930d156a94e0a2c1c1 SHA512 c32a4c5780c183b13611615abe9061221fd8987188b08828d1617cdaee338ad8de67b3430aa83bde60128efc76449a688546bfbf697f0847b6a835cb1a868756
 DIST libcap-ng-0.7.9.tar.gz 449038 BLAKE2B 3f84e5078d5d443cb61358c49405e4f16ff82a56e1c96d5127b522613b1b5c56a566a01b14b40055eca85f13b37f3d795248a506c54ac4612ab184a94addc365 SHA512 095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259
 EBUILD libcap-ng-0.7.10.ebuild 2209 BLAKE2B 00052806cfcb2e497b944ba385a97bfb68e2da7e0b0ad8253e1de98b9c7f3e1b5bd5fc96a55ee606bde90874ed089f229f9a9eec4b8bdcf2847c270e791004b6 SHA512 6235d5d2d93bf43ad2b1c52c8a7df06656b14ad68591108c255d33e98ffbab0c7aa22280b2b291b35abf9eb5f7c49ac81f35d94548e50564d6d2cd4b306a6d4b
-EBUILD libcap-ng-0.7.8.ebuild 2288 BLAKE2B f4ebb901284a5820d9dece56ce84a7d9d0ac06937d1ed551a6836ba3205d1b7d4a65c9ee57a4d16c161869b386d09859fc54fc942a9d513350d00d65db5dfd04 SHA512 d4272c5106e71709e88d6c66c8bbf1036f77ed8113537a3437e002bf190baa1e87f311ffac2d5edc6fbaf7e25a0a6f2da1e9b348ee3e5c102b840e5ba412c8d8
+EBUILD libcap-ng-0.7.8.ebuild 2289 BLAKE2B ecc0a585792b0a908cb56a63b4d7797c5b2c8a4985d72510504599abb05f11a01fff77b8f2a93de3126d3bbe86507b480d4d14a092c4067d0f73554ab77e57a3 SHA512 3cf31ebe3706924b066a45e2b84fb2638df7f07143ade69e1fe553e9427ca682c2a4a23cff6825b999d8036da6a39c21ec452424ae0701921d11fa4f2527f832
 EBUILD libcap-ng-0.7.9.ebuild 2207 BLAKE2B 6818b6aded8fafbbf515e78cb5d0b4f43d241570ce3854a03befe989d2b695bc3e07b32aca380b1c93383647328b88f29eb716a7fdab79aa34e4f80566716104 SHA512 7f69d4201cd532d7b7467d1a245afeec04b85727edd2c1c695fbc10e2994132093be5560aa917df7e6a2a449b94d0f2aa8f3658ecd17954c380d5e2472ce23dc
 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
index 7063cc8bf7f2..1cc1c9d7b308 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index a36b57a00e5b..9cb2badbe92e 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -8,7 +8,7 @@ DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219b
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
 DIST libcap-2.30.tar.xz 98528 BLAKE2B 83892df1dc4f2a7605dbbf7332e90f1b696e16060ceba20a3fa3cdd53cb30f6a28d2bd49a4a66b7bc46221f860307de7c22cd7b2f826bad86baad6f510d01e40 SHA512 b2d843b61c3dd583b97c11ad4737b9ea5493eda6bb40da1efdb88b68c0594aeb0a2cebb0a59c749da1c6268ad1f821802d3c9e125a07c2d2457a0eb9df8c0c40
 DIST libcap-2.31.tar.xz 99236 BLAKE2B c4cd5e2e105cc05b2aee2ee6435b9a28c06a91dee5cdd1baf6d94f625d89e134ad35a4493ffdfda7f3ffb0b41aa6e75a20cd705bfe9df570e82d0b6ea4e484e1 SHA512 9f0ef665a52e77356d6028abdead3c3cf75f97406ac09d60a33500222428c581d8aaa7d25d7eb9051d9c73ebfaefa7af5581430e1ecc1dfea73398a3ac7cbc3a
-EBUILD libcap-2.26-r2.ebuild 2043 BLAKE2B c8a51141d1ddf21b9ef071b7d0ff014ae5a66027e7e678ff093c0b235e8f4cb530c36f1ec0f14ea16b35618be498792f82d72e3ce8c65b7ab1ffc537e89b1fe4 SHA512 c41acb88e83ecf6d4d284bcf4cf73ab8a3e452a7cdfc1e1146df34e48cb00f4b3398418265fbdd4e046f8f1cc8079bf8ecaebaa413548538f1a2a46fe66038b0
+EBUILD libcap-2.26-r2.ebuild 2044 BLAKE2B 35645f281716a37d79431795993fc248d6f5d9250b62cc1169cc842c8e201f4ae7bad8359c999bf7c6c9b37e55ee9a475db1ecf16e86c9ff78407474ecdf4097 SHA512 4623977d3fe5de09703f92c9aa81ed8866cba8ecfdc9ca9e7e7ed560f80bc821fd86a29d112549bb7c4af9260776517bc5d49729a7d0bd7856ee6f1b847675d6
 EBUILD libcap-2.27.ebuild 2056 BLAKE2B 243ed538747bd8d1588dd3ddbb654ebe9ae9f1e121b6fb37aa9888d3461c5d143ed93ce798f1f9b499cf13471751e129ac2f3d55b76124d9e253e3e4b6a530e1 SHA512 6bca40f0b987958c7d244bf64c915aac5b3d60fa4dc503b090b306039d8c23c99932071b1f44a22de25f4e38dc685a5c835eb85159ea2215d6d2df54e7314e21
 EBUILD libcap-2.30.ebuild 2128 BLAKE2B 622799b87c4007a2a1920a2880692e25a26e6316a4b88d4ad97b0e69d376969a7507e65c0bbcac69ea01d397d5a022c16fd7f241cc0973d7512d88c3f045473d SHA512 397c13d66e11b5aac1a0748961c2e5c9bfcae185fc56e3472f63b31fd0f7d8855947cd31e4b8dd2261e82617d1e63509c35f4c9b72f224a0d9790b2d93c352c3
 EBUILD libcap-2.31.ebuild 2128 BLAKE2B 622799b87c4007a2a1920a2880692e25a26e6316a4b88d4ad97b0e69d376969a7507e65c0bbcac69ea01d397d5a022c16fd7f241cc0973d7512d88c3f045473d SHA512 397c13d66e11b5aac1a0748961c2e5c9bfcae185fc56e3472f63b31fd0f7d8855947cd31e4b8dd2261e82617d1e63509c35f4c9b72f224a0d9790b2d93c352c3
diff --git a/sys-libs/libcap/libcap-2.26-r2.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
index 7bd9b6e03880..1a5f7c428360 100644
--- a/sys-libs/libcap/libcap-2.26-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -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 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 7fa61a428600..2cde809fedd2 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,10 +1,12 @@
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
 DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxx-10.0.0.9999.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
+EBUILD libcxx-10.0.0_rc1.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
 EBUILD libcxx-11.0.0.9999.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
 EBUILD libcxx-7.1.0.ebuild 6734 BLAKE2B ccf745bc3f3ea12361f877637970090b3588febd096fff2118359afc1664a2c5eb7e55e90372a5f5dc711b7a12310fcbe9fd2fd7f047b9bce117b8c99c7da393 SHA512 cea3065bf397c3d1615ac3d6a92910bc84ae439597c4972fdcd4eb41ce0fb1dd34dbdbd1cdfb95c0f46fb8a217f31f5b23da4c358204b349d48e1d433a3d9735
 EBUILD libcxx-8.0.1.ebuild 6773 BLAKE2B b1f95dfaa74faf6ec4299c7241330d5047c1eabc69351f2bbeea296c41a3671c87e99689cda85c65aa29c513eca148321806719f15229b283b0c82a5f9bd1c93 SHA512 0060d986d79514416681cab707ed8075a7f8c461146457724acfbd04e269836827b4adbf791b1afb3a4b8fec13d44678c459861b749ce4001fd5c4a65b97121c
-EBUILD libcxx-9.0.1.ebuild 6640 BLAKE2B 2b73fb9f3877f9c8fb4a49e3f439175cac34f9a0b779ba54d17151f6b3536b63f84bb28fdd3502ad4e479348c49b4cd51ec635524ff46861f3b187c0bdc635c5 SHA512 7d1bfe841a54fbec52078159dea8b924ba81d6e93866566d35e486f36e7cbe0a2a94f26fe292ab0d6c5ef2d73f026400f2def55bfdc9a8476e6b3dfa8cf8bba3
+EBUILD libcxx-9.0.1.ebuild 6639 BLAKE2B 8c1504238c018c535cff7e162b37e9b1cd203f72fe435b4d033872ac9c15b2de7ce0b44c6abc23ad7affa3c495ae18189b472b324fb643b4cd9aaa3b314387d7 SHA512 a023be9a8e78c27b20b4b3d128c66e7ff07fec68857549f93e440448b5937570f181722b8bc5a3d60fbac9ca60ecff1a7a8b8c127ebfdbc58b995aa91e288b6b
 MISC metadata.xml 751 BLAKE2B cc513b45c7283d41728236781558b47c535885612a93bcae2a41be20531bab0e01c159e918670c91ce7b4addb0390d5996ea735fc5856b61af7cf28a9b6286a9 SHA512 3620f5415cc80bc99f16eaaf98a712f1288895bdf1e98898103d680304930db89c3b8b55ca3f4d20d4738fc3aa3e314b81c9989971b23d7f66e2137095a35d4d
diff --git a/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..45df844722bb
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-multilib llvm llvm.org multiprocessing 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.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
+	?? ( libcxxabi libcxxrt )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( !libcxxrt? ( >=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? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+DOCS=( CREDITS.TXT )
+
+PATCHES=(
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+)
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! use libcxxrt && ! 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
+	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
+		eerror "conformant compilers). Please use gcc-config to switch to"
+		eerror "gcc-4.7 or later version."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	elif use libcxxrt; then
+		cxxabi=libcxxrt
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
+	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
+	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)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-libcxx
+}
+
+# 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" "$(usex libcxxrt "libcxxrt.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" "$(usex libcxxrt "libcxxrt.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-utils_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+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-9.0.1.ebuild b/sys-libs/libcxx/libcxx-9.0.1.ebuild
index 4cc122fe9615..ba447fd5af31 100644
--- a/sys-libs/libcxx/libcxx-9.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index b5eb25a09c82..529b2b4a295d 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,10 +2,12 @@ DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf9
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxxabi-10.0.0.9999.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
+EBUILD libcxxabi-10.0.0_rc1.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
 EBUILD libcxxabi-11.0.0.9999.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
 EBUILD libcxxabi-7.1.0.ebuild 3160 BLAKE2B 5b90f5ce5637b75316cc992dd50105c87e7e55c8bd608a5d0280556ca14e57b2be47d5a81bbef0be37c8ace675887bdd4e44029e8efb8cd4f7a69b7eb6eef488 SHA512 8a03888a55c60959802824e54c78bdc9b8e74501bdd8b5a47bbc619290e03e8815658e5f33f9fdc9befc66f9fc36ff5ac2d36008824e3800f76b299508e706e0
 EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
-EBUILD libcxxabi-9.0.1.ebuild 3382 BLAKE2B e86932deb4fbb8e919900a92a9456ee3481aaf942e198ead5d74342ae3394c43b9052e3e4b508320d87d56ab90de5ccd35d04a91b5cf1ebb6ddb543c6438da13 SHA512 6c78eec4a9693eb785ced7c9600e7640e4f248ba2a7b0c71a8b2480554a7b59be0444720fee112f086c2c47735ce7799f98ee02fec83a95e2764fbfa798919dc
+EBUILD libcxxabi-9.0.1.ebuild 3381 BLAKE2B ae0b0101c905b1a67cac9edd4651ec92f4e8c4d7bbc2d65031bc93433b4df28ea927ac8f9dca0bcb8d46a0ce5a72c391836839293d3d692ed4668faec5f6dbc7 SHA512 de9ab4b8917c64b24d78f523d0a214b81990e4187ea9eceb4ba13783e1dfcab6d1880308ff8a82e3409e762be4b381b62ff6765ca11380a74dc7a68b13182b2f
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d096ef109678
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+llvm.org_set_globals
+
+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}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	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)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake-utils_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-utils_src_configure
+	cmake-utils_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-utils_src_make check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
index e5b120d50565..820d6b1c320d 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libkudzu/Manifest b/sys-libs/libkudzu/Manifest
index e89ef57b5e01..f064f910981c 100644
--- a/sys-libs/libkudzu/Manifest
+++ b/sys-libs/libkudzu/Manifest
@@ -1,5 +1,5 @@
 AUX kudzu-1.2.57.1-sbusfix.patch 2217 BLAKE2B 27506402bd81f1a1be3e5213945dd6c6ca814085da9b7becf9cd2845242e17acf8a7936ce843eddc49f6e46590f09c9077d852fb21d15d051d9beeb6d57b4c4b SHA512 5b94734f63e1bb62cbfc349646c6dc4663e6ed2309e554e701943c35649193b14ea779a0c08e531ee931a94afdcc3e15529a8f410c658ea26d26659fe4147c71
 AUX kudzu-1.2.57.1-sparc-keyboard.patch 5389 BLAKE2B b49bd002dcadf6f79ee468fe222f150660908e983e8ffa44cbbc446c8162e3494ecb2b959e11f59e19d56437cc163199e2f4e773cdb8e5e6bc86aa7e6b39606b SHA512 6b89de1ede96e1a523880a33975488957e87cfc31cc0155014bb8152123cafb7ad793edcd9d228b9946bc6005b544e6fb908185f4ff901e623ce200435982708
 DIST kudzu-1.2.57.1.tar.gz 165855 BLAKE2B cd7a71a45a234701dd3e94b7378b37017a03cc78bf5230cc267c273fee4baf5338a5509572f0ba1bb23c8f585ec452c4a7f2d02159326c4133ad6abd80d36c3f SHA512 799e7cea840b7495fc007f4e34adc50fecd2fa7ceda2e2779e39639d0b93b10419bd44a0eb910b2e47024a49a4376330653a6fd96e5560c4828d55e18ab5d641
-EBUILD libkudzu-1.2.57.1.ebuild 1298 BLAKE2B fb2a64e5786715b2c9fa00c474dde55246f6c1f4a5ea2ccc2e90c7e8ea5a1a7027980b94ba55c8fe42d673f5e3ff8cd78d9a53ef72f99c67b2c1ec91553fd101 SHA512 b6be7a4022ad9e54b14db39ff0bfe9b2d97731212d1ccfde7b7db7f20ea82a8f0e92f7a44018cc4a7df7e2c9f401e4319a7e8521d00b0dbf11063470e548b7d8
+EBUILD libkudzu-1.2.57.1.ebuild 1299 BLAKE2B a7c04d28ea68374c024942725ec55812f1b175fca50e970491eb1b1c49b845595b03fd127e165369536c7627f33b6f444856290ef11bb3f53e78bb1fc6a1ef2e SHA512 5398cd667fdf6a1f792e4d9c6bafebac6b9639fdcdcdbeeae6addeda97d310ddd6c9aeaec6cb30abde8cbd1f611f8356324b34ed8de2410b6d7879c9d113e493
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
index c541f30d5fc9..0c087f357627 100644
--- a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
+++ b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/kudzu-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86"
 IUSE="zlib"
 
 DEPEND="
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
index 92108336917a..ffb05e15d04e 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -2,5 +2,5 @@ AUX libnih-1.0.3-optional-dbus.patch 1162 BLAKE2B 5c9178bdd193a7d3c2eb2e068712a6
 AUX libnih-1.0.3-pkg-config.patch 2491 BLAKE2B 6308443ce8ee8c77564a0c9a64b6f0a31258db08faf926bda603faf372bd73b57b00a0b75111fc07bedce0ed40080cb66d9ababadb99f9d8c4d753bce48963a5 SHA512 b99d580f4487cf3d25fa37f3f7b62ce32d9df80c6c0b01ad04b6850215ec0cc24cfea48aaf8ff89afe28db239b5ed212f139e86353d9991152d488c6edce5017
 AUX libnih-1.0.3-signal-race.patch 2081 BLAKE2B c11b900289e5fbb53b3d7e7f6a90d302bbb06a7d041b1b9b502ff585e440697f77b2ae5e2eb7ae40ff3817a052bd34da02766efd1ea021ce3ad78c4542307edd SHA512 5367cb0c6382004cc2a829b9b71f0c02a09e4983940afac90c4c5c0bfbda53fb36a6cc7e38ede7a895ce28f99a4f69e89392ebaadefdc536eb7efa90c2426ff8
 DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
-EBUILD libnih-1.0.3-r3.ebuild 1497 BLAKE2B 753ce727efcccd2bce5ac7b530cb17476fc403b37fb71a0edded4da9d7be8166e5457c90ab1f4e4c20da028e85568857b111da04c4e551219d1931aea2562258 SHA512 c3a1985f507ddbf72d3dff9e621c07d8426499c37e084dfa58b7fa6875a904c42159296326c46bb57ffcc7f5d45a5b61c0896a402ef12cdb0d2cb6cc41016605
+EBUILD libnih-1.0.3-r3.ebuild 1498 BLAKE2B 20ba5c99ff0b8a83d911ba41028fa7708a7e8059815560f1b7f4e450fe7981c39964dca56262b07917fdce33ba3883674f26f7d10f4770f8620920d9cfd90d54 SHA512 2c8e9c806b5ff0373ae3132a4731da44dd5e3253d4b2be355f1023081146123cbfa3395ee1e1fd4695f066f89c7a7299f7b0c1db75daadf14a12f4fb5a245a13
 MISC metadata.xml 241 BLAKE2B 02f7c7b912751df8725055416a093647e79dfdbf7f06c9f56246c67f6a1176997454dd3aaaa493ecf7d00d8ae295066e2861ac10bee860a94eef6085437561af SHA512 31e21c0bed310c4a025385f24c5b76f2e588999912fa548ca343947d95ad448b3a1232211cd4427607550c0f5de2e562e2b4e492415b6d207c954a516b811a84
diff --git a/sys-libs/libnih/libnih-1.0.3-r3.ebuild b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
index 5c68b1610b1f..eae10dabe319 100644
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d
 
 LICENSE="GPL-2"
 SLOT="0"
-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="+dbus nls static-libs +threads"
 
 # The configure phase will check for valgrind headers, and the tests will use
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index e77dcbd35f2a..1abf94093ee7 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,9 +1,11 @@
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 DIST openmp-7.1.0.src.tar.xz 909320 BLAKE2B 7a5fd4374992b7c440ff27917c0af6a2ec64aaeb2fda645f75b5affd4981e3ceef7f15cba61c37934c5b35be543af315cc4bff2937545fbf5eaa6593f1aa8b83 SHA512 57f18beede401c1c39766e13a03b52083a0f7b437758069f66b73d6d1388dc51e48c34b0a7ecd3552244fd35e2db57388642588febef413c161f5c5411ab1e5d
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
 EBUILD libomp-10.0.0.9999.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
+EBUILD libomp-10.0.0_rc1.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
 EBUILD libomp-11.0.0.9999.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
 EBUILD libomp-7.1.0.ebuild 3250 BLAKE2B c01271dec02e6315408cf8751580a870f0a8a08f8a7d7801efd6780049676742acc10a284ab21eff5d178570f59995cc0c388adf7d4cbafe5a07324c63de7402 SHA512 463b486bdb6fbd4b85d0935905e7b80d7c28a3279159a15182ecc364aa56eff268ba6e1dd4c4e38d90c3229b057dcbc6037419442e9aae137afd71e69816bd45
 EBUILD libomp-8.0.1.ebuild 3280 BLAKE2B ad34cfd8d5043c0fa706e292f78c5458c659b26ce260c4a049a9e8ecc88f3c268d0b4849c269a41e95255c8ca72f8db0b1f57eb342a4af0980dd34bce77c3c69 SHA512 fbe46c483dcf27d5598058b6f6394811d1e2fd2ce73cb3c34bf6519d2de0ba274562cd4d1caaae3737b70a6188c36079547518ec3a47afadf69c4696d9ec5634
-EBUILD libomp-9.0.1.ebuild 3038 BLAKE2B 2b18f75389f2e27ed67ad236c0c312e76afb9acc84783eb4d8658c0907de89e8285b5a0dd8176c0982170b5e9ab2c67c014ab486642d94ef2ef3d36d99cc2e45 SHA512 13b9524e733824481df1a92b14f5746d676b263477a7e253145ea2d53050610177e95c551e8d53582330e3d89feb94436fbd82a85cf75ea721158c1311f29e7e
+EBUILD libomp-9.0.1.ebuild 3037 BLAKE2B 4b01efd223c7c61743e95ba8628e392dfae3f592a7d71911b62877277b8625ef574d93fed9d3a1671f9986a3756c592d87693896819e84655c00b1791c461001 SHA512 0916e34ffb75dae9bdf25009910c92ccf2bd39cfa4c9b7beb2fe1e1b7217ce504f6b5b7330f5c60b1b9d23f79aab3f9ec224e6510e2f66abfefd9a4b82b781e8
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-10.0.0_rc1.ebuild b/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..763579d72517
--- /dev/null
+++ b/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+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}]
+		virtual/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[${MULTILIB_USEDEP}] )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+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="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-libomp
+}
diff --git a/sys-libs/libomp/libomp-9.0.1.ebuild b/sys-libs/libomp/libomp-9.0.1.ebuild
index 03e5a5346067..eea0366e1a4f 100644
--- a/sys-libs/libomp/libomp-9.0.1.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 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/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index 1c9c17bd65a8..14a8ec94bdfd 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -1,7 +1,7 @@
 DIST libraw1394-2.1.0.tar.xz 291456 BLAKE2B 8fa19d9f4348b7cb0b78e0789c1a7c112bad475064c1c2cc4a44a39fb859b9c056c97b88983940110b8f484e309f7bf3a27b18b50603f600b8f4fc585c7987e1 SHA512 04295c2b4391b1c61cc1c65dbe5921f5e208bbb311104366d5756a82a6c53f1339c368fe76077318b22e2402fd8f679236606d0be4898728a9dba2d7a8989b9e
 DIST libraw1394-2.1.1.tar.xz 309396 BLAKE2B 2460e8b9f848d30c74fb93c78e38ef818a09d714faa66f872dbb822daef0e7e144a2e18a898235915ddfc462ee68385c2ef24ca5217cf314847808678fc1d21f SHA512 ed6acf10e50593e6070764e57cb6cc0eabb6f2bc4b4ed805a55cdfc37109c1975eb597dfbef9b6f8bc73a9e9270e7d643956489f54682f4c670fa510ef726fbe
 DIST libraw1394-2.1.2.tar.xz 313120 BLAKE2B 73addee88d2463ecebc4a0bca14d8f4c285c8e7060e3ded49bacbb818049e436bdaf98bde26469ec03e1baf196f67fec59e90201347f34a5810b8704108c8d7f SHA512 1ef38961b747c4ebb18d823a4c38d5bf019f8bd0ac55547838d153b1899b91ae0ff56f5b6732e309d6975b55725d1ce989917ffcf605cf64f7d33624f54f0567
-EBUILD libraw1394-2.1.0-r1.ebuild 512 BLAKE2B bdeacafa839a6f0c67c8bec76ab8dd3c7f392e38bdebcbc50bf7cdedca51b2f746ece83e20d16720168354b3f720a50a77abbeb53e94dc3b335267a4f52a9801 SHA512 d2db649a2965f05791a4f2d5e29f277998fd9a40a56f73a9bcc1e51c71199ab2f6f917460b8f5b83645de4803149dc89f3940958f208507e3e9d1bc0ca985262
+EBUILD libraw1394-2.1.0-r1.ebuild 513 BLAKE2B a988ebbb7492a715bdec263bedbea79f555ced91e631d61bafeead1c0ce5b2275a6a54b98c187ee03d72910d463bdffece38abfe38c8dc1c755f43619df4befd SHA512 95ee4c46c427950410868616ac059f223baff0d21acd642259694e34ed933700b4d59890228e597aecf304623f23b1fc4648555253b43ceef053b9ccfeb55894
 EBUILD libraw1394-2.1.1.ebuild 521 BLAKE2B 727c89d51ba6865502accbcb4bdfb519ba8b3681a80d555216a84ec64c4cd507066e80ae6f0a048906054cde86857b7054137725482c1770b73af30776fa07a1 SHA512 27debfd5049bfeb50899084311ab1035128a9ac0335de5b9c5f0ea76e84906b6745a7430f3bf527fbf46f190875cca9bcb94eaf6d614aef0d533bb373e231cf7
 EBUILD libraw1394-2.1.2-r1.ebuild 607 BLAKE2B 581c05c588d9f2ea5d6fa49320b77fb1b4205ce705f836d346e7089d5e85f9f8230f034496fb61cf893818e4db03e3a8c467ef00cec6befadb3d0efb56b4d033 SHA512 3654d5b84f938707cd441a5eb058a0aa92f0cdc2a3d6146da046a3bb8c5739cb4578e4e809058ce4f2f54c723ffcb0cdb8f4b01e270b82bf9e1d04f0a0cd4676
 EBUILD libraw1394-2.1.2.ebuild 524 BLAKE2B 135a53734dc88a23d1b5f86daaf2973cf5d9992a9a905c52d43a2baa1b53f2f3420f08346d7f9fd64263ecc2c0b1a1aca4c2eb7e0a4b64ab3bd131fa0edb4d87 SHA512 b61e305f55580d2832f172095521651544bc02f5378d0e6c4c33d0c85b47790d2e99eb17c36c147efdd669e1a8d722ce54b37c467b3f768a8087c3db9aeb937a
diff --git a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
index da2d4beba9b8..498bb6e95cbe 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index b6e7270c1664..0ef249467deb 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -4,5 +4,5 @@ DIST libseccomp-2.4.1.tar.gz 606860 BLAKE2B f80f11ef4e03fc9f59fdd38466e32b081e98
 DIST libseccomp-2.4.2.tar.gz 601014 BLAKE2B cff2612498a6ff3097809e9e04542e0be12c2c5d80fd51c2abd35fb6ac59f3ef7fce1c5205216876c1f67eb762d31c7df8e0f237f3957b7710148a1298502ae5 SHA512 375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb
 EBUILD libseccomp-2.4.0.ebuild 1020 BLAKE2B ac1751d130f6879190709c32f1d485c94fa299686d3b34c87098440c8829c38575d4f4ecf232c42f60e71664b031cff07f7521936455359c8d41b72ea61ec7cd SHA512 ae9283a13fde88d058c46543c1663f1c4dd61d3f4c3c82685b2a7c752af2d3a16ef61b51057ddfd27ea7dfa4403bbef031462505bc1c0a65e0dc5d316fec2997
 EBUILD libseccomp-2.4.1.ebuild 1028 BLAKE2B e5bb28b41e63a74c7a51fbd9bddc65a6cd2ea558ac0d32381862c62ba3554150311718d5f9aa83c95d6aefc551e29c085b885007f49e25597f02411808818ea4 SHA512 0a59b16b9056a1d16be91ef066ba17958465d7cc5646e2bf5de54ccbee74bb5ffc88b9fddc1557c385ff1fe58947a0347b8b5e8eff643917d9bb9933478f344a
-EBUILD libseccomp-2.4.2-r1.ebuild 1098 BLAKE2B 289e3fc64cbcb054e4668b4d6e57de6b4d939283e3759a895b383c9b602e42d942c71f05a730d5829c054a1dfdd1e91f710192fc87f970d7dd07bcc066346f46 SHA512 a8d0daa6455707c8468c2ccccb24c98f57755fd019fd321c51fcc315e2c744b494201efee95506b440775999589b9a40ed4868f0066aba7462a88d781e03caa2
+EBUILD libseccomp-2.4.2-r1.ebuild 1097 BLAKE2B d72b57d2f44a2792847f2225b4bd012c54afc95f62c4d532493ce7ee827abf1bfbb04f3d52d450d3bcfc72790c562ae6c6169b16c6c5d96811b70a8e7070b913 SHA512 d3892fd1915b514dc345134b3c37b2aea3d906fd998ef5ddcc57e09513422c01710c03929ee1a2266716b7941bf70b0e4593dfd9366d1cdfebb25a5bcd807c31
 MISC metadata.xml 395 BLAKE2B a375d336aa4cdc973bc6edefa50745bdc67753e53988718a804b9dfab02d8c8324fd998c9c17dfac0f1c57a7068d2c036ad37194a46c3aec208314171c357367 SHA512 db1f67e65f149ce7122b9c845d1305cdca95428267590d7261af489493dd34518c178ce8ce402bea290c0ee441fdece5006c62803ed587281dc7d84a25a3c3e4
diff --git a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
index 6b5169425b87..fc6b67754358 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index ee76574ba3c9..5d71b04f5af6 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,6 +1,6 @@
 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-r3.ebuild 1113 BLAKE2B 4354475bb93b8720d7c2400620634a30ae46c900eb55af78f7266b41b7c459fff1455022f99452993765d53c300952d322f556804b30d7dc78f9324959a32ddb SHA512 11983377a273f8435c2941ac86a196b54583510b807428cabb3897dab53c1d987a228b423143d4f4c3e9a53dc98e2f0d1cfa087f5657f071a9cb47b9c6233fb7
+EBUILD libtermcap-compat-2.0.8-r3.ebuild 1114 BLAKE2B 812a881b4e609d2535cf7d4010af68152d574799ec3f2303b511069fe3661f00a0548e5674cf6b0831a62429bf966f43bcc38b18cd4295593bd8a89710bc105b SHA512 760ea949caa15aa2c8184271f5fb20b5c6f1329f4f4025400d50f52a02f343d1d13f85154cc717f9991d1ee7d164532fbf77742acbfff2d9015d8a4559360c0a
 EBUILD libtermcap-compat-2.0.8-r4.ebuild 1200 BLAKE2B 7d7cdfa1f7f14c63042e01d6200e129f3e6e0a3c9961a5fd8225938ae17d5b2bfe5ce8c84a301bd1010f3ad59760adc894dc0aebe91e73559c41a8328e3323cf SHA512 ee86770f5a49c2f0697900c0763c460cae87d97ec464a1aea45cb0345d06650e09c11a798aa4e996ae4f46fe6e7725fa772818368ea3363467d4dd4ae5cee938
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild
index 8b6922348686..6a17b33a5204 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
 
 LICENSE="GPL-2 LGPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 94d589ef5bd2..a140d51c8073 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,3 +1,3 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
-EBUILD libutempter-1.1.6-r2.ebuild 1690 BLAKE2B 1c110e9832a618caa98b985ce4f1c35a738302ec8b3481bd2f696d6048c93edce51dc94eccf12d5b50784848bddb409e93e7b01d58754aee79ec320254f975ca SHA512 5d0b08ae6b45b949ee7b10e52af47db713f2211d001dd629d4c1db0af19f17e40f0cd9e2749325cbfb2b555b561ea24c3e2d44c42c2aa2561949b6e4a9699d45
+EBUILD libutempter-1.1.6-r2.ebuild 1691 BLAKE2B 0949cfea704c236c8bc8b5b506a3b651b04f45cbe6429efb5fa94425823d441da02f1916114d2975392f3c054c7b26b5edccae2603f3564c9119a09c4758bfa9 SHA512 b835e68d88947829656a087c4add5573ed209572d427e361a3a977cdc740e149590d59dfd2e6964624e039ea4761bb54421f1b78213de2f64eb7f831d6baf2e4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
index 59d01cd79e1b..dd95dfda6b6a 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs elibc_FreeBSD"
 
 RDEPEND="!sys-apps/utempter"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 29a0f571ecf8..c3712290e77f 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,10 +4,12 @@ DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf385223
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST libunwind-7.1.0.src.tar.xz 79780 BLAKE2B 8f15dcf4a9c8cb45f17c72bf058eed13a6cd52842ee8630781c3104be77d9a868e241eafd34a31b23aeff18dc49743dd5a566ce4cb866a170f1d09899584e2dd SHA512 8ebfeb821013167e866986a2f9cc6459e43d82f73560a15ee7e0d604a974e1c656f824c9f7ccb47da4b4830ad9a99c663961bdf7642cd105e666b8a8fdf7d03c
 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-libunwind-10.0.0.9999.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
+EBUILD llvm-libunwind-10.0.0_rc1.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
 EBUILD llvm-libunwind-11.0.0.9999.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
 EBUILD llvm-libunwind-7.1.0.ebuild 3723 BLAKE2B 4d26e255995242285e4793f0f377832e8e37751582659f233a9bd2b12545af49df0b5110f76285279cc6ddaf1aa5b42162e7d9ccd5acc1a5c06aca454b1ef5e2 SHA512 51999ce3889d6cb671073e64f1c3c5e6cd9206e55cc20c12412f98a208b1b8d32c2e0cdcefea404d15566776861d7b60dbde7b0485491a0ca7935c773d87a1d8
 EBUILD llvm-libunwind-8.0.1.ebuild 3821 BLAKE2B 4855a5b1dbce552eed8887b6b6787c9c5a26c6b012e8140c2f31d5fb07fac9b2f30aed680068db4cd95294de91bcd5a71e6d23cbbd680f9d45c8d63cd1139deb SHA512 db30e0e4120ba7f8fd396b7452720637329d3007fef5ccec545d4d6040c3deaa27c423311b0034292fae6cd45ae2c4eec75dd884bd5d806e55da0cbf81fbe418
-EBUILD llvm-libunwind-9.0.1.ebuild 3364 BLAKE2B 37e179bf5c1f1b406f45f549e90df1f9943901a2c7a16b24130b94dd9f312655c50126f19c14475ac06a576b9bf5417e8ab2a7db91a20d9cb2eabdd4c670af57 SHA512 2a201148ae7c3983b4e60f64601ccbcf2bb3ceefa0dd6855ed0a3d022288fe3d4821f506a77bd5db4dd6850f1dab5882bd16ed1d8cc2727b5d5763268b875038
+EBUILD llvm-libunwind-9.0.1.ebuild 3363 BLAKE2B e6fa2592f1fed7adb612990ddd1f6ec765220c1ee05ec9b798bc7d74e89dc0ae56e5652864557d61c6fefc7c1bf9f7f286cafcf18f71bc3bb6ec033d069c8b65 SHA512 657b8bef8e262c08e1659da48996a08af9bb65e4ef2ae7c09ec2bbe5c3e5a4aec43be56707a9007dbb13a0d2247b4da8fa8e6eb8cd3c7c05adfaac1e80ab72ee
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..3891515f46e9
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+llvm.org_set_globals
+
+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}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+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)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake-utils_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-utils_src_configure
+	cmake-utils_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-utils_src_configure
+	cmake-utils_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-utils_src_make check-unwind
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
index e498caf14d22..39b185ef6458 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 13bd9f58b956..c15f2784794a 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,4 +1,4 @@
 AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
-EBUILD lwp-2.8.ebuild 522 BLAKE2B fb5f3ed46c3f5b025604f6e64d43fbad5d173c9319cfbe2792bdbf452a2525f71a4501ccccf3d89edd84ba7fb6f148faecfa00f6f3a2c95c48f69c17801ea38e SHA512 7f57ee9faeef1bfc493c1c6c7ab6b7aa5a6131d7861b0fa5aae82231103bc727a6d60e43206eacd22b029750460a4b8b71526ab32a567807ff1b24b85979ee58
+EBUILD lwp-2.8.ebuild 523 BLAKE2B 9de3799f20f44b68ff40cfa19e59015bc7821d9a67a5b7b2935e6bc31f9f3da42b61250c4f22c31caff925c77e539561f21ee9b61b92b18c91cef58f6c22cd73 SHA512 20f140f90d9255aae22076b1f95e8c9b1d4cc8e46fce3e1acff57f0ed05245b7a1be05f45190ea8bb5b34e0fef64acb28968237dc80c25cbacdbb8d2466db348
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/lwp-2.8.ebuild b/sys-libs/lwp/lwp-2.8.ebuild
index b84f7a29d53e..543249cb2e6a 100644
--- a/sys-libs/lwp/lwp-2.8.ebuild
+++ b/sys-libs/lwp/lwp-2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/sys-libs/mtdev/Manifest b/sys-libs/mtdev/Manifest
index 0dd144d6b728..3ac2b6eb0456 100644
--- a/sys-libs/mtdev/Manifest
+++ b/sys-libs/mtdev/Manifest
@@ -1,3 +1,5 @@
 DIST mtdev-1.1.5.tar.bz2 274162 BLAKE2B 4e73b3f25f9b3d42ffecb15018e57e7c50f1cb11c662cb5a5bbd2cf38272b98294362075e00277d4983e40f2779afef7d3fb1c6679e3f29117ce0f4c369fe27a SHA512 78477a4af784e3f846df867f1428ffdc458e3ff33d465d45a84247a7e52f0e215cace397d72be64f6e641f07e0b97a930eff0e07fe9507e0138fb028a4037d6d
-EBUILD mtdev-1.1.5.ebuild 560 BLAKE2B ccd7f5869dab60cfef8ba1449db106729c70159c71d2367d842075a23c859be24eb5e185bbbebec1140493a0cada679afb5094f8622c75d3a58de140f34f57ae SHA512 9f9b60c7932d1e0b598d0dd82cdd61344976c384d7d6def6c72895d44e353535f001b9d9fe992c7afc731d8de8e7ef2e04450f455d12d659a2de476cc36ec1bf
+DIST mtdev-1.1.6.tar.bz2 295965 BLAKE2B 212cf0f0bea0fc295528c90c6685770e88cb135a714cbf21e53b75ab2eaedd210269d073520e44c5bffafe8a5ecca521221061193725cba916bc2cf703fd5166 SHA512 859fb0803f330ecaae69f80713ff5a5235c0cb00de6d5ac2717ad82cea856a92b866f0c272ecfe743186abcf925f95585149ba4828b4c91555cfeb2f2a1c98f1
+EBUILD mtdev-1.1.5.ebuild 561 BLAKE2B f8fd507281724017404f1b7e61f95645831eba99fb69291a3693fa5bfbc118f98aae6e8b6348e28e2b4f7831dd4ecf51760942ae4468a618329afd46255ae641 SHA512 f8774b4038310097ec277947ba59e8558da442b32b3b28a9f3ff2038ccceac784743e44ae09096d3c8e7a5685e3b15e442672cafb0fe29334c4d5285c266998a
+EBUILD mtdev-1.1.6.ebuild 537 BLAKE2B 745473580ca6b167ce7acd2753803f460f75bd86c186a4a9933b345423d77fbc992fa89903fcc45935d04b4d7d83ca2289fdcb7f7dfd0cff8590826ee22458d4 SHA512 9a804a6528eb1a46ad959e20667266954951aa1fbc7c27938e5fbf541ba93d20309146062f6326c6a2133cff14ec9f363b547ac74d30dded192ac75c71487288
 MISC metadata.xml 307 BLAKE2B 111e26b23df5360c4b6326fe57a59b502da229e92c75a607db23174b31b5ecd9d5ddb2c14efc17aead6d1a17d4ba52f7fef09cbae87d9718c7c6ee6ccd630cee SHA512 5765f66767b8854edcb68efbed96d5ad33a6b9dee582020b742de2136c19050bde444ac16359cefbf7ee463c842eb2ab6c6a46564a034497683d158e2d841ad5
diff --git a/sys-libs/mtdev/mtdev-1.1.5.ebuild b/sys-libs/mtdev/mtdev-1.1.5.ebuild
index fb91e1e5754d..908881f02663 100644
--- a/sys-libs/mtdev/mtdev-1.1.5.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bitmath.org/code/mtdev/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/sys-libs/mtdev/mtdev-1.1.6.ebuild b/sys-libs/mtdev/mtdev-1.1.6.ebuild
new file mode 100644
index 000000000000..74a573cbaeae
--- /dev/null
+++ b/sys-libs/mtdev/mtdev-1.1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Multitouch Protocol Translation Library"
+HOMEPAGE="https://bitmath.org/code/mtdev/"
+SRC_URI="https://bitmath.org/code/mtdev/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-kernel/linux-headers-2.6.31"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 7639bc1b42d0..684d2156be6d 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,7 +4,7 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
 DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
-EBUILD musl-1.1.23.ebuild 3233 BLAKE2B 784b11a4445cd75a192b55a69fa9e79bcdca4a3da6c9998f50a8965ec16e9bf23a2b127812457659115dfacd14b4e4cc30a5dde0cee91e882a1587a93d358ad2 SHA512 a112488d751998b0e28a3a53f82c90ec9e6bf502612a40045bac4aa9d281e1f6117e1d816e19ee581f1cc4a4a85f5f9d611805bdf1e5e06ad494c3de17256213
-EBUILD musl-1.1.24.ebuild 3234 BLAKE2B e784ef6ad62c1e57f613f1d300002aaae92119f0a37f3725ec467ee0ea6cb53c862cd0e628921174bd0a6cea0cb00c36f69404a164cd2775149c8b9d769755b2 SHA512 8d3ea03acd7c9b0ab7cd472b4868f73274f831d44e28371e9389e170bcc8334566255a93270c9727eb15892ecf0e5ad16e2d01403801260843f03ca022265c76
-EBUILD musl-9999.ebuild 3238 BLAKE2B 0d6857023b89bddd2212b533ab83fab3608af6da4a639cec9c8b0d87646e0651a55816406419f687d64e2ed47aabf0d796cb1e0f0fe97a18ed4908670b9dd6e7 SHA512 f8b88325b39e4bde575419353ea0789a74b33381a5daad82a0bd8c544e1f1d6ca24869c03870670944242aeea7a0d6841cd8c4df8c90307aea60a280da3c98dc
+EBUILD musl-1.1.23.ebuild 3185 BLAKE2B 1026074140839609490b2317505d73158b1cef832c85dcb0e4f6c50083bffeddf9c67b72b7e36b8bf3e7f0f2c647200b43bfe72e7306f17e0532af80638543ea SHA512 df14c860cd56e9cd24f43c125174f2aed00ac0660c3f74a808a8b8d6c5b0f49ed7ab6e8d8c7c5725bc296a1c3c680708b3e5f72f8605e12ac9caca7147f9d73c
+EBUILD musl-1.1.24.ebuild 3191 BLAKE2B a58e17b751cbf37abd114f4b19621723da613f4396ad51cb9db10f01132a6d3813137db77d3dc6bd62e4632b4f213e6cab1dd25a40e11b410136546336077aa3 SHA512 9a26e02bd394a3b8339632fb58ad8e9387325b376d4de14efdcf6e6b0d0223af77a9421afe8a8679cf3ec7e185cd10705f16324378699f13e64085c2e19a0ba6
+EBUILD musl-9999.ebuild 3190 BLAKE2B bf8b78f641cea6c7159fc66cbd7baaf54439aac9323c57092a3d688166fd4c5a209ed12e5ebfbd9ce50feffe794778bd1b3a90d7239d966bd25e21110fd153df SHA512 89fc2bc34ae68f7ac8d824271cc2c6a9e24794d2eed23dc536bb711b82c9b8ab1fdd738453f35eef1eb1bc3b58ac9086b06a1f2f4183812d43f9fe15b22ac2cb
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 47c54d2eb79c..ec3d2f49819c 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -119,6 +119,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 
 	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index e6595cccd38b..7948e4dbf5b3 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -17,7 +17,7 @@ else
 	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 x86"
+	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -119,6 +119,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 
 	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9c1ddb9d501b..50beaf64e1aa 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -119,6 +119,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 
 	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index 4a53f0c30198..5f60106fc8e4 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -12,6 +12,6 @@ AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
-EBUILD ncurses-compat-5.9.ebuild 5312 BLAKE2B bf0dfb4a46d22726833ce3aeb799c6421a61c48aefc3c577432833c1701bee05682fdeb681d56416fcf42e81e6d2a8aa6cf4ca7347c0b16ec7f107f64883fa91 SHA512 534468aaec1773329c0237a9b5726bf0c2e58ee6149821266589c6d25cd53ac2d80feb0a676bbeedc38ecab9ed3d3ffac8b162e12cd6e9f9333d751136da7eb5
+EBUILD ncurses-compat-5.9.ebuild 5313 BLAKE2B c5324f05b14f2711842a28616175781894ff724dcd915a41b9a03ab95ded58ee01714e31cccd9d727a46c109973f26b8dad03f2954b55a43dbb7b3a8fc6cebb5 SHA512 a51b65c6ab091d703aad1d690d81b3e6d659e52144d1fa6384d87b515ed153995774b3679ef0568591eb8571e4e58b9fa30543804ca4fdbf257751d46e7eed0d
 EBUILD ncurses-compat-6.1_p20190609.ebuild 6351 BLAKE2B c9c47cd7d07fca186c627bb50a479882bbdb81697d1e6667b2725b139b9a212eaaff66c8c4114a38ff07cf24a113b333f10b6ac16a622669cde7627b45b1ed8c SHA512 b7bae0bcbe24fe6df80f83e385b94db94a4c4c1fb51c7562f83eeb399775f3db4e42665e0e1ad12100a7dc6f46b6135063306aed0403323e6cd7475c2e20f7d3
 MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
index 581e2a795c7f..e8c204848055 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 1ec624a9ace1..00732d245720 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -7,6 +7,6 @@ AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02
 DIST ncurses-6.1-20181020-patch.sh.bz2 361598 BLAKE2B e74f6b4e81c822ae500724ebe707031d3157190e96256656940241e4485fa3d96669e069e764cecc829d9fccccc11caaab8c68ae489b083ade4f286647ac74af SHA512 e54bf83cae5bae3ddb909b9bbe91f549b366a5c60b6274f6b27a3f28b5f9f1afe7263487db842f8cbc22a93e0ef17f0fd518a0585523116e192174f44423ae4a
 DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
-EBUILD ncurses-6.1_p20181020.ebuild 9293 BLAKE2B 1192a739a643440a028e8d2e0a8600f60850d36f5079b84880e5b7d9995404fb7205a0d58300a6243d29212e32f02b5ab5755d503b52144b8444e88b31c09b99 SHA512 771fae43358709b59638d8b229831998480292aa90b8e0daee867614878b5089fb5cdef1ca499440419cece47613742e57b64b3ac86babac243adff8f841e8e8
+EBUILD ncurses-6.1_p20181020.ebuild 9294 BLAKE2B 995003f692e45df5e8785949ed00392d365bb029c50bbd4e6657be66695d73cfbe77114e15b144bc9fc7891dab10f54a7c223ec0d4387b42a263cc7be5f973ac SHA512 df17bbd9832383d46a2d9da14419b78073509025864f42c828c568f19a2a069da5bf29423152304c4827586df9e253d7d1cfaa88fbc141321e2f502cf0ec9160
 EBUILD ncurses-6.1_p20190609.ebuild 9492 BLAKE2B 5bfdcef1c0b341153135d3867aef6b034bf5bdd9ec06e2f2e54789af401f9a9095508f3282c6b39be22890922a3a2f91094b8bcd2509476e5911d1c0fc772cb5 SHA512 3cf6ecef92c1311c2574ebd2672e66aaeeba7dafb3a1745e80ee880da425116334b0cf7971b1f43c1a2a11aede4ddbf99bd34d737a294f41f464445b93b3b5b3
 MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
index a3663edeedbf..31129aa97ebc 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 56dab347668f..25ea2de8b9cd 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,7 +1,7 @@
 DIST nss_wrapper-1.1.3.tar.gz 53543 BLAKE2B be7b30fab18c2e4749eefc0d3580879e33f88bad7f91b23734609fd9162b2c7119bb6867c9851c526a3dbcc296b07b6cb97234e5a892f329888b78aa843708f3 SHA512 c48b176dcd55d4de01ba2fc04e4c2ab9cb77f67d26d3a3464ca4292e607e21a621a582c21d00504c9cadb50a495f4b11b086e9decba28625cff4ff44e5d33c8d
 DIST nss_wrapper-1.1.5.tar.gz 55467 BLAKE2B 0959fd5c4dfe39d988d8e73d963d63a09408f4e1f4e3baa4f719b0c0d1bb11d715b3410352c4d795ffa949ff648e6f6b7b8e587804fc48b1c92abd721d838eb2 SHA512 fd5610c9c6a1159bed42e7b5f0490293575522a845ddf7455b74959360904f33dc9dad2361221366fcbce13b27148a0b7f3de295065f13540947fcfe768816ab
 DIST nss_wrapper-1.1.6.tar.gz 57893 BLAKE2B 4952b1af2b2b0487104b650b98694e5d39aed9edb44992d22e10ea38a2c4009f076aafa36f43775a021eca5b1f2708c9f42fa711d6715c43b077a9a3341570e8 SHA512 213d611abc072cb8d098b0782f661b4cdf1dcfd04fb564fb05034f023197aeed15a684478c660c00fb72f9438a192914e7b6878e505e4380435534bef52e0328
-EBUILD nss_wrapper-1.1.3.ebuild 711 BLAKE2B 08de5fb52071227491fa6765673afda1c116b6a742387c1a21820eb9f9ccb70aa5233d6edb174c7bf3a1ce7c920ad7680679c8fcdbea49ed322c2d093c48e7ca SHA512 a2af7c68b60243d08874c461e134c48cf4dbcb0737d6873336abebd5952d31179f02b65a3ef58753328e4809581a55560d126efccc64cbaf9a278eacfa7559c0
+EBUILD nss_wrapper-1.1.3.ebuild 712 BLAKE2B 76cdaeb9ba1a761f3f3787cdc241bf45fa495a7f8519a7dccbdf429058eaa72e4bbc7a6d363f3f03477d1db16ad76a6017dc5184cebfa7ae803fd1a6da5c0002 SHA512 28ce59d2922529133fcd7566832cd85fc608337b6178eb7fa2b55e373b71b1ebee2d8ab6f80708e77b0fe6fcd06ad1e2d6736769051b51e21b8f76174a8d54df
 EBUILD nss_wrapper-1.1.5.ebuild 465 BLAKE2B 61459b960bd935992c7dfbe35f6cd03083e523632e30f243fbb0c264700288a380fa8e741edd6856093303f4b89aef42621bbe4416f6f732ffd75f2a20ed10c3 SHA512 f4ac1d05739d3ec69653b803b01316ff1c1f4ced9c06c3ed194602400b8bcf1af3557a1098dfabb6c7f2a09ee2e23d15058232a4bb6c11d9f42349126b425297
 EBUILD nss_wrapper-1.1.6.ebuild 465 BLAKE2B 61459b960bd935992c7dfbe35f6cd03083e523632e30f243fbb0c264700288a380fa8e741edd6856093303f4b89aef42621bbe4416f6f732ffd75f2a20ed10c3 SHA512 f4ac1d05739d3ec69653b803b01316ff1c1f4ced9c06c3ed194602400b8bcf1af3557a1098dfabb6c7f2a09ee2e23d15058232a4bb6c11d9f42349126b425297
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
index 113b084510a5..aa8bf2b7cb2b 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/nss_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/obstack-standalone/Manifest b/sys-libs/obstack-standalone/Manifest
index a25352126fd7..6c5d2ede7937 100644
--- a/sys-libs/obstack-standalone/Manifest
+++ b/sys-libs/obstack-standalone/Manifest
@@ -1,3 +1,3 @@
 DIST obstack-standalone-1.1.tar.gz 11561 BLAKE2B c6eba8ed7e235dcdefcfa7244d6318c6ac4d4b6d12a8f4778753bbc762ec98439724e1e8bbba4b1a04fbbafe56a1634bbb1c604c4d5f30574da39c82d52ca1c1 SHA512 e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757
-EBUILD obstack-standalone-1.1.ebuild 768 BLAKE2B 649eb3b4fa5d5f72743b173c529a691078d6003a4cf4442de424f6d45b70c260deff7be13c8e0c0471a1c78b1293440ef37adccf73c1a32843633cb64fee65ad SHA512 62923c33708a70140ee00f9bb7749c50200a154499654898d1fd96c8d681574e22928b06eae4ab7e461a5119f888673f0290e38070cc1363e1a255778ccf8a00
+EBUILD obstack-standalone-1.1.ebuild 774 BLAKE2B 0493196826252536f6115f4aa9986989c8dd6403f370e7587b1f3b9b07c3d0e366f97e73dae3c9519887d45f75fb39f19bed1de41e72fb2c0c3d2139fb907c5d SHA512 424f303905ce98c696901d0dd605bb42d6ee0b3705be0f363572001c0eed10f5b098e929a0c5fcc294665b12bd654fb8271cef700d82f39b17b7c211e279973a
 MISC metadata.xml 338 BLAKE2B 7bcad55fd6a890dfba57ca1939daf33f3c2ccaeb892534a737bedc18b2737111e448ff29d2e3e3df68c9ec33447bb5b636a7d89d000b782e16bcbbb3db76e89d SHA512 6f45a428f15b9409ed7870393cc691f816484c47852dc76dfe64a46e4261beaf3a88ecabf0e42679265fdaad5c5b7321ae19df762e213d0102dcead5d1ab0797
diff --git a/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild b/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild
index c8c0ab0c8e2a..12d8cbc9eb24 100644
--- a/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild
+++ b/sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pullmoll/musl-obstack/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 217822506bfb..43b5425eb83e 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,4 +1,6 @@
 AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
 DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
-EBUILD pam-1.3.1-r1.ebuild 3344 BLAKE2B 3e96d05d66d6fec287be78c5dadae13da99e53b90eb37797add75463953c01039797d830fdfe9d7643daa3b90a5398ac672a095e12cd08d5ca3d9b0936b49501 SHA512 62ed8ab02208ca55b0f9ef0175269428a34d1bbb6c8f16a8618016c88c964b6a3e47afe5459b93b15f6e1e6ad705e3bbdc4a8833e4154686627a40e9f14b05ef
+DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
+EBUILD pam-1.3.1-r1.ebuild 3345 BLAKE2B 376d49efc72d9fe5fd9abc3d1e9bbedbf9d5e9f242a354b32408d7aec8db5d0b01b337ee6c8353f3e8ca265c4bee078dbeea5f25b79d041a3040495af28ead70 SHA512 f6caf8ba4dff19f2bf3303e4e8d3874ca8bdb73deff65c48d16768d52b7e8e82b26555471370118a6c8023b632336c65440abeefda779af05f5fd1d6cf5ab387
+EBUILD pam-1.3.1_p20200128.ebuild 3466 BLAKE2B 4a958bff4752dc22c23917954bc2d3b9164f34b084d9944205fb2b905edf75420edec3485bf7ab33fccaf44dfaf74224fb980f20cac9f06ee3911e4f22955d4a SHA512 9c1f9f32501c692b0e49a2e747eee668de89e01d94a399210c902481b1c7c4242d8b0d18d3bcf451bae0be6c25fcdd71a0bb2c8ab122e362935ea3373c2a2974
 MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/pam-1.3.1-r1.ebuild b/sys-libs/pam/pam-1.3.1-r1.ebuild
index 3956e3a3499b..ee93946e8608 100644
--- a/sys-libs/pam/pam-1.3.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
 
 BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pam/pam-1.3.1_p20200128.ebuild b/sys-libs/pam/pam-1.3.1_p20200128.ebuild
new file mode 100644
index 000000000000..85f031584204
--- /dev/null
+++ b/sys-libs/pam/pam-1.3.1_p20200128.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+
+COMMIT_HASH="4dd9b97b762cc73816cb867d49c9d0d0b91d642c"
+SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
+
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )"
+
+DEPEND="
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="sys-auth/pambase"
+
+S="${WORKDIR}/linux-${PN}-${COMMIT_HASH}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
+	touch ChangeLog || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up. #549684
+	unset BROWSER
+
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+
+	export ac_cv_header_xcrypt_h=no
+
+	local myconf=(
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--libdir=/usr/$(get_libdir)
+		--disable-prelude
+		--enable-doc
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable cracklib)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable nls)
+		$(use_enable pie)
+		$(use_enable selinux)
+		$(use_enable static-libs static)
+		--enable-isadir='.' #464016
+		)
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use selinux; then
+		dodir /usr/lib/tmpfiles.d
+		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
+d /run/sepermit 0755 root root
+EOF
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 89a2f1828239..98778707ba93 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 1399 BLAKE2B feda723e4f45896ac5c0ebc235370330888f919537ce079b463408642b4a4b48da2e92e815f0542e76f08608d3b83cdc9f455aeb5ed41ca99f34447b6ce86024 SHA512 a4c2ddbae6f784cd1afde0220192b6f2a2fc7adb648d8da9a2876d9f08a4e051e350491e0d48c13aee3e70970021d98df7773da74ffec99ae70e9ffe03648b94
+EBUILD pwdb-0.62-r1.ebuild 1400 BLAKE2B 1ecd4592774641d9cfb0fe4af79f4fa0f38c7f6086db228b6f7b437f80dfbfb4e33d306c61098580d84462131a6368539d42656be71e0633d2e27cc18cf030e6 SHA512 3e19c30d921a61d8e98fd29705b5e9f757b00f4e49afb0d5a080dfd56eb9891d3f49013b8ce10dc1e06c54c98aede92d007669bd8398e4a54f8e2560413be544
 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 9f2d4f13baf9..41285e12bace 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux"
 RESTRICT="test" #122603
 
diff --git a/sys-libs/queue-standalone/Manifest b/sys-libs/queue-standalone/Manifest
index 00578aa9635a..314d80207997 100644
--- a/sys-libs/queue-standalone/Manifest
+++ b/sys-libs/queue-standalone/Manifest
@@ -1,3 +1,3 @@
 AUX queue.h 19539 BLAKE2B e3a4433d8b0a36bf8beb2678521a45b104ee0bbed2c32cd52d8bc60443fe97aa682c78b3fa65b40813e6bd0cd3b6a6bf75836f630c83dcbf7ba6e682547c0879 SHA512 0bd66194fc3c6ee185948d17cc34475afd19a7a3b6c1d2531fb7fac68bee6fd170428188b2c0c74a918adbfded43c4fb36892823c78c197e0af484d24601adef
-EBUILD queue-standalone-0.1-r1.ebuild 423 BLAKE2B 4442c77d980e2503b055e805419030772f11ccfe6081edcc145df4874d3415ad6a5def295f931d9ca75f25f6425c6c41429fa386bdfc88989c13a2ebcf08be43 SHA512 f11c6c9f7de9bf35b49cb5813218d6136fa70be3c85fdbd6d3cc8038ae986492afc8e5bf8a72950a16ec9635ef2ba68ed7e6ea7569f32161cf87cc4cef654e03
+EBUILD queue-standalone-0.1-r1.ebuild 429 BLAKE2B 555d8f700fa306e5e5df7a30ac7cc6d1fab07095954b6e9d1f9fa061773bb803eb1dd4e51fdbe09138991bc43cebeb9008fe5f572c2697d163e7c54bfcfa065f SHA512 e51bee9ff8f0ffe4bea242e697e28a4bb6ce8221995d6896c6255150d97a85984f5e7c5024e1eb2234103a7346ed8e931814f1cc943877c4d299cad1f50195a2
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
index 29250dafba9d..133216a3d29b 100644
--- a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
+++ b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 
 DEPEND="
 	!sys-libs/glibc
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index ea700212ee67..d1f1ff661deb 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -23,8 +23,8 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393
 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
 DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
-EBUILD readline-6.3_p8-r3.ebuild 4368 BLAKE2B b9308a93bbedafd88a53d72b7011c2e0c57c8ba3be64cc19769ccd72ee22bf32e314def9607477d3e1749064245b6e32311c35efeeb20f715fcf2b67e38328c2 SHA512 adca104b265358729e3e736bbb5c1261c3f63b76e8d32db1b460060d9481f4bf7ee3d2d0d662659fc8b1a841bfb80bfb1b4394f4885160070a570031ef270f8a
-EBUILD readline-7.0_p5-r1.ebuild 4859 BLAKE2B d35369cacab95a988b8d5168ccdfc45e3a66b08483e6a0359b89adab78d5a3e90f3d893c544c3e36c3462b0cc3b0fa40620ca1a6f56f52f8d0169e49d71fda97 SHA512 861600127c9c1015182d70e264787079fa2d3e583bc5bd9b2b8ce6e0369e08172d03bf6daa1776d276ee275605c45b246b5f4f9460dbcacd5817c8200a9a5bec
+EBUILD readline-6.3_p8-r3.ebuild 4369 BLAKE2B 56745c4a1370762aec7400cd3bd51f4bca5ac8316a5a2d5e292e79aa6647f143a9e6c7a5b449abc4443c6c474a8ffd2c2c0fd2d151def10983127327259f38c4 SHA512 4c744b2801297d65d600c9d2812e0a95fd2bac456b1c0619fcf7875af2761688f075562c00808c72ae974bf0749bdbc46d5b6d810a8a9ff1021c13063abeae71
+EBUILD readline-7.0_p5-r1.ebuild 4860 BLAKE2B 2bdfc9253d1efccc2b2fdd9df631039d41692e8e392ac827b748142cc346b10a5bafd1d4e1fbf2238deabb32becc01c581a57cffd2caa549db79ae5e1eb52403 SHA512 48bb2ebd5d22a0b6ea7812896059e99f4302d04a7427e4c8c918cc1291b268976052d2b1b15f840724a2de9a27fb5290167ed6523c7419d237bb3a8fc14d066f
 EBUILD readline-8.0.ebuild 4790 BLAKE2B 42833b30980fc6593bf4d21a74866467f23c5814c7eed4f26cfbe16343f78c99ae2b4c340e2f8b893a8ba728e6f677ffda22e451eca6bc539a0ac8113a6a5f79 SHA512 f8763e2bb3900626e4392bf0afb8672778f105bcaad146b61a78cab36f6b4a5fcf14b019a202c514b73f64353af0b42ac320c81fc9ca12881c034f82daec7ec6
 EBUILD readline-8.0_p1-r1.ebuild 4856 BLAKE2B e2196b310a064d321278860c53eccfefedfec9411c11f632281496b9dff318a01e18156d7539bb35dc6366a2f025ca4211aba2cd8b8b70b8e05566c2d7188f6b SHA512 8d8709911c6fb4387097ec6d37334cb59b669a4eaa7ff0b4e0c171ca351e24f3008eabc44ba81a9214251412ee624668bee33b9396af3e818d3113ef25efe4ab
 EBUILD readline-8.0_p1.ebuild 4818 BLAKE2B 9088e7a27a355c2ee20e5ce491196b806df4480597a949c2a3191f306845abda51669aac2e9bfecd44fcd62a914f66c1ea789393ed6bf62bd1e2a66afab8181a SHA512 d414288e8c571712d311c874c1150ba1271bc48e574f3768eca30e4d8a99548b83d840a8e6356782d80d8bdec9de15ec39cbf93aa35c4ceaba1d53a03f767c58
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index 91d56d5d37ca..9c92a679f1a6 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-7.0_p5-r1.ebuild b/sys-libs/readline/readline-7.0_p5-r1.ebuild
index 0facdfe5f115..b502e8e4e7ec 100644
--- a/sys-libs/readline/readline-7.0_p5-r1.ebuild
+++ b/sys-libs/readline/readline-7.0_p5-r1.ebuild
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 2cc8fcef4793..cef2da209fb5 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 2263 BLAKE2B f124f916f16b1e97f3454296cd9593cd7ff4638f20947b6c447fb1f743b808bef3a0ab4cab837efee08fb2d443fc1f143bab777536ebb1d116006e8eb0ccfb44 SHA512 550a2fbd436865b4d6d16bdc54e0f09a2fb6d2f9505ad9d8774007e506070e0056119e07cfb9ede527e1b2aec1d90a205e461c93236bb926615c3087ac392f36
+EBUILD slang-2.3.2.ebuild 2264 BLAKE2B f04a296767d12b57931f2c122a7582d40cd77d5a2c3d1ba89481a1fef8b83da2aca54c78cc2e9a53f78e2566686ae302063450fde6a4333ab419c10b898bdab0 SHA512 034cb70b723e069337f5cfe1c298b78c9467d641f5fb59e2b222cbe9f345e09685baddb5bb6e68ec77463210bc598e7e35c275883cd80ada9e4b788af5c1b2b8
 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 53e42c82e2b9..5232ac35b2d5 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 4bf4d84cbe0e..0fa0e7197ce4 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -6,7 +6,7 @@ DIST talloc-2.3.0.tar.gz 642364 BLAKE2B 148ad3b478617c34c16c2ef454796a5dc918fc0a
 DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
 EBUILD talloc-2.1.14.ebuild 2406 BLAKE2B e47759baa6f8b010122d558ddc662fe137d95b778698acc50727d313161aa48c628c91be7fa8b07d936687e3a161ae200047865beedc48264fca3f684c990741 SHA512 faa3d8c4980117f8f9f4ea4f74354a1fc1b053d2ead9c0af9c42b8a722d15d00a654aa7cb622d2c6280475a755a0f156ba70a819804ff3c52e3708c218fe805b
 EBUILD talloc-2.1.16.ebuild 2489 BLAKE2B 848188f578dd882a44dfbe2ec34b5abac2a67b60014aac22aee172ff3f49031a7a142084d49754e127e601e7ff535c4ee316fb39f8edc545f26386a24cc7445a SHA512 9eb807f48e33dc7f872c1fec3ab3dd0aefc6266cbdba67047273d6a83d0b6f917e4a5395116d384887f338cad2b57d9132c0da00517aba87ff3999d8c40a80fd
-EBUILD talloc-2.1.9.ebuild 2442 BLAKE2B e0dfd5acb21db0e2b30964b8f044a4ead59bbb88b4f137677b16447d5335bd7e1669df66e4ff3bd8af3a301c8c89d17f0f50f18764821ef305b1a4e5d561da1c SHA512 5ba1bcefa06d03a291fd8d27a2035f7c99b7c25bbe938e24eb6d2fba5e677b3c166c2ce5e632cf33017d5e45579ad854535a6fdc8017f92a454aeaa4b789fa69
+EBUILD talloc-2.1.9.ebuild 2443 BLAKE2B 99310b382dd33a5a94b9a2e956a5ec80da65942f5ccd8410b3cefd237b9e620bcb2c89de010f2fd850c8530cdd3484aa5c3aa159967452c0ca6431ed4ca1a10f SHA512 769007c84ae061f07639f8bff048c63766465a30ba0baad4721041a5aae39b020377bb2dc3609674815bebcf698356ccfdb69ad701ec22f917adf3b635a4be5d
 EBUILD talloc-2.2.0.ebuild 2553 BLAKE2B fc33206c51c71db381a7dce3e7e973103b58787b7b1c4cd226c781be8aa0f674cc71d278cc84f3f529e375281ba44a83f06a834e05fddccbd2b9393c66aca812 SHA512 206c8d165f2852a56d893a95faa2809049638ea0a5c1d3eb6e4cced6a379c5e0a52886d543ee3e6184344e28416963bedf12098b35452bfd797a6a46571e96cd
 EBUILD talloc-2.3.0.ebuild 2554 BLAKE2B dc3077a2c115fcf39cc7f64a98c0e69b1b1ecab7b5ba489d8d6e8e8e1ac8956f373680c44db971366c1acfaf85b3717d75ce56724b21c658b4b3bec741716ba1 SHA512 7c1d0ae309dc12eeaee9c93551dc1d2dc60d3e0d489d0a540ac4e4d8e0668ea6fcacf591df37be8d3d475b548f421a1a58f50e8a632153c33eb592451089fb8f
 EBUILD talloc-2.3.1.ebuild 2556 BLAKE2B 1840f2cbecd04657b7fd7387a3456bd82f22c075b8c554acc52fc6a9d17d15701b097e76fd90dae201333c7262df2d42ecef34014dc0d7b95ca3fc8959c7fd88 SHA512 913c31fd91290e6e2e56b0396fa1c099ac65a8469f7efe80dfd4e3b5674160adb78b3712113e7ed6b28655f21cd2c3feb46162d2ad07bfdcbb10b018fb296da2
diff --git a/sys-libs/talloc/talloc-2.1.9.ebuild b/sys-libs/talloc/talloc-2.1.9.ebuild
index ee19333d1874..5132b6b4f514 100644
--- a/sys-libs/talloc/talloc-2.1.9.ebuild
+++ b/sys-libs/talloc/talloc-2.1.9.ebuild
@@ -14,7 +14,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 3f96c141b54e..2ab45b9323fa 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -4,7 +4,7 @@ DIST tdb-1.3.18.tar.gz 697970 BLAKE2B a6dff8dbe444ce35f6470dae7da1b6719052fb2030
 DIST tdb-1.4.0.tar.gz 696994 BLAKE2B f1dc29d3a66bd898f0e69f195879aea56235c1b6f542c532b4335d87482a5a2d8a8bc9bd5b463a0a110431535a2b0ccebb779449536696e0b5aa7ea5f3bce02c SHA512 3c5e17f8011e61e855a745dbff18ba9f778534f34e1538a68c8854d8d1022494bcc3bf7a19f2b79c478e091b1b6b183723fe27b935c4cc6d058b6b147b6a325e
 DIST tdb-1.4.2.tar.gz 706236 BLAKE2B 5ec8938f2e62c146c73d8ef01dd73bc44f38df2ea65b9cd62694bfc532315ab8b0594975e5edfccd84f3ad504dbfc6eb08be96d9d0e5b679f2613c2f69a5f58b SHA512 1d1f83e1b79cc6ea2b5cbc755de4a370fb95ef0f592f3bd2b6d23b1be18555cd417a9254fdf276dc6bd7f3368af82a4569c1f1cdde13d98405a5d38f1291d832
 DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a
-EBUILD tdb-1.3.13.ebuild 1369 BLAKE2B 2a879b59b193e97a380f4a8650f3779a5be8aee89ba37d3c49e5bbfb3f281f9e44680cf2ec3f3884ed7984171c60ba645acf7015f4660037e96f731bd7fbabe1 SHA512 83682c2f962ea258ad2c8e4fe1d1f955f61cdd68cfcf6163b881ab9f7a9039e21806565f2508983657bbb0aaebb36e7a03c935817b18a52165f1c4bea8ff3322
+EBUILD tdb-1.3.13.ebuild 1370 BLAKE2B a862716cb4e846645c1fe3747ee2b6bdafc57445b49f5a6cd7b0b4e0ffcdc1ebd975aed9523dc8153f0cc82b74feeff06ae2f77dd24ad9a64c7090e2fa1d176f SHA512 34bad34a62752075a70f8c3360f797c7b07a38b0917d8fa51e465888715850cd004afa46a4c4a992cb14a37d4419d416c77dab09c454a38459085cccfca89d21
 EBUILD tdb-1.3.16.ebuild 1365 BLAKE2B 81363e33a477a476cb65c6d25901a3aaa536e34a7c700fd4b1bb79e1b7900672abfaff10ed78699b8d4e7325967f97125a1ca262fda6bebc9984936b6112134c SHA512 d73d8f8759cedcf2f66d2bc02e7dded4229bf464b881b25eebdee65365fce43f58f5943e04eddb67433754cf598b1ec7f26e466489a2e8cdd4e6934cbebb8732
 EBUILD tdb-1.3.18.ebuild 1391 BLAKE2B eb60f2b7f563dd98e68f0e748c4ec0cd657f27b7a822edb4e4de8f2b44f5cbd0325ea310715db9f72862cc385cc4948dab2bc5e11cba186bbe64e49a7bb126a9 SHA512 5c110f2a45565cc7ae3e7814bba00f3e650044cc8ec80a05ff0abf2c7790961a7c8dc51af1024bc446e2d19ed524250f0b9491c9ba592450bf427c3467aaf85f
 EBUILD tdb-1.4.0.ebuild 1390 BLAKE2B 2081183ed51727830d40cc40aa73c8959cc00b2b5b8108be47e3a3f740b6b9fd137c49ccf733e6499a98f4927dea67dea97d6f9d01075f2de8b2ade7b12199bd SHA512 463b6f80b68d280c025597f8e16bb8148a4a4a8b1941d7f29284054cd36827629ba9a79cf9f3dcffaefba612e41e6b17aace491cbdede0cdcbaa2cfd0ae49b1c
diff --git a/sys-libs/tdb/tdb-1.3.13.ebuild b/sys-libs/tdb/tdb-1.3.13.ebuild
index 5dd93a183dfd..245e7f024d98 100644
--- a/sys-libs/tdb/tdb-1.3.13.ebuild
+++ b/sys-libs/tdb/tdb-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 28971e1f4f9c..be56252fd45a 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -7,7 +7,7 @@ DIST tevent-0.9.39.tar.gz 795796 BLAKE2B a352d2730f4d480f18559ac01b82354914ebf3c
 EBUILD tevent-0.10.0.ebuild 1634 BLAKE2B ed2eff1acb389c45cda1a3fb9506710edb17ed98f915978728f1d5bb8622901ea7301fd972951bc5e7a9f31094095653cb856e02eba1c012ff9ba563669c0a4b SHA512 f0f1865a7205940eb448db251b428bcc6351565591740473cbba14922f59dcc32b7499def802964156387faffc8849afc5c568db5d75603d4154b6978f3e4cab
 EBUILD tevent-0.10.1.ebuild 1642 BLAKE2B 16201c77ac8b9359b637945a862639a3eeaff5c06834dba7972b298df013dfac61834641361ba3d59367f5c9ec79a6225372b2632727c777b8d6b646ce814ae7 SHA512 e2e81915ec4670d6967e3f5c3f7fb9c286191c5faa74167b078cd7001561acbd440ed1a6f693b8745af24c36cc639bbd54a8a2498ac68c31d246564f6a6241b4
 EBUILD tevent-0.10.2.ebuild 1644 BLAKE2B b0cc506aec022b92cc0038f4675f74200d4a8eb94289a35192b64b814dccc7a35d81cf51c346462fd5f1b8ffaf9e5dc3908d2989541b1952a83be41af1ebb66f SHA512 3e4999aea5d2d5416b66b6c48a94e113d8afa1a85aa06d93bff88ecccef277f847b64dabf200390f4084f560c20e50cf728a80024d090dc4859ff4e625dd6559
-EBUILD tevent-0.9.31-r1.ebuild 1408 BLAKE2B 078ae3d6da81680ecca2917150e204b0cb7714105325716cc8dedea420f9ab8d294840e9c7a589094782e459ae8d81c7004798eb4af7dbc4867ab4c51443f2c3 SHA512 af5e9cce3d24ed7c0849854e83beae321475a2a1cd0ab19816fe6dabd5257241a24714245b4a8f7460b94064cb63a0a3d5c54b5677921289864c522a036da1e4
+EBUILD tevent-0.9.31-r1.ebuild 1409 BLAKE2B 5db9df0f01141e5f9ce2f6ab38689ec06db25f67729e28abd522e4e672988dd7c93c33ae55a1a638eeeceb55f0958244de59274ee489e7aec947515555d0ba1a SHA512 45591e44604a9c005ea73886b7ed3a60340323b664a3b9e4dc573fa0ac0b6bbad4d40041cf08f8ca24074ec29eb18bd2b1063232a48970a583048f799cc8d8f7
 EBUILD tevent-0.9.37.ebuild 1609 BLAKE2B 4e4068500bdceb6bea30f0a33bc3e70659798886dfdd78b92a011192fce34b8aea4b7c96bb18a080a8e44a773fb7241dbcd49c9ae460986c2c68e8d638807f85 SHA512 24f3374305dc70e31070bc3c8da181f1c96a0323f7baee96768372609b33e48eb27b16093bb58670743fdff280afae6e3841aa8840c8dc4e0dc48928d2b4bcfa
 EBUILD tevent-0.9.39.ebuild 1643 BLAKE2B 82c7ba0e32d99665d9f008e1b2de3c30003e32d58ae1e3d5fb5af49262bb7b9cad61e696e8b9c10515c8a6c56e595e99b283274edb35275a4d31f6dc34ce0145 SHA512 79018f60e61cc9b75fd2282f4ae56f99dce2d5b38d2f94eec34b2808f8456c996c88b943413d7dde31fe8c5ad9ee3bb91b200c1485f243e7ee78577b8c14f7ea
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.9.31-r1.ebuild b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
index 0997facac158..e9f10a692106 100644
--- a/sys-libs/tevent/tevent-0.9.31-r1.ebuild
+++ b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE="python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 0546dbd22b5a..16b278b1879a 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,6 +2,6 @@ DIST tzcode2019b.tar.gz 251196 BLAKE2B 73ed8d44675a25e0497b77cc20ca3cc5b137297e4
 DIST tzcode2019c.tar.gz 253560 BLAKE2B 62552e7e78ebb50c111f9a99119843fe9b5dad9e1abb5ba0f1cf0a931cf00fc49684a6b378f5ea4cb31aca8af5b0c3b697b87048ef36a445536ec2fc5b943440 SHA512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b
 DIST tzdata2019b.tar.gz 384667 BLAKE2B c045d137cbb09e1109916dfdb1265ceb560d589ded9b05aa0cfe75f5fcb19057ded4d4f12f47c895020ed02bc4138de995eadac497eb3663579b094164d7e3ad SHA512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
 DIST tzdata2019c.tar.gz 392087 BLAKE2B d7a21e57391d321b5c84e1ba2286ff0dd154c435d40015d999c8c6f2f1bea3c13d832c0752af313c9aa4dafe6a261e1e92bfd79523448fcd585188a53454e31a SHA512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
-EBUILD timezone-data-2019b-r2.ebuild 5134 BLAKE2B 0736c4e91434aa9832c7a8f8e7aeffea105f16d9de0ac02422d3fefe717aae258b3df5d20c9f5537fdef5c0daeb0ff9630251ccc74be5dad63f75719320bf500 SHA512 c8649a117b780a6978c412ef6207f205bad0e3ae62c1f65482c23e60148eef03711b03d8320fd3d30c43993992be8d7787522bee68d6d5540f3dcef76499f5c5
-EBUILD timezone-data-2019c.ebuild 5134 BLAKE2B 0736c4e91434aa9832c7a8f8e7aeffea105f16d9de0ac02422d3fefe717aae258b3df5d20c9f5537fdef5c0daeb0ff9630251ccc74be5dad63f75719320bf500 SHA512 c8649a117b780a6978c412ef6207f205bad0e3ae62c1f65482c23e60148eef03711b03d8320fd3d30c43993992be8d7787522bee68d6d5540f3dcef76499f5c5
+EBUILD timezone-data-2019b-r2.ebuild 5135 BLAKE2B 501d0519f4bcc147953e7043c9ea4fcdb9e97e66fd27ad78c5a94f51ed12221ba53f8bba45a2857b2680ae3acb04ac5edd1d8b9c645526cc3313b2e4172778fa SHA512 450fb833ebc30e40a57c26212bbe01e50907f5b419ff25d0bc0620d56f5248e6eaa94e3e023438770a448193230b28377ec3e1a7354d816bf2dbfd0bc3c0f7a3
+EBUILD timezone-data-2019c.ebuild 5135 BLAKE2B 501d0519f4bcc147953e7043c9ea4fcdb9e97e66fd27ad78c5a94f51ed12221ba53f8bba45a2857b2680ae3acb04ac5edd1d8b9c645526cc3313b2e4172778fa SHA512 450fb833ebc30e40a57c26212bbe01e50907f5b419ff25d0bc0620d56f5248e6eaa94e3e023438770a448193230b28377ec3e1a7354d816bf2dbfd0bc3c0f7a3
 MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
index 7d7b49503a9c..8221e763809b 100644
--- a/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019b-r2.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/timezone-data/timezone-data-2019c.ebuild b/sys-libs/timezone-data/timezone-data-2019c.ebuild
index 7d7b49503a9c..8221e763809b 100644
--- a/sys-libs/timezone-data/timezone-data-2019c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019c.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index ca2e83e3d336..b602b92c4e38 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -3,8 +3,8 @@ AUX uclibc-ng-1.0.30-fix-ld.so.cache.patch 1515 BLAKE2B 20f317c623cf66f835191563
 DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac SHA512 ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742
 DIST uClibc-ng-1.0.31.tar.bz2 2351728 BLAKE2B e2cad8500fdafdd98db11cbc756f3277845fedf545598c9861b1d1ef51b3a24744afe635d6894929eb537891323b0627577c2a5e5dbe1ff0ae588c5aa53a1219 SHA512 489e5f5e8952ebfad1d8a5528a04420d9d2e58fa5092029ccdae91d81dfcf8b3e00092453432da94c76fc18cab542192040bfb271e367fa42ca4926f4b45c372
 DIST uClibc-ng-1.0.32.tar.bz2 2352471 BLAKE2B 887b67f7f03fc8610d8236a18f90584720a78bfc3a036cd6616453bea6e31140f5fd1dfd1d207cc5100854bf3e0c5cc1ca38fe6c31cf97b631892767ae23ec27 SHA512 1de5d4e99b94eeeada4233c53a95ea1b9e704ce1d4aa19ca9b17535c0328b2372ed93d24591c6ea5bfbc0b950aa575c18dcf6950fb04342924bb2b5f9ee235e8
-EBUILD uclibc-ng-1.0.30-r1.ebuild 10381 BLAKE2B 9603fb34fa34c8fee8e32accb2adc68636fd63984ceff1217a5af92537c72a0e933f2b60a70a5b2127817bbb1dc958fde328e2fc4f528f54d4d24071be4f147d SHA512 e921cfaeef385e651e658260681d85741bf90d2d25f735261232a8ba90d4e32839a694ddc4c9c4bb994aae90d2c79a608eeaba0c76f3c29fab094cab940f6099
-EBUILD uclibc-ng-1.0.31.ebuild 10315 BLAKE2B 051e10123378e7c7b4639e030554a60e7305311428aef3e74accc515eecc07ac18b3102ba40e05eec8564c19f24c458d12698d3a2c2261ce9b15af08285a27c9 SHA512 e9e09606d44b850304356f400b5b2cb782b8a429e14bfc703d381298c63da9feff05785038a4321452c64b7c7b15c64a5da10351ff9f9245e61f726bfe8b22f5
-EBUILD uclibc-ng-1.0.32.ebuild 10331 BLAKE2B 57e88542b53d6e5456efcb597b1d9db8a6b19113582fb4742c8ff7de819bb556d3229ec2ff6adf809d12ce045225cb27f5bf52050c0884f7f169200db8afe083 SHA512 915e6fa543a913b72c0d03bf7d1fc49f3ba689cccefe8ca7e4bdc309c339ab9b79b7da38b2ca8e9e41e92ecc8171e9412edc503b034ad5925fe1ccc9e7b5a936
-EBUILD uclibc-ng-9999.ebuild 10339 BLAKE2B 57a5c4ad7b5d6aee65872bde3af3712826ae910631b44606454e66de69dca49aa7339746929e1bbcb0cc67de1bb72fc0e4c8e8042e85be27464d3b7f61ee838e SHA512 db0ca38f425b956ce02b9a43202f19d8ec3ea16c303ddc31b7982f7617005cade3406af666506a320332a9fc5c4e2d07b1bbdefa836a78d8684b7231e1b30565
+EBUILD uclibc-ng-1.0.30-r1.ebuild 10333 BLAKE2B ffa5feeb97445afc2e383dedcc1bc9a323c555f6e6804bc5a36fc94fffd61ae1924de915dd502c0201bf05c458a8ccdb855cfd823392bdf9414fcb168834c035 SHA512 f58101bbdc06e4c8f1174bd03eec3cb0618f348960f4e9c920d9e5a96a48b57077248e47899b31280f23aedb0a359400a89faabff9371bdb07a9987b1e1fd659
+EBUILD uclibc-ng-1.0.31.ebuild 10267 BLAKE2B 025e6c32ea7b912e023c5aea52bf25cfab558490203faef255a9df706db8a1b77c011a6e953936523239fae4916beb163185a5069509252db9d7201e1548e6d5 SHA512 702bb92fef6d0cd575aca7368a87ad3d529a191384686a2201aede6303af5d1472efa2a19d03693c6111ecf65bfc4d20d61447f17648c07aee77368d0447fd34
+EBUILD uclibc-ng-1.0.32.ebuild 10283 BLAKE2B c62bcdc2976c3856b1588521df51b4cc73aecb4f7d071345fa73e4eae56590affdfe2bb6a6dfbb5502c737f96e91629e52150684a9287c4bd0d6f53ab1af2c7c SHA512 21140aa3c9f86262f6a5a7d3c44115fd1ab515966c27d54edb2db535cdd82bd1b7cb4ff2555261082d2a66f7466b257851bede3a2b36cd6da4adfd69e2244b0e
+EBUILD uclibc-ng-9999.ebuild 10291 BLAKE2B eb05c3ddf01a6654dde891395cf530662f6310ad1d20743f27a63f8c019a06ab06d84a7cb7e4a961de4575a574b9bc74779b96d292d73d31a5b9e07ef9c47a63 SHA512 19254a93c71a4d5bc3eea3f3d49b0f507fa28770c8e88265a461f3826f09f2e58318500c75e9d6a8f4dcd4d171ceb0c1edd2a9cf892cd768c93a726f60e3b0e5
 MISC metadata.xml 790 BLAKE2B b48396e1f8dca79f2b9e452982007573959e89ab8467e2c0d65863a0c00dee140f9a7a5a4f02c916da76018dacdcd9993434c30ba0a511888248f83a9c063e7f SHA512 a8e955511974be64f2360c16a883eec4b9450eebb393bee5f97b50e233275de1cce62e2ef3b9945174a9dca19a7f30aaab6e90c5c28f283c378709eb3fab3ac4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
index a795cffae546..375d030fc404 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
@@ -400,6 +400,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 	# update cache before reloading init
 	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
index 93b0b01a0fc1..48fcf29fa83f 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
@@ -397,6 +397,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 	# update cache before reloading init
 	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
index 82ccf77573e2..fffc7f103fb8 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
@@ -399,6 +399,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 	# update cache before reloading init
 	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 46dcc44af01a..5ef7e61a3a91 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -399,6 +399,4 @@ pkg_postinst() {
 	[ "${ROOT}" != "/" ] && return 0
 	# update cache before reloading init
 	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
 }
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index b00e40ca9205..1fca5f86fd4b 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -2,7 +2,7 @@ DIST uid_wrapper-1.2.1-alpha_fix.patch 932 BLAKE2B 14cb3215472037b528a20da8d72cb
 DIST uid_wrapper-1.2.1.tar.gz 311002 BLAKE2B 30430c21df36095d8c71a7fcdef3cd71585d7c152acbab2c58c6876de5d4b6c0a7053c4d404c4d949c565b18218097023d87631573355e2e6b555dbc0322acd3 SHA512 563577bf3f4ca2989040635301faccc198da34a30b6998370d376f8df8c689953d2f10474efc926cb06d23e565cee32b4f59fce87546c3620d55cd9f7e0cf543
 DIST uid_wrapper-1.2.4.tar.gz 311811 BLAKE2B d7c309e020cfb2a1024fa74fc71cb598827ed55547613d7e0a7e60b13ca1c1cf9c2b44e6fc5f6f5c62d0df2f8b0090c62a94f5724cc997d324abd8d32c74fdaf SHA512 212b35f7d0655611c5bb7927e4e29049ce79a4e677805fa7154142dff559ddc6dd7117a4c94314b69e27c954ff03ef49470ed69e2405cf46b5958643c6021d3b
 DIST uid_wrapper-1.2.7.tar.gz 47580 BLAKE2B f33a2a29a3e61315ae48317b759898cabcfcc50f72a7fac9388b2b5791a76f66e88a6339ca45c319df102354d592d6a26c8046193b7c4d07c4e4ce3f4031672e SHA512 ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
-EBUILD uid_wrapper-1.2.1.ebuild 1131 BLAKE2B c0fa7fcc6d408b76db22caa4a4a9f71eafbe9cd571b1926b1bf755d534d209ec3e24e9d8f86240cde2ba6efa1bf205bfe6cbb93c1a521d4a4288ecb3f39a75e6 SHA512 2b888da5b42b3c49ededb45287c7f4a79401527d0b4fb134771003974e232c57380e53b628127967a2a6f1425d32af9c0512c1b0213f7d501ad050c0a6b5d765
+EBUILD uid_wrapper-1.2.1.ebuild 1132 BLAKE2B aaa2e944bb9fee151703fb17349b8c07d8015fd711ebebee65cca7c500f2426e64e323f99bd5267f744d1eab05ab92791f44b95ba190c034629b2fb8fa034398 SHA512 a17a183c9d0fc9fbe61fb9ce85d9ef38af345ae8f84e20dca5dfa33600502240ed98d9d97211944c7d5e8e4c3701714d6029c6a9a4128cd8916b52ece7d5cd62
 EBUILD uid_wrapper-1.2.4.ebuild 507 BLAKE2B 5177ac0edd8a4095f36a68045fc4ed54e84a508051efc18bfe9b0ba03702e2a3d0e70b5b005cd3a406cbfdaeda91146e7c5ea26e883dee9c0412eae3a33dc2c7 SHA512 818cc73b380bb0bcec3ab982e67fbfa669c36e16724e0a37c885dcc6df32fb35179bfc249dcda729d5d5d6736825a6481057460e348bd091097ac7df4851a277
 EBUILD uid_wrapper-1.2.7.ebuild 507 BLAKE2B c7985fa908ddb0b0aae3740b8a6ae26070814e29913a21620c7c82ed29eea6368c490796a5610b0d8b4aee598f1bc8754b9a208ba998ef0428ae02f75834c3b5 SHA512 71286c0dda30951876b0fb3fbb0400c0d6006a3c7535b8a3b1e9e413ff1854971182bb8345b7e5ac29978efd85a8eb18a0309e74ebcf50708277d4a7fedfd9b6
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
index 3e097e619161..532018b18130 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index e50bdea98327..5abd7fc14e76 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
 AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD zlib-1.2.11-r2.ebuild 3101 BLAKE2B c53e08cad8a08e0e8092f4ce161b33dfe27103a1bab670aeabc7ba5dd9dc3483c3f390f5484a1ccb3cd3316c21a60f4d37c3940ccbb90744dadacb4a9d352a73 SHA512 db677f86a7b95425ea1239ad2cef589d76ff08ee24cf29aa92b76a5c1c597f70929c36e9329a76558339742846aecadf6d435d864b4348395bacd4e6643082c4
+EBUILD zlib-1.2.11-r2.ebuild 3102 BLAKE2B 1ea1a94df78ea9cee3ee9518e267b605bc262f1069cf3e793fa61894a4bed7d1848d53c6b181c8522a75609413718773e5bc968f5ef1a905994123b8169e511f SHA512 1e2e1f63a4a3b7b5160148c5882c04287dad887368300ce99ef98d4275315d9b2b8a5ff3af9f0315390c2f2442cf08b0a2731450434f1d7f284ca29e25b32fac
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index 14bd33c0c41b..f1a380d38dea 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /sys-libs
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)