gentoo resync : 05.12.2021

5 files changed, 2 insertions, 113 deletions

diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 34a3c416bcb5..ba8bc987d011 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,7 +1,3 @@
-AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
-AUX blosc-1.10.4-cpu-flags.patch 1419 BLAKE2B afcc14d97c6b38e1d7fce06ae2b00e656ba656cc784f4f13f4acf12145cd1ac9a1d4b3f4110b4a5f8ecbb8c056647cfc5076016e5c563d3b05882245cfc0ba32 SHA512 9b1a1620136aa76c0bf6f8d91b784410de7118a6006d36ad3005f2b8bd6a952f7fe25cfe71de2a52127e2ac825ab9155946e2e92a132afc31265a8bd2e60e023
-DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
 DIST python-blosc-1.10.5.gh.tar.gz 1570462 BLAKE2B e2ee3cc3827e1df89afc97a0cdc3f07670368d2edfea9b6ae32ecbb74b464d5311bbd7b129b3b94fb91d20fd579425859412665de397facd4c119e429fbcd014 SHA512 75b91e50def65ecbbdd29f7b7aba65c6ca611eeeaa9e55583c0253eda5d1e1ab7d899d0c77c45ae999188f701205f20d8c8ed130a3865433edd87db3c0eeebb0
-EBUILD blosc-1.10.4.ebuild 1020 BLAKE2B 7209f33157584b120d99359b1ef37fc4a31086c8883200ae5cfd8e19db1a53818d1a6808f1c6a1c9b33b17fb628291776bebc2217f8860fb02e672734f05d872 SHA512 d6b3c86465761571b31dc81855c99f863317d22231628f30b6956c105f350c130940313a7cf3c472c1d5bc15f6101d7871c63072bd9a8e91a60ed84efddf9a86
-EBUILD blosc-1.10.5.ebuild 1039 BLAKE2B 1969e9308a3bfb4f66dd0523087dac4967c3a1420221ab9e5a4f19ec9857c2a2953d2c34c6764296618d3b2be3e853ac1a847bf02af07eeab85aafc763b370cc SHA512 b216f035adc29f3637f5c526b5ef2b7a9ebe99941a2bdb95a9a68822171f1d924e433b3c1a42b82733474d9248b47c34eeca786c14ac2adaf191f8954d283937
+EBUILD blosc-1.10.5.ebuild 1040 BLAKE2B 5aa9588930e78101a2bd90a636507c89fdcdee71e6bd61283568f7ae0265484ee26dc68a160841885b24b00f55397c0b4d5907fdbf6e49c115ddad49c52e65d0 SHA512 8326622d5a5d297610b7fe039b57f4b1d5c2b1fbdc4fce8f75537e88d12089e1bcb61d02a928d3effe9b037332043d1ee53502eebc9ebda9024bca13e39854e9
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
deleted file mode 100644
index 62e47eaae86d..000000000000
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ /dev/null
@@ -1,47 +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
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~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}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-PATCHES=(
-	"${FILESDIR}"/blosc-1.10.0-unbundle.patch
-	"${FILESDIR}"/blosc-1.10.4-cpu-flags.patch
-)
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/blosc/blosc-1.10.5.ebuild b/dev-python/blosc/blosc-1.10.5.ebuild
index 31d98d79a3b3..a5785bfc0ba9 100644
--- a/dev-python/blosc/blosc-1.10.5.ebuild
+++ b/dev-python/blosc/blosc-1.10.5.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
deleted file mode 100644
index 0ea6740f9c07..000000000000
--- a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 24 Dec 2020 01:06:23 +0100
-Subject: [PATCH] build against system blosc
-
----
- blosc/CMakeLists.txt | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
-index 7f06f28..fcf7db0 100644
---- a/blosc/CMakeLists.txt
-+++ b/blosc/CMakeLists.txt
-@@ -1,19 +1,9 @@
- # Todo: c-blosc provides a CMake package configuration file that we can build
- # against if blosc is available on the system, etc.
--# find_package(blosc)
--# if(NOT blosc_FOUND)
--set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.")
--set(BUILD_SHARED ON CACHE BOOL "Build a shared library version of the blosc library.")
--set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library")
--set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library")
--set(BLOSC_IS_SUBPROJECT OFF CACHE BOOL "Blosc is subproject")
--set(CMAKE_POSITION_INDEPENDENT_CODE ON)
--add_subdirectory(c-blosc)
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/c-blosc/blosc")
--
-+find_package(blosc)
- 
- add_library(blosc_extension MODULE blosc_extension.c)
--target_link_libraries(blosc_extension blosc_static)
-+target_link_libraries(blosc_extension blosc)
- python_extension_module(blosc_extension)
- 
- add_custom_command(
--- 
-2.29.2
-
diff --git a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch b/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch
deleted file mode 100644
index 1e2641646138..000000000000
--- a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/Blosc/python-blosc/commit/70226a70907072be607caee3da472e37a4683bae
-https://github.com/Blosc/python-blosc/issues/227
-https://bugs.gentoo.org/732178
-
-From: Graham Inggs <ginggs@debian.org>
-Date: Tue, 3 Aug 2021 17:11:51 +0200
-Subject: [PATCH] Deactivate SSE2 and AVX2 if a CPU has no flags (#242)
-
-Fixes #277
---- a/setup.py
-+++ b/setup.py
-@@ -90,8 +90,8 @@ def cmake_bool(cond):
-         platforms = ['any'],
-         cmake_args = [
-           '-DBLOSC_DIR:PATH=%s' % os.environ.get('BLOSC_DIR', ''),
--          '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('sse2' not in cpu_info['flags'])),
--          '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('avx2' not in cpu_info['flags'])),
-+          '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('sse2' not in cpu_info['flags'])),
-+          '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('avx2' not in cpu_info['flags'])),
-           '-DDEACTIVATE_LZ4:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_LZ4', '1'))),
-           # Snappy is disabled by default
-           '-DDEACTIVATE_SNAPPY:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_SNAPPY', '0'))),