gentoo auto-resync : 07:02:2024 - 03:59:02

9 files changed, 208 insertions, 24 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3c0e8811bf91..4006f847f088 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index e37059f5e673..2f8329456eff 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -8,5 +8,6 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
 EBUILD bzip2-1.0.8-r4.ebuild 3551 BLAKE2B faa39850794cf91b33067cb90ea0c9113d65b01610f8a9025bd9018a221d9ecc5ea32d3f42c66b01e52ba131dedec34b78c7eba198108e63da9f5fde22f4c351 SHA512 a655dd1c0bdbbbea98a88cf3d235b08a7b3b47bc527858443a9a3024a58a5e5f4acab440f53f36bdc2c3d9827de2ad4b4f42606604b4ca36eb9208c2d482ec5c
+EBUILD bzip2-1.0.8-r5.ebuild 3519 BLAKE2B 5893d920489ff1fec5afd4e2496d0d77819a6aef7cf02cc22d0d80b76bc131436e1bae0d4dfcafe319d2db2a3262454155327ab705f145ec640777fdf41e4e9f SHA512 4c87ab6b72c0a1a98af0ccee6fd673dd6aa3ad1e22899255852b7a967ae844f3b9a60ee6b28f9b239e05bb406ff02b59a20538a68139f0a2dbc43763cb0d2787
 EBUILD bzip2-9999.ebuild 1382 BLAKE2B 03246514a2ea9a7123145072068f0b3ca0092d8d87a769ef4b01966e77d79029203a1fb8b4692d1024cf9727b596231f1926b77b978e509d23ecf3d012b19d8b SHA512 5c4a20ea3691e4641e3db5b79f9f65e554f893dacafa980e2beb62f790a6c104d4b39586b9a6e81e4b34abead9045df114182321445cd86ebcbd15235f97e774
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
new file mode 100644
index 000000000000..5a099bc96f1d
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib multilib-minimal verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="static static-libs"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+	app-alternatives/bzip2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_test() {
+	cp "${S}"/sample* "${BUILD_DIR}" || die
+	bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		dobin bzip2recover$(get_exeext)
+		into /
+		newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman bz{diff,grep,more}.1
+	newman bzip2.1 bzip2-reference.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+	local x
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bzip2
+	# is installed
+	local x
+	for x in bzip2 bunzip2 bzcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die
+		fi
+	done
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f7913d6b8d7c..46d8b4040536 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -5,7 +5,7 @@ DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa029
 DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f SHA512 dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
 DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76 SHA512 714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7
 EBUILD xz-utils-5.4.5.ebuild 3955 BLAKE2B a0b903cd6906fb604362fcc9e8aa44249946baac062438b3fd8a1901bb5fdf18d789eb1ac073894b047726849d75a6e8e48d0f955f5b22527339b780e1cfed5f SHA512 2ff0ca2035261185db82c72117bfb0ad3c5bc9dc957bf8625076def51d5010f491a76ae161084fdd2b50536882be49565c3f1185d001299dde456cedcc77d3ee
-EBUILD xz-utils-5.4.6.ebuild 3967 BLAKE2B abb9dc12fd8c3540bfe66e377e0ea23be4cf22cfc8f5a0aeae9eb65f4f1decf77866fd062767a47487eeb1b2fa6f354c110cb7ff2ab6a073daeb21098f9ede83 SHA512 ed3192004e5e4ca0e211e49c269500bbfe432e78e5e59931dd30e249c4fd4c1e325fae0bc0c5b67593330dff223e8ecbe152a7dc4ed9efc4adcda1004a671f1a
-EBUILD xz-utils-5.5.1_alpha.ebuild 3989 BLAKE2B ab98171ba3f60a65b5ee43577787447b1815b79796611e51bc46191bd0ff3bb8f53693101a2b51b20242e96f1016acc06373f7b2f8925d1aecc4e28ee33ee004 SHA512 fd3efb8645332aca6d6d2f5fe7e21f094740e9ea36c9f1787f021145cdb3d113cf7f9f6400b465284648ea89c7b7ae8b4d0ae2fedab6c6ffbb621364aca13940
-EBUILD xz-utils-9999.ebuild 3989 BLAKE2B ab98171ba3f60a65b5ee43577787447b1815b79796611e51bc46191bd0ff3bb8f53693101a2b51b20242e96f1016acc06373f7b2f8925d1aecc4e28ee33ee004 SHA512 fd3efb8645332aca6d6d2f5fe7e21f094740e9ea36c9f1787f021145cdb3d113cf7f9f6400b465284648ea89c7b7ae8b4d0ae2fedab6c6ffbb621364aca13940
+EBUILD xz-utils-5.4.6-r1.ebuild 3890 BLAKE2B edf6f6dbe6de85a8f6ea1c708736cc19d81d45d40dcd6f420ce84fe840a66649ade7f9063b5c1d06288d49504fe34d65db2262574f681c9185e9c6e25da73311 SHA512 5443da7658b6b692f8147b74db1720e6f355926374e2a2954f01ec84043c8a3a124d9d3dacaddb287eafe7affd61fd7d48c43806c0cd58cbb6181539272d0222
+EBUILD xz-utils-5.5.1_alpha.ebuild 3912 BLAKE2B 268f9126361ec7bbadad246598686453203ff9ee8f88d3f0d52dd1349602b07e1a56e24b8ce52b6ad512992e6b72840d6caf081474bf9664fac938284c31123d SHA512 291bfc73857662e5761221fea29b3183a0cbb6d31d65444f527479183b29f5815b0bf8a5f56cb8facbcff611ef9186b318ff83c6717bac39b4fcf8ab674cd534
+EBUILD xz-utils-9999.ebuild 3912 BLAKE2B 268f9126361ec7bbadad246598686453203ff9ee8f88d3f0d52dd1349602b07e1a56e24b8ce52b6ad512992e6b72840d6caf081474bf9664fac938284c31123d SHA512 291bfc73857662e5761221fea29b3183a0cbb6d31d65444f527479183b29f5815b0bf8a5f56cb8facbcff611ef9186b318ff83c6717bac39b4fcf8ab674cd534
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 10993a19d076..15cea9ec02c1 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 89edae028733..3a466b1bd3d9 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,4 +1,5 @@
 AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88
 DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
+EBUILD zstd-1.5.5-r1.ebuild 1647 BLAKE2B 87ccfc6b9d86af3d6126ff156aef53fc35f658ae75f038d8eda0c1ed013fe5174bb09197320491c8be8b9680cf6e85ce20863944f0f8bcbd07702751ec8d4692 SHA512 4f5fa4d59486e7222e092ed5170d0cd27e6dc700153ef4866e6405f2f7735b814aa3ca2fee4ed793fcff628f7bd7855f3879230e6e806ad5b3fce82358e4952b
 EBUILD zstd-1.5.5.ebuild 1752 BLAKE2B 924a18dc1a55ef5cf84e6be528328a96026074420e53ed58de0e2cf28edb479f6d2d046d79667719f70d18f6352216d7235ec0cb2f39ee2ec14b5649dd95ba07 SHA512 15acfd70664a12cdac98695b71e1c8a77bb6ae04c938a4ac6b443886793d977d27742337f0a017fdac8b68811fe2c1d93884df3c2387b5045bbc20f6a70f7b98
 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/zstd-1.5.5-r1.ebuild b/app-arch/zstd/zstd-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..0b0fac3c180d
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}"/${P}/build/meson
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+lzma lz4 static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+MESON_PATCHES=(
+	# Workaround until Valgrind bugfix lands
+	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
+)
+
+PATCHES=(
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+
+	cd "${S}" || die
+	eapply "${MESON_PATCHES[@]}"
+}
+
+multilib_src_configure() {
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+	# This replaces the no-find-valgrind patch once bugfix lands in a meson
+	# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	valgrind='valgrind-falseified'
+	EOF
+
+	local emesonargs=(
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
+
+		$(meson_native_true bin_programs)
+		$(meson_native_true bin_contrib)
+		$(meson_use test bin_tests)
+
+		$(meson_native_use_feature zlib)
+		$(meson_native_use_feature lzma)
+		$(meson_native_use_feature lz4)
+
+		--native-file "${native_file}"
+	)
+
+	meson_src_configure
+}