gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-libs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
174 files changed, 2203 insertions, 2539 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5d2342577997..a7f2f4af2491 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 4afb11af5109..7cc8a9d66def 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,22 +1,7 @@
-DIST binutils-2.27-patches-1.0.tar.xz 8852 BLAKE2B 6cc15efef1fce0e287bd3d467053451f8d1f5a645d0588c872ea6b055f3479a507273f9374a8ce30131e8ff0437cab9e3eac2959682393d4685041265f3f10fc SHA512 489b5fff87886682d8e98eafa2f082e6dcf811d2a693b6c41d76bd1ac50815a6e7d26fb7c9e3811c2d8e0e1dc307557e6ffe46d1d0f7caeb581060cf14bda899
-DIST binutils-2.27.tar.bz2 26099568 BLAKE2B e9433b4dc28b0aeaa31d21fc039459e73c47050bb79dc0cf3f00e384604c37c0c1704ac6cba79c6b15edcbfd13f17b8013efeaca422d5b0e5a7f60c202fc5d18 SHA512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb
-DIST binutils-2.28.1-patches-1.0.tar.xz 19772 BLAKE2B 146b393b49ba868c7c064c58275ba1af3b7cbc7e97cc55b03c80d8b391955c40dd4e81ac4eeabcdfb53e41ea334a377d86300e037f8ccb810555a48dfa9da878 SHA512 c2c7d22e1013e79040c4dcb4d70649e78a070976ba3a4bc2ceb4805827b9d93eea1805c85db4fcb6b31be5218c3d7b42a4990437a7c01dc01fd7e9dedb606828
-DIST binutils-2.28.1.tar.bz2 28120394 BLAKE2B 3a0ed2bcf0c859638546b7460d9e6f0a55518402ff0c65c90ce462a318f5ae6690961616d188ce6cf0271c9f2fb8b7902782d32cf0e711068c53d3d06956d89e SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb
-DIST binutils-2.29.1-patches-2.tar.xz 18528 BLAKE2B 514496d6c9609362782d66b6cecbe3fe617f96dfb86e174a80d0b9113cbd4fce9d760fa61660ba2cfafbe1e482e955391cb8d3ef78d2c166c82796416a7ee106 SHA512 b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0
-DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878 SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
-DIST binutils-2.30-patches-5.tar.xz 590864 BLAKE2B 71de4d08f92ab1898ad576a21763f955067cbbed543250888e0c5d51f4ef77d0d829049e9a835691cf2de03965fbcc9bcfa092eb304c03f9b885e7a3dadab286 SHA512 029b3be6ae9b8620f8580a35701bd4517b4e0232ff3cf9983b3808475c7443cbf500b6cace2c052df0bd1e47202838f4d2453238db28709a947117071d9ae804
-DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b19294c0be09ebdff2fc4533dd16116fcd4f4a1b4c8db02233dabe33ca68347e0a30e542456988a4ead407edb47ed031e018c SHA512 c84ff9cd9f5b1e313e93d0f25bb4244950a73e0d97ec4dacb8763382219a08a01b16a8e93173032232ea4239098b29448331ed461f792e663e1117eb0811f85b
-DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-EBUILD binutils-libs-2.27.ebuild 2825 BLAKE2B e5954627842425182792b369dd7c14a22a4abc19f812487196d65870273b2866c6716237dfe2f5746300882f1f0ec2f73ca891c865ac8afd2996b4d4460bc5e4 SHA512 3315ccbfb1e83ecee0174007141168e2345183ff3b95db266513bbe435c207d348f60ed7e8c701b4eadcf2aeefcc8f41c8f3198b260b258100dbb4f8e6ba0d55
-EBUILD binutils-libs-2.28.1.ebuild 2850 BLAKE2B 57b3e0b62ca8539dee42212155d8b1a1de8d59f1ad8664f267e33d02a9bc835c6dac0f4992bf8dc83c166f23364b241f52fd19dcf2bcb6dbc8c374048af82fe9 SHA512 1daa6865a61a619c856186402fa64cff4bd0be3cb76e45300dc4f58fe2df2cfd523a883e74904e650a4e52dc407175602ec3b65c8964a314a35f679d86491426
-EBUILD binutils-libs-2.29.1-r1.ebuild 2899 BLAKE2B 4f2469ace95d68e9f9a8bf8c820758543eac6ac8b266ae8bc0460f5f66eabb0cd93519023487e4cc40aab918e10dd891c365daadeec538c5f9cf98a5ff3cd3e8 SHA512 a4453c637003017dbf893e35502005d370e5bfeef2cae062df8d0c1c1590b9bb3417beea2eb31525d08711ff600df9580d8c807c7d72108a1208a241f9fba5b4
-EBUILD binutils-libs-2.30-r4.ebuild 3571 BLAKE2B 7512f15d93977c198a7fd29f6d85da5725420b50deb6bcf7e6fcf9eb4617d73b587c3e3b9a7c93c4ba5baedef14f98b3bd1ff5056fd7eadef7c415cd6460fa64 SHA512 5c9b3d31437685d90aa6af8403607d152a87d8e226e6780b0e6691dc887dc4fdade8fbff6457393a042f6818b2b936fa1ff3aa3aadabf109f99eb3a525061310
-EBUILD binutils-libs-2.31.1-r6.ebuild 3550 BLAKE2B 07d3d200bec74033a23c03177ce451f4b132a2a16cadeb47af85859c38a278f4889aa154af8967a3c4163828f6ac248b3990634cb848f88fe163b8db9a176950 SHA512 6fb3041aa547df222800c138791dd1b55e738895c404d709b30c244ab03ad0a05896e2ca35ce913388384a0001bf01bf428bb8e06ada095380b3c52404f0d068
 EBUILD binutils-libs-2.32-r1.ebuild 3674 BLAKE2B 89d175ce636893bf35ad719eee7b60fdbd18ad6bf21841bba1e619681e7d9ea485bc3d10de6513d6a0b1251687f6c787862320a3c4b3089845abdf55a058914f SHA512 b2da4f468ee714b7dbaf7fcb1d72039330d45442dc1ff10aad72478ee3ed85b22ff33656143c0d9a4116cca063744199d96145fd1bb788f4b4647e571a5af3bf
 EBUILD binutils-libs-2.33.1.ebuild 3565 BLAKE2B a21ad6b0ee10f11cb18c20201b96dff49f7ac7f59e4fef4dd3e42d50393a16fc2ba981ec48784d5522da00db24af3f37544ea05c796ee00adeb88bc0e66c90f1 SHA512 209fd420f25471252989896e1b715bf7876a72019354e379d82ba32a157a4e9f98e1a835984292ec8a2e0ff476a8121de5e9d4a83ff403b773a05f8a29ed9f20
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
deleted file mode 100644
index d0af54dd79a4..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="1.0"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-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() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-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
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
deleted file mode 100644
index 27973ddc6bca..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="1.0"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	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() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-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
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
deleted file mode 100644
index 397ff492d0b7..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="2"
-PATCH_BINUTILS_VER="2.29.1"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	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() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-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
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
deleted file mode 100644
index 9f87b8426a73..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_VER=5
-
-inherit eutils 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 )"
-# The shared lib SONAMEs use the ${PV} in them.
-# -r1 is a one-off subslot bump where SONAME changed for bug #666100
-SLOT="0/${PV}-r1"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	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
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-	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[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
deleted file mode 100644
index 37c03f645e74..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_VER=7
-PATCH_DEV=dilfridge
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-# -r1 is a one-off subslot bump where SONAME changed for bug #666100
-SLOT="0/${PV}-r1"
-IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	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
-		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[@]}"
-}
-
-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 7c055e15c401..ff571d0c4599 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,18 +1,18 @@
 AUX 7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B be7e9a2cbab8b3bd110346f6c8bda30d104397601950c995b77388fcb91e53ca82f5d3574931c58244403eee698f01209ca9e704fd4c6b9b3ef08e68d41dbea7 SHA512 656a7bbdcf0f678814d0ad0ff56ce43b7fc48c7a549373a4ef77e74490437283c5834e86b1b4e8bcb85578953687d79474ef2bf494c7eed4cf7fa1f17003f385
 AUX 7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch 4161 BLAKE2B 3db2dcebf70ca3e7c399dfb22d8ae50d51863f7a8a15a10b0232f73d4fc2ee0b51ff67e8842b0e4d29dd41e60a326c90670f62a431ca593617f566e03bc7f90a SHA512 2f03f4d0232b600861de0c527d6bef26b0e3273865a7d7344e083a6a7de4033de6d30df3a6b22f4d23be74dfa8864ccaebd42c1f0d4474abc83a66f8997e19fb
-DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 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 compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
-DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
-DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 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 llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 4690 BLAKE2B 6af6661f0ea4c83cf103d0ce21a1bbd360c7497512fde80e7fb77fbc4ff564b5c6a89bf3123bde7a368efe3c656640a66dbb6f79373aa2c68df8ec678798ad52 SHA512 46a2ded095d2e0f0c6433acb76c8bfee8ec2c8b1b32b4cb33936015db6a915bb660377ba9b679d6f6a9f0132d1f8748b254529ed044cc19fd61e3523909057a1
-EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5441 BLAKE2B aee706d982849e61b7fc87a63812131c41eead7135740385719610bee8ba1e3e10823e36ea9ffc2041f15c70a51a56c902e887507aabc2dc02c04a23672bd721 SHA512 aae5f86ab86a09e64a5a07e3432c78478eaf6c9faf3c57101806af49746672d95dd78481f31356286f4c0ceed09ba305d7a0dcf1922d849ebedec87ef6769426
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5388 BLAKE2B 63d9681596e72e8df4c04046d5ad5277402957ebea29f2ceca0e3252a69ef8498998b710bc5be8a66efde59087223e5bd23fb5c2ffa1ef644a07577032e1330f SHA512 f94e76d0bdc8d99c09d4e9d1bfc3f566f45b0c7e42242cd76ba1d61d46f8d244ff971a154693980753a0323ece57138285a5f7e42af1f41f662f32f6ac09b23b
 EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5186 BLAKE2B fb334e5216a59f76afb035414e1d145c3780fa672439a728b37e34c63f73516b0c5a55efc75dc6abe59b7f47240dc5969016eeb597cc00a873ff77a16dba72d9 SHA512 305c3018df76a6c55f1d0121f02b87d821d1645145bda6ab631ddfbc23714ee3879e9c5f2e6fbee12872c0a05a8730216120b1a141b722fd36cafdaffb5773eb
 EBUILD compiler-rt-sanitizers-9.0.0.ebuild 4740 BLAKE2B fb32526d40411bfc5989a6d6c86271ff514920a84260c0a29e370d3ea9f7c2edc734e2fb74b9f1af24ed2fa1aebe7dd06c28cba8d45cfa2275918b5ef505fc9b SHA512 457f032b1b8ce3f2c181fa7cc79c07c13552f59090c4b544120fddb0ad376bfadaff7377d0a4bf0d980f9e585a35fbcb8a5165e5edab1a223fe2f2e6d637670f
 EBUILD compiler-rt-sanitizers-9.0.1.9999.ebuild 4689 BLAKE2B 21ba79f3b045b5738ea187035606dbbf28ba464cef95fd84c83bb937a2a6286f688e58ced5fd3399c801681a115e4daa96302cac5763a0cc25e63f2abcb0ab6b SHA512 508c98f4aaabb84793f500240abf830686352d361f7cab7051d5a3ba76c497a6e5897d415fddba65a54f4e73d804236d0a2746993522f0cc1c5e5ddd050166c8
+EBUILD compiler-rt-sanitizers-9.0.1_rc2.ebuild 4765 BLAKE2B 91652ad73616197b2b22be1e04c490ef4561896a53bf285b0726684978a9e74d7a0e261b5193da4ed4ecbde0d2a4b3200664086ee75c6848619cbd7f9ba3ef9a SHA512 326ee7b8869adcd3a8bfec5801552b03d4f8151d06be5d47fd5125105d817cc241106911c7cdb7426d0f51a074f680d99b113a40d802c5f7022cfbf3f02f5218
+EBUILD compiler-rt-sanitizers-9.0.1_rc3.ebuild 4765 BLAKE2B 91652ad73616197b2b22be1e04c490ef4561896a53bf285b0726684978a9e74d7a0e261b5193da4ed4ecbde0d2a4b3200664086ee75c6848619cbd7f9ba3ef9a SHA512 326ee7b8869adcd3a8bfec5801552b03d4f8151d06be5d47fd5125105d817cc241106911c7cdb7426d0f51a074f680d99b113a40d802c5f7022cfbf3f02f5218
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1_rc2.ebuild
index 10bf0f5035a3..4c388d97887c 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1_rc2.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils flag-o-matic llvm \
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
 	multiprocessing python-any-r1
 
-MY_P=compiler-rt-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
@@ -31,8 +24,10 @@ RESTRICT="!test? ( test ) !clang? ( test )"
 CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
-	>=sys-devel/llvm-6
+	>=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}]")
@@ -40,8 +35,6 @@ DEPEND="
 		sys-libs/compiler-rt:${SLOT} )
 	${PYTHON_DEPS}"
 
-S=${WORKDIR}/${MY_P}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -62,40 +55,21 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${P}-patchset.tar.xz ..."
-	tar -xf "${DISTDIR}/${P}-patchset.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# apply the patchset (new glibc fixes)
-	eapply "${WORKDIR}/${P}-patchset"
-
 	if use test; then
-		# remove tests that are broken by new glibc
+		# 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/use_tls_dynamic.cc || die
-			rm test/msan/dtls_test.c || die
-			rm test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc || die
+			rm test/lsan/TestCases/Linux/fork_and_leak.cc || die
 		fi
 	fi
 }
 
 src_configure() {
 	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
 
 	if use clang; then
 		local -x CC=${CHOST}-clang
@@ -110,8 +84,9 @@ src_configure() {
 		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# built-ins installed by sys-libs/compiler-rt
+		# 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)
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1_rc3.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..4c388d97887c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1_rc3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~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 ) )"
+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
+
+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.cc || 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/Manifest b/sys-libs/compiler-rt/Manifest
index 8d9f6f2b3b9d..a144f2f0f630 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,12 +1,14 @@
 AUX 9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch 1552 BLAKE2B 5045e2cc506282a6fb708c21e916a0e4ff24f0ccfbeb6d27af506c085ff759c203377e12ab969e40a2fbb9834bbc190de0e649061aec1b2ddd36b52ed99ede11 SHA512 d52245c1eaf650f8f666b9ec352332202fa5d76bdefd37a85f0c6939fecd8be80e386485851990efc918e53e82280489d0653d7c4e90637f328bd131bde6f6cb
-DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 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 compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 EBUILD compiler-rt-10.0.0.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
-EBUILD compiler-rt-6.0.1.ebuild 2899 BLAKE2B 9db37364c5e328b38c64dc2c6ed076b944e2d3528e17bb34ec2ade4e498226f8c3f26196ac416ff51bd0b64335856b7161a6ca2b264a8db331fa4626d9b3eac6 SHA512 ea9086fc9943fc9910522d1672fb0448b47c51ad81aa3c0d59282c6109f63a87190392c46c3cb234427ef190fa116e8b4232f089c428e1b28ea80744285e8e50
 EBUILD compiler-rt-7.1.0.ebuild 2900 BLAKE2B 60bec479b6e5caa39b98e5bf54621e9cf395c7e20ce0269d336153811f39de065b53744c11bded995899a6be33cf207c0c4a091b4be8a9ce8b8b479d26b057e8 SHA512 6cf5d533db3bbc75125f40439f8a6132f6c0c4fa04bd1d6007e9014ae4638fb1e99d475da780e07d12509873c26d129696cbd657c6c0b79521aa0561a927b23e
 EBUILD compiler-rt-8.0.1.ebuild 2938 BLAKE2B 6ce7229e928bbd6b269b3d37ad233f188e831fc2dd3153346eecad4a031a6a6f7a82fa8c25020fc8169eeeeede6e138aee2d7b3f520be02c1f5450bb802fac9a SHA512 567c3cd3d932f02a5d0f627cac45fbbeb403b346a421e805a8a48289bddc8868d1307f35cd37f7d6ab60ecf466c0651c93dc1ace24b99971a3a131f0d12d6261
 EBUILD compiler-rt-9.0.0-r1.ebuild 2997 BLAKE2B 641abc9127b63a93a8c79762fc2a4a0136cec073b1869a9a9bdae1be0cb2db8b933d2562d26bb43f69b81828fb8af334f2737c2012af625437e824629eed7cb7 SHA512 af614fd60c9aba59d4ff7d35155632befa2f5d364572fc784c9c43fe5f1e76bfa0571bc84376e05cc1aa3f3b8f9b3d8219a0fd9e08dbfc016d7ce64c7b9a4098
 EBUILD compiler-rt-9.0.1.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
+EBUILD compiler-rt-9.0.1_rc2.ebuild 2826 BLAKE2B cca9e66ec831966d04067cd20af830e9e90b6b57316fa6ec3ad644747778f882e05a8a84cf55bcae6b0b9f88bb4fadf1273973628807eb90b3ff8895661e7050 SHA512 eb5d018acabebb23400af886010c5de40356aab46e4379418cad715336948f7c97abcb071b352317b5baee2358b3f88312a50ce48c5ca5ac5995aedefacbcdaf
+EBUILD compiler-rt-9.0.1_rc3.ebuild 2826 BLAKE2B cca9e66ec831966d04067cd20af830e9e90b6b57316fa6ec3ad644747778f882e05a8a84cf55bcae6b0b9f88bb4fadf1273973628807eb90b3ff8895661e7050 SHA512 eb5d018acabebb23400af886010c5de40356aab46e4379418cad715336948f7c97abcb071b352317b5baee2358b3f88312a50ce48c5ca5ac5995aedefacbcdaf
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1_rc2.ebuild
index 459d60b022a4..6bca0d26b58e 100644
--- a/sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1_rc2.ebuild
@@ -1,38 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic llvm multiprocessing \
+PYTHON_COMPAT=( python{2_7,3_{5,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/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
 CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
 		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-S=${WORKDIR}/${P/_/}.src
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..6bca0d26b58e
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+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[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+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++
+		# 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[*]}"
+			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/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 9ecbea839153..1ac8c43ac125 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -3,5 +3,5 @@ AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f
 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 2809 BLAKE2B 530690031ed4c0ba37d56197272e86a1fea6ba3c3f8cab09e723597db84feb2d338ba8d8b555e19511ee148f9991cf8f143ebd8f9ab6759a14422fcc985dcb73 SHA512 63bb2da1e40efcf2723101765c3a8b8fe85ab8173805b92c0aab3156fd097544787278b8f3398ca27fd93367f0773f96a153ac508a641cdd42b67ffa35c6c86a
-EBUILD cracklib-2.9.7.ebuild 2546 BLAKE2B 69f64e795d0fbc7f75a7fe6d973ac146ce85a315862a9757eb8c8fa592ad92c1a1587ae9039d81aba28afc6c3d01808d59e9bc5d64e755461ca39d481f1c374e SHA512 2efbfa5f14051d76f2ede7ea348a1b52bf91b5b4e2e4a035b7756d40ac71a9171e11e2c729fb669af556696bc470d9fe8bdf2b24a27279fbea67fe6cb35359f6
+EBUILD cracklib-2.9.7.ebuild 2535 BLAKE2B e8c47afa12ec388c1bcdcebf7bab68697a52e9cdd2892298ffa3d08d94e435fe946b7e575e0b1b98ced44b55f4c648ad9156318fca9510409f61c6240446f202 SHA512 5e2d531f1f0e2b1924b3fe04773e8089270fdd616338e7aa49bcb0230927ee350b15b630b58a14783433887bbd5cd3933fd194e778320c3669e32c8ec63adc9b
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 529c4a5e8272..5638ea82ea02 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool multilib-minimal toolchain-funcs usr-ldscript
@@ -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/csu/Manifest b/sys-libs/csu/Manifest
index 34368d99b3e1..8ecab6745264 100644
--- a/sys-libs/csu/Manifest
+++ b/sys-libs/csu/Manifest
@@ -1,6 +1,6 @@
 AUX csu-85-arm-availability.patch 475 BLAKE2B 29612bef6ef28b2681452a77aecb66184143bcad29e6fad2e3355d32f21858c2f722e7075a534b49616ce20ac738f225190c6db1e46547b4d99f7e68689d5dd5 SHA512 bcdf8153f80f2d873ceda05e3e0b2b798924e311e7038a7c52f2fec760d1c4b38f99eeae4cdd3bcc3ac64c1e123fb333a3d4be08fe36cb1d93823c15ea9c3742
 DIST Csu-79.tar.gz 12719 BLAKE2B f44e979323da828ebe4546ef3077dc1fd6feaf832e0a55aa09a9ba69a83c64759548f34ede8f92769f37e88d78e248b74c4a7e042857f74a8b88fc5958481ea4 SHA512 1d47cce40d400241bdd0a4c24e332f999cb7ae08bd43b08b88e9b5fd5a0a53c9752816b0e07c5b6ffb78f7b5bc24f45986c6a50c661bc5cdd15fee5e465da1bb
 DIST Csu-85.tar.gz 13376 BLAKE2B 59aa275bf01bb785b848447ff1291e0018b2f2bc3c42f4f222957aa6c1f9fd344fa6dca9ee53fb8d9d3b11f6c03c37fff9178c40e5a009712f251f502e1f4957 SHA512 3cfeb7d37630fc9d6607da018b9ac1aeb3f41a4c190a67e7dc242ae48e7abd0026e25055b9459f2f187d3bb25644f516f079d1b2e943e8cb4cc6c132ad594467
-EBUILD csu-79.ebuild 1157 BLAKE2B 9df85bf532d0efd055989857f8dbc84c7f5c1df183ef9254d2b5770d10a8ea64a070cc11280488fa48cb09fdb3e2338f51448251b9e21aa0a09f2e786decdb35 SHA512 7458326cb5087b9bf3386d710cf82f9c7d364cf68f3be68bfd9653d1cb2861973ca4a6d9be41dd314bae9e2063e8c522a5d18781532f78e1b4245a1398e6da6d
-EBUILD csu-85.ebuild 1813 BLAKE2B f393296a5befccbef7da249d8f95b9061b37bcd90575c6d3019ef3c468722ad7fcb4eef92bd1b46b5e85ee4f46319ceffb9199e3973ea2f8e39b8c345e51e2f4 SHA512 6bf289c05a620de9fe710e3d08d75e2099e156381cd12ec94affcada287f28ba06ae60794c9bb5d63862fa6541c70bc9c0bbbc1296a10f878a0834fb54931b23
+EBUILD csu-79.ebuild 1143 BLAKE2B c8477d58611e0c8652056cd7ad76eb7d066375c486cc627d345e961406ef855bd91cd0774efd9448920b7c5053462764544682da7d68e118db02b5a361df2d66 SHA512 df4423850340cb3b8e2cc6d5f7223d3b9681c29e091e4f907cbfc8a1404534b8bc1f918e283ae417f5ade850e859187ebd641f3a874231a59874c6a9fce21e06
+EBUILD csu-85.ebuild 1799 BLAKE2B e314103da584639717b8094f730c5a4edd4c7ad1ea36323d222c17cf753016577f2fee86b6b07bcce35b6865deb7fedc788d5c419093440d8ff17cec113daa8a SHA512 ed317978fde742844f11e25d465cbab113d5ffaba099822b6c0a7c0b7193448ebbf8573a14e180e2d53ddfb0e3b00512cb6cabf1e4cc9a13563f1096f8400e53
 MISC metadata.xml 253 BLAKE2B a4b36b4be049f1d21e016d607880182f1cec9bed962515c57a38cf380f146696105267bf25064ed831d889c27030798245d96eaee47d098a017f5052f44bc24f SHA512 b87265dab4980faf3d32b53ab9ce7d4ebbe5cc9d12300903b1365b337bcd72c337fdec2ef1574615d2d02cf0664023c17c0d30b57ac0237412fd2b401cc0e2f8
diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild
index bd386e8f1cdc..465515a1d795 100644
--- a/sys-libs/csu/csu-79.ebuild
+++ b/sys-libs/csu/csu-79.ebuild
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake USRLIBDIR="${EPREFIX}"/lib || die
+	emake USRLIBDIR="${EPREFIX}"/lib
 }
 
 src_install() {
@@ -40,5 +40,5 @@ src_install() {
 		USRLIBDIR="${EPREFIX}"/lib \
 		LOCLIBDIR="${EPREFIX}"/lib \
 		DSTROOT="${D}" \
-		install || die
+		install
 }
diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild
index 4e6c9fd1daf8..6d0fb053db7f 100644
--- a/sys-libs/csu/csu-85.ebuild
+++ b/sys-libs/csu/csu-85.ebuild
@@ -52,7 +52,7 @@ src_compile() {
 	# so this isn't used, should they have gcc-apple installed, then
 	# this wouldn't hurt either.
 	type -P gcc-4.2.1 > /dev/null && export CC=gcc-4.2.1
-	emake USRLIBDIR="${EPREFIX}"/lib || die
+	emake USRLIBDIR="${EPREFIX}"/lib
 }
 
 src_install() {
@@ -60,5 +60,5 @@ src_install() {
 		USRLIBDIR="${EPREFIX}"/lib \
 		LOCLIBDIR="${EPREFIX}"/lib \
 		DSTROOT="${D}" \
-		install || die
+		install
 }
diff --git a/sys-libs/darwin-libc-headers/Manifest b/sys-libs/darwin-libc-headers/Manifest
index d2f8c2fb0b1c..4064e93ee813 100644
--- a/sys-libs/darwin-libc-headers/Manifest
+++ b/sys-libs/darwin-libc-headers/Manifest
@@ -26,7 +26,7 @@ DIST libpthread-301.50.1.tar.gz 208501 BLAKE2B d9056fc4132e453ed21b054761a3b78f4
 DIST libpthread-330.230.1.tar.gz 197145 BLAKE2B 2366a9961862ac5467e48abf1e8a6ab4f240ebb09a8c58a390b49b259aa8ee012017de3a1ab0df6f779f1fc601fe841704c68406ed457f14456041a67038b29a SHA512 6ef2cd2775668ca74f365201b3477e26e6459a2597694d7c12ff203970004abf12deaea7a00b5301ab02344fb390e402e99155bf4e28f28db23928cac9f3bf6e
 DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
 DIST libunwind-35.4.tar.gz 1094999 BLAKE2B 5ddc3bb3dca0ceb5c979fd55657ad3ca0a4601be5594749d26a461ea61f75891b564ea9b4d60943baafe07f924d3750e857c0cd27154aceb130cada1cc83ff41 SHA512 7fcfaf071c6bfecd1b5dbdae6a24186c9741b2d877eaea9f64158278dc19f84b5bc46f09df2a4b81cf40f6dc91594b5411a0084e9e8fefcdbbfd8b53668f2631
-EBUILD darwin-libc-headers-1158.50.2-r1.ebuild 4327 BLAKE2B c04eba92692d3e77f4d92ae2f2f384f85f3a0e05062e374cadd83431354c8a404a6e90dbb74f5fb44188f94a3039087454fe85185980f939f5f537468ca97d09 SHA512 9ec0e64d69950d34dda2521ee3d08ff0b95fd0f37dd17eb6e9042ef18f213c8d5b12964177c12097aee9a3b2a91b2353256346847d0df7b237f47744a2f8cdf6
-EBUILD darwin-libc-headers-1244.50.9-r1.ebuild 4327 BLAKE2B 85ab699259c3bcd762c29d6c4f31cb3f086e292dedb48f7596fa8e9a5e36009aefaf665cb6f7aad776988419bb5c7099431050d132f4ca4a451fe9c10bdf645e SHA512 f06877f5c4368053e6701e1da410d0574312bd623a30aab907d6f1860c3d9dc1dc33fb23e44d68aab4209f3158d9dc9d1361889d44855eee5fcda23cca7967fd
-EBUILD darwin-libc-headers-1272.250.1-r1.ebuild 4290 BLAKE2B c396dd9a9725e5c20ddc13c1d6eb08d63065747dbaf6bb20c965136128bb2f19dd5abee04d54a75dec4b08fd162aafa74370feed2bb5a64b4afa9d5e24717699 SHA512 9c7ab3b7362ea70152ba3e4c3baea9037d0362547355ae00fe7d748123031d14f49361a82bbd0b56ac4f4940938b2b13d921d05bbfda7c99f690a5a1c7bcc104
+EBUILD darwin-libc-headers-1158.50.2-r2.ebuild 4321 BLAKE2B c0d7dab98d96dcdfb6b7e6de01f5b8da2d482053a7e41ce1c86ba4430770c9a5f2f71387cb16ab2932e7b12148509a7efe87f8759d48735a28648b5fdef3a8e0 SHA512 14de99afa52564f5148da28a7a833320e9e81f9bcd2aa59295005b3ae5ea2ade102ea81a413e6c3f5024fd0165e9333de622b3fb1d8f927e560cf1df785d8894
+EBUILD darwin-libc-headers-1244.50.9-r2.ebuild 4321 BLAKE2B b4d5dc5a400c5b25274154e503eb503b4e220a64a0d11b2dfd11c7e0b8389163e28ac446cc2ef1c18e766cb164e1b8827092031aa09529c11e3bed768962e8d6 SHA512 3e5601f082e7805b7bf473c2e8159929c2d576d57cd17ae4e43b94458b8d92b254719eaf6b23abbf3c6f1a22bbb70ae658376bf50e41cd3f06eac4cb2a1d711e
+EBUILD darwin-libc-headers-1272.250.1-r2.ebuild 4284 BLAKE2B 939a02936ac9e5ec863e9a8aca3b527b98c9772ae3a5e05ad7fb2ec39cb0549f7c4276577b1cb17847766bdc6ffa721534e6b2fb9c9504233a0c0cf53bb7abb8 SHA512 69997e3708bc840dbfc24ae68e9424e2dc43381cbd279dcaadfc3ed02c66ce1bd7754059650150853bc684508b46da8a70bfeece8ebf54909bf8a799b8726ba6
 MISC metadata.xml 533 BLAKE2B df8e811ac29ac4dfc64f46302aa7975f223b0ca01af65978e55049c63514872efc54821682bad5b7f544b35a5246e93c1ef8f781b8ee8b6256da30fb110bdd5e SHA512 6151f4de2c080a8ac5bb8676170e7c467bae9c730d6726bc590d34b3e653161f7c58d2dcebe199cbbf49b5129bd7d121c73119ea8d54943eb01bf2d5fdcd4ce8
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r2.ebuild
index 266ccf06c137..f3b1c4eac4e6 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r1.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r2.ebuild
@@ -128,5 +128,5 @@ src_install() {
 	use man || rm -Rf "${ED}/usr/share/man"
 
 	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util,utmpx}.h || die
+	rm "${ED}"/usr/include/{db,util}.h || die
 }
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r2.ebuild
index 0d7e34e9b122..55949607a21d 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r1.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r2.ebuild
@@ -128,5 +128,5 @@ src_install() {
 	use man || rm -Rf "${ED}/usr/share/man"
 
 	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util,utmpx}.h || die
+	rm "${ED}"/usr/include/{db,util}.h || die
 }
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r2.ebuild
index e6851d945419..0f07e5b38789 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r1.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r2.ebuild
@@ -127,5 +127,5 @@ src_install() {
 	use man || rm -Rf "${ED}/usr/share/man"
 
 	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util,utmpx}.h || die
+	rm "${ED}"/usr/include/{db,util}.h || die
 }
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index bfe203dfe84c..9d57839c39f6 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,8 +3,8 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed
 DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
-EBUILD e2fsprogs-libs-1.44.5.ebuild 2409 BLAKE2B ca5e6323859f592666d6dedb4beaa9da7c9e824176f74c2488f057dcf696972275c204b50bbfa65c3e943a9bc0d5f9035197be1347172edb5f2067701bfb3eac SHA512 6f7676e0e299d12089f0729a186b423da58d2f6b689e0bee42968c994adafc7ab432f12d8216589d503993c10b3e5bb2cb1e6bc7bec5bfcb3648da8ce8c307bc
-EBUILD e2fsprogs-libs-1.45.2.ebuild 2409 BLAKE2B 17bbfab5da7d135492e007479a9fd880e090e9eef000afa37bffae3af862e7f1b805341ade7723353deb89536779570c63d197781a1a3fc8d0e896d4a0782c2a SHA512 d4590a8108e941e40041f210dc80674522ec3ac9b1a3f4f78ba754446acf4a4deefce2486a20220e5bbdfd1f62a07842714f6697d17035419cca35faaca2b1be
-EBUILD e2fsprogs-libs-1.45.3.ebuild 2422 BLAKE2B 25eac7e393f359b5fd1093309582a404cabe6756cbcc831c8fb3580e8b0603d1d1322ad7e2d185741b3778340419f8d4221c5db4525b0754322a217f3e80ed3b SHA512 981063c8ebe1cd74a44d2b8039e20864e838853aae967f21b1c4839c93a93f3763d9854de102ac622fad5691491469c49887c0a099db47913d7c2cfc238f5f45
-EBUILD e2fsprogs-libs-1.45.4.ebuild 2409 BLAKE2B 17bbfab5da7d135492e007479a9fd880e090e9eef000afa37bffae3af862e7f1b805341ade7723353deb89536779570c63d197781a1a3fc8d0e896d4a0782c2a SHA512 d4590a8108e941e40041f210dc80674522ec3ac9b1a3f4f78ba754446acf4a4deefce2486a20220e5bbdfd1f62a07842714f6697d17035419cca35faaca2b1be
+EBUILD e2fsprogs-libs-1.44.5.ebuild 2218 BLAKE2B b80bb4ab367ee0384ac6a174b89a506517253e9c9fc95b3ae4961b67b2b07bb18e71864473e3bfb3eb61bdf1c9164406fc89143906cf67a6a6d14d1818cd1377 SHA512 b442c9ebe72094f9deb24bf94723b6de6db888125abee00e364c91888012c82e936951cb58c1178795f24971ad2357f765f718c4704ee12decf36de330c3bd72
+EBUILD e2fsprogs-libs-1.45.2.ebuild 2218 BLAKE2B 69299aeb12ba130f124645c42388521ed964de35272d20a08aa93345e38d0e6199c8c7372f0836837b449943e0503c9537a7d5a7b373c6519263661ac6864209 SHA512 7bb676f6f42c3a4cb2a9e0f5401d29742cec6bca14eb161788f3824e914db6bd6d5a9ba446a1523e5dfb5aa51448de1bf119bf89b992063f1994e1155ddba846
+EBUILD e2fsprogs-libs-1.45.3.ebuild 2231 BLAKE2B fff230b2254350b6803c2deddea6c2ad032305f15da67632d16083f778d1bb3f9654871cd652a585dd5be805b16fc0aaf3d683930b12e96aeffdf695d7271547 SHA512 22435a2ab6882a20c441aacd04870cd09704503122b58b5ee35e87f82ba5680b33c6be178ddfc812164ca26d5f31b6e5d7afd177deece37811c8eb0b237f7d07
+EBUILD e2fsprogs-libs-1.45.4.ebuild 2218 BLAKE2B 69299aeb12ba130f124645c42388521ed964de35272d20a08aa93345e38d0e6199c8c7372f0836837b449943e0503c9537a7d5a7b373c6519263661ac6864209 SHA512 7bb676f6f42c3a4cb2a9e0f5401d29742cec6bca14eb161788f3824e914db6bd6d5a9ba446a1523e5dfb5aa51448de1bf119bf89b992063f1994e1155ddba846
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
index 2dcb1838de26..31a4fa3fa902 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D%/}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D%/}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
index 610d4705abb0..24859270ad92 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
index a65bd89cf144..f5538bc2e807 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
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 610d4705abb0..24859270ad92 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
 	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 03c0ee0a61e1..0f1dd87d94d1 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,13 +1,5 @@
 AUX efivar-32-efi_guid_ux_capsule.patch 2054 BLAKE2B c349cb606fabb96729af078547bdb3e425607599397a067684753565f6aa98f340885585acaee64e3642a1c284eecca313e3348014e6ccfc5cee1e72ec1885fa SHA512 7e8852b9adb3702b7a7a9a26ee734234c7163aa95d10114d79f62ab6dc918a9afb762fb0476913f4515b36db1cc2c80eb5a0b509f0252483e5aaf51d4d76df76
-DIST efivar-30.tar.bz2 73202 BLAKE2B 6b146cb6d664e3419361e72ab6fd1578522e7fc219613ae21566cb40a700fe70f18750cc753338faca2ad078e2bc933fb33a3a4cdfb148eabb0fc71b1319fb71 SHA512 0a6d7175762011c3fc67b531d3d19a45e82195c729b9ff498be02b3a6a73f6c3c4f9e14a27470c6744b741d7d54db9ef24c7882639af25fca1034b7b9f641b39
-DIST efivar-31.tar.bz2 82404 BLAKE2B d339aa8ab7dcd6a60cb067fccfbc2c42407fba211ca96eb39f227d57e9403462505940f427651dfaffa8272c9edfe70898f181b9f6ecddbae4745eb3262de949 SHA512 5055f690fd99cf59895dcf3d11103494d917d4923567626f0bee816ea5e4dd56cec23627ede5f21bdc57b7306522471ad19cc8ab22ae94591dbd1925c084f163
-DIST efivar-32.tar.gz 108102 BLAKE2B 7f9d27433b40ec6c044ab34ccc697001ad23e39a46862d2e04db0f9a3dfc26ae53b46a3c3a8c957bf76df0969710f78249f72f7bf38e67c0aa902034a07acf8f SHA512 e73eae182fd645183dfe587591a286670ee1123a113e3e19e4070fb910ab7794e320defdc0597540df7664947f2a0497abbb763a19b4dfa40511a512c7f3e490
-DIST efivar-35.tar.bz2 95528 BLAKE2B c936114aade7a586f707af2464d350703234e0c3fb786fb568590737fb3939c3f74ff813f4f188aec230d75e75e73b0d07cbff5860f0b9f1285d2780b29c7689 SHA512 c7ba60b2112053f088ad0b74aaa834860601b7fe17118c35b012050176f5205d948fba9c4b6de35991249f702e3bc24832539e2eb3c235c4188e1eabc78965ee
+AUX efivar-37-makeguids_fix_host_compile.patch 1391 BLAKE2B 079bf271f2e2087fea63265713b5ce75e277f5010f8cb08e6b0608b6c7112ebe8b121238fbc9d07b65bbce38c75732829649d3ef7dd67fc456d52677372190d4 SHA512 50f560725f2ebb2dae9c1b3b603be46aec672d8764d6ba4218aab213d812302e636f8811fe6c51ae17e705e0d461d4141e1e58b8ba997154f42b0046e67f5177
 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
-EBUILD efivar-30.ebuild 956 BLAKE2B 617ae40f78ecb76e5b81c2b47fce467738394151021cddaaab484acc843a440d24b7af2d6a2b24f540d5f7f8bfb0af49ab5ad068e85b772ed0232747206cb824 SHA512 9c29f7fd850e4821ff642475828015c5960b47015114cbac0b913e2a02063c3cc1525e4458c9857cce1be9c32a82bb378fe49a4fb67eae60db35528da73491a9
-EBUILD efivar-31.ebuild 809 BLAKE2B d0ca028356842cadf5f052aa86c8383de0ce22d42edcc5146afb018f62d95cfbe2894ee60365d14fc2ab6df5177d282fc0f18c4bf9a4473d2e04cdf4235ce8d5 SHA512 63897e051ef4b474cb1bba5928935773d1de71ba18c2b18b439b6333570628375db6a9e20d33539187bb38eac60ecf06b265ae6609cd0686ae2fe8a1920066ae
-EBUILD efivar-32-r1.ebuild 946 BLAKE2B 815cbe5f43f3ffa65ee94d581b24d001b7f8d14d18b0ac831058555d12e1ac3e2bcca242f437d94326c35dc148154b1203088630e67b3bbc54fe8ec83b715921 SHA512 8c9c99a39b0fad8fdc4c96a24b281db6b1174c1dc4f9769fc789bddd0b0ae06ffdd36e7bda9f103240a136daace83883be0846de9d0975c2e9f002f2d3c01e46
-EBUILD efivar-32.ebuild 887 BLAKE2B 753d7b2b7a44e0123a5eeafa8ccb861731872873a064c9e5981d5b2f8202fac9be0cdc7e14249e81f25289acb25579da4ccc6bc85c7a2211b58ce3e30734de22 SHA512 22baa7fe2befa4f1c1858e2d955e31043c46a9b18fa3b192c69874b150d1815e5febb53c0d5d78fa0ef4e81b271ab381fcb050318052f52c67cbc2d6f4e6ca78
-EBUILD efivar-35.ebuild 854 BLAKE2B 9530db8cc261a2fb86502700764dbf77f16879b4746e210c064db97dc057c1c70fc9e16f52d888708dccdfe875a5127f06aaffdf975003ec57208602802647cd SHA512 ecaa5a9b57f6c62aa7a725eaebc53c93eb8df1a4178a6cfdd976cbff7f6eaf7ef2840d99a131afed9938585b8e2e5e2b853b8d2b4826dcf6653976b730cf4e86
-EBUILD efivar-37.ebuild 851 BLAKE2B d103357671bfe4b1d59019f154069f67048a460cd6faa6bafa4743b30c1172ae2451bf9dedd618d41e53b083568b51a721fee134e1609301818a9ea6de5bb550 SHA512 914877cdf55617c48d5435b25f809a48d38aea3b1f329aaacf28184f2dfe85c94b511d5ce161edf7c57e8de8ad0d94870cee96a993667f8588e5b8e434d745df
+EBUILD efivar-37-r1.ebuild 917 BLAKE2B 7946b77614ebed0a03055845df7aed2dad994e8e174f71162036a96b3b73e003f78dafb369b54cfd22fb51b8ad835c8366cccc85aa52dcad8d4781caf7506f25 SHA512 e7d6703547ff91db3487d6d18fc679bfd2289c15dc4e55dbabbcba18bb2cf6c0d74a8cdbb535f3e57fc0d484268945ed8db4e312a967162d929df49f13925e59
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-30.ebuild b/sys-libs/efivar/efivar-30.ebuild
deleted file mode 100644
index e45c9ae1e97a..000000000000
--- a/sys-libs/efivar/efivar-30.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-
-	# https://github.com/rhinstaller/efivar/issues/64
-	append-cflags -flto
-
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-}
-
-src_compile() {
-	# Avoid building static binary/libs
-	opts=(
-		BINTARGETS=efivar
-		STATICLIBTARGETS=
-	)
-	emake "${opts[@]}"
-}
-
-src_install() {
-	emake "${opts[@]}" DESTDIR="${D}" install
-}
diff --git a/sys-libs/efivar/efivar-31.ebuild b/sys-libs/efivar/efivar-31.ebuild
deleted file mode 100644
index 6eccd1d7ed33..000000000000
--- a/sys-libs/efivar/efivar-31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/gcc.specs"
-	fi
-}
diff --git a/sys-libs/efivar/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild
deleted file mode 100644
index b9a3ef43942b..000000000000
--- a/sys-libs/efivar/efivar-32-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-efi_guid_ux_capsule.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/gcc.specs"
-	fi
-}
diff --git a/sys-libs/efivar/efivar-32.ebuild b/sys-libs/efivar/efivar-32.ebuild
deleted file mode 100644
index bec7c857931f..000000000000
--- a/sys-libs/efivar/efivar-32.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/gcc.specs"
-	fi
-}
diff --git a/sys-libs/efivar/efivar-35.ebuild b/sys-libs/efivar/efivar-35.ebuild
deleted file mode 100644
index b050cddcf60d..000000000000
--- a/sys-libs/efivar/efivar-35.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e 's/-Werror //' gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/gcc.specs"
-	fi
-}
diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37-r1.ebuild
index f9a608e46d22..878309f4b43a 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37-r1.ebuild
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-makeguids_fix_host_compile.patch"
+)
+
 src_prepare() {
 	default
 	sed -i -e 's/-Werror //' gcc.specs || die
diff --git a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch
new file mode 100644
index 000000000000..f0172eb612eb
--- /dev/null
+++ b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch
@@ -0,0 +1,36 @@
+From 81346196bb262156fd436c78323d161af61dd6c1 Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <dtor@chromium.org>
+Date: Tue, 6 Aug 2019 09:22:25 -0700
+Subject: [PATCH] Make sure makeguids helper is compiled for the host's arch
+
+Currently makeguids is compiled with the same flags/settings as the rest
+of the package, which does not work in case of cross-compiles when arch
+of the build host and the target host are different. Let's force
+compiling for the native host arch to avoid this issue.
+
+Note that this is not a full cross-compile solution as this does not
+account for potential differences in host/target compilers (versions,
+clang vs gcc, etc), but it removes one of the issue with package build
+aborting due to invalid instruction on the host.
+
+Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index addfaa0..3729d2b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,7 +52,7 @@ include/efivar/efivar-guids.h : makeguids guids.txt
+ 	./makeguids guids.txt guids.bin names.bin \
+ 		guid-symbols.c include/efivar/efivar-guids.h
+ 
+-makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT
++makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -march=native
+ makeguids : LIBS=dl
+ makeguids : $(MAKEGUIDS_SOURCES)
+ makeguids : CCLD=$(CCLD_FOR_BUILD)
+-- 
+2.23.0.866.gb869b98d4c-goog
+
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0f9188f552d1..574c00715994 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -18,21 +18,21 @@ DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea
 DIST glibc-2.28-patches-9.tar.xz 98588 BLAKE2B 4ab583be712994f949dee2512da6e12fd7f7ad73e96393f21678552b43da98f49321b53b5b009551300cdb09ca135e7f6adc636ff750c251a1d6d7f262dbc410 SHA512 e3f40ae6e9d06471c1a11bd2bce7b5161d07c3d0a81791505a72aec4817e7faf9ef09841e98c6dcf62a0a00754dff87dd194d97ac6b6354aeb2497cf60900b96
 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
 DIST glibc-2.29-patches-3.tar.xz 35812 BLAKE2B 90b8bc57b7a63f03617795c368b92e525eccfec462d638dbc25c581e5b7a2a72ffd5191842f5ac443a868cbc950838d7e5120e866d343a14b80c55dcbfa48f30 SHA512 4c9b78d9d1a8aa629418f2d758ef800857780b8a1fd8d3582b88348a513ca26ca7f6ac9110a8c6bae16949b360ba36840d184f42293cd4324760273592d1b438
-DIST glibc-2.29-patches-6.tar.xz 64076 BLAKE2B 04c1baf838eff9275e79145d4a5a642dcd6572aadcdfc6782769f2de107dcd1648b81d0690068db8c0d53229efe2130e279f4aafe8a91238e5dd6a8a7120a433 SHA512 6494dcd23441fe308de97706f7abbea1571e0015d1456e719268b8026e1fb23733c2efd5256840f4b9f0df4f02ac7827b1fad56905cbd8919bca9c25b0afe822
-DIST glibc-2.29-patches-7.tar.xz 64752 BLAKE2B 766f3f2d11aedf7e1b83db94fd2793244e29abc0beb78071a3eadfb83d3589f56b07b68c8faffd77ecc859497ba52f0327e03cf984b00adbeee3e196b0c5e57c SHA512 aea61fd3e084b293d0a92c89cd83d176ca95112e23224091e31ac77f54089922926ebbd9b75748d5b750f3d88c6f55f9953f11375a07a219946c485d4bf6bcaf
+DIST glibc-2.29-patches-8.tar.xz 102712 BLAKE2B 49aacff358c0f8499c444e73eec92f402b81236d6a91d1fc9864f974c5cb72fc5c87bf5ee77700a8333db4c68892b3940948158530cea0d0fbbda51df0ae7953 SHA512 7a929e023294e6b76569120cc234bc862f3e260994e56c3a2fc2b969b7313c94a47de7ef85f4e93c9083c16fde987ca470ab9d69d881ab49a22f5fd3a721703a
 DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa SHA512 146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0
 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-9999-patches-14.tar.xz 17908 BLAKE2B a6e1f22a4358111ff757431c5d42fd020f6095584c3517aa854ea266129d1a177a7c09b310643f1cea32ffaf253806ac08f3aed864fb477097aaa2c4010450f4 SHA512 ef28b409b26472ec1d868167345aecfee70b1edf1863374dc2f25892f40c10f0826620a8b22fbbc9f737c8f611569b3412e8e2ea041da1ad1ef7f6398b82cddc
-EBUILD glibc-2.19-r2.ebuild 38406 BLAKE2B 75066656909bfe6d3665a6694ae41bb2a13fb5fc766868440ea968c731f30020a0009ab5115c004e24f89b46565e244fe560953f54f4ea647ee993bb3dfcd063 SHA512 e99dbd2d1bf3ac13ab60a7329b4d5c9370801e2aa97bef18b4f4897a3c842d5239c91a5e9f2888806fc7377a3b41c135d7a3d7af67bcc51d694433fa57653e63
+DIST glibc-9999-patches-15.tar.xz 17792 BLAKE2B fe351b7c71418a4707c96fbc6832f831947515bb2ce01fcfa9a9ea410f543a50b8c013e26f10587b283acbab4e988272e8db770112b2961b11c89b20b4a408f7 SHA512 37db45d1d04ad1130319a58d04774a2ada0f026bacd444625782b4dcf5a98a7019a17e132dd1e497968f43fde2c974bbe09a41e164831769a9e95bc8e2117103
+EBUILD glibc-2.19-r2.ebuild 38349 BLAKE2B dae2e89afb58d814955a4b1884027622c4acbdb48a62d3f1252828625706ef567bb69c71de418a3d07c5757e3ae1cf2c13009e7272e4c8de76716ef6f3bf8d5a SHA512 ada09d4230f0668a11c35c463a0926c0f1e833577fae0b0167fb69b437ffe786f8a231a65ac80d656f8d0f5eadeb9d878b385269611e3426d6e438a1fa1a3bb0
 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 26616 BLAKE2B b5f538588332cd24d86c090b90ca88adda824e7213953d81e1bed9cfab5995883d8e434a29368bdef28c8110105d645113bea60ffa9378ff8ab36b5e74780a10 SHA512 34a67725a8e8a58fe259116893ec9dbb8d2bec46cdc7b1514e40c35a7e22334989863b0ee72c50413906b390cc62f9b127cc2a883530d0ebc279a645cc8395bc
-EBUILD glibc-2.27-r6.ebuild 41983 BLAKE2B 0d8cf524dcb8378fe69ff47f6fdf1a1c5a9da0395c118f489e371695c880ad6cc7154dc90e18d2d3b3c8ca7fe582a224897a8aa13acdd74d21def3ec6baba0a7 SHA512 d36915d3b6365ba840cbbff0cd7d5772bf05cbcb032169e51016a2a82b5a886636d81f6134b3da50da9997779fc9ed2b5f7a762bafe0e82a84b1ad96608c7fa7
-EBUILD glibc-2.28-r6.ebuild 41771 BLAKE2B 912dd3610871e990590107225afa1acae514b5f34a3d53fea1d922adb7bf970c813632b21d311928ad31f268b3ae8c621c826f042baff0878e44ba94eedaf9b4 SHA512 ffc6349e16b396b34612a77fbb8b504c828f8b47714a63789d1b0965d448eb6eb3f693bd13ffd55fd45cbe67f34f16e5e706a512ad3a73db933119ba7ab05f52
-EBUILD glibc-2.29-r2.ebuild 43060 BLAKE2B 049cb81ad12d49a736d10e5714a42c34e58081245c4d53b68574d87fffede6f3ea8a14ef48ccf224a97c7ae90c34ff618bd3ed8a9fe5f34e8abfdfdfeddc7a68 SHA512 c4fe880bc830ece2c0ee48e6d2d9590ef65c11a3d9969cc3104db4c30712944906065ae8f421414212dcd7a82a464d35382eddcf9b1d830c8914c74e5d75ffaf
-EBUILD glibc-2.29-r5.ebuild 43363 BLAKE2B 455e6e1cef2292e5d242c8678210c87ff061880d04b4edd0b47c897b7b054ea7dfeb76f4cc13897af440339d672de48bc307fef2074b9092f2c032162a7ed47f SHA512 f022e2a67674003b184271dfdb13061a2180ece70eb215b4a3701688ce0a6be1a1a039b06d94df38e5a21d44365ac74ea798cb0cb31b1a32889c4da1d6100468
-EBUILD glibc-2.29-r6.ebuild 43540 BLAKE2B c20619b6de9070ed77dec438b8954205600c91a14c0376718b2ae3c78a51d96d0be0a60c72bd105b6edb82947d4eceedecb7d9a477885c8b1c0048eb28eeb2fd SHA512 8b170959b3d2ad7f8a6ce9d28295cddb010419264b7c8d0f8d9e65c06787218e8e1d84c72095d26418195d51674c22b274c134c2f8508a62f7c8c037833b557e
-EBUILD glibc-2.30-r2.ebuild 43861 BLAKE2B 8fd68d5bc123061930dc3637ace4f03c8443b5dc1581122540d95dbf897d76e7229ceb9d504f3c1c96bcf829de0f97fe4b8f5a0cdc49e044f685b56704a6684d SHA512 350eec874a34f2a9064a31c0a414d779e86c3275de8909b32e84e76b7276bce4e5f8f2c8c1468ef2c10f55b0bb224d5c5f652a7a58ce524adbbe79a4c4a402fa
-EBUILD glibc-9999.ebuild 43876 BLAKE2B 3b744574f7a8dae61fbc5c64d59927865610f1b10d2d1a08bfc64dcdf0138f756c4acbdfd6ee398e38a6451636890bdf95a091388c5b9f7ba163740f3c774947 SHA512 dc2c68fe550ffe9fadfce796cb02474a156867cc7757b57a87d1288cd629c68becb7712aafca6910c955d9ccd066b4893af857b2b5c94b8bb3c539b9a3b598a6
+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 43003 BLAKE2B 157426000183d1c756e34d3328a8bc25536a9038f3ad1c13f1e991061a0fe76fb16116fa2e8d6895af2077021c30613289c5bc692c60c71947da4d84b2226d13 SHA512 7968e6093e261926ec7257bf6419f48b683382b2ad88e83422dff983d45771a82f833fe3442201a4cd162b810512309add273689ced50d3c355f474b280cd95f
+EBUILD glibc-2.29-r7.ebuild 43545 BLAKE2B dd107322896bc39bc9dc779802a470d0bb0d5aa972ced93a68ae057a8801600a2633e231617203f40745f72e88c2bcbc4fe8ced0cf8ed9251c0f2bef486cdcf5 SHA512 2ef43b0918f2e4758ae834cbf5024991fd650c52c687e6af3aa7ab6dd125ea17aa62b169ecf9f594d67e8d618299e20b16a40be44b4d87d6530c19fb8b108746
+EBUILD glibc-2.30-r2.ebuild 43848 BLAKE2B f9a1bf90407cc453d07c8d1f32c960e91df40171a8affb0b0cc83da95b11c52bdfbeb761bc7303ab3bc82311a0b7e65a05a675d02f74005ceff1b67677c31f04 SHA512 6bc14d01ee5f3fb0823bdbf860d6054918a5d03080287ae897dfb889037380857a46e1cb70c5bafcb06394b4b08ca37a38f13584b4c9728b0179e976850bdbc8
+EBUILD glibc-2.30-r3.ebuild 43900 BLAKE2B 15406306334616860669ffa4be75a714b6d5a4e80b8a9dc5bd7bdca45132b035b8870074ad5608a69da0ce95252d7a20ee62ef6b2eced2f3f36a761c407ab185 SHA512 2222cb63aaa604f72d4cecbf91ca26f0cb3d8a5155716c6cb8f904fdfbc5df962d4a1ad27a1db1a23cf0948ef7d172072371a5d8748eecc00fab7230b923eb9d
+EBUILD glibc-9999.ebuild 43889 BLAKE2B c53bd9d008cd8020fdace74c80c841e4e7991fe75be2b77634eed516041e75bebf0ab75490183116932688fafbc6f3f5a307915715f6b4ac52daa7e778f07a81 SHA512 e2531212b39b42b7595125463fb2a79a23ae10111ba2ba8b5c24638b43f23818f218a120ea05205ab5dd780ee4b645d9b2344aacaa709a636c6be15f68e49016
 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 c77d6db5f992..2ba5fba1eef8 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -983,7 +983,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1032,7 +1032,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index bf7478c94f8f..7194206b39a5 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit prefix toolchain-glibc usr-ldscript
+inherit prefix toolchain-glibc
 
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
@@ -577,7 +577,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -616,7 +616,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index 7b629c9b1e81..39bd251ae522 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -1086,7 +1086,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1139,7 +1139,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 329875854994..8752c87248c9 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -1084,7 +1084,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1137,7 +1137,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install || die
+	emake install_root="${D}$(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
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 5e57364b5be2..2f287c1a1b22 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -1112,7 +1112,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1165,7 +1165,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install || die
+	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
diff --git a/sys-libs/glibc/glibc-2.29-r6.ebuild b/sys-libs/glibc/glibc-2.29-r7.ebuild
index 8f88020a9c25..c7a3255931aa 100644
--- a/sys-libs/glibc/glibc-2.29-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -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
 
@@ -28,9 +28,10 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER=20180511
 
 # Gentoo patchset
-PATCH_VER=7
+PATCH_VER=8
+PATCH_DEV=dilfridge
 
-SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+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 doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla"
diff --git a/sys-libs/glibc/glibc-2.30-r2.ebuild b/sys-libs/glibc/glibc-2.30-r2.ebuild
index 21a2145abdd5..8e5b658c2eb2 100644
--- a/sys-libs/glibc/glibc-2.30-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
diff --git a/sys-libs/glibc/glibc-2.29-r5.ebuild b/sys-libs/glibc/glibc-2.30-r3.ebuild
index 5cb7bd73144c..7bbdf0c882ad 100644
--- a/sys-libs/glibc/glibc-2.29-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -28,12 +28,13 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER=20180511
 
 # Gentoo patchset
-PATCH_VER=6
+PATCH_VER=4
+PATCH_DEV=dilfridge
 
-SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+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 doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla"
+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"
@@ -78,14 +79,21 @@ fi
 #   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 disable stripping
-# entirely.
-RESTRICT="strip !test? ( test )"
+# 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 )
@@ -95,30 +103,26 @@ COMMON_DEPEND="
 	systemtap? ( dev-util/systemtap )
 "
 DEPEND="${COMMON_DEPEND}
-	${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 )
 	test? ( >=net-dns/libidn2-2.0.5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/gentoo-functions
 "
 
+RESTRICT="!test? ( test )"
+
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !headers-only? (
+	BDEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.24
 		>=${CATEGORY}/gcc-6
 	)"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
 else
-	DEPEND+="
+	BDEPEND+="
 		>=sys-devel/binutils-2.24
 		>=sys-devel/gcc-6
-		virtual/os-headers
 	"
+	DEPEND+=" virtual/os-headers "
 	RDEPEND+="
 		>=net-dns/libidn2-2.0.5
 		vanilla? ( !sys-libs/timezone-data )
@@ -196,7 +200,7 @@ do_compile_test() {
 	rm -f glibc-test*
 	printf '%b' "$*" > glibc-test.c
 
-	nonfatal emake -s glibc-test
+	nonfatal emake glibc-test
 	ret=$?
 
 	popd >/dev/null
@@ -244,7 +248,7 @@ setup_target_flags() {
 			# 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' 2>/dev/null ; then
+			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=*'
@@ -254,10 +258,9 @@ setup_target_flags() {
 		;;
 		amd64)
 			# -march needed for #185404 #199334
-			# Note: This test only matters when the x86 ABI is enabled, so we could
-			# optimize a bit and elide it.
 			# TODO: See cross-compile issues listed above for 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' 2>/dev/null ; then
+			[[ ${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
@@ -267,7 +270,7 @@ setup_target_flags() {
 				# 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"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
 			fi
 		;;
 		mips)
@@ -373,11 +376,18 @@ setup_flags() {
 	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
 	ASFLAGS=${ASFLAGS_BASE}
 
-	# 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
+	# 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=*'
 
@@ -399,10 +409,9 @@ setup_flags() {
 		CBUILD_OPT=${CTARGET_OPT}
 	fi
 
-	# Lock glibc at -O2; we want to be conservative here.
-	# -fno-strict-aliasing is to work around #155906.
-	filter-flags '-O?'
-	append-flags -O2 -fno-strict-aliasing
+	# 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*'
 }
@@ -532,7 +541,7 @@ check_devpts() {
 	[[ ${MERGE_TYPE} == "buildonly" ]] && return
 
 	# Only sanity check when installing the native glibc.
-	[[ ${ROOT} != "/" ]] && return
+	[[ -n ${ROOT} ]] && return
 
 	# If they're opting in to the old suid code, then no need to check.
 	use suid && return
@@ -620,7 +629,7 @@ sanity_prechecks() {
 
 	# Prevent native builds from downgrading
 	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
+	   [[ -z ${ROOT} ]] && \
 	   [[ ${CBUILD} == ${CHOST} ]] && \
 	   [[ ${CHOST} == ${CTARGET} ]] ; then
 
@@ -930,6 +939,7 @@ glibc_do_configure() {
 		--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)
@@ -1112,7 +1122,7 @@ src_configure() {
 }
 
 do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+	emake -C "$(builddir nptl)"
 }
 
 src_compile() {
@@ -1160,7 +1170,7 @@ run_locale_gen() {
 
 	local locale_list="${root}/etc/locale.gen"
 
-	pushd "${ED}"/$(get_libdir)
+	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"
@@ -1170,14 +1180,14 @@ run_locale_gen() {
 	locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
 		--destdir "${root}"
 
-	popd
+	popd >/dev/null
 }
 
 glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install || die
+	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
@@ -1190,13 +1200,20 @@ glibc_do_src_install() {
 	# '#define VERSION "2.26.90"' -> '2.26.90'
 	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
 
-	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+	# 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
+		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
+		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
@@ -1354,7 +1371,7 @@ glibc_do_src_install() {
 
 	# 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}"
+		run_locale_gen --inplace-glibc "${ED}/"
 		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
 	fi
 }
@@ -1362,7 +1379,7 @@ glibc_do_src_install() {
 glibc_headers_install() {
 	local builddir=$(builddir "headers")
 	cd "${builddir}"
-	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install-headers
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
 
 	insinto $(alt_headers)/gnu
 	doins "${S}"/include/gnu/stubs.h
@@ -1381,6 +1398,11 @@ src_install() {
 	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.
@@ -1433,7 +1455,7 @@ pkg_preinst() {
 		einfo "Defaulting /etc/host.conf:multi to on"
 	fi
 
-	[[ ${ROOT} != "/" ]] && return 0
+	[[ -n ${ROOT} ]] && return 0
 	[[ -d ${ED}/$(get_libdir) ]] || return 0
 	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
 }
@@ -1444,15 +1466,11 @@ pkg_postinst() {
 
 	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
 	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}"
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
 	fi
 
 	# Check for sanity of /etc/nsswitch.conf, take 2
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 4ddf0a273219..a3d9d33a3686 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -29,7 +29,7 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER=20180511
 
 # Gentoo patchset
-PATCH_VER=14
+PATCH_VER=15
 
 SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
@@ -93,6 +93,7 @@ BDEPEND="
 	doc? ( sys-apps/texinfo )
 "
 COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
 	nscd? ( selinux? (
 		audit? ( sys-process/audit )
 		caps? ( sys-libs/libcap )
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 9407b29978a3..44aed099d274 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -3,5 +3,5 @@ DIST gwenhywfar-4.20.2.tar.gz 2350327 BLAKE2B 1209bc46fe16e4a76886327bdcc0c9dde7
 DIST gwenhywfar-4.99.25rc9.tar.gz 2333734 BLAKE2B 03c9e2fefef592cf0efc20596f0d49d8e1eb9fbea5dce6f8eb6c7d1fc04cd1f0c1adbe386cf22c78dc4de6bba337b1f7e2ad3ca58f8b5cfce8353843d685e424 SHA512 5a94673360299859fca1cea3193c8f03b7d8aa54d1faedddddf54c69892d1f7eefcbe66eb3795145c2b444720cd296bd64e18ec5def10c9409551dcb6d8f7f57
 EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
 EBUILD gwenhywfar-4.20.2-r1.ebuild 2723 BLAKE2B c7640c0c22779ce813fe64d398dc1c1464830a03a9e8abf7ec8569ae21ded84d4e07fc1168d8001626a26b6c087110307a3acf20631616a9bf0afbdbf180ebe2 SHA512 9c9fa5af0789d0005d5e10501d44d1fdc306362893b83913c4f8fd1532053624502a86bcc9d3ae615dcafdc8957d9361d3ecc11b272d85cfae83985dcbfaa633
-EBUILD gwenhywfar-4.99.25_rc9.ebuild 2778 BLAKE2B 93af735fc31fd823b22e916b0389574977c3ec4f5941baa7147f9e8736e199f984bf1b4fff597a5f3a826974803fbb4cd8ca99eaf73b22d7932d33c18ab722f7 SHA512 11e92c30e809bedc7939bd7a71e9455d456431db7b200961f784096eaf4a20cbf67d907b545fa2ee94189f4805f8054b0330e82f210f535a9fbfcbc181fc03b7
+EBUILD gwenhywfar-4.99.25_rc9.ebuild 2776 BLAKE2B 1c134583202bfbc2fa4acba6c18909701b8ec6dee3c859443ccc599193462263eec51f0bd17ae2886d636152612bc0d83d568d057cae01157744d9cde7d5cc33 SHA512 1d762e5b90e4b872a1b6e116f0cc62a0cab3bea6db6924cd98ab06630378c979bfd164aa3a3983c8abfb3a7a3e36ebcb58a3738ccfc3097f9eb1c038c128bdfa
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.99.25_rc9.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.99.25_rc9.ebuild
index b5849382bf4b..23cced45f5bd 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-4.99.25_rc9.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.99.25_rc9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/223/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/78" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
 
 REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
diff --git a/sys-libs/lib-compat-loki/Manifest b/sys-libs/lib-compat-loki/Manifest
deleted file mode 100644
index 9c9cec74f734..000000000000
--- a/sys-libs/lib-compat-loki/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lib-compat-loki-0.2.tar.bz2 1441552 BLAKE2B 5aad70aa780a31a54176cdb70410cd526e7c658cc9877374f03bb45731c9e48b46024e4f8bda162d7dd18dd310530427491a93c75606d3631112d0eb48919af1 SHA512 7a090d9bfb3cb3a184d64030f9c85070034365e83c9e11b315df98995d15933d13542069f15b7bd1dd1c4f1cfab3466c1b354bdc073172573846347ecc8c8527
-EBUILD lib-compat-loki-0.2-r1.ebuild 945 BLAKE2B 8c49b189dc98d8e8ed02f958b6f9b0adde50a623e163d941084a94b0b354b0b77aeb22eb6508c058bcda0b14dd4c256b28f34bdc7fae67edffa3f79feb920dcd SHA512 f4520b4d12a8ac763082227e54ba56d7788ad7bfc147569c8affe3318d757c2217a7365d3a361bb9513ee56e80b9d1ffba83674a22c6d44b052a71c3c9d632bd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/sys-libs/lib-compat-loki/lib-compat-loki-0.2-r1.ebuild b/sys-libs/lib-compat-loki/lib-compat-loki-0.2-r1.ebuild
deleted file mode 100644
index 1681e9fe2b1e..000000000000
--- a/sys-libs/lib-compat-loki/lib-compat-loki-0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Compatibility libc6 libraries for Loki games"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="http://www.blfh.de/gentoo/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~wolf31o2/sources/lib-compat-loki/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/lib-compat
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
-
-# I'm not quite sure if this is necessary:
-RESTRICT="strip"
-
-S=${WORKDIR}/${P}/x86
-
-src_prepare() {
-	# rename the libs in order to _never_ overwrite any existing lib.
-	mv libc-2.2.5.so loki_libc.so.6 || die
-	mv ld-2.2.5.so loki_ld-linux.so.2 || die
-	mv libnss_files-2.2.5.so loki_libnss_files.so.2 || die
-	mv libsmpeg-0.4.so.0 loki_libsmpeg-0.4.so.0 || die
-}
-
-src_install() {
-	ABI=x86
-
-	into /
-	dolib.so loki_ld-linux.so.2
-	rm -f loki_ld-linux.so.2
-	into /usr
-	dolib.so *.so*
-}
diff --git a/sys-libs/lib-compat-loki/metadata.xml b/sys-libs/lib-compat-loki/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/sys-libs/lib-compat-loki/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/lib-compat/Manifest b/sys-libs/lib-compat/Manifest
deleted file mode 100644
index 54c2d0153481..000000000000
--- a/sys-libs/lib-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lib-compat-1.5.tar.bz2 110305 BLAKE2B d103cd4df22d018e03cdd940a74a50ed79a121863dced17b199a0dee4c2fb7a6fd5547d62f70e61cca3933162e2433b1fa2a3edb1cc2991ac0417b509f42419b SHA512 b23b12ab6ecf8c3840ccaebd9c7823651c687fbfaa845b071fa2c2970e616345650f2688cbfca35097686c6b914ab637d166461adb2122f5f7d37c7870a68472
-EBUILD lib-compat-1.5.ebuild 433 BLAKE2B aebb24fd19d3f2b64c3bee13c24bff230f924ec1461a70dcea6f81c1657c142724ce9d99e0dcf66091588baf17b1c2b8cca9bbc9b366dbe37ed726f3b5f5c182 SHA512 9df4b34ea2616c1f748198d0e3655fbbd2e0c6433e4836e37e8a3b015b279ef0d7f7380cd7b43961a6f1dc77f4968bbf60fcfa2e44bac0c8173116cac0530143
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/lib-compat/lib-compat-1.5.ebuild b/sys-libs/lib-compat/lib-compat-1.5.ebuild
deleted file mode 100644
index 93f758188723..000000000000
--- a/sys-libs/lib-compat/lib-compat-1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compatibility C++ library for very old programs"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="libstdc++"  # corresponding source code in gcc-2.95.3.tar.bz2
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-linux"
-
-src_install() {
-	ABI=x86 dolib.so x86/libstdc++-libc6.2-2.so.3
-}
diff --git a/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/sys-libs/lib-compat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 75525dd5576c..f6858e1548e5 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,6 +1,4 @@
 AUX libapparmor-2.10-symbol_visibility.patch 219 BLAKE2B 37bb9ceabfedde6f21e313fcc6a85563fdeca86863e681fa40689b5ce8cb5bdf87947c19b176d7f96edac562b6420a0ae6aae717967782e1bd1bb6ffd4782671 SHA512 93c5e19a6cdfce232a71f9b33b1e96dff44b947c06fc6e348a31038ef78bec7b90e49698681a4010bffd4274ff17a304542b549a8840458b3ab17d4ef1b53d36
-DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
-EBUILD libapparmor-2.13.1.ebuild 2106 BLAKE2B 98238a6f8787762cd172b4fd6f9cd004eb315582998d27402e16aa827bc195bc84d525820cf72608d4636649347fc50202d29e1058466e833015d4b90d590a7f SHA512 0b57ff90302560c94b1e9560f62d81e0b1d3da9224b4b42ced97c57f3cdb79e8197c053466bcda90c40d13dbf9a9cfd5123f731ffc3d696a037bd2add0882097
-EBUILD libapparmor-2.13.3.ebuild 2080 BLAKE2B 54cb943fd283f7fedd6f675618eeef14fc8af87a41ed89dd2c9d644927b6753689ac6f7e1eb9b9002d421881978529629c8eef9dbc679e36015c45cd75c0a7f8 SHA512 f0ca90d3dbb9a62d7755c96fffb5043162856602b3e972cf69b8a18e7051978c5f3a401bf69a33705e741f7e9d571f77683951054c4dd477e6e08aa75c52ea7e
+EBUILD libapparmor-2.13.3.ebuild 2079 BLAKE2B 12a80872f6a9f5edfa6226fb55c5d52900d7722015474f9672a1e60084c4921369d9800b194f66a43531133f72fb0e82165be79ece8f3111c18de67f331a1378 SHA512 a97bab13a06ad9b671a1288e65a6afe9a70f450b69bec198fcef08f0de769c1243be67c07dcdc182cb2b3be020530ba79b723fbc69671ae0c430cd6d95c99aa0
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.13.1.ebuild b/sys-libs/libapparmor/libapparmor-2.13.1.ebuild
deleted file mode 100644
index 81551b20fa1d..000000000000
--- a/sys-libs/libapparmor/libapparmor-2.13.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-###############AUTOTOOLS_AUTORECONF=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools distutils-r1 eapi7-ver perl-functions
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-2.10-symbol_visibility.patch" )
-
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	default
-	eautoreconf
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with perl) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake -C src
-	emake -C include
-	use doc && emake -C doc
-	use perl && emake -C swig/perl
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C src install
-	emake DESTDIR="${D}" -C include install
-	use doc && emake DESTDIR="${D}" -C doc install
-
-	if use perl ; then
-		emake DESTDIR="${D}" -C swig/perl install
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libapparmor/libapparmor-2.13.3.ebuild b/sys-libs/libapparmor/libapparmor-2.13.3.ebuild
index e0bd81813926..8828480dccf7 100644
--- a/sys-libs/libapparmor/libapparmor-2.13.3.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index efc304ef4749..04b46192ef51 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,8 +1,8 @@
 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 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084
-EBUILD libblockdev-2.22.ebuild 2497 BLAKE2B 7ef6a8b19de6e99df9f7682c4a6c5d6eaaf7f355c6430ae71d89b5a8c7396b0b05e19e2f9ca1789c299987309477abf2f9a0f6da55695e85c67c11529371bacd SHA512 be6fe140870202e20f5907960879ac0ca682b834b2e982a976739b2c34d25e3378b3000df3591964bcdf7be61f9bc84e2cd5b2d3bf2a51476b14a6729e571739
-EBUILD libblockdev-2.23.ebuild 2560 BLAKE2B 206091bbcc7694d2e42131bcf14d4069f21a03e5dbf2610bf16c271c3697fbd918ca28bb6219add2d2daff43b0da6b374e21f1b37f8ca304af451d0a4f72d815 SHA512 390dcca4aeb8acfd838c896a131b40cc9d01f0980d924915fbec9342963b884505ced96e07057066ea5af723d6933e74a6e0265c3dce6ca9de9d97827775a1f2
-EBUILD libblockdev-9999.ebuild 2560 BLAKE2B 206091bbcc7694d2e42131bcf14d4069f21a03e5dbf2610bf16c271c3697fbd918ca28bb6219add2d2daff43b0da6b374e21f1b37f8ca304af451d0a4f72d815 SHA512 390dcca4aeb8acfd838c896a131b40cc9d01f0980d924915fbec9342963b884505ced96e07057066ea5af723d6933e74a6e0265c3dce6ca9de9d97827775a1f2
+EBUILD libblockdev-2.20-r2.ebuild 2020 BLAKE2B 870a312438bb59a1c369521df65268f04ab660b6fd02bd4a0cc77b1313326f5a0c226310fd383c9752479bacc0ae3ce5bf5940763aeefb84b0249a45fa531019 SHA512 d5526b9b6e3a8e4f24c42960202ea3aa496a562f0a66863754b76a9e00da6c5af2d3fcb7d39800bf902ec6e7f5720e8e164891f9a73c2405317c50af228fcee4
+EBUILD libblockdev-2.22.ebuild 2524 BLAKE2B 197f03bdc7b67aa35501c948b8fb7b64ac84297d9fb2e39dda06d1f48a501eba48251dd597b0f25d04adb3cba9e4649f3db425829aa9f74fb17a07bf471582e9 SHA512 3fb67afe7909850c9238fdfbb11287944e6ecd38f7f07b0737e94bf36e2543b8d36e35c407455c7c1a3546602c9f459061fb5c19f66547e55ceaa9660ad12ae8
+EBUILD libblockdev-2.23.ebuild 2587 BLAKE2B d0af45c8fcdd57c6775ab35548e970021e266408e3c23cd3223d297d90cdc4fed23019e621243a11962783c86329a5da514aa1d0032b0c7b1f998964ccfac820 SHA512 7dcc39ea6adfa3fef96869823badc659aef01869e8f374739d9fc4f6e8f056e3fa76359a3cec9d3ffaab933515946bdf5eee30f950dd98209c9b31d558f85102
+EBUILD libblockdev-9999.ebuild 2587 BLAKE2B d0af45c8fcdd57c6775ab35548e970021e266408e3c23cd3223d297d90cdc4fed23019e621243a11962783c86329a5da514aa1d0032b0c7b1f998964ccfac820 SHA512 7dcc39ea6adfa3fef96869823badc659aef01869e8f374739d9fc4f6e8f056e3fa76359a3cec9d3ffaab933515946bdf5eee30f950dd98209c9b31d558f85102
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index 86f99e4dd7cd..6779b714db4f 100644
--- a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 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 )"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.2
diff --git a/sys-libs/libblockdev/libblockdev-2.22.ebuild b/sys-libs/libblockdev/libblockdev-2.22.ebuild
index cf78fd034653..382f79323601 100644
--- a/sys-libs/libblockdev/libblockdev-2.22.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.22.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc lvm kbd test +tools vdo"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.2
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild
index cd986a9091b1..ed091987aff4 100644
--- a/sys-libs/libblockdev/libblockdev-2.23.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.2
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index cd986a9091b1..ed091987aff4 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.2
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 8973fcc5a18b..d1b7ec0e099c 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,7 +1,7 @@
 DIST libcap-ng-0.7.10.tar.gz 450243 BLAKE2B 8eb21b0309e46b05fa42752b9c814d90bc1eda4852ac7a4975868c279764431a8d5eafc53e50998470f622e2a59e2b4c6c2ac1ac20525c6fcd0633b09b113012 SHA512 1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def
 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 0f6d25562ae6615d4ce8895f74a8467dc8cfd3cb1cea5b3eb5b13f75c31b90483c2fa868bd35d64b658f92b7b94f383d1f120822c30854465f14fe279ac977de SHA512 e11f77e450af23539de6ee26e4f0afeef2c278b16f2ac8cf6b7a7b3dab7c1d62af8531793e24afe3b05c26f75c2fd3d28c50135fd6965341e735915c6c3a4c44
+EBUILD libcap-ng-0.7.10.ebuild 2211 BLAKE2B ab1774fa04284ba1849ee1be228cbc9d8f8e93ea00018569e5a0f41966fd235d55bc5aebab17c608576ab99f92d6e3a50cd32454892cfec586bb6489149e3e1c SHA512 429dec81a8d8487f78b6ebdb14309b443168be705320cc4e89ef972422632728f5f2db52bbc0ed1f4d3b918c495e170fe8e6371bd10e94069ce9b9520873320d
 EBUILD libcap-ng-0.7.8.ebuild 2292 BLAKE2B 8ee760e4d10a5ae652d30cb824852d60228c4ce7cd8e9339cd223527bb73b5348f2178597c9daf6e30620090e76ea13f539c44b78434acb5db8db909f0773ce4 SHA512 fd1f7e43556763f0512464c2a03e33815df1d4517f2558ab84cf4aeaeefc0ed6f92fb771f121656b9e62ab461d74355311bb1e6a49b166862fa87f6a8edc3b3a
 EBUILD libcap-ng-0.7.9.ebuild 2209 BLAKE2B d99748aa43de737a364f480007cf8a6957e5143f1866a5e724b4a9bff867c6e55e39d94cfce40a7744f4633b5c4d5046f6869d75d175564ef1335b2b2aea8072 SHA512 73845fe25ca5416a9b2cb04b59667c5bb2781f8ad982c6093c723be67371e486423151772c35f0f396532e6f2266578ba61c46f66cea6ec831ca2cc75045b4fc
 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
index e73f7cf226b4..4bfeb7b05ef4 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
 inherit autotools flag-o-matic python-r1
 
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index c271e81edd7f..ad4022dfd361 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,8 +2,12 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-build-system-fixes.patch 4705 BLAKE2B be3c05b5c798411cc03458c1ce71956ddf2996db71d349e6733a082ec90b264d6a24aa6abaff4b44a65502dc9cd49fe749f11d2fc41fa45879fa0cb6bde2b6ef SHA512 c99df67dfdceefeea3c3033a38e94a93cd7a9c4ed6e74f42c3b7198d66deee4b5d4aa91c540a48b12749ce3285c0ac3f11d0ecc33b913c3f0169578ae28745da
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.26-no-perl.patch 2483 BLAKE2B 34d20ca017119a40e31e2da64786a93c1d5468558e8dfcfb15f3758b6648aaad38bf333c11b35a2c8c4cb66d823e4daefed93b7073a0a65225fe9ef3494ff9ef SHA512 750a64c7b45fd145a043f29b8262c9f972aa4dcfb76afed9e440365c0e55d67d0103491e67a34f0f24ee580656e2fffd589b46b0c5a04b4c9e05b5dac6bbe994
+AUX libcap-2.28-build-system-fixes.patch 6163 BLAKE2B e4222dd22d84576d008a0029e855d6e55f7b5aee4fb49a4c04b60501e0bca92d0f58f0751892d5d5e911e67a8f282c32fc8438ad741c662cd3b22625fad94c6e SHA512 3af48ebb13ca1076bce279ef646d66ca73e8c88a54a7698f785a1afdd1019884cc507f0d4f100b6b9e39b7a277131149b818f8d079f4a6e8b2f397c435e84180
+AUX libcap-2.28-no_perl.patch 2599 BLAKE2B 55a6ef3573517e7cd7f367b811a5b6edc2b91974a23e99a31e1704dd5bcda90dfa3b7fde69c37f48c8ad1d97d0c8d68441830f7cc94adacb50cb54246519cb89 SHA512 40d739250a3508538f7083da700efe47628acd6b213e806b5c9d321ce55ce870dd58073459991b235d3cd3190b53e62e1fcc11f79779bda9239f3e042fb9428b
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
+DIST libcap-2.28.tar.xz 94244 BLAKE2B 9416ca78da0b985c25682746b5f5d052835d29ed40e2ffb2f70e3e59753423c91176a41f7d32b28d75800ccfccc5ed446050985a44471f0d0cc4cc9e0ef69661 SHA512 e693ac97483f575bb8a3f4d50262082e6d0d4906f2df48a4f52db4dde21014fcdc683d40712294c7c59d1be21740276bd20b486afee53815dc49e57a9938c5eb
 EBUILD libcap-2.26-r2.ebuild 2043 BLAKE2B 40b475415abc00cb2c5c622739d4928f34a5e1eb217a3b7bf14634de1c405f56d1dcf840e0b53a88cc4656c7ebb8ff74fb8df297f806cd58e8f1e05af011a057 SHA512 d99b520b61447d2ac5113ce8969402a6a9992800a1cde89ae472005facb23bfcd6b5969bcc7a136f9a1c6e0b760ab9ff7c58975fa158c5c3c70c0da58bd20361
 EBUILD libcap-2.27.ebuild 2056 BLAKE2B 19560d3a95c3e03ab3c86d39d0724d20fdee80fcb4114ed850038a4e6f4139ed96fcc4723745b52a18064fddeac0485a9fc3c307a9d575267ef8e32a81a9754e SHA512 ed311603a2654b268332f006ba27a414a063ebe29e7a3399377a0ee41309b805f4327122c8735c825e225bf5f797f8a672e41221bcfeac493d6be6597fbf00cf
+EBUILD libcap-2.28-r1.ebuild 2062 BLAKE2B ba7c16a072037719ff01ea01b33c9f1bfafd00e6a7ade4140096e273b50e2083202a84f51c3c49e3167d64b37c8ce402b7337e284fa50673469c6dc4f3022ce7 SHA512 0f29c2cf7f3fa7542ac939d6d8728697d1f6cec65b9db4f0019042f137743b8a797dda1d6610a712b6dd3c5647bb6c0247a7b29900eb6dd8cf88b38c6dbcc52e
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch
new file mode 100644
index 000000000000..3c2ef3d22149
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch
@@ -0,0 +1,196 @@
+From 95e48927b0c3a5e817a41c03d977fbf2e7083940 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 10 Feb 2016 09:47:27 +0100
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people.  Specifically:
+	- allow toolchain vars to be set via environment
+	- CC / BUILD_CC / AR / RANLIB
+	- CFLAGS / CPPFLAGS / LDFLAGS
+	- split CPPFLAGS out of CFLAGS
+	- break -fPIC out of global CFLAGS and only use where needed
+	- use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.24 to libcap-2.25
+Forward ported from libcap-2.25 to libcap-2.28
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Make.Rules       | 27 +++++++++++++++------------
+ libcap/Makefile  |  7 ++++---
+ pam_cap/Makefile |  8 +++++---
+ progs/Makefile   |  2 +-
+ tests/Makefile   |  8 +++++---
+ 5 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index ab4f17c..bd8f73c 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -46,35 +46,38 @@ MINOR=28
+ # Compilation specifics
+ 
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+-
+-CC := gcc
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
++
++CC ?= gcc
++CFLAGS ?= -O2
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS)
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LDFLAGS ?= #-g
+ LIBCAPLIB := -L$(topdir)/libcap -lcap
+ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
+ 
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+-SYSTEM_HEADERS = /usr/include
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
++LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ 
+-GOLANG := $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
++GOLANG ?= $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
+ ifeq ($(GOLANG),yes)
+ GOROOT := $(shell go env GOROOT)
+ GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 8619972..93f43bf 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
+ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
++CFLAGS += -fPIC
+ 
+ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc $(STAPSXLIBNAME)
+ 
+@@ -39,7 +40,7 @@ libcap.pc: libcap.pc.in
+ 		$< >$@
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -66,10 +67,10 @@ $(MINLIBNAME): $(CAPOBJS)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile
+index 22f0f81..a1f11f6 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -3,6 +3,8 @@
+ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testcompile
+ 
+@@ -16,13 +18,13 @@ install: all
+ # written (and you know why it fails), email me and explain why. Thanks!
+ 
+ pam_cap.so: pam_cap.o
+-	$(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
++	$(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ testcompile: test.c pam_cap.o
+-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o *.so testcompile *~
+diff --git a/progs/Makefile b/progs/Makefile
+index 0786ad3..3abbbd9 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -18,7 +18,7 @@ $(BUILD): %: %.o
+ 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+diff --git a/tests/Makefile b/tests/Makefile
+index b16bdcd..dfed90e 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -5,6 +5,8 @@ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ #
+ 
++CFLAGS += -fPIC
++
+ all: run_psx_test run_libcap_psx_test
+ 
+ install: all
+@@ -14,16 +16,16 @@ run_psx_test: psx_test psx_test_wrap
+ 	./psx_test_wrap
+ 
+ psx_test: psx_test.c
+-	$(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB)
+ 
+ psx_test_wrap: psx_test.c
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+ 
+ run_libcap_psx_test: libcap_psx_test
+ 	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+ 
+ clean:
+ 	rm -f psx_test psx_test_wrap libcap_psx_test
+-- 
+2.24.1
+
diff --git a/sys-libs/libcap/files/libcap-2.28-no_perl.patch b/sys-libs/libcap/files/libcap-2.28-no_perl.patch
new file mode 100644
index 000000000000..d8a20c2e1310
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.28-no_perl.patch
@@ -0,0 +1,64 @@
+From 71ed151782c55b69ad4ce87658c0ce2ccc9c4a86 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 21 Nov 2018 11:00:54 +0100
+Subject: [PATCH] use awk/sed instead of perl for creating header files
+
+More systems should have awk/sed than perl.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.22 to libcap-2.26
+and incorporated the gperf-3.1 fix provided by Mike Gilbert
+<floppym@gentoo.org>
+Forward ported from libcap-2.26 to libcap-2.28
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ libcap/Makefile | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 93f43bf..e2e371d 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
+ CFLAGS += -fPIC
++AWK = awk
++SED = sed
+ 
+ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc $(STAPSXLIBNAME)
+ 
+@@ -46,12 +48,22 @@ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+ 
+ $(GPERF_OUTPUT): cap_names.list.h
+-	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
+-	sed -e 's/unsigned int len/size_t len/' -i $@
+-
+-cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
+-	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
+-	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@
++	(printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \
++	$(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
++	gperf \
++		--ignore-case \
++		--language=ANSI-C \
++		--includes \
++		--readonly \
++		--null-strings \
++		--global-table \
++		--hash-function-name=__cap_hash_name \
++		--lookup-function-name="__cap_lookup_name" \
++		-c -t -m20 $(INDENT) > $@
++
++cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile
++	@echo "=> making $@ from $<"
++	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@
+ 
+ $(STALIBNAME): $(CAPOBJS)
+ 	$(AR) rcs $@ $^
+-- 
+2.24.0
+
diff --git a/sys-libs/libcap/libcap-2.28-r1.ebuild b/sys-libs/libcap/libcap-2.28-r1.ebuild
new file mode 100644
index 000000000000..679cf0b9f262
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.28-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+# 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"
+IUSE="pam static-libs"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+	pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+
+# Requires test suite being run as root (via sudo)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.28-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.28-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+	"${FILESDIR}"/${PN}-2.21-include.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG=no
+	)
+	emake "${args[@]}" "$@"
+}
+
+multilib_src_compile() {
+	tc-export AR CC RANLIB
+	local BUILD_CC
+	tc-export_build_env BUILD_CC
+
+	run_emake
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/libcap.a || die
+	fi
+
+	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
+		rm -r "${ED}"/usr/$(get_libdir)/security || die
+	fi
+
+	if use pam; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 064c5c4bbb3c..74d247f33e45 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,5 +1,5 @@
 DIST libchipcard-5.0.4.tar.gz 801499 BLAKE2B 7966002dbf5c9eb7a53490aa8df68765901d7ebb7c7a16d8b24bf087a9886883aeb8a5c4f4be21ca5740215ce4f1b8d0023409f7b0f843ce1ce894a2cc115f40 SHA512 3b5b049f8ed676994c00ca758248c842de1119a0cee9e55682971839dc72cca226910559763bf858ceb126d998284b0c9f37459e0c87831d52ac39b6c4317293
 DIST libchipcard-5.1.4rc1.tar.gz 871404 BLAKE2B d4377207adec9f90e628caed7c41278770d0c4705b11af54e9e0a1e2241b52ee92bcfbd8ba6f3d64aeae0ddb60e9dc903481a40448a3be12b85dc783d4e53ffd SHA512 01623b831f22f43d7beac5d1b269f68fd44ee978163981cf107ebb3d694f13b26d1393265f1d823e1e5f4df6fffc559834d28fd6c7ca96bef733b89e8e2e4ef2
-EBUILD libchipcard-5.0.4.ebuild 1084 BLAKE2B 72ae66970873a1b840557c9c933c4fd7f530471f43f73f66f8926c8f6728e02e3a7d2f7a6b95d1ced5323af260a61343ca8390924e65fcc4aa1742fe0c4b2bcf SHA512 7c04abecae8f198ec389a5954a7e565fc501938d1796b4005b0273a0b76ed7c9b57e40e5a94d46b53b126356c36af5adefbe5588e00b9c54bf4a4f8b695dcf29
-EBUILD libchipcard-5.1.4_rc1.ebuild 1120 BLAKE2B e25faeac8bc6a3c0ecb5f5e25346d3ec4e4cdc922632bbb4d9da1df370ab411b568bdb99b66113dba1c1ba518f3beeb1b8e596c884411e7e42360050e43bea08 SHA512 bad42baa0318611ecc392ea2a32d2a66390c850e9d5a1750d2ff47831639def6cad6ccbf5e25379e9baab89495bc6f27abeef8fb762fae3f1b438000014aa2c7
+EBUILD libchipcard-5.0.4.ebuild 1077 BLAKE2B cb34a186da432dc85f5b7f3b6758a32ed70cfa54d930f4ff0d93bac7d0332f50b8eb84157828fba6fc879cd5b218d6839138aad46c2b86c28f16ce02c6a63f4d SHA512 6198a303bd92872bb9a2142fc62cf3b7bcbb4d638ed309683c45100678dc23af8187ab841467add09e32378b34b7219541fe528080390920ed963ac876a71c17
+EBUILD libchipcard-5.1.4_rc1.ebuild 1118 BLAKE2B 2164cfaf3a606427228793500f2ed589c3bd5af82aadec8b5e0cb3f6117799b5ec97888bf28a03e7d08c88efebb9d33c40b99414dbf7911497c735b02f3b762e SHA512 85f287749975df8e393bc0512d1be243dfa0948d3b3cf097c5faa2c688da9bb39069ec606056452f2da31c128baaae39ca07c95c8a11b0b73b3083e64ff9d6e3
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
index eaa041a3d6c5..cb9f5a1708d1 100644
--- a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
@@ -32,7 +32,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	einstalldocs
 
diff --git a/sys-libs/libchipcard/libchipcard-5.1.4_rc1.ebuild b/sys-libs/libchipcard/libchipcard-5.1.4_rc1.ebuild
index 642235675a9b..75c3b596fb20 100644
--- a/sys-libs/libchipcard/libchipcard-5.1.4_rc1.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.1.4_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/221/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 83ce7e973e97..6bd927f4a91c 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,12 +1,14 @@
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
-DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 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 libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
-EBUILD libcxx-10.0.0.9999.ebuild 6529 BLAKE2B 25b1b79a7dd2be15557ae27ea2c66697937a18aa8f8223eab8cd84ce41d46fd168463c279ecbcefb1b62a1596af7876bd17f9953c73e5d23ac6c86a30edb45db SHA512 ca3492679b80dbc7e746709166c7831f3e8bc7be0cc2b7f674b1a0186851a5f3a7975a066035293b12333e673df6948e1043c24a4c14b27a43df049bfaf697ad
-EBUILD libcxx-6.0.1.ebuild 6734 BLAKE2B 5871a241d06ab0a449a2a375d3dd89d1b79f7d0712954061df88da89e350612ac00f7e9252ca8e93e9373fe45a66f89730d304865f713a75c6f1ab43565054f1 SHA512 af9fb74c62ecf1a5b188752ddc9fe0bf6ab3443f25704b024c6544b150cd33bcc92492e172119685d3fec2032689a4382dab6bb9f3662f4412323c4f6537c552
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+EBUILD libcxx-10.0.0.9999.ebuild 6621 BLAKE2B 43dfdeb6687377b335760e12aa5a7a9c3f99783a7ceb69dc3983779db414867b24bb3368cd9a056fdd0d60ebf2e84d631f07a37c4e0572491fd3a5ed13141103 SHA512 cca25472753a88da4a9fb6f356c102100a91d8d0e0af029ee0647432de1fe4d7f5cb0f187fd0e1a4a675ec1568c76b85da51134a4f020012b0531e86b5559257
 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.0.ebuild 6552 BLAKE2B bf5b5360f86e4673abaf6af0de2b111ba90b205538a8ad22ff1f97c0be1f4c1c145f9863b74a0a93513adfb3c7539a19f837cc6c5a1090c2e3db0b25ab8272d9 SHA512 344b64dbffa364b12f8f53fc76453d9566805f73b3322084aee7879b63e154a387c6d32a9205a81d7c828ee8c062c7bb10596e58f99ac0ee19392a76956033fe
-EBUILD libcxx-9.0.1.9999.ebuild 6529 BLAKE2B 25b1b79a7dd2be15557ae27ea2c66697937a18aa8f8223eab8cd84ce41d46fd168463c279ecbcefb1b62a1596af7876bd17f9953c73e5d23ac6c86a30edb45db SHA512 ca3492679b80dbc7e746709166c7831f3e8bc7be0cc2b7f674b1a0186851a5f3a7975a066035293b12333e673df6948e1043c24a4c14b27a43df049bfaf697ad
+EBUILD libcxx-9.0.0.ebuild 6644 BLAKE2B dc5cd0c95cbd0e3c68b991f00725f1e930b2cecfff11cfe92bb5552b79a3e2c20d67e13a7f27cd16cb9564c95b5d876505e168de54f03645454e2be2f6a19aa5 SHA512 6265a227bfeacc5ac35bd9be869e570005ff927140e99c091da552474f7206d1f78214d72d4453fb3adc88043b820a4fd25958fa8db1eabdfcba0e404dfbd171
+EBUILD libcxx-9.0.1.9999.ebuild 6621 BLAKE2B 43dfdeb6687377b335760e12aa5a7a9c3f99783a7ceb69dc3983779db414867b24bb3368cd9a056fdd0d60ebf2e84d631f07a37c4e0572491fd3a5ed13141103 SHA512 cca25472753a88da4a9fb6f356c102100a91d8d0e0af029ee0647432de1fe4d7f5cb0f187fd0e1a4a675ec1568c76b85da51134a4f020012b0531e86b5559257
+EBUILD libcxx-9.0.1_rc2.ebuild 6644 BLAKE2B dc5cd0c95cbd0e3c68b991f00725f1e930b2cecfff11cfe92bb5552b79a3e2c20d67e13a7f27cd16cb9564c95b5d876505e168de54f03645454e2be2f6a19aa5 SHA512 6265a227bfeacc5ac35bd9be869e570005ff927140e99c091da552474f7206d1f78214d72d4453fb3adc88043b820a4fd25958fa8db1eabdfcba0e404dfbd171
+EBUILD libcxx-9.0.1_rc3.ebuild 6644 BLAKE2B dc5cd0c95cbd0e3c68b991f00725f1e930b2cecfff11cfe92bb5552b79a3e2c20d67e13a7f27cd16cb9564c95b5d876505e168de54f03645454e2be2f6a19aa5 SHA512 6265a227bfeacc5ac35bd9be869e570005ff927140e99c091da552474f7206d1f78214d72d4453fb3adc88043b820a4fd25958fa8db1eabdfcba0e404dfbd171
 MISC metadata.xml 751 BLAKE2B cc513b45c7283d41728236781558b47c535885612a93bcae2a41be20531bab0e01c159e918670c91ce7b4addb0390d5996ea735fc5856b61af7cf28a9b6286a9 SHA512 3620f5415cc80bc99f16eaaf98a712f1288895bdf1e98898103d680304930db89c3b8b55ca3f4d20d4738fc3aa3e314b81c9989971b23d7f66e2137095a35d4d
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
index f5f67053d776..db9250d5440b 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
@@ -93,7 +93,7 @@ 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
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
 	if use libunwind; then
 		# work-around missing -lunwind upstream
 		extra_libs+=( -lunwind )
@@ -104,6 +104,7 @@ multilib_src_configure() {
 			   ${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
@@ -130,6 +131,7 @@ multilib_src_configure() {
 		-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}"
 	)
 
diff --git a/sys-libs/libcxx/libcxx-9.0.0.ebuild b/sys-libs/libcxx/libcxx-9.0.0.ebuild
index 76ae63ba35ad..41c96a83d618 100644
--- a/sys-libs/libcxx/libcxx-9.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.0.ebuild
@@ -93,7 +93,7 @@ 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
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
 	if use libunwind; then
 		# work-around missing -lunwind upstream
 		extra_libs+=( -lunwind )
@@ -104,6 +104,7 @@ multilib_src_configure() {
 			   ${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
@@ -130,6 +131,7 @@ multilib_src_configure() {
 		-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}"
 	)
 
diff --git a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
index f5f67053d776..db9250d5440b 100644
--- a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
@@ -93,7 +93,7 @@ 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
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
 	if use libunwind; then
 		# work-around missing -lunwind upstream
 		extra_libs+=( -lunwind )
@@ -104,6 +104,7 @@ multilib_src_configure() {
 			   ${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
@@ -130,6 +131,7 @@ multilib_src_configure() {
 		-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}"
 	)
 
diff --git a/sys-libs/libcxx/libcxx-6.0.1.ebuild b/sys-libs/libcxx/libcxx-9.0.1_rc2.ebuild
index 23be36cbff62..41c96a83d618 100644
--- a/sys-libs/libcxx/libcxx-6.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1_rc2.ebuild
@@ -1,25 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# Ninja provides better scalability and cleaner verbose output, and is used
-# throughout all LLVM projects.
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1 \
+PYTHON_COMPAT=( python{2_7,3_{5,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/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+LLVM_COMPONENTS=( libcxx )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~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 )"
@@ -33,12 +28,10 @@ RDEPEND="
 # clang-3.9.0 installs necessary target symlinks unconditionally
 # which removes the need for MULTILIB_USEDEP
 DEPEND="${RDEPEND}
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
-	app-arch/xz-utils
 	>=sys-devel/llvm-6"
-
-S=${WORKDIR}/${P/_/}.src
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 DOCS=( CREDITS.TXT )
 
@@ -100,7 +93,7 @@ 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
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
 	if use libunwind; then
 		# work-around missing -lunwind upstream
 		extra_libs+=( -lunwind )
@@ -111,6 +104,7 @@ multilib_src_configure() {
 			   ${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
@@ -137,6 +131,7 @@ multilib_src_configure() {
 		-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}"
 	)
 
@@ -155,6 +150,7 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
 	cmake-utils_src_make check-libcxx
 }
 
diff --git a/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild b/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..41c96a83d618
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~amd64 ~arm ~arm64 ~x86"
+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/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 0fa2d43fe006..85479daecaa5 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,15 +1,16 @@
-DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 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 libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
-DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
 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 libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625
-EBUILD libcxxabi-10.0.0.9999.ebuild 2984 BLAKE2B 2d5e19d65c798004a761167c15008399bc02641abe5899178ae430a7c141867586ced56044873744ef681b259ecb4f220195b56335992b34ce3be21d62d5ebd8 SHA512 b647d0ff00030c45fc01f8194d6a01a8800b1f165deb9e336d541060b7fabc6ae2962aa923d1f79db886c6c2bb8e82a30113a3c5da550028aefe793da3a17b5e
-EBUILD libcxxabi-6.0.1.ebuild 3160 BLAKE2B f71f407049fde2c3310ffd6626e19398abef0d5d521b1e88ac7139dc45a44e8a8ef67bceddbbbc3e653bf8dd824cd1e429be4e4de4805384b27207b26a3d6299 SHA512 4ff855c703b50eb2165cc9b0942a5de556ea3fd07a9a56b468d72df113473d3ec249ed4887e7b353138dc218a767e299fec9dd43650e1794e39a4455c8f0f68d
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+EBUILD libcxxabi-10.0.0.9999.ebuild 3363 BLAKE2B ef84e208dd036347eace8b38f0378e34aa010265be6e04a502efd835cc357492371fcccbeb285c4a9217c33434f9069e3979a9b967c2049d3b3ff4b9d7d25c5b SHA512 a5f46f878db09827bb1867c7ddf00f57760fa464c6812275d88c086f5432877de8b62b72b828f2e162fa00697901bb02d62a691f3d040ba53cecb658daac842c
 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.0.ebuild 3007 BLAKE2B 7aa0ad17a02b26f548f6a4cd6e39b2dbfa3c298f76b5ba0a708de4b130e265a25e2476c21fb30c9f427065fb259029dc53e4bf8d22a730a61f793870cc5d1038 SHA512 32411ec0cb1722f4e09787e22b08b40334fdad52f5da7ec6c918934269c211b76936fa7d5c664f572f874fe022c907e51dcbb9edf9a62f65e773e2828c2bc578
-EBUILD libcxxabi-9.0.1.9999.ebuild 2984 BLAKE2B 2d5e19d65c798004a761167c15008399bc02641abe5899178ae430a7c141867586ced56044873744ef681b259ecb4f220195b56335992b34ce3be21d62d5ebd8 SHA512 b647d0ff00030c45fc01f8194d6a01a8800b1f165deb9e336d541060b7fabc6ae2962aa923d1f79db886c6c2bb8e82a30113a3c5da550028aefe793da3a17b5e
+EBUILD libcxxabi-9.0.0.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
+EBUILD libcxxabi-9.0.1.9999.ebuild 3363 BLAKE2B ef84e208dd036347eace8b38f0378e34aa010265be6e04a502efd835cc357492371fcccbeb285c4a9217c33434f9069e3979a9b967c2049d3b3ff4b9d7d25c5b SHA512 a5f46f878db09827bb1867c7ddf00f57760fa464c6812275d88c086f5432877de8b62b72b828f2e162fa00697901bb02d62a691f3d040ba53cecb658daac842c
+EBUILD libcxxabi-9.0.1_rc2.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
+EBUILD libcxxabi-9.0.1_rc3.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
index df108a4e0237..4bdd0295a168 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
@@ -45,6 +45,16 @@ 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}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-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
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
index eb2960357792..3d656a49cf7d 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
@@ -45,6 +45,16 @@ 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}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-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
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
index df108a4e0237..4bdd0295a168 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
@@ -45,6 +45,16 @@ 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}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-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
diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc2.ebuild
index 1d40c35736c8..3d656a49cf7d 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc2.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
+PYTHON_COMPAT=( python{2_7,3_{5,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/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
@@ -33,12 +27,11 @@ RDEPEND="
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-S=${WORKDIR}/${MY_P}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -51,12 +44,17 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	default
-	mv "${LIBCXX_P}" libcxx || die
-}
-
 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}
@@ -64,6 +62,7 @@ multilib_src_configure() {
 		-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
@@ -90,8 +89,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXX_CXX_ABI=libcxxabi
 		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
@@ -110,6 +109,7 @@ multilib_src_test() {
 	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
 }
 
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..3d656a49cf7d
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~amd64 ~arm ~arm64 ~x86"
+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/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index a95d05b0f87d..1985f83904b8 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -2,6 +2,6 @@ AUX Makefile 513 BLAKE2B 582a1ee9c7cf3f50a3508470e68c987f7566a6b85fd525b9c5649d5
 AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768ffe4244e5fd883bc4a8ec5ef3e41537734899353127801004659ab8a6890b0c4fea46b8bba4591 SHA512 fc93c26e4df1c5eca2f99ad3058e2d129fa85a876c9d3d6fcc9e456f397455ebd136b88b3c0ed8d27003dc7a00a985094b6c711fb34316d9fef39e1ab2aadaba
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
-EBUILD libcxxrt-0.0_p20180311.ebuild 2279 BLAKE2B ec5e6ecfe5131bbbc3e661f7b5c7e388d141c61fe582dbc374bd39a03a9bfb2245c244770dd06beda54ebc802385932eaf2ee3c0b8b0f74a948822d81dcf0005 SHA512 5a7aa41ffe3e3417fd6717ad40e78ae704679e5c8ef123619ff648dac7306075f5cd1515ebbf21379ca044f68c2c5e608398c17dd6591e767d5f66deb69456b1
-EBUILD libcxxrt-9999.ebuild 2260 BLAKE2B 0604d76d0f839b3c3614173ac8c2fc831665a8cbd1e80375fa3ca653436591d8ae4dd5c42995d2cadf3e9c63451e0201a9918c5352a90054abd31aa566f59108 SHA512 8fd87230bc41487a5a466fc45f2c99a6a8d99008cb0c5d13b9758eee5a4458e567dac780e2057b07feaa9ed06caa07a3bdee89cc167a7b5dff9f541f3b293204
+EBUILD libcxxrt-0.0_p20180311.ebuild 2306 BLAKE2B bfafd255e645583a1f22fa9b377d02afd3d4ba6becf4cd66ae91ab34c06a0f823a10a699242db9c8a8b3d9e7462150a003a21b092c65c59c5e88644d4c026361 SHA512 e2856b6029852fa9c67497319688771da68e3579e4064fa6cd2ce1019f04636136ae28b3da69de2c4a182168b5005b621079220e1de801dd63c8255200cb35b1
+EBUILD libcxxrt-9999.ebuild 2287 BLAKE2B 6b9447fe7063b00f5ff9b83048812604524f1993c52d68a21e8952461bfbbcd67b33053f517a87cca908b81cd5c605fbddfa5827db5d76114f6975ca0920b5cf SHA512 b03ecf58b36d2e5c3851f44d94c245af8f318541d277f96464db4749a4cb476ae056311e4b3377ed5c73dc2ee555a73963928503e7bc03526204e35537cb2e35
 MISC metadata.xml 663 BLAKE2B e23670c740126eaef944e0e78026ac1cd79c4a338158cf99a610fda7fc38e74c3206b03b48bcac22f5f268f1620494a9ccd6b01594c06c18f45a01b0054d9cf5 SHA512 a109b71b8c259c0c71de830bcb2397b6f98879e5c00a85bfb46ed89b0ca0b01cb9ec788f41721fd419b2d912a8574c229d4961e7df74e49e3c6cd6801a13bd7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index bb89489c09da..5f6ec8f7caaa 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -26,6 +26,7 @@ else
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 IUSE="+libunwind +static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
 		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index 5374e99ec390..2fdf7d613327 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -26,6 +26,7 @@ else
 	KEYWORDS=""
 fi
 IUSE="+libunwind +static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
 		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index b5bb23971b29..6c5261ac0c05 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,8 +1,6 @@
-AUX libhugetlbfs-2.20-noexec-stack.patch 3513 BLAKE2B b33aa3f5891e1c55c00c61e7d7232504466dc78c6b4d232f64ec5047c45c6044058bdebea02ddb1f67deb20f298e970d96d2fe8a76a017984d46863c179c0924 SHA512 b8146512167da9530f107d3db4695d8e1174568c2f10bab41c3c3f8dff27b1357cef409e95cea75fbce177366a84904d80a7f1cfb7653dc6e8e10c0abfd8ef0b
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
-AUX libhugetlbfs-2.9-build.patch 1163 BLAKE2B 782c802c12ba86c637fa693dda3d8fb618068f156ccaae5a60623d077997d4dcc7a27e3b2fa4e3b7ec0a34ae8db2e9571bad077de103ca6b65de533b6fc896c9 SHA512 d6443875d2dd2e44abfd470ec793b70d0cf5a69931e2c2889a7b204d1c27bc2abc3b0c7149a495845e080cb797b759844c330ad5c467aed7dae0669b7f5b7ff2
 DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0
 DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8
-EBUILD libhugetlbfs-2.21.ebuild 4068 BLAKE2B 903b0db5f72e4926e8185d15bc4ad970fc77926381bdb6ad0205aa9bcbb7fe6a8936f38a4b783d2a418ad0523ca045cca45db7ed1650e892edd58db1f04de233 SHA512 9df56b646c5df82903a03562e7de61b019d3182a9b8d9b24506ad3bd0edf2ba68b4cd00ba5c47410c8f60876d0fe79b360b50d6c40f6a08d9db6c688cfbfc36d
-EBUILD libhugetlbfs-2.22.ebuild 4153 BLAKE2B 3079451b1dd71059eb955d6ff8a3c08986176fdaeadfce9358b56deedd011a23a301cf80eff014960103a08802a77ef8327f0394e38c9c94a89550a45bb876a1 SHA512 a77ab0a980a286945b1082cbcfa02a7c984d16be555bcfc50b9b2f2bc4a4c1cae45bb93e304ad9b3970e59624d52624be9806c20d576ab41d791d916ae7a2e56
+EBUILD libhugetlbfs-2.21.ebuild 4061 BLAKE2B 93e5777e62c7002285854bda8e2f6b7560ef4a2a00347407bee21d0bbba46ed4e9b0d21f5b054c65a05564271c5a39efd1989131735eac257dec270c8a8bf4a0 SHA512 19b644e0e4c67417ca4e3e3c8da804f00efecb13a68f241eaafc869183c1512e96099fbc6b528cf87484119d6e31cdd692ccd9b90d16e87dd551574a5a5ef753
+EBUILD libhugetlbfs-2.22.ebuild 4149 BLAKE2B 6dd795205b11af7732ff851aa87c382d2ebdc58d26fda6edff6357f8c21dd2d06cdff5d08676b53bb5eab7ec7f9f8b8f96e39ce59d735e7d6971d442bd0b6897 SHA512 e2d515965d2f09c337d682126cd4aa0439f91e282a72dc259d754998f3933b6b692967ef5efa57f55670b8cf6a3d85f56422fbb9f07d229550840d5744bd9880
 MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch
deleted file mode 100644
index 04c8baee37b8..000000000000
--- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.20-noexec-stack.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-https://github.com/libhugetlbfs/libhugetlbfs/pull/9
-
-From 1c41d751d57a598919c40ab9c27514a98da93273 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Sat, 31 Oct 2009 07:59:57 +0000
-Subject: [PATCH] set noexec markers in the asm file directly
-
-Using -Wl,-z,noexecstack can hide real exec stack issues coming from other
-files, and is a bit unportable.  Instead, set proper section markers in the
-assembly files directly.  It also means people using the static libraries
-won't have to use -Wl,-z,noexecstack when they link their code.
----
- Makefile                | 2 +-
- sys-aarch64elf.S        | 4 ++++
- sys-armelf_linux_eabi.S | 4 ++++
- sys-elf32ppclinux.S     | 4 ++++
- sys-elf64_s390.S        | 4 ++++
- sys-elf64ppc.S          | 4 ++++
- sys-elf_i386.S          | 4 ++++
- sys-elf_s390.S          | 4 ++++
- sys-elf_x86_64.S        | 4 ++++
- 9 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 73ebad7..ca987d9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@ NODEPTARGETS=<version.h> <clean>
- 
- INSTALL = install
- 
--LDFLAGS += -Wl,-z,noexecstack -ldl
-+LDFLAGS += -ldl
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall -fPIC
- CPPFLAGS += -D__LIBHUGETLBFS__
-diff --git a/sys-aarch64elf.S b/sys-aarch64elf.S
-index 54799d3..210558b 100644
---- a/sys-aarch64elf.S
-+++ b/sys-aarch64elf.S
-@@ -32,3 +32,7 @@ direct_syscall:
- 	mov	x6, x7
- 	svc	0x0
- 	ret
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-armelf_linux_eabi.S b/sys-armelf_linux_eabi.S
-index dfa7407..265b75d 100644
---- a/sys-armelf_linux_eabi.S
-+++ b/sys-armelf_linux_eabi.S
-@@ -31,3 +31,7 @@ direct_syscall:
- 	swi     0x0
- 	ldmfd   sp!, {r4, r5, r6, r7}
- 	bx	lr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf32ppclinux.S b/sys-elf32ppclinux.S
-index 65d8b3f..6ba3f22 100644
---- a/sys-elf32ppclinux.S
-+++ b/sys-elf32ppclinux.S
-@@ -32,3 +32,7 @@ direct_syscall:
- 	mr	8,9
- 	sc
- 	blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf64_s390.S b/sys-elf64_s390.S
-index 425a387..5c31899 100644
---- a/sys-elf64_s390.S
-+++ b/sys-elf64_s390.S
-@@ -20,3 +20,7 @@ direct_syscall:
- 	lgr	%r5,%r6
- 	svc	0
- 	br	%r14
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf64ppc.S b/sys-elf64ppc.S
-index d50f4a6..b57a345 100644
---- a/sys-elf64ppc.S
-+++ b/sys-elf64ppc.S
-@@ -46,3 +46,7 @@ direct_syscall:
- 	mr	8,9
- 	sc
- 	blr
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_i386.S b/sys-elf_i386.S
-index ab30c8d..6182b3d 100644
---- a/sys-elf_i386.S
-+++ b/sys-elf_i386.S
-@@ -40,3 +40,7 @@ direct_syscall:
- 	pop	%edi
- 	pop	%ebp
- 	ret
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_s390.S b/sys-elf_s390.S
-index 40630d1..e6a9a96 100644
---- a/sys-elf_s390.S
-+++ b/sys-elf_s390.S
-@@ -20,3 +20,7 @@ direct_syscall:
- 	lr	%r5,%r6
- 	svc	0
- 	br	%r14
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/sys-elf_x86_64.S b/sys-elf_x86_64.S
-index 6af06ad..561f49b 100644
---- a/sys-elf_x86_64.S
-+++ b/sys-elf_x86_64.S
-@@ -32,3 +32,7 @@ direct_syscall:
- 	mov	0x8(%rsp),%r9
- 	syscall
- 	retq
-+
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
--- 
-2.6.2
-
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
deleted file mode 100644
index 827e2a58d101..000000000000
--- a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2010-08-13 20:14:18.000000000 -0400
-+++ Makefile	2010-08-13 20:14:42.000000000 -0400
-@@ -314,24 +314,24 @@
- $(BIN_OBJ_DIR)/hugectl: $(BIN_OBJ_DIR)/hugectl.o
- 	@$(VECHO) LDHOST $@
- 	mkdir -p $(BIN_OBJ_DIR)
--	$(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^
-+	$(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- $(BIN_OBJ_DIR)/hugeedit: $(BIN_OBJ_DIR)/hugeedit.o
- 	@$(VECHO) LDHOST $@
- 	mkdir -p $(BIN_OBJ_DIR)
--	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
-+	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
- 
- HUGEADM_OBJ=hugeadm.o libhugetlbfs_privutils.a
- $(BIN_OBJ_DIR)/hugeadm: $(foreach file,$(HUGEADM_OBJ),$(BIN_OBJ_DIR)/$(file))
- 	@$(VECHO) LDHOST $@
- 	mkdir -p $(BIN_OBJ_DIR)
--	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
-+	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
- 
- PAGESIZE_OBJ=pagesize.o libhugetlbfs_privutils.a
- $(BIN_OBJ_DIR)/pagesize: $(foreach file,$(PAGESIZE_OBJ),$(BIN_OBJ_DIR)/$(file))
- 	@$(VECHO) LDHOST $@
- 	mkdir -p $(BIN_OBJ_DIR)
--	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
-+	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
- 
- clean:
- 	@$(VECHO) CLEAN
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
index e7aae65f6050..8afaeb6120b1 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
@@ -72,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	hugeadm='obj/hugeadm'
 	allocated=''
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
index 34b969c3fe3d..b62aa943041e 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
@@ -72,7 +73,7 @@ src_test_alloc_one() {
 src_test() {
 	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
+	emake -j1 tests
 
 	local hugeadm='obj/hugeadm'
 	local allocated=''
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 18868059cd4a..5beaf3b0ca69 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,11 +1,13 @@
-DIST openmp-6.0.1.src.tar.xz 2048320 BLAKE2B 08b3a7051c985903f78331f55a1c6e928399b87c862c43c991e9bf78b66b6e412fc96f202b82c051176dbbe02422f8ceb7414f44ea8f3522f418e515c0f70c62 SHA512 abb956583e5d11d0c6f6d97183c081d658616a74933be884a591eaa3d8c4bb04f08f02016d2c86d7384c7ff1aa44fb949b0d967fc0ff50e3132aaba412e9add8
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 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
 DIST openmp-9.0.0.src.tar.xz 939036 BLAKE2B 3eee75f05f65a294db6e65c29b8871bb2dd4e0ee753447d2356010ca1a114f3ad2dc54c2f39ad7ffcebd510d912e96f54a2884ecdc7f50864f909184c707e7a5 SHA512 0be0e95026db574ad75d4a9d2fe4234056d16dc4fe24760f3e9e39f3e10099c7eea4ff76d7236e5a570809111fa18fa017cb679391c16a995ba0c194eb9391d4
 EBUILD libomp-10.0.0.9999.ebuild 2989 BLAKE2B 6d8b584d8f2b533ddd2d42c82957aaf749df591c57bf518e2cd0bcb900acd5631097099f172d6a95c3b2f8714be7240f6f641df4c8a77675cd7a442746f3e498 SHA512 efd8c7cb3368590b5171c4ee0308bff23b1eac6160bddeadc9ccdff139628425c93d87a679cf51e1c4c46cdad857a7602e4b02b654486281fab4d8ec3a41a488
-EBUILD libomp-6.0.1-r1.ebuild 3249 BLAKE2B c0128b595df288ca5d233d0de9f3dd1c6d60be6796530e3944d3cfe8b6aa983ba634714a0f1b8cdd5fd51a719c0547a34ab788c3fb2456d84b055d3b58c38f7b SHA512 c6f934694852f6c4ac474d04ab3b33204d5094c2a42f8935f6744e74041e2cfb6f9746b53dadadfeb1c5892efdf97c8d33865f72a9e4baa048984470a3efbcef
 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.0.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
 EBUILD libomp-9.0.1.9999.ebuild 2989 BLAKE2B 6d8b584d8f2b533ddd2d42c82957aaf749df591c57bf518e2cd0bcb900acd5631097099f172d6a95c3b2f8714be7240f6f641df4c8a77675cd7a442746f3e498 SHA512 efd8c7cb3368590b5171c4ee0308bff23b1eac6160bddeadc9ccdff139628425c93d87a679cf51e1c4c46cdad857a7602e4b02b654486281fab4d8ec3a41a488
+EBUILD libomp-9.0.1_rc2.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
+EBUILD libomp-9.0.1_rc3.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-6.0.1-r1.ebuild b/sys-libs/libomp/libomp-9.0.1_rc2.ebuild
index abc8941fe1ff..50704d497432 100644
--- a/sys-libs/libomp/libomp-6.0.1-r1.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1_rc2.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib linux-info multiprocessing python-any-r1
+PYTHON_COMPAT=( python{2_7,3_{5,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"
-SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
-
-# Additional licenses:
-# - MIT-licensed Intel code,
-# - LLVM Software Grant from Intel.
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 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 ) )"
@@ -37,16 +30,14 @@ RDEPEND="
 # - 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}
-	dev-lang/perl
+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
 	)"
 
-S=${WORKDIR}/openmp-${PV/_/}.src
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/sys-libs/libomp/libomp-9.0.1_rc3.ebuild b/sys-libs/libomp/libomp-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..50704d497432
--- /dev/null
+++ b/sys-libs/libomp/libomp-9.0.1_rc3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~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 ) )"
+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/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 952056e24799..bdba5a6c65e6 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,7 +1,7 @@
 DIST libosinfo-1.2.0.tar.gz 916787 BLAKE2B 652910ca1e70071d88adb771e458f0c19159a772eec1178c94ea5f65c5045bb00e4b1354b1ce4229d28821b6b1557424e419c1505b721883731a36b0761a1b5d SHA512 d98a107a08c5e2cddd746631b3ceac4278184ea5561ad2372d772b8ae253dc1363f217778d105387e5b5c5e86be9607668aa94929ad9b4ee48ab7abf50fb6a01
 DIST libosinfo-1.3.0.tar.gz 977090 BLAKE2B fdfe29dbf01e00608374baf2fb6b5257dff5eb8870375769c572b4dacf2bd7f6e1907083e6c36bfb1a76e9e994bb19b093c6fc63ce8e7170ab8073f6d53c573b SHA512 652f2927e901afe9772d4f28be5bb59802cf149c6c8eea4256a999f5012bfaaac81b51c56a94b32c82ef3462ff1f26baf84bf9329e5b1136e2b49ed4a0658982
 DIST libosinfo-1.4.0.tar.gz 1075852 BLAKE2B 93129a29ea3a1a3aa69fdceabcf6f41393c8e1dd3f92872d97dcc23a3316b0e4d16ede104da9a3ea0c49d352ba88e05ba5a38806c8c039fe92217e4b6e3140ab SHA512 531b7acf811add53252e52917f8b13b409dbe7a4bc5837dcbe34e729b0f294e760d5a57c5c1c56f1f65217b7fc6e285a56a6fa49d36f02cf696b7cc181db1fe5
-EBUILD libosinfo-1.2.0.ebuild 1733 BLAKE2B 6d8f39bfe7139b5a9103922b61768f458a8ac5db914bb4b7cd4a13b897d5fb1b062adfd81a6aca778a97475ec95835a386904f2bf70a413a992bc3fa3f7c5b67 SHA512 331e01a546b7b81c1d88d2bec8984e15747924d40b6caac719680dae5af709d9816c06bc7eea9c19a9202648c3245191b107390a5097af7323e3c3910fb33dd2
-EBUILD libosinfo-1.3.0.ebuild 1862 BLAKE2B 9aacc7c5ed0c1318a8749282a123596135d6b0472417cefbca1fc6a0d52dfe89e3f25b1aa50149101fa896dbd6da43a2a091a0a444b77bfa226192b77f339dc1 SHA512 b55b7cb906a4a02e33d650af2493ba0904ef7b43c47f9b62d15830ef00decad706ea1e74c60b6d49ce63968aef1c7c706745bdbae5ac835ac9cd9b2ec6c964dc
-EBUILD libosinfo-1.4.0.ebuild 1865 BLAKE2B 99659c78f76076d2338c619d381d924f9c2a80d2bba736dbc803d0cee94f4a69379e0a6781cc0776a923200827b4ec908c1692f06d254ddb4b7276eb502f27c6 SHA512 b288b846e4348094d53e072fc2c1ff2a4b5c9bd0cb37005a24a31b7c8f1acd8edcb019da1587a861df6581d2a98103efcdc2cb047cdc975191f92483cf2c3457
+EBUILD libosinfo-1.2.0.ebuild 1760 BLAKE2B 6e07b52b9b5b2286ebbb4860afb7cbdb4cee11a6582941411f6406314db1c09e7e5880464806966a6a0b4118ee2bc3fec047f4d65722179a5f44579638678ce6 SHA512 562228e1d0dcf5a8d7972f0a25e8e5e37360404eacb8eecbcc0e6ce64f4f14d55880fe68d272bafcabe445e585fc764b84376ac469cad52f152af872a73fd9d2
+EBUILD libosinfo-1.3.0.ebuild 1889 BLAKE2B 22b3218eb91c56f834b1111bdf58293858329f639397c319b9efacd4de3452c2a788eee52cba7bb1afa2edbd1474861a67fb708da1ce61b2e856fe35d20913a2 SHA512 2848f2b4597a24fdade45a82e8bd135f25f552a743de95d8798ad7c3de64641434e276bfd018092f561c03ecdcd1fd522512889e88feb61fda888ad8b3755412
+EBUILD libosinfo-1.4.0.ebuild 1889 BLAKE2B e270a3fc8436b9766caa8c7d5dcc0812860422e66571964c23115c3e165ec5ca922fd728ea693bc09d10693eda6f99845b1d03f893dc3ef89aaccd28c2065702 SHA512 f2d7c045173732f79333e0c04341d50155afccc4ad4f33a7bc53e83977a0074a9aaaa770fc2decbbc10aed860b91a7dd232c88fbe6879157b63f22d1e0506545
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
index 72e0867bd9fc..b2aa0c7a03d2 100644
--- a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
 IUSE="+introspection +vala test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
index 064e8e0d469b..81405fe9b0d1 100644
--- a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
 IUSE="+introspection +vala test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-libs/libosinfo/libosinfo-1.4.0.ebuild b/sys-libs/libosinfo/libosinfo-1.4.0.ebuild
index 5dd44bb7fe19..93cbfec3fe17 100644
--- a/sys-libs/libosinfo/libosinfo-1.4.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.4.0.ebuild
@@ -14,9 +14,10 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
 IUSE="+introspection +vala test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 0e1110ceb355..cd16faa78b29 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,7 +1,8 @@
+AUX libseccomp-2.4.2-missing_SNR_ppoll_defs.patch 1228 BLAKE2B 4e1a60bec1ee6004367faa559ab15b5a14228df7abd95ec2a3a28ef08346233497573517f43e240f770893e482f4e45b75b107e6e2b5f4825e8ddfe4d14f1451 SHA512 e6d37ff50915ccc0101f1cb2aa7af5061c38d95fc8f51034f944161d5620b0bb8588c296b3be5695427ef5e0ec66b2c660ad0e408485269c0be2aa98991717aa
 DIST libseccomp-2.4.0.tar.gz 604987 BLAKE2B 2dd84f2c08d40a61dfe4fdc47a9dcdad2701e2918cdcdeae2d15a66eb114221866121bab11a8292f3bd31493b6cd7b370d0728976cb1bbfd0dbb9e32127b9045 SHA512 daa4a32c6c2b2f39aa9db1a4606619f9faeffcd2fca00c25ac5cf95d0405639ec21203293be7c8341317a05b18fd9f603a201544457cac91bf034a0bbd4dfc88
 DIST libseccomp-2.4.1.tar.gz 606860 BLAKE2B f80f11ef4e03fc9f59fdd38466e32b081e9858473266942b22a1bd1afbd480d21e9c72f9c33e197349fcd2658361f84ee1ee371f73aa5dfe19561472fec8c1ed SHA512 1fe47ebb032635ba1b1cbefb505a0c103bae659844d1bf106d03e7f28b3c470726f7b0dbbe76d10ab89501630dc4f20b162c2eeefa22394eb632f803ae62ccc5
 DIST libseccomp-2.4.2.tar.gz 601014 BLAKE2B cff2612498a6ff3097809e9e04542e0be12c2c5d80fd51c2abd35fb6ac59f3ef7fce1c5205216876c1f67eb762d31c7df8e0f237f3957b7710148a1298502ae5 SHA512 375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb
-EBUILD libseccomp-2.4.0.ebuild 1021 BLAKE2B 074c5338a42ab2fc31182d94dc3268e10348c97c4aa1cb42139b926dddead8f7c630b0481f24b42ada7160215611b4238f4d64ab9c2fa9ea7908ff01edff4606 SHA512 7d97edbe6d0248cf1339381e5e6f24478cf38f7c48781c36f143dd78a607918c1c35e14cc9d206e405872d05bdeae9d4f0881151031738a249c7863e878da10b
+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.ebuild 1036 BLAKE2B 31956c980efc78d261610bc2ab63c67612e54a6d70e0db083b08a613d073c59bbd3c9b1e623dd8948152407c5f682968a0fe30c0bc2cff7903f1afcb2182db13 SHA512 4c1e2080ed599e98f66dd068aa8028e4fd5fdf0e678ab06deb3f8c6a086108c898eaa3915299365a59197c0509c687cab702e24564e12f69c0b0208b1668fb03
+EBUILD libseccomp-2.4.2-r1.ebuild 1105 BLAKE2B 2898082b162bcbc3309af85df6e767703692d3d7c9a28e2921ed92d6760faed43d42b9c565ab37a0ebc46e8663760662d157006fffea65fa3a543021e50a7b6b SHA512 2badce3f530e81f93694a75085d8725be5bcd52d1acbb5365306a612d17d9193898a431472eb5fbd467be48f55a63b0adf694512d6b44420cb1c7da0f8be0c6e
 MISC metadata.xml 395 BLAKE2B a375d336aa4cdc973bc6edefa50745bdc67753e53988718a804b9dfab02d8c8324fd998c9c17dfac0f1c57a7068d2c036ad37194a46c3aec208314171c357367 SHA512 db1f67e65f149ce7122b9c845d1305cdca95428267590d7261af489493dd34518c178ce8ce402bea290c0ee441fdece5006c62803ed587281dc7d84a25a3c3e4
diff --git a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
new file mode 100644
index 000000000000..9194706efa06
--- /dev/null
+++ b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
@@ -0,0 +1,41 @@
+From e3647f5b6b52996bf30d0c2c1d1248e4182e1c1c Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Wed, 13 Nov 2019 13:36:10 +0100
+Subject: [PATCH] api: define __SNR_ppoll again
+
+Commit bf747eb21e428c2b3ead6ebcca27951b681963a0 accidentally removed the
+__SNR_ppoll definition. Add it back, using a PNR value if disabled in
+the kernel headers.
+
+Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
+Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
+Signed-off-by: Paul Moore <paul@paul-moore.com>
+---
+ include/seccomp-syscalls.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h
+index 6457592..3c958df 100644
+--- a/include/seccomp-syscalls.h
++++ b/include/seccomp-syscalls.h
+@@ -272,6 +272,7 @@
+ #define __PNR_timerfd_gettime64			-10238
+ #define __PNR_timerfd_settime64			-10239
+ #define __PNR_utimensat_time64			-10240
++#define __PNR_ppoll				-10241
+ 
+ /*
+  * libseccomp syscall definitions
+@@ -1359,6 +1360,12 @@
+ #define __SNR_poll			__PNR_poll
+ #endif
+ 
++#ifdef __NR_ppoll
++#define __SNR_ppoll			__NR_ppoll
++#else
++#define __SNR_ppoll			__PNR_ppoll
++#endif
++
+ #ifdef __NR_ppoll_time64
+ #define __SNR_ppoll_time64		__NR_ppoll_time64
+ #else
diff --git a/sys-libs/libseccomp/libseccomp-2.4.0.ebuild b/sys-libs/libseccomp/libseccomp-2.4.0.ebuild
index ed16699636f3..8914898af2db 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.0.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
index 6fc6a1ee79ec..8e528f0bf022 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
@@ -20,6 +20,10 @@ IUSE="static-libs"
 # version here, just be safe and pull in the latest stable ones. #551248
 DEPEND=">=sys-kernel/linux-headers-4.3"
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing_SNR_ppoll_defs.patch"
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -36,6 +40,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -type f -name libseccomp.la -delete
+	find "${ED}" -type f -name libseccomp.la -delete || die
 	einstalldocs
 }
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index e7ad3c880f24..e9095e662d85 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,8 +1,7 @@
 AUX 0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch 8172 BLAKE2B 3c301b206a809311fd7eb1eb35b3925c064731146e35702b7dab5b47f41cb2a61723db7243d67caf4ce317f3b4ca2d1a999b0533e0185c44b2892e72d8cf8bb0 SHA512 287e82b5888f973bc3545b1777d9baa33965fb2bb3810834871b6843b163d11e4dacde9a7361088f715f70947e9087de89331b0b35dec1e37bddd523e5a12c1b
-DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
 DIST libselinux-2.9.tar.gz 211546 BLAKE2B 5b06b922690e48924865c98ed34ebfc1ce5e30e78dbeaccb6b9c931a35bed113c030f8f8575084429fe13b91aeafc73abaa24fe609a17ba54c8472d783f6ac61 SHA512 727b211d09f374d45aa3fa4dec7fd5463dfdcf5aaa47f7fcaccee51fb74896c3aa1a6f0bac9cdd47ebe4929effff13f66f5f70447b27b783dca5f7b1576d30d0
-EBUILD libselinux-2.8-r1.ebuild 4185 BLAKE2B 215867146c515772f63c579ac9d3cb5e65b6493da8bcc5abf641aa1fb5e63d966c4c59ac0ed1e27c92834983bce308fa8c032f4da395c1857bbb317e0cce20ff SHA512 979454cea09f81e3b63ff62672deebb8b3dce3192ff27c6abb3382058182994c9de90e8660b421d1c671b87366588163f6b507de24b7ee5a8db4b78d6bc4a289
-EBUILD libselinux-2.9-r1.ebuild 4257 BLAKE2B fdebf286772e557341bc0be3a893cfd3fc9ef4681f4a586f977fdf4dbcaafc0923ea3085a106cfccbf793ba11bd2ce06e88ff133477e93908268cfb02da342d5 SHA512 37e8ad4cb92d059841232e7bcfe6170b7ae3a11d1daba18df540604912e6211d899bfce577908540eba0e6b80bbf000a3121f91eca089b0b8f7070f5aaad3f7c
-EBUILD libselinux-2.9.ebuild 4166 BLAKE2B 820eebc2087a9731775a43fe7d8b34b692369e11419867a66e68ecd78a61608c8716d43ef390d8e4d39360dfb97e0e317e3ed24c7ab6a7bd2db4f5928c5ed59d SHA512 d575fa59d838a18e827d489c9a9212128e5f9c07eaa90ecaecc3a24565b467220893074149818f907b87611ca02595ac175bb98f8d30bc12616f56b08f7fb11e
-EBUILD libselinux-9999.ebuild 4170 BLAKE2B e23a62ba8d06085e9bc2b5ea42e84637a503b243332c78d0429d407a49a482dc966b669ff061dc9f58895efe54ec423f175312d9081c5ccbe2760cf0e529f434 SHA512 c100b626adec06317ecefe13954a846f4d8d7c537e48bd39c7945231d0f5041a9db63d543e341b2ef7fbe751049856c64a2f8a398d1ed6ea099b73a4935ed711
+DIST libselinux-3.0.tar.gz 212096 BLAKE2B 7502c77243928adfc445f55357b0e894087859c3a83e2beb446c31818362d10111c3e52b970150638c055f96cccca6fccde79440026201a2a48bfda3565c27d3 SHA512 6fd8c3711e25cb1363232e484268609b71d823975537b3863e403836222eba026abce8ca198f64dba6f4c1ea4deb7ecef68a0397b9656a67b363e4d74409cd95
+EBUILD libselinux-2.9-r1.ebuild 4265 BLAKE2B f5fae531cd13c5a75e5f6d7c07f457ddcbdb3207646135859fc4ec0cbdb7d47ffe8306a8cda8e18280279b8d4537d93671fa6975e103740b84dd99d675935116 SHA512 82b542d8c37d8ae94a164ac45cb5eaed473d5d7f5d97a47c6e96ef3fd438f0988c5ee09e2ce1c3e1a25acdf8d7b21eca01c861ef646a9d1f6aa0bb29bf08aec9
+EBUILD libselinux-3.0.ebuild 4226 BLAKE2B 9605e8a9ec5e403d4a2ab93665fce70c6a1bfdbd3d9a79730a45f5cf3b43c7d7c9750c19611fcb2781406eabca89a096cea535c06154f5d6e1fb9025fb39339b SHA512 cf7d6c63814a3c75c85e4f393c5d1cbd4c222bf30205626fd941ea7f5e9e543a6b2b94306cb749f03bf7e08ac0d46d1ba8944e8a9a2d8d0f89bbb9092ae52a4e
+EBUILD libselinux-9999.ebuild 4226 BLAKE2B 9605e8a9ec5e403d4a2ab93665fce70c6a1bfdbd3d9a79730a45f5cf3b43c7d7c9750c19611fcb2781406eabca89a096cea535c06154f5d6e1fb9025fb39339b SHA512 cf7d6c63814a3c75c85e4f393c5d1cbd4c222bf30205626fd941ea7f5e9e543a6b2b94306cb749f03bf7e08ac0d46d1ba8944e8a9a2d8d0f89bbb9092ae52a4e
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-2.8-r1.ebuild b/sys-libs/libselinux/libselinux-2.8-r1.ebuild
deleted file mode 100644
index be77fe9aed83..000000000000
--- a/sys-libs/libselinux/libselinux-2.8-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
-USE_RUBY="ruby24 ruby25"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20180524"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
-	ruby? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			emake \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-2.9-r1.ebuild b/sys-libs/libselinux/libselinux-2.9-r1.ebuild
index 0a941fc9a829..f9b4b294e1f1 100644
--- a/sys-libs/libselinux/libselinux-2.9-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.9-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 python3_8 )
 USE_RUBY="ruby24 ruby25"
 
 # No, I am not calling ruby-ng
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libselinux/libselinux-2.9.ebuild b/sys-libs/libselinux/libselinux-3.0.ebuild
index 01eb86ea822f..65d1cf5ca6c7 100644
--- a/sys-libs/libselinux/libselinux-2.9.ebuild
+++ b/sys-libs/libselinux/libselinux-3.0.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
-USE_RUBY="ruby24 ruby25"
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -21,13 +21,13 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -37,12 +37,13 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	ruby? (
 		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+		ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	python? ( <dev-lang/swig-4_pre )
-	ruby? ( <dev-lang/swig-4_pre )"
+	python? ( >=dev-lang/swig-2.0.9 )
+	ruby? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index ee1da650b46e..65d1cf5ca6c7 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
-USE_RUBY="ruby24 ruby25"
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -37,6 +37,7 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	ruby? (
 		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+		ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index a5ff2e7aef35..e0e025b9c67a 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,6 +1,6 @@
-DIST libsemanage-2.8.tar.gz 154200 BLAKE2B db987e42aed7177cd9b3d1e495c97878a816fe78d7c73631f475649d0ab4182e5966a9ee691f2d59863eab2b7a62f608bc00f0789f22401a54f18b41f6ebfb68 SHA512 53f09c79da168a79b853f55e0f1c20a96229df9d82929c514bcaf72697446ae836f7f0457fc0056d2418cc6d0712157faf0152881518fe84a1b1b9b9af17e7ef
 DIST libsemanage-2.9.tar.gz 157690 BLAKE2B 98a7800a4f4a5b6eeaad8be9870a49bc697cec6cd053cb44bcd618d22146ed1adc32b432667f8fd245ac073a458e048894cbaf68903b79577bc8596b1c255f56 SHA512 ea2924e8ce97d376519d40d499145b3db413cf9cc1eb995ed338b95c131e043d8c43b87b2012cee2bb6354a6e3161ebf5ce4a1200278d3ecd4294b43d177a5c2
-EBUILD libsemanage-2.8.ebuild 4673 BLAKE2B 02956f6f4384787808ffbcc34184cb802ce968ef1c3942c71b0d4df8b1c926eb5150d18af6ab88b0d450dad0d3126ba3fff536e62546007ead1c8cfb8298874c SHA512 7ee8eb32b2fb8ffd530f7866b34e052d6f07b4bdfd2611f88952ad3a97e827daddb7b580cc057a49a49ab2ddfe8bd61725a5189d7967ffe85753c569340b25c6
+DIST libsemanage-3.0.tar.gz 180745 BLAKE2B a7e7f0c98e365fcc132e2e66de736db29b46599be2da227dbf1384110a607120f141975b859e55073f734e3ff533bdf90b7bbefd79f7bc5857bbb0722a75ad4e SHA512 f960e1bd6815d3c9f000efa7ae717bc7937e742af5a7fea4aa865cf1aee49486e34897d83dbdb9cf77975a09a5ad77e5512d47690a74512a468a89432b72a42c
 EBUILD libsemanage-2.9.ebuild 4656 BLAKE2B 64aaa3ec753326d9d619aeccc7607c9af2f076f4951fb1cf242180964b1e293c7a069ee6ce3aab8f1d254373fc9a6ebb4070fb0a44a7961117814bd5abfe04a8 SHA512 54b06cab9da09119791e373865e331fa2a3c09e0ce0b8474e2dfc16211e7172e633ee9024fac46ecc5201a0e274d27527109e71164e85a4b1e3f1003bdc60b57
-EBUILD libsemanage-9999.ebuild 4658 BLAKE2B ea77b29d1c8dd72a6455f1742be6fc9ecf3d5cfc9c855417d1e8950b20237e5ac9b090eb759a75ccf78255ef2be597251350847635fe7907b9dbb975b09824eb SHA512 7d8b32361ccb58e00d9a4942a20937d0da23f889b522f768b6b2a0f1e2378288232e0a104c9f59cff49a9f076aa6af6b3b2747fa7fdd14b828270c20c154e04d
+EBUILD libsemanage-3.0.ebuild 4662 BLAKE2B 65ce57278d2fd448f2dcf28540f509de31fa97f92169c8684692d6744edefabd0c4bf42bc3ffc594d2844c1073d8f92379cc5c0bfe3a3e9ce8c1d251b63b0d45 SHA512 2e0b0878e06374e7a39e1b87a640edac663974dc472128f6f45302aad8b41176fc81acbe85b8a3cb07891ebaf1174efc5a0dcaab9b2e668f10097a599e98fe75
+EBUILD libsemanage-9999.ebuild 4662 BLAKE2B 65ce57278d2fd448f2dcf28540f509de31fa97f92169c8684692d6744edefabd0c4bf42bc3ffc594d2844c1073d8f92379cc5c0bfe3a3e9ce8c1d251b63b0d45 SHA512 2e0b0878e06374e7a39e1b87a640edac663974dc472128f6f45302aad8b41176fc81acbe85b8a3cb07891ebaf1174efc5a0dcaab9b2e668f10097a599e98fe75
 MISC metadata.xml 406 BLAKE2B c9f83aef9f66b26a895bad604ab829ba1d6b6865cb519ac23be395cfb9b81f06d35a3ac4602d5a0b53f0ca58e50a8ca71efba8dc8d70740294cee2a49ed0e777 SHA512 742aba47cdd9ad8f97fcb03a01cc2552c6e1d715f6b717c9dff2ae86ab34b850745888e4f2e3963ec2c258cf16a33cb161205f4ea72563446eada82f6c298479
diff --git a/sys-libs/libsemanage/libsemanage-2.8.ebuild b/sys-libs/libsemanage/libsemanage-3.0.ebuild
index 53e09e311690..61acc2ad7eef 100644
--- a/sys-libs/libsemanage/libsemanage-2.8.ebuild
+++ b/sys-libs/libsemanage/libsemanage-3.0.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
 
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
@@ -20,8 +20,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 3c459af181c2..61acc2ad7eef 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
 
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 9aaa84ab9c61..3f99ddc4bb22 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,6 +1,6 @@
-DIST libsepol-2.8.tar.gz 473384 BLAKE2B 7280221d0824b316a3e66a0126654c71f52464d8a17460a2d38f592cb54449e2c57383f22ab7a3da2af809adeba93ef46b9c03cc69ddd112ab7592a14393cef3 SHA512 dd065886819a265cd4f2751ac231a7baa5d7c7735844f3557d5c7e1feb06d4b4d03433d26ff6419b426caf90b69771ee743850fe45d36bc0201cadb86c62189c
 DIST libsepol-2.9.tar.gz 474861 BLAKE2B 2d0941a003bbe6f15f047e3e55ce4561c36fb4946ce46b618df1b884881579cd192a0ac7cbedfb67ae5e926ab03ca35988d2a4fc279f31a88c83874e85862d13 SHA512 415af623c2b2898d98828c9bf0b12cf05d05790d2b412cad291f0759a8c3feacf1bd88c2ba6f2f1bca8f9f71e1627e9d5b1b69d60e7ef96fdd52df8a3d57d3e9
-EBUILD libsepol-2.8.ebuild 1121 BLAKE2B 5896f2ea478008922f39d26ecf6fe7570952f2a74b327f25c9ddcb682b9609f47ee9b6fee2f65272393d249724489685ec5431c5b2e13f2deec7f8ee1057aeb8 SHA512 909747386f07ada18df34d5b89168efbe83999bacd969b17f20dcf4f23e2d525a6bd5006dc94d9e52e57ba94302364c6f2c114a92091167729993437d894e45d
+DIST libsepol-3.0.tar.gz 473864 BLAKE2B ff4da6e12c1635de88a2aaba26bd3630576a3806543d7176d8fbdb4deda5c9c5fbf8a5a4f68c8041cca0af97429e720d908cd31052d13ac72780bc85db1f56c8 SHA512 82a5bae0afd9ae53b55ddcfc9f6dd61724a55e45aef1d9cd0122d1814adf2abe63c816a7ac63b64b401f5c67acb910dd8e0574eec546bed04da7842ab6c3bb55
 EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
-EBUILD libsepol-9999.ebuild 1103 BLAKE2B 98191cc3a9bc03475f9832eb55f8152dcc7f1b85900babbf776f468e452e7eaaca9f6292f875a46c637769c51cb30d0c466bdcc94d7f28151ff342d3e8809d70 SHA512 49d14f6550df03cb0eea70c495f6ca1680ca2bc6ee9c4231bc51b88d56ce02ee143491283be4530606d090938bfddea033f4ef483cae8a1e88c470e460bd0aff
+EBUILD libsepol-3.0.ebuild 1103 BLAKE2B ee873252927fe95c23926ab16dc5b403d69fad3dcf14c3a65260cdd14b3fe02a27da4741f76c275b2021a8c537e799b526681713330488a6d64c323bcee2c127 SHA512 1e62321cf764da370247e4e12986f6aaf1ed90df2b4fa3fba87fa02ee995f7aa73ec1895dacfb1a7e7da359ebef255db73bb03b5d6945bacaff858e942debf64
+EBUILD libsepol-9999.ebuild 1103 BLAKE2B ee873252927fe95c23926ab16dc5b403d69fad3dcf14c3a65260cdd14b3fe02a27da4741f76c275b2021a8c537e799b526681713330488a6d64c323bcee2c127 SHA512 1e62321cf764da370247e4e12986f6aaf1ed90df2b4fa3fba87fa02ee995f7aa73ec1895dacfb1a7e7da359ebef255db73bb03b5d6945bacaff858e942debf64
 MISC metadata.xml 495 BLAKE2B 2cf1b786b99f7cdcbf7e393957ee741ff23b69c4f2d326f306e3576ab7e17eb17148c1f34d32797fa669a05506eee0d86ba7c9b41c24c62f72aaa2b7d97ecdb5 SHA512 bf55f1da0e997ebc521b5c74f9f721e38971630e9201a6c8aa458e44291c8480eef082b526c746b20ee7335a231fa69ac9d0f1953ee8cd5a63a1c2346708de1c
diff --git a/sys-libs/libsepol/libsepol-2.8.ebuild b/sys-libs/libsepol/libsepol-3.0.ebuild
index d0c638fbd9ff..cd78384ffb9b 100644
--- a/sys-libs/libsepol/libsepol-2.8.ebuild
+++ b/sys-libs/libsepol/libsepol-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -16,8 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index 0e2359d762be..cd78384ffb9b 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index b5c27299afa7..31e1b90d02f1 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,13 +1,5 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
-AUX libsmbios-2.3.0-doxygen_target.patch 305 BLAKE2B ba3e149fd8a792a1b589938fbe6cd895e30298685c4ceab61e45ff34c171126389ea0e1c15a18661ef1b4528f41587ce4bc7f5fd7f076e099894ebe19de0a5dc SHA512 f1f85f052265d88f4735a18ce0205a56256dba5416e6153291d27a4f958bbe9618401b1b70a5e462d12287490a42fe5a6e5e196091b9ec2afa01728a7910815d
-AUX libsmbios-2.3.3-doxygen_target.patch 351 BLAKE2B 100ca4d508b8441bdf6c678768fe67a8c91ee9a1d1b353bd5ba856ff1df1ea3cf503b922b9474f7b3d79a9ed504d9f9b9a10a259194c53cbb2a7a3e3fa5263f2 SHA512 d86df4b1c3ab389360d07f4fab84219bb03e270e77984996d7c53d55b4a0e5a29e2d097e79da5a49f7be0ff9118722aaa955acdbffd4d59cbefa7a1a0ad6f1c3
-AUX libsmbios-fix-pie.patch 816 BLAKE2B 73d2e9611bd672332bed58adee52cbac6285d1e07b259ffbcd3d37374b772a59355c49f231dcb4005b7897f12d847f58eed8139531f250906fd0a1db05843cfb SHA512 2567fe1dfe2e858103c3732e7059888731c207234022a24c1cd4b158253330699af6b2e90cf98881e57e0b7cb8c70a8627fe1d7eb370f2cbb3969189538baf7e
-DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
-DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
-DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
 DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
-EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
-EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
-EBUILD libsmbios-2.4.1.ebuild 1716 BLAKE2B f30f7e7cf6c28b86f6340da66f566f788d9f25bbff53658ab7b5ffdfd7b36082daee2d27f8cd5990a610e9c9e989a1a369711461ac190c3377410587fe2da2e4 SHA512 aeadb26492b8710afc3151b1a1af199a33fb1a9e66b12aa5955501b1e3db1b75d98a552065b7376d038bc19ea246cef1b8af53a2245b0017c21b32dd2910f7f3
-EBUILD libsmbios-2.4.2.ebuild 1701 BLAKE2B daa5433df2c08a7f2fbc864e980a2f336035b537d89955e631858ff248e290059ff028764fae614d89b35d87ed1967ebde83fd39513998f967e729874247578e SHA512 4729d2e31e69c0e96dfb3ac9a52cdada7042b98abde5e91b73fe3480a77bf2da164bae6170a292a077312ebd42fc46031578f2c586f25e8a322ac5d06d94c0f5
+EBUILD libsmbios-2.4.2-r1.ebuild 1734 BLAKE2B 5b69e42e3d4c73b8b3c908b5fac4fcfb23c90f293086b8cbfd78b0e926a2cb27d690d2bed6f742d3b6283cdf674c919e9194c1caa504483474d0225c5b48ebf8 SHA512 d398b4fdff34365191d72f98f367513a8777370bb4c3b7898a6fcb6172b0159d2f934001cd84271bf47d5bf0540a10ab19fa75524be68483f172d51052ee4397
+EBUILD libsmbios-2.4.2.ebuild 1727 BLAKE2B 622cd90d9c74072e1eca76ab8dc5dc3258503e70037c7324c951cc5fbdaf54f9bd9814de93c3f0c125e18c2c721ba4467564e25ea864f35481e405654d76d5c6 SHA512 7133528d5f79ab4e596cdf5dc93811e31d7a05405610bc7841ed3f173093a9f4dad0c806a6111f8f52b93e6457471ce6d28b6b0ee38e96930199c3bfc8ef5f19
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch b/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch
deleted file mode 100644
index ebe6798bd731..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libsmbios-2.3.0/Makefile.am
-+++ libsmbios-2.3.0/Makefile.am
-@@ -89,10 +89,12 @@
- 
- 
- ########## DOCS ################
--all: doxygen
- if HAVE_DOXYGEN
-+all: doxygen
- DOXYGEN_DEPS=out/libsmbios_c/html/index.html out/libsmbios_c++/html/index.html
- doxygen: $(DOXYGEN_DEPS)
-+else
-+all:
- endif
- 
- DOT=@DOT@
diff --git a/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch b/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
deleted file mode 100644
index 4adca14f21d8..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libsmbios-2.3.3/Makefile.am
-+++ libsmbios-2.3.3/Makefile.am
-@@ -89,13 +89,15 @@
- 
- 
- ########## DOCS ################
--all: doxygen
- if HAVE_DOXYGEN
-+all: doxygen
- DOXYGEN_DEPS=out/libsmbios_c/html/index.html
- if BUILD_LIBSMBIOS_CXX
- DOXYGEN_DEPS+=out/libsmbios_c++/html/index.html
- endif
- doxygen: $(DOXYGEN_DEPS)
-+else
-+all:
- endif
- 
- DOT=@DOT@
diff --git a/sys-libs/libsmbios/files/libsmbios-fix-pie.patch b/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
deleted file mode 100644
index 3ab404e8ea2e..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
-+++ libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
-@@ -183,16 +183,21 @@
- {
-     iopl(3);
- 
-+    u32 tmpebx;
-     __asm__ __volatile__ (
--           //   magic    port
--        "outb   %%al,    %%dx     \n\t"
--
-+          "movl   %%ebx,%[tmpebx]\n\t"
-+          "movl   %[ebx],%%ebx\n\t"
-+      //   magic    port
-+          "outb   %%al,    %%dx     \n\t"
-+          "movl   %%ebx,%[ebx]\n\t"
-+          "movl   %[tmpebx],%%ebx\n\t"
-         : /* output args */
-           "=a" (r->eax),
--          "=b" (r->ebx),
-+          [ebx] "=rm" (r->ebx),
-           "=c" (r->ecx),
-           "=S" (r->esi),
--          "=D" (r->edi)
-+          "=D" (r->edi),
-+          [tmpebx] "+m" (tmpebx)
-         : /* input args */
-           "0" (r->eax),
-           "1" (r->ebx),
diff --git a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
deleted file mode 100644
index d2777066e17c..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 versionator
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/files/libsmbios/"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="doc graphviz nls python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.9.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-pie.patch"
-	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-doxygen_target.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Don't build yum-plugin - we don't need it
-	sed '/yum-plugin/d' -i Makefile.am || die
-
-	# Fix version string in build system
-	sed "/release_micro_version/s@\[1\]@[$(get_version_component_range 3)]@" \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	#Remove -O3 for bug #290097
-	replace-flags -O3 -O2
-
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable graphviz) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use python ; then
-		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
-	fi
-
-	insinto /usr/include/
-	doins -r src/include/smbios/
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild b/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
deleted file mode 100644
index f6024bfa3475..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 versionator
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/files/libsmbios/"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="doc graphviz nls python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.9.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-pie.patch"
-	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-doxygen_target.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Don't build yum-plugin - we don't need it
-	sed '/yum-plugin/d' -i Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	#Remove -O3 for bug #290097
-	replace-flags -O3 -O2
-
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable graphviz) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use python ; then
-		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
-	fi
-
-	insinto /usr/include/
-	doins -r src/include/smbios/
-	doins -r src/include/smbios_c
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/sys-libs/libsmbios/libsmbios-2.4.1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
index 158c4534ba3c..7d6570c75000 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
-inherit autotools flag-o-matic python-single-r1 versionator
+inherit autotools flag-o-matic python-single-r1
 
 DESCRIPTION="Provide access to (SM)BIOS information"
 HOMEPAGE="http://linux.dell.com/files/libsmbios/"
@@ -16,6 +16,8 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
 	nls? ( virtual/libintl )
@@ -63,7 +65,7 @@ src_install() {
 
 	if use python ; then
 		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+		python_doscript "${ED}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
 
 	insinto /usr/include/
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
index 4a5c54da1b98..d6391e788212 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -16,6 +16,8 @@ KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
 	nls? ( virtual/libintl )
@@ -63,7 +65,7 @@ src_install() {
 
 	if use python ; then
 		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+		python_doscript "${ED}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
 
 	insinto /usr/include/
diff --git a/sys-libs/libspe2/Manifest b/sys-libs/libspe2/Manifest
deleted file mode 100644
index a2acf13e525d..000000000000
--- a/sys-libs/libspe2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX spe.rc6 904 BLAKE2B 9a63a264fe43d5d004180f68a0ae3841e41b85c97a21f5d64809397f872a04dcf8722e9f9b0da9446f4009248e528a848147969839deedfbca92df787e70959c SHA512 3661fd96629b7c0326308de48b6a48fbead8d24ffe66e31e7a0313936edb39c44c8d5480b2b3d80ea9219690fb454ec5f385cf06ed4d434e67d46ec8e5038d80
-DIST libspe2-2.2.80-95.tar.gz 153122 BLAKE2B 80eb99c55c3d94bf1d9f77ca6925f5a606ce9b9845710084f5d50f6857706f780e6f3d77433105f3bdc1fa6873575b39e5edfdb0d6e817645013100c073b9afe SHA512 8ae0665e37f1ba98972f2906831007dfde2a35bb46b317604aee1327dd19ea8556a01d84c990ec6735004a7ee1e67439c0e0cba34f0df749f4e98766ca26021b
-DIST libspe2-2.3.0.135.tar.gz 197848 BLAKE2B 5d041e62b4301d84294a9be6f6c1881f39c7fadefc4f26ddf97bd2ff09a55ce8bcbd5deb752e4ef2453cac1b04edebabd58dbca80490435fafd5faf54286110c SHA512 31f4e9593d76de50ec5ab903aa82450fb5d9dea9300298831aeb408b083297ba88398fddc2110818bfdd5c13850cae95b9eced3b88f6627b732ea5a76e5d7435
-EBUILD libspe2-2.2.80_p95-r1.ebuild 1601 BLAKE2B 7c5603561198a009f3e88d660e0c949388e2b6fa660da390621dc5891e4296646d3a9e790997d4c091eeff55a0a1b64028fec734f6d52e1ae2922a5537875cc3 SHA512 4bb9320af60a14adbc0cc3f860eab786dcd17258de33f217afe711c7077af635e7c05d90ee34f509fef3d7a35e22d9b77a6a93b66fdbbb13b2996318fb515be8
-EBUILD libspe2-2.3.0_p135.ebuild 1617 BLAKE2B e768cd16125cae6c9ea57407fe153b116f573af9f1624f8315fa9d513406ef5607094ee967fe0b2e3df61ae1825c26ffc45b4fd57952fc38ffa0904487b8de06 SHA512 b26fcd8d5d3158ccf50b3ff692d14f9f2fa8a7e9e7d1c82f3163d8ac083c418fbde3ff52affb53f85db65f355aea8cf7cc693371cf8e3172e0526115add8389c
-MISC metadata.xml 294 BLAKE2B 62efa659609c1bf952b3da3036c59d504cd165fe3f844507c688b5477a20da23231e01f1d92a78732e1be10f716f4d9ef354347710869d6ced2cbe2335f8f60b SHA512 f27b273f7396a60b20a0a8ddbec4a93b8b87730b00a190913a561f3f767248bb0dd0956c24f93ecb6f6423cc9fd3413f20ebe47f6b3cf2b94a900605482ca62e
diff --git a/sys-libs/libspe2/files/spe.rc6 b/sys-libs/libspe2/files/spe.rc6
deleted file mode 100644
index 76c1c5cb29d3..000000000000
--- a/sys-libs/libspe2/files/spe.rc6
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    # you need the elfspe bin
-    need localmount
-}
-
-start() {
-    ebegin "Registering elfspe to binfmt"
-    
-    if test -f /proc/sys/fs/binfmt_misc/spe
-    then
-        eerror "elfspe already registered"
-        return 1
-    else
-        if test -f /proc/sys/fs/binfmt_misc/register
-        then
-            echo ':spe:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x17::/usr/bin/elfspe:' >/proc/sys/fs/binfmt_misc/register 
-            eend $?
-        else
-            eerror "binfmt not available"
-            return 1
-        fi
-    fi
-}
-
-stop() {
-    if ! test -f /proc/sys/fs/binfmt_misc/spe
-    then
-        eerror "elfspe not present"
-        return 1
-    else
-        echo -1 > /proc/sys/fs/binfmt_misc/spe
-        eend $?
-    fi
-}
diff --git a/sys-libs/libspe2/libspe2-2.2.80_p95-r1.ebuild b/sys-libs/libspe2/libspe2-2.2.80_p95-r1.ebuild
deleted file mode 100644
index c98ead677fab..000000000000
--- a/sys-libs/libspe2/libspe2-2.2.80_p95-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P=${P/_p/-}
-
-DESCRIPTION="A wrapper library to adapt the JSRE SPU usage model to SPUFS"
-HOMEPAGE="https://sourceforge.net/projects/libspe"
-SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-IUSE="debug"
-
-S="${WORKDIR}/${P//_p*}"
-
-DEPEND=""
-# This packages also provides libspe1
-RDEPEND="!sys-libs/libspe"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	SYSROOT=""
-else
-	SYSROOT="/usr/${CTARGET}"
-fi
-
-src_unpack () {
-	unpack ${A}
-	#just in case something is missing
-	cd "${S}"
-}
-
-src_compile() {
-	myconf=""
-	use debug && myconf="${myconf} DEBUG=1"
-	make all elfspe-all CROSS="${CTARGET}-" \
-		prefix=/usr SYSROOT="$SYSROOT" ${myconf} \
-		speinclude=/usr/spu-elf/include || die
-}
-
-src_install() {
-	make CROSS="${CTARGET}-" prefix=/usr \
-		 speinclude=/usr/spu-elf/include \
-		 SYSROOT="$SYSROOT" \
-		 DESTDIR="$D" install elfspe-install || die
-	newinitd "${FILESDIR}/spe.rc6" elfspe
-}
-
-pkg_postinst() {
-	einfo "You may want to register elfspe to binfmt using the"
-	einfo "provided initscript"
-	einfo "# rc-update add elfspe boot"
-	ewarn "make sure your fstab contains the following line"
-	ewarn "none                    /spu            spufs           defaults
-	0 0"
-	ewarn "and that you have spufs support enabled in the kernel"
-}
diff --git a/sys-libs/libspe2/libspe2-2.3.0_p135.ebuild b/sys-libs/libspe2/libspe2-2.3.0_p135.ebuild
deleted file mode 100644
index dbe65d54de60..000000000000
--- a/sys-libs/libspe2/libspe2-2.3.0_p135.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P=${P/_p/.}
-
-DESCRIPTION="A wrapper library to adapt the JSRE SPU usage model to SPUFS"
-HOMEPAGE="https://sourceforge.net/projects/libspe"
-SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~ppc64"
-IUSE="debug"
-
-S="${WORKDIR}/${P/_p*//}"
-
-DEPEND=""
-# This packages also provides libspe1
-RDEPEND="!sys-libs/libspe"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	SYSROOT=""
-else
-	SYSROOT="/usr/${CTARGET}"
-fi
-
-src_unpack () {
-	unpack ${A}
-	#just in case something is missing
-	cd "${S}"
-	echo "${S}"
-}
-
-src_compile() {
-	myconf=""
-	use debug && myconf="${myconf} DEBUG=1"
-	make all elfspe-all CROSS="${CTARGET}-" \
-		prefix=/usr SYSROOT="$SYSROOT" ${myconf} \
-		speinclude=/usr/spu-elf/include || die
-}
-
-src_install() {
-	make CROSS="${CTARGET}-" prefix=/usr \
-		 speinclude=/usr/spu-elf/include \
-		 SYSROOT="$SYSROOT" \
-		 DESTDIR="$D" install elfspe-install || die
-	newinitd "${FILESDIR}/spe.rc6" elfspe
-}
-
-pkg_postinst() {
-	einfo "You may want to register elfspe to binfmt using the"
-	einfo "provided initscript"
-	einfo "# rc-update add elfspe boot"
-	ewarn "make sure your fstab contains the following line"
-	ewarn "none                    /spu            spufs           defaults
-	0 0"
-	ewarn "and that you have spufs support enabled in the kernel"
-}
diff --git a/sys-libs/libspe2/metadata.xml b/sys-libs/libspe2/metadata.xml
deleted file mode 100644
index 118d82b0c46f..000000000000
--- a/sys-libs/libspe2/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>lu_zero@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">libspe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index b95d80d258fc..c77d455fe20a 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,5 +1,3 @@
-AUX libunwind-1.1-fix-CVE-2015-3239.patch 523 BLAKE2B e81db6d31d70c6d39fef7ff5106054e5783f11c5e80b8eca443a19e6e285052d782989f6b18c3040ec898068eedf02a06e0a99338d586a5fd1a7f39199a8fc24 SHA512 71f28720486c07cbbc31cf2747096e324cc43dd57c4ec9312da12fd4aa9d5af83e4cbe80071b6192cdf14a2e2afd090c136e57476ac981204a933db67d609c01
-AUX libunwind-1.1-lzma.patch 3004 BLAKE2B 6ce2d7d21a8ddedca1276661c74c432bd8fdc031d1bdb31383f4f85bb0decee2a56ac00d1ed9ce45fb5ce4817c9bb7e34fb382afb0acdb1551496df86798b2b2 SHA512 d15f849d743426fd030de2990d683a5373273ecfc407b081280e7f5fb2e65350496badb7b094911719e5b3f6bdac5ddf2653e556391c58a8559938a11f60250c
 AUX libunwind-1.2-coredump-regs.patch 619 BLAKE2B b901d50cb7fa4ab372da26120e512da0ca506322130583623eebe31548a65f5a53249b632d71409d77a6dc00eb002beddd44f8a5d11dc82bf8450b812770a023 SHA512 48536ef54590221b42a3ca568ec781e526807b3d8aed3e33e19e6efacfa05a428a6101d3a51e79ea5d3e1d783bcba9acb92f7623c121d3e00cd3e1a17d13e282
 AUX libunwind-1.2-ia64-missing.patch 3863 BLAKE2B 384d2afd7d725f0730207b5b32ff4ffcedd852043af83b1884c7dc95116298eff41bd7f997e0ad51c9912b59e36b439eb524d3d4786f2a0a19dff32437e62003 SHA512 e8f65d706839770d993f9801371e1e294a0231c4bfe29b497e4a859567b7f5b6561b0a15d59b1626311e549fe57149046f5a76424a2ad69c521610aaa3019c17
 AUX libunwind-1.2-ia64-ptrace-coredump.patch 1445 BLAKE2B 0b4b6b5d7b3cfc8be58c3973b096ceeb19faa84f175a23f2130588351e40f94abf5c53a4eb5813d8b9da7762f032671031d2d637bd2ec445f7e4f9ea9d276773 SHA512 0bab310ff16294d7617077ffa1261fe9c1a6aaeb4339c96918869c4dd9a2b1b73fbe2ebb5c895f1a420ff7922da85cbb44ccfcd69df6e2518c1f2ff64b7b2d76
@@ -8,10 +6,9 @@ AUX libunwind-1.2.1-arm-__asm__.patch 2350 BLAKE2B de56de0e3bf32cc66d3b9cc85552d
 AUX libunwind-1.2.1-fix_version_macros.patch 381 BLAKE2B 77b523a859a66297eb5677e0eedfc511b6e3cae7058b49da2da41b27d1d22d72b9a662f2b20338eaa5166bd5ae414531695f540098a1dfb674e668ed4c683079 SHA512 4178ed205046dbdf0cea6c7004b866f840e4e3b477a88c3a24f4178e4c642f9d0cfbe7c0f79c6408fad95d8f387f55c912022a78fae382d69e80cd4ff41d8bad
 AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d1506072cbf162831ba3193c0c3ed74f7091dea226c2f9cf06387574ae1d15cc1db1627137f0f80adc542fb5534cf8f6254c SHA512 fe76aef28096ccfdb5c290da631efe8f7cbef13fddb415227f97cfe974162d757a3439b542bee0fe225950200f3cec5e7eecf60c60b2584e2a922618b73e2a7b
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
-DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f84d3173dc3a2e9fd54486a18d99713df152d810db4eb3e36df4afa7df1b544e6c9271479e2fcbffe473a17c4372 SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
-EBUILD libunwind-1.1-r1.ebuild 2429 BLAKE2B c903745f6d196f2d95254b84a9329600f4b7347574ac67883e3e24414f35919cf95bb4b12f360e331c12bc2647fa591481711618da763573fd3e7dc30581e351 SHA512 2d5b0179022f21794e6b3a115e487b797fec328001451125bbb451a06f28463efc84b8ec70f2827a974d91d767325cf1c073793a5d87de8678259c8e358494c6
+DIST libunwind-1.3.1.tar.gz 801262 BLAKE2B 4dfcd5e170ef0f7626aa966672f3302b4d8f231fcda37c72fbddb9ab913e82b45bb613b22c5ead8bbd5b09fa92bc0db1c32a744b11e40fd736c3a1412ad3d842 SHA512 3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def
 EBUILD libunwind-1.2.1-r1.ebuild 3163 BLAKE2B 1b160324a293b2897a0690daa05637630734b621df5f996b025b5dab9ecd9d420b703b3a827e3985dc3721ff5e4b1bb1aee559d79082755b7d6c6a14b7f177f5 SHA512 4c87ef071250f453f14a4a8279fd07f3b65c7f48c75600ed60be6f3c40762cab10690590b7433ad1abd6eb3a712fc69981382ee1e1b7ed55b28326100c8e8591
-EBUILD libunwind-1.2.1-r2.ebuild 3224 BLAKE2B 0b25a6c74b58e078e1801719167dd7b6bfacce677d184cdf3cacbb871b6e48e463c1eb2d5d009e3fb0b8e4adf4fb8c641744043a1469c1199042bbbb3d073991 SHA512 e1949212aec5f4ff2355748e8cc4128928c656984b4164777f5931bec2271f59fb65c58b9fe2f0f16855df549cbf3f462a2558cbebb488adbbea3747804f2183
-EBUILD libunwind-1.2.1-r3.ebuild 3261 BLAKE2B 5db36c0b03414855f985fbe240522189645a9d6d594626d91e1896542dc8f4e223c544fbb555d6645eb81be9eb46632f62957a031ba2fdf4717ffc03d596e39b SHA512 ce631136be34cca61bad7e6046b6af9bd5f9c82206f858997b642a96455c95bbbdb35fa9b1578995a7dda9cf9e524029f021c557e35f44edc69cbc89a68680c5
+EBUILD libunwind-1.2.1-r3.ebuild 3255 BLAKE2B 0c4656527538db7b3bfd4d281a072225127e315c8539b583f8bf0e8f1fede0143012f246c1c6d75dd709ccdac3e5a704ac196451fb516989d4eb56f7fc9b9bc1 SHA512 ac6bb5d1ba3e1327f5cddff4add1c13398a74ea9121aa7f39cc419cbcf4c2b81085813a887bf5abfef08dabc0eba6fbc642e04dc3122951e691e3c3e7093c3ce
+EBUILD libunwind-1.3.1.ebuild 3111 BLAKE2B 14aa52ed1b3ecca2bd3648aa188894cd364d5d2b285e7ab47813614c06cf7abc6abe556860ee02b9671210cfa1855eaab9d8b70408b5aa92fe056879d123090c SHA512 df955e46ebb8f90d765c5d0a7960d1d6e48997db6ba3393fc41e53776b5d8fc1e3264f593dfe5ba7f5b1e73879eb4df1a542547199952bef072c326c43fa9c02
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch b/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
deleted file mode 100644
index 153108bbb151..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-taken from Fedora
-
-https://bugs.gentoo.org/585830
-
---- libunwind-1.1/include/dwarf_i.h.CVE20153239
-+++ libunwind-1.1/include/dwarf_i.h
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)					  \
--  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
- 
- #ifdef UNW_LOCAL_ONLY
diff --git a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
deleted file mode 100644
index 09cefa028539..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 15 Feb 2014 21:00:59 -0500
-Subject: [PATCH] link sublibs against liblzma as needed
-
-The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
-it.  This produces sub-shared libs that don't link against lzma and can
-make the linker angry due to underlinking like so:
-
-libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
-	-frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
-	-Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
-	-o .libs/test-coredump-unwind test-coredump-unwind.o  \
-	../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
-collect2: error: ld returned 1 exit status
-
-So add LIBLZMA to the right LIBADD for each of these libraries.
-
-URL: https://bugs.gentoo.org/444050
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
- @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
--libunwind_coredump_la_LIBADD =
-+libunwind_coredump_la_LIBADD = $(LIBLZMA)
- am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
- 	coredump/_UCD_create.c coredump/_UCD_destroy.c \
- 	coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
-@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
- libunwind_dwarf_local_la_OBJECTS =  \
- 	$(am_libunwind_dwarf_local_la_OBJECTS)
- @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
--libunwind_elf32_la_LIBADD =
-+libunwind_elf32_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf32_la_OBJECTS = elf32.lo
- libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
- @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
--libunwind_elf64_la_LIBADD =
-+libunwind_elf64_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf64_la_OBJECTS = elf64.lo
- libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
- @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
--libunwind_elfxx_la_LIBADD =
-+libunwind_elfxx_la_LIBADD = $(LIBLZMA)
- am_libunwind_elfxx_la_OBJECTS = elfxx.lo
- libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
- @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
--- 
-1.8.5.5
-
diff --git a/sys-libs/libunwind/libunwind-1.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
deleted file mode 100644
index d6226861dbdd..000000000000
--- a/sys-libs/libunwind/libunwind-1.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils libtool
-
-DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
-HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
-SRC_URI="mirror://nongnu/libunwind/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="7"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug debug-frame libatomic lzma +static-libs"
-
-RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
-
-# We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0"
-
-src_prepare() {
-	# These tests like to fail.  bleh.
-	echo 'int main(){return 0;}' > tests/Gtest-dyn1.c
-	echo 'int main(){return 0;}' > tests/Ltest-dyn1.c
-
-	# Since we have tests disabled via RESTRICT, disable building in the subdir
-	# entirely.  This worksaround some build errors too. #484846
-	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
-
-	sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{.ac,} || die #444050
-	epatch "${FILESDIR}"/${P}-lzma.patch #444050
-	epatch "${FILESDIR}"/${P}-fix-CVE-2015-3239.patch #585830
-	elibtoolize
-}
-
-src_configure() {
-	# https://savannah.nongnu.org/bugs/index.php?34324
-	# --enable-cxx-exceptions: always enable it, headers provide the interface
-	# and on some archs it is disabled by default causing a mismatch between the
-	# API and the ABI, bug #418253
-	# conservative-checks: validate memory addresses before use; as of 1.0.1,
-	# only x86_64 supports this, yet may be useful for debugging, couple it with
-	# debug useflag.
-	ac_cv_header_atomic_ops_h=$(usex libatomic) \
-	econf \
-		--enable-cxx-exceptions \
-		$(use_enable debug-frame) \
-		$(use_enable lzma minidebuginfo) \
-		$(use_enable static-libs static) \
-		$(use_enable debug conservative_checks) \
-		$(use_enable debug)
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests.
-	# Sandbox causes some tests to freak out.
-	SANDBOX_ON=0 emake check
-}
-
-src_install() {
-	default
-	# libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
-	# shared library, so we keep it in any case
-	use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
-}
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
index 800ad13d87d9..d9557f28c39f 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild b/sys-libs/libunwind/libunwind-1.3.1.ebuild
index a64db840b93d..e91ad4925c30 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild
+++ b/sys-libs/libunwind/libunwind-1.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -12,16 +12,16 @@ HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
 SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="7"
+SLOT="7/8" # it should be a "0/8" where '8' is libunwind.so.8
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
 
 # We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils )"
+RDEPEND="lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops )"
+	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -44,13 +44,9 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
-	"${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
-	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
 	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
-	"${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
-	"${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674
 )
 
 src_prepare() {
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 42103b14ce93..d5a589efe527 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -3,7 +3,7 @@ DIST libvpd-2.1.3.tar.gz 116493 BLAKE2B 12647984c54042d77944cdeb4132a2ddeaa51502
 DIST libvpd-2.2.4.tar.gz 374665 BLAKE2B d27cdf647c69cae2478b9286f255a9722d46c2817817da8f805f3385ece754df77505bb02e624babff66fc111ba80c26175e276ac35b7796c4a977b538ea81cb SHA512 89f7e235e957393fe33e484b23fce15fbf36274db6115e7245027a17b7535e387f835c048a7063f317f10de2351a78acf2ca72b10adee0020ce62a035bfe787e
 DIST libvpd-2.2.5.tar.gz 374311 BLAKE2B 1d0d793b958c46d6795097f5bd2f7bac3f9f9167aee0b21535d3a37114290f39cfdfb10f3789f995267312b898447f230263a0b08916f11490d56c2dd0573b4a SHA512 06969e61d2882a30ebff13b6432397edb0119adc0b0f8ea603973c6ef439320c39c1cbc218fab154d595fadc966bfef07a4a9c4e4ec8fd772cf7d396000864b0
 DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
-EBUILD libvpd-2.1.3.ebuild 627 BLAKE2B f42721e2516d4548d78e1518a1f8da4b352580e70e763655802f424451c2c4c94d8234c36e21488c34d6142d9f42ab02a19dc0d56dfdd32ae2dded77c6c59fe9 SHA512 fe4edfc877569c9e2e09ecd54b85cf243e798a95bca7d08e7f9bea6410dbfdd81dfd0287b943a1426ef245334d775b1f88c871b6bf0faba2d1c66393cf548cf1
+EBUILD libvpd-2.1.3.ebuild 567 BLAKE2B f371cbb811db40d9a430e4d3c651a30be5862af0b55149b7e01cc3d46c0acbc7058d97dfad4f5ab66694ea4c4d3abc56fc1a061e2fb680d4739d6c1105686f14 SHA512 8418e0ce7b477039cdcda07bc449fa97b32f6c15bc4f59b5cfad54334dde4616ced8dd7660b841093a68a38b1a76c5d8c20470b6f6fd7c9650c8cfd7ddbf3ecc
 EBUILD libvpd-2.2.4.ebuild 823 BLAKE2B 8ce15bbe055364f54d3255fd6d491806fd8cd8eaf5d4b4113931c3c6cd0115fd47c83cd1511ee48b2a0263408e64b4802e6a6693e02601df2c79ee8cf21c37a4 SHA512 ea4e275ec0248c3fe73303b41b9d4230c7e18b695ab9dcd574b684d2ca90acb5e15624894d1d85dc0902757703db09596b5bc34bbac77fbc427e1be3d4a9c4e3
 EBUILD libvpd-2.2.5.ebuild 823 BLAKE2B 8ce15bbe055364f54d3255fd6d491806fd8cd8eaf5d4b4113931c3c6cd0115fd47c83cd1511ee48b2a0263408e64b4802e6a6693e02601df2c79ee8cf21c37a4 SHA512 ea4e275ec0248c3fe73303b41b9d4230c7e18b695ab9dcd574b684d2ca90acb5e15624894d1d85dc0902757703db09596b5bc34bbac77fbc427e1be3d4a9c4e3
 EBUILD libvpd-2.2.6.ebuild 897 BLAKE2B 437dd60bd69a395ca74becc05d8f944dc73430acc0cf673d6597a05fbb420b5b9728b01688457ceac4a455579a43622e55204ab84629fee479476de47462ff99 SHA512 4277aca7fc9c1641949c766171df37fe1c116d1619eb817e30b5d8897bbbd828a2ec65ea457cfdb0018cbcbc8b33aa1690fd70e0bee577db61ba689889bf4574
diff --git a/sys-libs/libvpd/libvpd-2.1.3.ebuild b/sys-libs/libvpd/libvpd-2.1.3.ebuild
index fc751d0e4407..e4566e2fcdee 100644
--- a/sys-libs/libvpd/libvpd-2.1.3.ebuild
+++ b/sys-libs/libvpd/libvpd-2.1.3.ebuild
@@ -23,10 +23,9 @@ src_unpack() {
 
 src_configure() {
 	./bootstrap.sh
-	econf || die "Unable to configure"
+	econf
 }
 
 src_install(){
-	emake DESTDIR="${D}" install || die "Something went wrong"
-
+	emake DESTDIR="${D}" install
 }
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 1514a1673399..ea4ccdb0cd42 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,19 +1,19 @@
-DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 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 libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
-DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
 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 libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625
-DIST libunwind-6.0.1.src.tar.xz 77036 BLAKE2B b6c293285896c8ff1f64bb56eee5a88b102b7ed9902d46436ee3cb79f204f230fd08a07d39c7fa9aeeddd093036f2bb9af38dd54268099ea9e51e12a71ff4adb SHA512 78568c28720abdd1f8471c462421df9965e05e1db048689d16ac85378716c4080ec1723af78e9f61d133b0ff82ac8c1f0dde7fd42d194485f62c1a17c02db37f
 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 libunwind-9.0.0.src.tar.xz 90372 BLAKE2B 2ac6dafa53e030dd63a7e0eb4b9ee2c665a5aa64b95324d04604efce7fce6f101fc3685723e39ae0a0819bd16c9e4e366d28dfedae6748423c74f79e6a8b38b5 SHA512 55b44439b76638a7c5ea25dd3713a3f6a2d54bcfb7bf34d3388753f0d25be2e843b5f05dc1c0052d7a9cd5a141c6818f4da42bc9174a16d89e819ea262ad5706
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 EBUILD llvm-libunwind-10.0.0.9999.ebuild 3345 BLAKE2B c179ff24533af6c8f51bb8993b3a626f0a1ba3f1e4e3d69202a8ad8196747fe3e2f11b0f4d591e7999a4dd10dab3080ea0a35e22818e66fb5112131967f594ba SHA512 fae567cdf445f59a3956ce7639317c2eff9fccbcf88d4e2de5920082f8cd4321a85311f64f37875ceff18772a53f90ab9e5dc0fb6c4dc930a2214ec4588edb34
-EBUILD llvm-libunwind-6.0.1.ebuild 3726 BLAKE2B eff574b04142b578a05b50aa9834a2b494361001e99a729c648cb34b72293d32703cc0d7d918e628a5746ba3d1e18efb063b198677ec7320e7564fce6ce137f4 SHA512 465c752552f5e28e9c995922c26fc9e4e3c13b7fa612c24a894a9580473924e0f90cd34a13f914af7a426e0c317f9c1104c2baf01bc202a4872a3a178ce1b3ce
 EBUILD llvm-libunwind-7.1.0.ebuild 3727 BLAKE2B 433bf5d3eebf17face5bf31030c5079ccb8cc99cf4a9e37fcfb9699b43e75702f3a6cd462c8cd8654666f76efb9f87960b171b5acf2b61b798fd7869f3bdd008 SHA512 5c5fc9dce356d1534089e724b898ef2f76cf8963fe4fa66bdba37255c609ca6f3e0dca3f50e746e6d8c2da9fc187975bf1f6345816f90dc3f65b02a81dfa1223
 EBUILD llvm-libunwind-8.0.1.ebuild 3825 BLAKE2B 6b967ef98ef57ba33f91acd00c692a0856139ce86f743b41c4c863680256b7f74f690cd18fdc23202b784c41cf6bccebb812a69ceded3fe41285f17667ed3606 SHA512 db2d412d9238f0e4aa686088b9195c57170562ebcf69a226bdc28fbd56196b8f39b900e87d5b4daf78c8a3f93f0d84bc14d4f28b5ce1df9307b29dfda7b19751
 EBUILD llvm-libunwind-9.0.0.ebuild 3368 BLAKE2B 496f8bd1e62d130af0b25d6e2166ea9b42cfd69d664d4aa3feff4d44a8d3654b6e7980c3d93cef310b9680268091af29ac3c04a0ef0d5627170dd051aa8fc3a2 SHA512 6efcc00c6a6752228c9474322f9d57bd5b5a2e92c5a02e10de91ba3c1604a7f51467590d34e286967a38b82d1d0995af415f17550a7dfe6bd9bc0b079a957cd8
 EBUILD llvm-libunwind-9.0.1.9999.ebuild 3345 BLAKE2B c179ff24533af6c8f51bb8993b3a626f0a1ba3f1e4e3d69202a8ad8196747fe3e2f11b0f4d591e7999a4dd10dab3080ea0a35e22818e66fb5112131967f594ba SHA512 fae567cdf445f59a3956ce7639317c2eff9fccbcf88d4e2de5920082f8cd4321a85311f64f37875ceff18772a53f90ab9e5dc0fb6c4dc930a2214ec4588edb34
+EBUILD llvm-libunwind-9.0.1_rc2.ebuild 3368 BLAKE2B 496f8bd1e62d130af0b25d6e2166ea9b42cfd69d664d4aa3feff4d44a8d3654b6e7980c3d93cef310b9680268091af29ac3c04a0ef0d5627170dd051aa8fc3a2 SHA512 6efcc00c6a6752228c9474322f9d57bd5b5a2e92c5a02e10de91ba3c1604a7f51467590d34e286967a38b82d1d0995af415f17550a7dfe6bd9bc0b079a957cd8
+EBUILD llvm-libunwind-9.0.1_rc3.ebuild 3368 BLAKE2B 496f8bd1e62d130af0b25d6e2166ea9b42cfd69d664d4aa3feff4d44a8d3654b6e7980c3d93cef310b9680268091af29ac3c04a0ef0d5627170dd051aa8fc3a2 SHA512 6efcc00c6a6752228c9474322f9d57bd5b5a2e92c5a02e10de91ba3c1604a7f51467590d34e286967a38b82d1d0995af415f17550a7dfe6bd9bc0b079a957cd8
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1_rc2.ebuild
index 7644854d75dc..373f7d8c03ae 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1_rc2.ebuild
@@ -1,40 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=libunwind-${PV/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-LIBCXXABI_P=libcxxabi-${PV/_/}.src
+PYTHON_COMPAT=( python{2_7,3_{5,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"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? (
-		https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
-		https://releases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
 DEPEND="
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-S=${WORKDIR}/${MY_P}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -46,15 +37,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	default
-
-	if use test; then
-		mv "${LIBCXX_P}" libcxx || die
-		mv "${LIBCXXABI_P}" libcxxabi || die
-	fi
-}
-
 multilib_src_configure() {
 	local libdir=$(get_libdir)
 
@@ -77,7 +59,7 @@ multilib_src_configure() {
 		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
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
 		)
 	fi
 
@@ -90,8 +72,8 @@ build_libcxxabi() {
 	local BUILD_DIR=${BUILD_DIR}/libcxxabi
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=OFF
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXXABI_INCLUDE_TESTS=OFF
 
@@ -109,8 +91,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXX_CXX_ABI=libcxxabi
@@ -132,6 +114,7 @@ multilib_src_test() {
 	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
 }
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..373f7d8c03ae
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1_rc3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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="~amd64 ~arm ~arm64 ~x86"
+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/mars/Manifest b/sys-libs/mars/Manifest
deleted file mode 100644
index bdd48708e2f2..000000000000
--- a/sys-libs/mars/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mars-src-1.0.1.tar.gz 1264844 BLAKE2B 6e70174c0e62f33ba10f2cf793b1895cbfac2f879fe9d6d74509b4558d8991d2dc56946f5a429d854476cbef1a21ff12e60f6d09d69f2838f80892065b4a9bdd SHA512 56f46a19377b7c4058457082a54835d59ddae3c97e509eda1a977b637628edd352f14e0b2f8f8653e2f2de76ff73a5a4ed1b011213a7addc286c085a9c7c2a6e
-EBUILD mars-1.0.1.ebuild 836 BLAKE2B d1e7135db76e648d4bac4041be2c3abf68dd4aa2f14fd2a635fdc69a27f5b55573abe7008dddaab97ff9056945f7002d2d48d543d610c794226973ffc12ef59d SHA512 fc95f9de420d687fd6d106fc45b9cecf55044631a555f943a295de6d53ef0180887930fd65da2dd6285d7aa1352f85452287d94827357de852d6a7d7b4737b05
-MISC metadata.xml 215 BLAKE2B 416b347b470da55cc38463c877ac944c5530bf47ca6a73b56dff8f174db2572d6e5b2e87fa838e0acffd4d81d850b353f59fa0008b934d896b926fb79bf5e015 SHA512 49695b6fe6c6840d991013455f167da37a67fa9fd326f2241778caeab2b7ab38bbb36b2f383ca6736c465b65cce7338ebb90468ceb30bdf5b5989449bb2d2ebd
diff --git a/sys-libs/mars/mars-1.0.1.ebuild b/sys-libs/mars/mars-1.0.1.ebuild
deleted file mode 100644
index d0ec58bb835e..000000000000
--- a/sys-libs/mars/mars-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools
-
-MY_P=${P/mars/mars-src}
-
-DESCRIPTION="Multicore Application Runtime System"
-HOMEPAGE="ftp://ftp.infradead.org/pub/Sony-PS3/mars/"
-SRC_URI="ftp://ftp.infradead.org/pub/Sony-PS3/mars/1.0.1/${MY_P}.tar.gz"
-
-LICENSE="MIT_Plus MIT"
-SLOT="0"
-KEYWORDS="~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/libspe2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	# repeat after me: "dummy tuples are bogus"
-	sed -i -e "s:/spu:/spu-elf:" \
-		   -e "s:--host=spu:--host=spu-elf:" configure.ac
-	eautoreconf
-}
-
-src_compile () {
-	unset CFLAGS
-	unset CXXFLAGS
-	unset CFLAGS_ppc64
-	econf --with-mars-platform=cell || die
-	emake || die
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/sys-libs/mars/metadata.xml b/sys-libs/mars/metadata.xml
deleted file mode 100644
index dccede93222c..000000000000
--- a/sys-libs/mars/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>lu_zero@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 471176ffb107..fadef123712e 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,13 +1,12 @@
 AUX ldconfig.in 2552 BLAKE2B c94f9900e8582d707519171c4b61079c801b60c555677b1740b04adbdec9645578b9a8fc91f11413072568f316c795e46a332970f3d2dde5272b0c49a5d60a78 SHA512 59f1b57361196363d3f127366764f05d26c23dbe3d3dbcdba9bd3c8ca26a671fd713b96d31c509d22805c57ada2b596d979a3f5795bcf0a4d3ac7d168f3bf377
-AUX musl-1.1.20-fix-getaddrinfo.patch 1877 BLAKE2B 2b213efe9da356f0b07a448c311cf608c5452884859833a0a664ee7801ad421e051c7d4719d889210927b4b03ee981ea6bb56276a9c97f5170ff011731540434 SHA512 e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
 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.22.ebuild 3240 BLAKE2B 756ce888342f6b9f7501873af701bad4e4b429fcd11a9713e168da63da641d0fbef39a25d002a88f6d988a6a1b0e79e24cf042acd56a1903b95905cd811ecda6 SHA512 c7b779730e7c5b56618d0a53cd70e02e4f3e9f443c91bb59237fbf72dea1f6d7fa2e480312114b98db012ab4e716d0ef1481019788389edfc21b56c1245e28ac
-EBUILD musl-1.1.23.ebuild 3240 BLAKE2B 756ce888342f6b9f7501873af701bad4e4b429fcd11a9713e168da63da641d0fbef39a25d002a88f6d988a6a1b0e79e24cf042acd56a1903b95905cd811ecda6 SHA512 c7b779730e7c5b56618d0a53cd70e02e4f3e9f443c91bb59237fbf72dea1f6d7fa2e480312114b98db012ab4e716d0ef1481019788389edfc21b56c1245e28ac
-EBUILD musl-1.1.24.ebuild 3243 BLAKE2B 8b71faa27471cdd6e645b15fa3d9e08f0076d729262c27e7b132c329344d4a30513a18f1fa6997e5169fb95eeed25e5ce6b6657bdb42aebe2ff098c0bde5eae4 SHA512 3b261897998feda25bd51d0983b664071dbb3f4607dc849be761b4a319aa9e325d1c0a5f4d61f8580d3d248cba58172fa96e5d727b2d9728c7e03269de9cc70c
-EBUILD musl-9999.ebuild 3245 BLAKE2B 96b025385b2f8cdbc66a91bbe4bcabdb6daab5fc6dff29f4f78b10f0d02daa2c4f4ff9546f55b67fba4552c3fdfd3ee6deaa21dd2b4f52b95a114070cee587aa SHA512 8a789f0d2988be8567647258a45989b708c9d50f0fdae020160931af140c6566f68551ff4ec423beaf9a9043490888c2a99b80cfd826a98d46553609b7994de8
+EBUILD musl-1.1.22.ebuild 3233 BLAKE2B 784b11a4445cd75a192b55a69fa9e79bcdca4a3da6c9998f50a8965ec16e9bf23a2b127812457659115dfacd14b4e4cc30a5dde0cee91e882a1587a93d358ad2 SHA512 a112488d751998b0e28a3a53f82c90ec9e6bf502612a40045bac4aa9d281e1f6117e1d816e19ee581f1cc4a4a85f5f9d611805bdf1e5e06ad494c3de17256213
+EBUILD musl-1.1.23.ebuild 3233 BLAKE2B 784b11a4445cd75a192b55a69fa9e79bcdca4a3da6c9998f50a8965ec16e9bf23a2b127812457659115dfacd14b4e4cc30a5dde0cee91e882a1587a93d358ad2 SHA512 a112488d751998b0e28a3a53f82c90ec9e6bf502612a40045bac4aa9d281e1f6117e1d816e19ee581f1cc4a4a85f5f9d611805bdf1e5e06ad494c3de17256213
+EBUILD musl-1.1.24.ebuild 3235 BLAKE2B af0d9ac260a85beb7684a933049f65c7b507977bff500ecd61bd200a6ff9107e4e298c4de00cb9287c8d83860659d6c2b26098727a72a46ce4d60677c0701388 SHA512 ad16eef17d023099d1e52bdced7628dbc2c1e58d249e321cc9874edc469832343a771c10c69ca96b5cf629e17bf4d7ca02e934d8872ce7e3d36aa5279ae9f86d
+EBUILD musl-9999.ebuild 3238 BLAKE2B 0d6857023b89bddd2212b533ab83fab3608af6da4a639cec9c8b0d87646e0651a55816406419f687d64e2ed47aabf0d796cb1e0f0fe97a18ed4908670b9dd6e7 SHA512 f8b88325b39e4bde575419353ea0789a74b33381a5daad82a0bd8c544e1f1d6ca24869c03870670944242aeea7a0d6841cd8c4df8c90307aea60a280da3c98dc
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch b/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch
deleted file mode 100644
index 28d4558b8b6c..000000000000
--- a/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 19 Sep 2018 18:03:22 -0400
-Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations
-
-despite not being documented to do so in the standard or Linux
-documentation, attempts to udp connect to 127.0.0.1 or ::1 generate
-EADDRNOTAVAIL when the loopback device is not configured and there is
-no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG
-to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6
-configurations, rather than the intended behavior of detecting IPv6 as
-unsuppported and producing IPv4-only results.
-
-previously, only EAFNOSUPPORT was treated as unavailability of the
-address family being probed. instead, treat all errors related to
-inability to get an address or route as conclusive that the family
-being probed is unsupported, and only fail with EAI_SYSTEM on other
-errors.
-
-further improvements may be desirable, such as reporting EAI_AGAIN
-instead of EAI_SYSTEM for errors which are expected to be transient,
-but this patch should suffice to fix the serious regression.
----
- src/network/getaddrinfo.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
-index ba26847a..e33bfa28 100644
---- a/src/network/getaddrinfo.c
-+++ b/src/network/getaddrinfo.c
-@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
- 				close(s);
- 				if (!r) continue;
- 			}
--			if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
-+			switch (errno) {
-+			case EADDRNOTAVAIL:
-+			case EAFNOSUPPORT:
-+			case EHOSTUNREACH:
-+			case ENETDOWN:
-+			case ENETUNREACH:
-+				break;
-+			default:
-+				return EAI_SYSTEM;
-+			}
- 			if (family == tf[i]) return EAI_NONAME;
- 			family = tf[1-i];
- 		}
--- 
-cgit v1.2.1
-
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 129c83020221..47c54d2eb79c 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 129c83020221..47c54d2eb79c 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 19c1029a0454..eb6063619101 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 x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 0827b9d412bf..9c1ddb9d501b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -109,7 +109,7 @@ src_install() {
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
+		doenvd "${T}"/00musl
 	fi
 }
 
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index 64be5ad84071..4a53f0c30198 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -5,6 +5,13 @@ AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f6
 AUX ncurses-5.9-no-I-usr-include.patch 1431 BLAKE2B 1dcc533936ba22fcb07a3ad4252391becb57aec0878304254236148c9d022ebf4d7d698c97e9f199baf83995e4de72ff7979539dae1a4222dbadeab93d643bf4 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805
 AUX ncurses-5.9-pkg-config.patch 1022 BLAKE2B dcaa045919e22eb174cb7c155ef05fa7c2c29d64eb586947f2afb243a13dfdc503460452be0f8075bc91b166d5b7f12ea34b39234d0832ef6bd432496932719f SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6
 AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 BLAKE2B b88b028246c4177cac148837063b8dd76fa8dc215cb47ace2dd58b38eb8547273ac29930e2fe1c209bc8047462fe1319ac253955af445674410e21e8fe1c39b9 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131
+AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983df744d40573b4fc2488d3f26f40ed77aba2d15da2a006e56217216740e26a295c9ab9c4be78df201514040376a986cf1b30 SHA512 db333b400ad23110bff80d86eca39e5656870caa06083b6d7098503fe34a46e387d207b135bf9aa9a0a1f2eca2a9b094f1d189ea8f8a17caaec4fc14b819fcc4
+AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3
+AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
+AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 DIST ncurses-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-6.1_p20190609.ebuild 6351 BLAKE2B c9c47cd7d07fca186c627bb50a479882bbdb81697d1e6667b2725b139b9a212eaaff66c8c4114a38ff07cf24a113b333f10b6ac16a622669cde7627b45b1ed8c SHA512 b7bae0bcbe24fe6df80f83e385b94db94a4c4c1fb51c7562f83eeb399775f3db4e42665e0e1ad12100a7dc6f46b6135063306aed0403323e6cd7475c2e20f7d3
 MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/files/ncurses-6.0-cppflags-cross.patch b/sys-libs/ncurses-compat/files/ncurses-6.0-cppflags-cross.patch
new file mode 100644
index 000000000000..decdc2677904
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-6.0-cppflags-cross.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/601426
+https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html
+
+From: John Vogel
+Subject: [PATCH] c++ binding missed when cross compiling
+Date: Mon, 16 Feb 2015 01:01:48 -0500
+
+The configure script hard codes the include dir to the prefix'ed include dir,
+when checking if c++ compiler works. This breaks the compiler's built-in search
+path. I've included two patches. The first works on the configure.in file, which
+requires your autoconf stuff to test and I'm not ready to meddle with at the
+moment. The other works directly on the configure file. I've tested the second
+one; it should mirror what the first patch tries to achieve and works for me.
+
+--- a/configure
++++ b/configure
+@@ -2938,10 +2938,6 @@
+ 		echo "$as_me:2938: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+-		save_CPPFLAGS="$CPPFLAGS"
+-		eval cf_includedir=${includedir}
+-		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+-
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 2946 "configure"
+ #include "confdefs.h"
+@@ -2978,7 +2974,6 @@
+ cf_cxx_works=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		CPPFLAGS="$save_CPPFLAGS"
+ 
+ 		echo "$as_me:2983: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
diff --git a/sys-libs/ncurses-compat/files/ncurses-6.0-pkg-config.patch b/sys-libs/ncurses-compat/files/ncurses-6.0-pkg-config.patch
new file mode 100644
index 000000000000..6808319b9533
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-6.0-pkg-config.patch
@@ -0,0 +1,14 @@
+disable the $PATH search for the PKG_CONFIG tool.  it isn't needed and just
+gets in the way when setting to a value that might not yet exist.
+
+--- ncurses-6.0/configure
++++ ncurses-6.0/configure
+@@ -3533,7 +3533,7 @@
+ esac
+ 
+ test -z "$PKG_CONFIG" && PKG_CONFIG=none
+-if test "$PKG_CONFIG" != none ; then
++if false ; then
+ 
+ if test "x$prefix" != xNONE; then
+ 	cf_path_syntax="$prefix"
diff --git a/sys-libs/ncurses-compat/files/ncurses-6.0-rxvt-unicode-9.15.patch b/sys-libs/ncurses-compat/files/ncurses-6.0-rxvt-unicode-9.15.patch
new file mode 100644
index 000000000000..af3df941d699
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-6.0-rxvt-unicode-9.15.patch
@@ -0,0 +1,191 @@
+Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
+
+Providing this in ncurses makes it widely available, much better than having to
+install rxvt-unicode everywhere.
+
+http://bugs.gentoo.org/show_bug.cgi?id=192083
+
+This patch uses the updated rxvt-unicode-9.15 terminfo
+which includes 256 color support and fixes Gentoo bug 383871
+
+http://bugs.gentoo.org/show_bug.cgi?id=383871
+
+--- ncurses-6.0/misc/terminfo.src
++++ ncurses-6.0/misc/terminfo.src
+@@ -5214,6 +5214,176 @@
+ rxvt-16color|rxvt with 16 colors like aixterm,
+ 	ncv#32, use=ibm+16color, use=rxvt,
+ 
++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
++# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005
++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
++rxvt-unicode|rxvt-unicode terminal (X Window System),
++	am,
++	bce,
++	eo,
++	km,
++	msgr,
++	xenl,
++	hs,
++	cols#80,
++	it#8,
++	lines#24,
++	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
++	bel=^G,
++	blink=\E[5m,
++	bold=\E[1m,
++	civis=\E[?25l,
++	clear=\E[H\E[2J,
++	cnorm=\E[?25h,
++	cr=^M,
++	csr=\E[%i%p1%d;%p2%dr,
++	cub=\E[%p1%dD,
++	cub1=^H,
++	cud=\E[%p1%dB,
++	cud1=^J,
++	cuf=\E[%p1%dC,
++	cuf1=\E[C,
++	cup=\E[%i%p1%d;%p2%dH,
++	cuu=\E[%p1%dA,
++	cuu1=\E[A,
++	cvvis=\E[?25h,
++	dch=\E[%p1%dP,
++	dch1=\E[P,
++	dl=\E[%p1%dM,
++	dl1=\E[M,
++	ed=\E[J,
++	el=\E[K,
++	el1=\E[1K,
++	flash=\E[?5h$<20/>\E[?5l,
++	home=\E[H,
++	hpa=\E[%i%p1%dG,
++	ht=^I,
++	hts=\EH,
++	ich=\E[%p1%d@,
++	ich1=\E[@,
++	il=\E[%p1%dL,
++	il1=\E[L,
++	ind=^J,
++	is1=\E[\041p,
++	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
++	kDC=\E[3$,
++	kIC=\E[2$,
++	kEND=\E[8$,
++	kHOM=\E[7$,
++	kLFT=\E[d,
++	kNXT=\E[6$,
++	kPRV=\E[5$,
++	kRIT=\E[c,
++	kbs=\177,
++	ka1=\EOw,
++	ka3=\EOy,
++	kb2=\EOu,
++	kc1=\EOq,
++	kc3=\EOs,
++	kcbt=\E[Z,
++	kcub1=\E[D,
++	kcud1=\E[B,
++	kcuf1=\E[C,
++	kcuu1=\E[A,
++	kdch1=\E[3~,
++	kel=\E[8\^,
++	kend=\E[8~,
++	kent=\EOM,
++	kf1=\E[11~,
++	kf10=\E[21~,
++	kf11=\E[23~,
++	kf12=\E[24~,
++	kf13=\E[25~,
++	kf14=\E[26~,
++	kf15=\E[28~,
++	kf16=\E[29~,
++	kf17=\E[31~,
++	kf18=\E[32~,
++	kf19=\E[33~,
++	kf2=\E[12~,
++	kf20=\E[34~,
++	kf3=\E[13~,
++	kf4=\E[14~,
++	kf5=\E[15~,
++	kf6=\E[17~,
++	kf7=\E[18~,
++	kf8=\E[19~,
++	kf9=\E[20~,
++	kfnd=\E[1~,
++	khome=\E[7~,
++	kich1=\E[2~,
++	kmous=\E[M,
++	knp=\E[6~,
++	kpp=\E[5~,
++	kslt=\E[4~,
++	rc=\E8,
++	rev=\E[7m,
++	ri=\EM,
++	rmso=\E[27m,
++	rmul=\E[24m,
++	rs1=\Ec,
++	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
++	sgr0=\E[m\E(B,
++	enacs=,
++	smacs=\E(0,
++	rmacs=\E(B,
++	smso=\E[7m,
++	smul=\E[4m,
++	tbc=\E[3g,
++	vpa=\E[%i%p1%dd,
++	colors#88,
++	pairs#7744,
++	btns#5,
++	lm#0,
++	ccc,
++	npc,
++	mc5i,
++	ncv#0,
++	mir,
++	xon,
++	bw,
++	ech=\E[%p1%dX,
++	mc0=\E[i,
++	mc4=\E[4i,
++	mc5=\E[5i,
++	sitm=\E[3m,
++	ritm=\E[23m,
++	smam=\E[?7h,
++	rmam=\E[?7l,
++	smir=\E[4h,
++	rmir=\E[4l,
++	smcup=\E[?1049h,
++	rmcup=\E[r\E[?1049l,
++	smkx=\E=,
++	rmkx=\E>,
++	indn=\E[%p1%dS,
++	rin=\E[%p1%dT,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	op=\E[39;49m,
++	setaf=\E[38;5;%p1%dm,
++	setab=\E[48;5;%p1%dm,
++	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
++	sc=\E7,
++	s0ds=\E(B,
++	s1ds=\E(0,
++	s2ds=\E*B,
++	s3ds=\E+B,
++	u6=\E[%i%d;%dR,
++	u7=\E[6n,
++	u8=\E[?1;2c,
++	u9=\E[c,
++	tsl=\E]2;,
++	fsl=\007,
++	dsl=\E]2;\007,
++
++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
++	colors#256,
++	pairs#32767,
++	use=rxvt-unicode,
++
+ #### MRXVT
+ # mrxvt 0.5.4
+ #
diff --git a/sys-libs/ncurses-compat/files/ncurses-6.0-ticlib.patch b/sys-libs/ncurses-compat/files/ncurses-6.0-ticlib.patch
new file mode 100644
index 000000000000..188e6adff8c7
--- /dev/null
+++ b/sys-libs/ncurses-compat/files/ncurses-6.0-ticlib.patch
@@ -0,0 +1,15 @@
+always include ticlib even when progs are disabled
+
+https://bugs.gentoo.org/557360
+
+--- a/configure
++++ b/configure
+@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then
++if true; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
+ 	if test "$with_ticlib" != no ; then
+ 		LIB_SUBSETS="${LIB_SUBSETS} "
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
new file mode 100644
index 000000000000..562dbc4e4dfe
--- /dev/null
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This version is just for the ABI .5 library
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+
+MY_PV="${PV:0:3}"
+MY_P="${PN/-compat}-${MY_PV}"
+MY_PN="${PN/-compat}"
+
+DESCRIPTION="console display library (ABI version 5)"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+	SRC_URI+=" ftp://ftp.invisible-island.net/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2
+		https://invisible-mirror.net/archives/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="5/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="gpm tinfo unicode"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the ncurses-5 that installs the same lib. #557472
+RDEPEND="${DEPEND}
+	!<sys-libs/ncurses-6:0
+	!sys-libs/ncurses:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ncurses-5.7-nongnu.patch"
+	"${FILESDIR}/ncurses-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/ncurses-6.0-pkg-config.patch"
+	"${FILESDIR}/ncurses-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/ncurses-6.0-ticlib.patch" #557360
+	"${FILESDIR}/ncurses-6.0-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	if [[ "${PV}" == *_p* ]] ; then
+		eapply "${WORKDIR}/${MY_PN}-${PV/_p/-}-patch.sh"
+	fi
+	default
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		##--with-rel-version=5.9 ??
+		--with-abi-version=5
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Now the rest of the various standard flags.
+		--without-hashed-db
+		--disable-pc-files
+		--with-shared
+		--without-hashed-db
+		--without-ada
+		--without-cxx
+		--without-cxx-binding
+		--without-debug
+		--without-profile
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-echo
+		--disable-warnings
+		--without-assertions
+		--enable-leaks
+		--without-expanded
+		--with-macros
+		--without-progs
+		--without-tests
+		--without-trace
+		$(use_with tinfo termlib)
+
+		# The chtype/mmask-t settings below are to retain ABI compat
+		# with ncurses-5.4 so dont change em !
+		--with-chtype=long
+		--with-mmask-t=long
+		--disable-ext-colors
+		--disable-ext-mouse
+		--without-{pthread,reentrant}
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} != "ncurses" ]] ; then
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	else
+		conf+=( --with-progs )
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	CONFIG_SHELL="${EPREFIX}"/bin/bash \
+	ECONF_SOURCE="${S}" \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" \
+		do_compile cross -C progs tic
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target lib
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		cd "${BUILD_DIR}/${target}/lib" || die
+		for lib in *5.9 ; do
+			newlib.so "${lib}" "${lib%%.9}"
+		done
+	done
+}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 1f60d01fdc34..e03324785af6 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 9266 BLAKE2B cc7015640fd3b0dea4308fc98d5d8808bd7b135a862f05cace6ed42591812440625769a31678401f0f7a70ef0a68790da3cf5edbc66bb074daa131837a583115 SHA512 cdd25af39c5dda0bce9314c90017c7aef211d5bb181669a9845ca688c3ee2485d0bbe00641ed9069f2922db6f7adae6b52977d9337e55778c0c0880d3a220f0d
-EBUILD ncurses-6.1_p20190609.ebuild 9475 BLAKE2B bf2620b1c2f9e1b00b72d50a44461349b039b70667895d2f2666c9c72bc3f401c391374098bcb7308ad817b8e04e911235c7d35434d5c9185d3de712882382b5 SHA512 d798106f13616c652e4fc3701ecf0a11c695107232da6757ec2b13f4a6813cbaac87376e1ac12dc96b6f7899d8555a92a78e11f3d84f9d660fa7f23c43c55144
+EBUILD ncurses-6.1_p20181020.ebuild 9293 BLAKE2B 1192a739a643440a028e8d2e0a8600f60850d36f5079b84880e5b7d9995404fb7205a0d58300a6243d29212e32f02b5ab5755d503b52144b8444e88b31c09b99 SHA512 771fae43358709b59638d8b229831998480292aa90b8e0daee867614878b5089fb5cdef1ca499440419cece47613742e57b64b3ac86babac243adff8f841e8e8
+EBUILD ncurses-6.1_p20190609.ebuild 9494 BLAKE2B 568e6d45d0b05c993bf118986b65ffafcdc7baf06056da89eb794375003ceb5dc561352ecfd730f78b5d8b0c360ff0bcd295789b6ef694bc171fdc95c8e1950a SHA512 5eb08ec440df114f7eb212af3d9a2b50358b63b486210117a14872ea633010bfdd6e41170dad1c0e3776087d38294cf8c09c26666777a090f5d616c599e18dca
 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 1b10aae31358..a3663edeedbf 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -21,6 +21,7 @@ LICENSE="MIT"
 SLOT="0/6"
 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 )"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
 #	berkdb? ( sys-libs/db )"
diff --git a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
index e654cb4dc623..fe308345067a 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
@@ -19,8 +19,9 @@ 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 )"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
 #	berkdb? ( sys-libs/db )"
diff --git a/sys-libs/netbsd-csu/Manifest b/sys-libs/netbsd-csu/Manifest
index 6646dbafbb13..21cd8b077cda 100644
--- a/sys-libs/netbsd-csu/Manifest
+++ b/sys-libs/netbsd-csu/Manifest
@@ -1,6 +1,4 @@
 DIST netbsd-csu-7.1-tests.tar.bz2 579 BLAKE2B 6d042b3b549ce6ffe0bd0ce908d042e4501a95c21958710078f587d9f52316a52f4bcc219f694ee60066a427a84c027c34906b76c7b8ca151766e5b476152708 SHA512 f2aa7d2340e2545a99cb88e104aaca77b64fd5bfea42bbe5e34d790ae120a749245099a550728f3b7ca2ca5a29fd1f426ddd2e8d5a7bc1a44921c308f1cb12db
-DIST netbsd-csu-7.1.tar.xz 993460 BLAKE2B 013dd56eb5c49289f68518bee3f72afb42b264f7be869c7dda69f12c98ff782246fcee22c84a51719ab7ed45258cf5c06b43ee9d9da31879187bc0025b8e8c02 SHA512 834524a3ada2a4c02e7eb17d8be09cf023b91e64627f3b2abc32d4f3302e982dcf0939406dc8d6c0ec7ca5e641d2d1845885bb22a165b3d6a1979c2945e2aaad
 DIST netbsd-csu-9.0_beta.tar.xz 846120 BLAKE2B 59257e72766279ec043cbee39e2056345348088fbb9af097815c381d6cc5d2bf74c24c0ffd91f45da7384ad6df74a1a4bb0a283b3fb44976f7a59ad2f3bbbb24 SHA512 497ea33ac49338cf32bc265f5d9e7f3ba19c58009717af8505f07d9e2ec9bd3a3c72f85ec37924659509111aca20a6552fd8a06c765fa442b414bd6160815e1a
-EBUILD netbsd-csu-7.1.ebuild 3465 BLAKE2B a2ea666d2aac8bffbd461be3df7a6853c1fe2118a511851686a0635dc8e8bc42d3a2b621bd3db764ef069866f3abf306fa42e6dd6df0497945cbcb678c97ec54 SHA512 7888be9788b0f63f8d835e241d6b9e35777dcc6264178d0b11bd5c02a3e27c5c9606d9a61eb423728b149fa143443914909b201f33115af21fc190124da7cc86
-EBUILD netbsd-csu-9.0_beta.ebuild 3478 BLAKE2B 2193d6bf405467d5a812fc683fd63f618d1ba8d7673a82ee1766785b2f50035415a4ef4b95b61f205181a268cb5a3e7a5fb145e3cbb3fe96ad52113e281db921 SHA512 cffbe64e6bd3cb5d9259df1020469293f5f989ad9556e402e8189d1b291e8b3ebd64b393154097ee5716c3ea0c231530324bf1ce36a6a4229bce178c377d4087
+EBUILD netbsd-csu-9.0_beta.ebuild 3522 BLAKE2B d38576e7338723c7a68e1b5c1f9401b168cfe6189ad784a79dfdc0f3591b59d2b85724382314ab607df4ea4bae12371a3f633ac8443c45ebf7af1c4782aeb172 SHA512 c345001f2e802dfd27e11f6a71849e81e490c06ca2f72069eb32c93f671928368f8c1c9318828139901e615a2b5f82ed3e54dfaabfc2e752aac522c398b7ca9b
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-libs/netbsd-csu/netbsd-csu-7.1.ebuild b/sys-libs/netbsd-csu/netbsd-csu-7.1.ebuild
deleted file mode 100644
index dae26e9e001f..000000000000
--- a/sys-libs/netbsd-csu/netbsd-csu-7.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bsdmk multilib-minimal toolchain-funcs
-
-DESCRIPTION="crtbegin.o/crtend.o from NetBSD CSU for GCC-free toolchain"
-HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/csu/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
-	test? ( https://dev.gentoo.org/~mgorny/dist/${P}-tests.tar.bz2 )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/xz-utils
-	test? ( sys-devel/clang )"
-
-S=${WORKDIR}/${P}/lib/csu
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local inc_arch=${ABI:-${ARCH}}
-
-	# rewrite ARCH to match NetBSD includes
-	case "${inc_arch}" in
-		x86) inc_arch=i386;;
-		# x32 seems to be equivalent to amd64 as far as we're concerned
-		x32) inc_arch=amd64;;
-		arm64) inc_arch=aarch64;;
-	esac
-
-	# we need arch-specific headers for some assembler macros
-	if [[ ! -d ${WORKDIR}/${P}/sys/arch/${inc_arch} ]]; then
-		die "Unexpected ABI/ARCH: ${inc_arch}, please report"
-	fi
-	ln -s "${WORKDIR}/${P}/sys/arch/${inc_arch}/include" common/machine || die
-
-	local opts=(
-		CC="$(tc-getCC)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-
-		MKPIC=yes
-		MKSTRIPIDENT=no
-	)
-	# rewrite MACHINE_ARCH to match names used in CSU
-	case "${inc_arch}" in
-		amd64) opts+=( MACHINE_ARCH=x86_64 );;
-		*) opts+=( MACHINE_ARCH="${inc_arch}" );;
-	esac
-
-	# we only need those files; crt1 and friends are provided by libc
-	opts+=( crtbegin.o crtbeginS.o crtend.o )
-
-	bsdmk_src_compile "${opts[@]}"
-
-	ln -s crtbegin.o crtbeginT.o || die
-	ln -s crtend.o crtendS.o || die
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}"/*-tests || die
-
-	# TODO: fix gcc support
-	local -x CC=${CHOST}-clang
-	local -x CXX=${CHOST}-clang++
-	strip-unsupported-flags
-
-	local cc=(
-		# -B sets prefix for internal gcc/clang file lookup
-		"${CC}" -B"${BUILD_DIR}"
-	)
-
-	# 1. figure out the correct location for crt* files
-	if tc-is-gcc; then
-		# gcc requires crt*.o in multi-dir
-		local multidir=$("${cc[@]}" -print-multi-directory)
-		if [[ ${multidir} != . ]]; then
-			ln -s . "${multidir}" || die
-		fi
-	elif tc-is-clang; then
-		# clang is entirely happy with crt*.o in -B
-		:
-	else
-		eerror "Unsupported compiler for tests ($(tc-getCC))"
-		return
-	fi
-
-	# 2. verify that the compiler can use our crtbegin/crtend
-	local crtbegin=$("${cc[@]}" -print-file-name=crtbegin.o) || die
-	local crtend=$("${cc[@]}" -print-file-name=crtend.o) || die
-	if [[ ! ${crtbegin} -ef ${BUILD_DIR}/crtbegin.o ]]; then
-		die "Compiler uses wrong crtbegin: ${crtbegin}"
-	fi
-	if [[ ! ${crtend} -ef ${BUILD_DIR}/crtend.o ]]; then
-		die "Compiler uses wrong crtend: ${crtend}"
-	fi
-
-	# 3. build and run the tests
-	emake CC="${cc[*]}"
-
-	local p out exp
-	for p in ./hello{,-static,-dyn}; do
-		if [[ ${p} == ./hello-dyn && ${ABI} == x32 ]]; then
-			einfo "Skipping ${p} on x32 -- known to crash"
-			continue
-		fi
-
-		ebegin "Testing ${p}"
-		exp='ctor:main:dtor'
-		[[ ${p} == ./hello-dyn ]] && exp=libctor:${exp}:libdtor
-		if ! out=$("${p}"); then
-			eend 1
-			die "Test ${p} crashed for ${ABI:-${ARCH}}"
-		fi
-
-		[[ ${out} == ${exp} ]]
-		if ! eend "${?}"; then
-			eerror "  Expected: ${exp}"
-			eerror "  Output  : ${out}"
-			die "Test ${p} failed for ${ABI:-${ARCH}}"
-		fi
-	done
-
-	emake clean
-}
-
-multilib_src_install() {
-	dolib crtbegin.o crtbeginS.o crtend.o
-	dosym crtbegin.o "/usr/$(get_libdir)/crtbeginT.o"
-	dosym crtend.o "/usr/$(get_libdir)/crtendS.o"
-}
diff --git a/sys-libs/netbsd-csu/netbsd-csu-9.0_beta.ebuild b/sys-libs/netbsd-csu/netbsd-csu-9.0_beta.ebuild
index 51311c325c24..99981172dddc 100644
--- a/sys-libs/netbsd-csu/netbsd-csu-9.0_beta.ebuild
+++ b/sys-libs/netbsd-csu/netbsd-csu-9.0_beta.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bsdmk multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="crtbegin.o/crtend.o from NetBSD CSU for GCC-free toolchain"
 HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/csu/"
@@ -17,6 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="app-arch/xz-utils
+	virtual/pmake
 	test? ( sys-devel/clang )"
 
 S=${WORKDIR}/${P}/lib/csu
@@ -59,7 +60,7 @@ multilib_src_compile() {
 	# we only need those files; crt1 and friends are provided by libc
 	opts+=( crtbegin.o crtbeginS.o crtend.o )
 
-	bsdmk_src_compile "${opts[@]}"
+	bmake ${MAKEOPTS} "${opts[@]}" ${EXTRA_EMAKE} || die
 
 	ln -s crtbegin.o crtbeginT.o || die
 	ln -s crtend.o crtendS.o || die
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index fe61988bbdbb..11709efc306c 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,9 +1,8 @@
-AUX newlib-2.1.0-msp430-destdir.patch 1271 BLAKE2B ec3a2050750c7977830a04e33af32e01b3359355c09eab133ca7c5167e4117faf9fe54c1cb87b026761c3ade845dffb37e12dff153d61fe5237f7ed1f89f81bd SHA512 094410eb6e259e05ee0ecdf7fc5db2a46af3f09cfb2ac6f3c96eb3d440c28eacfcd1c02e397240fd5e542cb97cf0ea1707ea08d4d1a85e6387769c83ad6df850
 DIST newlib-2.2.0.tar.gz 16521910 BLAKE2B 530290c8f219774885e3c408889b7f58bbeefe5c092f004c9ad61de8642b725df1f8fd2a00760ebde814e5bf379ae0320a589d2318113f371a733c5abaca2ba7 SHA512 ab9161f16845367c823b6709e3c5708969f29f05c77edb1cf969ff4202f358648f1e55080974599dcefed2fbced4694dc73748596e76c1aa37c50cddff6e4be3
 DIST newlib-2.5.0.tar.gz 17912392 BLAKE2B bc89491758d59f3529c72308e963c5b3e39044d6d586ef3814cc19cf55aee33948656c544df7dfcbe3915105e7373f53d7b2baf96b9b8147e3af780c1d08e670 SHA512 4c99e8dfcb4a7ad0769b9e173ff06628d82e4993ef87d3adf9d6b5578626b14de81b4b3c5f0673ddbb49dc9f3d3628f9f8d4432dcded91f5cd3d27b7d44343cd
 DIST newlib-3.1.0.tar.gz 17958952 BLAKE2B 3a84ae81fc07e442a4ed3da7a78e7ede34cc7e24b5d1c66a12624ed808e5f85f134751fcea0e4ce9eb39df287a582821f751a8610a088c149895b5e38eb06989 SHA512 efc4c3ab7153387780d141386bca5d3e20c9d25ae3e6b87cf94c8df9d301ce5926dacdff9bd33aeb9781559d933c3d0ae77f4e5b46120d90792f75dbfde702c7
 EBUILD newlib-2.2.0.ebuild 1778 BLAKE2B 1b2808f9adf45af3f55ea1d7d52d1e129424d01d2511020ddb9908163a439c96b400c0d4ff01dd5fa695fd560a0375c1fec16773db4523091f5e5ba21ac3ad89 SHA512 f2d7f9d926db20b2b3c36a244d4ebe95818d7b0accb87b1b0f073aa53ff866d58d5fd92ee82999f130fe590ee42918c3693636d809f68c5ddc389973d42a9de6
 EBUILD newlib-2.5.0.ebuild 4040 BLAKE2B 89d2eea47609958ae3a6fe32f527ed7cdff94b430f40fe4bdd12714e72dfcdce4dcc59d8e2a8971d54d0a880d227ac557741f374c30d53e84e59b73ee8fe72fd SHA512 e9c40057893176881fe811d84eb6e1ff5bb82c02cbf3bc1d4cfbb346a1960dacdce183d9e5c10df1cf23daa2bfd01d72712b811f4a1719436a4109a9e904df51
-EBUILD newlib-3.1.0.ebuild 4225 BLAKE2B e644e98f0599a178a10e692958e5fb086127b011caaa6c9c57503506d83074b795cd388088d5b3cc769e7e2bf590203ebe5eede525fc6f5fcb6d64c0be2c6b45 SHA512 f897ce7ecdcb3fd5cd09dffd285ad1e22730702483e87179c4137aa8f4142962800ec0e793b43fd278b2a89c325d227966fb30e2e20f7b55a709ebfb245c35ef
-EBUILD newlib-9999.ebuild 4225 BLAKE2B e644e98f0599a178a10e692958e5fb086127b011caaa6c9c57503506d83074b795cd388088d5b3cc769e7e2bf590203ebe5eede525fc6f5fcb6d64c0be2c6b45 SHA512 f897ce7ecdcb3fd5cd09dffd285ad1e22730702483e87179c4137aa8f4142962800ec0e793b43fd278b2a89c325d227966fb30e2e20f7b55a709ebfb245c35ef
+EBUILD newlib-3.1.0.ebuild 4226 BLAKE2B b383fac3485a409a2e58e8db2c48f47aaea4cbdb740de00da7388ccb4dc3228b82ddde3c451a7f61c838672d8ea36fe215f2edfd5ac6ba4a78dd991f486b18f9 SHA512 ffc6b9a7388b055e8bfa6b820cc5dc547ccbd4b7d63bd7271d27111307926ada784d0634aa517acd2f132c8fcbb666eeedc6166fa9aff734a5c88e508ef3142e
+EBUILD newlib-9999.ebuild 4226 BLAKE2B b383fac3485a409a2e58e8db2c48f47aaea4cbdb740de00da7388ccb4dc3228b82ddde3c451a7f61c838672d8ea36fe215f2edfd5ac6ba4a78dd991f486b18f9 SHA512 ffc6b9a7388b055e8bfa6b820cc5dc547ccbd4b7d63bd7271d27111307926ada784d0634aa517acd2f132c8fcbb666eeedc6166fa9aff734a5c88e508ef3142e
 MISC metadata.xml 413 BLAKE2B 03320244c40182ff9d503fd1d9c7c3847209eeb91081e7d4a3285ed43eba6a42e0f361f6b7601966df420dde2d4e93ca458816198c2f9ebaec82790359ce868b SHA512 37e46d117243b93e189177ada64acedc0d798dfe4859f29a7ef70b22fe44e6364a3445e345def7e48264cb2bf3047ac78637759bc04d9ed3d7ea339432adf7e4
diff --git a/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch b/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch
deleted file mode 100644
index 38fa2643dce3..000000000000
--- a/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0a7009c61811b4451ff6cccda24f42ab07142603 Mon Sep 17 00:00:00 2001
-From: DJ Delorie <dj@redhat.com>
-Date: Thu, 23 Oct 2014 01:49:45 +0000
-Subject: [PATCH] 2014-10-22  Tim Harder  <radhermit@gmail.com> *
- msp430/Makefile.in: respect DESTDIR during install
-
----
- libgloss/ChangeLog          | 4 ++++
- libgloss/msp430/Makefile.in | 6 ++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-2014-10-22  Tim Harder  <radhermit@gmail.com>
-
-	* msp430/Makefile.in: respect DESTDIR during install
-
-diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in
-index d72051d..b9f5a6a 100644
---- a/libgloss/msp430/Makefile.in
-+++ b/libgloss/msp430/Makefile.in
-@@ -12,6 +12,7 @@
- 
- # Makefile for libgloss/msp430.
- 
-+DESTDIR =
- VPATH = @srcdir@
- srcdir = @srcdir@
- objdir = .
-@@ -138,11 +139,11 @@
- 
- install: $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT) $(SCRIPTS)
- 	for c in $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT); do \
--	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
-+	  $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\
- 	done
- 	for c in $(SCRIPTS); do \
- 	  b=`basename $$c`; \
--	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$b ;\
-+	  $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$b ;\
- 	done
- 
- clean mostlyclean:
diff --git a/sys-libs/newlib/newlib-3.1.0.ebuild b/sys-libs/newlib/newlib-3.1.0.ebuild
index 52ef720a87f4..3ff7308671d7 100644
--- a/sys-libs/newlib/newlib-3.1.0.ebuild
+++ b/sys-libs/newlib/newlib-3.1.0.ebuild
@@ -33,7 +33,7 @@ NEWLIBBUILD="${WORKDIR}/build"
 NEWLIBNANOBUILD="${WORKDIR}/build.nano"
 NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
 
-# Adding -U_FORTIFY_SOURCE to conter the effect of Gentoo's
+# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
 # auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
 # Currently newlib can't be built itself when _FORTIFY_SOURCE
 # is set.
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
index 52ef720a87f4..3ff7308671d7 100644
--- a/sys-libs/newlib/newlib-9999.ebuild
+++ b/sys-libs/newlib/newlib-9999.ebuild
@@ -33,7 +33,7 @@ NEWLIBBUILD="${WORKDIR}/build"
 NEWLIBNANOBUILD="${WORKDIR}/build.nano"
 NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
 
-# Adding -U_FORTIFY_SOURCE to conter the effect of Gentoo's
+# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
 # auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
 # Currently newlib can't be built itself when _FORTIFY_SOURCE
 # is set.
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 5f18017b75da..56dab347668f 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 687 BLAKE2B 2540fa45582ccd15949b955d956ed6421d0ebb52e842e666c4c46e8b2da84c8e0887e3a416d977b87f3b68b73c014b9ae6dffa8cc9183f1ebfff42fea00f925c SHA512 2e4aa77a5f29603bec7cbf198f1f39545cd875a4f79e8971b676cffa77509d31c179a10bdd2b8d286ef616733741e446aee7fcb4a81acab3bee4bf01ac6672a9
-EBUILD nss_wrapper-1.1.5.ebuild 438 BLAKE2B fc0a7432e7d7cfdf93bd7ee6632cd04fd5379ce63e269ed1c5f72af72c08445b9245c8212470ab7b3b32b241ab29b263ff1db4fd22aae5a0ef4bd6d671c62ba0 SHA512 10a687fbfefa83da9c5675ca15727c25a083f7548e05e2f1c2fdaf4a0deed6dee524eab02fd140e301eff68057c002c3c4dde26133c3bcd6b3dd54a079cb971a
-EBUILD nss_wrapper-1.1.6.ebuild 438 BLAKE2B 2a04cdf429afc3e354309802a1246c7f6b851bc664928e69e3a10303c4011341978d2f1c94ddf089ac34f7c183b05d9e82c341459054d0998664d53d14fd400d SHA512 229acb30cfd8f7a0b2cf62a6956fe9a891f3932866d6010367c581a7672ade33060ebb0ff37161693a9a84933f11943f860717c182031c2c7d6bfe1d8c8c09d9
+EBUILD nss_wrapper-1.1.3.ebuild 711 BLAKE2B 08de5fb52071227491fa6765673afda1c116b6a742387c1a21820eb9f9ccb70aa5233d6edb174c7bf3a1ce7c920ad7680679c8fcdbea49ed322c2d093c48e7ca SHA512 a2af7c68b60243d08874c461e134c48cf4dbcb0737d6873336abebd5952d31179f02b65a3ef58753328e4809581a55560d126efccc64cbaf9a278eacfa7559c0
+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 9c850eb8eab2..113b084510a5 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild
index 097699cc431f..f1c972d5283a 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
index b4ad7aae9cfb..f1c972d5283a 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index ea6d95901e09..2e06c64f0a1f 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -4,7 +4,7 @@ DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59
 DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2adac127604a7552ff70c378323a0de8141445332430205946823097170edf217122196ea03ae665284751fed3748d9f8ac3d SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe
 DIST Linux-PAM-1.3.0.tar.bz2 1302820 BLAKE2B 0ed5553308e8bc4bef91746a1c79db41bf5f0a48a31796d5a13819387c0a04d553efa210435273ad8565d0a53f354817bc3e0f254e35a5e75b7b7b586cad5d16 SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42
 DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
-EBUILD pam-1.2.1-r2.ebuild 6109 BLAKE2B 669b114a797f26445e73cd0aee3554ebba8176c5b8f3e2bde6867cabc5ab421b1337b747c6d3ca3fdd0b126b26dfe060c505355cd59edf03f185df80e0419a88 SHA512 bf000ece93a1c77a442d59496a3dd0648c435d8ed39e8d7a85da8706532abc01e8a762720069128afbdc10095b7990c5cea83e83d7c1e13a3d9f235067484927
-EBUILD pam-1.3.0-r2.ebuild 5988 BLAKE2B 1e0eed9d56e51ad9fcf3dba6f4ef5ad43822742fdb0b809398854b690e33ef23931289bfd9ab8efb8bbb5a4d8b58dfff544dd92a4fe77b43adca372523d97cbd SHA512 4b0bb8d4a3dbcbbd4b8a10dd406d63d2e289d970a85577bf8ffbbe6efed0687402f1737edb00e459539140291416dfa13b86aa20b959128c638be0bfbd380687
+EBUILD pam-1.2.1-r2.ebuild 6136 BLAKE2B 8564c814c6a40fb236d830be671fe8331452cbff78cf84d3117062e7b2995ecf52654078568179b38dfea9bf391ff6719fc72ad822c15da62378fbc9a0ea0228 SHA512 7be870c7b4080fd770375f1585b082ee6a8dbe95fb09363d1ec624e44c74ad404204c75ee5fd1ecc11a9a74308f9391adc4b523e5d0f4b0c5dd968bc9355fdff
+EBUILD pam-1.3.0-r2.ebuild 6015 BLAKE2B 6f4de2ee210b42b927940732da2de8af4bdd88cc230c9e50e51e53572d7f070eeb4709060fb2b1c888497a50eb14a85e87eae608bc13d14745fa55dd30b08727 SHA512 6a685ff0e8f6e34a4146afe288c5371dac0c0f0f4717c3c11ef673f7cd27f7d887120ea9c582199ca92e130ad931b2c12d3fef68b4584a7d10e36dc2dbcb04b9
 EBUILD pam-1.3.1-r1.ebuild 3377 BLAKE2B e269bc46b8a57cd379134aea080fedebb3328220bfd25dd5e7ff5a3930bb01765c70610f69613517897738ebde6e7a09311d1482c868482f4e399af6003a828b SHA512 e584bad6441f8d3c5d049cd746fc0c4ea97f24d17ac71bab8f2740369efdd08d52de03482c4be28aeae0c1aa7152fee4a96062baa9aa045d65eb16031b21437e
 MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/pam-1.2.1-r2.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild
index 2cb117abc88e..b6e3fee2e960 100644
--- a/sys-libs/pam/pam-1.2.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.2.1-r2.ebuild
@@ -17,6 +17,7 @@ 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 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/pam/pam-1.3.0-r2.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild
index 2eb2d287da65..85b67e363e5a 100644
--- a/sys-libs/pam/pam-1.3.0-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.0-r2.ebuild
@@ -17,6 +17,7 @@ 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 test vim-syntax"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index b189010e713f..d2b53c1d7ce7 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -3,6 +3,6 @@ AUX uclibc-ng-1.0.30-fix-ld.so.cache.patch 1515 BLAKE2B 20f317c623cf66f835191563
 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.31.ebuild 10319 BLAKE2B f06b14a05e153bb1572bf6b408f93901cf58c44e4dbbbb98dc86ddc9d21f9f190932e996f89238db713214eeac07ec6cf63a153c7f0df56716349345b24479bd SHA512 fb4f76a5621e6ec1b0844e9e443efc26bfea75c3c60b4f3cc1fd2333e7b3e8dd5f3f00480741431aee98c489254f5111d2d9498d9c60f2c405f5eb3a2000e76e
-EBUILD uclibc-ng-1.0.32.ebuild 10337 BLAKE2B 7f05dda90edc709e2fd3344284991bcca6e415e521c2eb77954b3cb216c19b497e6c91be7291b4cd06fc7f6cd6214f3390efb4ab4c379f8f104e2c8a1c30c21b SHA512 97ef5668d7fa4da7a33dd3e256f1bcc1f63e4182f8eec414b1283fba9e4fd32e8f5be1e8e40603d95def6f9b779b5ec5d2d63000985d658c19c58edbde0a1c13
+EBUILD uclibc-ng-1.0.32.ebuild 10336 BLAKE2B f3808c9d4ac97577344f9eba90de471092c9db27df1cadce646bae0a2377df641aa80c834c062ed8d76978455ac3e004c7fae37934c38e840d8174d9b38e5281 SHA512 3858e70681a1357211f9cf920d4e0fb856879691c3ddc44ded7769b2be6417474b2595f491cb706bfe14fb228ba4a4809a924d4a3bfbb0d10cefeaba937941ca
 EBUILD uclibc-ng-9999.ebuild 10339 BLAKE2B 57a5c4ad7b5d6aee65872bde3af3712826ae910631b44606454e66de69dca49aa7339746929e1bbcb0cc67de1bb72fc0e4c8e8042e85be27464d3b7f61ee838e SHA512 db0ca38f425b956ce02b9a43202f19d8ec3ea16c303ddc31b7982f7617005cade3406af666506a320332a9fc5c4e2d07b1bbdefa836a78d8684b7231e1b30565
 MISC metadata.xml 790 BLAKE2B b48396e1f8dca79f2b9e452982007573959e89ab8467e2c0d65863a0c00dee140f9a7a5a4f02c916da76018dacdcd9993434c30ba0a511888248f83a9c063e7f SHA512 a8e955511974be64f2360c16a883eec4b9450eebb393bee5f97b50e233275de1cce62e2ef3b9945174a9dca19a7f30aaab6e90c5c28f283c378709eb3fab3ac4
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 5e58388e4022..62423b51aec2 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
+	KEYWORDS="-* amd64 ~arm ~mips ppc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index d505abc96d1f..b00e40ca9205 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 1107 BLAKE2B a18e15dc765955fb48254ae7de2259a32e038a5164ff8372a1f048c154b78112741f9a6c72f13db0ef17751e8b249eb2591105f954e8a80095fd83c5aaab302d SHA512 46dd993b33643951476674751cfb7008762f0f97726810ba815c59ffcd1cc6f0e75a820a1855cae98d7506f924a62814e67ab198cd451cf19454dedf0bed80be
-EBUILD uid_wrapper-1.2.4.ebuild 483 BLAKE2B f94b6362ef5aa5a1f3bfe76f45eb063455646e6b7b6d5955663ee22de9e35c5188632d094f2b5e84b4418569f5efe05694f4a24b7d39525e1425fe2bfb07eb20 SHA512 c5f1095921afd9857e0db275f5fc360cd110938b67316cdb900672c8f3aa9f432d5810bf50e2445a4da80fd944d8e9bc4df56e5c186d21cb4d050a61d0a102f0
-EBUILD uid_wrapper-1.2.7.ebuild 480 BLAKE2B 3d2b9efe9e8992e9492932415338b87d40caf29b10a191eec96e1c6475bade57557526587a07e4751ff8e5d204c7cd69a8596421e41c5fbf9321151a6a798902 SHA512 ee6cfe36331450fa38550053a9e3aefbc8d86d91b88fefb3288d134f3f857c860c65b5ace8323336feb0354cacd0d39da9e2dd1262fc1aa46038bd57450a2f54
+EBUILD uid_wrapper-1.2.1.ebuild 1131 BLAKE2B c0fa7fcc6d408b76db22caa4a4a9f71eafbe9cd571b1926b1bf755d534d209ec3e24e9d8f86240cde2ba6efa1bf205bfe6cbb93c1a521d4a4288ecb3f39a75e6 SHA512 2b888da5b42b3c49ededb45287c7f4a79401527d0b4fb134771003974e232c57380e53b628127967a2a6f1425d32af9c0512c1b0213f7d501ad050c0a6b5d765
+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 de4446358d9b..3e097e619161 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild
index b24e1db33e5d..1fe72649c615 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
index 09f31700e472..cfc62eddb7f6 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-libs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)