[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/

["Michał Górny" <mgorny@gentoo.org>]

commit:     0a178f3dd5df4b56265e83fd9eab92edf1ab673d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 15:03:38 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:26:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a178f3d

media-gfx/inkscape: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{inkscape-0.92.4-r1.ebuild => inkscape-0.92.4-r2.ebuild} | 12 ++++++------
 ...nkscape-1.0_beta2.ebuild => inkscape-1.0_beta2-r1.ebuild} | 10 +++++++---
 media-gfx/inkscape/inkscape-9999.ebuild                      | 10 +++++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
similarity index 95%
rename from media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
rename to media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
index 8550767b269..bc73e6c6f57 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
@@ -32,9 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.6.20
 	>=dev-libs/libxslt-1.0.15
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -72,10 +70,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
 	latex? (

diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
similarity index 95%
rename from media-gfx/inkscape/inkscape-1.0_beta2.ebuild
rename to media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index fe3ac5ac3a7..52bc56d18a5 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -41,9 +41,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -52,6 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -85,7 +87,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1a10390a90d..bc57307639b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -40,9 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -51,6 +49,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -84,7 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "