Version bump

(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 64 insertions, 72 deletions

diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index d4c3fc5bab12..abd14a135f17 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scikits_image
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.10 2013/02/08 08:53:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.11 2013/03/19 20:31:15 bicatali Exp $
+
+*scikits_image-0.8.2 (19 Mar 2013)
+
+  19 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +scikits_image-0.8.2.ebuild, -scikits_image-0.7.2-r1.ebuild, metadata.xml:
+  Version bump
 
 *scikits_image-0.7.2-r2 (08 Feb 2013)
 
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 4e57c7f06fea..51476ec31535 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,17 +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">
+<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>
+<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.7.2-r1.ebuild b/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild
deleted file mode 100644
index 5d71571bc8ce..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 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.2 2013/01/03 20:40:40 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="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.8.2.ebuild b/sci-libs/scikits_image/scikits_image-0.8.2.ebuild
new file mode 100644
index 000000000000..221989c3f6e1
--- /dev/null
+++ b/sci-libs/scikits_image/scikits_image-0.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 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.8.2.ebuild,v 1.1 2013/03/19 20:31:15 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+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 freeimage gtk qt4 test"
+
+RDEPEND="
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	sci-libs/scipy[umfpack,${PYTHON_USEDEP}]
+	freeimage? ( media-libs/freeimage )
+	gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
+DEPEND="
+	>=dev-python/cython-0.15[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${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}"
+
+DOCS=( CONTRIBUTORS.txt DEPENDS.txt DEVELOPMENT.txt RELEASE.txt TASKS.txt )
+
+python_test() {
+	esetup.py \
+		install --root="${T}/test-${EPYTHON}" \
+		--no-compile || die "install test failed"
+	cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
+	echo "backend: Agg" > matplotlibrc
+	MPLCONFIGDIR=. PYTHONPATH=. nosetests-"${EPYTHON}" || die
+}