Version bump

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 71 insertions, 78 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/Manifest b/sci-libs/scikits_image/Manifest
index 032f6976f741..b3ad962887b1 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST scikit-image-0.7.2.tar.gz 4453107 SHA256 dad28ba772ccd1ddf70a72c3ecfbf27eb1a7ddf7b2e46e2ce567fc0c6b603931 SHA512 c8a21d1bdf57d17bce211aee6e3705e6a6e3682fc73d8369fcee5bb8e5f6b985c022624f51bd95cf87d125a545a447f7bfc0b533a4bcd48708a3e551bc8a82cf WHIRLPOOL d6f5042d33bad804aafc4dd0ecb16fed13b4b88b1e2a215e052e1014503395b37c945af0ec0e048977af9d0c3179113811031dbc3a3dddc0f4bafc8cf7dea1a8
-EBUILD scikits_image-0.7.2-r1.ebuild 1615 SHA256 f82dfa6482d94ae1f78528846f28b2d350254203ed2c92ccca16124b1f46e4df SHA512 dd22ac64d3b9876d8c17f3e92c49c14097e27c75898455e6932f95b62e3093bf953764741a552708779f782a6b22bba09cccc32c25f04616f64a60e2ebb65579 WHIRLPOOL 0acac5623276de37e4679089f597931ff12d2105598d95a0e1cd9e8fd700b58dd3230fa8c3809f2d85d2eb708a8040a904bd99e53c329c88490b0fca159af370
+DIST scikit-image-0.8.2.tar.gz 4872917 SHA256 df078f18f9dde7b354b6524cc85b6e78bc5c42a8851a173609052f7c7d4e0846 SHA512 c04f9f369d16f44395abcd8123fcd7c2d1e8558d3c52f821e2e1d3e6a63542b738f5814d53423a9e523427b256b5f30201dba6f3bd5e1b8e0d1942f4413f3bb2 WHIRLPOOL fe63817d2c8a25aaffe84192b78f730872cf0498799a3a3e18f3bfbd8950efc7f1122b2d8f8acafb6925b260ae4fafd754ce1024c2cde95a355d9b1d597f2ab4
 EBUILD scikits_image-0.7.2-r2.ebuild 1576 SHA256 59a0c33a1345b7c7a4900e76be1bdccd66a96f128e83c60805703432efc7e22f SHA512 c0556ae85ed3f5ff98c1109b5156925121d716990f9f52e083c0903b4723fec3d5faf4fb5c28b94fe9e0997c2a330028913c6fbf7cba53bc4d4c8feeaa93cfb1 WHIRLPOOL e7e70da38c8d7a3129c33664d0811da732cd2eebbb389f3bbb702c5ae0a212c71bf832da6ba792f55c1bcc8543de468bde5dccc5b6d26a7bb5a0f6e51d637597
-MISC ChangeLog 2405 SHA256 7976acbb4290e2c1584688a0c99579e5c7de6270ae22b80ab3b6cb350d78f55f SHA512 5208767b2f5378e3bbcc777c641cb15c4aba88c650a56f22d32f4433bc9fc8cab684bc6e5ecb256c1500717f4da479d6f89c5d8707f41e100b63db90380ca7f8 WHIRLPOOL 7fe91423c49294c396f4c24836ffdc52e4d52338d039f977ad515156ac1d3b14c7bffcd292fa5d4e9854dbad3d3f821841e74dec4545887caecf0429022b9988
-MISC metadata.xml 632 SHA256 b2417b6228fcaefa5d67f88357cb8385af5cdbb4cd6e38b638fb5d364e0dad41 SHA512 b3567623150cc4b73589246bee7948452f111df9e8cd3d929c78f6b90b2d19dd368a1b9e0f6c2f8a558b87989ffcec1c1c02e0128cbc7f79ba9c4cde356302fb WHIRLPOOL 73a557828046ca834badfc016dcb61c3e46eae6ac8ee017ec771462464dbb6f443dbe22e283c3b05cdf1c9c9584f7fa1ca47677b9f3f8153f97ae76b60e1ddb0
+EBUILD scikits_image-0.8.2.ebuild 1475 SHA256 b9a2fd2f93b749c7ce4658672f265e0a4cb4e3fcc1014b03787edbfe6ddd20a9 SHA512 903459ee0b301c730a3cb080548bb8a5cb527107f8e72a932ab5b06c8ebb2f3f9c7d09be2947f32ec99d4a767e0971d3b33e1264320f111e7d9cc73ea1445fd2 WHIRLPOOL e1edfb615051d226f60c1ce3d836aaaa62c264c7fecbe193c6307c3fc9ec466789ba268cd45d9391df0b9a6d96b37adac4dde4c794eac97549cc00e0cc460976
+MISC ChangeLog 2593 SHA256 e9ea9aab0d40d2f6a8d2aef5813a1d6423bae12f79804bdc5ba472830007c134 SHA512 78cb279510eec7c8b62b151ba0b5b6640903fdde4a9f35bd1f13e1a4a5810c2b17846819af209505ff80794d66c34d2ee670bf272135b6654c33bc15dbebae02 WHIRLPOOL 6f581e17e7929990e8751f2854abc35e89687e7af05608482bf5fcdc838f2fb8e53f4b14fa613b171c66c6e0d57c38a7e4db5f2e70bbc02169aef0e29dc550c5
+MISC metadata.xml 616 SHA256 6ae51383130ed34d32d97a4900156c4380a67d35fa473f9ba554d95027e5cd90 SHA512 c26ed4400a2d37f5ebcd7fb7989e1a3bc5319e6d7724075c1a08755de76dc9115f071f73e47dc637e84b2af59a59900dcb17987f6eee16ef942931afccc4aa4b WHIRLPOOL 367edd6569c925278e0b5e9ae1182390248d53466cfa0fd92c0b86ad4f6a75cb4f80a3194f21c1fe35f9ab4fee8c579d4db5860eca405a39e3feb01efcc3a8ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEUvQQACgkQgAnW8HDreRYudwCeMODli3v3V506pkD1R7WpflPD
-WbMAn0jFHQ8jkpgsNsceQb5DHovPKcoF
-=fcVM
+iEYEAREIAAYFAlFIy8IACgkQ1ycZbhPLE2AyEwCghSPaUnL7VeIXQge046YLrAQo
+tyMAniAsBIBDMsnKgM2GQpD3C4AVF3tT
+=no00
 -----END PGP SIGNATURE-----
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
+}