gentoo resync : 12.07.2021

3 files changed, 3 insertions, 106 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 7e2fe722070e..9368e578bf80 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,10 @@
 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-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
+DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 12061d64f8e264dd341e4831a575473bd16b92b70a12d25e6b9f4197d784bb1f671f3591eeeac2b0e8c3ae529880fa58acaae7da5ea3a174e823c3dfe6412f6f SHA512 ae8afe01ff6959cac205830a811eab50588568f9d0016ff9ff468894375b64deb4d359140636066b72efd2eca12019522647b2b4b59b5ed1d9a90c3aeef25d7a
-EBUILD lldb-12.0.1.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
-EBUILD lldb-12.0.1_rc4.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
+EBUILD lldb-12.0.1.ebuild 2420 BLAKE2B 8fd461752260d2e7d3cde1112863d43b0681d46ad129d36056b73b03c67b13c1263656e3577ab04ec729b70af167796991d20c91cfda5643fd63c898a3f2a993 SHA512 d14631da412a5e822f98ae6bc703e66383d848ace0d705363a4d0bf8e8f4f9126a1c7a472a4805b495b185d91098748d35a7a89f4047456904edb97735f5925c
 EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-12.0.1.9999.ebuild b/dev-util/lldb/lldb-12.0.1.ebuild
index 468fe7b0cf61..1460455009fa 100644
--- a/dev-util/lldb/lldb-12.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
diff --git a/dev-util/lldb/lldb-12.0.1_rc4.ebuild b/dev-util/lldb/lldb-12.0.1_rc4.ebuild
deleted file mode 100644
index 468fe7b0cf61..000000000000
--- a/dev-util/lldb/lldb-12.0.1_rc4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-lit
-	# failures + hangs
-	#use python && cmake_build check-lldb
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}