gentoo resync : 18.12.2020

5 files changed, 77 insertions, 2 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 75a70eb0dac1..53dc2966437b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 39feef084099..e0a5f8963fc3 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,5 +1,5 @@
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
 EBUILD lz4-1.9.2.ebuild 914 BLAKE2B eaf423bafb37abee6dc5424d551449c359ca6e70790bfe35c5b28975c66064e84981b8d238492ffa080a2674b2937aebe9bb5d87b020e40bf048b9ee4cf36beb SHA512 76279d4ea35b063ea239f0124d60a0abd94e818ddf7aedbb2f44b80e504fb502cb8dddfa49e35ac9058bc377f5d2aaa9fa4bd322f22ffaa269f940edb78602dd
-EBUILD lz4-1.9.3.ebuild 789 BLAKE2B 1ed48b7ae722b9b52aa7aa2af699b5b5a2243006d1ebe6cfd0c0b77491abe9ce8aa33b467cbb7d92aed8cd371b0d033fb05dafb35477c9bd78ed209738cd2fb7 SHA512 a09fc7d38763dea2abc58797aefbf1e217b66d48cf85340100ead835128bc2803d5c72f3fb45dd51ca2b2e84214cdaac607fc00e3cefd5a8da8d7968d10726b0
+EBUILD lz4-1.9.3.ebuild 785 BLAKE2B 72da855626afc81dd8ed33256f1de0c12d728de9d7c41db771c9d0cacc8bbe08146f3e3849c0cef4cd5422df9baf94177b4e6969396c6ccc8fa657a1ea21ebaf SHA512 e8b884a1cc90a840c93b1cec2ed11593b21c9408c6a22695e7986094dc5f73f53887e7990458c0462f3177e5ff05117c61abc8671c8d75993326b371362ca7bd
 MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index dbf92b78579c..e1e14ad88fef 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
 SLOT="0/r132"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index ae6bbaa13455..9e42efa94575 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,6 +3,8 @@ AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538a
 AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a92e10f8ff20547e27fe897d70dac7bff15f1acedf6cca3ab0ea9ded07c2cdb8ac2ee5665eeb7a095c742c5614c73604 SHA512 e4de6367b47b016d9a0179b57cc06c9e232d0a736e20ff0cf8132d36512a5a232d8583d91b1453f7a122d63b85df96688053f02552b2717ff2f22bf30a0c0002
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
+DIST zstd-1.4.7.tar.gz 1817193 BLAKE2B 8a307fa7efca8baa45c61eb0e46c5b6eedff1459a9493d81ad7033b9050ccf96e39cfc0f5b913ea20fb64d5efa26063b70e36e6cc47077b17106f3b5135fd999 SHA512 720941fc484e36e2f2bd74f120966fc598781a7abb945ed2f553d4cb035fa007117d00b72979b037817fbaff60b0d72f698fc16561ccbd46b16ae2888b044548
 EBUILD zstd-1.4.4-r4.ebuild 1840 BLAKE2B 09aa07c4d2a068cb60e83d9796c7fe636d9e97c72e1efe731a2a2dc1f559874e9fa68dd06684135d18fe9f6dc67dcbddb69e34dd6ef0a510dc9355221acdf2a8 SHA512 7c55534e5feffae25bc9d1cfc9475404fa2387dbc44b788084df219d3cd26dfde0e47ccc015d89ab13bef1c5d261d2942d5745862221685fe5b80eb6613a73f3
 EBUILD zstd-1.4.5.ebuild 1750 BLAKE2B 3718289304a862bc8a5cd78159409ea00847af3d11e8906a45061ad76ee3cda3cdbcc072da6f2a8e20e6594aed841533bedf1195d4d01b0e43530ddb176160bf SHA512 b745133038280fcd31de024704934bf72d619087ed7d48efedf64d47758ca4987c26b0b9bd0ffbaf31b0321dd08796ec8e2d6a70c1a5a9b136ccf33f08960fd0
+EBUILD zstd-1.4.7.ebuild 1757 BLAKE2B 0e35a47390e0040e064966609d324018db0683f911dee36b357d72cd52da8c250c55fa583a5d8468ce0eeb24589b78c85b049e1c7315303112d74f60c9addc7b SHA512 4186ed99f97c69a4434ffce087327fd32f7fb9455be786e82c83417bbfec018409dd1d3da8907c0112f2de6e5c466b5f46d93a1a5c51d6ac093d3c16cbcb0e67
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.7.ebuild b/app-arch/zstd/zstd-1.4.7.ebuild
new file mode 100644
index 000000000000..96469d5a7f84
--- /dev/null
+++ b/app-arch/zstd/zstd-1.4.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+
+	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
+	# where upstream build system does not add -pthread for Makefile-based
+	# build system.
+	use threads && append-flags $(test-flags-CCLD -pthread)
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}