Version bump. Keyword amd64-linux, x86-linux

(Portage version: 2.2.01.20757-prefix/cvs/Linux x86_64)

3 files changed, 17 insertions, 70 deletions

diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 3ecbc08af2b0..1b76b2820380 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.5 2012/06/21 18:59:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_image/ChangeLog,v 1.6 2012/07/09 16:41:41 bicatali Exp $
+
+*scikits_image-0.6 (09 Jul 2012)
+
+  09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +scikits_image-0.6.ebuild,
+  -scikits_image-0.3.1.ebuild, -scikits_image-0.4.2.ebuild:
+  Version bump. Keyword amd64-linux, x86-linux
 
   21 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scikits_image-0.5.ebuild:
   Restrict pypy
@@ -42,4 +48,3 @@
   26 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
   +scikits_image-0.2.2.ebuild, +metadata.xml:
   Initial import
-
diff --git a/sci-libs/scikits_image/scikits_image-0.3.1.ebuild b/sci-libs/scikits_image/scikits_image-0.3.1.ebuild
deleted file mode 100644
index bfc1a9490fe1..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 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.3.1.ebuild,v 1.1 2011/11/25 22:14:08 bicatali Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikits-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/scikits.image/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/numpy
-	sci-libs/scikits"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		"$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation 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 || die
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins -r build/sphinx/html || die
-	fi
-}
diff --git a/sci-libs/scikits_image/scikits_image-0.4.2.ebuild b/sci-libs/scikits_image/scikits_image-0.6.ebuild
index 856e4642b673..22cc751c2b4f 100644
--- a/sci-libs/scikits_image/scikits_image-0.4.2.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4.2.ebuild,v 1.1 2011/12/20 06:34:06 bicatali Exp $
+# $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="3"
+EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
 
 inherit distutils
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYPN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gtk qt4"
 
 RDEPEND="sci-libs/scipy
@@ -36,13 +36,14 @@ PYTHON_MODNAME="skimage"
 src_compile() {
 	distutils_src_compile
 	if use doc; then
-		"$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+		"$(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
+		PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" \
+			"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
 	}
 	python_execute_function testing
 }
@@ -53,9 +54,7 @@ src_install() {
 		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
 	}
 	python_execute_function -q remove_scikits
-	dodoc *.txt || die
+	dodoc *.txt
 	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins -r build/sphinx/html || die
-	fi
+	use doc && dohtml -r build/sphinx/html/*
 }