| 1 |
commit: cbba69141db111820efc98edd6464b2f8e1bccfb |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 19:01:56 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbba6914 |
| 7 |
|
| 8 |
sci-geosciences/grass: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../grass/{grass-7.4.4-r2.ebuild => grass-7.4.4-r3.ebuild} | 10 ++++++---- |
| 13 |
sci-geosciences/grass/grass-7.4.4.ebuild | 10 ++++++---- |
| 14 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild |
| 17 |
similarity index 98% |
| 18 |
rename from sci-geosciences/grass/grass-7.4.4-r2.ebuild |
| 19 |
rename to sci-geosciences/grass/grass-7.4.4-r3.ebuild |
| 20 |
index 1eae3bc22a9..595f714b7b8 100644 |
| 21 |
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild |
| 22 |
+++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild |
| 23 |
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm |
| 24 |
|
| 25 |
RDEPEND="${PYTHON_DEPS} |
| 26 |
>=app-admin/eselect-1.2 |
| 27 |
- || ( |
| 28 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 29 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 30 |
- ) |
| 31 |
+ $(python_gen_cond_dep ' |
| 32 |
+ || ( |
| 33 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 34 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 35 |
+ ) |
| 36 |
+ ') |
| 37 |
media-libs/libprojectm |
| 38 |
sci-libs/gdal |
| 39 |
sys-libs/gdbm |
| 40 |
|
| 41 |
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild |
| 42 |
index 7ab6f3281d1..af8e8a283be 100644 |
| 43 |
--- a/sci-geosciences/grass/grass-7.4.4.ebuild |
| 44 |
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild |
| 45 |
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm |
| 46 |
|
| 47 |
RDEPEND="${PYTHON_DEPS} |
| 48 |
>=app-admin/eselect-1.2 |
| 49 |
- || ( |
| 50 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 51 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 52 |
- ) |
| 53 |
+ $(python_gen_cond_dep ' |
| 54 |
+ || ( |
| 55 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 56 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 57 |
+ ) |
| 58 |
+ ') |
| 59 |
media-libs/libprojectm |
| 60 |
sci-libs/gdal |
| 61 |
sys-libs/gdbm |
Archives