gentoo resync : 25.09.2019

5 files changed, 123 insertions, 10 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 35adc6b5b653..10297ffc9efd 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,12 +1,15 @@
 DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
 DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
+DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bfe7c834e1e50e15be1c53dc8003cc6ed8ad4c83eef662b775997395bdb7e70835f94eca3768288fcbfeece68356b SHA512 86455d9d9866cde75e8d9bee7ddeb2680088dbc671e7d0c7bfff4c68ac963bc293bcaaf1a595db2b5529ddeee0dd0057ece37c90ee4ea194ac5e3fdb3122de01
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-EBUILD lldb-10.0.0.9999.ebuild 2712 BLAKE2B 6b0d5bed2bad575925e888236e82084a3388e28a9434ac711a1fbcd67fc94a040b3fd7d80788c2e6d55ce37fe3173c4bc0d710d05f7c7599215dce2d38cd0076 SHA512 afca689ce2424be93db8500c407efed77f98eb27b28f7d427c143d04395714d371c5fb8a2a7169315f06a3964390bb0ff3f8837d407326355e7d989bdac159cc
+DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
+EBUILD lldb-10.0.0.9999.ebuild 2722 BLAKE2B 613f34b11a3efd0ed6dbd2ee20e24f52be5cceed7194fdb15035492974bbe346e42706755a80608f0b1db7a06bbaade1de61dfc275bbd9d3effb635b61be4649 SHA512 258536299fb962763c5105edfd816b446d4109038d8f4e61d868346d8609928fac51c20b6814e8a019d8b7f3481ed15a511494e9a2c7aee8abece312d446c473
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.0.ebuild 3011 BLAKE2B c4d28d2f72f001ccfeb108732d073e6c8c52db8dcf7988f4ac282981bc7317c723cd6e4afa695fb072cb321b976a05869f03a8a9062bb06f80e4ebac11bc892a SHA512 86fbe8fb7402865ffb8410751325bcd71fa0d830c562855042fb2029da24026879df77b2f974139a2e3b49bf539a1ab789becaa8342b94f70038f5c60be92e4e
-EBUILD lldb-8.0.1.ebuild 3079 BLAKE2B 2e8f895fc0481d490279cbbe6d30c847b31abc1a02f34d9f51cbca3c4ec3ea5d18c5f6e68b71eb64c4054c40dc93ef5d09ea704b4373fc2c109692b8bb419a4f SHA512 6525739c5de7e365340582b222c28404142de968776a4acf05b771f41246874eeefa5a37e0336669567f2bf3c9d518065b27a6ba259ffb290692a4d9743b5df7
-EBUILD lldb-9.0.0.9999.ebuild 2737 BLAKE2B a768532e7ff0e18e2ba779054f20bdc04da7571cf1ba66277734c5e11aed22c224763f4b61f2166c3014ea36b6ecd7f9cd5e56304e1c3aa50ada8be76e33a68a SHA512 c61ca46f688826fd96ab8284ec1ec86f861255efb0c401c680c9f4817ddd22d8e5e94889cb122762832e0db3fe4aea2b018837a08621d3a34b8bda72b7506326
+EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
+EBUILD lldb-9.0.0.9999.ebuild 2747 BLAKE2B c6c14740393f0808556912230587d4299ef22bac4e9e632b364e8e01413059cd5bf2e2ea715362ed676217661cbcf4553bde7ca4c34608169ffe55e75b6d457c SHA512 a8d059545a68ca487c6e3cab6e9cfc64444f504527db1d8f9921102e5b4ff03d6970fd745ff888af8770db98eb2fbce291a540c77ea6f751725e4ca0b7674075
+EBUILD lldb-9.0.0.ebuild 2791 BLAKE2B 96d09991c69e8835a557d0e49c0eb005b1c4202646031fd601fd5b1fcba5d48c02b4997cad7ed5fd201d5b216afb5dffb68393061f7304b19cec6975cb14b831 SHA512 3cc0b03a73fdd16c2a3f575e0b5b046c36b564fd7964431d27c16d09aff3a5b86fa40e5beb9bc2551eb07b34507741bf420f9953d4fbc9c2d7328d010cd0bada
 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 5a0c6f7f6ed1..43495df7f2fd 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -31,15 +32,14 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
index e41221629992..2adb8cdb9ad3 100644
--- a/dev-util/lldb/lldb-8.0.1.ebuild
+++ b/dev-util/lldb/lldb-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libedit ncurses +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/lldb-9.0.0.9999.ebuild b/dev-util/lldb/lldb-9.0.0.9999.ebuild
index 0a3d3cede2c2..9389776f49b5 100644
--- a/dev-util/lldb/lldb-9.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.9999.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,15 +33,14 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/dev-util/lldb/lldb-9.0.0.ebuild b/dev-util/lldb/lldb-9.0.0.ebuild
new file mode 100644
index 000000000000..84fc69b2d438
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+
+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 )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_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? (
+		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# 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() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}