From 12ea994e9abbfc7d8e2d65e138afc8c556309a9a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 14:14:49 +0100
Subject: [PATCH] dev-util/lldb: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-util/lldb/lldb-10.0.0.9999.ebuild            | 12 +++++++++---
 dev-util/lldb/lldb-10.0.0_rc1.ebuild             | 12 +++++++++---
 dev-util/lldb/lldb-11.0.0.9999.ebuild            | 12 +++++++++---
 .../{lldb-7.1.0.ebuild => lldb-7.1.0-r1.ebuild}  | 16 ++++++++++++----
 .../{lldb-8.0.1.ebuild => lldb-8.0.1-r1.ebuild}  | 16 ++++++++++++----
 .../{lldb-9.0.1.ebuild => lldb-9.0.1-r1.ebuild}  | 12 +++++++++---
 6 files changed, 60 insertions(+), 20 deletions(-)
 rename dev-util/lldb/{lldb-7.1.0.ebuild => lldb-7.1.0-r1.ebuild} (92%)
 rename dev-util/lldb/{lldb-8.0.1.ebuild => lldb-8.0.1-r1.ebuild} (92%)
 rename dev-util/lldb/{lldb-9.0.1.ebuild => lldb-9.0.1-r1.ebuild} (92%)

diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	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"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-10.0.0_rc1.ebuild b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-10.0.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	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"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	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"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-7.1.0.ebuild b/dev-util/lldb/lldb-7.1.0-r1.ebuild
similarity index 92%
rename from dev-util/lldb/lldb-7.1.0.ebuild
rename to dev-util/lldb/lldb-7.1.0-r1.ebuild
index a2c3d26a6531..a1d46a863097 100644
--- a/dev-util/lldb/lldb-7.1.0.ebuild
+++ b/dev-util/lldb/lldb-7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,14 +30,22 @@ RESTRICT="test"
 RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	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? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+	)
 	${PYTHON_DEPS}"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1-r1.ebuild
similarity index 92%
rename from dev-util/lldb/lldb-8.0.1.ebuild
rename to dev-util/lldb/lldb-8.0.1-r1.ebuild
index 2adb8cdb9ad3..fa7d98390e6e 100644
--- a/dev-util/lldb/lldb-8.0.1.ebuild
+++ b/dev-util/lldb/lldb-8.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,14 +28,22 @@ 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} )
+	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? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+	)
 	${PYTHON_DEPS}"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/lldb/lldb-9.0.1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild
similarity index 92%
rename from dev-util/lldb/lldb-9.0.1.ebuild
rename to dev-util/lldb/lldb-9.0.1-r1.ebuild
index 20d744e17b96..2afd2452347e 100644
--- a/dev-util/lldb/lldb-9.0.1.ebuild
+++ b/dev-util/lldb/lldb-9.0.1-r1.ebuild
@@ -23,8 +23,12 @@ 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} )
+	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"
@@ -32,7 +36,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-- 
2.26.2