6 files changed, 2 insertions, 237 deletions
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index d92cbfa86608..c14d4ab0b15e 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,9 +1,3 @@
-AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
-AUX h5py-3.2.1-i686-types.patch 1944 BLAKE2B 55b00cdf84a369fb1bce79fa5acbc82d719f49804d7db47d9fa6f0f17f7fefdf6db7fe653a6d765aaa67eceec5acc010184890294f29a655ab4707664e5798ad SHA512 e100888fcf2f3de1b8a331b20776899100a9d5b8ae65d21a451ac2501af5c63abc78114c620025186e805b64f3828b3be80473ddec6d256d2e6aef9e0f9e1878
-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
-EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
-EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 996256072ab2696da939d080cc23b947981e978759ce82b487177bd103316d84a2682833fb8976d3ad6db73f87ad7dda2b500ffddf218bcaeee8e50983fe876b SHA512 3cbaa44da1679595ec0865103f445ee4cda16e6bc2b8a8560d8ce715e1c4e1cc37a2d9a6bb8c6c9cefecbab3c58bf8872f49298197dcdfab5409305f1519eacc
-EBUILD h5py-3.3.0.ebuild 1417 BLAKE2B 7c90cf6e5ccb4eb6b495c8a8232c5de4fd8ba0ca05d29efbceaa4c1d1dcb1bf1113921b86690580c7b1e884ba2909bc481d04d586ad63aab23456d91449c91b9 SHA512 02c39d36bef5b0d39f1373dcee5ab2d410c72436bcec3683a650c6b9cb872966b8ac63ed887ee03c2c580f380259ac2eeeb52f7aa32d04b1c66455f68327dce4
+EBUILD h5py-3.3.0.ebuild 1416 BLAKE2B 5fb629237ec262cd1a395b9e5187fb214c79ddb5575af55ad35aa8a98f4bf8c0f3d5f90d8f985c9193063266dc487a35e45701941f98e8b7f4b1288b0206dd82 SHA512 ca8116d2ac0e402cb793608de9234d59e490b2367a16588157516c8aac5a7fd9e3ffb8855673a866a9f1a89a23b0c0ce44a0b59a002bf84586794bbe5170ca3f
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
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.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
index 903616019b46..d993e7d19b24 100644
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ b/dev-python/h5py/h5py-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"