| 1 |
commit: 1ea4db524b4253c3f1a6c458334cd59edc784be8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 15:01:45 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:26:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea4db52 |
| 7 |
|
| 8 |
media-gfx/gimp: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
media-gfx/gimp/{gimp-2.10.14.ebuild => gimp-2.10.14-r1.ebuild} | 6 ++++-- |
| 13 |
media-gfx/gimp/{gimp-2.10.8-r1.ebuild => gimp-2.10.8-r2.ebuild} | 8 +++++--- |
| 14 |
media-gfx/gimp/{gimp-2.8.22-r1.ebuild => gimp-2.8.22-r2.ebuild} | 6 ++++-- |
| 15 |
media-gfx/gimp/gimp-2.9.8-r1.ebuild | 6 ++++-- |
| 16 |
media-gfx/gimp/gimp-9999.ebuild | 4 +++- |
| 17 |
5 files changed, 20 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild |
| 20 |
similarity index 97% |
| 21 |
rename from media-gfx/gimp/gimp-2.10.14.ebuild |
| 22 |
rename to media-gfx/gimp/gimp-2.10.14-r1.ebuild |
| 23 |
index 63247f2f6b4..e169695de69 100644 |
| 24 |
--- a/media-gfx/gimp/gimp-2.10.14.ebuild |
| 25 |
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild |
| 26 |
@@ -58,8 +58,10 @@ COMMON_DEPEND=" |
| 27 |
postscript? ( app-text/ghostscript-gpl ) |
| 28 |
python? ( |
| 29 |
${PYTHON_DEPS} |
| 30 |
- >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
| 31 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 32 |
+ $(python_gen_cond_dep ' |
| 33 |
+ >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] |
| 34 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] |
| 35 |
+ ') |
| 36 |
) |
| 37 |
udev? ( dev-libs/libgudev:= ) |
| 38 |
unwind? ( >=sys-libs/libunwind-1.1.0:= ) |
| 39 |
|
| 40 |
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild |
| 41 |
similarity index 97% |
| 42 |
rename from media-gfx/gimp/gimp-2.10.8-r1.ebuild |
| 43 |
rename to media-gfx/gimp/gimp-2.10.8-r2.ebuild |
| 44 |
index c69d663e35e..936e49178ba 100644 |
| 45 |
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild |
| 46 |
+++ b/media-gfx/gimp/gimp-2.10.8-r2.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2019 Gentoo Authors |
| 49 |
+# Copyright 1999-2020 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=6 |
| 53 |
@@ -53,8 +53,10 @@ RDEPEND=">=dev-libs/glib-2.56.0:2 |
| 54 |
>=media-libs/libpng-1.6.25:0= |
| 55 |
python? ( |
| 56 |
${PYTHON_DEPS} |
| 57 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 58 |
- >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
| 59 |
+ $(python_gen_cond_dep ' |
| 60 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] |
| 61 |
+ >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] |
| 62 |
+ ') |
| 63 |
) |
| 64 |
>=media-libs/tiff-3.5.7:0 |
| 65 |
>=gnome-base/librsvg-2.40.6:2 |
| 66 |
|
| 67 |
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild |
| 68 |
similarity index 97% |
| 69 |
rename from media-gfx/gimp/gimp-2.8.22-r1.ebuild |
| 70 |
rename to media-gfx/gimp/gimp-2.8.22-r2.ebuild |
| 71 |
index 9fc5aa9cdd4..3d4251ed76a 100644 |
| 72 |
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild |
| 73 |
+++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2019 Gentoo Authors |
| 76 |
+# Copyright 1999-2020 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=5 |
| 80 |
@@ -45,7 +45,9 @@ RDEPEND=">=dev-libs/glib-2.30.2:2 |
| 81 |
png? ( >=media-libs/libpng-1.2.37:0 ) |
| 82 |
python? ( |
| 83 |
${PYTHON_DEPS} |
| 84 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 85 |
+ $(python_gen_cond_dep ' |
| 86 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] |
| 87 |
+ ') |
| 88 |
) |
| 89 |
tiff? ( >=media-libs/tiff-3.5.7:0 ) |
| 90 |
svg? ( >=gnome-base/librsvg-2.36.0:2 ) |
| 91 |
|
| 92 |
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild |
| 93 |
index fc0e9d31d19..73a8c30f70f 100644 |
| 94 |
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild |
| 95 |
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild |
| 96 |
@@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2 |
| 97 |
>=media-libs/libpng-1.6.25:0 |
| 98 |
python? ( |
| 99 |
${PYTHON_DEPS} |
| 100 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 101 |
- >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
| 102 |
+ $(python_gen_cond_dep ' |
| 103 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] |
| 104 |
+ >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] |
| 105 |
+ ') |
| 106 |
) |
| 107 |
>=media-libs/tiff-3.5.7:0 |
| 108 |
>=gnome-base/librsvg-2.40.6:2 |
| 109 |
|
| 110 |
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild |
| 111 |
index 31756e7a18c..a8add4680ec 100644 |
| 112 |
--- a/media-gfx/gimp/gimp-9999.ebuild |
| 113 |
+++ b/media-gfx/gimp/gimp-9999.ebuild |
| 114 |
@@ -65,7 +65,9 @@ COMMON_DEPEND=" |
| 115 |
postscript? ( app-text/ghostscript-gpl ) |
| 116 |
python? ( |
| 117 |
${PYTHON_DEPS} |
| 118 |
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] |
| 119 |
+ $(python_gen_cond_dep ' |
| 120 |
+ >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}] |
| 121 |
+ ') |
| 122 |
) |
| 123 |
udev? ( >=dev-libs/libgudev-167:= ) |
| 124 |
unwind? ( >=sys-libs/libunwind-1.1.0:= ) |
Archives