[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

[Michał Górny]

commit:     cbba69141db111820efc98edd6464b2f8e1bccfb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 19:01:56 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:35:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbba6914

sci-geosciences/grass: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../grass/{grass-7.4.4-r2.ebuild => grass-7.4.4-r3.ebuild}     | 10 ++++++----
 sci-geosciences/grass/grass-7.4.4.ebuild                       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild 
b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.4.4-r2.ebuild
rename to sci-geosciences/grass/grass-7.4.4-r3.ebuild
index 1eae3bc22a9..595f714b7b8 100644
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls 
odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
        >=app-admin/eselect-1.2
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
        media-libs/libprojectm
        sci-libs/gdal
        sys-libs/gdbm

diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild 
b/sci-geosciences/grass/grass-7.4.4.ebuild
index 7ab6f3281d1..af8e8a283be 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls 
odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
        >=app-admin/eselect-1.2
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
        media-libs/libprojectm
        sci-libs/gdal
        sys-libs/gdbm