gentoo resync : 08.07.2021

5 files changed, 9 insertions, 134 deletions

diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 7279162fb1c0..f809e5fb5370 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,17 +1,16 @@
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
+DIST llvm-gentoo-patchset-12.0.1-rc4-1.tar.xz 4776 BLAKE2B 2ae7994089922805c9b82268e4c73d9a70edbb8860af7e593da904c673836713fae5fd7626ef1dbfe813c66f4da8308b26b4cd0bd977471834d49512690afa39 SHA512 386668fd338ee24677c51379c69a73b6a749bd4cf72bf59f9cb800b1ac19938275d64d0c23e431c80ed5e572d86d94bbb030241c43cbf541801cdc672f5911c1
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
-DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
 EBUILD compiler-rt-10.0.1.ebuild 2782 BLAKE2B cdc7937f616e86c3394d1cc68eeea05f3eebdcac051ca48e477d3a2cb765be1d616159f72a2b77ac21a0c2a4ebf1cc79f9d9cd23a2a1c7b26a4a252142c3af21 SHA512 4380bb10112f745e0034d36be105a1b4df159f34adafdd2b24157dc3652881ab8792e7758555ce167f59e2c3360b5d36b5d4f8d456df44fa5ee754f3c310677a
 EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da
 EBUILD compiler-rt-12.0.0.ebuild 3541 BLAKE2B 0d5581a8a0f45d6843d3aca9ff184bb447e886e7e41faee2e4ebebb2154cfb2138ffa04be73eb6f76c60f7bbd65a8589649c64c60612037221c646535f04b7b5 SHA512 fa67b1e4105f9aa3bfa95c95a24c8bfeade28c521d4c69b0c08d8e8c469a06d62eb3a2b8c97175806922bd319ece1e016437c693baaab50646ec650f7aecd46e
-EBUILD compiler-rt-12.0.1.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
-EBUILD compiler-rt-12.0.1_rc1.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
-EBUILD compiler-rt-12.0.1_rc2.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
-EBUILD compiler-rt-13.0.0.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d
+EBUILD compiler-rt-12.0.1.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
+EBUILD compiler-rt-12.0.1_rc4.ebuild 3478 BLAKE2B 6f979334633034b225272ff2d6497731fcc837e190f9bd0a041a9b213c73e1d2e2cec2dafd8ed6ce0b42b1b0b78bdb60f519a3eae91293cff3d2a462bad51350 SHA512 0ed58a67c3ca669c6f64dfad57c254a7e3c07593f427623825eba7c4ecf123137b400271c76bbabf4e162ea3f52fa7e16f3518e8f48894bb4f2b0a4d9b8ae082
+EBUILD compiler-rt-13.0.0.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
 MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild
index caf0b9268efd..6f732cc60ab6 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc2.ebuild
deleted file mode 100644
index caf0b9268efd..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-12.0.1_rc2.ebuild
+++ /dev/null
@@ -1,124 +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_PATCHSET=9999-1
-llvm.org_set_globals
-
-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_MEMPROF=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-12.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc4.ebuild
index caf0b9268efd..05771e36ce7e 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -29,7 +29,7 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
-LLVM_PATCHSET=9999-1
+LLVM_PATCHSET=12.0.1-rc4-1
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
index caf0b9268efd..6f732cc60ab6 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"