| 1 |
commit: 0a178f3dd5df4b56265e83fd9eab92edf1ab673d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 15:03:38 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:26:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a178f3d |
| 7 |
|
| 8 |
media-gfx/inkscape: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{inkscape-0.92.4-r1.ebuild => inkscape-0.92.4-r2.ebuild} | 12 ++++++------ |
| 13 |
...nkscape-1.0_beta2.ebuild => inkscape-1.0_beta2-r1.ebuild} | 10 +++++++--- |
| 14 |
media-gfx/inkscape/inkscape-9999.ebuild | 10 +++++++--- |
| 15 |
3 files changed, 20 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from media-gfx/inkscape/inkscape-0.92.4-r1.ebuild |
| 20 |
rename to media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 21 |
index 8550767b269..bc73e6c6f57 100644 |
| 22 |
--- a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild |
| 23 |
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild |
| 24 |
@@ -32,9 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 25 |
>=dev-libs/libxml2-2.6.20 |
| 26 |
>=dev-libs/libxslt-1.0.15 |
| 27 |
dev-libs/popt |
| 28 |
- dev-python/lxml[${PYTHON_USEDEP}] |
| 29 |
media-gfx/potrace |
| 30 |
- media-gfx/scour[${PYTHON_USEDEP}] |
| 31 |
media-libs/fontconfig |
| 32 |
media-libs/freetype:2 |
| 33 |
media-libs/libpng:0= |
| 34 |
@@ -72,10 +70,12 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 35 |
# install these so we could of course just not depend on those and rely |
| 36 |
# on that. |
| 37 |
RDEPEND="${COMMON_DEPEND} |
| 38 |
- || ( |
| 39 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 40 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 41 |
- ) |
| 42 |
+ $(python_gen_cond_dep ' |
| 43 |
+ || ( |
| 44 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 45 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 46 |
+ ) |
| 47 |
+ ') |
| 48 |
media-gfx/uniconvertor |
| 49 |
dia? ( app-office/dia ) |
| 50 |
latex? ( |
| 51 |
|
| 52 |
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild |
| 53 |
similarity index 95% |
| 54 |
rename from media-gfx/inkscape/inkscape-1.0_beta2.ebuild |
| 55 |
rename to media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild |
| 56 |
index fe3ac5ac3a7..52bc56d18a5 100644 |
| 57 |
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild |
| 58 |
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild |
| 59 |
@@ -41,9 +41,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 60 |
>=dev-libs/libxslt-1.1.25 |
| 61 |
dev-libs/gdl:3 |
| 62 |
dev-libs/popt |
| 63 |
- dev-python/lxml[${PYTHON_USEDEP}] |
| 64 |
media-gfx/potrace |
| 65 |
- media-gfx/scour[${PYTHON_USEDEP}] |
| 66 |
media-libs/fontconfig |
| 67 |
media-libs/freetype:2 |
| 68 |
media-libs/libpng:0= |
| 69 |
@@ -52,6 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 70 |
x11-libs/libX11 |
| 71 |
>=x11-libs/pango-1.37.2 |
| 72 |
x11-libs/gtk+:3 |
| 73 |
+ $(python_gen_cond_dep ' |
| 74 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
| 75 |
+ media-gfx/scour[${PYTHON_MULTI_USEDEP}] |
| 76 |
+ ') |
| 77 |
cdr? ( |
| 78 |
app-text/libwpg:0.3 |
| 79 |
dev-libs/librevenge |
| 80 |
@@ -85,7 +87,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 81 |
# install these so we could of course just not depend on those and rely |
| 82 |
# on that. |
| 83 |
RDEPEND="${COMMON_DEPEND} |
| 84 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 85 |
+ $(python_gen_cond_dep ' |
| 86 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 87 |
+ ') |
| 88 |
dia? ( app-office/dia ) |
| 89 |
postscript? ( app-text/ghostscript-gpl ) |
| 90 |
" |
| 91 |
|
| 92 |
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild |
| 93 |
index 1a10390a90d..bc57307639b 100644 |
| 94 |
--- a/media-gfx/inkscape/inkscape-9999.ebuild |
| 95 |
+++ b/media-gfx/inkscape/inkscape-9999.ebuild |
| 96 |
@@ -40,9 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 97 |
>=dev-libs/libxslt-1.1.25 |
| 98 |
dev-libs/gdl:3 |
| 99 |
dev-libs/popt |
| 100 |
- dev-python/lxml[${PYTHON_USEDEP}] |
| 101 |
media-gfx/potrace |
| 102 |
- media-gfx/scour[${PYTHON_USEDEP}] |
| 103 |
media-libs/fontconfig |
| 104 |
media-libs/freetype:2 |
| 105 |
media-libs/libpng:0= |
| 106 |
@@ -51,6 +49,10 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 107 |
x11-libs/libX11 |
| 108 |
>=x11-libs/pango-1.37.2 |
| 109 |
x11-libs/gtk+:3 |
| 110 |
+ $(python_gen_cond_dep ' |
| 111 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
| 112 |
+ media-gfx/scour[${PYTHON_MULTI_USEDEP}] |
| 113 |
+ ') |
| 114 |
cdr? ( |
| 115 |
app-text/libwpg:0.3 |
| 116 |
dev-libs/librevenge |
| 117 |
@@ -84,7 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 118 |
# install these so we could of course just not depend on those and rely |
| 119 |
# on that. |
| 120 |
RDEPEND="${COMMON_DEPEND} |
| 121 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 122 |
+ $(python_gen_cond_dep ' |
| 123 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 124 |
+ ') |
| 125 |
dia? ( app-office/dia ) |
| 126 |
postscript? ( app-text/ghostscript-gpl ) |
| 127 |
" |
Archives