Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/soapy_power/, dev-python/pyqtgraph/, sci-physics/qmeq/, ...
Date: Fri, 18 Sep 2020 10:08:15
Message-Id: 1600423686.51a7be728639841f69b134f8acebeaa0fd3e4fe9.mgorny@gentoo
1 ev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild dev-python/uranium/uranium-4.6.1.ebuild dev-python/uranium/uranium-4.7.0.ebuild dev-python/xarray/xarray-0.12.1.ebuild dev-python/xarray/xarray-0.16.0.ebuild dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild dev-ros/calibration_estimation/calibration_estimation-9999.ebuild net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild net-wireless/soapy_power/metadata.xml net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild net-wireless/soapy_power/soapy_power-9999.ebuild profiles/updates/3Q-2020 sci-biology/biopandas/biopandas-0.2.7.ebuild sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild sci-chemistry/chemex/cheme
2 x-2018.10.2.ebuild sci-chemistry/chemex/chemex-2018.10.3.ebuild sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild sci-chemistry/nmrglue/nmrglue-0.7.ebuild sci-libs/cartopy/cartopy-0.18.0.ebuild sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild sci-libs/numkit/numkit-1.1.2.ebuild sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild sci-libs/scipy/Manifest sci-libs/scipy/metadata.xml sci-libs/scipy/scipy-1.1.0.ebuild sci-libs/scipy/scipy-1.4.1.ebuild sci-libs/scipy/scipy-1.5.0.ebuild sci-libs/scipy/scipy-1.5.1.ebuild sci-libs/scipy/scipy-1.5.2.ebuild sci-libs/shogun/s
3 hogun-5.0.0-r1.ebuild sci-mathematics/pymc3/pymc3-3.1
4 -r1.ebuild sci-physics/qmeq/qmeq-1.0-r1.ebuild sci-physics/qutip/qutip-4.2.0.ebuild sci-visualization/pythonprop/pythonprop-0.29.ebuild sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild sci-visualization/tensorboard/tensorboard-2.2.1.ebuild sys-cluster/ceph/ceph-14.2.11.ebuild sys-cluster/ceph/ceph-15.2.4-r3.ebuild sys-cluster/ceph/ceph-15.2.5.ebuild
5 X-VCS-Directories: sci-libs/cartopy/ dev-ros/calibration_estimation/ sci-libs/scikits_learn/ dev-python/spyder-kernels/ sci-visualization/pythonprop/ sci-chemistry/mdtraj/ sci-chemistry/MDAnalysis/ dev-python/spyder/ dev-python/moviepy/ dev-python/patsy/ dev-python/networkx/ dev-python/GridDataFormats/ dev-python/scipy/ net-wireless/gnuradio/ dev-python/pyqtgraph/ net-wireless/soapy_power/ sci-libs/scikits_timeseries/ sci-libs/scipy/ sci-physics/qmeq/ dev-python/bottleneck/ dev-python/nltk/ sci-biology/biopandas/ dev-python/seaborn/ sci-libs/scikits_image/ dev-python/pandas/ sci-physics/qutip/ sci-mathematics/pymc3/ sci-libs/shogun/ dev-python/pslab-python/ profiles/updates/ sci-chemistry/nmrglue/ sci-chemistry/ParmEd/ dev-python/dask/ sci-visualization/tensorboard/ dev-python/graph-tool/ dev-python/tikzplotlib/ dev-python/pweave/ dev-python/statsmodels/ dev-python/simplespectral/ dev-python/matplotlib/ dev-python/oct2py/ dev-python/lmfit/ dev-python/theano/ sys-cluster/ceph/ sci-lib
6 s/keras-preprocessing/ dev-python/uranium/ dev-python/xarray/ sci-libs/numkit/ sci-chemistry/chemex/ dev-python/pyamg/
7 X-VCS-Committer: mgorny
8 X-VCS-Committer-Name: Michał Górny
9 X-VCS-Revision: 51a7be728639841f69b134f8acebeaa0fd3e4fe9
10 X-VCS-Branch: master
11 Date: Fri, 18 Sep 2020 10:08:09 +0000 (UTC)
12
13 commit: 51a7be728639841f69b134f8acebeaa0fd3e4fe9
14 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
15 AuthorDate: Fri Sep 18 10:07:08 2020 +0000
16 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
17 CommitDate: Fri Sep 18 10:08:06 2020 +0000
18 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a7be72
19
20 Move {sci-libs → dev-python}/scipy
21
22 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
23
24 dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild | 2 +-
25 dev-python/bottleneck/bottleneck-1.3.2.ebuild | 2 +-
26 dev-python/dask/dask-1.2.0.ebuild | 2 +-
27 dev-python/dask/dask-2.22.0.ebuild | 2 +-
28 dev-python/dask/dask-2.23.0.ebuild | 2 +-
29 dev-python/dask/dask-2.24.0.ebuild | 2 +-
30 dev-python/dask/dask-2.25.0.ebuild | 2 +-
31 dev-python/dask/dask-2.26.0.ebuild | 2 +-
32 dev-python/graph-tool/graph-tool-2.29.ebuild | 2 +-
33 dev-python/graph-tool/graph-tool-9999.ebuild | 2 +-
34 dev-python/lmfit/lmfit-1.0.1.ebuild | 2 +-
35 dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild | 2 +-
36 dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild | 2 +-
37 dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild | 2 +-
38 dev-python/matplotlib/matplotlib-3.3.2.ebuild | 2 +-
39 dev-python/moviepy/moviepy-1.0.1-r1.ebuild | 2 +-
40 dev-python/networkx/networkx-2.4-r1.ebuild | 4 ++--
41 dev-python/networkx/networkx-2.5.ebuild | 4 ++--
42 dev-python/nltk/nltk-3.5.ebuild | 2 +-
43 dev-python/oct2py/oct2py-5.2.0-r1.ebuild | 2 +-
44 dev-python/pandas/pandas-1.0.5.ebuild | 6 +++---
45 dev-python/pandas/pandas-1.1.0.ebuild | 6 +++---
46 dev-python/pandas/pandas-1.1.1.ebuild | 6 +++---
47 dev-python/pandas/pandas-1.1.2.ebuild | 6 +++---
48 dev-python/patsy/patsy-0.5.1.ebuild | 2 +-
49 dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild | 2 +-
50 dev-python/pweave/pweave-0.30.3-r1.ebuild | 2 +-
51 dev-python/pyamg/pyamg-3.2.1-r1.ebuild | 2 +-
52 dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild | 2 +-
53 {sci-libs => dev-python}/scipy/Manifest | 0
54 {sci-libs => dev-python}/scipy/metadata.xml | 0
55 {sci-libs => dev-python}/scipy/scipy-1.1.0.ebuild | 0
56 {sci-libs => dev-python}/scipy/scipy-1.4.1.ebuild | 0
57 {sci-libs => dev-python}/scipy/scipy-1.5.0.ebuild | 0
58 {sci-libs => dev-python}/scipy/scipy-1.5.1.ebuild | 0
59 {sci-libs => dev-python}/scipy/scipy-1.5.2.ebuild | 0
60 dev-python/seaborn/seaborn-0.10.0.ebuild | 2 +-
61 dev-python/seaborn/seaborn-0.10.1.ebuild | 2 +-
62 dev-python/simplespectral/metadata.xml | 2 +-
63 dev-python/simplespectral/simplespectral-1.0.0.ebuild | 2 +-
64 dev-python/simplespectral/simplespectral-9999.ebuild | 2 +-
65 dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild | 2 +-
66 dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild | 2 +-
67 dev-python/spyder/spyder-4.1.4.ebuild | 4 ++--
68 dev-python/spyder/spyder-4.1.5.ebuild | 4 ++--
69 dev-python/statsmodels/statsmodels-0.11.1.ebuild | 2 +-
70 dev-python/statsmodels/statsmodels-0.12.0.ebuild | 4 ++--
71 dev-python/statsmodels/statsmodels-9999.ebuild | 2 +-
72 dev-python/theano/theano-1.0.5.ebuild | 2 +-
73 dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild | 2 +-
74 dev-python/uranium/uranium-4.6.1.ebuild | 2 +-
75 dev-python/uranium/uranium-4.7.0.ebuild | 2 +-
76 dev-python/xarray/xarray-0.12.1.ebuild | 2 +-
77 dev-python/xarray/xarray-0.16.0.ebuild | 2 +-
78 .../calibration_estimation/calibration_estimation-0.10.14.ebuild | 2 +-
79 dev-ros/calibration_estimation/calibration_estimation-9999.ebuild | 2 +-
80 net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild | 4 ++--
81 net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild | 4 ++--
82 net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild | 6 +++---
83 net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild | 6 +++---
84 net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild | 6 +++---
85 net-wireless/gnuradio/gnuradio-9999.ebuild | 6 +++---
86 net-wireless/soapy_power/metadata.xml | 2 +-
87 net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild | 2 +-
88 net-wireless/soapy_power/soapy_power-9999.ebuild | 2 +-
89 profiles/updates/3Q-2020 | 1 +
90 sci-biology/biopandas/biopandas-0.2.7.ebuild | 2 +-
91 sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild | 2 +-
92 sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild | 2 +-
93 sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild | 2 +-
94 sci-chemistry/chemex/chemex-2018.10.2.ebuild | 2 +-
95 sci-chemistry/chemex/chemex-2018.10.3.ebuild | 2 +-
96 sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild | 2 +-
97 sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild | 2 +-
98 sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild | 2 +-
99 sci-chemistry/nmrglue/nmrglue-0.7.ebuild | 2 +-
100 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
101 sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild | 2 +-
102 sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild | 2 +-
103 sci-libs/numkit/numkit-1.1.2.ebuild | 2 +-
104 sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild | 2 +-
105 sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild | 4 ++--
106 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild | 4 ++--
107 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild | 4 ++--
108 sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild | 2 +-
109 sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild | 2 +-
110 sci-libs/shogun/shogun-5.0.0-r1.ebuild | 2 +-
111 sci-mathematics/pymc3/pymc3-3.1-r1.ebuild | 2 +-
112 sci-physics/qmeq/qmeq-1.0-r1.ebuild | 2 +-
113 sci-physics/qutip/qutip-4.2.0.ebuild | 2 +-
114 sci-visualization/pythonprop/pythonprop-0.29.ebuild | 2 +-
115 sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild | 2 +-
116 sci-visualization/tensorboard/tensorboard-2.2.1.ebuild | 2 +-
117 sys-cluster/ceph/ceph-14.2.11.ebuild | 2 +-
118 sys-cluster/ceph/ceph-15.2.4-r3.ebuild | 2 +-
119 sys-cluster/ceph/ceph-15.2.5.ebuild | 2 +-
120 96 files changed, 115 insertions(+), 114 deletions(-)
121
122 diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
123 index 9fe4d0a0e85..74f8f99edd5 100644
124 --- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
125 +++ b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
126 @@ -19,4 +19,4 @@ IUSE=""
127 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
128 RDEPEND="
129 >=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
130 - sci-libs/scipy[${PYTHON_USEDEP}]"
131 + dev-python/scipy[${PYTHON_USEDEP}]"
132
133 diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
134 index cc85db2cccf..6c26824281b 100644
135 --- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
136 +++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
137 @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
138
139 RDEPEND="
140 >=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
141 - sci-libs/scipy[${PYTHON_USEDEP}]
142 + dev-python/scipy[${PYTHON_USEDEP}]
143 "
144 DEPEND="${RDEPEND}
145 dev-python/setuptools[${PYTHON_USEDEP}]
146
147 diff --git a/dev-python/dask/dask-1.2.0.ebuild b/dev-python/dask/dask-1.2.0.ebuild
148 index 561a15e629d..37102d7058d 100644
149 --- a/dev-python/dask/dask-1.2.0.ebuild
150 +++ b/dev-python/dask/dask-1.2.0.ebuild
151 @@ -36,7 +36,7 @@ DEPEND="
152 dev-python/numexpr[${PYTHON_USEDEP}]
153 dev-python/pytest[${PYTHON_USEDEP}]
154 dev-python/pyyaml[${PYTHON_USEDEP}]
155 - sci-libs/scipy[${PYTHON_USEDEP}]
156 + dev-python/scipy[${PYTHON_USEDEP}]
157 )
158 "
159
160
161 diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
162 index f99ce3726dc..4ba14c792b9 100644
163 --- a/dev-python/dask/dask-2.22.0.ebuild
164 +++ b/dev-python/dask/dask-2.22.0.ebuild
165 @@ -34,7 +34,7 @@ BDEPEND="
166 dev-python/numexpr[${PYTHON_USEDEP}]
167 dev-python/pytest-xdist[${PYTHON_USEDEP}]
168 >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
169 - sci-libs/scipy[${PYTHON_USEDEP}]
170 + dev-python/scipy[${PYTHON_USEDEP}]
171 )
172 "
173
174
175 diff --git a/dev-python/dask/dask-2.23.0.ebuild b/dev-python/dask/dask-2.23.0.ebuild
176 index ca386a69eec..3489dff6930 100644
177 --- a/dev-python/dask/dask-2.23.0.ebuild
178 +++ b/dev-python/dask/dask-2.23.0.ebuild
179 @@ -34,7 +34,7 @@ BDEPEND="
180 dev-python/numexpr[${PYTHON_USEDEP}]
181 dev-python/pytest-xdist[${PYTHON_USEDEP}]
182 >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
183 - sci-libs/scipy[${PYTHON_USEDEP}]
184 + dev-python/scipy[${PYTHON_USEDEP}]
185 )
186 "
187
188
189 diff --git a/dev-python/dask/dask-2.24.0.ebuild b/dev-python/dask/dask-2.24.0.ebuild
190 index b0c47455277..61df563da70 100644
191 --- a/dev-python/dask/dask-2.24.0.ebuild
192 +++ b/dev-python/dask/dask-2.24.0.ebuild
193 @@ -34,7 +34,7 @@ BDEPEND="
194 dev-python/numexpr[${PYTHON_USEDEP}]
195 dev-python/pytest-xdist[${PYTHON_USEDEP}]
196 >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
197 - sci-libs/scipy[${PYTHON_USEDEP}]
198 + dev-python/scipy[${PYTHON_USEDEP}]
199 )
200 "
201
202
203 diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
204 index eb47b5d4660..bb975ebbad7 100644
205 --- a/dev-python/dask/dask-2.25.0.ebuild
206 +++ b/dev-python/dask/dask-2.25.0.ebuild
207 @@ -30,7 +30,7 @@ BDEPEND="
208 dev-python/numexpr[${PYTHON_USEDEP}]
209 dev-python/pytest-xdist[${PYTHON_USEDEP}]
210 >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
211 - sci-libs/scipy[${PYTHON_USEDEP}]
212 + dev-python/scipy[${PYTHON_USEDEP}]
213 )
214 "
215
216
217 diff --git a/dev-python/dask/dask-2.26.0.ebuild b/dev-python/dask/dask-2.26.0.ebuild
218 index 9741a26c587..e188a716d44 100644
219 --- a/dev-python/dask/dask-2.26.0.ebuild
220 +++ b/dev-python/dask/dask-2.26.0.ebuild
221 @@ -31,7 +31,7 @@ BDEPEND="
222 dev-python/numexpr[${PYTHON_USEDEP}]
223 dev-python/pytest-xdist[${PYTHON_USEDEP}]
224 >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
225 - sci-libs/scipy[${PYTHON_USEDEP}]
226 + dev-python/scipy[${PYTHON_USEDEP}]
227 )
228 "
229
230
231 diff --git a/dev-python/graph-tool/graph-tool-2.29.ebuild b/dev-python/graph-tool/graph-tool-2.29.ebuild
232 index 90b94419f20..0b9a248e370 100644
233 --- a/dev-python/graph-tool/graph-tool-2.29.ebuild
234 +++ b/dev-python/graph-tool/graph-tool-2.29.ebuild
235 @@ -28,7 +28,7 @@ RDEPEND="
236 >=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
237 dev-libs/expat:=
238 dev-python/numpy[${PYTHON_USEDEP}]
239 - sci-libs/scipy[${PYTHON_USEDEP}]
240 + dev-python/scipy[${PYTHON_USEDEP}]
241 sci-mathematics/cgal:=
242 cairo? (
243 dev-cpp/cairomm
244
245 diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
246 index 90b94419f20..0b9a248e370 100644
247 --- a/dev-python/graph-tool/graph-tool-9999.ebuild
248 +++ b/dev-python/graph-tool/graph-tool-9999.ebuild
249 @@ -28,7 +28,7 @@ RDEPEND="
250 >=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
251 dev-libs/expat:=
252 dev-python/numpy[${PYTHON_USEDEP}]
253 - sci-libs/scipy[${PYTHON_USEDEP}]
254 + dev-python/scipy[${PYTHON_USEDEP}]
255 sci-mathematics/cgal:=
256 cairo? (
257 dev-cpp/cairomm
258
259 diff --git a/dev-python/lmfit/lmfit-1.0.1.ebuild b/dev-python/lmfit/lmfit-1.0.1.ebuild
260 index 3b27e1c92c0..8f2bfa1ccdd 100644
261 --- a/dev-python/lmfit/lmfit-1.0.1.ebuild
262 +++ b/dev-python/lmfit/lmfit-1.0.1.ebuild
263 @@ -18,7 +18,7 @@ BDEPEND="
264 >=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
265 >=dev-python/numpy-1.16[${PYTHON_USEDEP}]
266 >=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
267 - >=sci-libs/scipy-1.2[${PYTHON_USEDEP}]
268 + >=dev-python/scipy-1.2[${PYTHON_USEDEP}]
269 "
270 RDEPEND="${DEPEND}"
271
272
273 diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
274 index 3296b24075d..de55fd15dca 100644
275 --- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
276 +++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
277 @@ -81,7 +81,7 @@ BDEPEND="
278 >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
279 >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
280 >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
281 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
282 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
283 >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
284 >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
285 >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
286
287 diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
288 index 92a63fef156..068882d344d 100644
289 --- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
290 +++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
291 @@ -81,7 +81,7 @@ BDEPEND="
292 >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
293 >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
294 >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
295 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
296 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
297 >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
298 >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
299 >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
300
301 diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
302 index d8b120fa06f..39022728532 100644
303 --- a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
304 +++ b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
305 @@ -82,7 +82,7 @@ BDEPEND="
306 >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
307 >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
308 >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
309 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
310 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
311 >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
312 >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
313 >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
314
315 diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
316 index 9ded3690e45..f3c2b26d36e 100644
317 --- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
318 +++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
319 @@ -82,7 +82,7 @@ BDEPEND="
320 >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
321 >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
322 >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
323 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
324 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
325 >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
326 >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
327 >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
328
329 diff --git a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
330 index d50206e77d3..97a5c0f42da 100644
331 --- a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
332 +++ b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
333 @@ -27,7 +27,7 @@ RDEPEND="
334 dev-python/pygame[${PYTHON_USEDEP}]
335 dev-python/tqdm[${PYTHON_USEDEP}]
336 dev-python/urllib3[${PYTHON_USEDEP}]
337 - sci-libs/scipy[${PYTHON_USEDEP}]
338 + dev-python/scipy[${PYTHON_USEDEP}]
339 media-video/ffmpeg
340 "
341 DEPEND="${RDEPEND}"
342
343 diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
344 index d98c149620d..989d4d5da9a 100644
345 --- a/dev-python/networkx/networkx-2.4-r1.ebuild
346 +++ b/dev-python/networkx/networkx-2.4-r1.ebuild
347 @@ -29,11 +29,11 @@ RDEPEND="
348 pandas? (
349 >=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
350 )
351 - scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
352 + scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
353 xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
354 yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
355 BDEPEND="
356 - test? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )"
357 + test? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )"
358
359 distutils_enable_tests pytest
360
361
362 diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
363 index 7b9a1d6f392..e3df9c8c3bc 100644
364 --- a/dev-python/networkx/networkx-2.5.ebuild
365 +++ b/dev-python/networkx/networkx-2.5.ebuild
366 @@ -29,12 +29,12 @@ RDEPEND="
367 pandas? (
368 >=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
369 )
370 - scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
371 + scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
372 xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
373 yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
374 BDEPEND="
375 test? (
376 - >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}]
377 + >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}]
378 )"
379
380 distutils_enable_tests pytest
381
382 diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
383 index d127c3a08cf..3cf78bba0f1 100644
384 --- a/dev-python/nltk/nltk-3.5.ebuild
385 +++ b/dev-python/nltk/nltk-3.5.ebuild
386 @@ -32,7 +32,7 @@ BDEPEND="
387 dev-python/pyparsing[${PYTHON_USEDEP}]
388 dev-python/twython[${PYTHON_USEDEP}]
389 sci-libs/scikits_learn[${PYTHON_USEDEP}]
390 - sci-libs/scipy[${PYTHON_USEDEP}]
391 + dev-python/scipy[${PYTHON_USEDEP}]
392 )"
393 PDEPEND="dev-python/nltk-data"
394
395
396 diff --git a/dev-python/oct2py/oct2py-5.2.0-r1.ebuild b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
397 index 475ad273c81..394f090b4be 100644
398 --- a/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
399 +++ b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
400 @@ -21,7 +21,7 @@ IUSE="examples"
401 RDEPEND="
402 >=dev-python/numpy-1.12[${PYTHON_USEDEP}]
403 >=dev-python/octave_kernel-0.31.0[${PYTHON_USEDEP}]
404 - >=sci-libs/scipy-0.17[${PYTHON_USEDEP}]"
405 + >=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
406 BDEPEND="
407 test? (
408 dev-python/ipython[${PYTHON_USEDEP}]
409
410 diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
411 index a58806fe205..ed65359d2c3 100644
412 --- a/dev-python/pandas/pandas-1.0.5.ebuild
413 +++ b/dev-python/pandas/pandas-1.0.5.ebuild
414 @@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
415 >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
416 >=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
417 dev-python/xlwt[${PYTHON_USEDEP}]
418 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
419 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
420 X? (
421 || (
422 dev-python/PyQt5[${PYTHON_USEDEP}]
423 @@ -84,7 +84,7 @@ DEPEND="${COMMON_DEPEND}
424 dev-python/sphinx[${PYTHON_USEDEP}]
425 dev-python/xlrd[${PYTHON_USEDEP}]
426 dev-python/xlwt[${PYTHON_USEDEP}]
427 - sci-libs/scipy[${PYTHON_USEDEP}]
428 + dev-python/scipy[${PYTHON_USEDEP}]
429 x11-misc/xclip
430 )
431 test? (
432 @@ -170,6 +170,6 @@ pkg_postinst() {
433 optfeature "R I/O support" dev-python/rpy
434 optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
435 optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
436 - optfeature "miscellaneous statistical functions" sci-libs/scipy
437 + optfeature "miscellaneous statistical functions" dev-python/scipy
438 optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
439 }
440
441 diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
442 index 0497d064102..0a4ffee0074 100644
443 --- a/dev-python/pandas/pandas-1.1.0.ebuild
444 +++ b/dev-python/pandas/pandas-1.1.0.ebuild
445 @@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
446 >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
447 >=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
448 dev-python/xlwt[${PYTHON_USEDEP}]
449 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
450 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
451 X? (
452 || (
453 dev-python/PyQt5[${PYTHON_USEDEP}]
454 @@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
455 dev-python/sphinx[${PYTHON_USEDEP}]
456 dev-python/xlrd[${PYTHON_USEDEP}]
457 dev-python/xlwt[${PYTHON_USEDEP}]
458 - sci-libs/scipy[${PYTHON_USEDEP}]
459 + dev-python/scipy[${PYTHON_USEDEP}]
460 x11-misc/xclip
461 )
462 test? (
463 @@ -172,6 +172,6 @@ pkg_postinst() {
464 optfeature "R I/O support" dev-python/rpy
465 optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
466 optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
467 - optfeature "miscellaneous statistical functions" sci-libs/scipy
468 + optfeature "miscellaneous statistical functions" dev-python/scipy
469 optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
470 }
471
472 diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
473 index de735561e5c..fac714b5282 100644
474 --- a/dev-python/pandas/pandas-1.1.1.ebuild
475 +++ b/dev-python/pandas/pandas-1.1.1.ebuild
476 @@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
477 >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
478 >=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
479 dev-python/xlwt[${PYTHON_USEDEP}]
480 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
481 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
482 X? (
483 || (
484 dev-python/PyQt5[${PYTHON_USEDEP}]
485 @@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
486 dev-python/sphinx[${PYTHON_USEDEP}]
487 dev-python/xlrd[${PYTHON_USEDEP}]
488 dev-python/xlwt[${PYTHON_USEDEP}]
489 - sci-libs/scipy[${PYTHON_USEDEP}]
490 + dev-python/scipy[${PYTHON_USEDEP}]
491 x11-misc/xclip
492 )
493 test? (
494 @@ -176,6 +176,6 @@ pkg_postinst() {
495 optfeature "R I/O support" dev-python/rpy
496 optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
497 optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
498 - optfeature "miscellaneous statistical functions" sci-libs/scipy
499 + optfeature "miscellaneous statistical functions" dev-python/scipy
500 optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
501 }
502
503 diff --git a/dev-python/pandas/pandas-1.1.2.ebuild b/dev-python/pandas/pandas-1.1.2.ebuild
504 index de735561e5c..fac714b5282 100644
505 --- a/dev-python/pandas/pandas-1.1.2.ebuild
506 +++ b/dev-python/pandas/pandas-1.1.2.ebuild
507 @@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
508 >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
509 >=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
510 dev-python/xlwt[${PYTHON_USEDEP}]
511 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
512 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
513 X? (
514 || (
515 dev-python/PyQt5[${PYTHON_USEDEP}]
516 @@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
517 dev-python/sphinx[${PYTHON_USEDEP}]
518 dev-python/xlrd[${PYTHON_USEDEP}]
519 dev-python/xlwt[${PYTHON_USEDEP}]
520 - sci-libs/scipy[${PYTHON_USEDEP}]
521 + dev-python/scipy[${PYTHON_USEDEP}]
522 x11-misc/xclip
523 )
524 test? (
525 @@ -176,6 +176,6 @@ pkg_postinst() {
526 optfeature "R I/O support" dev-python/rpy
527 optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
528 optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
529 - optfeature "miscellaneous statistical functions" sci-libs/scipy
530 + optfeature "miscellaneous statistical functions" dev-python/scipy
531 optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
532 }
533
534 diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
535 index e6498661a78..c36858bb581 100644
536 --- a/dev-python/patsy/patsy-0.5.1.ebuild
537 +++ b/dev-python/patsy/patsy-0.5.1.ebuild
538 @@ -18,7 +18,7 @@ IUSE="doc"
539 RDEPEND="
540 dev-python/numpy[${PYTHON_USEDEP}]
541 dev-python/six[${PYTHON_USEDEP}]
542 - sci-libs/scipy[${PYTHON_USEDEP}]
543 + dev-python/scipy[${PYTHON_USEDEP}]
544 "
545 BDEPEND="
546 doc? (
547
548 diff --git a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
549 index 9701c59385a..0b79bdd0a05 100644
550 --- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
551 +++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
552 @@ -18,7 +18,7 @@ KEYWORDS="amd64"
553 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
554 dev-python/pyqtgraph[${PYTHON_USEDEP}]
555 dev-python/pyserial[${PYTHON_USEDEP}]
556 - sci-libs/scipy[${PYTHON_USEDEP}]"
557 + dev-python/scipy[${PYTHON_USEDEP}]"
558
559 PATCHES=(
560 "${FILESDIR}"/${PN}-1.0.1-sys_version.patch
561
562 diff --git a/dev-python/pweave/pweave-0.30.3-r1.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
563 index f85db19e41d..30b5cb9ebd1 100644
564 --- a/dev-python/pweave/pweave-0.30.3-r1.ebuild
565 +++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
566 @@ -40,7 +40,7 @@ DEPEND="test? (
567 dev-python/matplotlib[${PYTHON_USEDEP}]
568 dev-python/nose[${PYTHON_USEDEP}]
569 dev-python/notebook[${PYTHON_USEDEP}]
570 - sci-libs/scipy[${PYTHON_USEDEP}] )"
571 + dev-python/scipy[${PYTHON_USEDEP}] )"
572
573 S="${WORKDIR}/${MY_P}"
574
575
576 diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
577 index f16d431c5e3..cc9224f2094 100644
578 --- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
579 +++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
580 @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
581
582 RDEPEND="
583 dev-python/numpy[${PYTHON_USEDEP}]
584 - sci-libs/scipy[${PYTHON_USEDEP}]
585 + dev-python/scipy[${PYTHON_USEDEP}]
586 "
587 DEPEND="${RDEPEND}
588 test? ( dev-python/nose[${PYTHON_USEDEP}] )
589
590 diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
591 index 2259d40e1ec..d6e54830b5a 100644
592 --- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
593 +++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
594 @@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
595 IUSE="examples opengl svg"
596
597 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
598 - sci-libs/scipy[${PYTHON_USEDEP}]
599 + dev-python/scipy[${PYTHON_USEDEP}]
600 dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
601 opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
602
603
604 diff --git a/sci-libs/scipy/Manifest b/dev-python/scipy/Manifest
605 similarity index 100%
606 rename from sci-libs/scipy/Manifest
607 rename to dev-python/scipy/Manifest
608
609 diff --git a/sci-libs/scipy/metadata.xml b/dev-python/scipy/metadata.xml
610 similarity index 100%
611 rename from sci-libs/scipy/metadata.xml
612 rename to dev-python/scipy/metadata.xml
613
614 diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/dev-python/scipy/scipy-1.1.0.ebuild
615 similarity index 100%
616 rename from sci-libs/scipy/scipy-1.1.0.ebuild
617 rename to dev-python/scipy/scipy-1.1.0.ebuild
618
619 diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/dev-python/scipy/scipy-1.4.1.ebuild
620 similarity index 100%
621 rename from sci-libs/scipy/scipy-1.4.1.ebuild
622 rename to dev-python/scipy/scipy-1.4.1.ebuild
623
624 diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild b/dev-python/scipy/scipy-1.5.0.ebuild
625 similarity index 100%
626 rename from sci-libs/scipy/scipy-1.5.0.ebuild
627 rename to dev-python/scipy/scipy-1.5.0.ebuild
628
629 diff --git a/sci-libs/scipy/scipy-1.5.1.ebuild b/dev-python/scipy/scipy-1.5.1.ebuild
630 similarity index 100%
631 rename from sci-libs/scipy/scipy-1.5.1.ebuild
632 rename to dev-python/scipy/scipy-1.5.1.ebuild
633
634 diff --git a/sci-libs/scipy/scipy-1.5.2.ebuild b/dev-python/scipy/scipy-1.5.2.ebuild
635 similarity index 100%
636 rename from sci-libs/scipy/scipy-1.5.2.ebuild
637 rename to dev-python/scipy/scipy-1.5.2.ebuild
638
639 diff --git a/dev-python/seaborn/seaborn-0.10.0.ebuild b/dev-python/seaborn/seaborn-0.10.0.ebuild
640 index ede4b500f02..73f07500f39 100644
641 --- a/dev-python/seaborn/seaborn-0.10.0.ebuild
642 +++ b/dev-python/seaborn/seaborn-0.10.0.ebuild
643 @@ -23,7 +23,7 @@ RDEPEND="
644 >=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
645 dev-python/patsy[${PYTHON_USEDEP}]
646 dev-python/statsmodels[${PYTHON_USEDEP}]
647 - >=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
648 + >=dev-python/scipy-1.0.1[${PYTHON_USEDEP}]
649 "
650 DEPEND="${RDEPEND}
651 test? (
652
653 diff --git a/dev-python/seaborn/seaborn-0.10.1.ebuild b/dev-python/seaborn/seaborn-0.10.1.ebuild
654 index 3075fc84222..7b4da3c7d23 100644
655 --- a/dev-python/seaborn/seaborn-0.10.1.ebuild
656 +++ b/dev-python/seaborn/seaborn-0.10.1.ebuild
657 @@ -23,7 +23,7 @@ RDEPEND="
658 >=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
659 dev-python/patsy[${PYTHON_USEDEP}]
660 dev-python/statsmodels[${PYTHON_USEDEP}]
661 - >=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
662 + >=dev-python/scipy-1.0.1[${PYTHON_USEDEP}]
663 "
664 DEPEND="${RDEPEND}
665 test? (
666
667 diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml
668 index f26be1adc30..3d1f57eecee 100644
669 --- a/dev-python/simplespectral/metadata.xml
670 +++ b/dev-python/simplespectral/metadata.xml
671 @@ -10,7 +10,7 @@
672 <name>Radio</name>
673 </maintainer>
674 <use>
675 - <flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag>
676 + <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
677 <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
678 </use>
679 <upstream>
680
681 diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
682 index 6bf7df5c0f9..69a8968c912 100644
683 --- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
684 +++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
685 @@ -24,7 +24,7 @@ fi
686 IUSE="faster +fastest"
687
688 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
689 - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
690 + faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
691 fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
692 DEPEND="${RDEPEND}
693 dev-python/setuptools[${PYTHON_USEDEP}]"
694
695 diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
696 index 6bf7df5c0f9..69a8968c912 100644
697 --- a/dev-python/simplespectral/simplespectral-9999.ebuild
698 +++ b/dev-python/simplespectral/simplespectral-9999.ebuild
699 @@ -24,7 +24,7 @@ fi
700 IUSE="faster +fastest"
701
702 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
703 - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
704 + faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
705 fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
706 DEPEND="${RDEPEND}
707 dev-python/setuptools[${PYTHON_USEDEP}]"
708
709 diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
710 index 5f51d2e2363..5e3b1c79988 100644
711 --- a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
712 +++ b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
713 @@ -30,7 +30,7 @@ DEPEND="test? (
714 dev-python/mock[${PYTHON_USEDEP}]
715 dev-python/numpy[${PYTHON_USEDEP}]
716 dev-python/pandas[${PYTHON_USEDEP}]
717 - sci-libs/scipy[${PYTHON_USEDEP}]
718 + dev-python/scipy[${PYTHON_USEDEP}]
719 dev-python/xarray[${PYTHON_USEDEP}]
720 )"
721
722
723 diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
724 index 979f038c90f..e22e8887eb6 100644
725 --- a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
726 +++ b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
727 @@ -30,7 +30,7 @@ DEPEND="test? (
728 dev-python/mock[${PYTHON_USEDEP}]
729 dev-python/numpy[${PYTHON_USEDEP}]
730 dev-python/pandas[${PYTHON_USEDEP}]
731 - sci-libs/scipy[${PYTHON_USEDEP}]
732 + dev-python/scipy[${PYTHON_USEDEP}]
733 dev-python/xarray[${PYTHON_USEDEP}]
734 )"
735
736
737 diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
738 index 557c7b2359f..7fc9e74e942 100644
739 --- a/dev-python/spyder/spyder-4.1.4.ebuild
740 +++ b/dev-python/spyder/spyder-4.1.4.ebuild
741 @@ -67,7 +67,7 @@ DEPEND="test? (
742 dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
743 dev-python/pytest-mock[${PYTHON_USEDEP}]
744 dev-python/pytest-qt[${PYTHON_USEDEP}]
745 - sci-libs/scipy[${PYTHON_USEDEP}]
746 + dev-python/scipy[${PYTHON_USEDEP}]
747 dev-python/sympy[${PYTHON_USEDEP}]
748 dev-python/xarray[${PYTHON_USEDEP}]
749 )"
750 @@ -137,7 +137,7 @@ pkg_postinst() {
751 optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
752 optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
753 optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
754 - optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
755 + optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
756 optfeature "Run Cython files in the IPython console" dev-python/cython
757 optfeature "The hdf5/h5py plugin" dev-python/h5py
758 optfeature "The line profiler plugin" dev-python/spyder-line-profiler
759
760 diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.1.5.ebuild
761 index d8bcd60bdc2..8e298c03b63 100644
762 --- a/dev-python/spyder/spyder-4.1.5.ebuild
763 +++ b/dev-python/spyder/spyder-4.1.5.ebuild
764 @@ -90,7 +90,7 @@ BDEPEND="test? (
765 dev-python/pytest-qt[${PYTHON_USEDEP}]
766 dev-python/pytest-xvfb[${PYTHON_USEDEP}]
767 dev-python/pyyaml[${PYTHON_USEDEP}]
768 - sci-libs/scipy[${PYTHON_USEDEP}]
769 + dev-python/scipy[${PYTHON_USEDEP}]
770 dev-python/sympy[${PYTHON_USEDEP}]
771 )"
772
773 @@ -190,7 +190,7 @@ pkg_postinst() {
774 optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
775 optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
776 optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
777 - optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
778 + optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
779 optfeature "Run Cython files in the IPython console" dev-python/cython
780 optfeature "The hdf5/h5py plugin" dev-python/h5py
781 optfeature "The line profiler plugin" dev-python/spyder-line-profiler
782
783 diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
784 index 4abed0cfcb2..997b3203528 100644
785 --- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
786 +++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
787 @@ -21,7 +21,7 @@ RDEPEND="
788 dev-python/numpy[${PYTHON_USEDEP}]
789 >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
790 dev-python/patsy[${PYTHON_USEDEP}]
791 - sci-libs/scipy[${PYTHON_USEDEP}]
792 + dev-python/scipy[${PYTHON_USEDEP}]
793 "
794 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
795 DEPEND="${RDEPEND}
796
797 diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
798 index c1acf54013f..cb0c73adee2 100644
799 --- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
800 +++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
801 @@ -20,12 +20,12 @@ RDEPEND="
802 >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
803 >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
804 dev-python/patsy[${PYTHON_USEDEP}]
805 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
806 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
807 "
808 BDEPEND="
809 dev-python/cython[${PYTHON_USEDEP}]
810 >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
811 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
812 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
813 test? (
814 dev-python/pytest-xdist[${PYTHON_USEDEP}]
815 )
816
817 diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
818 index 37a2fc6336e..c9356435504 100644
819 --- a/dev-python/statsmodels/statsmodels-9999.ebuild
820 +++ b/dev-python/statsmodels/statsmodels-9999.ebuild
821 @@ -21,7 +21,7 @@ CDEPEND="
822 dev-python/numpy[${PYTHON_USEDEP}]
823 dev-python/pandas[${PYTHON_USEDEP}]
824 dev-python/patsy[${PYTHON_USEDEP}]
825 - sci-libs/scipy[${PYTHON_USEDEP}]
826 + dev-python/scipy[${PYTHON_USEDEP}]
827 "
828 RDEPEND="${CDEPEND}
829 examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
830
831 diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
832 index ca434f00654..6f65b491df8 100644
833 --- a/dev-python/theano/theano-1.0.5.ebuild
834 +++ b/dev-python/theano/theano-1.0.5.ebuild
835 @@ -23,7 +23,7 @@ BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
836 RDEPEND="
837 dev-python/numpy[${PYTHON_USEDEP}]
838 dev-python/six[${PYTHON_USEDEP}]
839 - sci-libs/scipy[${PYTHON_USEDEP}]
840 + dev-python/scipy[${PYTHON_USEDEP}]
841 "
842
843 distutils_enable_tests nose
844
845 diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
846 index 9bd714fa2fe..d079411a059 100644
847 --- a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
848 +++ b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
849 @@ -23,7 +23,7 @@ RDEPEND="
850
851 DEPEND="test? (
852 dev-python/pandas[${PYTHON_USEDEP}]
853 - sci-libs/scipy[${PYTHON_USEDEP}] )"
854 + dev-python/scipy[${PYTHON_USEDEP}] )"
855
856 distutils_enable_tests pytest
857 distutils_enable_sphinx doc dev-python/mock
858
859 diff --git a/dev-python/uranium/uranium-4.6.1.ebuild b/dev-python/uranium/uranium-4.6.1.ebuild
860 index e2a3e9d997e..19a97cf4fd2 100644
861 --- a/dev-python/uranium/uranium-4.6.1.ebuild
862 +++ b/dev-python/uranium/uranium-4.6.1.ebuild
863 @@ -35,7 +35,7 @@ DEPEND="${PYTHON_DEPS}
864 $(python_gen_cond_dep '
865 dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
866 dev-python/numpy[${PYTHON_MULTI_USEDEP}]
867 - >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
868 + >=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}]
869 sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
870 ')"
871
872
873 diff --git a/dev-python/uranium/uranium-4.7.0.ebuild b/dev-python/uranium/uranium-4.7.0.ebuild
874 index 7e03615ebb5..4d6dc957d69 100644
875 --- a/dev-python/uranium/uranium-4.7.0.ebuild
876 +++ b/dev-python/uranium/uranium-4.7.0.ebuild
877 @@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS}
878 $(python_gen_cond_dep '
879 dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
880 dev-python/numpy[${PYTHON_USEDEP}]
881 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
882 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
883 sci-libs/Shapely[${PYTHON_USEDEP}]
884 ')"
885
886
887 diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
888 index e37cd7cb6f6..5339b36685a 100644
889 --- a/dev-python/xarray/xarray-0.12.1.ebuild
890 +++ b/dev-python/xarray/xarray-0.12.1.ebuild
891 @@ -25,7 +25,7 @@ DEPEND="
892 test? (
893 >=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
894 dev-python/pytest[${PYTHON_USEDEP}]
895 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
896 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
897 )"
898
899 PATCHES=(
900
901 diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild
902 index 67c0b3aaa1a..b31fa72fde9 100644
903 --- a/dev-python/xarray/xarray-0.16.0.ebuild
904 +++ b/dev-python/xarray/xarray-0.16.0.ebuild
905 @@ -28,7 +28,7 @@ BDEPEND="
906 dev-python/hypothesis[${PYTHON_USEDEP}]
907 dev-python/matplotlib[${PYTHON_USEDEP}]
908 dev-python/toolz[${PYTHON_USEDEP}]
909 - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
910 + >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
911 )"
912
913 distutils_enable_tests pytest
914
915 diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
916 index d24d3f65147..d445cebc3fd 100644
917 --- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
918 +++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
919 @@ -22,7 +22,7 @@ RDEPEND="
920 dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
921 $(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
922 $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
923 - $(python_gen_cond_dep "sci-libs/scipy[\${PYTHON_USEDEP}]")
924 + $(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
925 $(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
926 "
927 DEPEND="${RDEPEND}
928
929 diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
930 index d24d3f65147..d445cebc3fd 100644
931 --- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
932 +++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
933 @@ -22,7 +22,7 @@ RDEPEND="
934 dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
935 $(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
936 $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
937 - $(python_gen_cond_dep "sci-libs/scipy[\${PYTHON_USEDEP}]")
938 + $(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
939 $(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
940 "
941 DEPEND="${RDEPEND}
942
943 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
944 index a73f9f65dc6..e5e6b1a24c2 100644
945 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
946 +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
947 @@ -77,8 +77,8 @@ RDEPEND="${PYTHON_DEPS}
948 dev-python/six[${PYTHON_MULTI_USEDEP}]
949 filter? (
950 || (
951 - sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
952 - sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
953 + dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
954 + dev-python/scipy[${PYTHON_MULTI_USEDEP}]
955 )
956 )
957 grc? (
958
959 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
960 index b85c4e57872..4bd0848dbf4 100644
961 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
962 +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
963 @@ -78,8 +78,8 @@ RDEPEND="${PYTHON_DEPS}
964 dev-python/six[${PYTHON_MULTI_USEDEP}]
965 filter? (
966 || (
967 - sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
968 - sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
969 + dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
970 + dev-python/scipy[${PYTHON_MULTI_USEDEP}]
971 )
972 )
973 grc? (
974
975 diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
976 index 3fd0a24eac1..ebf97b1bfda 100644
977 --- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
978 +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
979 @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
980 alsa? ( media-libs/alsa-lib:= )
981 fec? (
982 sci-libs/gsl
983 - sci-libs/scipy
984 + dev-python/scipy
985 )
986 - filter? ( sci-libs/scipy )
987 + filter? ( dev-python/scipy )
988 grc? (
989 $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
990 dev-python/numpy[${PYTHON_USEDEP}]
991 @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
992 dev-qt/qtwidgets:5
993 )
994 sdl? ( >=media-libs/libsdl-1.2.0 )
995 - trellis? ( sci-libs/scipy )
996 + trellis? ( dev-python/scipy )
997 uhd? (
998 $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
999 )
1000
1001 diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
1002 index ed6d89a7a8f..3ae37a1a92e 100644
1003 --- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
1004 +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
1005 @@ -57,9 +57,9 @@ RDEPEND="${PYTHON_DEPS}
1006 alsa? ( media-libs/alsa-lib:= )
1007 fec? (
1008 sci-libs/gsl
1009 - sci-libs/scipy
1010 + dev-python/scipy
1011 )
1012 - filter? ( sci-libs/scipy )
1013 + filter? ( dev-python/scipy )
1014 grc? (
1015 $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
1016 dev-python/numpy[${PYTHON_USEDEP}]
1017 @@ -78,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
1018 dev-qt/qtwidgets:5
1019 )
1020 sdl? ( >=media-libs/libsdl-1.2.0 )
1021 - trellis? ( sci-libs/scipy )
1022 + trellis? ( dev-python/scipy )
1023 uhd? (
1024 $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
1025 )
1026
1027 diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
1028 index 65be5a35852..43237bbd9cc 100644
1029 --- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
1030 +++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
1031 @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
1032 alsa? ( media-libs/alsa-lib:= )
1033 fec? (
1034 sci-libs/gsl
1035 - sci-libs/scipy
1036 + dev-python/scipy
1037 )
1038 - filter? ( sci-libs/scipy )
1039 + filter? ( dev-python/scipy )
1040 grc? (
1041 $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
1042 dev-python/numpy[${PYTHON_USEDEP}]
1043 @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
1044 dev-qt/qtwidgets:5
1045 )
1046 sdl? ( >=media-libs/libsdl-1.2.0 )
1047 - trellis? ( sci-libs/scipy )
1048 + trellis? ( dev-python/scipy )
1049 uhd? (
1050 $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
1051 )
1052
1053 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
1054 index 65be5a35852..43237bbd9cc 100644
1055 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
1056 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
1057 @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
1058 alsa? ( media-libs/alsa-lib:= )
1059 fec? (
1060 sci-libs/gsl
1061 - sci-libs/scipy
1062 + dev-python/scipy
1063 )
1064 - filter? ( sci-libs/scipy )
1065 + filter? ( dev-python/scipy )
1066 grc? (
1067 $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
1068 dev-python/numpy[${PYTHON_USEDEP}]
1069 @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
1070 dev-qt/qtwidgets:5
1071 )
1072 sdl? ( >=media-libs/libsdl-1.2.0 )
1073 - trellis? ( sci-libs/scipy )
1074 + trellis? ( dev-python/scipy )
1075 uhd? (
1076 $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
1077 )
1078
1079 diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml
1080 index e93f0c7982e..5a4e0cc6cf6 100644
1081 --- a/net-wireless/soapy_power/metadata.xml
1082 +++ b/net-wireless/soapy_power/metadata.xml
1083 @@ -10,7 +10,7 @@
1084 <name>Radio</name>
1085 </maintainer>
1086 <use>
1087 - <flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag>
1088 + <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
1089 <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
1090 </use>
1091 <upstream>
1092
1093 diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
1094 index 6daef0f42e7..fd1472590b6 100644
1095 --- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
1096 +++ b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
1097 @@ -27,5 +27,5 @@ DEPEND=""
1098 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
1099 dev-python/simplespectral[${PYTHON_USEDEP}]
1100 >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
1101 - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
1102 + faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
1103 fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
1104
1105 diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild
1106 index 6daef0f42e7..fd1472590b6 100644
1107 --- a/net-wireless/soapy_power/soapy_power-9999.ebuild
1108 +++ b/net-wireless/soapy_power/soapy_power-9999.ebuild
1109 @@ -27,5 +27,5 @@ DEPEND=""
1110 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
1111 dev-python/simplespectral[${PYTHON_USEDEP}]
1112 >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
1113 - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
1114 + faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
1115 fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
1116
1117 diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
1118 index feaaebcda6a..a05a2e8b4de 100644
1119 --- a/profiles/updates/3Q-2020
1120 +++ b/profiles/updates/3Q-2020
1121 @@ -142,3 +142,4 @@ slotmove =app-editors/emacs-27.1_rc* 27-vcs 27
1122 move net-misc/ntpclient net-misc/sntpd
1123 slotmove <media-sound/teamspeak-client-5 0 3
1124 slotmove dev-haskell/network 3 0
1125 +move dev-python/scipy dev-python/scipy
1126
1127 diff --git a/sci-biology/biopandas/biopandas-0.2.7.ebuild b/sci-biology/biopandas/biopandas-0.2.7.ebuild
1128 index 9be9a8ac4a3..83bfb4610f4 100644
1129 --- a/sci-biology/biopandas/biopandas-0.2.7.ebuild
1130 +++ b/sci-biology/biopandas/biopandas-0.2.7.ebuild
1131 @@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
1132 RDEPEND="
1133 dev-python/numpy[${PYTHON_USEDEP}]
1134 dev-python/pandas[${PYTHON_USEDEP}]
1135 - sci-libs/scipy[${PYTHON_USEDEP}]"
1136 + dev-python/scipy[${PYTHON_USEDEP}]"
1137
1138 distutils_enable_tests nose
1139
1140
1141 diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild
1142 index 00d480b169c..688fa93d394 100644
1143 --- a/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild
1144 +++ b/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild
1145 @@ -18,7 +18,7 @@ IUSE="test"
1146
1147 RDEPEND="
1148 dev-python/numpy[${PYTHON_USEDEP}]
1149 - sci-libs/scipy[${PYTHON_USEDEP}]
1150 + dev-python/scipy[${PYTHON_USEDEP}]
1151 sci-biology/biopython[${PYTHON_USEDEP}]
1152 dev-python/networkx[${PYTHON_USEDEP}]
1153 dev-python/GridDataFormats[${PYTHON_USEDEP}]
1154
1155 diff --git a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
1156 index b7a964b8165..ea150d998e9 100644
1157 --- a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
1158 +++ b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
1159 @@ -27,7 +27,7 @@ IUSE=""
1160
1161 DEPEND="
1162 dev-python/numpy[${PYTHON_USEDEP}]
1163 - sci-libs/scipy[${PYTHON_USEDEP}]
1164 + dev-python/scipy[${PYTHON_USEDEP}]
1165 "
1166
1167 RDEPEND="${DEPEND}"
1168
1169 diff --git a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
1170 index 37f959acdc6..bb13d32f0d4 100644
1171 --- a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
1172 +++ b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
1173 @@ -27,7 +27,7 @@ IUSE=""
1174
1175 DEPEND="
1176 dev-python/numpy[${PYTHON_USEDEP}]
1177 - sci-libs/scipy[${PYTHON_USEDEP}]
1178 + dev-python/scipy[${PYTHON_USEDEP}]
1179 "
1180
1181 RDEPEND="${DEPEND}"
1182
1183 diff --git a/sci-chemistry/chemex/chemex-2018.10.2.ebuild b/sci-chemistry/chemex/chemex-2018.10.2.ebuild
1184 index 99f888adb02..b73bd7a2fa6 100644
1185 --- a/sci-chemistry/chemex/chemex-2018.10.2.ebuild
1186 +++ b/sci-chemistry/chemex/chemex-2018.10.2.ebuild
1187 @@ -25,7 +25,7 @@ RDEPEND="
1188 >=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}]
1189 dev-python/numpy[${PYTHON_MULTI_USEDEP}]
1190 dev-python/setuptools_scm[${PYTHON_MULTI_USEDEP}]
1191 - >=sci-libs/scipy-0.11[${PYTHON_MULTI_USEDEP}]
1192 + >=dev-python/scipy-0.11[${PYTHON_MULTI_USEDEP}]
1193 ')
1194 "
1195 DEPEND="${RDEPEND}"
1196
1197 diff --git a/sci-chemistry/chemex/chemex-2018.10.3.ebuild b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
1198 index d0634c88451..4e6e2d717f9 100644
1199 --- a/sci-chemistry/chemex/chemex-2018.10.3.ebuild
1200 +++ b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
1201 @@ -25,7 +25,7 @@ RDEPEND="
1202 >=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}]
1203 dev-python/numpy[${PYTHON_MULTI_USEDEP}]
1204 dev-python/setuptools_scm[${PYTHON_MULTI_USEDEP}]
1205 - >=sci-libs/scipy-0.11[${PYTHON_MULTI_USEDEP}]
1206 + >=dev-python/scipy-0.11[${PYTHON_MULTI_USEDEP}]
1207 ')
1208 "
1209 DEPEND="${RDEPEND}"
1210
1211 diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild
1212 index 761ab50155c..cdf5b949625 100644
1213 --- a/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild
1214 +++ b/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild
1215 @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
1216 RDEPEND="
1217 dev-python/setuptools[${PYTHON_USEDEP}]
1218 dev-python/numpy[${PYTHON_USEDEP}]
1219 - sci-libs/scipy[${PYTHON_USEDEP}]
1220 + dev-python/scipy[${PYTHON_USEDEP}]
1221 dev-python/pandas[${PYTHON_USEDEP}]
1222 dev-python/pytables[${PYTHON_USEDEP}]
1223 dev-python/networkx[${PYTHON_USEDEP}]
1224
1225 diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
1226 index 5537daa6a53..fba1fb10eed 100644
1227 --- a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
1228 +++ b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
1229 @@ -22,7 +22,7 @@ RDEPEND="
1230 dev-python/pandas[${PYTHON_USEDEP}]
1231 dev-python/pytables[${PYTHON_USEDEP}]
1232 dev-python/networkx[${PYTHON_USEDEP}]
1233 - sci-libs/scipy[${PYTHON_USEDEP}]
1234 + dev-python/scipy[${PYTHON_USEDEP}]
1235 "
1236 DEPEND="${RDEPEND}
1237 test? (
1238
1239 diff --git a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
1240 index 78539bfaf77..3a767944a13 100644
1241 --- a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
1242 +++ b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
1243 @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
1244 RDEPEND="
1245 dev-python/matplotlib[${PYTHON_USEDEP}]
1246 dev-python/numpy[${PYTHON_USEDEP}]
1247 - sci-libs/scipy[${PYTHON_USEDEP}]"
1248 + dev-python/scipy[${PYTHON_USEDEP}]"
1249 DEPEND="
1250 test? (
1251 ${RDEPEND}
1252
1253 diff --git a/sci-chemistry/nmrglue/nmrglue-0.7.ebuild b/sci-chemistry/nmrglue/nmrglue-0.7.ebuild
1254 index 7772d64fc7d..8b3a7eac604 100644
1255 --- a/sci-chemistry/nmrglue/nmrglue-0.7.ebuild
1256 +++ b/sci-chemistry/nmrglue/nmrglue-0.7.ebuild
1257 @@ -18,7 +18,7 @@ IUSE=""
1258 RDEPEND="
1259 dev-python/matplotlib[${PYTHON_USEDEP}]
1260 dev-python/numpy[${PYTHON_USEDEP}]
1261 - sci-libs/scipy[${PYTHON_USEDEP}]
1262 + dev-python/scipy[${PYTHON_USEDEP}]
1263 "
1264 DEPEND="${RDEPEND}"
1265
1266
1267 diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
1268 index 2fb1a4020f2..bc9c5426b8f 100644
1269 --- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
1270 +++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
1271 @@ -27,7 +27,7 @@ RDEPEND="
1272 sci-libs/Shapely[${PYTHON_USEDEP}]
1273 dev-python/six[${PYTHON_USEDEP}]
1274 dev-python/matplotlib[${PYTHON_USEDEP}]
1275 - sci-libs/scipy[${PYTHON_USEDEP}]
1276 + dev-python/scipy[${PYTHON_USEDEP}]
1277 dev-python/pillow[jpeg,${PYTHON_USEDEP}]
1278 sci-libs/gdal[python,${PYTHON_USEDEP}]
1279 "
1280
1281 diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
1282 index 58c165ae501..c0bf90c60e2 100644
1283 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
1284 +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
1285 @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
1286 IUSE=""
1287
1288 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
1289 - sci-libs/scipy[${PYTHON_USEDEP}]
1290 + dev-python/scipy[${PYTHON_USEDEP}]
1291 dev-python/six[${PYTHON_USEDEP}]"
1292 DEPEND="${RDEPEND}
1293 dev-python/setuptools[${PYTHON_USEDEP}]"
1294
1295 diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
1296 index 58c165ae501..c0bf90c60e2 100644
1297 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
1298 +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
1299 @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
1300 IUSE=""
1301
1302 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
1303 - sci-libs/scipy[${PYTHON_USEDEP}]
1304 + dev-python/scipy[${PYTHON_USEDEP}]
1305 dev-python/six[${PYTHON_USEDEP}]"
1306 DEPEND="${RDEPEND}
1307 dev-python/setuptools[${PYTHON_USEDEP}]"
1308
1309 diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
1310 index 8fb64e296e6..60e7576d3c8 100644
1311 --- a/sci-libs/numkit/numkit-1.1.2.ebuild
1312 +++ b/sci-libs/numkit/numkit-1.1.2.ebuild
1313 @@ -29,5 +29,5 @@ IUSE=""
1314 BDEPEND="
1315 dev-python/six[${PYTHON_USEDEP}]
1316 >=dev-python/numpy-1.9[${PYTHON_USEDEP}]
1317 - >=sci-libs/scipy-1.0[${PYTHON_USEDEP}]"
1318 + >=dev-python/scipy-1.0[${PYTHON_USEDEP}]"
1319 RDEPEND="${DEPEND}"
1320
1321 diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
1322 index 875c4e86fa4..6764d75ad7c 100644
1323 --- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
1324 +++ b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
1325 @@ -27,7 +27,7 @@ RDEPEND="
1326 dev-python/pillow[${PYTHON_USEDEP}]
1327 dev-python/pywavelets[${PYTHON_USEDEP}]
1328 dev-python/six[${PYTHON_USEDEP}]
1329 - sci-libs/scipy[sparse,${PYTHON_USEDEP}]
1330 + dev-python/scipy[sparse,${PYTHON_USEDEP}]
1331 freeimage? ( media-libs/freeimage )
1332 pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
1333 DEPEND="${RDEPEND}
1334
1335 diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
1336 index 467c2124494..87abf6b9c1e 100644
1337 --- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
1338 +++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
1339 @@ -28,7 +28,7 @@ RDEPEND="
1340 dev-python/nose[${PYTHON_USEDEP}]
1341 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1342 sci-libs/scikits[${PYTHON_USEDEP}]
1343 - sci-libs/scipy[${PYTHON_USEDEP}]
1344 + dev-python/scipy[${PYTHON_USEDEP}]
1345 virtual/blas:=
1346 virtual/cblas:=
1347 "
1348 @@ -37,7 +37,7 @@ DEPEND="
1349 dev-python/cython[${PYTHON_USEDEP}]
1350 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1351 dev-python/setuptools[${PYTHON_USEDEP}]
1352 - sci-libs/scipy[${PYTHON_USEDEP}]
1353 + dev-python/scipy[${PYTHON_USEDEP}]
1354 virtual/blas:=
1355 virtual/cblas:=
1356 "
1357
1358 diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
1359 index fc65c21b1d4..72823168329 100644
1360 --- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
1361 +++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
1362 @@ -29,7 +29,7 @@ RDEPEND="
1363 dev-python/nose[${PYTHON_USEDEP}]
1364 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1365 sci-libs/scikits[${PYTHON_USEDEP}]
1366 - sci-libs/scipy[${PYTHON_USEDEP}]
1367 + dev-python/scipy[${PYTHON_USEDEP}]
1368 virtual/blas:=
1369 virtual/cblas:=
1370 "
1371 @@ -38,7 +38,7 @@ DEPEND="
1372 dev-python/cython[${PYTHON_USEDEP}]
1373 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1374 dev-python/setuptools[${PYTHON_USEDEP}]
1375 - sci-libs/scipy[${PYTHON_USEDEP}]
1376 + dev-python/scipy[${PYTHON_USEDEP}]
1377 virtual/blas:=
1378 virtual/cblas:=
1379 "
1380
1381 diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
1382 index fc65c21b1d4..72823168329 100644
1383 --- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
1384 +++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
1385 @@ -29,7 +29,7 @@ RDEPEND="
1386 dev-python/nose[${PYTHON_USEDEP}]
1387 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1388 sci-libs/scikits[${PYTHON_USEDEP}]
1389 - sci-libs/scipy[${PYTHON_USEDEP}]
1390 + dev-python/scipy[${PYTHON_USEDEP}]
1391 virtual/blas:=
1392 virtual/cblas:=
1393 "
1394 @@ -38,7 +38,7 @@ DEPEND="
1395 dev-python/cython[${PYTHON_USEDEP}]
1396 dev-python/numpy[lapack,${PYTHON_USEDEP}]
1397 dev-python/setuptools[${PYTHON_USEDEP}]
1398 - sci-libs/scipy[${PYTHON_USEDEP}]
1399 + dev-python/scipy[${PYTHON_USEDEP}]
1400 virtual/blas:=
1401 virtual/cblas:=
1402 "
1403
1404 diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
1405 index 1c4068d298c..b60be666ce0 100644
1406 --- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
1407 +++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
1408 @@ -25,7 +25,7 @@ RDEPEND="
1409 dev-python/wheel[${PYTHON_USEDEP}]
1410 dev-python/cython[${PYTHON_USEDEP}]
1411 dev-python/numpy[${PYTHON_USEDEP}]
1412 - sci-libs/scipy[${PYTHON_USEDEP}]
1413 + dev-python/scipy[${PYTHON_USEDEP}]
1414 sci-libs/scikits[${PYTHON_USEDEP}]
1415 virtual/blas:=
1416 virtual/cblas:=
1417
1418 diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
1419 index b1dd82b3629..0b7cea51568 100644
1420 --- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
1421 +++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
1422 @@ -25,7 +25,7 @@ DEPEND="
1423 dev-python/numpy[${PYTHON_USEDEP}]
1424 doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
1425 RDEPEND="
1426 - sci-libs/scipy[${PYTHON_USEDEP}]
1427 + dev-python/scipy[${PYTHON_USEDEP}]
1428 sci-libs/scikits[${PYTHON_USEDEP}]
1429 dev-python/matplotlib[${PYTHON_USEDEP}]
1430 dev-python/pytables[${PYTHON_USEDEP}]"
1431
1432 diff --git a/sci-libs/shogun/shogun-5.0.0-r1.ebuild b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
1433 index 1db83f206fa..d4e67145a5f 100644
1434 --- a/sci-libs/shogun/shogun-5.0.0-r1.ebuild
1435 +++ b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
1436 @@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
1437 python? (
1438 >=dev-lang/swig-3.0.12
1439 test? (
1440 - sci-libs/scipy
1441 + dev-python/scipy
1442 )
1443 )
1444 R? ( >=dev-lang/swig-3.0.12 )
1445
1446 diff --git a/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
1447 index b631808b810..46ef0a59ef5 100644
1448 --- a/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
1449 +++ b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
1450 @@ -32,7 +32,7 @@ RDEPEND="
1451 dev-python/sphinx[${PYTHON_USEDEP}]
1452 >=dev-python/theano-0.9[${PYTHON_USEDEP}]
1453 >=dev-python/tqdm-4.8.4[${PYTHON_USEDEP}]
1454 - >=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
1455 + >=dev-python/scipy-0.12[${PYTHON_USEDEP}]
1456 "
1457 DEPEND="
1458 dev-python/setuptools[${PYTHON_USEDEP}]
1459
1460 diff --git a/sci-physics/qmeq/qmeq-1.0-r1.ebuild b/sci-physics/qmeq/qmeq-1.0-r1.ebuild
1461 index 9038c029f11..7ae48a59361 100644
1462 --- a/sci-physics/qmeq/qmeq-1.0-r1.ebuild
1463 +++ b/sci-physics/qmeq/qmeq-1.0-r1.ebuild
1464 @@ -21,7 +21,7 @@ SLOT="0"
1465
1466 COMMON_DEPEND="
1467 dev-python/numpy[${PYTHON_USEDEP}]
1468 - sci-libs/scipy[${PYTHON_USEDEP}]
1469 + dev-python/scipy[${PYTHON_USEDEP}]
1470 "
1471 RDEPEND="
1472 ${COMMON_DEPEND}
1473
1474 diff --git a/sci-physics/qutip/qutip-4.2.0.ebuild b/sci-physics/qutip/qutip-4.2.0.ebuild
1475 index 9bbf6fe19d2..6e022cd8d0f 100644
1476 --- a/sci-physics/qutip/qutip-4.2.0.ebuild
1477 +++ b/sci-physics/qutip/qutip-4.2.0.ebuild
1478 @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
1479 RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
1480 dev-python/numpy[${PYTHON_USEDEP}]
1481 dev-python/matplotlib[${PYTHON_USEDEP}]
1482 - sci-libs/scipy[${PYTHON_USEDEP}]
1483 + dev-python/scipy[${PYTHON_USEDEP}]
1484 "
1485 DEPEND="${RDEPEND}
1486 test? ( dev-python/nose[${PYTHON_USEDEP}] )
1487
1488 diff --git a/sci-visualization/pythonprop/pythonprop-0.29.ebuild b/sci-visualization/pythonprop/pythonprop-0.29.ebuild
1489 index 372c14f28f4..1888fc5fc46 100644
1490 --- a/sci-visualization/pythonprop/pythonprop-0.29.ebuild
1491 +++ b/sci-visualization/pythonprop/pythonprop-0.29.ebuild
1492 @@ -23,7 +23,7 @@ RDEPEND="
1493 dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
1494 dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
1495 sci-libs/cartopy[${PYTHON_MULTI_USEDEP}]
1496 - sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
1497 + dev-python/scipy[${PYTHON_MULTI_USEDEP}]
1498 ')
1499 dev-python/cairocffi
1500 sci-electronics/voacapl
1501
1502 diff --git a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild
1503 index 4b8819557eb..b5bb6d33623 100644
1504 --- a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild
1505 +++ b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild
1506 @@ -30,7 +30,7 @@ RDEPEND="
1507 >=dev-python/setuptools-41[${PYTHON_USEDEP}]
1508 dev-python/werkzeug[${PYTHON_USEDEP}]
1509 dev-python/wheel[${PYTHON_USEDEP}]
1510 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]"
1511 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
1512 BDEPEND="app-arch/unzip
1513 ${PYTHON_DEPS}"
1514 PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
1515
1516 diff --git a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
1517 index 08bb80b2417..ce0ceaa1000 100644
1518 --- a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
1519 +++ b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
1520 @@ -30,7 +30,7 @@ RDEPEND="
1521 >=dev-python/setuptools-41[${PYTHON_USEDEP}]
1522 dev-python/werkzeug[${PYTHON_USEDEP}]
1523 dev-python/wheel[${PYTHON_USEDEP}]
1524 - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]"
1525 + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
1526 BDEPEND="app-arch/unzip
1527 ${PYTHON_DEPS}"
1528 PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
1529
1530 diff --git a/sys-cluster/ceph/ceph-14.2.11.ebuild b/sys-cluster/ceph/ceph-14.2.11.ebuild
1531 index cab350b3f49..09fdd24959d 100644
1532 --- a/sys-cluster/ceph/ceph-14.2.11.ebuild
1533 +++ b/sys-cluster/ceph/ceph-14.2.11.ebuild
1534 @@ -148,7 +148,7 @@ RDEPEND="${DEPEND}
1535 dev-python/pyyaml[${PYTHON_USEDEP}]
1536 dev-python/routes[${PYTHON_USEDEP}]
1537 diskprediction? (
1538 - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1539 + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1540 )
1541 sci-libs/scikits_learn[${PYTHON_USEDEP}]
1542 dev-python/six[${PYTHON_USEDEP}]
1543
1544 diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
1545 index a81fe959935..d3903349156 100644
1546 --- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
1547 +++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
1548 @@ -153,7 +153,7 @@ RDEPEND="${DEPEND}
1549 dev-python/pyyaml[${PYTHON_USEDEP}]
1550 dev-python/routes[${PYTHON_USEDEP}]
1551 diskprediction? (
1552 - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1553 + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1554 )
1555 sci-libs/scikits_learn[${PYTHON_USEDEP}]
1556 dev-python/six[${PYTHON_USEDEP}]
1557
1558 diff --git a/sys-cluster/ceph/ceph-15.2.5.ebuild b/sys-cluster/ceph/ceph-15.2.5.ebuild
1559 index 5368ad7d8d0..942ffd88e77 100644
1560 --- a/sys-cluster/ceph/ceph-15.2.5.ebuild
1561 +++ b/sys-cluster/ceph/ceph-15.2.5.ebuild
1562 @@ -153,7 +153,7 @@ RDEPEND="${DEPEND}
1563 dev-python/pyyaml[${PYTHON_USEDEP}]
1564 dev-python/routes[${PYTHON_USEDEP}]
1565 diskprediction? (
1566 - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1567 + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
1568 )
1569 sci-libs/scikits_learn[${PYTHON_USEDEP}]
1570 dev-python/six[${PYTHON_USEDEP}]