From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022
---
app-arch/zstd/Manifest | 8 +--
.../zstd/files/zstd-1.5.1-respect-CFLAGS.patch | 11 ---
app-arch/zstd/metadata.xml | 4 --
app-arch/zstd/zstd-1.5.0.ebuild | 65 ------------------
app-arch/zstd/zstd-1.5.1-r2.ebuild | 80 ----------------------
app-arch/zstd/zstd-1.5.2-r1.ebuild | 66 ++++++++++++++++++
6 files changed, 68 insertions(+), 166 deletions(-)
delete mode 100644 app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
delete mode 100644 app-arch/zstd/zstd-1.5.0.ebuild
delete mode 100644 app-arch/zstd/zstd-1.5.1-r2.ebuild
create mode 100644 app-arch/zstd/zstd-1.5.2-r1.ebuild
(limited to 'app-arch/zstd')
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index f51ed94e3f22..72e5bb758b46 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,10 +1,6 @@
-AUX zstd-1.5.1-respect-CFLAGS.patch 228 BLAKE2B df2d41007faeedd776a77d63201bd467d9473c5083b7b10ee717457c425d7e7538c0e1f923b99cb2088530a04020c22a39aeb45e5c832d7edec90f65d0409370 SHA512 f866ff12f0582f9205be791c454b824e03c62ac09b3fed9a30516251af5d9c59dd2b153744d84a080e928563c1332910dccdd8ca696f7d3233d2ef9719dd402d
DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
-DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
-DIST zstd-1.5.1.tar.gz 1948539 BLAKE2B 2f82fb7872c49c41c8ccae17e343825dabceae3070266e49468c2019a1324758b825d7fc1bc3b62602b4d726538260258dc9134fa81d3c5e5085a8a1b531a8c5 SHA512 ed8ea0143b7bbd85afdcc8f95d44589a0903cff8375059836ebe577cc4b3ea49c0c756db6a3649655e478377f48b3120ef87dc768fd449bd4bfac786209bfd31
DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
-EBUILD zstd-1.5.0.ebuild 1449 BLAKE2B 1985dcc6336b6cb5617bc48a3d80400f3d642d281e098576c597b5e807cdacd2e738f66de94c58cef35a54f78f34eb21c77f4e5bd10a9f430d633f77c62d696e SHA512 31e0ab933fe30b781a1c0923ff4a8ab7437d95ee957e0b44e3d1b41687308ee6652ab13e4f490c39ec2b954bdeded743ac3642ebde9563a57d74d6dfa27c6e5d
-EBUILD zstd-1.5.1-r2.ebuild 1803 BLAKE2B 1309e5ea2c9d98ea1c496be3cc14b1ebc076577532b8622e787470fbc804dd1f225694431477aef8846c3a4283ac5697faa6a2eced78daf36607086d7cd6bb74 SHA512 9c953dae97b02decaa82090909c74bc3ad3c07724ccac56c348238051d4a671dddc29266c0b76828eb29924996acdd58fbb88ac1516b150569fdc1552827e8e1
+EBUILD zstd-1.5.2-r1.ebuild 1504 BLAKE2B 51451abbae042647f5cb659aa268c6e893269e5518b17b8bbf746219f2e5bf8e30466b57c41b1a9050439a02c0d3acc0ec7e833a6b7b0d6f320958bb79eff090 SHA512 4779c04ea3147a895a8e30df7c70741bc133f628b113037aeb4b2572b45211fe93f638ddaee74c976766ca99a1f3be0c68b3dce430ccda27f6e67ba6a7f875ba
EBUILD zstd-1.5.2.ebuild 1456 BLAKE2B b1f0a313494d5025c9568bc09a4cc5c4caefc8aad0009ff272745541a97977fc812a69cd0ac05c8caf3a487d9cb51578e46e9446f9e9402448fd9227db6145d5 SHA512 445ca54ab352ff64fd6acbbc7e0a2e76ace9e4f55719efe80b304efb4e3da0e369e743f7516c22fd1e4d1611bcd38ea97624f7a874156e595f231b4e958147fb
-MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
+MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch b/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
deleted file mode 100644
index 63f0f47459d9..000000000000
--- a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/libzstd.mk
-+++ b/lib/libzstd.mk
-@@ -78,8 +78,6 @@ else
- endif
- CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
- -DDYNAMIC_BMI2=0 -DNDEBUG
--else
-- CFLAGS += -O3
- endif
-
- DEBUGLEVEL ?= 0
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index 847490d73d0a..6eaf61eef210 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
</maintainer>
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
deleted file mode 100644
index 8e810dcf9fc1..000000000000
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs +threads"
-
-RDEPEND="app-arch/xz-utils
- lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-mymake() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- V=1 \
- "${@}"
-}
-
-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
-}
diff --git a/app-arch/zstd/zstd-1.5.1-r2.ebuild b/app-arch/zstd/zstd-1.5.1-r2.ebuild
deleted file mode 100644
index 29168c5fe5d2..000000000000
--- a/app-arch/zstd/zstd-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 ~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.5.1-respect-CFLAGS.patch
-)
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-mymake() {
- # We need to turn off asm for certain arches (!amd64) for now.
- # - bug #829849
- # - https://bugzilla.redhat.com/show_bug.cgi?id=2035802
- # - https://github.com/facebook/zstd/issues/2963
- local asm="ZSTD_NO_ASM=1"
-
- if use amd64 && [[ ${ABI} == amd64 ]] ; then
- asm=
- fi
-
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- V=1 \
- ${asm} \
- "${@}"
-}
-
-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
-}
diff --git a/app-arch/zstd/zstd-1.5.2-r1.ebuild b/app-arch/zstd/zstd-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..808d99d8300b
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs usr-ldscript
+
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}"
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+mymake() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ V=1 \
+ "${@}"
+}
+
+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
+ gen_usr_ldscript -a zstd
+
+ 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
+}
--
cgit v1.2.3