Move {sci-libs → dev-python}/scipy

Signed-off-by: Michał Górny <mgorny@gentoo.org>

54 files changed, 872 insertions, 60 deletions

diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
index 9fe4d0a0e85b..74f8f99edd54 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
@@ -19,4 +19,4 @@ IUSE=""
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	dev-python/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index cc85db2cccfb..6c26824281ba 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-1.2.0.ebuild b/dev-python/dask/dask-1.2.0.ebuild
index 561a15e629df..37102d7058d6 100644
--- a/dev-python/dask/dask-1.2.0.ebuild
+++ b/dev-python/dask/dask-1.2.0.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
index f99ce3726dca..4ba14c792b91 100644
--- a/dev-python/dask/dask-2.22.0.ebuild
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.23.0.ebuild b/dev-python/dask/dask-2.23.0.ebuild
index ca386a69eec2..3489dff69303 100644
--- a/dev-python/dask/dask-2.23.0.ebuild
+++ b/dev-python/dask/dask-2.23.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.24.0.ebuild b/dev-python/dask/dask-2.24.0.ebuild
index b0c47455277a..61df563da702 100644
--- a/dev-python/dask/dask-2.24.0.ebuild
+++ b/dev-python/dask/dask-2.24.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
index eb47b5d4660c..bb975ebbad7a 100644
--- a/dev-python/dask/dask-2.25.0.ebuild
+++ b/dev-python/dask/dask-2.25.0.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.26.0.ebuild b/dev-python/dask/dask-2.26.0.ebuild
index 9741a26c5870..e188a716d44c 100644
--- a/dev-python/dask/dask-2.26.0.ebuild
+++ b/dev-python/dask/dask-2.26.0.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/graph-tool/graph-tool-2.29.ebuild b/dev-python/graph-tool/graph-tool-2.29.ebuild
index 90b94419f20b..0b9a248e3700 100644
--- a/dev-python/graph-tool/graph-tool-2.29.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.29.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 90b94419f20b..0b9a248e3700 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
diff --git a/dev-python/lmfit/lmfit-1.0.1.ebuild b/dev-python/lmfit/lmfit-1.0.1.ebuild
index 3b27e1c92c05..8f2bfa1ccdd6 100644
--- a/dev-python/lmfit/lmfit-1.0.1.ebuild
+++ b/dev-python/lmfit/lmfit-1.0.1.ebuild
@@ -18,7 +18,7 @@ BDEPEND="
 	>=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
 	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.2[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index 3296b24075d0..de55fd15dca0 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index 92a63fef1567..068882d344d6 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
index d8b120fa06ff..39022728532a 100644
--- a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
@@ -82,7 +82,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
index 9ded3690e457..f3c2b26d36e1 100644
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -82,7 +82,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
index d50206e77d36..97a5c0f42da6 100644
--- a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
+++ b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	media-video/ffmpeg
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index d98c149620d1..989d4d5da9a9 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -29,11 +29,11 @@ RDEPEND="
 	pandas? (
 		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
 	)
-	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
+	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
 BDEPEND="
-	test? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )"
+	test? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index 7b9a1d6f392f..e3df9c8c3bcf 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -29,12 +29,12 @@ RDEPEND="
 	pandas? (
 		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
 	)
-	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
+	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
 BDEPEND="
 	test? (
-		>=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1.0[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index d127c3a08cfd..3cf78bba0f11 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/twython[${PYTHON_USEDEP}]
 		sci-libs/scikits_learn[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)"
 PDEPEND="dev-python/nltk-data"
 
diff --git a/dev-python/oct2py/oct2py-5.2.0-r1.ebuild b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
index 475ad273c818..394f090b4be0 100644
--- a/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
+++ b/dev-python/oct2py/oct2py-5.2.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="examples"
 RDEPEND="
 	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
 	>=dev-python/octave_kernel-0.31.0[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.17[${PYTHON_USEDEP}]"
+	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
index a58806fe2056..ed65359d2c39 100644
--- a/dev-python/pandas/pandas-1.0.5.ebuild
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -84,7 +84,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -170,6 +170,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
index 0497d0641024..0a4ffee00749 100644
--- a/dev-python/pandas/pandas-1.1.0.ebuild
+++ b/dev-python/pandas/pandas-1.1.0.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -172,6 +172,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index de735561e5c8..fac714b52820 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -176,6 +176,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.2.ebuild b/dev-python/pandas/pandas-1.1.2.ebuild
index de735561e5c8..fac714b52820 100644
--- a/dev-python/pandas/pandas-1.1.2.ebuild
+++ b/dev-python/pandas/pandas-1.1.2.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -176,6 +176,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index e6498661a786..c36858bb581b 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -18,7 +18,7 @@ IUSE="doc"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	"
 BDEPEND="
 	doc? (
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
index 9701c59385aa..0b79bdd0a057 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64"
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyqtgraph[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	dev-python/scipy[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.1-sys_version.patch
diff --git a/dev-python/pweave/pweave-0.30.3-r1.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index f85db19e41dd..30b5cb9ebd19 100644
--- a/dev-python/pweave/pweave-0.30.3-r1.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="test? (
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/notebook[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}] )"
+	dev-python/scipy[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
index f16d431c5e37..cc9224f2094e 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
index 2259d40e1ec3..d6e54830b5ac 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
 	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
new file mode 100644
index 000000000000..9ed4593e3fc8
--- /dev/null
+++ b/dev-python/scipy/Manifest
@@ -0,0 +1,15 @@
+DIST