From 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Jun 2024 00:07:06 +0100 Subject: gentoo auto-resync : 01:06:2024 - 00:07:06 --- app-arch/xz-utils/Manifest | 4 ++-- app-arch/xz-utils/xz-utils-5.6.2.ebuild | 21 +++++++++++++-------- app-arch/xz-utils/xz-utils-9999.ebuild | 21 +++++++++++++-------- 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'app-arch/xz-utils') diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest index 8d9a9cbbcb6f..8fda3ed91d67 100644 --- a/app-arch/xz-utils/Manifest +++ b/app-arch/xz-utils/Manifest @@ -6,6 +6,6 @@ DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9 DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b EBUILD xz-utils-5.4.2.ebuild 3916 BLAKE2B e5ed50ed6c54ba51fabcc3b77ad0a42a00e8b5aca66a3264e51c572300bcbdf0ce181b8548aad3cd2c917ba9f77960e069ee73392be9d6b43f399ce70c98d8a6 SHA512 15d25fb0df99907985f4cd94edff05f3db0a15afee067276f00616eceb46fb79de248cd3b2945ca4aded3a4ff079a72ddeee7b9f599934c4f0ff2f71db6284f6 EBUILD xz-utils-5.4.7.ebuild 3924 BLAKE2B 664e833cf0da6953a1571e9843ec80870f00ba62b0f5a43342adaafa26e8ce91e377a169256927f5e553b9176cb5cd2f87784a4ef9acb9ac8f3bb5d2a26a5189 SHA512 7c18e7a278e5f316ae9b8fdc9116a167ae970bb8d52cfe4809a0218bfc2f0a1469546f037728cf3a21eb9e6869a583ad997a8dae19db65a22595abcc0826954e -EBUILD xz-utils-5.6.2.ebuild 5070 BLAKE2B bc3cc64bc3162d6ceb1f46714e97a295ebe126b84d90be6c4387369a36f30d3118dce0c7d83e63f49158d8fb75cea64ab7ca572447fa8a98408d27ba8ac52efb SHA512 7aa499ccec6612f417b18320082fce3ea19ba65290cbf1a5d05e2cc65cb09c1a56918f7b1d657daae9098fc2c13792d2e76923f48902228e352d72d01bbb2d01 -EBUILD xz-utils-9999.ebuild 5070 BLAKE2B bc3cc64bc3162d6ceb1f46714e97a295ebe126b84d90be6c4387369a36f30d3118dce0c7d83e63f49158d8fb75cea64ab7ca572447fa8a98408d27ba8ac52efb SHA512 7aa499ccec6612f417b18320082fce3ea19ba65290cbf1a5d05e2cc65cb09c1a56918f7b1d657daae9098fc2c13792d2e76923f48902228e352d72d01bbb2d01 +EBUILD xz-utils-5.6.2.ebuild 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b +EBUILD xz-utils-9999.ebuild 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189 diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild b/app-arch/xz-utils/xz-utils-5.6.2.ebuild index 923a92ff82a9..1a3ca64e6cc2 100644 --- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild @@ -116,20 +116,25 @@ multilib_src_compile() { if use pgo ; then emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + local tar_pgo_args=( + --mtime=@2718281828 + ) + has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name ) + if multilib_is_native_abi ; then ( shopt -s globstar tar \ - --sort=name --mtime=@2718281828 \ + "${tar_pgo_args[@]}" \ -cf xz-pgo-test-01.tar \ {"${S}","${BUILD_DIR}"}/**/*.[cho] \ - {"${S}","${BUILD_DIR}"}/**/*.so* \ + {"${S}","${BUILD_DIR}"}/**/.libs/* \ {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files \ + {"${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 + 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=( @@ -137,14 +142,14 @@ multilib_src_compile() { # 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' + "$(usev extra-filters '-6 --arm --lzma2 -C crc64')" + "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')" '-7e --format=lzma' # Our own variants '' '-9e' - '--x86 --lzma2=preset=9e' + "$(usev extra-filters '--x86 --lzma2=preset=9e')" ) local test_variant for test_variant in "${test_variants[@]}" ; do diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index 923a92ff82a9..1a3ca64e6cc2 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -116,20 +116,25 @@ multilib_src_compile() { if use pgo ; then emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + local tar_pgo_args=( + --mtime=@2718281828 + ) + has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name ) + if multilib_is_native_abi ; then ( shopt -s globstar tar \ - --sort=name --mtime=@2718281828 \ + "${tar_pgo_args[@]}" \ -cf xz-pgo-test-01.tar \ {"${S}","${BUILD_DIR}"}/**/*.[cho] \ - {"${S}","${BUILD_DIR}"}/**/*.so* \ + {"${S}","${BUILD_DIR}"}/**/.libs/* \ {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files \ + {"${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 + 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=( @@ -137,14 +142,14 @@ multilib_src_compile() { # 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' + "$(usev extra-filters '-6 --arm --lzma2 -C crc64')" + "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')" '-7e --format=lzma' # Our own variants '' '-9e' - '--x86 --lzma2=preset=9e' + "$(usev extra-filters '--x86 --lzma2=preset=9e')" ) local test_variant for test_variant in "${test_variants[@]}" ; do -- cgit v1.2.3