media-gfx/gimp: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
similarity index 97%
rename from media-gfx/gimp/gimp-2.10.14.ebuild
rename to media-gfx/gimp/gimp-2.10.14-r1.ebuild
index 63247f2f6b4b9b12c279a1318175944a57fddf2a..e169695de69b147f3b37db8af6e85f62e3ad92e3 100644 (file)
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
        postscript? ( app-text/ghostscript-gpl )
        python? (
                ${PYTHON_DEPS}
-               >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        udev? ( dev-libs/libgudev:= )
        unwind? ( >=sys-libs/libunwind-1.1.0:= )

diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
similarity index 97%
rename from media-gfx/gimp/gimp-2.10.8-r1.ebuild
rename to media-gfx/gimp/gimp-2.10.8-r2.ebuild
index c69d663e35e145f724e0520deb16cf2e72ad0558..936e49178bae3ebc289cdb3033a896df4f8fce94 100644 (file)
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r2.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
@@ -53,8 +53,10 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
        >=media-libs/libpng-1.6.25:0=
        python? (
                ${PYTHON_DEPS}
-               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-               >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        >=media-libs/tiff-3.5.7:0
        >=gnome-base/librsvg-2.40.6:2

diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
similarity index 97%
rename from media-gfx/gimp/gimp-2.8.22-r1.ebuild
rename to media-gfx/gimp/gimp-2.8.22-r2.ebuild
index 9fc5aa9cdd4c5f5692d89ef22b6dbcfb8542f6dd..3d4251ed76a5e3c2035c24f8e3bbc45634aa4675 100644 (file)
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r2.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=5
@@ -45,7 +45,9 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
        png? ( >=media-libs/libpng-1.2.37:0 )
        python? (
                ${PYTHON_DEPS}
-               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        tiff? ( >=media-libs/tiff-3.5.7:0 )
        svg? ( >=gnome-base/librsvg-2.36.0:2 )

diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index fc0e9d31d199dbfdeb050d75c4ca25a40fe4a160..73a8c30f70ffbaed195d91d323bf8e702a3ec7d9 100644 (file)
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
        >=media-libs/libpng-1.6.25:0
        python? (
                ${PYTHON_DEPS}
-               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-               >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        >=media-libs/tiff-3.5.7:0
        >=gnome-base/librsvg-2.40.6:2

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 31756e7a18c7135733a7aa9e894976ab84552837..a8add4680ec18c13e53ce8bf0d3f01e37a514a84 100644 (file)
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -65,7 +65,9 @@ COMMON_DEPEND="
        postscript? ( app-text/ghostscript-gpl )
        python? (
                ${PYTHON_DEPS}
-               >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        udev? ( >=dev-libs/libgudev-167:= )
        unwind? ( >=sys-libs/libunwind-1.1.0:= )