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

(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)

5 files changed, 16 insertions, 54 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/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