media-gfx/inkscape: Switch to PYTHON_MULTI_USEDEP API

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

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 8550767b26948df4ba2f2e9b33d10c84642b2216..bc73e6c6f57d29cd4b7aa48479b47d44c3e91ed0 100644 (file)
--- 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 fe3ac5ac3a7caa17204f9775d24ebe798745ad3b..52bc56d18a54bf1802ba6f5e20d1201764fc3fe8 100644 (file)
--- 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 1a10390a90dcb2e7caff36cb165962e33576adbd..bc57307639b5a1f5ab889c4277397e968c18c51c 100644 (file)
--- 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 )
 "