| 1 |
commit: 588795db94366812e38da84d817d8a00bd7835ed |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 19:10:07 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588795db |
| 7 |
|
| 8 |
sci-physics/espresso: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../espresso/{espresso-4.0.0-r1.ebuild => espresso-4.0.0-r2.ebuild} | 6 ++++-- |
| 13 |
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 6 ++++-- |
| 14 |
sci-physics/espresso/espresso-9999.ebuild | 6 ++++-- |
| 15 |
3 files changed, 12 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from sci-physics/espresso/espresso-4.0.0-r1.ebuild |
| 20 |
rename to sci-physics/espresso/espresso-4.0.0-r2.ebuild |
| 21 |
index 00b53caa2ef..0afbf393e9a 100644 |
| 22 |
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild |
| 23 |
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild |
| 24 |
@@ -31,8 +31,10 @@ REQUIRED_USE=" |
| 25 |
|
| 26 |
RDEPEND=" |
| 27 |
${PYTHON_DEPS} |
| 28 |
- >=dev-python/cython-0.26.1[${PYTHON_USEDEP}] |
| 29 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 30 |
+ $(python_gen_cond_dep ' |
| 31 |
+ >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}] |
| 32 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 33 |
+ ') |
| 34 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
| 35 |
fftw? ( sci-libs/fftw:3.0 ) |
| 36 |
dev-libs/boost:=[mpi] |
| 37 |
|
| 38 |
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild |
| 39 |
index 5755eba6cdf..e7c540b1629 100644 |
| 40 |
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild |
| 41 |
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild |
| 42 |
@@ -33,8 +33,10 @@ REQUIRED_USE=" |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
${PYTHON_DEPS} |
| 46 |
- >dev-python/cython-0.22[${PYTHON_USEDEP}] |
| 47 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 48 |
+ $(python_gen_cond_dep ' |
| 49 |
+ >dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}] |
| 50 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 51 |
+ ') |
| 52 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
| 53 |
fftw? ( sci-libs/fftw:3.0 ) |
| 54 |
dev-libs/boost:=[mpi] |
| 55 |
|
| 56 |
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild |
| 57 |
index b9d14d3937e..fcc6fbc9926 100644 |
| 58 |
--- a/sci-physics/espresso/espresso-9999.ebuild |
| 59 |
+++ b/sci-physics/espresso/espresso-9999.ebuild |
| 60 |
@@ -31,8 +31,10 @@ REQUIRED_USE=" |
| 61 |
|
| 62 |
RDEPEND=" |
| 63 |
${PYTHON_DEPS} |
| 64 |
- >=dev-python/cython-0.26.1[${PYTHON_USEDEP}] |
| 65 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 66 |
+ $(python_gen_cond_dep ' |
| 67 |
+ >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}] |
| 68 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 69 |
+ ') |
| 70 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
| 71 |
fftw? ( sci-libs/fftw:3.0 ) |
| 72 |
dev-libs/boost:=[mpi] |
Archives