From fda78b0df21eeb3f200753dc5f3b30a5d1f77387 Mon Sep 17 00:00:00 2001
From: Sébastien Fabbro <bicatali@gentoo.org>
Date: Tue, 17 Sep 2013 10:23:44 -0700
Subject: sci-libs/scikits_image: Fix source directory, update dependencies,
 cleanup (bug #484428)

Package-Manager: portage-2.2.4.22351-prefix
RepoMan-Options: --force
---
 sci-libs/scikits_image/ChangeLog                 |  5 +++++
 sci-libs/scikits_image/metadata.xml              | 17 +++++++++++++++++
 sci-libs/scikits_image/scikits_image-9999.ebuild | 18 +++++++-----------
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 sci-libs/scikits_image/metadata.xml

diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 249a0b61b..2b3abdf68 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
+  scikits_image-9999.ebuild:
+  sci-libs/scikits_image: Fix source directory, update dependencies, cleanup
+  (bug #484428)
+
   19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> scikits_image-9999.ebuild:
   sci-libs/scikits_image: Revert to esetup.py instead of for testing, remove
   scikits depedency
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
new file mode 100644
index 000000000..51476ec31
--- /dev/null
+++ b/sci-libs/scikits_image/metadata.xml
@@ -0,0 +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
+  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>
+</use>
+<upstream>
+  <remote-id type="pypi">scikit-image</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 6174f069d..bcb232c18 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -8,9 +8,7 @@ EAPI=5
 #PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1 git-2
-
-MYPN="${PN/scikits_/scikit-}"
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Image processing routines for SciPy"
 HOMEPAGE="http://scikit-image.org/"
@@ -27,25 +25,23 @@ RDEPEND="
 	gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
 	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
 DEPEND="
-	>=dev-python/cython-0.15[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyamg[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
+		sci-libs/scipy[sparse,${PYTHON_USEDEP}] )"
 
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt )
+DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt README.md DEPENDS.txt RELEASE.txt TASKS.txt )
 
 python_test() {
+	# distutils_install_for_testing not working here
 	esetup.py \
 		install --root="${T}/test-${EPYTHON}" \
 		--no-compile || die "install test failed"
-	#distutils_install_for_testing
 	cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
 	echo "backend: Agg" > matplotlibrc
-	MPLCONFIGDIR=. PYTHONPATH=. nosetests-"${EPYTHON}" || die
+	MPLCONFIGDIR=. nosetests -v skimage || die
 }
-- 
cgit v1.2.3-18-g5258