From d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 16 Jan 2020 07:29:12 +0100 Subject: [PATCH] sci-geosciences/grass: Permit numpy-python2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 5c87d32bf2ab..4fc916183868 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 e067fbf0aaa6..e875e74c7586 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 -- 2.26.2