gentoo resync : 03.03.2021

5 files changed, 9 insertions, 136 deletions

diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 9524a4b8ea8e..700406f00083 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -3,19 +3,17 @@ AUX 9999/compiler-rt-prefix-paths.patch 0 BLAKE2B 786a02f742015903c6c6fd852552d2
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
-DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
-DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
-DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
+DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-10.0.1.ebuild 2759 BLAKE2B ef75dd0b6d96bf2dfb562ac59bc6bbb8aebc69684dd3acf302b4700fad90fd80e62088b0c141aa23958ec7f06dafd01f6d5f451b4c995fb01541eb1a39dcb127 SHA512 51a5c6fcb385651f5d91d5985396f176fc7405fc4a95321a8ff896f8c22b922bfc987aaa5462a6be3df3ee2ac179633226e97955b4ffd486ec414a4e82e9470c
 EBUILD compiler-rt-11.0.0.ebuild 3541 BLAKE2B d9847d05f37311727267169e5798e2cf3af779a565776b273e0041434774cbcf9544a85fd5ceef555326f59a94ad2a1978581529689a6c46d160937dbd2d7b8f SHA512 940e19da15e1f9af55e978155152e3ee65216c16cbfd96b32a0ffee2df5f7bf1ab1e14b3f214df858b116aec810f9ddef9a5c21d11d3f33eb56ea16116d69e7f
-EBUILD compiler-rt-11.0.1.ebuild 3548 BLAKE2B c1f96cde71af8b605056e827c750c5dfe07382ecf494dca1f5d689fc3a8caff18d8ac595f6d47b7b9f9fec8e7cbba3ddcbb07176958ffacd541b314a3baad587 SHA512 bafd2287d7d07ef083e0aed54f76d8c82d7fa317a5432cb9e1ad8c05bbf78c6577178d42e278dafd92bb0f0803031c25038c0870a51008ca7b22a396ebbfde8a
-EBUILD compiler-rt-11.1.0_rc1.ebuild 3476 BLAKE2B 8b77c7494d3b360ca64b15b2909ab23a6884a2769d8985f446541fc513f16c0ede5671f01c0ae7c39b1f2ee964d0139df0c83d9de0c28080fa170b0695856295 SHA512 05871f00567f79ff5f17f19c7ddd21042b4c230819a1c7dec09e0c6072b45c7c773afa20d06da1880fa20ecd43b1b97b9d1c8a69842d31ca62558c480198d20f
-EBUILD compiler-rt-11.1.0_rc2.ebuild 3476 BLAKE2B 8b77c7494d3b360ca64b15b2909ab23a6884a2769d8985f446541fc513f16c0ede5671f01c0ae7c39b1f2ee964d0139df0c83d9de0c28080fa170b0695856295 SHA512 05871f00567f79ff5f17f19c7ddd21042b4c230819a1c7dec09e0c6072b45c7c773afa20d06da1880fa20ecd43b1b97b9d1c8a69842d31ca62558c480198d20f
-EBUILD compiler-rt-11.1.0_rc3.ebuild 3476 BLAKE2B 8b77c7494d3b360ca64b15b2909ab23a6884a2769d8985f446541fc513f16c0ede5671f01c0ae7c39b1f2ee964d0139df0c83d9de0c28080fa170b0695856295 SHA512 05871f00567f79ff5f17f19c7ddd21042b4c230819a1c7dec09e0c6072b45c7c773afa20d06da1880fa20ecd43b1b97b9d1c8a69842d31ca62558c480198d20f
+EBUILD compiler-rt-11.0.1.ebuild 3544 BLAKE2B c12af62e30475143bd86e5b87042003bb9d1dbf3918d566210c7593ab12168095bf9a0f16f185e613c33c48a101e209b55288015b0b8c45168cc3ac098d805ca SHA512 5464a523dd54dc9dddc1de15a657c1f07dad4ab64cc6bbdab13cbf315451614400730281bd3c7c6e64580d003ca57bf074c061cd224a5a6a32f19c2157b31c3f
+EBUILD compiler-rt-11.1.0.ebuild 3548 BLAKE2B c1f96cde71af8b605056e827c750c5dfe07382ecf494dca1f5d689fc3a8caff18d8ac595f6d47b7b9f9fec8e7cbba3ddcbb07176958ffacd541b314a3baad587 SHA512 bafd2287d7d07ef083e0aed54f76d8c82d7fa317a5432cb9e1ad8c05bbf78c6577178d42e278dafd92bb0f0803031c25038c0870a51008ca7b22a396ebbfde8a
 EBUILD compiler-rt-12.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-12.0.0_rc1.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
+EBUILD compiler-rt-12.0.0_rc2.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-13.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-9.0.1.ebuild 2901 BLAKE2B e28483e1e776a558e3edbb068f821cd4fea0e6ff5adc2a15efd3cdcc43d0fc38470556c9ea48fc6e44639971739568000a7633d4b2cccd43819fc9a40e00c25f SHA512 276b397d3755b92554c72cade1e9130f72dfa5d0e63332f728a6aa1e03b950f379e24ffe6a5dca04a3d23d5774d52c483d4872506294f68ec02256ede7f87af0
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
index ed8d7713b352..31085e5f5a71 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
index 041d0c955709..ed8d7713b352 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0_rc3.ebuild
deleted file mode 100644
index 041d0c955709..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
-
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0_rc2.ebuild
index 041d0c955709..e66cf796efb1 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0_rc2.ebuild
@@ -32,7 +32,7 @@ LLVM_COMPONENTS=( compiler-rt )
 llvm.org_set_globals
 
 PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
+	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
 )
 
 python_check_deps() {
@@ -85,6 +85,7 @@ src_configure() {
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF