| 1 |
commit: 8ba9e5b982ef7fd97b46b4b0f20c93ea71f6c103 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 18:01:42 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba9e5b9 |
| 7 |
|
| 8 |
sci-chemistry/vmd: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sci-chemistry/vmd/vmd-1.9.2.ebuild | 10 ++++++---- |
| 13 |
sci-chemistry/vmd/vmd-1.9.3-r1.ebuild | 10 ++++++---- |
| 14 |
sci-chemistry/vmd/{vmd-1.9.3-r3.ebuild => vmd-1.9.3-r4.ebuild} | 10 ++++++---- |
| 15 |
sci-chemistry/vmd/vmd-1.9.3.ebuild | 10 ++++++---- |
| 16 |
4 files changed, 24 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild |
| 19 |
index 2cee984cdd4..92daf030477 100644 |
| 20 |
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild |
| 21 |
+++ b/sci-chemistry/vmd/vmd-1.9.2.ebuild |
| 22 |
@@ -27,10 +27,12 @@ CDEPEND=" |
| 23 |
>=dev-lang/tk-8.6.1 |
| 24 |
dev-lang/perl |
| 25 |
dev-libs/expat |
| 26 |
- || ( |
| 27 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 28 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 29 |
- ) |
| 30 |
+ $(python_gen_cond_dep ' |
| 31 |
+ || ( |
| 32 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 33 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 34 |
+ ) |
| 35 |
+ ') |
| 36 |
sci-libs/netcdf:0= |
| 37 |
virtual/opengl |
| 38 |
>=x11-libs/fltk-1.1.10-r2:1 |
| 39 |
|
| 40 |
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild |
| 41 |
index abf5d03202f..f42cb4d104f 100644 |
| 42 |
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild |
| 43 |
+++ b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild |
| 44 |
@@ -27,10 +27,12 @@ CDEPEND=" |
| 45 |
>=dev-lang/tk-8.6.1:0= |
| 46 |
dev-lang/perl |
| 47 |
dev-libs/expat |
| 48 |
- || ( |
| 49 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 50 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 51 |
- ) |
| 52 |
+ $(python_gen_cond_dep ' |
| 53 |
+ || ( |
| 54 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 55 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 56 |
+ ) |
| 57 |
+ ') |
| 58 |
sci-libs/netcdf:0= |
| 59 |
virtual/opengl |
| 60 |
>=x11-libs/fltk-1.1.10-r2:1 |
| 61 |
|
| 62 |
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild |
| 63 |
similarity index 98% |
| 64 |
rename from sci-chemistry/vmd/vmd-1.9.3-r3.ebuild |
| 65 |
rename to sci-chemistry/vmd/vmd-1.9.3-r4.ebuild |
| 66 |
index 8d8897a57f8..39e7a9751ce 100644 |
| 67 |
--- a/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild |
| 68 |
+++ b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild |
| 69 |
@@ -27,10 +27,12 @@ CDEPEND=" |
| 70 |
>=dev-lang/tk-8.6.1:0= |
| 71 |
dev-lang/perl |
| 72 |
dev-libs/expat |
| 73 |
- || ( |
| 74 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 75 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 76 |
- ) |
| 77 |
+ $(python_gen_cond_dep ' |
| 78 |
+ || ( |
| 79 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 80 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 81 |
+ ) |
| 82 |
+ ') |
| 83 |
sci-libs/netcdf:0= |
| 84 |
virtual/opengl |
| 85 |
>=x11-libs/fltk-1.1.10-r2:1 |
| 86 |
|
| 87 |
diff --git a/sci-chemistry/vmd/vmd-1.9.3.ebuild b/sci-chemistry/vmd/vmd-1.9.3.ebuild |
| 88 |
index 01098a723de..88394af1970 100644 |
| 89 |
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild |
| 90 |
+++ b/sci-chemistry/vmd/vmd-1.9.3.ebuild |
| 91 |
@@ -27,10 +27,12 @@ CDEPEND=" |
| 92 |
>=dev-lang/tk-8.6.1 |
| 93 |
dev-lang/perl |
| 94 |
dev-libs/expat |
| 95 |
- || ( |
| 96 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 97 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 98 |
- ) |
| 99 |
+ $(python_gen_cond_dep ' |
| 100 |
+ || ( |
| 101 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 102 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 103 |
+ ) |
| 104 |
+ ') |
| 105 |
sci-libs/netcdf:0= |
| 106 |
virtual/opengl |
| 107 |
>=x11-libs/fltk-1.1.10-r2:1 |
Archives