gentoo resync : 15.01.2020

3 files changed, 3 insertions, 62 deletions

diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index e5f1d0ac88f0..4fd4d37f834f 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,4 +1,3 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0-r1.ebuild 1822 BLAKE2B e595df705bd5aed423277c56cb9c0b9ce41e2a8ee492d521ecea117b5043290f8350fa2d8ca233eb9e00d1781dec3f693b14b5a7860d994301072fada5739234 SHA512 52c1b774f54ef368076f2b3286b9b024a0de92740a0527ac5b8a05ca55a4a5040e24ffd68a3c64ed4da2f01a329ba65d0372c0e9d7575aaf6a4bdc8086859d37
-EBUILD scikits_image-0.13.0.ebuild 1820 BLAKE2B e0acc39756bc717c5f0e35edc92606cfb38f2a24ca5297d72c63dc306a316b3172841aace9c0210b8eb3a80ea259a61fd1ccc92b165a46eb1bbd6138d638638a SHA512 e61b38dc34f10d5a08b04071fbe341daaefed3110372f740237a79fd3433b8ab2460ba416e7faf55c9410d53d1d7d028f2832cba56565f16b4066bb224cebd23
+EBUILD scikits_image-0.13.0-r1.ebuild 1810 BLAKE2B 8e90aecad0cd74e15dc7e817253d492bacaa9b846b8dcfea6b244bba0de386ffa2db2f54701e2b06aa4adb085df8fc044a6d5cae7f90ad4d84669d75ad1db51d SHA512 9359682962f99c304eb4ef52138ccb0d87477c5dca7239af2dc8c154a6ba1553cf8f06232f9c768fd8888853282e4a893b68a304713dd5f68910b0185af00fdb
 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
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 8c4d5a0fd8e3..99a0588f9ff9 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
deleted file mode 100644
index 985fd58974d2..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils virtualx
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.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}]
-	sci-libs/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}] )"
-
-S="${WORKDIR}/${MYP}"
-
-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
-}