gentoo auto-resync : 28:02:2024 - 23:41:01

4 files changed, 190 insertions, 0 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 805d75d2b878..3d4416a71bb2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index e9b70801de7a..f70ae9d81643 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,3 +1,4 @@
+AUX xz-utils-5.6.0-logging-verbosity-threads-auto.patch 1817 BLAKE2B b89b18c9a736567c93851773b24b3c90f9de923d9b61dcbad65030b8b22619f9b6ce6bbff4e025349f5e9913c9be45fc58cdafb53ac1f4a3e3ecf1c5f135d5c9 SHA512 d11b64e2faa7220b422e89694e11caa9b5b887a512ba6a386af223d777df6944cde75e4a25007787c2daaa217249d6c119ee257539c6138b3a49aa060e6dbac5
 DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315 SHA512 91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2 SHA512 4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f SHA512 b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
@@ -6,6 +7,7 @@ DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986b
 DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21 SHA512 2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0
 EBUILD xz-utils-5.4.5.ebuild 3955 BLAKE2B a0b903cd6906fb604362fcc9e8aa44249946baac062438b3fd8a1901bb5fdf18d789eb1ac073894b047726849d75a6e8e48d0f955f5b22527339b780e1cfed5f SHA512 2ff0ca2035261185db82c72117bfb0ad3c5bc9dc957bf8625076def51d5010f491a76ae161084fdd2b50536882be49565c3f1185d001299dde456cedcc77d3ee
 EBUILD xz-utils-5.4.6-r1.ebuild 3886 BLAKE2B 010e34ca3f1d478399daad4450d3ed6b34acb10670e115b4dd17e77d7dba82461907badceb1f36d387692682b40747bc77c2a09555c03d68be37b54342136758 SHA512 53acecf0c939e24630132503665e2d0a66a8590c16bbada57da426bb5d90e5931924682771f6098fe2965adb417193a231fa87353dc230c125ce28d0750027d1
+EBUILD xz-utils-5.6.0-r1.ebuild 4041 BLAKE2B edc4db4f5b437a95c2ba77819939c05c4292d885d67ef71867569ece0c682510dcb1552de146cad511437628544098940815f0fe813645df93ba3147977ace3c SHA512 e9a65904bc3d6479020fc27651d0059220d8f23e992728b11f64b7d6bdafb1676e7e1043f41b0e918a6134e4ee757513c27b2440270052ebadcfe8b51e66f710
 EBUILD xz-utils-5.6.0.ebuild 3971 BLAKE2B 5c7dc315303de12ac9b5046252dbab561911fc0a4b1d002bf2a6bb3cd0fac6494efabafb3ce65a98cd119da28ce2b4155ac2af0f73e6fea34612e46b1fec553d SHA512 caa0d3dd146f47b0b142009a07d05751d4a430810a0a60d12a76c49c0c0498b053af3b0342c11c91bfc8159fd5e2678b3223e8a5bda4f6ba1559c32bea249dd3
 EBUILD xz-utils-9999.ebuild 3971 BLAKE2B 5c7dc315303de12ac9b5046252dbab561911fc0a4b1d002bf2a6bb3cd0fac6494efabafb3ce65a98cd119da28ce2b4155ac2af0f73e6fea34612e46b1fec553d SHA512 caa0d3dd146f47b0b142009a07d05751d4a430810a0a60d12a76c49c0c0498b053af3b0342c11c91bfc8159fd5e2678b3223e8a5bda4f6ba1559c32bea249dd3
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch b/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
new file mode 100644
index 000000000000..a203ecf2aa97
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
@@ -0,0 +1,43 @@
+https://github.com/tukaani-project/xz/commit/5c91b454c24e043ca8f2cc7d2b09bd091dafe655
+
+From 5c91b454c24e043ca8f2cc7d2b09bd091dafe655 Mon Sep 17 00:00:00 2001
+From: Jia Tan <jiat0218@gmail.com>
+Date: Tue, 27 Feb 2024 23:42:41 +0800
+Subject: [PATCH] xz: Change logging level for thread reduction to highest
+ verbosity only.
+
+Now that multi threaded encoding is the default, users do not need to
+see a warning message everytime the number of threads is reduced. On
+some machines, this could happen very often. It is not unreasonable for
+users to need to set double verbose mode to see this kind of
+information.
+
+To see these warning messages -vv or --verbose --verbose must be passed
+to set xz into the highest possible verbosity mode.
+
+These warnings had caused automated testing frameworks to fail when they
+expected no output to stderr.
+
+Thanks to Sebastian Andrzej Siewior for reporting this and for the
+initial version of the patch.
+--- a/src/xz/coder.c
++++ b/src/xz/coder.c
+@@ -581,7 +581,7 @@ coder_set_compression_settings(void)
+ 
+ 			if (memory_usage <= memory_limit) {
+ 				// The memory usage is now low enough.
+-				message(V_WARNING, _("Reduced the number of "
++				message(V_DEBUG, _("Reduced the number of "
+ 					"threads from %s to %s to not exceed "
+ 					"the memory usage limit of %s MiB"),
+ 					uint64_to_str(
+@@ -601,7 +601,7 @@ coder_set_compression_settings(void)
+ 		// time the soft limit will never make xz fail and never make
+ 		// xz change settings that would affect the compressed output.
+ 		if (hardware_memlimit_mtenc_is_default()) {
+-			message(V_WARNING, _("Reduced the number of threads "
++			message(V_DEBUG, _("Reduced the number of threads "
+ 				"from %s to one. The automatic memory usage "
+ 				"limit of %s MiB is still being exceeded. "
+ 				"%s MiB of memory is required. "
+
diff --git a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
new file mode 100644
index 000000000000..26708cb6aea1
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=8
+
+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
+	# may be behind.
+	EGIT_REPO_URI="
+		https://github.com/tukaani-project/xz
+		https://git.tukaani.org/xz.git
+	"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="
+		https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		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"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
+SLOT="0"
+IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-logging-verbosity-threads-auto.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(multilib_native_use_enable doc)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable cpu_flags_arm_crc32 arm64-crc32)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
+	# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
+	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+
+	if use pgo ; then
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die
+		fi
+
+		emake clean
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}