From: Michał Górny Date: Mon, 27 Jan 2020 20:42:49 +0000 (+0100) Subject: sci-libs/scipy: Revert "fixing numpy deps" X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be70e7ea0c9382d2c68d7bb48444e4265940317c;p=gentoo.git sci-libs/scipy: Revert "fixing numpy deps" Change done in explicit violation of maintainer's request. Signed-off-by: Michał Górny --- diff --git a/sci-libs/scipy/scipy-1.1.0-r2.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild similarity index 94% rename from sci-libs/scipy/scipy-1.1.0-r2.ebuild rename to sci-libs/scipy/scipy-1.1.0.ebuild index 68223502d2cd..a676281fbac9 100644 --- a/sci-libs/scipy/scipy-1.1.0-r2.ebuild +++ b/sci-libs/scipy/scipy-1.1.0.ebuild @@ -26,8 +26,7 @@ RESTRICT="!test? ( test )" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=" - $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*') - $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 'python3*') + >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas virtual/lapack