commit:     d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:29:12 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:38:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ef686a

sci-geosciences/grass: Permit numpy-python2

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

 sci-geosciences/grass/grass-7.4.4-r1.ebuild | 7 +++++--
 sci-geosciences/grass/grass-7.4.4.ebuild    | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild 
b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
index 5c87d32bf2a..4fc91618386 100644
--- a/sci-geosciences/grass/grass-7.4.4-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ 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[${PYTHON_USEDEP}]
+       || (
+               dev-python/numpy-python2[${PYTHON_USEDEP}]
+               dev-python/numpy[${PYTHON_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 e067fbf0aaa..e875e74c758 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ 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[${PYTHON_USEDEP}]
+       || (
+               dev-python/numpy-python2[${PYTHON_USEDEP}]
+               dev-python/numpy[${PYTHON_USEDEP}]
+       )
        media-libs/libprojectm
        sci-libs/gdal
        sys-libs/gdbm

Reply via email to