commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 18:01:01 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:35:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b95491
sci-chemistry/relax: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...relax-4.0.0-r3.ebuild => relax-4.0.0-r4.ebuild} | 36 ++++++++++++----------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/sci-chemistry/relax/relax-4.0.0-r3.ebuild
b/sci-chemistry/relax/relax-4.0.0-r4.ebuild
similarity index 66%
rename from sci-chemistry/relax/relax-4.0.0-r3.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r4.ebuild
index 28b0f5d9da6..ba03dbad845 100644
--- a/sci-chemistry/relax/relax-4.0.0-r3.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r4.ebuild
@@ -23,25 +23,27 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- || (
- dev-python/matplotlib-python2[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep "
+ dev-python/Numdifftools[\${PYTHON_MULTI_USEDEP}]
+ || (
+ dev-python/matplotlib-python2[\${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[\${PYTHON_MULTI_USEDEP}]
+ )
+ || (
+ dev-python/numpy-python2[\${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[\${PYTHON_MULTI_USEDEP}]
+ )
+ dev-python/wxpython:${WX_GTK_VER}[\${PYTHON_MULTI_USEDEP}]
+ sci-chemistry/pymol[\${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/bmrblib-1.0.3[\${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/minfx-1.0.11[\${PYTHON_MULTI_USEDEP}]
+ || (
+ sci-libs/scipy-python2[\${PYTHON_MULTI_USEDEP}]
+ sci-libs/scipy[\${PYTHON_MULTI_USEDEP}]
+ )
+ ")
sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- || (
- sci-libs/scipy-python2[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )
sci-visualization/grace
sci-visualization/opendx
x11-libs/wxGTK:${WX_GTK_VER}[X]"
