From: Rick Farina Date: Mon, 27 Jan 2020 18:16:54 +0000 (-0500) Subject: sci-libs/scipy: fixing numpy deps X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a97fa93304f40cd96c86cdcfeebcf32b1d18646;p=gentoo.git sci-libs/scipy: fixing numpy deps Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Rick Farina --- diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0-r2.ebuild similarity index 94% rename from sci-libs/scipy/scipy-1.1.0.ebuild rename to sci-libs/scipy/scipy-1.1.0-r2.ebuild index a676281fbac9..68223502d2cd 100644 --- a/sci-libs/scipy/scipy-1.1.0.ebuild +++ b/sci-libs/scipy/scipy-1.1.0-r2.ebuild @@ -26,7 +26,8 @@ RESTRICT="!test? ( test )" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=" - >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}] + $(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*') sci-libs/arpack:0= virtual/cblas virtual/lapack