1 |
commit: 9df55e4f0c2556c83ccb51eebce70fefc76989ca |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 5 01:57:00 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 5 01:57:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df55e4f |
7 |
|
8 |
dev-python/scipy: add 1.9.0_rc2 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-python/scipy/Manifest | 2 +- |
13 |
.../{scipy-1.9.0_rc1.ebuild => scipy-1.9.0_rc2.ebuild} | 4 ++-- |
14 |
dev-python/scipy/scipy-1.9.9999.ebuild | 13 +++++++++---- |
15 |
3 files changed, 12 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest |
18 |
index 3155ebc0d471..06d764c811f0 100644 |
19 |
--- a/dev-python/scipy/Manifest |
20 |
+++ b/dev-python/scipy/Manifest |
21 |
@@ -1,4 +1,4 @@ |
22 |
DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea |
23 |
-DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe |
24 |
+DIST scipy-1.9.0rc2.tar.gz 41994528 BLAKE2B a1f72c54dda09a2086756e61cf35be30485e5f237b8a5c339002aa6532017fd215e029e9762b8b669d36975d0df751f7cbe1b0d1da60e12376f70e706af4bdf7 SHA512 dce69ee783d6a234c0a9300af055a59a4de23ba4fedfd2aa16e8dfd244eff72a217c242b332ab500389b236d3bac81ebb202a9f0ed8d1cffa82c36290fd49f77 |
25 |
DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac |
26 |
DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 |
27 |
|
28 |
diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc2.ebuild |
29 |
similarity index 95% |
30 |
rename from dev-python/scipy/scipy-1.9.0_rc1.ebuild |
31 |
rename to dev-python/scipy/scipy-1.9.0_rc2.ebuild |
32 |
index aa0db9c53032..19c83a0756f4 100644 |
33 |
--- a/dev-python/scipy/scipy-1.9.0_rc1.ebuild |
34 |
+++ b/dev-python/scipy/scipy-1.9.0_rc2.ebuild |
35 |
@@ -47,10 +47,10 @@ SLOT="0" |
36 |
IUSE="doc +sparse" |
37 |
|
38 |
DEPEND=" |
39 |
- >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}] |
40 |
+ >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] |
41 |
sci-libs/arpack:0= |
42 |
virtual/cblas |
43 |
- virtual/lapack |
44 |
+ >=virtual/lapack-3.8 |
45 |
sparse? ( sci-libs/umfpack:0= )" |
46 |
RDEPEND="${DEPEND} |
47 |
dev-python/pillow[${PYTHON_USEDEP}]" |
48 |
|
49 |
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild |
50 |
index a25a63827ff7..19c83a0756f4 100644 |
51 |
--- a/dev-python/scipy/scipy-1.9.9999.ebuild |
52 |
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild |
53 |
@@ -26,15 +26,20 @@ if [[ ${PV} == *9999* ]] ; then |
54 |
else |
55 |
# Upstream is often behind with doc updates |
56 |
DOC_PV=1.8.1 |
57 |
+ MY_PV=${PV/_rc/rc} |
58 |
+ MY_P=${PN}-${MY_PV} |
59 |
|
60 |
SRC_URI=" |
61 |
- mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
62 |
+ mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz |
63 |
doc? ( |
64 |
https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip |
65 |
https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf |
66 |
)" |
67 |
+ S="${WORKDIR}"/${MY_P} |
68 |
|
69 |
- KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
70 |
+ if [[ ${PV} != *rc* ]] ; then |
71 |
+ KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
72 |
+ fi |
73 |
fi |
74 |
|
75 |
LICENSE="BSD LGPL-2" |
76 |
@@ -42,10 +47,10 @@ SLOT="0" |
77 |
IUSE="doc +sparse" |
78 |
|
79 |
DEPEND=" |
80 |
- >=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}] |
81 |
+ >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] |
82 |
sci-libs/arpack:0= |
83 |
virtual/cblas |
84 |
- virtual/lapack |
85 |
+ >=virtual/lapack-3.8 |
86 |
sparse? ( sci-libs/umfpack:0= )" |
87 |
RDEPEND="${DEPEND} |
88 |
dev-python/pillow[${PYTHON_USEDEP}]" |