diff options
96 files changed, 115 insertions, 114 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/sci-libs/scipy/Manifest b/dev-python/scipy/Manifest index 9ed4593e3fc8..9ed4593e3fc8 100644 --- a/sci-libs/scipy/Manifest +++ b/dev-python/scipy/Manifest diff --git a/sci-libs/scipy/metadata.xml b/dev-python/scipy/metadata.xml index f1d093c366af..f1d093c366af 100644 --- a/sci-libs/scipy/metadata.xml +++ b/dev-python/scipy/metadata.xml diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/dev-python/scipy/scipy-1.1.0.ebuild index 119210dc4f00..119210dc4f00 100644 --- a/sci-libs/scipy/scipy-1.1.0.ebuild +++ b/dev-python/scipy/scipy-1.1.0.ebuild diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/dev-python/scipy/scipy-1.4.1.ebuild index 90fb741b4d73..90fb741b4d73 100644 --- a/sci-libs/scipy/scipy-1.4.1.ebuild +++ b/dev-python/scipy/scipy-1.4.1.ebuild diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild b/dev-python/scipy/scipy-1.5.0.ebuild index 21948a8eb2c5..21948a8eb2c5 100644 --- a/sci-libs/scipy/scipy-1.5.0.ebuild +++ b/dev-python/scipy/scipy-1.5.0.ebuild diff --git a/sci-libs/scipy/scipy-1.5.1.ebuild b/dev-python/scipy/scipy-1.5.1.ebuild index 21948a8eb2c5..21948a8eb2c5 100644 --- a/sci-libs/scipy/scipy-1.5.1.ebuild +++ b/dev-python/scipy/scipy-1.5.1.ebuild diff --git a/sci-libs/scipy/scipy-1.5.2.ebuild b/dev-python/scipy/scipy-1.5.2.ebuild index 52f1cb13642f..52f1cb13642f 100644 --- a/sci-libs/scipy/scipy-1.5.2.ebuild +++ b/dev-python/scipy/scipy-1.5.2.ebuild diff --git a/dev-python/seaborn/seaborn-0.10.0.ebuild b/dev-python/seaborn/seaborn-0.10.0.ebuild index ede4b500f025..73f07500f393 100644 --- a/dev-python/seaborn/seaborn-0.10.0.ebuild +++ b/dev-python/seaborn/seaborn-0.10.0.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/pandas-0.22.0[${PYTHON_USEDEP}] dev-python/patsy[${PYTHON_USEDEP}] dev-python/statsmodels[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.0.1[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( diff --git a/dev-python/seaborn/seaborn-0.10.1.ebuild b/dev-python/seaborn/seaborn-0.10.1.ebuild index 3075fc84222b..7b4da3c7d23c 100644 --- a/dev-python/seaborn/seaborn-0.10.1.ebuild +++ b/dev-python/seaborn/seaborn-0.10.1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/pandas-0.22.0[${PYTHON_USEDEP}] dev-python/patsy[${PYTHON_USEDEP}] dev-python/statsmodels[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.0.1[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml index f26be1adc30c..3d1f57eeceec 100644 --- a/dev-python/simplespectral/metadata.xml +++ b/dev-python/simplespectral/metadata.xml @@ -10,7 +10,7 @@ <name>Radio</name> </maintainer> <use> - <flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag> + <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag> <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag> </use> <upstream> diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild index 6bf7df5c0f98..69a8968c912f 100644 --- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild +++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild @@ -24,7 +24,7 @@ fi IUSE="faster +fastest" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] ) + faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild index 6bf7df5c0f98..69a8968c912f 100644 --- a/dev-python/simplespectral/simplespectral-9999.ebuild +++ b/dev-python/simplespectral/simplespectral-9999.ebuild @@ -24,7 +24,7 @@ fi IUSE="faster +fastest" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] ) + faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild index 5f51d2e2363b..5e3b1c799882 100644 --- a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild +++ b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild @@ -30,7 +30,7 @@ DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/xarray[${PYTHON_USEDEP}] )" diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild index 979f038c90f7..e22e8887eb63 100644 --- a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild +++ b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild @@ -30,7 +30,7 @@ DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/xarray[${PYTHON_USEDEP}] )" diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild index 557c7b2359f0..7fc9e74e9422 100644 --- a/dev-python/spyder/spyder-4.1.4.ebuild +++ b/dev-python/spyder/spyder-4.1.4.ebuild @@ -67,7 +67,7 @@ DEPEND="test? ( dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/pytest-qt[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] dev-python/xarray[${PYTHON_USEDEP}] )" @@ -137,7 +137,7 @@ pkg_postinst() { optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy optfeature "Symbolic mathematics in the IPython console" dev-python/sympy - optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy + optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy optfeature "Run Cython files in the IPython console" dev-python/cython optfeature "The hdf5/h5py plugin" dev-python/h5py optfeature "The line profiler plugin" dev-python/spyder-line-profiler diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.1.5.ebuild index d8bcd60bdc25..8e298c03b636 100644 --- a/dev-python/spyder/spyder-4.1.5.ebuild +++ b/dev-python/spyder/spyder-4.1.5.ebuild @@ -90,7 +90,7 @@ BDEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] dev-python/pytest-xvfb[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] )" @@ -190,7 +190,7 @@ pkg_postinst() { optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy optfeature "Symbolic mathematics in the IPython console" dev-python/sympy - optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy + optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy optfeature "Run Cython files in the IPython console" dev-python/cython optfeature "The hdf5/h5py plugin" dev-python/h5py optfeature "The line profiler plugin" dev-python/spyder-line-profiler diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild index 4abed0cfcb29..997b3203528d 100644 --- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild +++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}] dev-python/patsy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild index c1acf54013fe..cb0c73adee24 100644 --- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild +++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild @@ -20,12 +20,12 @@ RDEPEND=" >=dev-python/numpy-1.15[${PYTHON_USEDEP}] >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}] dev-python/patsy[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] " BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] >=dev-python/numpy-1.15[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] ) diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild index 37a2fc6336eb..c93564355042 100644 --- a/dev-python/statsmodels/statsmodels-9999.ebuild +++ b/dev-python/statsmodels/statsmodels-9999.ebuild @@ -21,7 +21,7 @@ CDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] dev-python/patsy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " RDEPEND="${CDEPEND} examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild index ca434f006540..6f65b491df80 100644 --- a/dev-python/theano/theano-1.0.5.ebuild +++ b/dev-python/theano/theano-1.0.5.ebuild @@ -23,7 +23,7 @@ BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " distutils_enable_tests nose diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild index 9bd714fa2fe7..d079411a0592 100644 --- a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild +++ b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" DEPEND="test? ( dev-python/pandas[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] )" + dev-python/scipy[${PYTHON_USEDEP}] )" distutils_enable_tests pytest distutils_enable_sphinx doc dev-python/mock diff --git a/dev-python/uranium/uranium-4.6.1.ebuild b/dev-python/uranium/uranium-4.6.1.ebuild index e2a3e9d997e2..19a97cf4fd23 100644 --- a/dev-python/uranium/uranium-4.6.1.ebuild +++ b/dev-python/uranium/uranium-4.6.1.ebuild @@ -35,7 +35,7 @@ DEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg] dev-python/numpy[${PYTHON_MULTI_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}] sci-libs/Shapely[${PYTHON_MULTI_USEDEP}] ')" diff --git a/dev-python/uranium/uranium-4.7.0.ebuild b/dev-python/uranium/uranium-4.7.0.ebuild index 7e03615ebb5b..4d6dc957d694 100644 --- a/dev-python/uranium/uranium-4.7.0.ebuild +++ b/dev-python/uranium/uranium-4.7.0.ebuild @@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] sci-libs/Shapely[${PYTHON_USEDEP}] ')" diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild index e37cd7cb6f69..5339b36685a5 100644 --- a/dev-python/xarray/xarray-0.12.1.ebuild +++ b/dev-python/xarray/xarray-0.12.1.ebuild @@ -25,7 +25,7 @@ DEPEND=" test? ( >=dev-python/dask-0.18.2[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] )" PATCHES=( diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild index 67c0b3aaa1ae..b31fa72fde94 100644 --- a/dev-python/xarray/xarray-0.16.0.ebuild +++ b/dev-python/xarray/xarray-0.16.0.ebuild @@ -28,7 +28,7 @@ BDEPEND=" dev-python/hypothesis[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/toolz[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.1[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] )" distutils_enable_tests pytest diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild index d24d3f651478..d445cebc3fda 100644 --- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild +++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild @@ -22,7 +22,7 @@ RDEPEND=" dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] $(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]") $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]") - $(python_gen_cond_dep "sci-libs/scipy[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]") $(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]") " DEPEND="${RDEPEND} diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild index d24d3f651478..d445cebc3fda 100644 --- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild +++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild @@ -22,7 +22,7 @@ RDEPEND=" dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] $(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]") $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]") - $(python_gen_cond_dep "sci-libs/scipy[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]") $(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]") " DEPEND="${RDEPEND} diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild index a73f9f65dc64..e5e6b1a24c2d 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild @@ -77,8 +77,8 @@ RDEPEND="${PYTHON_DEPS} dev-python/six[${PYTHON_MULTI_USEDEP}] filter? ( || ( - sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}] - sci-libs/scipy[${PYTHON_MULTI_USEDEP}] + dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/scipy[${PYTHON_MULTI_USEDEP}] ) ) grc? ( diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild index b85c4e578724..4bd0848dbf45 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild @@ -78,8 +78,8 @@ RDEPEND="${PYTHON_DEPS} dev-python/six[${PYTHON_MULTI_USEDEP}] filter? ( || ( - sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}] - sci-libs/scipy[${PYTHON_MULTI_USEDEP}] + dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/scipy[${PYTHON_MULTI_USEDEP}] ) ) grc? ( diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild index 3fd0a24eac18..ebf97b1bfda9 100644 --- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS} alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl - sci-libs/scipy + dev-python/scipy ) - filter? ( sci-libs/scipy ) + filter? ( dev-python/scipy ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( sci-libs/scipy ) + trellis? ( dev-python/scipy ) uhd? ( $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') ) diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild index ed6d89a7a8fa..3ae37a1a92e3 100644 --- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild @@ -57,9 +57,9 @@ RDEPEND="${PYTHON_DEPS} alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl - sci-libs/scipy + dev-python/scipy ) - filter? ( sci-libs/scipy ) + filter? ( dev-python/scipy ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -78,7 +78,7 @@ RDEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( sci-libs/scipy ) + trellis? ( dev-python/scipy ) uhd? ( $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') ) diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild index 65be5a358525..43237bbd9cc2 100644 --- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS} alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl - sci-libs/scipy + dev-python/scipy ) - filter? ( sci-libs/scipy ) + filter? ( dev-python/scipy ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( sci-libs/scipy ) + trellis? ( dev-python/scipy ) uhd? ( $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') ) diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index 65be5a358525..43237bbd9cc2 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS} alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl - sci-libs/scipy + dev-python/scipy ) - filter? ( sci-libs/scipy ) + filter? ( dev-python/scipy ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( sci-libs/scipy ) + trellis? ( dev-python/scipy ) uhd? ( $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') ) diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml index e93f0c7982e8..5a4e0cc6cf6b 100644 --- a/net-wireless/soapy_power/metadata.xml +++ b/net-wireless/soapy_power/metadata.xml @@ -10,7 +10,7 @@ <name>Radio</name> </maintainer> <use> - <flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag> + <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag> <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag> </use> <upstream> 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 index 6daef0f42e7b..fd1472590b6c 100644 --- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild +++ b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild @@ -27,5 +27,5 @@ DEPEND="" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] dev-python/simplespectral[${PYTHON_USEDEP}] >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}] - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] ) + faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild index 6daef0f42e7b..fd1472590b6c 100644 --- a/net-wireless/soapy_power/soapy_power-9999.ebuild +++ b/net-wireless/soapy_power/soapy_power-9999.ebuild @@ -27,5 +27,5 @@ DEPEND="" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] dev-python/simplespectral[${PYTHON_USEDEP}] >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}] - faster? ( sci-libs/scipy[${PYTHON_USEDEP}] ) + faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020 index feaaebcda6a6..a05a2e8b4de0 100644 --- a/profiles/updates/3Q-2020 +++ b/profiles/updates/3Q-2020 @@ -142,3 +142,4 @@ slotmove =app-editors/emacs-27.1_rc* 27-vcs 27 move net-misc/ntpclient net-misc/sntpd slotmove <media-sound/teamspeak-client-5 0 3 slotmove dev-haskell/network 3 0 +move dev-python/scipy dev-python/scipy diff --git a/sci-biology/biopandas/biopandas-0.2.7.ebuild b/sci-biology/biopandas/biopandas-0.2.7.ebuild index 9be9a8ac4a3c..83bfb4610f49 100644 --- a/sci-biology/biopandas/biopandas-0.2.7.ebuild +++ b/sci-biology/biopandas/biopandas-0.2.7.ebuild @@ -26,7 +26,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}]" + dev-python/scipy[${PYTHON_USEDEP}]" distutils_enable_tests nose diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild index 00d480b169c3..688fa93d394c 100644 --- a/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild +++ b/sci-chemistry/MDAnalysis/MDAnalysis-0.18.0-r1.ebuild @@ -18,7 +18,7 @@ IUSE="test" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] sci-biology/biopython[${PYTHON_USEDEP}] dev-python/networkx[${PYTHON_USEDEP}] dev-python/GridDataFormats[${PYTHON_USEDEP}] diff --git a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild index b7a964b81652..ea150d998e9d 100644 --- a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild +++ b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild @@ -27,7 +27,7 @@ IUSE="" DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " RDEPEND="${DEPEND}" diff --git a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild index 37f959acdc6e..bb13d32f0d41 100644 --- a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild +++ b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild @@ -27,7 +27,7 @@ IUSE="" DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " RDEPEND="${DEPEND}" diff --git a/sci-chemistry/chemex/chemex-2018.10.2.ebuild b/sci-chemistry/chemex/chemex-2018.10.2.ebuild index 99f888adb024..b73bd7a2fa61 100644 --- a/sci-chemistry/chemex/chemex-2018.10.2.ebuild +++ b/sci-chemistry/chemex/chemex-2018.10.2.ebuild @@ -25,7 +25,7 @@ RDEPEND=" >=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}] dev-python/numpy[${PYTHON_MULTI_USEDEP}] dev-python/setuptools_scm[${PYTHON_MULTI_USEDEP}] - >=sci-libs/scipy-0.11[${PYTHON_MULTI_USEDEP}] + >=dev-python/scipy-0.11[${PYTHON_MULTI_USEDEP}] ') " DEPEND="${RDEPEND}" diff --git a/sci-chemistry/chemex/chemex-2018.10.3.ebuild b/sci-chemistry/chemex/chemex-2018.10.3.ebuild index d0634c88451f..4e6e2d717f91 100644 --- a/sci-chemistry/chemex/chemex-2018.10.3.ebuild +++ b/sci-chemistry/chemex/chemex-2018.10.3.ebuild @@ -25,7 +25,7 @@ RDEPEND=" >=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}] dev-python/numpy[${PYTHON_MULTI_USEDEP}] dev-python/setuptools_scm[${PYTHON_MULTI_USEDEP}] - >=sci-libs/scipy-0.11[${PYTHON_MULTI_USEDEP}] + >=dev-python/scipy-0.11[${PYTHON_MULTI_USEDEP}] ') " DEPEND="${RDEPEND}" diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild index 761ab50155c8..cdf5b949625f 100644 --- a/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild +++ b/sci-chemistry/mdtraj/mdtraj-1.9.1.ebuild @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] dev-python/pytables[${PYTHON_USEDEP}] dev-python/networkx[${PYTHON_USEDEP}] diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild index 5537daa6a536..fba1fb10eed2 100644 --- a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild +++ b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild @@ -22,7 +22,7 @@ RDEPEND=" dev-python/pandas[${PYTHON_USEDEP}] dev-python/pytables[${PYTHON_USEDEP}] dev-python/networkx[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( diff --git a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild index 78539bfaf771..3a767944a130 100644 --- a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild +++ b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}]" + dev-python/scipy[${PYTHON_USEDEP}]" DEPEND=" test? ( ${RDEPEND} diff --git a/sci-chemistry/nmrglue/nmrglue-0.7.ebuild b/sci-chemistry/nmrglue/nmrglue-0.7.ebuild index 7772d64fc7d3..8b3a7eac6041 100644 --- a/sci-chemistry/nmrglue/nmrglue-0.7.ebuild +++ b/sci-chemistry/nmrglue/nmrglue-0.7.ebuild @@ -18,7 +18,7 @@ IUSE="" RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild index 2fb1a4020f2f..bc9c5426b8f1 100644 --- a/sci-libs/cartopy/cartopy-0.18.0.ebuild +++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild @@ -27,7 +27,7 @@ RDEPEND=" sci-libs/Shapely[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/pillow[jpeg,${PYTHON_USEDEP}] sci-libs/gdal[python,${PYTHON_USEDEP}] " diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild index 58c165ae5018..c0bf90c60e2e 100644 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild index 58c165ae5018..c0bf90c60e2e 100644 --- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild index 8fb64e296e68..60e7576d3c8e 100644 --- a/sci-libs/numkit/numkit-1.1.2.ebuild +++ b/sci-libs/numkit/numkit-1.1.2.ebuild @@ -29,5 +29,5 @@ IUSE="" BDEPEND=" dev-python/six[${PYTHON_USEDEP}] >=dev-python/numpy-1.9[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.0[${PYTHON_USEDEP}]" + >=dev-python/scipy-1.0[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" 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 index 875c4e86fa4c..6764d75ad7cf 100644 --- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild +++ b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" dev-python/pillow[${PYTHON_USEDEP}] dev-python/pywavelets[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - sci-libs/scipy[sparse,${PYTHON_USEDEP}] + dev-python/scipy[sparse,${PYTHON_USEDEP}] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} 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 index 467c21244943..87abf6b9c1e3 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " @@ -37,7 +37,7 @@ DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild index fc65c21b1d47..728231683290 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " @@ -38,7 +38,7 @@ DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild index fc65c21b1d47..728231683290 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " @@ -38,7 +38,7 @@ DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= " 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 index 1c4068d298ca..b60be666ce0d 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" dev-python/wheel[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] virtual/blas:= virtual/cblas:= 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 index b1dd82b36296..0b7cea51568b 100644 --- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild +++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild @@ -25,7 +25,7 @@ DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" RDEPEND=" - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] sci-libs/scikits[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pytables[${PYTHON_USEDEP}]" diff --git a/sci-libs/shogun/shogun-5.0.0-r1.ebuild b/sci-libs/shogun/shogun-5.0.0-r1.ebuild index 1db83f206fad..d4e67145a5f1 100644 --- a/sci-libs/shogun/shogun-5.0.0-r1.ebuild +++ b/sci-libs/shogun/shogun-5.0.0-r1.ebuild @@ -72,7 +72,7 @@ DEPEND="${RDEPEND} python? ( >=dev-lang/swig-3.0.12 test? ( - sci-libs/scipy + dev-python/scipy ) ) R? ( >=dev-lang/swig-3.0.12 ) diff --git a/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild index b631808b810e..46ef0a59ef5f 100644 --- a/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild +++ b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" dev-python/sphinx[${PYTHON_USEDEP}] >=dev-python/theano-0.9[${PYTHON_USEDEP}] >=dev-python/tqdm-4.8.4[${PYTHON_USEDEP}] - >=sci-libs/scipy-0.12[${PYTHON_USEDEP}] + >=dev-python/scipy-0.12[${PYTHON_USEDEP}] " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sci-physics/qmeq/qmeq-1.0-r1.ebuild b/sci-physics/qmeq/qmeq-1.0-r1.ebuild index 9038c029f11b..7ae48a59361c 100644 --- a/sci-physics/qmeq/qmeq-1.0-r1.ebuild +++ b/sci-physics/qmeq/qmeq-1.0-r1.ebuild @@ -21,7 +21,7 @@ SLOT="0" COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " RDEPEND=" ${COMMON_DEPEND} diff --git a/sci-physics/qutip/qutip-4.2.0.ebuild b/sci-physics/qutip/qutip-4.2.0.ebuild index 9bbf6fe19d2b..6e022cd8d0fb 100644 --- a/sci-physics/qutip/qutip-4.2.0.ebuild +++ b/sci-physics/qutip/qutip-4.2.0.ebuild @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] ) diff --git a/sci-visualization/pythonprop/pythonprop-0.29.ebuild b/sci-visualization/pythonprop/pythonprop-0.29.ebuild index 372c14f28f46..1888fc5fc46d 100644 --- a/sci-visualization/pythonprop/pythonprop-0.29.ebuild +++ b/sci-visualization/pythonprop/pythonprop-0.29.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] sci-libs/cartopy[${PYTHON_MULTI_USEDEP}] - sci-libs/scipy[${PYTHON_MULTI_USEDEP}] + dev-python/scipy[${PYTHON_MULTI_USEDEP}] ') dev-python/cairocffi sci-electronics/voacapl diff --git a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild index 4b8819557ebe..b5bb6d336236 100644 --- a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild +++ b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/setuptools-41[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]" + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip ${PYTHON_DEPS}" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" diff --git a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild index 08bb80b2417a..ce0ceaa1000b 100644 --- a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild +++ b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/setuptools-41[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]" + >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip ${PYTHON_DEPS}" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" diff --git a/sys-cluster/ceph/ceph-14.2.11.ebuild b/sys-cluster/ceph/ceph-14.2.11.ebuild index cab350b3f499..09fdd24959db 100644 --- a/sys-cluster/ceph/ceph-14.2.11.ebuild +++ b/sys-cluster/ceph/ceph-14.2.11.ebuild @@ -148,7 +148,7 @@ RDEPEND="${DEPEND} dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/routes[${PYTHON_USEDEP}] diskprediction? ( - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) sci-libs/scikits_learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild index a81fe959935e..d3903349156e 100644 --- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild +++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild @@ -153,7 +153,7 @@ RDEPEND="${DEPEND} dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/routes[${PYTHON_USEDEP}] diskprediction? ( - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) sci-libs/scikits_learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-15.2.5.ebuild b/sys-cluster/ceph/ceph-15.2.5.ebuild index 5368ad7d8d0a..942ffd88e776 100644 --- a/sys-cluster/ceph/ceph-15.2.5.ebuild +++ b/sys-cluster/ceph/ceph-15.2.5.ebuild @@ -153,7 +153,7 @@ RDEPEND="${DEPEND} dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/routes[${PYTHON_USEDEP}] diskprediction? ( - $(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) + $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) sci-libs/scikits_learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] |