sci-geosciences/grass: Switch to PYTHON_MULTI_USEDEP API

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

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 1eae3bc22a9cfbebffdb26e119957cb186c7c555..595f714b7b87bbae70e8192ea1d0c7e1c0119bac 100644 (file)
--- 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 7ab6f3281d16ad81e970d7c7905feae6e4126e61..af8e8a283be99251dc82cf265ecc5b714c25f329 100644 (file)
--- 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