gentoo resync : 16.09.2021

5 files changed, 6 insertions, 146 deletions

diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index d132e04b24b5..9219584045fb 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,15 +1,13 @@
 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.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
+DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de
 EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1
-EBUILD llvm-libunwind-12.0.0.ebuild 3657 BLAKE2B 4370cc5e2c1d423a7ab3bb3ed6c208d02e785c89d6d5159c5f6f967591dadf6a49602b34f6e94a66e3c8700b3cab273140aeeaabf941eac49c03cf0926470b7e SHA512 0d0aaadc05b8beca6e692b9b6325e426a4c29186b45376d1501cde2c1ee66f69ab5b60b2f148188f7ae708908a200395a51b02920a62c755101176b035aafd2d
-EBUILD llvm-libunwind-12.0.1.ebuild 3660 BLAKE2B 8e434b1c8dfec9a488d7b69b8fd014b65b1ee1c462bf21ba4953680f161c233ddf297a7b28c6882942b7148fb17e5ae6c68da0d9e13d6b92d727faa3c82b0017 SHA512 7e2c7022387a91f696d14c54ae9f209355cb5d6800e08b6577f79976191cd99fb44e61b661901c73a560a7ec601d51155efafc3fc85e481cad79571f746bd8f5
+EBUILD llvm-libunwind-12.0.1.ebuild 3657 BLAKE2B f2426a0aa744c81452ecd8d37bdffc8f294a559753ea57ef11c2fb8646e6eedd93c70afb3fd354c97f5b70f9fc7d4f13b2e180f49c7d06cf21e1e9586f05ef50 SHA512 cecba115918eae18534b8ffdfbaede6b77851e67eaadd17466133a0976765526f11554fbf849e894b7136abc844c8822c633e95609c1019f2d89fa83d9c8a1e5
 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
-EBUILD llvm-libunwind-13.0.0_rc1.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
 EBUILD llvm-libunwind-13.0.0_rc2.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
+EBUILD llvm-libunwind-13.0.0_rc3.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
 EBUILD llvm-libunwind-14.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
-MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
+MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
deleted file mode 100644
index b907f5db41fe..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)"
-
-LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
-LLVM_TEST_COMPONENTS=( libcxxabi )
-llvm.org_set_globals
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local use_compiler_rt=OFF
-	local libdir=$(get_libdir)
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	if tc-is-clang; then
-		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-		   ${LD_FLAGS} -print-libgcc-file-name)
-		if [[ ${compiler_rt} == *libclang_rt* ]]; then
-			use_compiler_rt=ON
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=OFF
-		-DLIBCXXABI_ENABLE_STATIC=ONF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake_src_configure
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	# build local copies of libc++ & libc++abi for testing to avoid
-	# circular deps
-	build_libcxxabi
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# install headers like sys-libs/libunwind
-	doheader "${S}"/include/*.h
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
index 08f10724089d..4705a67fc652 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc3.ebuild
index a4b1aceef510..a4b1aceef510 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc3.ebuild
diff --git a/sys-libs/llvm-libunwind/metadata.xml b/sys-libs/llvm-libunwind/metadata.xml
index d36a3f021769..0c3d32050a15 100644
--- a/sys-libs/llvm-libunwind/metadata.xml
+++ b/sys-libs/llvm-libunwind/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>llvm@gentoo.org</email>