summaryrefslogtreecommitdiff
path: root/sci-chemistry/relax
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
commit71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree9f1f0dee23e13658e52f49437befe78427148c51 /sci-chemistry/relax
parent29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
gentoo resync : 10.02.2020
Diffstat (limited to 'sci-chemistry/relax')
-rw-r--r--sci-chemistry/relax/Manifest2
-rw-r--r--sci-chemistry/relax/relax-4.0.0-r4.ebuild (renamed from sci-chemistry/relax/relax-4.0.0-r3.ebuild)36
2 files changed, 20 insertions, 18 deletions
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index f3b0b62ccafa..56c32abe4254 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1,3 @@
DIST relax-4.0.0.src.tar.bz2 105659752 BLAKE2B ce5fc9b7f31787f2189e75a543f8ba6fe3cd59ce7382c6c0f79c419b9f71b2d09bd16685e7fed3c9e3205be531efa2a8dc1cce707e77e2386d2a9f7a71b4b0c1 SHA512 28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
-EBUILD relax-4.0.0-r3.ebuild 1760 BLAKE2B 6ea79be4c348069a5cd54ce3f9614d145febcb47a76709b5c45c9400347d9ff035cf6138005a455e2b14c1a6a498cb8ee1fdc76d8c65aa99d82bbba966bd7d16 SHA512 c3a59cbba651f752650d840b60dfda46ceb7f6f2673607e8e1b8f1265ff3595116f64830b3e00ee42a017ecd54cf27d008c841048f302a09a2c2abb87326a204
+EBUILD relax-4.0.0-r4.ebuild 1883 BLAKE2B 83dbe09ddc6feb3b7ec4af472eeac4e49c2cda90c84d2f19f19bdcf9414b97f0e7221a9e048c68535e6d5239511013738f4d969b01233034212efcefd7dca3c8 SHA512 5f657c2798e1a83626056ff7849339d3bb05f014ea579a1697e022a7b9628256c7c14a37fa71869be9d66fb1a935bc4907329c45d9cb9af7c6270ba1690046ef
MISC metadata.xml 1373 BLAKE2B d5a9e36f0412ef757a23aa4991986bdc394edc035f59b0206b246affc884417eb8446a598b23054972c97dc5d883cd0242e306f9e8d61620c144939845c0bcf1 SHA512 575ccfdae744fc5d97e795a22989b377954edeacb8ec4887d987a59af813f126551743c4b29b9c2b4a26a1840f05d42fb26fd39b7ae9b38e24373fab18c0270e
diff --git a/sci-chemistry/relax/relax-4.0.0-r3.ebuild b/sci-chemistry/relax/relax-4.0.0-r4.ebuild
index 28b0f5d9da67..ba03dbad8454 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]"