3 files changed, 2 insertions, 101 deletions
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b879f397368c..bd3dca27d045 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,9 +1,7 @@
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
-DIST compiler-rt-5.0.0.src.tar.xz 1507996 BLAKE2B 7294b7c4fee6401baaf2a9c9bd22d3f94d57334575ae0d5c599b613990d6f139b72acee8c2c66f6c7bc17378d5258290e749f691cc6c6c5bf9f204e3a76b37a0 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb
 DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4
 EBUILD compiler-rt-4.0.1.ebuild 4138 BLAKE2B e13bd10d0709bd482064b110742f7714306116e27c8123a3f61a446dc3a10e5de688c4b0ff0b5e43f392032c05e5abf8b1d429e9351090691e56c204c2341bed SHA512 76e4ca5084fa6c4e909cad6327d8e59a9a5ff8e88f6d7800c65ea0b19e464408598eb3c7e950ddc72b882dcb332f0ac094b15a3081739dfd0873a998e27d9bfb
-EBUILD compiler-rt-5.0.0.ebuild 2465 BLAKE2B 673b049f9f286223d377fd1f339e3d6854b9833cf8009b646f63ae36b4c885463d8f072332e19591e937b71f3189388353310599d903a8bd062c53e88a706869 SHA512 a6b6cc988d66efa33917031c30edac1685a2421250182b74e3ae50f86ad30e60b088b43697d256a77cc3e5a0ca44dd111801dd191f20563e35c5620f5d28580a
-EBUILD compiler-rt-5.0.1.ebuild 2661 BLAKE2B e2a9e0d2214676c52662e253f55d8d38c86c6626cdab73356fcf33218feb72eb5337c5166d32e3404401c65a739b1c458d4aa27bcf77b3fe4c56b40cd2b02112 SHA512 db193c5551f57d3bd30487a8bf6beb6cbef00aaec804a776d38897326e8c1204b1252558fbe912e9bcb6e6d603deea1d028c9e4ea26d1a6714a6ba9615d07c90
+EBUILD compiler-rt-5.0.1.ebuild 2660 BLAKE2B f67e722c35d6d5908c12b175f99aec5899435890d92421d5eaf4bdfd53dc3c335da8904a317c4f937ec281f7f3ec22ca4b3c9c7babd0fa65e6dffcf5456e8f9d SHA512 8a002c63f12f2dc7b6f5cd8052879b4c8c4381f4aa4bfa2e72b931d820ffa353bcc927a46ac7832790d8124d8e6dec23e71c2faf91805c174267f12cfc055f5d
 EBUILD compiler-rt-6.0.9999.ebuild 2873 BLAKE2B 419ddb09e6413ac6a8948b7bcf43ecafd6fb822c4d54b74e9197cdcb6998a288d223429c82592fc580b3cc528daec003072523c7a32e3ec97b2ecf1daea42dfa SHA512 2a0814fdb3e2258f13fbc6c8ae1014e09bb6b680f7b784f6071f6edc08a95b5aa3b97abe9e32c83655d6ed590bbf29bd4f8eef8f44fed9ba385264b46bca91d1
 EBUILD compiler-rt-9999.ebuild 2848 BLAKE2B a44e7b05cacef04284cfdb7a1f31c48e85fc726da666479ca222605cb804c24900b0f360de5ef69065d3ddc4bf5d150a86980948d5340aa34b1295358bd2ce7f SHA512 9312c69639d82f59c08ceebbe062d57f12675772e9f3cb980c0328fe185e16300351415f91b12ccd3063c7d61ad739a45d11460e951a7640a07452633406c8dd
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.0.ebuild
deleted file mode 100644
index 9b135a41b328..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-5.0.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 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 ~x86"
-IUSE="+clang test"
-
-LLVM_SLOT=${SLOT%%.*}
-# llvm-4 needed for --cmakedir
-DEPEND="
-	>=sys-devel/llvm-4
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${LLVM_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 test; then
-		mycmakeargs+=(
-			-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_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-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
index 020ddaac8475..dac697f44682 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 
 LLVM_SLOT=${SLOT%%.*}