Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.
author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:49:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:49:31 +0100
commit: 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (patch)
tree: d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /sys-libs
parent: a1392efe64137262023d92492396ca9156d22396 (diff)
46 files changed, 559 insertions, 105 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index eb415c9ee822..f64c3ab72aa0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 7afa4abaa254..08e43cad90b0 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,18 +1,22 @@
+AUX 5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch 2336 BLAKE2B 501238f8bb3881b427ff4673933c4544596fcbd3e129876d17b8506498c0513aeec69acd2a38f1d009a7df9f8aecf3e10d88301281722f156a32f76fea131c53 SHA512 7b2b71bb5cb11d6f0d96d0f5f33f2f7da7b4c637e191248c83e27e536d277bb1dee92affa0ca2092c870648525ed7d7b97a29af71aef3631764f724b61118720
 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-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 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.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
+DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 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.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 5080 BLAKE2B 867d9b094c28fc7a8955f716e7afd5b9a1fb765b5cf1c24c031058dd758fd66f3d19bb3f5d992ba7cda403730ced01ab72f52a83e20eab652312d366b19a5af7 SHA512 a22c61868254c35249d4c1685677cbc566a9e8b9b64f5b28d912daf742ea35625858e15870de1ad17d876486c45b32dd68889a42443e41c2dc92b6ed3be094ed
+EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5259 BLAKE2B d9fd342c98e1c7a9d124cd3149a4325625c8ab604cc9d3cbb01513b6ae2add2adbf246c616219f2fc0691d90aa26f5371e7cda8a18aec95243bd1d6ba7b25379 SHA512 8f82649dded359a5c6132b0b9cf211faefb3840850d71f43332cb8f1c250c830848aee7c5e7b1be2278f103420683b4e51bf493c563dead5a27781756a0c8015
 EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05072397003d6e46793a763f91eb79f60c183d89e7265a53f6f96401dc87546bba5b8d21dd38dd0b8bceecdb652702685288465916 SHA512 c9b1dee74f1cbe7d6822589372389c2e3e6f3398211e26d83072dab290541797fa08c52c4c6ac581a59dac52fe5893a27812e5e46e175b9146f2c8348f170458
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5401 BLAKE2B 7e4069b74c630e33f5f7045764f8ad5f510fd4c03014e6274d8ba4430406d1e507ce9fc9198c64f923a3df15545f143cdeb696c9b2e74b5250c557d5a8be295b SHA512 1853c25f8b8fcd21f7f37044dfd96d6bed076324d067cbb6d14711e6e65ffe7aa7b76a3b6665acf04051ea688a08eca0bd66da47476c1cc3e969cc6ce346f0f5
 EBUILD compiler-rt-sanitizers-8.0.0.ebuild 5137 BLAKE2B f155a3b8d1ea7c1ec3bd598784a0600c7c0050a7e25a17895d919a5d7d0b05b28548e42fce9ee66a7fbb9b328b5cc7f1a998cb110f1e20a1d0b55c564f33d91e SHA512 4ebfa01e7d110bee738b63c7b9129cfaff13aaa90e38f8e08bec256b7fa098eb79f8b92dacd21c0af3b717005207b0eb4c8c4ebec92da805b53c0052759f03e2
-EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5200 BLAKE2B e1ccb4612f44fbea2a5404d7da17a6a910d1fdfc60f5ce3560b5417df2942ebf6d0a4142ef4813b2a36c78a9fbf7d951672172d8828d2b6a699de601cad2d763 SHA512 0ed0ff7a55ac281da0e920916b41d2835eb0c4f15b18bb3e086bdb7968a7bb32f7c2823a91a38d2cd9efb3705b2e2819484de48bc03f65f4f562bcc6521328c4
+EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5203 BLAKE2B d663a6cb26677be372e91ec3664c5b2a615dc7234170af6d7946bf73c6cab81c5ca691fdafb0108c8d8112f01daae75878ea5d9fc391ae906d401343d4d800d5 SHA512 f1d68014cc59092eefab419c505711fa5207286b44fe1d99e4dbae4b6dcb68d3393ac6f0ce63bae9251ef9ec5dfc10f1d03fc0e9b6fc19ca22c20e820390cddd
 EBUILD compiler-rt-sanitizers-9.0.0.9999.ebuild 5105 BLAKE2B aa430a9b40ae689c8fee3d1615d0c34351fdf54b6f49551fb376bb6c7f8dae90321c065ec012c30acc08340e19c97a0657d7340e6423a7333635c1e8f060f71b SHA512 89417db1facedea5758704d344811f9fbdc9cbd0e5d98c0d3782ce4e0bc14c187ce7ee89e1f691a435616fd09a051e577be6175d37aaf0366cda55e28d942d4a
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
new file mode 100644
index 000000000000..2862cd5c8719
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${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-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
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="${PV%_*}"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+clang test elibc_glibc"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	clang? ( sys-devel/clang )
+	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}"
+
+S=${WORKDIR}/${MY_P}
+
+# 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_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.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
+
+	# sys/ustat.h removed in glibc 2.28
+	# https://bugs.gentoo.org/675654
+	eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
+
+	if use test; then
+		# remove tests that are broken by new glibc
+		# (disabled in 6.0.0+, r313069)
+		if use elibc_glibc && has_version '>=sys-libs/glibc-2.24'; then
+			rm test/tsan/Linux/user_malloc.cc || die
+		fi
+		# 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
+		fi
+	fi
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_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)
+		# built-ins installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=ON
+		-DCOMPILER_RT_BUILD_XRAY=ON
+	)
+	if use test; then
+		if has_version '>=sys-devel/llvm-6'; then
+			mycmakeargs+=(
+				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			)
+		else
+			mycmakeargs+=(
+				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake-utils_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake-utils_src_make check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
index 175526e2b09b..e293bbe65f60 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch b/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
new file mode 100644
index 000000000000..5a9aa2327b8d
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
@@ -0,0 +1,61 @@
+From 2e8240309f5ce36eae8f1f9dfcd8c060c040ca5c Mon Sep 17 00:00:00 2001
+From: Craig Topper <craig.topper@intel.com>
+Date: Thu, 24 May 2018 17:59:47 +0000
+Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+Deprecate ustat syscall interface
+This patch uses pre-computed size of struct ustat for Linux to fix
+
+https://bugs.llvm.org/show_bug.cgi?id=37418
+
+Patch by H.J. Lu.
+
+Differential Revision: https://reviews.llvm.org/D47281
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../sanitizer_platform_limits_posix.cc            | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 83f4fd22f..804abd9e4 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -252,7 +251,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+-  unsigned struct_ustat_sz = sizeof(struct ustat);
++  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++  // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++  || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++  || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+-- 
+2.20.1
+
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index c5b0ed72c25a..8a6260f90723 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,11 +1,13 @@
+DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 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.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 EBUILD compiler-rt-10.0.0.9999.ebuild 2910 BLAKE2B 94a8d936ea0d366cf57f648772e7dc4adeec0c3b50edb3c62043cbfe1ce5c3ddeec28d03afbc036cc1a702767f7d35b2fa7fe8413a5d14bca4c2f553d3be72ac SHA512 1076cea1303646469d9125c8f4fca47e40901f4923792c352e488fb186811fd957fdba4e5c70058e2bc22445e6c8d5953a8ace00e77a61b8969175fa689a0e5e
+EBUILD compiler-rt-5.0.2.ebuild 2840 BLAKE2B 4c6e6ca121bad66f69f272a1ddc8a5153196c8f2608da08b5326e264842fe60ae8a4cb1aa98e2907b141068e5af997fe81ae13708dfd148f8676bebf18b894d2 SHA512 3fcea6a7045c1dc666ad6cd9c575b1ba931719bf31457f7493bb7b9c7950bca8e1c5eb8ce4342c1098250d0c126e85ba86b56724b17a3f6bb43c2846fb765a1f
 EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980aff78331a65b5658a50e0f808c9cb694d2e5d85bd753d291e1b5f96ab9e6cbc6a6d9f0cddcd9f7f8521ed5280f8291 SHA512 ecce0303d9db8ec0c74b3d0b248547402c32b7bceef52a5bb999f076c8fa82e209d5d113e6c14a1511e99dbf04bfd4d79077da1c010d9069a1bd284a168b26e0
 EBUILD compiler-rt-7.1.0.ebuild 2913 BLAKE2B 86f05a0f2604f7df55ecec3906f380f6838f9deb66f76f952c9dfb89d8b3738aafd7468c1cfc2c6e19e1301fc4dacdb74a4f8436cdf7daf98bebb82ee1284590 SHA512 ddb15119c6dc09816ecf15ca61c548d786c16c8380284323e27a37229dd81808fae98b2451b5bfe98b2f1ce3b0bb620acf792ba1a66e5aa67acb40a33dd64744
 EBUILD compiler-rt-8.0.0.ebuild 2916 BLAKE2B cb63ba2b0e7a3f913fe58f2e53fb5deaa827c0fa7b10a89891a7da7fcf658fb6d9ab0fd50e501d35a788c9f53b3c267c85a03dbbb9722f4a3294aec4a1c0e4b8 SHA512 d11deefc294f5d99e4b92384a154dfebcb9ab5a7549aaefefbe791bf5cc319c1ea547eb076bb416702d8812d967e4721f7d51f18ec9d741a0347cd79b8172ad1
-EBUILD compiler-rt-8.0.1.ebuild 2952 BLAKE2B ac72b6dfd85f500aa57236f40d057be428b28799d5c008e1308b928d8e9f763ff77669f768a9d6563e85b011b36524a25eafcdf6a3c993b22570b2223c09c3d5 SHA512 93957665903231e1d1f1dafd0a9e30030a4dbbdf158cf929c14023ab8b2b7552341067e1f583164f37bc16e99b43365b94c8f33f2f9c21e5d0275132c4464d98
+EBUILD compiler-rt-8.0.1.ebuild 2955 BLAKE2B 702fd03689bf6442de07f5edccccc583cc151158998a0f2b9c627de68d16761dbe4463468f4e74a5ad10772878660a3a62d464a48c83e595f9e43e7bbf26cd02 SHA512 df56a69b5bc0ac31d53bbe9b44f4a7ec59d79d8b573ba0396593fc7e9ac9d8fed5ec599d41bde33adb6584f46c672e9d790bf0f933f7b67f796620d9ff06e7c1
 EBUILD compiler-rt-9.0.0.9999.ebuild 2935 BLAKE2B cb244d9f5532655ad9da87e22d09d6167dc525698d331e3d0c590170af23b2ccc9027e9d355925bc3492706ddc8b42499d76615e8f96a3f9bed5e6b582fcc226 SHA512 b08ab2c25a1d2b748be508d1b7b98dd571729984b605f26fe32eaff6419f1416dbf3659c93cada597abe323ffc8fc22a06ba97f49f6118758d761d1882194f37
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
new file mode 100644
index 000000000000..8d53cbd955ee
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${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 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"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="${PV%_*}"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+clang test"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	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
+
+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_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
+		if has_version '>=sys-devel/llvm-6'; then
+			mycmakeargs+=(
+				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			)
+		else
+			mycmakeargs+=(
+				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+			)
+		fi
+
+		mycmakeargs+=(
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
index 7097b23d57c3..2df510757e47 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index bd983814d130..505de122a2d4 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -5,4 +5,4 @@ DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94
 EBUILD e2fsprogs-libs-1.44.5.ebuild 2420 BLAKE2B 185bc676e63b1a9d4bbeeab3f93026d90c9f147b55b40161efb57596071e0bb9f6ef2b78a234de7d7006d9a2ac9de83d563a87f4469f8525401eb346bf1dc73e SHA512 1ac2a5bbd640ead26afbb89c5d30ea8e9c07af7754591a1bc5167e016ee0a3b16a3534cdf01a89608204bbec6e1cf556720c050d658cd1d011c5bc6eceeb44c6
 EBUILD e2fsprogs-libs-1.45.2.ebuild 2420 BLAKE2B 81ee3f5d9d59a5add241ca79bfa2a0f9a112c16c4bb0b9970a1ee196540d2d98106c6a0d43bdad610d640407b56b312d0f58a4a6062bd311dedc96b0ecd96fe2 SHA512 be072a3070da4d0017347a9b62e09a2020410b48e29c8c9e680effa4dcd31d5cecc61604402f63dfa55256ace35b9c179fb7b6773ba0eaf8249f0144c0015939
 EBUILD e2fsprogs-libs-1.45.3.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517
-MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
+MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index 3455ebb9dca9..fb37f7ff1115 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
-	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 8ea9a3f62fde..0fbdcd9f3264 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -28,4 +28,4 @@ EBUILD ldb-1.5.5.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e
 EBUILD ldb-1.6.3.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
 EBUILD ldb-2.0.5.ebuild 2669 BLAKE2B 20600ca8a56727fd4984e107dfb28569dc850c79c0b719ffa95201d8932916c51e44bc5a0fc2084537c1c4ced2ec290c6f9a16a22f2cf8433fa6f82f862ed717 SHA512 7e75e5505fd1193e3b604b5ea52945342c9264a38b8d2b0d27031a6cf4e291c826ca1945e72cbd8bd600eeba8fa49deebc45a413818f0976e219b166506c9645
 EBUILD ldb-2.0.7.ebuild 2669 BLAKE2B c8ed063507dadd7d69098b2f830e46558ab2e527006c0bd6f96fd2ccc9906cc5f8f9a11bc05943ae21de08d37e16e8262729d25119923c98eb09c6b41b0a0bf7 SHA512 3976d24cdcdd1d6159c80d71ec4bddb25fcf20f2ef2ba5d67a17f4748ff147e1a2d09820417947be6cdf514b83b9129fcf2339a7b83aa28c0f8f0d64c3bb1f92
-MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
+MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index 597078477105..db4a710716a7 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/metadata.xml
@@ -5,9 +5,6 @@
 		<email>samba@gentoo.org</email>
 		<name>Samba</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
-	</upstream>
 	<use>
 		<flag name="doc">Builds documentation</flag>
 		<flag name="ldap">Enable LDAP support</flag>
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 2fd31859b309..a85d52113389 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.21-1.tar.gz 342121 BLAKE2B a0a1958303d38760a49eb2aca11ee84dfc16ebecac37d0b8322f88e078931737695e4a600efef42511bad4e027799ca38d0e3b42527a0b9189035f7a02a10f35 SHA512 9991e5b776b4fe62b7f703753630e8ec4769c043047452d63de08d93f823b778179e4568b8b78c3963daf6219422afc9eb82bcc5b07b7f0a422162037b569e41
 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.21.ebuild 2029 BLAKE2B 52b4450eee896acef06c19b4ce5565739139ded79438b9a3ebbbe4c9e4d6cc37d02410b0d1c39533ff81427479efbdddb97855550a13e5aa8a5437163be3ad8b SHA512 d2b6dd2c454a83be8b2733ee215a24b4d21f200ef4c65aeb7bca293d47b92eb0ca4a69b520b623c1165b18287fefd5d9afdc37bebf75e0b994d91903285df4d8
 EBUILD libblockdev-2.22.ebuild 2498 BLAKE2B 249e31af2e2e8f0d19dc37d3dfd069a32e8bc6ec2d4cc8edae1d232a64c5c844fb5cf97b4e1d648f5b45405e2e0292b2c84ca7dd7fb9542deb0391f3d4a4a982 SHA512 0b54fd3f202027e4c7d95b381ab4503a32cb294a8e3419896621e0c3770b6ed32f7ac87d2aff9c751e3888b9c1ba7885c9275482525ac729345f7eab76f580c2
-EBUILD libblockdev-2.23.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
-EBUILD libblockdev-9999.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
+EBUILD libblockdev-9999.ebuild 2393 BLAKE2B 168e982cd69a773f96a51b5273c7529a885431b06f3c632d27e1e4858ac8c07ef14860aeff54b7c3d5ed071d3ed1b921c87cdc477383aaa066c0c8397ad14d43 SHA512 0f4cbb4d0fbb2cf2dfd300685fd3ef75ef9fe21981f4cd53a5f9b2b659520c7cb8784bc904cd5fd68d10f7f9fee13506441cd085e11b14c4e6151fc9716b1e4d
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.21.ebuild
index 6108db98a24f..896f932d1c63 100644
--- a/sys-libs/libblockdev/libblockdev-2.23.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.21.ebuild
@@ -4,28 +4,18 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit python-single-r1 xdg-utils
+inherit autotools python-single-r1 xdg-utils
+
+MY_PV="${PV}-1"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="A library for manipulating block devices"
 HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-		gtk-doc? ( dev-util/gtk-doc )
-	"
-else
-	MY_PV="${PV}-1"
-	#MY_P="${PN}-${MY_PV}"
-	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	#S="${WORKDIR}/${MY_P}"
-fi
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test +tools vdo"
 
 RDEPEND="
 	>=dev-libs/glib-2.42.2
@@ -56,15 +46,17 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+BDEPEND="
+	>=dev-libs/gobject-introspection-1.3.0
+	sys-devel/autoconf-archive
+	doc? ( dev-util/gtk-doc )
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		escrow? ( cryptsetup )"
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
@@ -72,7 +64,7 @@ pkg_setup() {
 src_prepare() {
 	xdg_environment_reset #623992
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
@@ -82,14 +74,13 @@ src_configure() {
 		--with-part
 		--without-mpath
 		--without-nvdimm
-		$(use_enable introspection)
 		$(use_enable test tests)
 		$(use_with bcache)
 		$(use_with cryptsetup crypto)
 		$(use_with device-mapper dm)
 		$(use_with dmraid)
+		$(use_with doc gtk-doc)
 		$(use_with escrow)
-		$(use_with gtk-doc)
 		$(use_with kbd)
 		$(use_with lvm lvm)
 		$(use_with lvm lvm-dbus)
@@ -112,10 +103,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 6108db98a24f..fb0c5edf2187 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -113,9 +113,4 @@ src_configure() {
 src_install() {
 	default
 	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
 }
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index dfd22127a1ae..d30f9328becb 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -2,4 +2,4 @@ DIST libcap-ng-0.7.8.tar.gz 447946 BLAKE2B a26af2dcdd1af26cf03ca668dc95eed7bc1d0
 DIST libcap-ng-0.7.9.tar.gz 449038 BLAKE2B 3f84e5078d5d443cb61358c49405e4f16ff82a56e1c96d5127b522613b1b5c56a566a01b14b40055eca85f13b37f3d795248a506c54ac4612ab184a94addc365 SHA512 095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259
 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
+MISC metadata.xml 580 BLAKE2B 488341de9440c9cb0679acda14073496a0a1294380aa421496e4c622fa22a1c143b8bbce742214459fccf1825b9c1ef0004c9fec0fc3076b92a88bf557a63361 SHA512 51d670d97a94c8c668a4580bf6106a5b027b4d8d0c2f27ca88a508e60ece5a5390b619f0368c8111f2b843748a9ad31f1804c2a60df91ae1717a2c8b2a7aedc3
diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index e9dd16674835..9aa642f3201d 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -11,7 +11,4 @@
 	utilities that can analyse all currently running applications and print
 	out any capabilities and whether or not it has an open ended bounding set.
 </longdescription>
-<upstream>
-	<remote-id type="cpe">cpe:/a:libcap-ng_project:libcap-ng</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index a5b26b2af959..fe9e460c9c2f 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,4 +6,4 @@ DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219b
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
 EBUILD libcap-2.26-r2.ebuild 2031 BLAKE2B 11a03a442a8859efef3eb93c16858d74292a30384db6a219250eb68f745a647de6431adbb9225c2f1672bec5448978dc35a9edd6581fc502648f9fdd0a992c60 SHA512 1935cba9a14be5431255bd36be8942be541812a1d1610646bee1d659a931f79285179ceb3f44001b5f3061461374b5c2b013693880a60e65d2adaa6df9cef40e
 EBUILD libcap-2.27.ebuild 2044 BLAKE2B 405ef4470f9c2dc7da9034bcbc3abb7863a3ff8c1cf62636a7c5fd7ecca3ee1c2e6871b1b7d7d542c18902400510d60da914255ad2e4930bcb8002e30fbc0f08 SHA512 344bc5bd41b3c499d36cace315c0b93fdf9f05a48effebb7fdb29489de884071904aec29d8531c74c789a348567c743f4dbfbe92a240fe6673dc97de144a2757
-MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index d10107478bd7..56c124413057 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/metadata.xml
@@ -5,7 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:libcap:libcap</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index ce7a7cb9d297..48daa63e4de3 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,6 +7,6 @@ EBUILD libcxx-10.0.0.9999.ebuild 7093 BLAKE2B 9091fed3e48a68383200334296a1a2cb78
 EBUILD libcxx-6.0.1.ebuild 6746 BLAKE2B 616128b9d49049ac6de90b84f89a48c7033f5927edc5e15674df5e3a2225630f59a99c8047c71d9128304d726241ceaa1cefabf8d44e4b2d6a491611f63bee88 SHA512 3df9e7e79b62893441212fe7baa51190ac69f0bf64332718ae53596a043dc3583b8125bbcf7339cca7cf9937aa870ea0d8b12670700962c1cb22892f706e3129
 EBUILD libcxx-7.1.0.ebuild 6747 BLAKE2B 437a08ee7854b3d398c55e20ff790deca0d7c69e1050fc2ed0d0dc00f467c9c3ca3fcd9e4752898adc68c28c485091a016f6d22af202bedf2b2008e62f1b9a28 SHA512 e22930bc78ff7063b75982164effc559c2adcf25b2b126f31c15e51095cba0d14de839cf1265c6c154a7c89bc8d92de62f962946359731f7ecd5ac6f8cb6aa7b
 EBUILD libcxx-8.0.0.ebuild 6750 BLAKE2B 6e03588334d2af0c0ce2e02ff2e7a8f9f9817a494fc6445a4fecfb1381884eb4a92921d7b06d5c12f36795acac5f2ee90a3794665419e9bc6ed2bde99a4f7259 SHA512 4bc27a7e3974d83a661887ca32f414b1697f0470ba8d9505f1ea795537d252cd336feb8a8db71f456821b2d9f38613458af888f530663df78a371f7e1391d897
-EBUILD libcxx-8.0.1.ebuild 6787 BLAKE2B 2c2f67585cdb9f9b0245751447fdd4d01d35e0f16ba8a006943c36a3afe3567499f9e3935c3256b3450cbee08345f76d8691d284ffa97b7f9b82dafaa26bd5da SHA512 e925c66fa0e20663c35d14ce9e171bf4c513657cfecdb17324b814b048a7a9e4de5bc08a6c5ba9179b72d17ce089be570f6be33159a9f9a33c0bcdf32f615bd4
+EBUILD libcxx-8.0.1.ebuild 6789 BLAKE2B de37835ae850bbebef3cb114f51db6af7e04fa76c3209b7a96e8c1ffc1928566e9ee5f11a150d26f16fe2d66440b872dde850771e1b1ed88f0f5095677baf037 SHA512 cc20b84c1d1061dc43713ca71e80c45c9ce3ea8a9212009c98524c467be60e85c96509896c835ed92a6b146e14061c5d018620f5ee6ca0e195d65c5e62ac85da
 EBUILD libcxx-9.0.0.9999.ebuild 7118 BLAKE2B e4af9cd8fdc3728d46feab331acc98010bd7a8b5fca99df215898ba7e38a5001de66c6b215f163d31ea089b0096944c7da976f8c118d561712e810e427a09058 SHA512 ab849d2c0a4ee0a6b7e536db0c96886fc850cb208bb8d60717c9f6c02a1e1b98748256161d25c951d1665b6570244e3db33af672c796a88506ceb9761df0c310
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-8.0.1.ebuild b/sys-libs/libcxx/libcxx-8.0.1.ebuild
index fc365cc33324..cf4bd1b3b354 100644
--- a/sys-libs/libcxx/libcxx-8.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index a09888fabfd7..ecaa99c2f8f5 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -10,6 +10,6 @@ EBUILD libcxxabi-10.0.0.9999.ebuild 3334 BLAKE2B e186dbaf646c165595a73956bb4362a
 EBUILD libcxxabi-6.0.1.ebuild 3172 BLAKE2B 0078aa6ca753285439a17dea5af0c66a991a1844b7bd487c0f51b95d9c8007a4d077515d3282cea8a044692a3d14f869f2b651bed3a7ba5e6acd20629bfd2e5b SHA512 b1168935e250e2a83356061456bef94635a1bb797abeb725f201298de3f6c90e285714799de4d79f30bd33f2a9ad9cfbdad2f4339100023485aee4554c36c133
 EBUILD libcxxabi-7.1.0.ebuild 3173 BLAKE2B 48dda73d243e18c4591910d0f8900b0fc75eacf229f1eb11b9c402897f46a03e89bae5330daffe80a994d526fc612db237d104d9a3c69cef2c910bfb705069cc SHA512 a028cb4cd4381fea4cd487fa44a33bdbd604badfbe8c7e8452c4b19255ef672d11a415ddc4cf087ce19235cea0eac4e479bfb3d3e5d764aa431677d31683a37d
 EBUILD libcxxabi-8.0.0.ebuild 3176 BLAKE2B 709c55c2aedd2490ef6a982f41fa0b3977c1109ef480aba56cbfd248c40027349daa0dd477adefd5c37b8dbac8485cb8ab3c470e440b4be050ff52c0815bd59c SHA512 76237682c5e3d09cd259a03184fc35def96a90ac2bf42efe869be7d2f2ebdde05dca1e9f2efb5a08a41e7b461d4bbcb5dacd2d1ff8d3128ae65a1dfb2683f92f
-EBUILD libcxxabi-8.0.1.ebuild 3240 BLAKE2B c31ce38e6dc350f96d8a5688beb37eb43004236558b49bb848ddcef1a758155d3ba307566ce9da22a1de4e52845f85e927e18a8d3511f05fec95d113e9f17871 SHA512 c44e561bd835ad9fdd4f7401919287ab7013438da269bc743781083919486ee5edec7a36ca409a34fcdf56f3facc7fa1a386fd0d4528ec058b48b7a016c03a3f
+EBUILD libcxxabi-8.0.1.ebuild 3242 BLAKE2B ed19bb64b100dc6a1878a3ace19ee8a44c29402d08c41b37bd7639efb83190ba2dea56b39a50d9bf3be7d8eeb4c80b8ba71404d35593b731c157a50f06259a4c SHA512 2795ce4983faea958c8ce7c439b0d093fb267ed9884697a1a416bf2b918a31b593ab7e5a295bb3fbec8a6259168c40054c352cc2be327e9c900ae44426816f9e
 EBUILD libcxxabi-9.0.0.9999.ebuild 3359 BLAKE2B 647cb17fc54a8a7e909c290420957ba46304346bee82bce9b89b7ac54dc3396ce948747d52fd3d0985aaafc16cce9421b4959def28a7ab3a855db0e20692bc1a SHA512 387434299ae97fe288665d447b27ab56ce40e85a53f91157d51a5d3070bd9e87e3d24cc29a3aad6b9093715e0fdbbca1b35a3f0c79bb1d657be9e63a4bf0a223
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
index 5a7293530038..9a5bef364e69 100644
--- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index b5bb23971b29..3e42c146d085 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,8 +1,8 @@
 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.20.tar.gz 186750 BLAKE2B 758482a41254d6d14795efdfb2959248af2ff00bc6cafbae9b2002b7eaa50921a72ef928910bc0d2061a414e9c73346848eead108af077c96429870c734495aa SHA512 817fca3f8e3b127b9b877e0a03d0a94bf0c3ec481d3becf995986ce6ae0532629c5460100eb9f2ef3452ed59a3b9d3ac8362df8f87b387803c36d35ab7af0902
 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.20.ebuild 4461 BLAKE2B 4ba750e430f3c3de3282fe628a3229d58af3f2af9ed2f795e5584e967d34b6a3ef5158cd0f29c2f78d5400ed1ddaff391847b3b180687e21957880f03731868e SHA512 c8db19646892d790c08abd9e577c96bbfcb52de3e45087782a4019f0f5fffe0311079b5d8e61e96a75e5af56d3e9b0961e6a3d0b43f3d29ecf57c85fc12ce108
 EBUILD libhugetlbfs-2.21.ebuild 4068 BLAKE2B 903b0db5f72e4926e8185d15bc4ad970fc77926381bdb6ad0205aa9bcbb7fe6a8936f38a4b783d2a418ad0523ca045cca45db7ed1650e892edd58db1f04de233 SHA512 9df56b646c5df82903a03562e7de61b019d3182a9b8d9b24506ad3bd0edf2ba68b4cd00ba5c47410c8f60876d0fe79b360b50d6c40f6a08d9db6c688cfbfc36d
-EBUILD libhugetlbfs-2.22.ebuild 4153 BLAKE2B 3079451b1dd71059eb955d6ff8a3c08986176fdaeadfce9358b56deedd011a23a301cf80eff014960103a08802a77ef8327f0394e38c9c94a89550a45bb876a1 SHA512 a77ab0a980a286945b1082cbcfa02a7c984d16be555bcfc50b9b2f2bc4a4c1cae45bb93e304ad9b3970e59624d52624be9806c20d576ab41d791d916ae7a2e56
-MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
+MISC metadata.xml 484 BLAKE2B 8f4e5877068e5af69e5a53695d10c44fbc899eb53f3128c41a4cef162ce3c0213002c169c6d7e89fff6a39126b3e387f565480e1ef2323b354a2c6181ecb8167 SHA512 0dee09cbd2ca1a730dbe2a3c62ef1099959ab307c96f3106c483854310430dd59b45a7135a2db56a28684b0a4245898341527b1f67bb335456c8cdc14ae611fd
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild
index 34b969c3fe3d..c3c800361c4d 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="5"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 )
 
-inherit multilib toolchain-funcs python-any-r1
+inherit eutils multilib toolchain-funcs perl-functions python-any-r1
 
 DESCRIPTION="easy hugepage access"
 HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
@@ -14,16 +14,17 @@ SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="static-libs test"
+IUSE="perl static-libs test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
-)
+RDEPEND="perl? ( dev-lang/perl:= )"
 
 src_prepare() {
-	default
+	perl_set_version
+
+	epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
+	epatch "${FILESDIR}"/${PN}-2.20-noexec-stack.patch
+	epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
 	sed -i \
 		-e '/^PREFIX/s:/local::' \
 		-e '1iBUILDTYPE = NATIVEONLY' \
@@ -31,7 +32,7 @@ src_prepare() {
 		-e '/gzip.*MANDIR/d' \
 		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
 		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
-		-e 's@^\(ARCH\) ?=@\1 =@' \
+		-e "/^PMDIR = .*\/perl5\/TLBC/s::PMDIR = ${VENDOR_LIB}\/TLBC:" \
 		Makefile || die "sed failed"
 	if [ "$(get_libdir)" == "lib64" ]; then
 		sed -i \
@@ -52,6 +53,14 @@ src_compile() {
 src_install() {
 	default
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	rm "${ED}"/usr/bin/oprofile* || die
+	if ! use perl ; then
+		rm -r \
+			"${ED}"/usr/bin/cpupcstat \
+			"${ED}"/usr/share/man/man8/cpupcstat.8 \
+			"${ED}/${VENDOR_LIB}" \
+			|| die
+	fi
 }
 
 src_test_alloc_one() {
@@ -74,17 +83,16 @@ src_test() {
 	einfo "Building testsuite"
 	emake -j1 tests || die "Failed to build tests"
 
-	local hugeadm='obj/hugeadm'
-	local allocated=''
-	local rc=0
+	hugeadm='obj/hugeadm'
+	allocated=''
+	rc=0
 	# the testcases need 64MiB per pagesize.
-	local MIN_HUGEPAGE_RAM=$((64*1024*1024))
+	MIN_HUGEPAGE_RAM=$((64*1024*1024))
 
 	einfo "Planning allocation"
-	local PAGESIZES="$(${hugeadm} --page-sizes-all)"
+	PAGESIZES="$(${hugeadm} --page-sizes-all)"
 
 	# Need to do this before we can create the mountpoints.
-	local pagesize pagecount
 	for pagesize in ${PAGESIZES} ; do
 		# The kernel depends on the location :-(
 		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
@@ -107,9 +115,9 @@ src_test() {
 		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
 		einfo "  ${pagecount} @ ${pagesize}"
 		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
-		src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
+		src_test_alloc_one "$hugeadm" "+" "${pagesize}" "${pagecount}"
 		rc=$?
-		if [[ ${rc} -eq 0 ]]; then
+		if [[ $rc -eq 0 ]]; then
 			allocated="${allocated} ${pagesize}:${pagecount}"
 		else
 			eerror "Failed to add ${pagecount} pages of size ${pagesize}"
@@ -122,9 +130,9 @@ src_test() {
 	if [[ -n "${allocated}" ]]; then
 		# All our allocations worked, so time to run.
 		einfo "Starting tests"
-		cd "${S}"/tests || die
-		local TESTOPTS="-t func"
-		case ${ARCH} in
+		cd "${S}"/tests
+		TESTOPTS="-t func"
+		case $ARCH in
 			amd64|ppc64)
 				TESTOPTS="${TESTOPTS} -b 64"
 				;;
@@ -141,7 +149,7 @@ src_test() {
 	fi
 
 	einfo "Cleaning up memory"
-	cd "${S}" || die
+	cd "${S}"
 	# Cleanup memory allocation
 	for alloc in ${allocated} ; do
 		pagesize="${alloc/:*}"
@@ -154,5 +162,5 @@ src_test() {
 	# --------- die is safe again after this point. -----------
 	# ---------------------------------------------------------
 
-	return ${rc}
+	return $rc
 }
diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
index bf4a9ce74b49..534f22e29cc0 100644
--- a/sys-libs/libhugetlbfs/metadata.xml
+++ b/sys-libs/libhugetlbfs/metadata.xml
@@ -5,6 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="perl">Install the cpupcstat tool and some perl modules</flag>
+</use>
 <upstream>
 	<remote-id type="github">libhugetlbfs/libhugetlbfs</remote-id>
 	<remote-id type="sourceforge">libhugetlbfs</remote-id>
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 7611fe7e3605..cbcc79b8e213 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,6 +6,6 @@ EBUILD libomp-10.0.0.9999.ebuild 3146 BLAKE2B 73737d981fa62ec452a2b2810ac3740d0c
 EBUILD libomp-6.0.1-r1.ebuild 3261 BLAKE2B dc43e11cbd716285018a3857b33378715338350269cbfee3292c44ebb0d10584ea1f505962c34fc9c5a58771d6abb52f444467e79834e9a04d594c914af46a2f SHA512 eb901f8810fa552cad6d6510f54f30824a1d7f7931ccc1cf6bb02a2ed22a9e9af3d924bfbc09921510d2972ac4ca36fb1df4d6b7d52342a346fb8b5cfa0ac436
 EBUILD libomp-7.1.0.ebuild 3263 BLAKE2B c1ac92a7713abe0f53eb0cd60703bba001e99bd9d371af06b5ac595be438b6dbb9a2bd638026aab9c231c3cce032be487e25ba8d778afbc8220857341c910abc SHA512 554b946498e2699bbdcd99f313b03b23b78494adc1dd06ea4540b68304a58c8f25b2c619313ea5fc76be089f63fd7bd7e8e9bd2d95297342cc8b95a69aaa794f
 EBUILD libomp-8.0.0.ebuild 3266 BLAKE2B 8cd6a5dfac53b82e0a92d647ae9b453a664f5b5fa8156c8185ccecf394f313ae826e29634b14126a53ce36498c485b658b36141ddd5895635437b59beabea001 SHA512 6fb36d649ce586f638f0846e26d7346ae9faeae571b1e61b2509b810a04e899b63293653d6b3af51924cbd2c1477f359b8e004f57cedf20385698eb8657caef5
-EBUILD libomp-8.0.1.ebuild 3294 BLAKE2B 61f29cea622b3567adc2965e6d26ec653eef77626d43f9efd4d0df8ba9e7b8560b175683bca1599534a0a6a562ed8c0f6d2c64dcee6c3080e75c8334681ef087 SHA512 875ec813db0adc37fb18890e5d4f27b3b6ef192347008e87b813a46b428fafa9cbf3bb5efb6e3cdd91a187a41188b0f2b6f10ee3fdbfce0c0f9be42f5f30f0d6
+EBUILD libomp-8.0.1.ebuild 3297 BLAKE2B 558f0d747ad1cfb8e5f2e3436a20e8151eb53c72df550fac88675c6ff664127f009f55ab10b8b1d646e0a19454795df603d2c47b7c7c05b7b34de5a6c929785c SHA512 b4ef0557edd709b18fcfea3ee08fb19e48089e985daab2488936e1f8f63ea42b8de993c8a23b5c51a9c54385f0b87a56ccefd47b43eaa9c53d2ca5d6f0df034c
 EBUILD libomp-9.0.0.9999.ebuild 3171 BLAKE2B b4891226a8c35031dba8ab4fe7ab5fbb77b41527652b8095bc2350affaf760e026408912a9dcbdb02891fdd9824c51c1e8055710a7ec814aaa858229df871561 SHA512 02c305620b8f83888627fbf3dc8e0040e9343c76e943c7bccbb061941ec0ba94827e659eb97a865fa0c444b9bc0fc17b041182aad63ff4f27d6050366931b3ec
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-8.0.1.ebuild b/sys-libs/libomp/libomp-8.0.1.ebuild
index dbffc3de51f6..9272c4a89352 100644
--- a/sys-libs/libomp/libomp-8.0.1.ebuild
+++ b/sys-libs/libomp/libomp-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index e7ad3c880f24..a668cdec05f0 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,4 +5,4 @@ EBUILD libselinux-2.8-r1.ebuild 4185 BLAKE2B 215867146c515772f63c579ac9d3cb5e65b
 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
-MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
+MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 92059a54b96d..537e0aa97df3 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for fcontext regexes</flag>
 	</use>
 	<upstream>
-		<remote-id type="cpe">cpe:/a:selinuxproject:libselinux</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 9aaa84ab9c61..d68e37f81eb9 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,4 +3,4 @@ DIST libsepol-2.9.tar.gz 474861 BLAKE2B 2d0941a003bbe6f15f047e3e55ce4561c36fb494
 EBUILD libsepol-2.8.ebuild 1121 BLAKE2B 5896f2ea478008922f39d26ecf6fe7570952f2a74b327f25c9ddcb682b9609f47ee9b6fee2f65272393d249724489685ec5431c5b2e13f2deec7f8ee1057aeb8 SHA512 909747386f07ada18df34d5b89168efbe83999bacd969b17f20dcf4f23e2d525a6bd5006dc94d9e52e57ba94302364c6f2c114a92091167729993437d894e45d
 EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
 EBUILD libsepol-9999.ebuild 1103 BLAKE2B 98191cc3a9bc03475f9832eb55f8152dcc7f1b85900babbf776f468e452e7eaaca9f6292f875a46c637769c51cb30d0c466bdcc94d7f28151ff342d3e8809d70 SHA512 49d14f6550df03cb0eea70c495f6ca1680ca2bc6ee9c4231bc51b88d56ce02ee143491283be4530606d090938bfddea033f4ef483cae8a1e88c470e460bd0aff
-MISC metadata.xml 495 BLAKE2B 2cf1b786b99f7cdcbf7e393957ee741ff23b69c4f2d326f306e3576ab7e17eb17148c1f34d32797fa669a05506eee0d86ba7c9b41c24c62f72aaa2b7d97ecdb5 SHA512 bf55f1da0e997ebc521b5c74f9f721e38971630e9201a6c8aa458e44291c8480eef082b526c746b20ee7335a231fa69ac9d0f1953ee8cd5a63a1c2346708de1c
+MISC metadata.xml 428 BLAKE2B 5e3dba085b9d5cf181fd548681975f00f888a6bb02b688eaa088a3668acdfb5def36af8c0e1085ca8785b7c503c3b797474724097fb24ebb1acc9c1a4c4e9a0f SHA512 14093ec1e86ac7b7521ab02ace725347013e11628e22cf3ed5362cfe7f30a180374ab00747b58ae251afbb3fabbeb4e328bda798e512bfac9bad643206835192
diff --git a/sys-libs/libsepol/metadata.xml b/sys-libs/libsepol/metadata.xml
index 1ff444ab65c6..ef117d5eac5e 100644
--- a/sys-libs/libsepol/metadata.xml
+++ b/sys-libs/libsepol/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<longdescription>SELinux library for manipulating binary security policies</longdescription>
 	<upstream>
-		<remote-id type="cpe">cpe:/a:selinuxproject:libsepol</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index 2982fbf22968..c0a5da94c8c5 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -1,4 +1,6 @@
 AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a6fca5be942b6381413544ae139c7f79d74f8e3fffd231423cf3f7a5d7468579f0fa567156fc83a3e6421ce9fb81c92 SHA512 71908cdac0684e4b6fae04f30156ca390d9bd525467f0954e94b5725e9ef5fe368cfd78ece333d8ffca5e02fc33b66e993655960a3cd1b9667a479be73943b6b
+DIST libstatgrab-0.17.tar.gz 463224 BLAKE2B fff9f0833a0320de469c81d1dd10a62f0a81413a243c38d449ea8129a4635f55056d431f2b585b5f77082829438c8945d961c4a6ca1db13e0b4c9689bfd47905 SHA512 feb8d8aa345d57a9036700d580a7d1e21aed9bb2063b46b2c57a59fce00eb20a22590e5e391c8a9a1f43055c14a6ce3fcf648b98f1fec3b4efd270455a2933e3
 DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6
+EBUILD libstatgrab-0.17.ebuild 778 BLAKE2B 9224ab5e5289e48c6a6db42f38a00e4fff96dcbc96e2ae962c89b20f40882650ad297bc6047ed0355596725e1d9e792d8f105c905878ad026ef0ebdc740da126 SHA512 9237601a8660cd0f9490edcb0cbb7e57421db3321c190a9bf66a6113461da060d6237b92f8fb56b8d2d2a8e467f4472042fb46db4bfc2e46af65f12f0fcfe5f5
 EBUILD libstatgrab-0.91.ebuild 1028 BLAKE2B ca1d27101a697b2fe9ccafdcb3537df1a9a31a2a8ce42b64827b3d6cca0a64fcb1b1c86b798879de66ca1eecd7b491c482961e7090216399e190e99122b6946f SHA512 20baae8873265e26d344c5dbac272ca1c7e5408546f2e70b21f7017e5219ad0a36a52e37a911d897f1eb9141477922193f4decbbe66392b26b9ee8cf1ba8aeed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/libstatgrab/libstatgrab-0.17.ebuild b/sys-libs/libstatgrab/libstatgrab-0.17.ebuild
new file mode 100644
index 000000000000..b4bbb0eaa85f
--- /dev/null
+++ b/sys-libs/libstatgrab/libstatgrab-0.17.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A tool to provide access to statistics about the system on which it's run"
+HOMEPAGE="https://www.i-scream.org/libstatgrab/"
+SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT=0
+KEYWORDS="amd64 ~arm ~ia64 ppc x86"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog PLATFORMS NEWS AUTHORS README )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-setgid-binaries
+		--disable-setuid-binaries
+		--disable-deprecated
+		--with-ncurses
+		$(use_enable static-libs static)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 6d4129e46770..e0660959ceaf 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -14,6 +14,6 @@ EBUILD llvm-libunwind-10.0.0.9999.ebuild 3918 BLAKE2B b337caa75a19e0ecfaeb21a070
 EBUILD llvm-libunwind-6.0.1.ebuild 3738 BLAKE2B 5c58eb49bac3d30643ea2d82f5e59add83fff5154ab335180778b3c7c9e7cf87b2423ee76401dd25a2fc89f5a492440236ad47328dcf05af87d4961c2c2f1761 SHA512 712fc6d98152c397f7436ffbccf62646ee53e14a5b9fc2c491b3c0d8dcfa40e81b16a4d9b7d5b1d81769282ead75d93994606fe6cf3ee08d80eaa5707f182d8e
 EBUILD llvm-libunwind-7.1.0.ebuild 3739 BLAKE2B 160c33fd885e26e19ad02304ee792cb26868e92bcce527246e726e5415c63c071cc72858d35bf4d03111d0e85756b744e00f4f0ec89523232e088d3342f61adb SHA512 260d39e26ae10d62261c2cd348ec487cdc8950997c04b73b3773482fb8f54cc5518dfff58943727892fb7ba57752e1bfe785b2b621c4f00f3bdcdd909ab266c8
 EBUILD llvm-libunwind-8.0.0.ebuild 3742 BLAKE2B 2284e1919e3a6dfacafc424dd0c7cf43f1eb5810ca061096801867397b40989989c4ededb3aa60261046313df3064cece909a2f9343d2225e9e7e273c7a693e9 SHA512 69d4b2bcc157f2851a1b88ac0db3a18391b1e1bc8867f7725804133fd8b91cd128299c182c7d718c98cfb062d456d14181f9fd2885cb2c32e32bb3b96843728d
-EBUILD llvm-libunwind-8.0.1.ebuild 3839 BLAKE2B 0848af60069baa7ca24cbbee003ff13f30998b3bcd79b8518eadc24cb8847ae9de708714379e07607596b83e19ff90467727c670d09ddf0deb21d10670af5ee5 SHA512 b571e7b235fb1e001483a58310dfd31f21a2301cd6fb4d552c4d136c79e62040ca7b72016da9c1a6e04cc04b81a891d4313b0c6da4a37103619d006bd204beb3
+EBUILD llvm-libunwind-8.0.1.ebuild 3841 BLAKE2B d4d2346264a5bfc924ad9cef8bf55f5021074597a81278f175c40410fe3edefb5738e56eebeb82053aa325a7d0b2af545f057517af71420e8bceca2988b8921a SHA512 fe53dd13dd8db83812ff9b4ac91c8b486edde12b59449ca2259b3ca52997d31cac137bf57f05641d2e771f5566f83f6d809a88711e475320a7894f629c2abfdc
 EBUILD llvm-libunwind-9.0.0.9999.ebuild 3943 BLAKE2B 0f310507cd16f7f1a9d64feb41dacc26cbf89d91e2ff8f246e152315e871fab99ae528e4500188bfe0cde00b4d9a6eaa2332e39ee32b7c30409ae809d5044745 SHA512 4f6fb06a1b6c72b36293d243bccc15d8c457a5b2b5cf0c0b6fbdbb1dbdac2cfb6b56c71931e2347e0c41182c3766832bd73e56892534c5cfad2f1d13a59de4e6
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
index 87598c46ded6..48723607244a 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 13bd9f58b956..24f3dc20b435 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,4 +1,9 @@
+AUX lwp-2.0-amd64.patch 866 BLAKE2B 231e806f36c17ec0501e0ec646f16093408ecd25bf612a29a0cd34550c966f53b891d1f2522cb810a2fec9661cef2be9747537a17e06f6e8f6e257dc7694eb50 SHA512 f66c3d7111673ddf503a8ebd82fe22db9bf92dcc4bb7d9ce8fbfd3c65fb699a4f240c04700fcdb08c582a4f2be8da7ed870ba07cbc3d81110b2fc29f69028dd0
 AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
+DIST lwp-2.2.tar.gz 376136 BLAKE2B 2f80ccab5cdc7e910a0ae41416a24a8fd2a6da86799f1393b23fb570d61e6973aa4ebc70fec8d3343465bbc5eea1280fa70d14ca2678d2b2d490333b5cef2f2a SHA512 a5fa52c0483e04fdbface5f0e9cc85bab5db59c4d730a3cb3c538ccaa3a88aaa916b37478e4c5450e77bcc45638987610ba619995a75541d728f138f103c5d7e
+DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47a1e58375775a80c96b739cc17acf6aacf3b161e53445d947af341a555edbd2cb8783741075bfacaea43 SHA512 ad8374ddf55ef9fddf9ce0b8d7c2ae0dc206e5108a01f278a37486070ab70e5bd7312f057863254b4fc430cfbed2c36f589807813e6a99067933142d5225395b
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
+EBUILD lwp-2.2.ebuild 743 BLAKE2B 9769b2d8bef4dbac08721740c7a06c0546f2db5d54e6c8277bfa4505b331910cf04a72af56b01af88fd5ce21268865ab4cdb048e95e2e1502efef3add1199e93 SHA512 a0f6b1911cf58893fcf81753e43f41c25d8e9151ad15189cb3e99fd432fbd2d6761002887a2df52e3479a70e1f292486ee61835d9802bdb686ece8228a052c16
+EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
 EBUILD lwp-2.8.ebuild 522 BLAKE2B fb5f3ed46c3f5b025604f6e64d43fbad5d173c9319cfbe2792bdbf452a2525f71a4501ccccf3d89edd84ba7fb6f148faecfa00f6f3a2c95c48f69c17801ea38e SHA512 7f57ee9faeef1bfc493c1c6c7ab6b7aa5a6131d7861b0fa5aae82231103bc727a6d60e43206eacd22b029750460a4b8b71526ab32a567807ff1b24b85979ee58
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/files/lwp-2.0-amd64.patch b/sys-libs/lwp/files/lwp-2.0-amd64.patch
new file mode 100644
index 000000000000..64a1576f0894
--- /dev/null
+++ b/sys-libs/lwp/files/lwp-2.0-amd64.patch
@@ -0,0 +1,28 @@
+diff -ruN lwp-2.0/src/lwp.c lwp-2.0-fixed/src/lwp.c
+--- lwp-2.0/src/lwp.c	2005-03-25 17:50:56.000000000 +0100
++++ lwp-2.0-fixed/src/lwp.c	2005-05-05 14:32:56.580753096 +0200
+@@ -463,6 +463,16 @@
+ #ifndef MMAP_LWP_STACKS
+     stackptr = (char *) malloc(stacksize);
+ #else
++    pagesize = getpagesize();
++
++#if defined(__x86_64__)
++    /* [gb] Ensure minimal stack size. Heuristically determined
++       through tdb test that 2048 is too small when printf() et al. come
++       into action.  */
++    if (stacksize < pagesize)
++	stacksize = pagesize;
++#endif
++
+ #ifdef MAP_ANON
+     stackptr = mmap(lwp_stackbase, stacksize, PROT_READ | PROT_WRITE,
+ 		    MAP_PRIVATE | MAP_ANON, -1, 0);
+@@ -483,7 +493,6 @@
+ 	perror("stack: ");
+ 	assert(0);
+     }
+-    pagesize = getpagesize();
+     lwp_stackbase += ((stacksize/pagesize) + 2) * pagesize;
+ #endif
+     if (!stackptr)
diff --git a/sys-libs/lwp/lwp-2.2.ebuild b/sys-libs/lwp/lwp-2.2.ebuild
new file mode 100644
index 000000000000..85cd229c0241
--- /dev/null
+++ b/sys-libs/lwp/lwp-2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="Light weight process library (used by Coda).  This is NOT libwww-perl"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/grep
+	sys-apps/sed
+	sys-devel/libtool
+	sys-devel/gcc"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Was introduced for bug #34542, not sure if still needed
+	use amd64 && epatch "${FILESDIR}"/lwp-2.0-amd64.patch
+}
+
+src_install() {
+	einstall || die "einstall failed."
+	dodoc AUTHORS NEWS PORTING README
+}
diff --git a/sys-libs/lwp/lwp-2.6-r1.ebuild b/sys-libs/lwp/lwp-2.6-r1.ebuild
new file mode 100644
index 000000000000..f4206728130a
--- /dev/null
+++ b/sys-libs/lwp/lwp-2.6-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Light-weight process library (used by Coda)"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	eapply_user
+	# Was introduced for bug #34542, not sure if still needed
+	use amd64 && eapply "${FILESDIR}"/lwp-2.0-amd64.patch
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index efc0ce06e987..5c90223df3fe 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -6,6 +6,6 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b
 DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
 DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
 EBUILD musl-1.1.22.ebuild 3240 BLAKE2B 756ce888342f6b9f7501873af701bad4e4b429fcd11a9713e168da63da641d0fbef39a25d002a88f6d988a6a1b0e79e24cf042acd56a1903b95905cd811ecda6 SHA512 c7b779730e7c5b56618d0a53cd70e02e4f3e9f443c91bb59237fbf72dea1f6d7fa2e480312114b98db012ab4e716d0ef1481019788389edfc21b56c1245e28ac
-EBUILD musl-1.1.23.ebuild 3242 BLAKE2B 2d7c121e43f3f3dcc39daa3a27049ffadce81db16b055c5807c7a7ea7e62cae844145d2f4a737b92ce5c5601a3b494726a842105b983a050a2dfa09763885a76 SHA512 a0b7e420307c6350a7ffc1f026bf41de5c8692c7791b7c7941902ebb6f4427a2b0ce039acb983ffd8b0c8ae7df76ea2d224ead0b8f931fea41f566a3204d6750
+EBUILD musl-1.1.23.ebuild 3243 BLAKE2B 8b71faa27471cdd6e645b15fa3d9e08f0076d729262c27e7b132c329344d4a30513a18f1fa6997e5169fb95eeed25e5ce6b6657bdb42aebe2ff098c0bde5eae4 SHA512 3b261897998feda25bd51d0983b664071dbb3f4607dc849be761b4a319aa9e325d1c0a5f4d61f8580d3d248cba58172fa96e5d727b2d9728c7e03269de9cc70c
 EBUILD musl-9999.ebuild 3245 BLAKE2B 96b025385b2f8cdbc66a91bbe4bcabdb6daab5fc6dff29f4f78b10f0d02daa2c4f4ff9546f55b67fba4552c3fdfd3ee6deaa21dd2b4f52b95a114070cee587aa SHA512 8a789f0d2988be8567647258a45989b708c9d50f0fdae020160931af140c6566f68551ff4ec423beaf9a9043490888c2a99b80cfd826a98d46553609b7994de8
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 36f4183156b3..19c1029a0454 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.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}}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 3f67676c2050..b60a067747e9 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -16,4 +16,4 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249
 EBUILD ncurses-5.9-r101.ebuild 5287 BLAKE2B 7429e04203c35510eec381f3ac1fe28292b191c1b0d3f37d467e97b90c3d53d03a564745a1cafbb6a6032a895af7cc4e172afd9d91ac9315463786f545117e47 SHA512 98daead57237d72df9450e95d75f25949cb0056973e29801f06bb6352e66b3e9d94212c555a72e6fbef66fa778a74acc2c2a5a9027bfda719593acb062356df6
 EBUILD ncurses-6.1_p20181020.ebuild 9288 BLAKE2B 5e37b4794b93a896942a7cd2510e1696128bf4b3d9f84be6016a1aaacc6a9a1c9fef134c4ec2812541720863dab20fa303582eb3ad3a41dd55b4da7cb261c9d4 SHA512 07fccd57e13ef6732a69c0bc1865b8f6d446097f919fde7d830469867cc15f791e4692f2b051a9b37cc39fd1d9f2d5234855404242ecd284b5f5a8f75573a612
 EBUILD ncurses-6.1_p20190609.ebuild 9497 BLAKE2B 7e273a1ebb12f343e92e822cc72d944aeeb10deb356de599d2e3141454ec443445ac21812e185e2e67bbd659baf037ef0f2c17063eff5643d661416039a6e066 SHA512 63e9874446bf271fa3341f707c76a5eb06f4c7388e788a24666e2605ea1f7a0f42dd58a4f6ca735c107fb43558d279dde58009dd049277f9e2c377ead2df9254
-MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
+MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index 1030e9cebbae..888a6adf6636 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -14,7 +14,4 @@
 	</flag>
 	<flag name="trace">Enable test trace() support in ncurses calls</flag>
 </use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index b4988e81971b..5ccf5159a40d 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -50,4 +50,4 @@ EBUILD readline-6.3_p8-r3.ebuild 4390 BLAKE2B 2121e1c1d5b045fa0ae14db133a80e4b52
 EBUILD readline-7.0_p5.ebuild 4843 BLAKE2B 77f5eca75e11a2a2c3de59020a3030593670e402c2c58efe786507a3cbbda015f9714f187434d53eeb13b9d47a3fb8ae9f2a032c67272326e076fe56c44333cb SHA512 b116fd9a52913d615845f23ab5d37bca0b478b03779ed7aa229dc929565e47bcd757625f636088788721debd43171e133ea5f40e685918f6df519dd670e7db78
 EBUILD readline-8.0.ebuild 4812 BLAKE2B 34c5b37ae51086570439f333067a8276f2160c9ab7d2b6e1a4639164ce9d199b253689dd69beba935231b251729b8af36ee938c12bba03d1440ae463b8f8f128 SHA512 c1afbacd9c1297570a6c8a116faad750a3236e25b7ec30bf2861492e0c3578d2002e9995c11aa9cce86c88cb5567c89c6f9b6343fc4d57f98a5edf5bb8e83c3b
 EBUILD readline-8.0_p1.ebuild 4840 BLAKE2B d0dddfb82d703dd45801ff9079861a0213cb11063fa7608a195eb30b97b4d7e635eef028ff8f17daf37716b701ce514284bb7422ee5720c2bbcd7203a42dec1d SHA512 a8079e8578f0cc5c7fc616a76d69135fb3e95965328cd38097398458f760f812612951381b143106612f316068871a941d5d0c1b3ec396fbc457f4fd902e79b4
-MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
+MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index 6bce63269f8b..49d63436c4b4 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -8,7 +8,4 @@
 <use>
 	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
 </use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
-</upstream>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:49:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:49:31 +0100
commit	36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (patch)
tree	d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /sys-libs
parent	a1392efe64137262023d92492396ca9156d22396 (diff)