[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/

[Michał Górny]

commit:     81245c75f8b75958ca76ab28e38f20353219fb0d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 06:58:46 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 21:12:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81245c75

dev-python/scipy: Pass -Dblas, -Dlapack via DISTUTILS_ARGS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/scipy/scipy-1.9.3.ebuild    | 11 +++++------
 dev-python/scipy/scipy-1.9.9999.ebuild | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev-python/scipy/scipy-1.9.3.ebuild 
b/dev-python/scipy/scipy-1.9.3.ebuild
index 18e8c08b3222..7c62ef8bb35f 100644
--- a/dev-python/scipy/scipy-1.9.3.ebuild
+++ b/dev-python/scipy/scipy-1.9.3.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+       >=dev-python/meson-python-0.11[${PYTHON_USEDEP}]
        dev-python/pybind11[${PYTHON_USEDEP}]
        >=dev-util/meson-0.62.2
        dev-util/patchelf
@@ -70,10 +71,6 @@ BDEPEND="
        fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
        test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
-)
-
 EPYTEST_DESELECT=(
        linalg/tests/test_decomp.py::TestSchur::test_sort
        linalg/tests/test_solvers.py::test_solve_discrete_are
@@ -90,9 +87,11 @@ src_unpack() {
 }
 
 python_configure_all() {
-       # workaround stupid numpy distutils overrides, indirectly via pythran
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
        export SCIPY_USE_PYTHRAN=$(usex fortran 1 0)
+       DISTUTILS_ARGS=(
+               -Dblas=blas
+               -Dlapack=lapack
+       )
 }
 
 python_test() {

diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild 
b/dev-python/scipy/scipy-1.9.9999.ebuild
index 6396c461e4e3..b85e9495ebc9 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+       >=dev-python/meson-python-0.11[${PYTHON_USEDEP}]
        dev-python/pybind11[${PYTHON_USEDEP}]
        >=dev-util/meson-0.62.2
        dev-util/patchelf
@@ -70,10 +71,6 @@ BDEPEND="
        fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
        test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
-)
-
 EPYTEST_DESELECT=(
        linalg/tests/test_decomp.py::TestSchur::test_sort
        linalg/tests/test_solvers.py::test_solve_discrete_are
@@ -90,9 +87,11 @@ src_unpack() {
 }
 
 python_configure_all() {
-       # workaround stupid numpy distutils overrides, indirectly via pythran
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
        export SCIPY_USE_PYTHRAN=$(usex fortran 1 0)
+       DISTUTILS_ARGS=(
+               -Dblas=blas
+               -Dlapack=lapack
+       )
 }
 
 python_test() {