gentoo resync : 08.01.2021

3 files changed, 1 insertions, 60 deletions

diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 9af2f6832b4c..49be388ae6cd 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,5 +1,3 @@
-DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
-EBUILD scikit-image-0.13.0-r1.ebuild 1738 BLAKE2B abf1e5df1eff25fddc3df6adeb9c8a2b289f9f51a8093318e7f0d0bad8d178b358377663f5a40cc0544765ee52f173222ffe3a342e41f212c2a6516e895393bf SHA512 50efaa381c1093a0e9602a4330253f44f46c56a993a6371527ab07dc987ee25b33cb7266894a3be9548b2e76616bb196e3c6cdabf83c33279c3d2165c06b850b
 EBUILD scikit-image-0.17.2.ebuild 1217 BLAKE2B ad8cee397fb0f4b3e906c08f63ef6b83b2932b0b77d230b3872ceae08a970e925a2eecd60e3d981656877210f22ec1dc65d0f66a638e034a9916dca7f7377a36 SHA512 3af9fcbdcd231564dc42df1feed4ef27d1e4064e4da0e9d6819c16895a6639b516a3939abb636097e14538d8a06fa27520f63aeab4883e3c5a72796e2eac40a2
-MISC metadata.xml 841 BLAKE2B d8e9c6247c250b668c91ef9341c9bd0c4d7a7c479530b02d2b05f2691a7d554e16cf744fd8e9fad919902a182a24bdcbf8aae890c58fccdbeb3a65116d7f9e5c SHA512 5e5ddb5f65b1e5b5a260af23bacc67775af9226fc97518d8146e05c922ae53e5863261a79382572920135e5ec70f1e5f083bbd7dadc9e9f899954baab67926da
+MISC metadata.xml 627 BLAKE2B 2936c5629cc755c91250dac8368462f1a60590e760cc435a6796284df5e1c3cef1945d10ca8ccad0075eddf636e3b93eb3bd08555aff7b1a542cff61fcf89230 SHA512 7cf63841ce61567db038ee838c44639d7e73ec10014e89c3116bc4c4cbc1afc96a687c416b715015e69ee0084bb48620328e6ab08a79f26c3993e7887ae552fb
diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index aa3d4f7f7fb5..a06c97516f58 100644
--- a/sci-libs/scikit-image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -11,10 +11,6 @@
     provides low-level manipulation, scikits.image centres around
     algorithms and applications.
   </longdescription>
-  <use>
-    <flag name="freeimage">Enable support for image i/o via<pkg>media-libs/freeimage</pkg></flag>
-    <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="pypi">scikit-image</remote-id>
   </upstream>
diff --git a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
deleted file mode 100644
index 0db4ea687ed1..000000000000
--- a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	echo "backend : Agg" > matplotlibrc || die
-	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	# not in portage yet
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}