| 1 |
commit: c6e1c019205cf536a6522e9d99acbaa05873d8a7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 00:22:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 00:23:25 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e1c019 |
| 7 |
|
| 8 |
dev-python/scipy: fix pkg_setup optionality for fortran, rename USE=pythran |
| 9 |
|
| 10 |
This still doesn't fix USE=-fortran builds, but reported that upstream now. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/878361 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/scipy/scipy-1.9.3.ebuild | 7 ++++--- |
| 16 |
dev-python/scipy/scipy-1.9.9999.ebuild | 7 ++++--- |
| 17 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild |
| 20 |
index 3b6adf392e6b..0f38a0cb37a1 100644 |
| 21 |
--- a/dev-python/scipy/scipy-1.9.3.ebuild |
| 22 |
+++ b/dev-python/scipy/scipy-1.9.3.ebuild |
| 23 |
@@ -3,6 +3,7 @@ |
| 24 |
|
| 25 |
EAPI=8 |
| 26 |
|
| 27 |
+FORTRAN_NEEDED=fortran |
| 28 |
DISTUTILS_USE_PEP517=meson-python |
| 29 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 30 |
PYTHON_REQ_USE="threads(+)" |
| 31 |
@@ -44,7 +45,7 @@ fi |
| 32 |
|
| 33 |
LICENSE="BSD LGPL-2" |
| 34 |
SLOT="0" |
| 35 |
-IUSE="doc +pythran" |
| 36 |
+IUSE="doc +fortran" |
| 37 |
|
| 38 |
# umfpack is technically optional but it's preferred to have it available. |
| 39 |
DEPEND=" |
| 40 |
@@ -66,7 +67,7 @@ BDEPEND=" |
| 41 |
dev-util/patchelf |
| 42 |
virtual/pkgconfig |
| 43 |
doc? ( app-arch/unzip ) |
| 44 |
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 45 |
+ fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 46 |
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" |
| 47 |
|
| 48 |
PATCHES=( |
| 49 |
@@ -89,7 +90,7 @@ src_unpack() { |
| 50 |
} |
| 51 |
|
| 52 |
python_configure_all() { |
| 53 |
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) |
| 54 |
+ export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) |
| 55 |
} |
| 56 |
|
| 57 |
python_test() { |
| 58 |
|
| 59 |
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild |
| 60 |
index 3b6adf392e6b..0f38a0cb37a1 100644 |
| 61 |
--- a/dev-python/scipy/scipy-1.9.9999.ebuild |
| 62 |
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild |
| 63 |
@@ -3,6 +3,7 @@ |
| 64 |
|
| 65 |
EAPI=8 |
| 66 |
|
| 67 |
+FORTRAN_NEEDED=fortran |
| 68 |
DISTUTILS_USE_PEP517=meson-python |
| 69 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 70 |
PYTHON_REQ_USE="threads(+)" |
| 71 |
@@ -44,7 +45,7 @@ fi |
| 72 |
|
| 73 |
LICENSE="BSD LGPL-2" |
| 74 |
SLOT="0" |
| 75 |
-IUSE="doc +pythran" |
| 76 |
+IUSE="doc +fortran" |
| 77 |
|
| 78 |
# umfpack is technically optional but it's preferred to have it available. |
| 79 |
DEPEND=" |
| 80 |
@@ -66,7 +67,7 @@ BDEPEND=" |
| 81 |
dev-util/patchelf |
| 82 |
virtual/pkgconfig |
| 83 |
doc? ( app-arch/unzip ) |
| 84 |
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 85 |
+ fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 86 |
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" |
| 87 |
|
| 88 |
PATCHES=( |
| 89 |
@@ -89,7 +90,7 @@ src_unpack() { |
| 90 |
} |
| 91 |
|
| 92 |
python_configure_all() { |
| 93 |
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) |
| 94 |
+ export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) |
| 95 |
} |
| 96 |
|
| 97 |
python_test() { |
Archives