gentoo auto-resync : 14:07:2024 - 12:27:13

4 files changed, 2 insertions, 124 deletions

diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index e4241b489cd7..f1edd3840bfe 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,6 +1,3 @@
-AUX blosc-1.11.1-numpy-2.patch 1832 BLAKE2B 17c3fb3ec945c325f669343bb51a04956656db9895e8cd108c6a4f585c74f1e0e147ce362ded7a7a42d9a530cbd4108b05e27022549eb20bf9864accfe204e90 SHA512 a26c2d5097d78a91a6e1418f0c03e84500400c7ffefe3295a14507656940e0e0bb1cea8b0f706968985c452401939db02d9b6c8f77875afaeee17d1c8bdb56d5
-DIST python-blosc-1.11.1.gh.tar.gz 111262 BLAKE2B cb348253a24258d2649ebc0604acbf936b8ccc2b28c42c69da2fee72ddf87eb17a24657bc5d3c0530193a60f482555ce4cc5d168a18d9c2d79a13410d40670bc SHA512 21f8a697a3a902860a6ed72233984cf00c464ec0ddde9842a0c24b1e8e5ec4dd57b872096445a873d162d7529cba5c3666ba2a3ee3f9b1b18107d9636011281c
 DIST python-blosc-1.11.2.gh.tar.gz 99160 BLAKE2B 79176961221a2dcdf389165b3ed0e629201605f806aca3e1ada1dd9b35c1acf13ea7fa6692a762f5e31270df327751642256a1c5bafb14fbed48ef69c6b9745c SHA512 56a53828669ac9d1452b247b8aad6bdfcb71ecffe9b8c7723e4405825704506946f150f54633b7e0886160255e5619c698b97847963c909e14c97808c04f39ab
-EBUILD blosc-1.11.1.ebuild 1450 BLAKE2B 8033409e473f5a28b12b0ed43842425f25dba0143cb15df2dc8ea0d672177c4ae3ba0636491240b43752410799fbe22f58095a3da656c4593e66514bec5f85c6 SHA512 41edae443a06e05c904c68b16434ae8b446d2b7c65d7ea4b46008759e35b5231cc5a7e9be462392f7aa4f37a4a300f6877755e5ef135deaf33b7b9979803feef
-EBUILD blosc-1.11.2.ebuild 1359 BLAKE2B 75d7457ea91bc1e4201581d7783034235c7dc138f1da52f7faffab0980af1872f5c0f4d63bcb3349f617421782feafae71e564b00573a0cab18007558cfed1ad SHA512 0a43587ed77ff6f3f805450ed638f2b4042b6ee337b9282925187cfe7d341e1d2e6dd6dd08021873be24c19068cb7e04c80137833950a6baa82c99fb3839c331
+EBUILD blosc-1.11.2.ebuild 1353 BLAKE2B cc3ab515809a405513e93aa0c064d964cc721d01657dec5d2e500923b72ad6a2697f2f6c8dd8f9240476e35fd3bed559a83a87ff311e8cceef779e97b1963092 SHA512 28d83be6c3ad9d09db088e639d7ca7a3e95f188393414ec707189a9bfde213e6f3c880445d7d79a94d8a0a110094de14dde6c520b064adcf801c90860db49232
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.11.1.ebuild b/dev-python/blosc/blosc-1.11.1.ebuild
deleted file mode 100644
index 560554b6dde2..000000000000
--- a/dev-python/blosc/blosc-1.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-blosc-${PV}
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="
-	https://www.blosc.org/
-	https://github.com/Blosc/python-blosc/
-	https://pypi.org/project/blosc/
-"
-SRC_URI="
-	https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/c-blosc-1.19.0:=
-"
-DEPEND="
-	${RDEPEND}
-"
-# py-cpuinfo dep is irrelevant for us, as it is only used to configure
-# bundled c-blosc build
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-
-PATCHES=(
-	# https://github.com/Blosc/python-blosc/pull/329
-	"${FILESDIR}/${P}-numpy-2.patch"
-)
-
-src_configure() {
-	export USE_SYSTEM_BLOSC=1
-	export BLOSC_DIR="${EPREFIX}/usr"
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# scikit-build is broken and reuses the same build
-	# https://github.com/scikit-build/scikit-build/issues/633
-	rm -r _skbuild || die
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
diff --git a/dev-python/blosc/blosc-1.11.2.ebuild b/dev-python/blosc/blosc-1.11.2.ebuild
index 9f8bcaed7226..13e290be267b 100644
--- a/dev-python/blosc/blosc-1.11.2.ebuild
+++ b/dev-python/blosc/blosc-1.11.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch b/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
deleted file mode 100644
index 97010c0a4bf6..000000000000
--- a/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4823cb746023821166756322becd3fc242cd0b32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 16 Jun 2024 08:59:36 +0200
-Subject: [PATCH] Fix test failures with NumPy 2
-
-* Replace deprecated `np.alltrue()` with `np.all()` (available since
-  NumPy 1.7.0).
-
-* Cast NumPy boolean to `bool()`, to ensure doctests pass both with
-  NumPy 2 (using `np.True_`) and NumPy 1 (using plain `True`).
----
- blosc/toplevel.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/blosc/toplevel.py b/blosc/toplevel.py
-index ad9c12d..4d2d413 100644
---- a/blosc/toplevel.py
-+++ b/blosc/toplevel.py
-@@ -514,7 +514,7 @@ def compress_ptr(address, items, typesize=8, clevel=9, shuffle=blosc.SHUFFLE,
-         items, np_array.dtype.itemsize)
-     >>> d = blosc.decompress(c)
-     >>> np_ans = numpy.fromstring(d, dtype=np_array.dtype)
--    >>> (np_array == np_ans).all()
-+    >>> bool((np_array == np_ans).all())
-     True
- 
-     >>> import ctypes
-@@ -640,7 +640,7 @@ def decompress_ptr(bytes_like, address):
-         items, np_array.dtype.itemsize)
-     >>> np_ans = numpy.empty(items, dtype=np_array.dtype)
-     >>> nbytes = blosc.decompress_ptr(c, np_ans.__array_interface__['data'][0])
--    >>> (np_array == np_ans).all()
-+    >>> bool((np_array == np_ans).all())
-     True
-     >>> nbytes == items * np_array.dtype.itemsize
-     True
-@@ -769,12 +769,12 @@ def unpack_array(packed_array, **kwargs):
-     >>> len(parray) < a.size*a.itemsize
-     True
-     >>> a2 = blosc.unpack_array(parray)
--    >>> numpy.alltrue(a == a2)
-+    >>> bool(numpy.all(a == a2))
-     True
-     >>> a = numpy.array(['å', 'ç', 'ø'])
-     >>> parray = blosc.pack_array(a)
-     >>> a2 = blosc.unpack_array(parray)
--    >>> numpy.alltrue(a == a2)
-+    >>> bool(numpy.all(a == a2))
-     True
-     """
-