commit: c6e1c019205cf536a6522e9d99acbaa05873d8a7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 4 00:22:56 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 4 00:23:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e1c019
dev-python/scipy: fix pkg_setup optionality for fortran, rename USE=pythran This still doesn't fix USE=-fortran builds, but reported that upstream now. Bug: https://bugs.gentoo.org/878361 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/scipy/scipy-1.9.3.ebuild | 7 ++++--- dev-python/scipy/scipy-1.9.9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild index 3b6adf392e6b..0f38a0cb37a1 100644 --- a/dev-python/scipy/scipy-1.9.3.ebuild +++ b/dev-python/scipy/scipy-1.9.3.ebuild @@ -3,6 +3,7 @@ EAPI=8 +FORTRAN_NEEDED=fortran DISTUTILS_USE_PEP517=meson-python PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" @@ -44,7 +45,7 @@ fi LICENSE="BSD LGPL-2" SLOT="0" -IUSE="doc +pythran" +IUSE="doc +fortran" # umfpack is technically optional but it's preferred to have it available. DEPEND=" @@ -66,7 +67,7 @@ BDEPEND=" dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) - pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) + fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" PATCHES=( @@ -89,7 +90,7 @@ src_unpack() { } python_configure_all() { - export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) + export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) } python_test() { diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild index 3b6adf392e6b..0f38a0cb37a1 100644 --- a/dev-python/scipy/scipy-1.9.9999.ebuild +++ b/dev-python/scipy/scipy-1.9.9999.ebuild @@ -3,6 +3,7 @@ EAPI=8 +FORTRAN_NEEDED=fortran DISTUTILS_USE_PEP517=meson-python PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" @@ -44,7 +45,7 @@ fi LICENSE="BSD LGPL-2" SLOT="0" -IUSE="doc +pythran" +IUSE="doc +fortran" # umfpack is technically optional but it's preferred to have it available. DEPEND=" @@ -66,7 +67,7 @@ BDEPEND=" dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) - pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) + fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" PATCHES=( @@ -89,7 +90,7 @@ src_unpack() { } python_configure_all() { - export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) + export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) } python_test() {
