commit:     266047631ed9f1288226a999e075c48bd1beab4f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 23:43:44 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 23:43:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26604763

dev-python/scipy: add dev-python/pythran to DEPEND as well as BDEPEND

It turns out that we need dev-python/pythran in both BDEPEND (for 
/usr/bin/pythran)
*and* DEPEND for pythran-generated code to be compiled as it uses headers
from pythran.

Bug: https://bugs.gentoo.org/922782
Bug: https://bugs.gentoo.org/950050
Closes: https://bugs.gentoo.org/950049
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/scipy/scipy-1.14.1.ebuild | 10 +++++++++-
 dev-python/scipy/scipy-1.15.0.ebuild |  8 ++++++++
 dev-python/scipy/scipy-1.15.1.ebuild |  8 ++++++++
 dev-python/scipy/scipy-1.15.2.ebuild |  8 ++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dev-python/scipy/scipy-1.14.1.ebuild 
b/dev-python/scipy/scipy-1.14.1.ebuild
index 3059a8fefe9d..d67d083e638d 100644
--- a/dev-python/scipy/scipy-1.14.1.ebuild
+++ b/dev-python/scipy/scipy-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,9 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc +fortran test-rust"
 
+# pythran is needed in both BDEPEND (for /usr/bin/pythran) and in DEPEND
+# to actually compile code generated by pythran (headers and such needed).
+#
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
        >=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
@@ -57,6 +60,11 @@ RDEPEND="
        ${DEPEND}
        dev-python/pillow[${PYTHON_USEDEP}]
 "
+DEPEND+="
+       fortran? (
+               >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+       )
+"
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-3.0.8[${PYTHON_USEDEP}]

diff --git a/dev-python/scipy/scipy-1.15.0.ebuild 
b/dev-python/scipy/scipy-1.15.0.ebuild
index 9412dd55294c..87e8e7913028 100644
--- a/dev-python/scipy/scipy-1.15.0.ebuild
+++ b/dev-python/scipy/scipy-1.15.0.ebuild
@@ -45,6 +45,9 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc +fortran test-rust"
 
+# pythran is needed in both BDEPEND (for /usr/bin/pythran) and in DEPEND
+# to actually compile code generated by pythran (headers and such needed).
+#
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
        >=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
@@ -57,6 +60,11 @@ RDEPEND="
        ${DEPEND}
        dev-python/pillow[${PYTHON_USEDEP}]
 "
+DEPEND+="
+       fortran? (
+               >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+       )
+"
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-3.0.8[${PYTHON_USEDEP}]

diff --git a/dev-python/scipy/scipy-1.15.1.ebuild 
b/dev-python/scipy/scipy-1.15.1.ebuild
index 6f6e6f18f523..0e11bd7ac443 100644
--- a/dev-python/scipy/scipy-1.15.1.ebuild
+++ b/dev-python/scipy/scipy-1.15.1.ebuild
@@ -45,6 +45,9 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc +fortran test-rust"
 
+# pythran is needed in both BDEPEND (for /usr/bin/pythran) and in DEPEND
+# to actually compile code generated by pythran (headers and such needed).
+#
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
        >=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
@@ -57,6 +60,11 @@ RDEPEND="
        ${DEPEND}
        dev-python/pillow[${PYTHON_USEDEP}]
 "
+DEPEND+="
+       fortran? (
+               >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+       )
+"
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-3.0.8[${PYTHON_USEDEP}]

diff --git a/dev-python/scipy/scipy-1.15.2.ebuild 
b/dev-python/scipy/scipy-1.15.2.ebuild
index 73243ddf3913..30d711c136a7 100644
--- a/dev-python/scipy/scipy-1.15.2.ebuild
+++ b/dev-python/scipy/scipy-1.15.2.ebuild
@@ -45,6 +45,9 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc +fortran test-rust"
 
+# pythran is needed in both BDEPEND (for /usr/bin/pythran) and in DEPEND
+# to actually compile code generated by pythran (headers and such needed).
+#
 # umfpack is technically optional but it's preferred to have it available.
 DEPEND="
        >=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
@@ -57,6 +60,11 @@ RDEPEND="
        ${DEPEND}
        dev-python/pillow[${PYTHON_USEDEP}]
 "
+DEPEND+="
+       fortran? (
+               >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+       )
+"
 BDEPEND="
        dev-lang/swig
        >=dev-python/cython-3.0.8[${PYTHON_USEDEP}]

Reply via email to