gentoo resync : 03.03.2021

5 files changed, 9 insertions, 109 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index b594f9ccb6da..584c0c4d5dc2 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,19 +1,17 @@
 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 lldb-10.0.1.ebuild 2335 BLAKE2B 662414b8dfc8cd767c39c86276645af44f50bb3fa6ce4b1922400bb5a6e27acd18410aeb63f026a06e7bf025ff2648ae1d5d5c60c61a4f66fe1465018acb8011 SHA512 25d70f6228848646b46080c89ed53d47a4cd4d32412f1e7d5e056ca9799001e1055093c1f81437d7d509f01be3f8ca66604094535da8d22d52353889db589555
 EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 8f9b788255186f72bc366551ef6d80b9c5d145672990206cbfe40dbe8419e2311519f261ba8130d466733dbe8174a8ec74e94d9b0a4393ccd49e1b23d5c3bb03 SHA512 d71f4ec94ddd375b037f5c48f0f906863a5d823c1f77d367236f347caf07708de5edf2e8d7324791c0b7f5f0fa1eed94e7a017025fffe3a9605786d4cf59f6a4
-EBUILD lldb-11.0.1.ebuild 2346 BLAKE2B c5d93a7cd2e140351b9307684df9dd66f987d66c55f6650d07a888e358905e354ba7ce19d2c142c47896e93b6dcaf7c9640cf336359715de62bec902966cf013 SHA512 2550bc7de00480ed4a186975e2a1f32e29644f21c63f51619e00d6b4dacbbf1cfd7957ba41a8a8555788c8070295aefdca1ae237d9990544bc87a566b3b581a7
-EBUILD lldb-11.1.0_rc1.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
-EBUILD lldb-11.1.0_rc2.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
-EBUILD lldb-11.1.0_rc3.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
+EBUILD lldb-11.0.1.ebuild 2342 BLAKE2B 7ed569c1dccae78593f55d798024b9fe3fdcbcee63b9bf332ae1f3c6602d5e90408b19a9cdf87e48a5ee06757487ad505ad09d9cae1a9b6c7482eaf4511b4389 SHA512 3b9ca0ab823a712c74e80b52461fd79e320f6f51d18f530f9b5c8743fb60762520544765c53612f5753ea02de50a8ca8081ff5c78646622a393819c6c271d2c1
+EBUILD lldb-11.1.0.ebuild 2346 BLAKE2B c5d93a7cd2e140351b9307684df9dd66f987d66c55f6650d07a888e358905e354ba7ce19d2c142c47896e93b6dcaf7c9640cf336359715de62bec902966cf013 SHA512 2550bc7de00480ed4a186975e2a1f32e29644f21c63f51619e00d6b4dacbbf1cfd7957ba41a8a8555788c8070295aefdca1ae237d9990544bc87a566b3b581a7
 EBUILD lldb-12.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
 EBUILD lldb-12.0.0_rc1.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
+EBUILD lldb-12.0.0_rc2.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
 EBUILD lldb-13.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
 EBUILD lldb-9.0.1-r1.ebuild 2387 BLAKE2B de659a1c72e14f14b0203769c256a1df2220fb53b053c6320c7c4feba598c061082e77140d514a95631047065beb79363a3b1f03077c8f4a658e31b5bf2ae112 SHA512 b0f7d2a2d8196088e7356b04af0d1a762fdb23c9b4f4943fdfdbd58c8309d81fa41bb3993cd8c5c1cb57233779ced4d61c73dbbc980654bf25ea89f9a2026610
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.0.1.ebuild b/dev-util/lldb/lldb-11.0.1.ebuild
index 1159918d63be..64749354423e 100644
--- a/dev-util/lldb/lldb-11.0.1.ebuild
+++ b/dev-util/lldb/lldb-11.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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-11.1.0_rc1.ebuild b/dev-util/lldb/lldb-11.1.0.ebuild
index e2aae7d39efa..1159918d63be 100644
--- a/dev-util/lldb/lldb-11.1.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-11.1.0.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-11.1.0_rc3.ebuild b/dev-util/lldb/lldb-11.1.0_rc3.ebuild
deleted file mode 100644
index e2aae7d39efa..000000000000
--- a/dev-util/lldb/lldb-11.1.0_rc3.ebuild
+++ /dev/null
@@ -1,100 +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 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
-
-		-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
-}
diff --git a/dev-util/lldb/lldb-11.1.0_rc2.ebuild b/dev-util/lldb/lldb-12.0.0_rc2.ebuild
index e2aae7d39efa..c5c517112bef 100644
--- a/dev-util/lldb/lldb-11.1.0_rc2.ebuild
+++ b/dev-util/lldb/lldb-12.0.0_rc2.ebuild
@@ -73,6 +73,8 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(