Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sci-libs/scikits_image/ChangeLog11
-rw-r--r--sci-libs/scikits_image/metadata.xml17
-rw-r--r--sci-libs/scikits_image/scikits_image-0.5.ebuild60
-rw-r--r--sci-libs/scikits_image/scikits_image-0.6.ebuild60
-rw-r--r--sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild63
-rw-r--r--sci-libs/scikits_image/scikits_image-0.7.2.ebuild60
6 files changed, 84 insertions, 187 deletions
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index c6f3b3cb5d73..c5ee695b171b 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sci-libs/scikits_image
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.7 2012/10/29 12:07:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.8 2012/12/10 22:04:22 bicatali Exp $
+
+*scikits_image-0.7.2-r1 (10 Dec 2012)
+
+ 10 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +scikits_image-0.7.2-r1.ebuild, -scikits_image-0.5.ebuild,
+ -scikits_image-0.6.ebuild, -scikits_image-0.7.2.ebuild, metadata.xml:
+ Fixed dependencies. Removed doc building because of missing files. Restrict
+ more python versions, rewrote test building, added freeimage possible
+ dependency
*scikits_image-0.7.2 (29 Oct 2012)
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 003d6c0b34cb..51476ec31535 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">This SciKit (toolkit for SciPy) includes useful image processing
+<herd>sci</herd>
+<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>
- <upstream>
- <remote-id type="pypi">scikits.image</remote-id>
- </upstream>
+ algorithms and applications.
+</longdescription>
+<use>
+ <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="pypi">scikit-image</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sci-libs/scikits_image/scikits_image-0.5.ebuild b/sci-libs/scikits_image/scikits_image-0.5.ebuild
deleted file mode 100644
index 89dfaeef62d1..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.5.ebuild,v 1.2 2012/06/21 18:59:03 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils
-
-MYPN="${PN/scikits_/scikits-}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikits-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk qt4"
-
-RDEPEND="sci-libs/scipy
- sci-libs/scikits
- gtk? ( dev-python/pygtk )
- qt4? ( dev-python/PyQt4 )"
-DEPEND="dev-python/numpy
- dev-python/cython
- dev-python/setuptools
- doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-PYTHON_MODNAME="skimage"
-
-src_compile() {
- distutils_src_compile
- if use doc; then
- "$(PYTHON -f)" setup.py build_sphinx || die "doc failed"
- fi
-}
-
-src_test() {
- testing() {
- PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" \
- "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- remove_scikits() {
- rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
- }
- python_execute_function -q remove_scikits
- dodoc *.txt
- insinto /usr/share/doc/${PF}
- use doc && dohtml -r build/sphinx/html/*
-}
diff --git a/sci-libs/scikits_image/scikits_image-0.6.ebuild b/sci-libs/scikits_image/scikits_image-0.6.ebuild
deleted file mode 100644
index 22cc751c2b4f..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.6.ebuild,v 1.1 2012/07/09 16:41:41 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils
-
-MYPN="${PN/scikits_/scikits-}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikits-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk qt4"
-
-RDEPEND="sci-libs/scipy
- sci-libs/scikits
- gtk? ( dev-python/pygtk )
- qt4? ( dev-python/PyQt4 )"
-DEPEND="dev-python/numpy
- dev-python/cython
- dev-python/setuptools
- doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-PYTHON_MODNAME="skimage"
-
-src_compile() {
- distutils_src_compile
- if use doc; then
- "$(PYTHON -f)" setup.py build_sphinx || die "doc failed"
- fi
-}
-
-src_test() {
- testing() {
- PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" \
- "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- remove_scikits() {
- rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
- }
- python_execute_function -q remove_scikits
- dodoc *.txt
- insinto /usr/share/doc/${PF}
- use doc && dohtml -r build/sphinx/html/*
-}
diff --git a/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild b/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..e47765e8d224
--- /dev/null
+++ b/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild,v 1.1 2012/12/10 22:04:22 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.3 2.7-pypy-* *-jython"
+PYTHON_MODNAME="skimage"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+MYPN="${PN/scikits_/scikit-}"
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="http://scikit-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="freeimage gtk qt4 test"
+
+RDEPEND="
+ sci-libs/scikits
+ sci-libs/scipy
+ freeimage? ( media-libs/freeimage )
+ gtk? ( dev-python/pygtk )
+ qt4? ( dev-python/PyQt4 )"
+DEPEND="
+ >=dev-python/cython-0.15
+ >=dev-python/numpy-1.6
+ dev-python/setuptools
+ test? ( dev-python/matplotlib )"
+
+# missing data files to generate doc in version 0.7.2
+# doc? ( dev-python/matplotlib
+# dev-python/sphinx
+# media-libs/freeimage
+# sci-libs/scipy
+# dev-python/sphinx )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+DOCS="*.txt"
+
+src_test() {
+ testing() {
+ "$(PYTHON)" setup.py \
+ build -b build-${PYTHON_ABI} \
+ install --root="${T}/test-${PYTHON_ABI}" \
+ --no-compile || die "install test failed"
+ pushd "${T}/test-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \
+ > /dev/null || die
+ echo "backend: Agg" > matplotlibrc
+ MPLCONFIGDIR=. PYTHONPATH=. nosetests-${PYTHON_ABI}
+ popd > /dev/null
+ rm -fr test-${PYTHON_ABI}
+ }
+ python_execute_function testing
+}
diff --git a/sci-libs/scikits_image/scikits_image-0.7.2.ebuild b/sci-libs/scikits_image/scikits_image-0.7.2.ebuild
deleted file mode 100644
index 0f10e05d2316..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.7.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/scikits_image-0.7.2.ebuild,v 1.1 2012/10/29 12:07:24 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-
-inherit distutils
-
-MYPN="${PN/scikits_/scikit-}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk qt4"
-
-RDEPEND="sci-libs/scipy
- sci-libs/scikits
- gtk? ( dev-python/pygtk )
- qt4? ( dev-python/PyQt4 )"
-DEPEND="dev-python/numpy
- dev-python/cython
- dev-python/setuptools
- doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-PYTHON_MODNAME="skimage"
-
-src_compile() {
- distutils_src_compile
- if use doc; then
- "$(PYTHON -f)" setup.py build_sphinx || die "doc failed"
- fi
-}
-
-src_test() {
- testing() {
- PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" \
- "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- remove_scikits() {
- rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
- }
- python_execute_function -q remove_scikits
- dodoc *.txt
- insinto /usr/share/doc/${PF}
- use doc && dohtml -r build/sphinx/html/*
-}