gentoo auto-resync : 24:02:2023 - 09:47:15

4 files changed, 2 insertions, 116 deletions

diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 75fbd7d8885a..fdca2678a75c 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,6 +1,3 @@
-AUX h5py-3.7.0-types.patch 1285 BLAKE2B 13433f524dadbff797fc1668d0ac2954867d3c9c7e56e7f09137b5f180545981620498ad2504c2523005c73dbd61510475eb0874f2d880926b31632f2d978c27 SHA512 d7abc39ee2b1399b0f656e91944ee471f89d0030eb0378dce68232e70209b609c2cf9e62124e4124cf0c089584865357321dc5a641ccb33dbb27f97ad885ccde
-DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
 DIST h5py-3.8.0.tar.gz 400774 BLAKE2B 2e48991225170fbb728fa55a68aea795db42c7eae605d123a24a59a8730220ddc98e88dfbff60220ce8c6952ca7fc0c3e33d472acae09864a29bfe11d90fcca1 SHA512 13397f66a9fc735e1143eb9e3dd584280e955adf49de467bf56c1a98952903720480ab8d505921b7e22c16453498625ad93421a64e520f15ea3566472849a8fd
-EBUILD h5py-3.7.0.ebuild 1530 BLAKE2B 9ebe99b9f990f8d4771ad6afffe78993c0a8a483c927d35a2b097be870fd4803143f2720df44a5ed1d677922f924a4542e3b64d500314b8947b48a0a46389938 SHA512 8c97aabb14491a3d8d60c19f94634508427878508f2971887db3c62cd42a6d0d96ece36e3f58cc27d53fe8655ef3b895bcc9c9b267950cf537839000ba4d9a15
-EBUILD h5py-3.8.0.ebuild 1476 BLAKE2B 7e4efbc225560fd38bbec95c6fd3ba7ba1d015b23e22006d99e5d425cc7bc5a5968fc5f94b45336888bb7003461db5548f21c4d72cc082c7060a65e2f1c04709 SHA512 8a6b209793140d7b7ecaa44bf772827d23490b9e4f1a0f18831ed3c450a2a73e177cc9dc6949817ac2e2a823ca6bc031b4c5a488ce3314845097e20470060ae2
+EBUILD h5py-3.8.0.ebuild 1429 BLAKE2B e2d971d3271e1ead1d627a093587b7889210c31ab78285c03a3187f06dd55842d36fb04841845f8b3a9d38ed4cca4304be2f9a9ab282eb34a6df6ee31d30ccf5 SHA512 9f01e17a578119d84776f104dadf11ad2eb36b0aa2a750dd8c113f586c2ed632dc1bf0a06131464f3b76f158172c39aca2e73d829a97afdac3f843152c5e736e
 MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
diff --git a/dev-python/h5py/files/h5py-3.7.0-types.patch b/dev-python/h5py/files/h5py-3.7.0-types.patch
deleted file mode 100644
index 47058879445f..000000000000
--- a/dev-python/h5py/files/h5py-3.7.0-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 873077a5b132c4294f0ea6af2eb29d61352c6688 Mon Sep 17 00:00:00 2001
-From: Gyeongjae Choi <def6488@gmail.com>
-Date: Fri, 2 Sep 2022 07:54:44 +0000
-Subject: [PATCH] Fix incompatible pointer type
-
----
- h5py/_errors.pxd | 2 +-
- h5py/_errors.pyx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/h5py/_errors.pxd b/h5py/_errors.pxd
-index 13b299e27..e7791a6bd 100644
---- a/h5py/_errors.pxd
-+++ b/h5py/_errors.pxd
-@@ -412,7 +412,7 @@ cdef extern from "hdf5.h":
- 
-     herr_t    H5Eprint(hid_t estack_id, void *stream)
- 
--    ctypedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void* client_data)
-+    ctypedef herr_t (*H5E_walk_t)(unsigned int n, const H5E_error_t *err_desc, void* client_data)
-     herr_t    H5Ewalk(hid_t estack_id, H5E_direction_t direction, H5E_walk_t func, void* client_data)
- 
- # --- Functions for managing the HDF5 error callback mechanism ---
-diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx
-index 612052fb2..ca7b1c48c 100644
---- a/h5py/_errors.pyx
-+++ b/h5py/_errors.pyx
-@@ -94,7 +94,7 @@ cdef struct err_data_t:
-     H5E_error_t err
-     int n
- 
--cdef herr_t walk_cb(int n, H5E_error_t *desc, void *e) nogil:
-+cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil:
- 
-     cdef err_data_t *ee = <err_data_t*>e
- 
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
deleted file mode 100644
index 4bde6fa3be73..000000000000
--- a/dev-python/h5py/h5py-3.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv 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-1.14.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${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() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-types.patch
-	)
-
-	# 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.8.0.ebuild b/dev-python/h5py/h5py-3.8.0.ebuild
index ba2b73c2383a..c18f019a61ca 100644
--- a/dev-python/h5py/h5py-3.8.0.ebuild
+++ b/dev-python/h5py/h5py-3.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Simple Python interface to HDF5 files"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/h5py/h5py/
 	https://pypi.org/project/h5py/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"