1 |
commit: f459fb452fc7f96b02f60e4a5c90469c1ec0f749 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 11:30:06 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:11:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f459fb45 |
7 |
|
8 |
app-office/scribus: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-office/scribus/scribus-1.5.5.ebuild | 6 +++++- |
13 |
app-office/scribus/scribus-9999.ebuild | 6 +++++- |
14 |
2 files changed, 10 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild |
17 |
index fa0caa4e246..ca708fa897b 100644 |
18 |
--- a/app-office/scribus/scribus-1.5.5.ebuild |
19 |
+++ b/app-office/scribus/scribus-1.5.5.ebuild |
20 |
@@ -60,7 +60,11 @@ DEPEND="${PYTHON_DEPS} |
21 |
graphicsmagick? ( media-gfx/graphicsmagick:= ) |
22 |
osg? ( dev-games/openscenegraph:= ) |
23 |
pdf? ( app-text/podofo:0= ) |
24 |
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) |
25 |
+ scripts? ( |
26 |
+ $(python_gen_cond_dep ' |
27 |
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}] |
28 |
+ ') |
29 |
+ ) |
30 |
" |
31 |
RDEPEND="${DEPEND} |
32 |
app-text/ghostscript-gpl |
33 |
|
34 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
35 |
index 2fc0d191008..97d62f8d370 100644 |
36 |
--- a/app-office/scribus/scribus-9999.ebuild |
37 |
+++ b/app-office/scribus/scribus-9999.ebuild |
38 |
@@ -62,7 +62,11 @@ DEPEND="${PYTHON_DEPS} |
39 |
graphicsmagick? ( media-gfx/graphicsmagick:= ) |
40 |
osg? ( dev-games/openscenegraph:= ) |
41 |
pdf? ( app-text/podofo:0= ) |
42 |
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) |
43 |
+ scripts? ( |
44 |
+ $(python_gen_cond_dep ' |
45 |
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}] |
46 |
+ ') |
47 |
+ ) |
48 |
" |
49 |
RDEPEND="${DEPEND} |
50 |
app-text/ghostscript-gpl |