From cbba69141db111820efc98edd6464b2f8e1bccfb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 20:01:56 +0100 Subject: [PATCH] sci-geosciences/grass: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../{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(-) rename sci-geosciences/grass/{grass-7.4.4-r2.ebuild => grass-7.4.4-r3.ebuild} (98%) 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 1eae3bc22a9c..595f714b7b87 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 7ab6f3281d16..af8e8a283be9 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 -- 2.26.2