gentoo auto-resync : 16:04:2024 - 12:04:26

5 files changed, 41 insertions, 6 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 87b33522eea2..06a956ab854e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index d6eb559ea7ab..d62fa5e39f45 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -5,5 +5,5 @@ DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712
 DIST trrntzip-1.3.tar.gz 67297 BLAKE2B c77fd134cfd3ab30f46b66f4b3dd36b899ee6267b17100b1ad15bdf5c6beddaea94fe22d23f1a81de85522768d76401f0192d0deac2ff75edc816510c8069e2c SHA512 c21ed6ac4dacd652e2a67b700741d70dd9da699259bd299ca177c741111f92e70eef0b3ad2ced54b5635780cab2b4c46b3f9c258dfa18bdde24e2718c38339be
 EBUILD torrentzip-0.9-r1.ebuild 564 BLAKE2B c3b95f46af8c990519039ad89be0c054a6060184f1911cf8945247589b3095dc5af33513f5488f0119db7fe38cd917f54a8b0a1413bb4f8db819b4767dccf050 SHA512 8e503901307d1e9c3cba278f06ed4f03de7c70bec58ba88a8ddb96d00ba4bfe791ec02e31c53335a7b2d6ad94a2a7b7315b84b3a7c8cb472d0134aa776dca9ac
 EBUILD torrentzip-1.2-r1.ebuild 571 BLAKE2B ab0db9d4546bc123c64c091c964cffc44c07d532502368002f734b292bc5d28c99d5f4f5c0f62bc41354632da2464f0eec7f483d8e99f5e70d2b0feb834c2c02 SHA512 c7816cdbbdb4cf8825e0ef93a4b8b0fbec0ea0eee56463c9aa551b2829caf3c8ccd7da4ccd12447e0570d0cf9f790d27105384d51f9e6c40d7f2e9acf3e960fb
-EBUILD torrentzip-1.3.ebuild 898 BLAKE2B 25e352585abcd7fb892bbe68f7aa27418cf630aa835f7558ebef17041ce84498caa942aa600cd61d6ca6ae6e9bac86ce18ab0d7993c4ac35536f71d7b731c0f1 SHA512 a64b14ae805fc20fec077773a9d45fb430e05d566425046cd742a0ad6e9c9c182bfd8de93b13916be01b943a1450d2f3f29f95106afe891aca863b10cfbd15ad
+EBUILD torrentzip-1.3.ebuild 896 BLAKE2B 722fcd384499449d217391aff9fb0dcf154892342b4ccf2016c60ce8bcd53270984fa93dbeffc33c754998fbba5042eb5c188ac3eee6b934f3ad0e8b86b9e3a5 SHA512 7650a25ae9480d95cded632bf44111e8d6b0d7bc4f6bbf20d13ed585fade3bcfa4fc60f2778b632a07e560934760846cc842b4a785e8f767f7365af6b0b73354
 MISC metadata.xml 928 BLAKE2B b0a650f0cd81be849f08bd6f078035ae7b56967034b3b9ba534da5d046936f7b27e819dc05ee94b2b8d95ca54ceafb8b521f7121eec0f4d5c4fdd0d8ac141ede SHA512 101e70ac70fdc24294dae2f18057c84e75dd0c776689883ea630f2dcd4ddd2b3da1f7e6643ffc5fd1aed2f5e355aa6700174bca0c16eb1fa84d9f531d7eba064
diff --git a/app-arch/torrentzip/torrentzip-1.3.ebuild b/app-arch/torrentzip/torrentzip-1.3.ebuild
index 5a45d54d5f5f..7a3ce63d28a3 100644
--- a/app-arch/torrentzip/torrentzip-1.3.ebuild
+++ b/app-arch/torrentzip/torrentzip-1.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 23daf7ec12e7..35ba7ee7fcff 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,5 +4,5 @@ DIST xz-5.4.6.tar.gz 2889306 BLAKE2B f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1 SHA512 d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 EBUILD xz-utils-5.4.2.ebuild 3903 BLAKE2B 6cd55695b97e2423416f0554a9cef087e68f2b5a1c0f71706fa4a993f075a98179035d02f22fea1bad1e66663f38fdedab00f76fc0bb4af4ea1ec5564d025b31 SHA512 bc87f93d7c7a80464c19a3df4ab284c1d206aabae4239c27734e6d9beba4ab677d1ed5baa2867a898448d92e8cd458a8c6c6a3e3591f49cd0f79dabe8f1bab92
 EBUILD xz-utils-5.4.6-r1.ebuild 3882 BLAKE2B 5a2c66dfcb424cf1f89ec7e73559065d67644542e850a9be1d18aac13408d1442868376c4ceb5020fe66d1f358f2cc3f452222267f54e810359f7b0260624291 SHA512 4333a37c8e2c00a0cb4dc94655ef57b7a928eada4f19c376c11dbc5921ac8c9d4c61db9fe24b9cbcd0310fbb6ebb395bbf275cb595cbef727ab503800c3019ab
-EBUILD xz-utils-9999.ebuild 4130 BLAKE2B 73ced8373630350f126b98c6ee89a318e96643f03b94b182a6ba5d19b782ab78942fae1aeffb7b82f27fa72889c4180e78bb0f5d5d6554f164489b341daed2cf SHA512 6b9ec83ca1df05c94fda184d424535d311b3f518a1cdb6fc5b4c1b4bfe1541817848d9b37d43c2f3736cf9f96f26fc19f910f4f9ec6696e5e498c9be7459f24e
+EBUILD xz-utils-9999.ebuild 5057 BLAKE2B 60080970239b0c80b26a455753d8f76eb5147d1ab480e5075d629aef638af8eb1960ce2e89ca5e0ca051a0c87015e42b28091d44051fae5860fc84dd47fe37e7 SHA512 d306864378e6ebacd2e2b3fdd482bddf42b0526413eb3727a5e915a65eebbae5c8f04faf786cefceb57266fe6f732f165c65894b279399bc20f63aedfb784f7a
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1f42a49bc42b..d2e98e50e15a 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -56,9 +56,6 @@ fi
 src_prepare() {
 	default
 
-	# Delete known-compromised test data (bug #928134)
-	rm tests/files/bad-3-corrupt_lzma2.xz tests/files/good-large_compressed.lzma || die
-
 	if [[ ${PV} == 9999 ]] ; then
 		eautopoint
 		eautoreconf
@@ -109,6 +106,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
+	# TODO: revisit that now we have the tar/xz loop below?
 	# 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)")
@@ -118,6 +116,43 @@ multilib_src_compile() {
 	if use pgo ; then
 		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
+		if multilib_is_native_abi ; then
+			(
+				shopt -s globstar
+
+				tar \
+					--sort=name --mtime=@2718281828 \
+					-cf xz-pgo-test-01.tar \
+					{"${S}","${BUILD_DIR}"}/**/*.[cho] \
+					{"${S}","${BUILD_DIR}"}/**/*.so* \
+					{"${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
+				md5sum xz-pgo-test-01.tar
+			)
+
+			local test_variants=(
+				# Borrowed from ALT Linux
+				# https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
+				'-0 -C none'
+				'-2 -C crc32'
+				'-6 --arm --lzma2 -C crc64'
+				'-6 --x86 --lzma2=lc=4 -C sha256'
+				'-7e --format=lzma'
+
+				# Our own variants
+				''
+				'-9e'
+				'--x86 --lzma2=preset=9e'
+			)
+			local test_variant
+			for test_variant in "${test_variants[@]}" ; do
+				"${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