gentoo resync : 30.09.2020

3 files changed, 101 insertions, 2 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4980897b98be..ab1b0f123a2d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B aadc50c6e94522732e3760d608f4904dff90036a6c0eec0e30ae32b40bcdef8e54d00f21aae73b2aa5097a59fcf16cac5c57d4b82dc727d771ba0965749a5788 SHA512 8e0503d60572f67878527a3879c53935cad6ae1d5533ce45f3c33253e3d9535b203ce2720f7ab8b3535708da4c1723e1379c9a9833648714756ff02067aee822
 EBUILD lldb-11.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
 EBUILD lldb-11.0.0_rc3.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
-EBUILD lldb-12.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
+EBUILD lldb-11.0.0_rc4.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
+EBUILD lldb-12.0.0.9999.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.0.0_rc4.ebuild b/dev-util/lldb/lldb-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..4b16c5b83278
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.0_rc4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+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=""
+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_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_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-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index a5b3aee8c3df..4b16c5b83278 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	libedit? ( dev-libs/libedit:0= )