gentoo resync : 14.05.2020

6 files changed, 8 insertions, 139 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 173b40b9b2f0..4fca019a4e86 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,10 @@
-DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
-DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.9999.ebuild 2464 BLAKE2B 2461d6e5f70fe28fa6c646a2ca4f878cf6e0d4e2b49af9500a458589f0efec4ae476746765e43084c2e2e243877e69dc77488553b8a38fc89f3b0723a03f9749 SHA512 107cc1adb1f88e50bda9d47b03b57ab1f46b06536fe5feb7f36601ea4d2ef46120be1f4cf37e15e5cf1cf71eb2b2ea73db2cbc62104eb1015bf327f6461086f6
-EBUILD lldb-10.0.0.ebuild 2487 BLAKE2B 52cb94adc5066aa054ec34131a64859dff28bf1971ae61c808c1e1aa8d9d62d10881925cb253aa4b4fe86eca6b84cc88486a461552f170f6c1b2d73717820ab7 SHA512 e5b6db1ba1cc29f7063feaad0088376d0e151f8bdaabc99eefb0e10c3f58119df5b467f285d3d83d3e06a881c72c1bad29052f36ead2c544194f9c3d08fb2e5e
-EBUILD lldb-11.0.0.9999.ebuild 2464 BLAKE2B 2461d6e5f70fe28fa6c646a2ca4f878cf6e0d4e2b49af9500a458589f0efec4ae476746765e43084c2e2e243877e69dc77488553b8a38fc89f3b0723a03f9749 SHA512 107cc1adb1f88e50bda9d47b03b57ab1f46b06536fe5feb7f36601ea4d2ef46120be1f4cf37e15e5cf1cf71eb2b2ea73db2cbc62104eb1015bf327f6461086f6
-EBUILD lldb-7.1.0-r1.ebuild 3171 BLAKE2B 9f53fa589292b8b2ac77c950172c5a9c8c63b1e76906f560ff1f9564c910b4fea6fc5366c55a4479782209df7de2c40c14c967d733aa524b9fd45ff446b69a2b SHA512 d7440c64bffcbb075b2752e939ba3495f1618a0debb88ff00b31fcd0bb31b4b29005b48094e37ad04fb9231571a1ffc123b7d8048ae909f71e1a21b85c3b2bca
+EBUILD lldb-10.0.0.9999.ebuild 2458 BLAKE2B 361942969b8237b4d2937ebb991785df9604fd4ead506ec8a40a22213da68cf72558376a02e0ff3bebaad1dbca32e0b659c2e287efe2fd42b4129be410b818df SHA512 3b53debd70430335686e7770122a4821c62b19a3638b6896468462fe1bff16f9345ed469263e6331cdd92f8707d64fd4c5f92a72437578e756c5ea0eb9691953
+EBUILD lldb-10.0.0.ebuild 2481 BLAKE2B eec1740e4eb28b77a1416b27ce0ab11f95d6d2e81ae6b8aaca04647bda9124422ffe9d414aa5c5f9410b616e473f2609c21201289955b6fe595e9d082b5519c9 SHA512 dfbe98bde465360bcd86ba6ca49c26693430c4ef08e556826af0fe992c57934f397963b6babf106be6594bcfc22f94b0a2a554026af94a7eab286bf916a58282
+EBUILD lldb-11.0.0.9999.ebuild 2458 BLAKE2B 361942969b8237b4d2937ebb991785df9604fd4ead506ec8a40a22213da68cf72558376a02e0ff3bebaad1dbca32e0b659c2e287efe2fd42b4129be410b818df SHA512 3b53debd70430335686e7770122a4821c62b19a3638b6896468462fe1bff16f9345ed469263e6331cdd92f8707d64fd4c5f92a72437578e756c5ea0eb9691953
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
-EBUILD lldb-9.0.1-r1.ebuild 2397 BLAKE2B e4a89885b08e3a582f7f02a935f4761f8bd24695caaab4732c928d82e69d4c4785de038994a3cbd80c0711a08da554b406e249390f2c9631838dc9d629be681b SHA512 61ea7725394294cfaa4125059cc687a42a11067a24ba35970403da69a083f24d9e5b1c81e2617100c1eb1ada125bbb9e8167651de8afd10ee208f3d2a8b840fc
+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-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index f5bbc5b68a26..a64ef3c4618b 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
index e03f8d5300b4..4b669f2eea2a 100644
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index f5bbc5b68a26..a64ef3c4618b 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
diff --git a/dev-util/lldb/lldb-7.1.0-r1.ebuild b/dev-util/lldb/lldb-7.1.0-r1.ebuild
deleted file mode 100644
index a1d46a863097..000000000000
--- a/dev-util/lldb/lldb-7.1.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="libedit ncurses +python test"
-# Tests are known to fail, and we are not going to address the failures
-# in this version.
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	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}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-	)
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# 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_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-9.0.1-r1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild
index cbe2269ee479..dbebb28b5cdb 100644
--- a/dev-util/lldb/lldb-9.0.1-r1.ebuild
+++ b/dev-util/lldb/lldb-9.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs