diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-27 01:15:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-27 01:15:54 +0000 |
| commit | 4b5a61a22263bba1a5119af1b9b61f80517d02fd (patch) | |
| tree | 7acb10c8fed343782088865ecd16bd3efe268ad7 /dev-python/scipy | |
| parent | b3e456d42287ef73c7ff48148d18a9ea8fb8debf (diff) | |
gentoo auto-resync : 27:11:2022 - 01:15:53
Diffstat (limited to 'dev-python/scipy')
| -rw-r--r-- | dev-python/scipy/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/scipy/scipy-1.9.3.ebuild | 11 | ||||
| -rw-r--r-- | dev-python/scipy/scipy-1.9.9999.ebuild | 11 |
3 files changed, 12 insertions, 14 deletions
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index afa21ed71ccd..bfd7dc5e26c1 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -6,6 +6,6 @@ DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763 EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f -EBUILD scipy-1.9.3.ebuild 2514 BLAKE2B 7bdb834f05937fdf660d9e9874a353ac8e405c4b2e2ef455f4d9d478b4eb37395072766665f4d5185a5d472bcec9cbdae3d375407a57fa1ff78602980f3cf58c SHA512 ca6e616681ef59802390e5555acf94ac82373a5d8c9fd3b72b29b233b4962cfb3eaf8c01e8da2c5cd81ae8d98c6af456e72ca0299e2167dad274e0d59c66bf33 -EBUILD scipy-1.9.9999.ebuild 2501 BLAKE2B 88131a1e0f1774b496f20a1f51d52e18892342851e006f5e79179c2757d878c3a8ca622f76ecc2750cda199ef2927f09d9b44f01e77df8ad354bd678c4a1fce7 SHA512 461edf81f5d3435dc0e8e3060e11d0ca0029731445fceda46065634aa3b62e33bcf5f89da04816847348227e2842ffa33d1e563f954931997ccbf63e6657e119 +EBUILD scipy-1.9.3.ebuild 2436 BLAKE2B 314d29f24855e4740c92186c4394ed06c1d1e2fbedd6d712a9cd213569e6c591ad735900445d963b1385b86cc7917dbed43b35f20870be0c277d03cd593f6e02 SHA512 ec83ee6f04fb29e4c7db731b846cebb2e17f33878373532c1a14a1248e6f9ffe00e549f1a1d841050b2484867ac50eda92154fb2eb58aa55e3b767740f24c921 +EBUILD scipy-1.9.9999.ebuild 2423 BLAKE2B 7748a666cd11817a90e8bfd284615c95be1230f7891eed9f389b1abf1d52e59a6221f1679b5a92977ce9d8cadc7ae3b11731e65c0426f320060bcce3cfb6d7d2 SHA512 53c88741fd4924be2e68c65ad1f7ab11092776b3f1ea019d0f133a45d60dbfed5abbac0f04b49254661463f94f430d3ff41c01a97fb8e28349f202232e286718 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb 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() { |