gentoo resync : 13.06.2020

5 files changed, 94 insertions, 4 deletions

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 57ad37a1029f..974c9a5077b3 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,7 @@
 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
-EBUILD c-blosc-1.11.2.ebuild 1319 BLAKE2B 97370a1b3e7c87da96c412e6a2c751bf8fd684e716f0ee525adfd90208d1d1d5cf4bc610072dd7578f9ca78f57e1c2b1e846f97874dd1740df5eef791d21c78a SHA512 efe7b63e4cb3eeaec4187967e28df0aa61f3a352806216942fc3173817729f82c8f30027ec9f57d12247d19117de6f50dbfa89e4b41a95653ebd13622e098ce2
-MISC metadata.xml 730 BLAKE2B 1e77a8bebe2f36cc0176d61bfb8839c80dc66b2c14fb0b8cdb2a997034308eae84ca6d9c403e4fc0da17b4ce1fcd571bcbf2f73d4349adc60a7e6163474df372 SHA512 eb015563106b9b23336c0954d6ab6395f823df52e33b64ce480376678d2d34ceb872775d607f97e8423ee888976f8bb74c6ee025a39b396882efec6af3af07f4
+DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
+EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e
+EBUILD c-blosc-1.19.0.ebuild 1118 BLAKE2B 859e3bc10a3e41aaae24c541d64fe11a0b6d65351b8111d18914c6ff71179a656c06a31c22d22b553a9a8a7d0731845c4e3e79df46ec35b57ea4e02853a509dd SHA512 697297004aac8f9904258cd5876d3cb3a938c2acc156d1ed8dc03228b5cd59110030b402d0be1701e8bfd19ddfdabf1739e809f010b8808436e69c2722368934
+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
index dbd37220fef8..2dbf5d282b31 100644
--- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
+HOMEPAGE="https://www.blosc.org/"
 SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
new file mode 100644
index 000000000000..71488e42738a
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
@@ -0,0 +1,50 @@
+# 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 ~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/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
new file mode 100644
index 000000000000..045a234028be
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
@@ -0,0 +1,33 @@
+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
+
diff --git a/dev-libs/c-blosc/metadata.xml b/dev-libs/c-blosc/metadata.xml
index 24926d992262..03a65e7d61a4 100644
--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<longdescription lang="en">
 	Blosc is a compression library designed to transmit data to the
 	processor cache faster than the traditional non-compressed memory fetch.