Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-image/
Date: Sun, 31 Jul 2022 02:59:19
Message-Id: 1659235868.8239d0fc01c9095a7222f4104551e84fc7851367.sam@gentoo
1 commit: 8239d0fc01c9095a7222f4104551e84fc7851367
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 02:51:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 02:51:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8239d0fc
7
8 sci-libs/scikit-image: scipy always has sparse
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../{scikit-image-0.17.2-r1.ebuild => scikit-image-0.17.2-r2.ebuild} | 4 ++--
13 .../{scikit-image-0.19.1.ebuild => scikit-image-0.19.1-r1.ebuild} | 4 ++--
14 .../{scikit-image-0.19.2.ebuild => scikit-image-0.19.2-r1.ebuild} | 2 +-
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17 diff --git a/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2-r2.ebuild
18 similarity index 93%
19 rename from sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild
20 rename to sci-libs/scikit-image/scikit-image-0.17.2-r2.ebuild
21 index 762e9a629aac..0823ec7e3843 100644
22 --- a/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild
23 +++ b/sci-libs/scikit-image/scikit-image-0.17.2-r2.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2021 Gentoo Authors
26 +# Copyright 1999-2022 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 @@ -20,7 +20,7 @@ RDEPEND="dev-python/imageio[${PYTHON_USEDEP}]
31 dev-python/numpy[${PYTHON_USEDEP}]
32 dev-python/pillow[${PYTHON_USEDEP}]
33 dev-python/pywavelets[${PYTHON_USEDEP}]
34 - dev-python/scipy[sparse,${PYTHON_USEDEP}]
35 + dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
36 dev-python/tifffile[${PYTHON_USEDEP}]"
37 DEPEND="${RDEPEND}"
38 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
39
40 diff --git a/sci-libs/scikit-image/scikit-image-0.19.1.ebuild b/sci-libs/scikit-image/scikit-image-0.19.1-r1.ebuild
41 similarity index 94%
42 rename from sci-libs/scikit-image/scikit-image-0.19.1.ebuild
43 rename to sci-libs/scikit-image/scikit-image-0.19.1-r1.ebuild
44 index 2ed329d762d2..34c089266bee 100644
45 --- a/sci-libs/scikit-image/scikit-image-0.19.1.ebuild
46 +++ b/sci-libs/scikit-image/scikit-image-0.19.1-r1.ebuild
47 @@ -1,4 +1,4 @@
48 -# Copyright 1999-2021 Gentoo Authors
49 +# Copyright 1999-2022 Gentoo Authors
50 # Distributed under the terms of the GNU General Public License v2
51
52 EAPI=8
53 @@ -24,7 +24,7 @@ RDEPEND="
54 dev-python/numpy[${PYTHON_USEDEP}]
55 dev-python/pillow[${PYTHON_USEDEP}]
56 dev-python/pywavelets[${PYTHON_USEDEP}]
57 - dev-python/scipy[sparse,${PYTHON_USEDEP}]
58 + dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
59 dev-python/tifffile[${PYTHON_USEDEP}]
60 "
61 DEPEND="${RDEPEND}"
62
63 diff --git a/sci-libs/scikit-image/scikit-image-0.19.2.ebuild b/sci-libs/scikit-image/scikit-image-0.19.2-r1.ebuild
64 similarity index 97%
65 rename from sci-libs/scikit-image/scikit-image-0.19.2.ebuild
66 rename to sci-libs/scikit-image/scikit-image-0.19.2-r1.ebuild
67 index ab2d264aa8f2..870f5cb3d753 100644
68 --- a/sci-libs/scikit-image/scikit-image-0.19.2.ebuild
69 +++ b/sci-libs/scikit-image/scikit-image-0.19.2-r1.ebuild
70 @@ -23,7 +23,7 @@ RDEPEND="
71 dev-python/numpy[${PYTHON_USEDEP}]
72 dev-python/pillow[${PYTHON_USEDEP}]
73 dev-python/pywavelets[${PYTHON_USEDEP}]
74 - dev-python/scipy[sparse,${PYTHON_USEDEP}]
75 + dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
76 dev-python/tifffile[${PYTHON_USEDEP}]
77 "
78 DEPEND="${RDEPEND}"