1 |
commit: 86318134b18dd16cd10a67e1986594556181da43 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 19:12:46 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:46:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86318134 |
7 |
|
8 |
sci-visualization/pythonprop: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sci-visualization/pythonprop/pythonprop-0.13.ebuild | 12 +++++++----- |
13 |
.../{pythonprop-0.18-r1.ebuild => pythonprop-0.18-r2.ebuild} | 12 +++++++----- |
14 |
2 files changed, 14 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild |
17 |
index 854920aa56a..729017cea4f 100644 |
18 |
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild |
19 |
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild |
20 |
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
21 |
|
22 |
RDEPEND=" |
23 |
${PYTHON_DEPS} |
24 |
- || ( |
25 |
- dev-python/matplotlib-python2[gtk2,${PYTHON_USEDEP}] |
26 |
- dev-python/matplotlib[gtk2,${PYTHON_USEDEP}] |
27 |
- ) |
28 |
- dev-python/basemap[${PYTHON_USEDEP}] |
29 |
+ $(python_gen_cond_dep ' |
30 |
+ || ( |
31 |
+ dev-python/matplotlib-python2[gtk2,${PYTHON_MULTI_USEDEP}] |
32 |
+ dev-python/matplotlib[gtk2,${PYTHON_MULTI_USEDEP}] |
33 |
+ ) |
34 |
+ ') |
35 |
+ dev-python/basemap[${PYTHON_SINGLE_USEDEP}] |
36 |
sci-electronics/voacapl |
37 |
" |
38 |
DEPEND="${RDEPEND}" |
39 |
|
40 |
diff --git a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild |
41 |
similarity index 80% |
42 |
rename from sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild |
43 |
rename to sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild |
44 |
index a5c36e5b53b..4f8e8ef1e52 100644 |
45 |
--- a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild |
46 |
+++ b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild |
47 |
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
48 |
|
49 |
RDEPEND=" |
50 |
${PYTHON_DEPS} |
51 |
- || ( |
52 |
- dev-python/matplotlib-python2[${PYTHON_USEDEP}] |
53 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
54 |
- ) |
55 |
- dev-python/basemap[${PYTHON_USEDEP}] |
56 |
+ $(python_gen_cond_dep ' |
57 |
+ || ( |
58 |
+ dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}] |
59 |
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] |
60 |
+ ) |
61 |
+ ') |
62 |
+ dev-python/basemap[${PYTHON_SINGLE_USEDEP}] |
63 |
sci-electronics/voacapl |
64 |
" |
65 |
DEPEND="${RDEPEND} |