Update py-h5py to 2.5.0 to sync with the API changes in devel/hdf.

cython is now unconditional and the package is installed as egg.

4 files changed, 93 insertions, 95 deletions

diff --git a/devel/py-h5py/DESCR b/devel/py-h5py/DESCR
index 591fb7bd177..6cf5f4e87fa 100644
--- a/devel/py-h5py/DESCR
+++ b/devel/py-h5py/DESCR
@@ -2,7 +2,7 @@ The h5py package provides both a high- and low-level interface to the HDF5
 library from Python. The low-level interface is intended to be a complete
 wrapping of the HDF5 API, while the high-level component supports  access to
 HDF5 files, datasets and groups using established Python and NumPy concepts.
-      
+
 A strong emphasis on automatic conversion between Python (Numpy) datatypes and
 data structures and their HDF5 equivalents vastly simplifies the process of
 reading and writing data from Python.
diff --git a/devel/py-h5py/Makefile b/devel/py-h5py/Makefile
index d916d926f90..f04999ca176 100644
--- a/devel/py-h5py/Makefile
+++ b/devel/py-h5py/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2014/10/05 16:27:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/09/23 12:11:47 joerg Exp $
 
-DISTNAME=	h5py-2.2.1
+DISTNAME=	h5py-2.5.0
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/h/h5py/
+MASTER_SITES=	${MASTER_SITE_PYPI:=h/h5py/}
 
 MAINTAINER=	jihbed.research@gmail.com
 HOMEPAGE=	http://www.h5py.org/
 COMMENT=	Python interface to the HDF5 library
 LICENSE=	modified-bsd
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.h5py
-PKG_SUPPORTED_OPTIONS=	cython
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcython)
-.include "../../devel/py-cython/buildlink3.mk"
-.endif
+BUILD_DEPENDS+=	${PYPKGPREFIX}-pkgconfig-[0-9]*:../../devel/py-pkgconfig
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 .include "../../devel/hdf5/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../devel/py-cython/buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-h5py/PLIST b/devel/py-h5py/PLIST
index d09c6e21ff3..d08bf9769e0 100644
--- a/devel/py-h5py/PLIST
+++ b/devel/py-h5py/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/06 14:59:11 drochner Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2015/09/23 12:11:47 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/h5py/__init__.py
 ${PYSITELIB}/h5py/__init__.pyc
 ${PYSITELIB}/h5py/__init__.pyo
-${PYSITELIB}/h5py/_conv.pyx
 ${PYSITELIB}/h5py/_conv.so
-${PYSITELIB}/h5py/_errors.pyx
 ${PYSITELIB}/h5py/_errors.so
 ${PYSITELIB}/h5py/_hl/__init__.py
 ${PYSITELIB}/h5py/_hl/__init__.pyc
@@ -40,79 +42,24 @@ ${PYSITELIB}/h5py/_hl/selections.pyo
 ${PYSITELIB}/h5py/_hl/selections2.py
 ${PYSITELIB}/h5py/_hl/selections2.pyc
 ${PYSITELIB}/h5py/_hl/selections2.pyo
-${PYSITELIB}/h5py/_hl/tests/__init__.py
-${PYSITELIB}/h5py/_hl/tests/__init__.pyc
-${PYSITELIB}/h5py/_hl/tests/__init__.pyo
-${PYSITELIB}/h5py/_hl/tests/common.py
-${PYSITELIB}/h5py/_hl/tests/common.pyc
-${PYSITELIB}/h5py/_hl/tests/common.pyo
-${PYSITELIB}/h5py/_hl/tests/test_attrs.py
-${PYSITELIB}/h5py/_hl/tests/test_attrs.pyc
-${PYSITELIB}/h5py/_hl/tests/test_attrs.pyo
-${PYSITELIB}/h5py/_hl/tests/test_attrs_data.py
-${PYSITELIB}/h5py/_hl/tests/test_attrs_data.pyc
-${PYSITELIB}/h5py/_hl/tests/test_attrs_data.pyo
-${PYSITELIB}/h5py/_hl/tests/test_base.py
-${PYSITELIB}/h5py/_hl/tests/test_base.pyc
-${PYSITELIB}/h5py/_hl/tests/test_base.pyo
-${PYSITELIB}/h5py/_hl/tests/test_dataset.py
-${PYSITELIB}/h5py/_hl/tests/test_dataset.pyc
-${PYSITELIB}/h5py/_hl/tests/test_dataset.pyo
-${PYSITELIB}/h5py/_hl/tests/test_datatype.py
-${PYSITELIB}/h5py/_hl/tests/test_datatype.pyc
-${PYSITELIB}/h5py/_hl/tests/test_datatype.pyo
-${PYSITELIB}/h5py/_hl/tests/test_dimension_scales.py
-${PYSITELIB}/h5py/_hl/tests/test_dimension_scales.pyc
-${PYSITELIB}/h5py/_hl/tests/test_dimension_scales.pyo
-${PYSITELIB}/h5py/_hl/tests/test_file.py
-${PYSITELIB}/h5py/_hl/tests/test_file.pyc
-${PYSITELIB}/h5py/_hl/tests/test_file.pyo
-${PYSITELIB}/h5py/_hl/tests/test_group.py
-${PYSITELIB}/h5py/_hl/tests/test_group.pyc
-${PYSITELIB}/h5py/_hl/tests/test_group.pyo
-${PYSITELIB}/h5py/_hl/tests/test_selections.py
-${PYSITELIB}/h5py/_hl/tests/test_selections.pyc
-${PYSITELIB}/h5py/_hl/tests/test_selections.pyo
-${PYSITELIB}/h5py/_hl/tests/test_slicing.py
-${PYSITELIB}/h5py/_hl/tests/test_slicing.pyc
-${PYSITELIB}/h5py/_hl/tests/test_slicing.pyo
-${PYSITELIB}/h5py/_objects.pyx
 ${PYSITELIB}/h5py/_objects.so
-${PYSITELIB}/h5py/_proxy.pyx
 ${PYSITELIB}/h5py/_proxy.so
-${PYSITELIB}/h5py/defs.pyx
 ${PYSITELIB}/h5py/defs.so
-${PYSITELIB}/h5py/h5.pyx
 ${PYSITELIB}/h5py/h5.so
-${PYSITELIB}/h5py/h5a.pyx
 ${PYSITELIB}/h5py/h5a.so
-${PYSITELIB}/h5py/h5ac.pyx
 ${PYSITELIB}/h5py/h5ac.so
-${PYSITELIB}/h5py/h5d.pyx
 ${PYSITELIB}/h5py/h5d.so
-${PYSITELIB}/h5py/h5ds.pyx
 ${PYSITELIB}/h5py/h5ds.so
-${PYSITELIB}/h5py/h5f.pyx
 ${PYSITELIB}/h5py/h5f.so
-${PYSITELIB}/h5py/h5fd.pyx
 ${PYSITELIB}/h5py/h5fd.so
-${PYSITELIB}/h5py/h5g.pyx
 ${PYSITELIB}/h5py/h5g.so
-${PYSITELIB}/h5py/h5i.pyx
 ${PYSITELIB}/h5py/h5i.so
-${PYSITELIB}/h5py/h5l.pyx
 ${PYSITELIB}/h5py/h5l.so
-${PYSITELIB}/h5py/h5o.pyx
 ${PYSITELIB}/h5py/h5o.so
-${PYSITELIB}/h5py/h5p.pyx
 ${PYSITELIB}/h5py/h5p.so
-${PYSITELIB}/h5py/h5r.pyx
 ${PYSITELIB}/h5py/h5r.so
-${PYSITELIB}/h5py/h5s.pyx
 ${PYSITELIB}/h5py/h5s.so
-${PYSITELIB}/h5py/h5t.pyx
 ${PYSITELIB}/h5py/h5t.so
-${PYSITELIB}/h5py/h5z.pyx
 ${PYSITELIB}/h5py/h5z.so
 ${PYSITELIB}/h5py/highlevel.py
 ${PYSITELIB}/h5py/highlevel.pyc
@@ -120,25 +67,81 @@ ${PYSITELIB}/h5py/highlevel.pyo
 ${PYSITELIB}/h5py/ipy_completer.py
 ${PYSITELIB}/h5py/ipy_completer.pyc
 ${PYSITELIB}/h5py/ipy_completer.pyo
-${PYSITELIB}/h5py/lowtest/__init__.py
-${PYSITELIB}/h5py/lowtest/__init__.pyc
-${PYSITELIB}/h5py/lowtest/__init__.pyo
-${PYSITELIB}/h5py/lowtest/test_h5.py
-${PYSITELIB}/h5py/lowtest/test_h5.pyc
-${PYSITELIB}/h5py/lowtest/test_h5.pyo
-${PYSITELIB}/h5py/lowtest/test_h5f.py
-${PYSITELIB}/h5py/lowtest/test_h5f.pyc
-${PYSITELIB}/h5py/lowtest/test_h5f.pyo
-${PYSITELIB}/h5py/lowtest/test_h5p.py
-${PYSITELIB}/h5py/lowtest/test_h5p.pyc
-${PYSITELIB}/h5py/lowtest/test_h5p.pyo
-${PYSITELIB}/h5py/lowtest/test_h5t.py
-${PYSITELIB}/h5py/lowtest/test_h5t.pyc
-${PYSITELIB}/h5py/lowtest/test_h5t.pyo
-${PYSITELIB}/h5py/lowtest/test_objects.py
-${PYSITELIB}/h5py/lowtest/test_objects.pyc
-${PYSITELIB}/h5py/lowtest/test_objects.pyo
-${PYSITELIB}/h5py/utils.pyx
+${PYSITELIB}/h5py/tests/__init__.py
+${PYSITELIB}/h5py/tests/__init__.pyc
+${PYSITELIB}/h5py/tests/__init__.pyo
+${PYSITELIB}/h5py/tests/common.py
+${PYSITELIB}/h5py/tests/common.pyc
+${PYSITELIB}/h5py/tests/common.pyo
+${PYSITELIB}/h5py/tests/hl/__init__.py
+${PYSITELIB}/h5py/tests/hl/__init__.pyc
+${PYSITELIB}/h5py/tests/hl/__init__.pyo
+${PYSITELIB}/h5py/tests/hl/test_attribute_create.py
+${PYSITELIB}/h5py/tests/hl/test_attribute_create.pyc
+${PYSITELIB}/h5py/tests/hl/test_attribute_create.pyo
+${PYSITELIB}/h5py/tests/hl/test_dataset_getitem.py
+${PYSITELIB}/h5py/tests/hl/test_dataset_getitem.pyc
+${PYSITELIB}/h5py/tests/hl/test_dataset_getitem.pyo
+${PYSITELIB}/h5py/tests/hl/test_dataset_swmr.py
+${PYSITELIB}/h5py/tests/hl/test_dataset_swmr.pyc
+${PYSITELIB}/h5py/tests/hl/test_dataset_swmr.pyo
+${PYSITELIB}/h5py/tests/hl/test_dims_dimensionproxy.py
+${PYSITELIB}/h5py/tests/hl/test_dims_dimensionproxy.pyc
+${PYSITELIB}/h5py/tests/hl/test_dims_dimensionproxy.pyo
+${PYSITELIB}/h5py/tests/hl/test_file.py
+${PYSITELIB}/h5py/tests/hl/test_file.pyc
+${PYSITELIB}/h5py/tests/hl/test_file.pyo
+${PYSITELIB}/h5py/tests/old/__init__.py
+${PYSITELIB}/h5py/tests/old/__init__.pyc
+${PYSITELIB}/h5py/tests/old/__init__.pyo
+${PYSITELIB}/h5py/tests/old/common.py
+${PYSITELIB}/h5py/tests/old/common.pyc
+${PYSITELIB}/h5py/tests/old/common.pyo
+${PYSITELIB}/h5py/tests/old/test_attrs.py
+${PYSITELIB}/h5py/tests/old/test_attrs.pyc
+${PYSITELIB}/h5py/tests/old/test_attrs.pyo
+${PYSITELIB}/h5py/tests/old/test_attrs_data.py
+${PYSITELIB}/h5py/tests/old/test_attrs_data.pyc
+${PYSITELIB}/h5py/tests/old/test_attrs_data.pyo
+${PYSITELIB}/h5py/tests/old/test_base.py
+${PYSITELIB}/h5py/tests/old/test_base.pyc
+${PYSITELIB}/h5py/tests/old/test_base.pyo
+${PYSITELIB}/h5py/tests/old/test_dataset.py
+${PYSITELIB}/h5py/tests/old/test_dataset.pyc
+${PYSITELIB}/h5py/tests/old/test_dataset.pyo
+${PYSITELIB}/h5py/tests/old/test_datatype.py
+${PYSITELIB}/h5py/tests/old/test_datatype.pyc
+${PYSITELIB}/h5py/tests/old/test_datatype.pyo
+${PYSITELIB}/h5py/tests/old/test_dimension_scales.py
+${PYSITELIB}/h5py/tests/old/test_dimension_scales.pyc
+${PYSITELIB}/h5py/tests/old/test_dimension_scales.pyo
+${PYSITELIB}/h5py/tests/old/test_file.py
+${PYSITELIB}/h5py/tests/old/test_file.pyc
+${PYSITELIB}/h5py/tests/old/test_file.pyo
+${PYSITELIB}/h5py/tests/old/test_group.py
+${PYSITELIB}/h5py/tests/old/test_group.pyc
+${PYSITELIB}/h5py/tests/old/test_group.pyo
+${PYSITELIB}/h5py/tests/old/test_h5.py
+${PYSITELIB}/h5py/tests/old/test_h5.pyc
+${PYSITELIB}/h5py/tests/old/test_h5.pyo
+${PYSITELIB}/h5py/tests/old/test_h5f.py
+${PYSITELIB}/h5py/tests/old/test_h5f.pyc
+${PYSITELIB}/h5py/tests/old/test_h5f.pyo
+${PYSITELIB}/h5py/tests/old/test_h5p.py
+${PYSITELIB}/h5py/tests/old/test_h5p.pyc
+${PYSITELIB}/h5py/tests/old/test_h5p.pyo
+${PYSITELIB}/h5py/tests/old/test_h5t.py
+${PYSITELIB}/h5py/tests/old/test_h5t.pyc
+${PYSITELIB}/h5py/tests/old/test_h5t.pyo
+${PYSITELIB}/h5py/tests/old/test_objects.py
+${PYSITELIB}/h5py/tests/old/test_objects.pyc
+${PYSITELIB}/h5py/tests/old/test_objects.pyo
+${PYSITELIB}/h5py/tests/old/test_selections.py
+${PYSITELIB}/h5py/tests/old/test_selections.pyc
+${PYSITELIB}/h5py/tests/old/test_selections.pyo
+${PYSITELIB}/h5py/tests/old/test_slicing.py
+${PYSITELIB}/h5py/tests/old/test_slicing.pyc
+${PYSITELIB}/h5py/tests/old/test_slicing.pyo
 ${PYSITELIB}/h5py/utils.so
 ${PYSITELIB}/h5py/version.py
 ${PYSITELIB}/h5py/version.pyc
diff --git a/devel/py-h5py/distinfo b/devel/py-h5py/distinfo
index c8eb8f555c2..8f6b40b23b1 100644
--- a/devel/py-h5py/distinfo
+++ b/devel/py-h5py/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/02/06 14:22:51 drochner Exp $
+$NetBSD: distinfo,v 1.2 2015/09/23 12:11:47 joerg Exp $
 
-SHA1 (h5py-2.2.1.tar.gz) = 4b511ed7aa28ac4c61188a121d42f17f3096c15a
-RMD160 (h5py-2.2.1.tar.gz) = 9e5ee73fa28e07e21439cef289b8e1945eccfd4e
-Size (h5py-2.2.1.tar.gz) = 978796 bytes
+SHA1 (h5py-2.5.0.tar.gz) = 4be8ddc5f74d0e7c3a86aee60382b7705267fb4d
+RMD160 (h5py-2.5.0.tar.gz) = 94484badd1103c00421582a055b7b0f3368ad653
+Size (h5py-2.5.0.tar.gz) = 684354 bytes