8 files changed, 67 insertions, 296 deletions
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 6a82160a7280..39fe84b7e467 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,3 +1,2 @@
-DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284
-DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
+DIST h5py-3.10.0-cython3.patch.xz 3868 BLAKE2B 3c0d952bdca5307ebf0bf878c26b94d0593bb89ac538a51017fb94e1e488bffc1583dcf4e713005b87d1b5e20d7b73043b24d65404faf60fb69515e598ca2133 SHA512 a0a0e3d1a9bccad1c89aa7efe3ba1e080eb70cae1f42f8de1021c212817970eaaa7070131e8e39859eea3c18d6c1243a17e7f53f2179f34ff6c406b315bab8fa
+DIST h5py-3.11.0.tar.gz 406519 BLAKE2B a5568c96290eee1f6da965174b6fa398f94e2e1825ec4ec50efd856b37ccf2bf634cfeb32101c7c53712fe9c68b0617774e9339a3f0d9373d3df24e6763a20cf SHA512 05d99093d5e7c280779b4167bd3594488dfc348b800da95c2275ddc8d77b4208fd1353942bf8863c4859d0208e8aa8bf84e628b3c5942eb947ecdcf0a7d19e88
diff --git a/dev-python/h5py/files/h5py-2.10.0-tests.patch b/dev-python/h5py/files/h5py-2.10.0-tests.patch
deleted file mode 100644
index 9f810ed46f01..000000000000
--- a/dev-python/h5py/files/h5py-2.10.0-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-These tests fail as confirmed by upstream.
-
-Reference: https://github.com/h5py/h5py/issues/1291
-Reference: https://github.com/gentoo/gentoo/pull/14343
-
-diff --git a/h5py/tests/test_file2.py b/h5py/tests/test_file2.py
-index 0fbf2d5..a7a28bb 100644
---- a/h5py/tests/test_file2.py
-+++ b/h5py/tests/test_file2.py
-@@ -207,22 +207,6 @@ class TestFileObj(TestCase):
-         f.create_dataset('test', data=list(range(12)))
-         self.assertRaises(Exception, list, f['test'])
- 
--    def test_exception_write(self):
--
--        class BrokenBytesIO(io.BytesIO):
--            def write(self, b):
--                raise Exception('I am broken')
--
--        f = h5py.File(BrokenBytesIO(), 'w')
--        self.assertRaises(Exception, f.create_dataset, 'test',
--                          data=list(range(12)))
--        self.assertRaises(Exception, f.close)
--
--    def test_exception_close(self):
--        fileobj = io.BytesIO()
--        f = h5py.File(fileobj, 'w')
--        fileobj.close()
--        self.assertRaises(Exception, f.close)
- 
-     def test_method_vanish(self):
-         fileobj = io.BytesIO()
diff --git a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch b/dev-python/h5py/files/h5py-3.2.1-i686-types.patch
deleted file mode 100644
index 80bbb112e7bd..000000000000
--- a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 76c9c8c4049943c490556fa888cf7743d1a677e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Apr 2021 11:48:16 +0200
-Subject: [PATCH] TST: Skip problematic datatypes based on their length
-
-Filter datatypes for tests based on their length rather than keeping
-a list of illegal platform+type combinations.  This is more robust
-than the previous solution and fixes the test failures with new numpy
-versions (1.19.5 is the oldest I have tested) that declare 'float96'
-and 'complex192' on i686 rather than 'float128' and 'complex256'.
-
-This fixes the following test failure:
-
-    E       AttributeError: module 'numpy' has no attribute 'float128'
-
-plus, later on (again):
-
-    E   TypeError: Illegal length 24 for complex dtype
----
- h5py/tests/test_dtype.py | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/h5py/tests/test_dtype.py b/h5py/tests/test_dtype.py
-index c5fac97e..ec4eda21 100644
---- a/h5py/tests/test_dtype.py
-+++ b/h5py/tests/test_dtype.py
-@@ -13,8 +13,6 @@ except ImportError:
- 
- from .common import ut, TestCase
- 
--UNSUPPORTED_LONG_DOUBLE = ('i386', 'i486', 'i586', 'i686', 'ppc64le')
--
- 
- class TestVlen(TestCase):
- 
-@@ -289,13 +287,9 @@ class TestOffsets(TestCase):
-                      if (np.issubdtype(f, np.floating) or
-                          np.issubdtype(f, np.complexfloating)))
- 
--        if platform.machine() in UNSUPPORTED_LONG_DOUBLE:
--            dtype_dset_map = {str(j): d
--                              for j, d in enumerate(dtypes)
--                              if d not in (np.float128, np.complex256)}
--        else:
--            dtype_dset_map = {str(j): d
--                              for j, d in enumerate(dtypes)}
-+        dtype_dset_map = {str(j): d
-+                          for j, d in enumerate(dtypes)
-+                          if d().nbytes in [4, 8, 16, 32]}
- 
-         fname = self.mktemp()
- 
--- 
-2.31.1
-
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
deleted file mode 100644
index 1a7328394762..000000000000
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-RDEPEND="
-	sci-libs/hdf5:=[hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]"
-#	mpi? ( virtual/mpi )
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	)"
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-DOCS=( README.rst AUTHORS ANN.rst )
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-#	esetup.py configure $(usex mpi --mpi '')
-	esetup.py configure
-}
-
-python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
-	# tests generate .pytest_cache which should not be installed
-	rm -r "${BUILD_DIR}/lib/.pytest_cache" || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.11.0.ebuild b/dev-python/h5py/h5py-3.11.0.ebuild
new file mode 100644
index 000000000000..961ca41db084
--- /dev/null
+++ b/dev-python/h5py/h5py-3.11.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="
+	https://www.h5py.org/
+	https://github.com/h5py/h5py/
+	https://pypi.org/project/h5py/
+"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-cython3.patch.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3:=[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.10.4:=[hl(+)]
+"
+RDEPEND="
+	${DEPEND}
+"
+
+BDEPEND="
+	>=dev-python/cython-0.29.31[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+python_prepare_all() {
+	# avoid pytest-mpi dep, we do not use mpi anyway
+	sed -i -e 's:pytest-mpi::' pytest.ini || die
+	distutils-r1_python_prepare_all
+
+	export H5PY_SETUP_REQUIRES=0
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest -m "not mpi"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild
deleted file mode 100644
index a658b288acfb..000000000000
--- a/dev-python/h5py/h5py-3.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="sci-libs/hdf5:=[hl(+)]"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	' python3_7)
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	)"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-PATCHES=(
-	"${FILESDIR}"/h5py-3.2.1-i686-types.patch
-)
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	pytest -vv -m "not mpi" ||
-		die "Tests failed with ${EPYTHON}"
-	# tests generate .pytest_cache which should not be installed
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
deleted file mode 100644
index c446eb58c665..000000000000
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="sci-libs/hdf5:=[hl(+)]"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	)"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	epytest -m "not mpi"
-	rm -rf .hypothesis .pytest_cache || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
index 9ca11da4f83c..efccd0f8f324 100644
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
@@ -17,8 +17,9 @@
   (as used with Numpy recarray types), HDF5 attributes, hyperslab and
   point-based I/O, and more recent features in HDF 1.8 like resizable
   datasets and recursive iteration over entire files.
-</longdescription>
+  </longdescription>
   <upstream>
+    <remote-id type="github">h5py/h5py</remote-id>
     <remote-id type="google-code">h5py</remote-id>
     <remote-id type="pypi">h5py</remote-id>
   </upstream>