commit:     b97c692bdf00d06a3eace3c2aea88b5b9bc9d46a
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 18:53:27 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 03:51:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97c692b

dev-python/scipy: remove outdated workaround for pythran

The upstream issue was fixed and released in 0.16, which is also the
only version we package anymore. Bump the dependency to make sure people
actually updated this bdep, and drop our hack.

This also fixes the problem where people misdiagnose a faulty personal
environment as a portage bug, due to setting PYTHONPATH="". Well...
actually it may hide the issue entirely, if scipy.signal as the `signal`
module doesn't actually get used. :) But that is beside the point.

Bug: https://bugs.gentoo.org/936948
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-python/scipy/scipy-1.14.0.ebuild | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/dev-python/scipy/scipy-1.14.0.ebuild 
b/dev-python/scipy/scipy-1.14.0.ebuild
index cd7be229a991..d92a8af88f7a 100644
--- a/dev-python/scipy/scipy-1.14.0.ebuild
+++ b/dev-python/scipy/scipy-1.14.0.ebuild
@@ -67,7 +67,7 @@ BDEPEND="
        virtual/pkgconfig
        doc? ( app-arch/unzip )
        fortran? (
-               >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
+               >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
        )
        test? (
                >=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
@@ -97,18 +97,6 @@ python_configure_all() {
 
        # https://bugs.gentoo.org/932721
        has_version '>=dev-python/numpy-2.0.0' && filter-lto
-
-       # hide real scipy, to prevent pythran crashing when scipy is being
-       # rebuilt for new numpy ABI
-       # https://github.com/serge-sans-paille/pythran/issues/2194
-       cat >> "${T}/scipy.py" <<-EOF || die
-               raise ImportError("hide real scipy")
-       EOF
-}
-
-python_compile() {
-       local -x PYTHONPATH="${T}${PYTHONPATH+:${PYTHONPATH}}"
-       distutils-r1_python_compile
 }
 
 python_test() {

Reply via email to