summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-01-16 07:29:12 +0100
committerMichał Górny <mgorny@gentoo.org>2020-01-16 07:38:09 +0100
commitd9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5 (patch)
tree8d759b6d12ec5fe4a0e2aad0be9cfdc4c7d24f07 /sci-geosciences
parentsci-chemistry/vmd: Permit numpy-python2 (diff)
downloadgentoo-d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5.tar.gz
gentoo-d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5.tar.bz2
gentoo-d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5.zip
sci-geosciences/grass: Permit numpy-python2
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/grass/grass-7.4.4-r1.ebuild7
-rw-r--r--sci-geosciences/grass/grass-7.4.4.ebuild7
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