gentoo resync : 23.09.2020

6 files changed, 2 insertions, 164 deletions

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 66b7c90f1a05..bfd892912ab9 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,11 +1,5 @@
-AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75ba437c6693701cc255a44638c5035d4f723563a5c0dfb5baee73ce0eb061bbaf45c8a49988ba799f35ff3d8b79159e73ea15afe SHA512 3064040af07acc445e4c7a9e962939eafa02d75366e6eee2ce12f15cc5846fbb4214a17d27f9366e8c08b69a3565cb04910008b1e4bd62d6ded3087e1a27124b
-AUX c-blosc-1.19.0-xgetbv.patch 1088 BLAKE2B 45e9d6c0e3a166d7c2cb41381fa9c75ca197cc5fb3d9ff51facbad0e62f2a408af92fcb40959bf2b49d3c406664d0f2c8bc58f4bbc435591e96553b4514307cd SHA512 33e6c674fee03e8c95fb0a90e04af2c29e12489b50c365a899d00ec689e1cf9c803e50234027df89b57820055cef41b487029e65cb16e6996549e2e5a761c627
-DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
-DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
 DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10
 DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475
-EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e
-EBUILD c-blosc-1.19.0.ebuild 1133 BLAKE2B f58035bf0c85812a52ba2ecd64372571021849a72a4efb8ffb6d7cd8a8243757091dfb1b73a7ef58546c23fbe7bfc1ebd5cc697fc1c74cfc775d53eff2ed1669 SHA512 29b1bb97a257994bda228fa6528d5a85c5ecf83495b6d30cc0696c08837dc85071260df6d78e25c92d50752a7d72288b9723e9261cbba139b1353a51c2d2fcc2
-EBUILD c-blosc-1.20.0.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
+EBUILD c-blosc-1.20.0.ebuild 1109 BLAKE2B c8e687c306f166ef06a1af3035e0e6557d05856d578446481dc6a0c1f47943a2123e21ac84ec3b0a4a89a5eaf08e74c7a98bf45c8063dbea7019522956f12970 SHA512 e8a3c7df73f5658c0b56c6ed7f71049ee889ed79ac7d2175c9790c8402712b1d25535fffc3894161e8729ae441b355f28c124cedcecbf14820287ec425c1b3cc
 EBUILD c-blosc-1.20.1.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
deleted file mode 100644
index 2dbf5d282b31..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-PATCHES=( "${FILESDIR}/${PN}-1.11.2-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		-DPREFER_EXTERNAL_SNAPPY=ON
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
deleted file mode 100644
index 671a429da437..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
index 894b71680371..6cb8f5af1a3e 100644
--- a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
deleted file mode 100644
index d385d5263710..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Make the build system respect CFLAGS
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,16 +244,6 @@
- endif()
- 
- # flags
--# @TODO: set -Wall
--# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
--
--# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
--# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
--if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
--     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
--     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
- 
- if(MSVC)
-     if(NOT CMAKE_C_FLAGS)
diff --git a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
deleted file mode 100644
index 045a234028be..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 14d2d561795c276fc33c8cb54781dff76b398906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 10 Jun 2020 12:13:39 +0200
-Subject: [PATCH] Redefine blosc_internal_xgetbv for platforms with immintrin.h
-
-Commit 2f2d876 renamed _xgetbv to blosc_internal_xgetbv.  Commit 0b8608b
-made it conditional to immintrin.h not being included, apparently
-in order to prevent _xgetbv collision.  However, since the block
-no longer defined _xgetbv but blosc_internal_xgetbv, it means that
-the latter is not defined if the condition is false.  #define it to
-_xgetbv to fix missing symbol.
----
- blosc/shuffle.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/blosc/shuffle.c b/blosc/shuffle.c
-index fc2ca64..7a03bf1 100644
---- a/blosc/shuffle.c
-+++ b/blosc/shuffle.c
-@@ -195,6 +195,10 @@ blosc_internal_xgetbv(uint32_t xcr) {
-   return ((uint64_t)edx << 32) | eax;
- }
- 
-+#else
-+
-+#define blosc_internal_xgetbv _xgetbv
-+
- #endif  // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900))
- #endif  /* defined(_MSC_FULL_VER) */
- 
--- 
-2.27.0
-