Version bump, drop old. Fixes bug #297997. Add sci to metadata

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

6 files changed, 25 insertions, 74 deletions

diff --git a/dev-python/h5py/ChangeLog b/dev-python/h5py/ChangeLog
index e8dafdb44092..58528e0758df 100644
--- a/dev-python/h5py/ChangeLog
+++ b/dev-python/h5py/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/h5py
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.5 2011/05/03 22:20:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/ChangeLog,v 1.6 2011/07/17 10:54:57 xarthisius Exp $
+
+*h5py-2.0.0 (17 Jul 2011)
+
+  17 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> -h5py-1.3.0.ebuild,
+  -files/h5py-1.3.0-python-2.7.patch, -h5py-1.3.1.ebuild, +h5py-2.0.0.ebuild,
+  metadata.xml:
+  Version bump, drop old. Fixes bug #297997. Add sci to metadata
 
 *h5py-1.3.1 (03 May 2011)
 
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 75a8821c8ef4..ffe4fbe32f1b 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX h5py-1.3.0-python-2.7.patch 319 RMD160 051913e8b73df8412090d2f586771351f158f36f SHA1 745b5ad0f7aefd2b4cd06db56adf571d3289ac93 SHA256 82cab5ec7d08dc6d0f5d95b7c3613ca3354ca5b71b24a0e949db9e09c041a3e2
-DIST h5py-1.3.0.tar.gz 1533645 RMD160 49e475ca6bf2de375eb98b5c8cca78b534d1ef6f SHA1 9398cb3a11ea7f6b62738330206c7dce7c7c2132 SHA256 1708268a86252f94154d854157d33a7ab48d7ec6d09515dd414a01f87019928a
-DIST h5py-1.3.1.tar.gz 1631609 RMD160 7c55fc57734857288adc37385ff98f4a17aa4f40 SHA1 8cbad11934f14b770613aa33b9a02e756e2d67c0 SHA256 e4416a158a8018d1a234e0be1a933298eb8f4c549ef889e2f28902093b84da0a
-EBUILD h5py-1.3.0.ebuild 890 RMD160 6d1962921c2f504b92a04ea2664d177143341c0b SHA1 16318881f2223051cf1f6b5d0de35316eafe2fc8 SHA256 ad7565d6af466d7bd3a5905b17d1d63a61f996997888378f1c4c2f14e61e7010
-EBUILD h5py-1.3.1.ebuild 806 RMD160 941fb66133df58ea1804561541eec7b5bd1f9d4d SHA1 8306be68cea07e900d350ea246f3c0534c0c97ff SHA256 a3f2f597357e49788a06b91fdde0262a6f2ff2bacb74e22a0610d6b658d41de3
-MISC ChangeLog 1690 RMD160 fc28c7b67fa18a944da9666799b85ef97f722b45 SHA1 4b56398400fd02e565349e41f987ea143ffb2269 SHA256 97a5884a582de9fb13e5be6379bb8555d8c31aff82fe77a0d54bfe19cdb56918
-MISC metadata.xml 685 RMD160 f3c9b3d97b716f571966e1d5568d429b71fd9858 SHA1 0b553cb79ce4685a77c38dbf38f1d664a974e075 SHA256 7fa1a12493813c68dddc29b3a7f4fd6519e258684dbeb189e442af3ab3ce6c6c
+DIST h5py-2.0.0.tar.gz 844101 RMD160 50cf9141c1f4718f33dd8d5b0b25121efdc23a37 SHA1 d66300f1deb540bd42b5596f07bf0add10a9363a SHA256 0fc1c458e7df614c2d550e66ab450b2ff32e99f2b8e7126a6fae069f366e9f1e
+EBUILD h5py-2.0.0.ebuild 832 RMD160 149f1e810a7b8d3e31b1f9a2259b36b62d3a6569 SHA1 ba7cc1c9efb98165cccbf643b98a2b2d1462cf98 SHA256 37d956ff89898a7d28ffdfbfede22e9d0711687477fb84ca2378c14abbef1b19
+MISC ChangeLog 1953 RMD160 e551aa1f5130e1b67f33f291b8400a64d2c447f6 SHA1 cc13eb8249d827bf02892bc03ac760934bb5648e SHA256 79cbd55bd4dfd7845012770e4267dd4010399f0b1c7d3f9ccdb7342d2e37239c
+MISC metadata.xml 702 RMD160 79ee29af7a0697d7625459c335071ef8bc9bad9d SHA1 2ee470a37f0e36fc12442d630f1a83431cc19bda SHA256 80076b56de98efa9c3aa9371e39ba08bd34cc81ab6013fab479a83976fe9ab6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNwbq9AAoJENgZr6v6gHY0Sy4P/RSNdo8kPunjd6KyySEFhk9t
-xpReAh6CVy+Ysn1LL32eXvXr8A0/SFoZ5PqmPxVUvk7ygxGaEcGzIwfRPsRhTBfp
-bUoZwZSRu5nPapvXrhHUp3N4Nem/0k9P059TYHferePJx56gca0knDkx5dROupXg
-Y6IoHIK6ds9kZ2UBpEeVZP+2vzAFGK8AdFmF4waIUvUITtubleeKzsd11dHl0smZ
-a6MhLeYCqppNhLDXQrHFeaUp0FvSI+1ij7wTf6TvgFmqLiVkdHn6L5oEM1Em3jFV
-aiX4cQG547hyOuxQd27WjZiw+UV4SiUnmYeb7gs8a+ykRxERa9cyQJ7zkWq7qMRr
-mQui67LmWipJUxOjRS/1d7xxSjM7ZwWAnEvjmXLvqsoseF43nLu59njI/gONst57
-hbVjNKJc2zbj18yoLVnf0inmXrY7uYKKJvMYousftA4qwKmEei4Q+IZnzS6o0MF2
-042thaM4NK88TgAOFjNdOPE/a3wEClWWAdOlPnH5+gkBMcsSArD8f+cIjQDplyhk
-Zppj3z2WFKH6lDTdcvElmzF+51D7Rx3KJWiHjWwzWedgQutUtQ0lQaP+OzxHLpXN
-31yTS3q6xaUZtdOXFEkgE5at3WGj53T1cCdn6MNMndX2ZNtGjh26eUSlplhllU4Z
-PWBcyGER7GNZ4R93Hj34
-=GseB
+iJwEAQECAAYFAk4iv4wACgkQIiMqcbOVdxRe5AP/WHh6iHqZu+W4nesX9ILV68hY
+PYlc8J0EYzvavKFLck01JORXL97rNqKLt4JzaSglwEVzxGqc21Acb0H/czddgy6e
+/c9wEr4Q18Hz+fgQCChtk5hewweCCY36q3iX04SMWn6yDKH0t+wrDai3gz+P9b9H
+demfX8GMAphCjssiov4=
+=SHHg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch b/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch
deleted file mode 100644
index 93a5014c0bbb..000000000000
--- a/dev-python/h5py/files/h5py-1.3.0-python-2.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://code.google.com/p/h5py/issues/detail?id=123
-
---- detect.py
-+++ detect.py
-@@ -9,7 +9,7 @@
-     """
- 
-     from distutils import ccompiler
--    from distutils.core import CompileError, LinkError
-+    from distutils.errors import CompileError, LinkError
-     import subprocess
- 
-     cc = ccompiler.new_compiler()
diff --git a/dev-python/h5py/h5py-1.3.0.ebuild b/dev-python/h5py/h5py-1.3.0.ebuild
deleted file mode 100644
index 299d80e1b707..000000000000
--- a/dev-python/h5py/h5py-1.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-1.3.0.ebuild,v 1.4 2010/07/23 21:18:29 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-DESCRIPTION="A simple Python interface to HDF5 files."
-HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
-SRC_URI="http://h5py.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sci-libs/hdf5-1.6.7
-	dev-python/numpy"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python-2.7.patch"
-	distutils_src_prepare
-}
diff --git a/dev-python/h5py/h5py-1.3.1.ebuild b/dev-python/h5py/h5py-2.0.0.ebuild
index 5a05eff9e146..e3657fa5a293 100644
--- a/dev-python/h5py/h5py-1.3.1.ebuild
+++ b/dev-python/h5py/h5py-2.0.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-1.3.1.ebuild,v 1.2 2011/05/04 20:44:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.0.0.ebuild,v 1.1 2011/07/17 10:54:57 xarthisius Exp $
 
 EAPI="3"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="*"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
@@ -17,12 +17,13 @@ SRC_URI="http://h5py.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
-RDEPEND=">=sci-libs/hdf5-1.6.7
+RDEPEND="sci-libs/hdf5
 	dev-python/numpy"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools
+	test? ( dev-python/unittest2 )"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index 96252fd400ed..515c16f9364c 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>sci</herd>
 <longdescription lang="en">
   HDF5 for Python (h5py) is a general-purpose simple Python interface to the
   Hierarchical Data Format library, version 5. Existing Python and