gentoo auto-resync : 03:06:2024 - 00:07:25

9 files changed, 18 insertions, 130 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0ed4947e4f0e..46d88269530e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index d62fa5e39f45..32f16d094b75 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,9 +1,3 @@
-AUX torrentzip-0.9-autoconf-quote.patch 337 BLAKE2B 6d1f630d365eaa9aff9d2c910ad30ad79694906cbb3ec7fccf665a468458d8103a0ebbc4e0d3fed1969e18b92780217fa47ed9a6260c42888f8bc022db15b3a6 SHA512 6ec05d00be36479084005c0938fb3df58b960914496ed149cb7eea9a6b4cb6067f9caa3ae7c835cf3bd79f357e17e18b8fcf80994dc1d550247c32416d71596d
-AUX torrentzip-1.2-checksum-detection.patch 2001 BLAKE2B 1efdfa1105a2446e6deafc65750505c3115889dcb7567898f8ea358cc8c96b9bbec1ebad20d913b2cc1f8c9ac46f3201bbedfb026493ab7571c234995a89ef7f SHA512 4d949191caed0285596df6dd53b7a86e892f112059e51af6efded5bdadce495b00941a71ae23438e0489a7a8e9795d266b3ba94a70f4b08fb3beb61669586a0e
-DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
-DIST trrntzip-1.2.tar.gz 62707 BLAKE2B 289ddfe89b91c63b1a6902ea7a4055fa8e235e712d6ea911da2848cc8db15cbdf712967b9fcc1414513c1a18eef160108f5f7b03aefd8f8f18c4d04907a16c17 SHA512 90c853efde1d077c741206362bc14fe779627f1b20571246e99ed29980840e78c0377110431c59c35596a0d209e612f6fe77b385707eb4bdb1ea47bb797c9272
 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 896 BLAKE2B 722fcd384499449d217391aff9fb0dcf154892342b4ccf2016c60ce8bcd53270984fa93dbeffc33c754998fbba5042eb5c188ac3eee6b934f3ad0e8b86b9e3a5 SHA512 7650a25ae9480d95cded632bf44111e8d6b0d7bc4f6bbf20d13ed585fade3bcfa4fc60f2778b632a07e560934760846cc842b4a785e8f767f7365af6b0b73354
 MISC metadata.xml 928 BLAKE2B b0a650f0cd81be849f08bd6f078035ae7b56967034b3b9ba534da5d046936f7b27e819dc05ee94b2b8d95ca54ceafb8b521f7121eec0f4d5c4fdd0d8ac141ede SHA512 101e70ac70fdc24294dae2f18057c84e75dd0c776689883ea630f2dcd4ddd2b3da1f7e6643ffc5fd1aed2f5e355aa6700174bca0c16eb1fa84d9f531d7eba064
diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
deleted file mode 100644
index f1f15ced173e..000000000000
--- a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])

-+AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])

- 

- AM_INIT_AUTOMAKE

- AM_CONFIG_HEADER(config.h)

diff --git a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch b/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
deleted file mode 100644
index ac1ae14cbe03..000000000000
--- a/app-arch/torrentzip/files/torrentzip-1.2-checksum-detection.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 016915e16f32105590a6dc11a4adc988b2f8d9a9 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Mon, 4 Mar 2024 19:26:21 +0100
-Subject: [PATCH] Fix broken detection of missing or wrong TORRENTZIPPED-...
- comment
-
-The commit listed below introduces a regression where in MigrateZip(),
-variable rc would be clobbered when its value is still needed. That
-completely breaks handling of zips that should be re-zipped because
-of missing or out of date TORRENTZIPPED-... comment.
-
-Rewrite the offending code such that it no longer touches the variable.
-
-Fixes: cf11c900079e ("Check for more errors while reading zip entries")
----
- src/trrntzip.c | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/trrntzip.c b/src/trrntzip.c
-index e55d217..49f796e 100644
---- a/src/trrntzip.c
-+++ b/src/trrntzip.c
-@@ -379,16 +379,20 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
- 
-   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
-   // Get the filelist from the zip file in original order in ws->FileNameArray
--  rc = GetFileList(UnZipHandle, ws);
--  if (rc != TZ_OK) {
-+  switch (GetFileList(UnZipHandle, ws)) {
-+  case TZ_OK:
-+    break;
-+  case TZ_CRITICAL:
-     logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
--              rc == TZ_CRITICAL
--                  ? "Error allocating memory!\n"
--                  : "Could not list contents of \"%s\". File is corrupted or "
--                    "contains entries with bad names.\n",
--              szZipFileName);
-+              "Error allocating memory!\n");
-+    unzClose(UnZipHandle);
-+    return TZ_CRITICAL;
-+  default:
-+    logprint3(stderr, mig->fProcessLog, ErrorLog(ws),
-+              "Could not list contents of \"%s\". File is corrupted or "
-+              "contains entries with bad names.\n", szZipFileName);
-     unzClose(UnZipHandle);
--    return rc;
-+    return TZ_ERR;
-   }
-   CHECK_DYNAMIC_STRING_ARRAY(ws->FileNameArray, ws->iElements);
- 
diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
deleted file mode 100644
index ad564eefcc4c..000000000000
--- a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=(README AUTHORS)
-
-PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch")
-
-src_prepare() {
-	default
-	export CPPFLAGS+=" -DOF\\(args\\)=args"
-	eautoreconf
-}
diff --git a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild b/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
deleted file mode 100644
index d526e0b88c10..000000000000
--- a/app-arch/torrentzip/torrentzip-1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="trrntzip-${PV}"
-DESCRIPTION="Create identical zip archives over multiple systems"
-HOMEPAGE="https://github.com/0-wiz-0/trrntzip"
-SRC_URI="https://github.com/0-wiz-0/trrntzip/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(AUTHORS NEWS.md README.md)
-PATCHES=(
-	"${FILESDIR}/${P}-checksum-detection.patch"
-)
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8fda3ed91d67..a1577a50a073 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 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b
-EBUILD xz-utils-9999.ebuild 5274 BLAKE2B b19bccf0d7615f4883fd3544a18c6e8e5cbb7b9f4cda3e4fc76e41fb41ad3d792b6827f0f6fee4be2248be00336a4e426297fbf124a2e9f44124a72b771339ff SHA512 79918316ce580a502d5e547697db28d328917c8a0a3156ddf0eb0011a828e0a29ba40c41209e688927654ac2eb1c356bf179fee3819752de066a678f7208d84b
+EBUILD xz-utils-5.6.2.ebuild 5295 BLAKE2B 3379a08a62468ecb3ca9155192b6566f7ecbd91a943bd8f21304810558be2d352ed57847dd4b8cb3a2cc6f84b0cddb81cdd326d2712c3a8dab24c04eb5b16020 SHA512 61cb9451724c079eff85100b80f50fed53af002a60de717e0374f3420d5a043bfb997c1dc3ffb2a3fe849affb7b8fde20ebe49349075d65441fb9fe17db06de2
+EBUILD xz-utils-9999.ebuild 5295 BLAKE2B 3379a08a62468ecb3ca9155192b6566f7ecbd91a943bd8f21304810558be2d352ed57847dd4b8cb3a2cc6f84b0cddb81cdd326d2712c3a8dab24c04eb5b16020 SHA512 61cb9451724c079eff85100b80f50fed53af002a60de717e0374f3420d5a043bfb997c1dc3ffb2a3fe849affb7b8fde20ebe49349075d65441fb9fe17db06de2
 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 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -116,10 +116,14 @@ 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 )
+		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
 			(
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -116,10 +116,14 @@ 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 )
+		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
 			(