1 |
commit: b3b95491e29af254135e028d65c5cfc560efa608 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 18:01:01 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:35:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b95491 |
7 |
|
8 |
sci-chemistry/relax: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
...relax-4.0.0-r3.ebuild => relax-4.0.0-r4.ebuild} | 36 ++++++++++++---------- |
13 |
1 file changed, 19 insertions(+), 17 deletions(-) |
14 |
|
15 |
diff --git a/sci-chemistry/relax/relax-4.0.0-r3.ebuild b/sci-chemistry/relax/relax-4.0.0-r4.ebuild |
16 |
similarity index 66% |
17 |
rename from sci-chemistry/relax/relax-4.0.0-r3.ebuild |
18 |
rename to sci-chemistry/relax/relax-4.0.0-r4.ebuild |
19 |
index 28b0f5d9da6..ba03dbad845 100644 |
20 |
--- a/sci-chemistry/relax/relax-4.0.0-r3.ebuild |
21 |
+++ b/sci-chemistry/relax/relax-4.0.0-r4.ebuild |
22 |
@@ -23,25 +23,27 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
23 |
|
24 |
RDEPEND=" |
25 |
${PYTHON_DEPS} |
26 |
- dev-python/Numdifftools[${PYTHON_USEDEP}] |
27 |
- || ( |
28 |
- dev-python/matplotlib-python2[${PYTHON_USEDEP}] |
29 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
30 |
- ) |
31 |
- || ( |
32 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
33 |
- dev-python/numpy[${PYTHON_USEDEP}] |
34 |
- ) |
35 |
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] |
36 |
+ $(python_gen_cond_dep " |
37 |
+ dev-python/Numdifftools[\${PYTHON_MULTI_USEDEP}] |
38 |
+ || ( |
39 |
+ dev-python/matplotlib-python2[\${PYTHON_MULTI_USEDEP}] |
40 |
+ dev-python/matplotlib[\${PYTHON_MULTI_USEDEP}] |
41 |
+ ) |
42 |
+ || ( |
43 |
+ dev-python/numpy-python2[\${PYTHON_MULTI_USEDEP}] |
44 |
+ dev-python/numpy[\${PYTHON_MULTI_USEDEP}] |
45 |
+ ) |
46 |
+ dev-python/wxpython:${WX_GTK_VER}[\${PYTHON_MULTI_USEDEP}] |
47 |
+ sci-chemistry/pymol[\${PYTHON_MULTI_USEDEP}] |
48 |
+ >=sci-libs/bmrblib-1.0.3[\${PYTHON_MULTI_USEDEP}] |
49 |
+ >=sci-libs/minfx-1.0.11[\${PYTHON_MULTI_USEDEP}] |
50 |
+ || ( |
51 |
+ sci-libs/scipy-python2[\${PYTHON_MULTI_USEDEP}] |
52 |
+ sci-libs/scipy[\${PYTHON_MULTI_USEDEP}] |
53 |
+ ) |
54 |
+ ") |
55 |
sci-chemistry/molmol |
56 |
- sci-chemistry/pymol[${PYTHON_USEDEP}] |
57 |
sci-chemistry/vmd |
58 |
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}] |
59 |
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}] |
60 |
- || ( |
61 |
- sci-libs/scipy-python2[${PYTHON_USEDEP}] |
62 |
- sci-libs/scipy[${PYTHON_USEDEP}] |
63 |
- ) |
64 |
sci-visualization/grace |
65 |
sci-visualization/opendx |
66 |
x11-libs/wxGTK:${WX_GTK_VER}[X]" |