diff options
-rw-r--r-- | profiles/updates/4Q-2020 | 1 | ||||
-rw-r--r-- | sci-libs/scikit-image/Manifest (renamed from sci-libs/scikits_image/Manifest) | 1 | ||||
-rw-r--r-- | sci-libs/scikit-image/metadata.xml (renamed from sci-libs/scikits_image/metadata.xml) | 13 | ||||
-rw-r--r-- | sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild (renamed from sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild) | 7 | ||||
-rw-r--r-- | sci-libs/scikit-image/scikit-image-0.17.2.ebuild | 42 |
5 files changed, 51 insertions, 13 deletions
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020 index e6eaafa053f7..0c667f5c3224 100644 --- a/profiles/updates/4Q-2020 +++ b/profiles/updates/4Q-2020 @@ -4,3 +4,4 @@ move x11-apps/copyq x11-misc/copyq slotmove media-gfx/gimp 2 0 move dev-python/scikit-learn sci-libs/scikit-learn move sci-libs/scikits_learn sci-libs/scikit-learn +move sci-libs/scikits_image sci-libs/scikit-image diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikit-image/Manifest index ef33ed7e6302..a9303cfafc77 100644 --- a/sci-libs/scikits_image/Manifest +++ b/sci-libs/scikit-image/Manifest @@ -1 +1,2 @@ DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550 +DIST scikit-image-0.17.2.tar.gz 22682646 BLAKE2B acfa38caff7aa2e1f724e173f544610e643976a40feb752040d2f20d49d871d19dddb34790bf846476932c771c260ad9bd210781439707d7c5f693c9a8fa021c SHA512 3e57d8bea2fd41270eb17e8489c477f58ed98e56cef0192b0b2d455f27f7a2d705161afd61c7bfd556ec938a9a2bf5663ec1aa7b79609a8e5946806356364e82 diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikit-image/metadata.xml index 8e05ce3947d6..aa3d4f7f7fb5 100644 --- a/sci-libs/scikits_image/metadata.xml +++ b/sci-libs/scikit-image/metadata.xml @@ -6,14 +6,13 @@ <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - This SciKit (toolkit for SciPy) includes useful image processing - algorithms for use with Python and NumPy. While SciPy’s ndimage - provides low-level manipulation, scikits.image centres around - algorithms and applications. -</longdescription> + This SciKit (toolkit for SciPy) includes useful image processing + algorithms for use with Python and NumPy. While SciPy’s ndimage + 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="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> diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild index 6764d75ad7cf..0db4ea687ed1 100644 --- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild +++ b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild @@ -7,12 +7,9 @@ PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 optfeature 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" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -35,8 +32,6 @@ DEPEND="${RDEPEND} 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() { diff --git a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild new file mode 100644 index 000000000000..fe007d997ac2 --- /dev/null +++ b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# 8,9 not on dev-python/pyamg +PYTHON_COMPAT=( python3_{6..7} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 optfeature + +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" + +RDEPEND=" + dev-python/imageio[${PYTHON_USEDEP}] + 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/scipy[sparse,${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" + +DOCS=( CONTRIBUTORS.txt RELEASE.txt ) + +pkg_postinst() { + optfeature "FITS io capability" dev-python/astropy + optfeature "GTK" dev-python/pygtk + optfeature "Parallel computation" dev-python/dask + optfeature "io plugin providing most standard formats" dev-python/imread + # not in portage yet + #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk +} |