gentoo resync : 13.11.2021

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4bd87eb716f5..3ec193793a98 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,9 @@
-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.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-EBUILD lldb-10.0.1.ebuild 2286 BLAKE2B ac5ee6653bce26265c7bc52f5461613ed0ddde5cefe930aeef268e1115656eaf122681342e606b42786fadfbf3437c6903d87df96c236b074c530c1c78eeb90e SHA512 38d1a73a7961ce42a7a50b94b08da1a340cec3f8e7c2c1272fc959519bd18523872116418e46f5baa4451f41d76082edbf186b618e9879aab447fc79097a5756
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2443 BLAKE2B dd155b7715cd38eebf62d14c139bb0030db953a2f4f14f3c4779f64e70ccfd3c3f64067ffdad3ee407388f69cb6733420197facefcd25297b0f2111d1912044e SHA512 dca2e443a146b1baa60565eaf5a5cc86cb8deb9b9b10594ddbfcc356e62f67f99dd4ba769817c008c753a5ad854e0fb04e96f00c6e3e081bdf6faf3091291689
 EBUILD lldb-13.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
-EBUILD lldb-13.0.0.ebuild 2591 BLAKE2B d05a38ee072c451f299b6add0b534b1188f5975d05b8c47738a68bff239171cb36b30f9a783e7b56b01460f572ff59fe99bce3378711674ca5238c08c6becf06 SHA512 1b0b5efa1f67b5b3c7482153b717ffc84e327a1f2f95a8a629d3084305b3c3e47ccbc48a8450a32d522b4011cdde224c76e344bd2db4f72c5deba88c78f315ff
+EBUILD lldb-13.0.0.ebuild 2587 BLAKE2B 916ff9a21b0fb99086f4f4039f227481adc63c41c3c480a319da7f1896d8a970d16b3bf813516b0ee3a56316182ff6cc4e61da1f391253d6d3be51c2c5fab367 SHA512 18955a92513b72d3e7fe83d9ad720d650cb2e084af9896c01e3828e19b74c5e2ba7fd523197b70eb190074399f9ce6ccb9d570b1d5ed15212996e9c61b673ab2
 EBUILD lldb-14.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
deleted file mode 100644
index 7233f5c56bb8..000000000000
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( 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}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-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
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		-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-13.0.0.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild
index 0369511ea6f4..dfaa91af8965 100644
--- a/dev-util/lldb/lldb-13.0.0.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.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="debug +libedit lzma ncurses +python test +xml"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"