gentoo auto-resync : 14:03:2025 - 00:28:41

7 files changed, 208 insertions, 6 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7c940b663dfe..d02bb9e91092 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 3107b5bcf281..ba72d81ae15c 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,5 +1,5 @@
 AUX ncompress-5.0-c23.patch 7592 BLAKE2B 3e2a88eff2b644a29dcccaa8e9bfd6bdc10f8b96456b466e22322228f7e4b7cac53ab1061049068635b10a7bdaef9876662699da51aef0de9f379d2afba86c44 SHA512 ddfd9ed9f9942168509e09976a1fbbee54af98e6d0c8690de1d6870f7bba9d6eec8d7fc22a74eb1a545800928804bd6cce6a4b4062217e7988b00c3734d5d1be
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
 EBUILD ncompress-5.0-r1.ebuild 1045 BLAKE2B 240b4cb863f2e8ff522361935d58bb85e221d1d42dc2b67d2f42f5dc00113c193deeb77676709760ef2f7ecab4e466937319c525cd24046bc8a799436d1093f6 SHA512 d203bbc23fd05096cac021cdb7aa7ef9005e1b2585059e5544bac37207c9188e882ec96af724945d1348de14092a74a0586deeebd3b843b7834d19c402bdb86f
-EBUILD ncompress-5.0-r2.ebuild 1084 BLAKE2B 9e39aeafba4cf2e4a5869114b85f56c6049278ee646a6ee3cdaeec9769b8274961e21f4bbadfea9b04bc76212239c9bd612e83f58f0c656a2b66b601e648da9d SHA512 82e9c1b6fcc6ec7c3e0c57e40b6efaab2f0d1f00827659c2fbf9e771c69a4478a2b74c5ed0208e1042e146e7b7bc04cf760b96e18b7fde9db6be875f85435a79
+EBUILD ncompress-5.0-r2.ebuild 1083 BLAKE2B f57de4b1d947d0433ca83a0e9935cd41cf5e5637d30b2d6c8bd5d96a890c2fed6bec8949c6d148a028de411181f643304a3a562992063fd36cd0a7ec667d180a SHA512 60316566067198bdae27e8a63b902058ce8c9c19f04696462787c74566610a6cf3347824d3aef3d35c25bbe874be3fb59b608f01fe4e72a7d300c029efd67f2e
 MISC metadata.xml 393 BLAKE2B 24133518bbc568fc7861bb255fcd6ebb34d8ed24912889ac7df4f0517f34fcb281a3eff0c75d5a285891f820956b680270b42cdb1f5cf7a417f43241b46d392f SHA512 7b5f6f0ea16f60fb9b05d9a27701b56e80b62c8e9d1fbf05ecc75015f51dc010f53546661013ec36831051985360e21fb374bc8b5006ecc14f707f9b715fe745
diff --git a/app-arch/ncompress/ncompress-5.0-r2.ebuild b/app-arch/ncompress/ncompress-5.0-r2.ebuild
index d257d90209ca..ed5c409da6b6 100644
--- a/app-arch/ncompress/ncompress-5.0-r2.ebuild
+++ b/app-arch/ncompress/ncompress-5.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-c23.patch
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 72e3a2a5e7b6..ba5c3241fb62 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -8,10 +8,13 @@ DIST xz-5.6.4.tar.gz 2280985 BLAKE2B 3d27c143f4856589d501bc47ff5c86c1c49b1d0b8c8
 DIST xz-5.6.4.tar.gz.sig 566 BLAKE2B 475b576431f573b9ce390ae2c43fc4f307f00ef523a741ec6795f182f5ff2c30f2049b1b4d2a3a7e61769bb7dc568de0f5af89661cb09341a58bbcdcdda3c877 SHA512 1ece59b7a540f6d215206ced14759aa971f192433705f8803b6ad8db0857e246145300c853cb571d8750b8152483d13736c478a7c0abb40d7ed25305d80a841c
 DIST xz-5.7.1alpha.tar.gz 2334409 BLAKE2B 98e98ebde9175fe8b135fa59f8e8acff1b8c6278f75a3ea997ebbe9aac25cb1a6a1f1bde163af4788ca0532bc270fe5baaf6cd89ba4c81ed3e3f7a6f08e741eb SHA512 40349652f3903e1d37e1cdc0b0b6f5479db0bc5bcbdc371f34b7cf7de730b1781748e1a6cad3dcc9e721243a0bd6f1c062a5ae54e966d23ff80ae0f0c9371246
 DIST xz-5.7.1alpha.tar.gz.sig 566 BLAKE2B 33c23b3aace6856f67b927d2f5b46f60f1e96eedde6a7e2cf5085e44b96da6503a8c38d5977a1dd7b068d9cb9ae652d457e9344eb40b482979d810afeb38f888 SHA512 f3fce937be1753b94110f2cf8ea1da52905133f8a62f9b2f91f6b5c91d2400ae63e000b392a0b992cd16495227077c0f26f1e36349b048e84a6bb8d3e618fd28
+DIST xz-5.7.2beta.tar.gz 2568902 BLAKE2B e7474e89bb628ea1a4a906ecad19be6b2bef30f2a674f9a384d20a5f1536cd8db0486f953de828ab327cef22a50dc23786e925b266b4f7398510c06707184699 SHA512 a9f373dcbfbfa0badac78f51678c078b455fc977744b80e04ae1f1dc19b1df681adb4097a4dfe2f50c7811e8f89287ab9d3bc28c00a8b48549adfe9bbc3f00a1
+DIST xz-5.7.2beta.tar.gz.sig 566 BLAKE2B 477e29d86a8dd76ea4eede8da223031ae36110d859afd46f18cd9fe67af6bc64cd0d80501d83c5fbd044d01b5307a69d634fe15a244096d2278a28c576628148 SHA512 cbbe79a2e00af78aeecb959fcda4dfe6d178f0a11cb9f64407b8850e586dcd50a386de41a675a9274b9be3d2122facf1377271a5fc6f9f3288e7b1f2598e5999
 EBUILD xz-utils-5.4.7-r1.ebuild 4421 BLAKE2B 1815a71ccbdda839d2659735fe14084274425e571f9de4b617c5d977fd2b54f420cc0f0bbb3604660fd9e2af4074e20bb23095ce694157025f03886e861d407e SHA512 17c066a72cb79c1e558bebdd37bafa04b2b34be1249dc24568d4c8622013ebdfcfd922542d171e2ac09276bac2eb97e8a19d7b9a577c7f5aafc815ebef692f3f
 EBUILD xz-utils-5.6.2-r1.ebuild 5843 BLAKE2B 4d0f1c5bd9e20d77523902b1c31b3bfea0c46e58a01b3d80c467d0898dc2b5302294c13d180a5bf26c9f52278014895a11496b8d11fe6ddba6187d352d200e16 SHA512 6b98fc14326aab5526b0dd6e812fe97e31bef5cd6c8e5f712eecee5bc3635b9c11ef303a119a9bfe6d605bbdf7045e70b758b9915a357d4f653531c436bf1faa
 EBUILD xz-utils-5.6.3.ebuild 5652 BLAKE2B 9f7575f9b8c79cb3c98a3d29351d8441edef4d100d828a534be7141bbebfabe4976a333d412588503199dd272749e14a11543f412d683617d25b87da0ac17770 SHA512 dd4846591d25f47becb33ab215a1210a6d0a35ecc6ac6286b2a9ca33f31dd9d107a221d377229cebbcd1d43f2263e6d67a49b2d6b870fa02f1d30c841918d9f0
-EBUILD xz-utils-5.6.4.ebuild 5498 BLAKE2B 1de799651067267083537e310098a03d6f77be38efd752e1f71d513c6ec5310dd8cd846e1bf2a83c5e21701777b6125d24e1cfae12c8e09d9601539c4e626945 SHA512 7bfa4f0f03b0fdc4c9afb07b017cb5d79d8e4d3f907f503ec4f2aa861d8dafb0dc7bca259e06383248846c27afba39710740fdf9263c9c83a0bf7102bef4339c
+EBUILD xz-utils-5.6.4.ebuild 5491 BLAKE2B 614c23ab3b5154a9e846718d8429955b3306823f230051d17410ccf400cb630abaeb5e6eaebda547d57c03df839be1e4b51518aa84500f43b811ab0808fcdd55 SHA512 319cd095bccb2cddd509bee66f344ca1307390818b2ab19e887ec78e2cc376ebaefaa385b68fb9bcfae43c52117057a03573241fcbbfbc265a7ac4f993993e4d
 EBUILD xz-utils-5.7.1_alpha.ebuild 5498 BLAKE2B 1de799651067267083537e310098a03d6f77be38efd752e1f71d513c6ec5310dd8cd846e1bf2a83c5e21701777b6125d24e1cfae12c8e09d9601539c4e626945 SHA512 7bfa4f0f03b0fdc4c9afb07b017cb5d79d8e4d3f907f503ec4f2aa861d8dafb0dc7bca259e06383248846c27afba39710740fdf9263c9c83a0bf7102bef4339c
-EBUILD xz-utils-9999.ebuild 5498 BLAKE2B 1de799651067267083537e310098a03d6f77be38efd752e1f71d513c6ec5310dd8cd846e1bf2a83c5e21701777b6125d24e1cfae12c8e09d9601539c4e626945 SHA512 7bfa4f0f03b0fdc4c9afb07b017cb5d79d8e4d3f907f503ec4f2aa861d8dafb0dc7bca259e06383248846c27afba39710740fdf9263c9c83a0bf7102bef4339c
+EBUILD xz-utils-5.7.2_beta.ebuild 5498 BLAKE2B b7bcacb8026c39ced8de4229d5e84368aef4da4f532d5adc1a4644db89340cbada5c39e3eec7fee536750f5096684e484b89303e155752efd1455ce5d56ea983 SHA512 7183c2b6c69d99f8b4e2d6deb7dc6dfd7ad017c91bb597714a3c1bcd9d5c0d2c749f3cee7f1009507b381392782ee2b8f03d5b25e6411493f8479528ae2e7908
+EBUILD xz-utils-9999.ebuild 5498 BLAKE2B b7bcacb8026c39ced8de4229d5e84368aef4da4f532d5adc1a4644db89340cbada5c39e3eec7fee536750f5096684e484b89303e155752efd1455ce5d56ea983 SHA512 7183c2b6c69d99f8b4e2d6deb7dc6dfd7ad017c91bb597714a3c1bcd9d5c0d2c749f3cee7f1009507b381392782ee2b8f03d5b25e6411493f8479528ae2e7908
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-5.6.4.ebuild b/app-arch/xz-utils/xz-utils-5.6.4.ebuild
index 9ee03ab5b7df..b5e36a0511ae 100644
--- a/app-arch/xz-utils/xz-utils-5.6.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.4.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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}"
diff --git a/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild b/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild
new file mode 100644
index 000000000000..b4b85808bcc3
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2025 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 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/lassecollin.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
+		https://downloads.sourceforge.net/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 ~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-lassecollin-20250313 )"
+fi
+
+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 7-Zip uses CRC32 by default.
+			# Also, XZ Embedded in Linux doesn't support CRC64, so
+			# kernel modules and friends are 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/xpg4/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo")
+	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo")
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+
+	if use pgo ; then
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+
+		local tar_pgo_args=()
+
+		if has_version -b "app-alternatives/tar[gnu]" ; then
+			tar_pgo_args+=(
+				--mtime=@2718281828
+				--sort=name
+			)
+		fi
+
+		if multilib_is_native_abi ; then
+			(
+				shopt -s globstar
+
+				tar \
+					"${tar_pgo_args[@]}" \
+					-cf xz-pgo-test-01.tar \
+					{"${S}","${BUILD_DIR}"}/**/*.[cho] \
+					{"${S}","${BUILD_DIR}"}/**/.libs/* \
+					{"${S}","${BUILD_DIR}"}/**/**.txt \
+					{"${S}","${BUILD_DIR}"}/tests/files
+
+				stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die
+				md5sum xz-pgo-test-01.tar || die
+			)
+
+			local test_variants=(
+				# Borrowed from ALT Linux
+				# https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
+				'-0 -C none'
+				'-2 -C crc32'
+				"$(usev extra-filters '-6 --arm --lzma2 -C crc64')"
+				"$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')"
+				'-7e --format=lzma'
+
+				# Our own variants
+				''
+				'-e'
+				"$(usev extra-filters '--x86 --lzma2=preset=6e')"
+			)
+			local test_variant
+			for test_variant in "${test_variants[@]}" ; do
+				einfo "Testing '${test_variant}' variant"
+				"${BUILD_DIR}"/src/xz/xz -c ${test_variant} xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null
+				assert "Testing '${test_variant}' variant failed"
+			done
+		fi
+
+		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() {
+	default
+
+	# bug #934370 and bug #450436 (and bug #934515)
+	if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then
+		eerror "Sanity check for liblzma$(get_libname) failed."
+		eerror "Shared library wasn't built, possible libtool bug"
+		[[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting"
+	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)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 9ee03ab5b7df..b4b85808bcc3 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -50,7 +50,7 @@ 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-lassecollin-20240529 )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )"
 fi
 
 src_prepare() {