[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/

["Sam James" <sam@gentoo.org>]

commit:     9df55e4f0c2556c83ccb51eebce70fefc76989ca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 01:57:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 01:57:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df55e4f

dev-python/scipy: add 1.9.0_rc2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/scipy/Manifest                                   |  2 +-
 .../{scipy-1.9.0_rc1.ebuild => scipy-1.9.0_rc2.ebuild}      |  4 ++--
 dev-python/scipy/scipy-1.9.9999.ebuild                      | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 3155ebc0d471..06d764c811f0 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,4 @@
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
-DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe
+DIST scipy-1.9.0rc2.tar.gz 41994528 BLAKE2B a1f72c54dda09a2086756e61cf35be30485e5f237b8a5c339002aa6532017fd215e029e9762b8b669d36975d0df751f7cbe1b0d1da60e12376f70e706af4bdf7 SHA512 dce69ee783d6a234c0a9300af055a59a4de23ba4fedfd2aa16e8dfd244eff72a217c242b332ab500389b236d3bac81ebb202a9f0ed8d1cffa82c36290fd49f77
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728

diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc2.ebuild
similarity index 95%
rename from dev-python/scipy/scipy-1.9.0_rc1.ebuild
rename to dev-python/scipy/scipy-1.9.0_rc2.ebuild
index aa0db9c53032..19c83a0756f4 100644
--- a/dev-python/scipy/scipy-1.9.0_rc1.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc2.ebuild
@@ -47,10 +47,10 @@ SLOT="0"
 IUSE="doc +sparse"
 
 DEPEND="
-	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
 	sci-libs/arpack:0=
 	virtual/cblas
-	virtual/lapack
+	>=virtual/lapack-3.8
 	sparse? ( sci-libs/umfpack:0= )"
 RDEPEND="${DEPEND}
 	dev-python/pillow[${PYTHON_USEDEP}]"

diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index a25a63827ff7..19c83a0756f4 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -26,15 +26,20 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	# Upstream is often behind with doc updates
 	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
 
 	SRC_URI="
-		mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
 		doc? (
 			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
 			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
 		)"
+	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
 fi
 
 LICENSE="BSD LGPL-2"
@@ -42,10 +47,10 @@ SLOT="0"
 IUSE="doc +sparse"
 
 DEPEND="
-	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
 	sci-libs/arpack:0=
 	virtual/cblas
-	virtual/lapack
+	>=virtual/lapack-3.8
 	sparse? ( sci-libs/umfpack:0= )"
 RDEPEND="${DEPEND}
 	dev-python/pillow[${PYTHON_USEDEP}]"