gentoo resync : 21.01.2018

4 files changed, 18 insertions, 26 deletions

diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 6a0993343565..9bfa8fb79ab2 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,7 +5,7 @@ DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
-EBUILD lldb-5.0.1.ebuild 3067 BLAKE2B 790a43c29244d006a3bf9ac3c8548f9348a2d18b96aecc156cef76d3145dbc34d22aa6534d8338d23e79113bf1a6d87c00464427aae5ee6b1c513d8fd2985e54 SHA512 41807a680175c6c836ef852b58f4306c32a21111da4b78c6584696a68e9424cb2de27bd2394164ac1cc91bcdf759a5fd0112d137bed9c9714ff60e66af9bd29d
-EBUILD lldb-6.0.9999.ebuild 3086 BLAKE2B a569f675b0a1da11c6cc663de56e2227a2c0a38ff01e69b0eb258655d6a7a1ed2d15ff5da9274f0fc3750a9ec3e07b8a6be4a8c07fbe004b36682944637a43f2 SHA512 ade71218d5aabd59cc5fdd7f8f39b69af49ee5be79abe7105c74b23d3abdb1c9a3c15fc09735111e31dfcf50013f00b985ebff89487c11e99129fa7cd81c8d7b
-EBUILD lldb-9999.ebuild 3061 BLAKE2B fc4cdb38222831d0e0f9fe93b44306160b56eeb1b23d1015dbfc5761fdfbd22f0deed91d420870469dc0e9fd777be8cf9ade79e3eb90f275a3e0e18205aa97f4 SHA512 facc16f2f3ab686f2247d833c9f4a12ab6c0ad2e70d72452d6d96234a5f6f66106ccd16175065dd6e6405ed014ef9e687494a877fe7eeaa3a64ac9cdaa292fb5
+EBUILD lldb-5.0.1.ebuild 3015 BLAKE2B 24c75d15e2898cd209df43f137b3e4fcad6ebbaaa0e66c9611d5a6cdd8666d5935c834ef3fd1fa02303c33a73e33f189b8bee25158dd5149222048f987f7f3bc SHA512 1773bab52a4794dc412ac3ac76eea3fdf1dcd2515009ba77b560c5972c44d0275a300206457cea89f4de08fc0103afd9a988404873d1d75b765e0460481c5436
+EBUILD lldb-6.0.9999.ebuild 2958 BLAKE2B d9b3b564d5b7defdf434454b333ef3d28ffea3a3e5bb88d2b9b945c2347c3b59a346f24528cb07d6391e672a66bee17474dda6f6dc2249349962d1d3f698acdc SHA512 76e59b0490a74dd57bc31cde5945c32de9efc3e9ca9c85be401d63ea1323f3019c6a6ccde70d412bf2490f0bb921cd9fa03f8fd45b9ac9eaad7b401868f45040
+EBUILD lldb-9999.ebuild 2933 BLAKE2B d95877e3ae3adea4d6ade02173b78519b4f6745e5b5c50db2fc17b25081d90ce881f1caec76f0cdebb0c8fa345b3994410739783817e1d7a87cec419d46afa49 SHA512 0b9322d551868a4032cfdafc3003e3f3245f793b071e4b0d61b8e259745b4486b195e144434ea4db7e5ef88b0b573658578712e42d812f1e6d4b98e1223e0314
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.1.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild
index 3b256444479b..899fe2be5ae6 100644
--- a/dev-util/lldb/lldb-5.0.1.ebuild
+++ b/dev-util/lldb/lldb-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,6 +67,7 @@ src_configure() {
 		-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)
 
 		-DLLVM_BUILD_TESTS=$(usex test)
@@ -104,9 +105,6 @@ src_install() {
 
 	# oh my...
 	if use python; then
-		# remove bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
 		# remove custom readline.so for now
 		# TODO: figure out how to deal with it
 		# upstream is basically building a custom readline.so with -ledit
diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild
index 002f1571b638..cf7c78750f2b 100644
--- a/dev-util/lldb/lldb-6.0.9999.ebuild
+++ b/dev-util/lldb/lldb-6.0.9999.ebuild
@@ -68,15 +68,10 @@ src_configure() {
 		-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)
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
 
 		# TODO: fix upstream to detect this properly
 		-DHAVE_LIBDL=ON
@@ -89,6 +84,11 @@ src_configure() {
 		-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"
@@ -107,9 +107,6 @@ src_install() {
 
 	# oh my...
 	if use python; then
-		# remove bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
 		# remove custom readline.so for now
 		# TODO: figure out how to deal with it
 		# upstream is basically building a custom readline.so with -ledit
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 594c205692d7..7e422adecfd2 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,15 +67,10 @@ src_configure() {
 		-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)
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
 
 		# TODO: fix upstream to detect this properly
 		-DHAVE_LIBDL=ON
@@ -88,6 +83,11 @@ src_configure() {
 		-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"
@@ -106,9 +106,6 @@ src_install() {
 
 	# oh my...
 	if use python; then
-		# remove bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
 		# remove custom readline.so for now
 		# TODO: figure out how to deal with it
 		# upstream is basically building a custom readline.so with -ledit