[gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/

["Sam James" <sam@gentoo.org>]

commit:     a1936383cafa03ef7eec5dab0793d2149adddf65
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Oct 19 03:32:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 02:22:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1936383

dev-util/lldb: drop outdated runtime dependency on six

In commit c919e59f4e6acf31497deb960ba15a42fadd4701 the obsolete cmake
variable was removed which toggled using the system six. But the
RDEPEND that went with it was left in.

Since https://reviews.llvm.org/D131304, the six module is not used by
lldb at all.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lldb/{lldb-17.0.3.9999.ebuild => lldb-16.0.6-r1.ebuild}   | 11 +++--------
 .../lldb/{lldb-17.0.3.9999.ebuild => lldb-17.0.3-r1.ebuild}   |  9 ++-------
 dev-util/lldb/lldb-17.0.3.9999.ebuild                         |  6 ------
 dev-util/lldb/lldb-18.0.0.9999.ebuild                         |  6 ------
 dev-util/lldb/lldb-18.0.0_pre20231019.ebuild                  |  6 ------
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/dev-util/lldb/lldb-17.0.3.9999.ebuild b/dev-util/lldb/lldb-16.0.6-r1.ebuild
similarity index 90%
copy from dev-util/lldb/lldb-17.0.3.9999.ebuild
copy to dev-util/lldb/lldb-16.0.6-r1.ebuild
index 85f3da6a1874..cb029e8fb2fd 100644
--- a/dev-util/lldb/lldb-17.0.3.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.6-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-IUSE="+debug +libedit lzma ncurses +python test +xml"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
@@ -26,9 +27,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 		${PYTHON_DEPS}
 	)
 "
@@ -37,9 +35,6 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	python? (
 		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 	)
 	test? (
 		$(python_gen_cond_dep "
@@ -85,7 +80,7 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DPython3_EXECUTABLE="${PYTHON}"

diff --git a/dev-util/lldb/lldb-17.0.3.9999.ebuild b/dev-util/lldb/lldb-17.0.3-r1.ebuild
similarity index 92%
copy from dev-util/lldb/lldb-17.0.3.9999.ebuild
copy to dev-util/lldb/lldb-17.0.3-r1.ebuild
index 85f3da6a1874..61bd954e14a2 100644
--- a/dev-util/lldb/lldb-17.0.3.9999.ebuild
+++ b/dev-util/lldb/lldb-17.0.3-r1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-IUSE="+debug +libedit lzma ncurses +python test +xml"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
@@ -26,9 +27,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 		${PYTHON_DEPS}
 	)
 "
@@ -37,9 +35,6 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	python? (
 		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 	)
 	test? (
 		$(python_gen_cond_dep "

diff --git a/dev-util/lldb/lldb-17.0.3.9999.ebuild b/dev-util/lldb/lldb-17.0.3.9999.ebuild
index 85f3da6a1874..1459848607aa 100644
--- a/dev-util/lldb/lldb-17.0.3.9999.ebuild
+++ b/dev-util/lldb/lldb-17.0.3.9999.ebuild
@@ -26,9 +26,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 		${PYTHON_DEPS}
 	)
 "
@@ -37,9 +34,6 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	python? (
 		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 	)
 	test? (
 		$(python_gen_cond_dep "

diff --git a/dev-util/lldb/lldb-18.0.0.9999.ebuild b/dev-util/lldb/lldb-18.0.0.9999.ebuild
index 85f3da6a1874..1459848607aa 100644
--- a/dev-util/lldb/lldb-18.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-18.0.0.9999.ebuild
@@ -26,9 +26,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 		${PYTHON_DEPS}
 	)
 "
@@ -37,9 +34,6 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	python? (
 		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 	)
 	test? (
 		$(python_gen_cond_dep "

diff --git a/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild
index 85f3da6a1874..1459848607aa 100644
--- a/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild
+++ b/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild
@@ -26,9 +26,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 		${PYTHON_DEPS}
 	)
 "
@@ -37,9 +34,6 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	python? (
 		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
 	)
 	test? (
 		$(python_gen_cond_dep "