Version bump. Keyword amd64-linux, x86-linux

Package-Manager: portage-2.2.01.20757-prefix/cvs/Linux x86_64

4 files changed, 28 insertions, 83 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/Manifest b/sci-libs/scikits_image/Manifest
index 939dfc9fc800..a16ed920c5f0 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST scikits-image-0.4.2.tar.gz 3128187 RMD160 4c03db7231384ad363801696fe1c8fb6051cc4e4 SHA1 74d7f91a25e85f0ec882cf809b1d91c30733e9d4 SHA256 be34953dd133e5cf9821e3e657d124fd53f0079799756bca3069aa8d31f56f31
-DIST scikits-image-0.5.tar.gz 3298989 RMD160 876712c2a1832f28d149e2ad5282b911c0ab4013 SHA1 cac3e925eaaeb726a784eb6f835d022f77c07609 SHA256 caf0e8557fb0f4b71b8a70c44f5bd58867deb4205ff45e268dff18e29ad49f03
-DIST scikits.image-0.3.1.tar.gz 3072072 RMD160 8378386ff3dfdfb155f11ef30c4f73988abe9e86 SHA1 de59042da437a1f69fcd04eaa273e07c4f82c84b SHA256 bcd3489afe8f681c744a00c7dd33dbe82a643ffccc647f91676d5a47a70c1d61
-EBUILD scikits_image-0.3.1.ebuild 1312 RMD160 33c4d1e5833d87993c3ca3eed9f465626b7fb84a SHA1 3621ddba2f7cd05e20bafeabe535c178de5db9b3 SHA256 ceb43575081c18ff4d2f348edd3eed318f561863d5338b8762cc28a00f461342
-EBUILD scikits_image-0.4.2.ebuild 1429 RMD160 107149e3c3db7be5811f63ef8ecb04e90f5db4e3 SHA1 d841049bc68ecc7c9e93268b33acd62189ccbd8c SHA256 9fcdb16fe507de86677cb9f8de7c7f9ffa123c3db0eece1856b8ea89fc69a0c6
-EBUILD scikits_image-0.5.ebuild 1394 RMD160 16fe80241cb38d060120531159324967083c8705 SHA1 12a6595b1bb3d430f9e0b9ccfa9ac62b46f84ea6 SHA256 ae4fb263afaa6269e9f29d2b8050cca24dd48d7678c54583c9bfb1f2f737f47b
-MISC ChangeLog 1349 RMD160 47d467987d5b27302b7cf617d8f1cf586be30346 SHA1 d6d454d825241e4f48beaa2f69792f3dffcf38f4 SHA256 832d1ffa353a3b32a0ca486bd0d517743804288b867576b55d081866196499c2
-MISC metadata.xml 507 RMD160 6c3dae8a75b1178bfe82da9cd197e142a81fba05 SHA1 4c9644749d391126d49ec059607ecf87fdf5942d SHA256 09965e56692663d193d977b397a7a52f4495122a9ae09867e805ed94171e9f62
+DIST scikits-image-0.5.tar.gz 3298989 SHA256 caf0e8557fb0f4b71b8a70c44f5bd58867deb4205ff45e268dff18e29ad49f03
+DIST scikits-image-0.6.tar.gz 3525312 SHA256 f17f6a83329dd2a02ddb0224255e4a37d816f92764ef1934365925a81184f3b3 SHA512 80d5ea7fa4a35ae468a7746536f5ee2508cd241b633a51277a913940418e457277934239130b5ea05707f627ad215894a685f756c3e507bfdbc098cfe21a71b6 WHIRLPOOL a408c26b296a976c04d7030172d1e84e68d5fdcbeb4ec4918286613bae31f149113e0f5999881f1960803b0cf19f5a9f0213055190884937172dddfb41bcf31b
+EBUILD scikits_image-0.5.ebuild 1394 SHA256 ae4fb263afaa6269e9f29d2b8050cca24dd48d7678c54583c9bfb1f2f737f47b SHA512 74fbc8034fbd9d220e937db94dd5e369263223a8416256d2b6d19528cf23eb0c43f5fce446bbbccf976dd5f6bd2e183e0c3bf1c5de79840e5aeaf3c80dc41205 WHIRLPOOL 265e9cf2539958c3e7657471bb7707da5e4052f5cde628d7ba7eb89e0dc741ad1788cb818163b5145b82dc14d6048028f335a8a6940110c0eed097ecb60b24a5
+EBUILD scikits_image-0.6.ebuild 1418 SHA256 42e963de145b3d1119ccbb261a07b28a0d240aa2972fb6ccef506be341c978d2 SHA512 5f2645e255d99d757aee358b9e3b8882f7ce185e2fe86814a0096bb1ac542607052573334aca6cf9c297bfb604ef3b071f2f4ea1a16b23c92b6701ce33e91fe5 WHIRLPOOL 3627ee6121a8edb88e1640e98696a1b93fd61829c39c68263b9ff4875097fbfd70e23c433994807a5e5ea77ee7916a4730d590f89e811370e6873efe7884e24a
+MISC ChangeLog 1572 SHA256 ed6707681d72719ff0028a44889c6dc6b4ff5e4479a5426dafd9aa106be09341 SHA512 c89d044f6809a4f6410fd7dd9580dffe0879dcfec30615f2f107022515ed223f9b49794bb91aab1aaca7378b0c62dec2650d0f7f53b73841e814972889ece26e WHIRLPOOL 2ca9948d9f0c135443c8c38a5b851d4ce36c36849149f96158c3edcf59351379597f2b73c4cd02dc3b806cc97f755573d7e49d6da2468a0f0d6ab802bc807f09
+MISC metadata.xml 507 SHA256 09965e56692663d193d977b397a7a52f4495122a9ae09867e805ed94171e9f62 SHA512 f63b6e74ef0b47bf0909066efc004928e2e43c9a3fe0217d189c96823e28666a3942c6ff02237e99fac541ff746677e78626a6c9d416f33ec5f6a41b3e486ca9 WHIRLPOOL bf53b2be4135d9ccaf3a7d909720d0cc190866faa64e958811bdb4c2409f79f3a870e456d83a68c90871570dd9d660d590e57a53fdfe177a9ce341de8a653959
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/jbwAACgkQ1ycZbhPLE2C9XQCgmHk6U0fhp0HCzrpKhYuvwRYR
-TosAn2+8S6eaFbcqIZz2hVMqUXXx2KG2
-=IXd/
+iEYEAREKAAYFAk/7CdEACgkQ1ycZbhPLE2DzqwCcDus28Jm3UmwGfUdkKD4YOcLZ
+IiAAnikWgPvnkV9ZrG6HPAKMvM5yUIdA
+=heWm
 -----END PGP SIGNATURE-----
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/*
 }