gentoo auto-resync : 01:01:2023 - 20:22:32

16 files changed, 0 insertions, 617 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ee4936ffe79a..7fbf4a1a90c4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1e76a5d40da9..69cfe8840bec 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,5 +1,3 @@
-AUX file-5.39-portage-sandbox.patch 457 BLAKE2B ff4b67570144d5995ef62326da5f7a4ac5fe4befc3db56ff6d6a711c84bb4316da9e1a203326a6bc219066acd8e40634bf17f28f95d583bfa2f3d4698bcd57fc SHA512 20f66d918a605233f733fa6f5c038d9c56ec1175e706b76b16ecb8be81d64d79c3a932824b61092bf1edcd55c29fc2bcfa8bdf506e5717c10e849ec6110bbd3d
-AUX file-5.40-seccomp-fstatat64-musl.patch 578 BLAKE2B c2c074e4dca62253303bae3af88a7ce0bc7d3efd608bd7269d624ad69b0fe4022db38efc5bb63d8f6d1f7bf45c2a1d749c406e76cf1ce42be731e663e2874ad5 SHA512 008c2a2c18b14eaa49f62b87fa14f4bea46bfd56efda17e49541fd51d87201d4d5511d3aae50b53dfcd68cc8e9a38884711ac59458acff9bf3290e267c2891bb
 AUX file-5.43-configure-clang16.patch 473 BLAKE2B 4f98016638a5afb5e7dd8c1085077d562a65811585971f5c5dd3c36b1848754900e2c41779c55b69b65c8ca07533f379623e230f7cd9cecd00318619572f1e24 SHA512 96627055e6a970fbad2f8a3c8d6ad5b326e89fceab081187e012c3a363975bb3d2368320653093121ef132fa80e4c9576278e3d58aee4b5a4afc26aa88ecd5c7
 AUX file-5.43-portage-sandbox.patch 640 BLAKE2B d0442694866d6d0dfa203f686309de3f79a9f3047cbb20b8ea2d9042293c437cbd6b04f02a6c779df9b6331a7c9cee4fc460b2e4ed0c29563fce981f33d69ec3 SHA512 10a8d059a62d3d4f58a255c8204f9f72660babb16e76d9de9946cb1c91130e56c9733f1fcf30396c40bc9906055a123b47ea55d38a54f3473e8b2c69a2f91ef3
 AUX file-5.43-seccomp-fstatat64-musl.patch 565 BLAKE2B 31c42ae9857958e70dc459afc6c2cf1a297c0d29048908e54bd9ea5e15b85608a6fa76795d89716d3c5293a131e986fb83398f4a6eb560a72d794a448387fe2c SHA512 d53ed79b84a7b499c92b5d57ef4b482750a96dbeca904d480b44017e757fee8f404703485513d9da823c7aace7c1b51c64be4402afd6aca0ff9e4ece6ccfcb53
diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch
deleted file mode 100644
index 1880f6223c06..000000000000
--- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001
-From: tka <tka@kamph.org>
-Date: Wed, 24 Jun 2020 11:18:45 +0200
-Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
-
-Bug: https://bugs.gentoo.org/728978
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -229,6 +229,8 @@ enable_sandbox_full(void)
- 	ALLOW_RULE(write);
- 	ALLOW_RULE(writev);
- 
-+	// needed by Gentoo's portage sandbox
-+	ALLOW_RULE(getcwd);
- 
- #if 0
- 	// needed by valgrind
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
deleted file mode 100644
index 28a278e73f07..000000000000
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 15 Jun 2021 16:08:22 -0400
-Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
-
-sys/stat.h in musl does this:
-
-  #define fstatat64 fstatat
-
-Counteract this with an #undef.
-
-Bug: https://bugs.gentoo.org/789336
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -179,6 +179,7 @@ enable_sandbox_full(void)
- 	ALLOW_RULE(fstat);
-  	ALLOW_RULE(fstat64);
- #ifdef __NR_fstatat64
-+#undef fstatat64
- 	ALLOW_RULE(fstatat64);
- #endif
- 	ALLOW_RULE(futex);
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 96e1715927f3..d36d9e9bbc36 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,8 +1,6 @@
 AUX keyutils-1.5.10-disable-tests.patch 1214 BLAKE2B ac79e98a45b02575433e3604a04b1597a386b96f45d872f175dbd36d134d9aa5cf44f0dd4a3a4b9bea38c9986a85a9d60b45f7f4a7576d19a6a5c369bea1ce4c SHA512 dda49b7c3aeadcd7d4e52d304ecf60fedbb84d02a11d0a641dfa4d563c6f6fcc2c577b46eb688c159feaf0be32c0aff4470adec5d1c3bff544d5dcea47162cbe
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
-AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26b17bdc80621c4197c3f7a2e47c3cdb9fd703fe92adfb5da419775d4b4bb334ffe7fb57e26645a8fc201568f070b11cdd923 SHA512 f7d5423173c0e65080931653604d9179a9c6dbc4e22c7e62b67685d444e81b33a2a61d26906e47987521a61e28c199fe4ab4fc7f9ba8cacd2faf00bc443259c1
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
-AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
 EBUILD keyutils-1.6.3.ebuild 3829 BLAKE2B 9e84effa58eff23d8c863ec871e1e4f2053fe1a543885c4e7fca742862cbf34ce64d7e26a89bfd91fe225d0bb608ed506e8c967708c4fa05e492ce77c8b7aaae SHA512 8570f184f8bba99d6f24005907a0073dddb4c808ab5f3af848ba2d7c149e699d63b9c175113af9afdfacf9db7ad0758924aed4a876b6d4c3df915809d046cafa
diff --git a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
deleted file mode 100644
index e783ec699c34..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 16 Nov 2018 12:37:29 +0100
-Subject: [PATCH] fix regexp match against `file /proc/$$/exe` for -fPIE bash
-
-Now that bash is built with PIE enabled, keyutils' check for endianness
-fails because file no longer returns "executable", but instead returns
-"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
----
- tests/toolbox.inc.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index 0ce6db0..712c5bd 100644
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=LE
- else
--- 
-2.19.1
-
diff --git a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch
deleted file mode 100644
index f68d7d111a0c..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Hide
-
-> grep: /etc/rpm: No such file or directory
-> grep: /usr/lib/rpm: No such file or directory
-
-errors.
-
-Bug: https://bugs.gentoo.org/656446
-
---- keyutils-1.6.1/Makefile
-+++ keyutils-1.6.1/Makefile
-@@ -267,7 +267,7 @@
- ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
- 
- BUILDID	:= .local
--dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
-+dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
- release3:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
- release2:= $(subst %{?dist},$(dist),$(release3))
- release1:= $(subst %{?buildid},$(BUILDID),$(release2))
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 5f15d8f62dd1..840717a59868 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,6 +1,4 @@
 AUX plocate-1.1.15-meson-use-feature-option-for-libiouring.patch 1943 BLAKE2B cbcd583d93c3423c4cb8f13b3891ec34690ec1447c92f60291ec395437f11626aef82e669f470482c63232b9a7ebe73ed67cb7e0595a9f08b309f742c0d79d72 SHA512 110292358260f5fdf6f687b80c0375a91f224a190f6a25ec166c406cf4d39732493e0ebfea0fc02ccca18d95fdfcbff5d17d00cd10ac28c9a4ae46db8faf0ac9
-AUX plocate-1.1.16-error-to-fprintf-exit-musl.patch 10927 BLAKE2B a467330809ef59af57c37d584f6ccaf44da5e8ba0db38923f1d91bfdfc0061a9beab914e7527a7e532bdc0f4a2d9bb1f4438b63ade0a8947197dc233658663c9 SHA512 ad35e589f8efaa4998bc53b18c9bb7ffe201243640f86dbb39c7f43336ca068fc39cf357ebd1015cb57cdbbbf47f0ad81ddf7a757f17a9bd4ca1ea400bfef6ea
-AUX plocate-1.1.16-include-linux-stat_h-musl.patch 860 BLAKE2B e22e96480d95da40dc5b935b61e2482d17c4754672ed9a33b7f98f2fa01f494f8a5b7fcf3354ae7861a6ea744906b135adb1658220776a6ec029c1623da67009 SHA512 475599d66efd9a6ceba650232a9f3b4480a6af6ef15c5d7bb6f85bcf63bf1b770e4c69c53f8bc308347639fb1a6eee45b5ae03d535c3a1c818bbda4729d10302
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
diff --git a/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch b/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch
deleted file mode 100644
index 6d108501307f..000000000000
--- a/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-https://bugs.gentoo.org/829580
-https://git.sesse.net/?p=plocate;a=commit;h=fd6198891d6fd9642effc0843fef6f23b991af3e
-
-From fd6198891d6fd9642effc0843fef6f23b991af3e Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <steinar+git@gunderson.no>
-Date: Wed, 13 Jul 2022 22:31:54 +0200
-Subject: [PATCH 2/2] Remove dependency on non-POSIX header error.h.
-
-This helps compatibility with certain configurations of musl libc.
-Note that the output format on updatedb.conf errors will change somewhat,
-and only the first one will be reported followed by immediate exit
-(unlike earlier, where all updatedb.conf errors would be output before exit).
-
-Based on a patch by Alfred Persson Forsberg.
----
- conf.cpp | 178 +++++++++++++++++++++++++++++--------------------------
- 1 file changed, 94 insertions(+), 84 deletions(-)
-
-diff --git a/conf.cpp b/conf.cpp
-index 1055fd7..60dd93f 100644
---- a/conf.cpp
-+++ b/conf.cpp
-@@ -22,7 +22,6 @@ any later version.
- 
- #include "conf.h"
- 
--#include "error.h"
- #include "lib.h"
- 
- #include <algorithm>
-@@ -167,11 +166,6 @@ uc_lex(void)
- 		/* Fall through */
- 	case '\n':
- 		uc_current_line++;
--		if (uc_current_line == 0) {
--			error_at_line(0, 0, UPDATEDB_CONF, uc_current_line - 1,
--			              _("warning: Line number overflow"));
--			error_message_count--; /* Don't count as an error */
--		}
- 		return UCT_EOL;
- 
- 	case '=':
-@@ -180,10 +174,9 @@ uc_lex(void)
- 	case '"': {
- 		while ((c = getc_unlocked(uc_file)) != '"') {
- 			if (c == EOF || c == '\n') {
--				error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--				              _("missing closing `\"'"));
--				ungetc(c, uc_file);
--				break;
-+				fprintf(stderr, "%s:%u: missing closing `\"'\n",
-+					UPDATEDB_CONF, uc_line);
-+				exit(EXIT_FAILURE);
- 			}
- 			uc_lex_buf.push_back(c);
- 		}
-@@ -215,21 +208,18 @@ uc_lex(void)
- static void
- parse_updatedb_conf(void)
- {
--	int old_error_one_per_line;
--	unsigned old_error_message_count;
- 	bool had_prune_bind_mounts, had_prunefs, had_prunenames, had_prunepaths;
- 
- 	uc_file = fopen(UPDATEDB_CONF, "r");
- 	if (uc_file == NULL) {
--		if (errno != ENOENT)
--			error(EXIT_FAILURE, errno, _("can not open `%s'"), UPDATEDB_CONF);
--		goto err;
-+	        if (errno != ENOENT) {
-+		        perror(UPDATEDB_CONF);
-+			exit(EXIT_FAILURE);
-+	        }
-+		return;
- 	}
- 	flockfile(uc_file);
- 	uc_current_line = 1;
--	old_error_message_count = error_message_count;
--	old_error_one_per_line = error_one_per_line;
--	error_one_per_line = 1;
- 	had_prune_bind_mounts = false;
- 	had_prunefs = false;
- 	had_prunenames = false;
-@@ -263,40 +253,39 @@ parse_updatedb_conf(void)
- 			break;
- 
- 		case UCT_IDENTIFIER:
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("unknown variable `%s'"), uc_lex_buf.c_str());
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: unknown variable: `%s'\n",
-+				UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
-+			exit(EXIT_FAILURE);
- 
- 		default:
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("variable name expected"));
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: variable name expected\n",
-+				UPDATEDB_CONF, uc_line);
-+			exit(EXIT_FAILURE);
- 		}
- 		if (*had_var != false) {
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("variable `%s' was already defined"), uc_lex_buf.c_str());
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: variable `%s' was already defined\n",
-+				UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
-+			exit(EXIT_FAILURE);
- 		}
- 		*had_var = true;
- 		var_token = token;
- 		token = uc_lex();
- 		if (token != UCT_EQUAL) {
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("`=' expected after variable name"));
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: `=' expected after variable name\n",
-+				UPDATEDB_CONF, uc_line);
-+			exit(EXIT_FAILURE);
- 		}
- 		token = uc_lex();
- 		if (token != UCT_QUOTED) {
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("value in quotes expected after `='"));
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: value in quotes expected after `='\n",
-+				UPDATEDB_CONF, uc_line);
-+			exit(EXIT_FAILURE);
- 		}
- 		if (var_token == UCT_PRUNE_BIND_MOUNTS) {
- 			if (parse_bool(&conf_prune_bind_mounts, uc_lex_buf.c_str()) != 0) {
--				error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--				              _("invalid value `%s' of PRUNE_BIND_MOUNTS"),
--				              uc_lex_buf.c_str());
--				goto skip_to_eol;
-+				fprintf(stderr, "%s:%u: invalid value `%s' of PRUNE_BIND_MOUNTS\n",
-+					UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
-+				exit(EXIT_FAILURE);
- 			}
- 		} else if (var_token == UCT_PRUNEFS)
- 			var_add_values(&conf_prunefs, uc_lex_buf.c_str());
-@@ -308,12 +297,11 @@ parse_updatedb_conf(void)
- 			abort();
- 		token = uc_lex();
- 		if (token != UCT_EOL && token != UCT_EOF) {
--			error_at_line(0, 0, UPDATEDB_CONF, uc_line,
--			              _("unexpected data after variable value"));
--			goto skip_to_eol;
-+			fprintf(stderr, "%s:%u: unexpected data after variable value\n",
-+				UPDATEDB_CONF, uc_line);
-+			exit(EXIT_FAILURE);
- 		}
- 		/* Fall through */
--	skip_to_eol:
- 		while (token != UCT_EOL) {
- 			if (token == UCT_EOF)
- 				goto eof;
-@@ -321,14 +309,12 @@ parse_updatedb_conf(void)
- 		}
- 	}
- eof:
--	if (ferror(uc_file))
--		error(EXIT_FAILURE, 0, _("I/O error reading `%s'"), UPDATEDB_CONF);
--	error_one_per_line = old_error_one_per_line;
-+	if (ferror(uc_file)) {
-+		perror(UPDATEDB_CONF);
-+		exit(EXIT_FAILURE);
-+	}
- 	funlockfile(uc_file);
- 	fclose(uc_file);
--	if (error_message_count != old_error_message_count)
--		exit(EXIT_FAILURE);
--err:;
- }
- 
- /* Command-line argument parsing */
-@@ -384,8 +370,11 @@ prepend_cwd(const string &path)
- 	do
- 		buf.resize(buf.size() * 1.5);
- 	while ((res = getcwd(buf.data(), buf.size())) == NULL && errno == ERANGE);
--	if (res == NULL)
--		error(EXIT_FAILURE, errno, _("can not get current working directory"));
-+	if (res == NULL) {
-+	        fprintf(stderr, "%s: %s: can not get current working directory\n",
-+			program_invocation_name, strerror(errno));
-+	        exit(EXIT_FAILURE);
-+	}
- 	buf.resize(strlen(buf.data()));
- 	return buf + '/' + path;
- }
-@@ -438,54 +427,64 @@ parse_arguments(int argc, char *argv[])
- 			exit(EXIT_FAILURE);
- 
- 		case 'B':
--			if (got_prune_bind_mounts != false)
--				error(EXIT_FAILURE, 0,
--				      _("--%s would override earlier command-line argument"),
--				      "prune-bind-mounts");
-+		        if (got_prune_bind_mounts != false) {
-+				fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
-+				        program_invocation_name, "prune-bind-mounts");
-+				exit(EXIT_FAILURE);
-+			}
- 			got_prune_bind_mounts = true;
--			if (parse_bool(&conf_prune_bind_mounts, optarg) != 0)
--				error(EXIT_FAILURE, 0, _("invalid value `%s' of --%s"), optarg,
--				      "prune-bind-mounts");
-+			if (parse_bool(&conf_prune_bind_mounts, optarg) != 0) {
-+				fprintf(stderr, "%s: invalid value %s of --%s\n",
-+				        program_invocation_name, optarg, "prune-bind-mounts");
-+				exit(EXIT_FAILURE);
-+			}
- 			break;
- 
- 		case 'F':
--			if (prunefs_changed != false)
--				error(EXIT_FAILURE, 0,
--				      _("--%s would override earlier command-line argument"),
--				      "prunefs");
-+			if (prunefs_changed != false) {
-+				fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
-+				        program_invocation_name, "prunefs");
-+				exit(EXIT_FAILURE);
-+			}
- 			prunefs_changed = true;
- 			conf_prunefs.clear();
- 			var_add_values(&conf_prunefs, optarg);
- 			break;
- 
- 		case 'N':
--			if (prunenames_changed != false)
--				error(EXIT_FAILURE, 0,
--				      _("--%s would override earlier command-line argument"),
--				      "prunenames");
-+			if (prunenames_changed != false) {
-+				fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
-+                                        program_invocation_name, "prunenames");
-+                                exit(EXIT_FAILURE);
-+			}
- 			prunenames_changed = true;
- 			conf_prunenames.clear();
- 			var_add_values(&conf_prunenames, optarg);
- 			break;
- 
- 		case 'P':
--			if (prunepaths_changed != false)
--				error(EXIT_FAILURE, 0,
--				      _("--%s would override earlier command-line argument"),
--				      "prunepaths");
-+			if (prunepaths_changed != false) {
-+				fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
-+                                        program_invocation_name, "prunepaths");
-+                                exit(EXIT_FAILURE);
-+			}
- 			prunepaths_changed = true;
- 			conf_prunepaths.clear();
- 			var_add_values(&conf_prunepaths, optarg);
- 			break;
- 
- 		case 'U':
--			if (conf_scan_root != NULL)
--				error(EXIT_FAILURE, 0, _("--%s specified twice"),
--				      "database-root");
-+			if (conf_scan_root != NULL) {
-+				fprintf(stderr, "%s: --%s specified twice\n",
-+					program_invocation_name, "database-root");
-+				exit(EXIT_FAILURE);
-+			}
- 			conf_scan_root = realpath(optarg, nullptr);
--			if (conf_scan_root == NULL)
--				error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg,
--				      "database-root");
-+			if (conf_scan_root == NULL) {
-+				fprintf(stderr, "%s: %s: invalid value `%s' of --%s\n",
-+					program_invocation_name, strerror(errno), optarg, "database-root");
-+				exit(EXIT_FAILURE);
-+			}
- 			break;
- 
- 		case 'V':
-@@ -517,13 +516,18 @@ parse_arguments(int argc, char *argv[])
- 			exit(EXIT_SUCCESS);
- 
- 		case 'l':
--			if (got_visibility != false)
--				error(EXIT_FAILURE, 0, _("--%s specified twice"),
--				      "require-visibility");
-+			if (got_visibility != false) {
-+				fprintf(stderr, "%s: --%s specified twice\n",
-+                                        program_invocation_name, "require-visibility");
-+                                exit(EXIT_FAILURE);
-+			}
-+
- 			got_visibility = true;
--			if (parse_bool(&conf_check_visibility, optarg) != 0)
--				error(EXIT_FAILURE, 0, _("invalid value `%s' of --%s"), optarg,
--				      "require-visibility");
-+			if (parse_bool(&conf_check_visibility, optarg) != 0) {
-+				fprintf(stderr, "%s: invalid value `%s' of --%s",
-+					program_invocation_name, optarg, "require-visibility");
-+				exit(EXIT_FAILURE);
-+			}
- 			break;
- 
- 		case 'n':
-@@ -532,8 +536,11 @@ parse_arguments(int argc, char *argv[])
- 			break;
- 
- 		case 'o':
--			if (!conf_output.empty())
--				error(EXIT_FAILURE, 0, _("--%s specified twice"), "output");
-+			if (!conf_output.empty()) {
-+				fprintf(stderr, "%s: --%s specified twice",
-+					program_invocation_name, "output");
-+				exit(EXIT_FAILURE);
-+			}
- 			conf_output = optarg;
- 			break;
- 
-@@ -558,8 +565,11 @@ parse_arguments(int argc, char *argv[])
- 		}
- 	}
- options_done:
--	if (optind != argc)
--		error(EXIT_FAILURE, 0, _("unexpected operand on command line"));
-+	if (optind != argc) {
-+		fprintf(stderr, "%s: unexpected operand on command line",
-+			program_invocation_name);
-+		exit(EXIT_FAILURE);
-+	}
- 	if (conf_scan_root == NULL) {
- 		static char root[] = "/";
- 
--- 
-2.35.1
-
diff --git a/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch b/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch
deleted file mode 100644
index a4b9fe4d1bc6..000000000000
--- a/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.sesse.net/?p=plocate;a=commit;h=0125004cd28c5f9124632b594e51dde73af1691c
-https://git.alpinelinux.org/aports/tree/community/plocate/include-statx.patch
-https://bugs.gentoo.org/853769
-
-From 0125004cd28c5f9124632b594e51dde73af1691c Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <steinar+git@gunderson.no>
-Date: Sat, 25 Jun 2022 10:01:49 +0200
-Subject: [PATCH 1/2] Add a missing #include.
-
-Taken from the Alpine Linux packaging; seems to be for statx()
-(presumably on musl libc).
----
- io_uring_engine.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/io_uring_engine.h b/io_uring_engine.h
-index 688a6ae..bcb1058 100644
---- a/io_uring_engine.h
-+++ b/io_uring_engine.h
-@@ -7,6 +7,7 @@
- #include <string_view>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <linux/stat.h>
- 
- struct io_uring_sqe;
- #ifndef WITHOUT_URING
--- 
-2.35.1
-
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9e1eecc22439..3d57663a07cb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,5 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-3.0.38.1-xz-32-bit.patch 4263 BLAKE2B 83ee332acc8290a1e96eaafbfff7e42c6a686c4dc34e1fb2e1e935fe04cd98071d14299d76294e8d4178615ee9309985a7f508a7aaad0f9f0efaaeeb89301565 SHA512 6d75e5bdc463ffed264b4db5a953a7bb49971109ea88c4645d1c35dd2d5e8f0a4913a2fc20b858a91921734f6ff906293b14308e24bf591d86150e93af6bbcc8
-AUX portage-3.0.39-bash-5.2-patsub_replacement.patch 1881 BLAKE2B 2bb2d38a03aecf54c1b438954eaa4bf49e5102dc4e9ada17b394d0bc1bfbe1c4b5ab5e193c540e64699d422f80b8ca12b4a75cc31714cdfda40f3a54878a4316 SHA512 9792ee5bccb1dca2c33512a4725f4c951a296921070de5ec0048028ac0a36a0e59a7d4867a44057eda6dc353cfab3b5ecc27c1089d650069f526f80c7c417e71
-AUX portage-3.0.39-implicit-func-decls-no-fatal.patch 1262 BLAKE2B c1615106d4adc53193dcbf52e6cce926cd0fa3548d504974ace467b2ceb87179753bbc8bc954a10a13ea4fc381a2a008e26dfea6416f8945c6468eff315c0b29 SHA512 ebd4f3910ab94c0555bcc87135f37970e72d0b61912f9a7c7c09c525c4b619e729a1a88208ae4986ceda1f23a29acc4e60362eca76ba247c181eea4f5ebef8cc
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
diff --git a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch b/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
deleted file mode 100644
index 90c678998a05..000000000000
--- a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/gentoo/portage/commit/69cac73ba0a7bcf2e2cff88c60d389895a550623
-
-From 69cac73ba0a7bcf2e2cff88c60d389895a550623 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 30 Nov 2022 01:09:12 +0000
-Subject: [PATCH] ebuild.sh: disable patsub_replacement in Bash 5.2
-
-patsub_replacement is a new option in bash-5.2 that is also default-on
-in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
-hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
-and eclasses.
-
-Thanks to Kerin for both raising this & being persistent with trying
-to get Bash 5.2 to be suitable for use in Gentoo.
-
-Bug: https://bugs.gentoo.org/881383
-Thanks-to: Kerin Millar <kfm@plushkava.net>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/ebuild.sh
-+++ b/bin/ebuild.sh
-@@ -18,6 +18,7 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
- # used instead.
- __check_bash_version() {
- 	# Figure out which min version of bash we require.
-+	# Adjust patsub_replacement logic below on new EAPI!
- 	local maj min
- 	if ___eapi_bash_3_2 ; then
- 		maj=3 min=2
-@@ -50,6 +51,19 @@ __check_bash_version() {
- 	if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then
- 		shopt -s compat32
- 	fi
-+
-+	# patsub_replacement is a new option in bash-5.2 that is also default-on
-+	# in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
-+	# hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
-+	# and eclasses.
-+	#
-+	# New EAPI note: a newer EAPI (after 8) may well adopt Bash 5.2 as its minimum version.
-+	# If it does, this logic will need to be adjusted to only disable patsub_replacement
-+	# for < ${new_api}!
-+	if (( BASH_VERSINFO[0] >= 6 || ( BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 2 ) )) ; then
-+		shopt -u patsub_replacement
-+	fi
-+
- }
- __check_bash_version
- 
-
diff --git a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch b/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
deleted file mode 100644
index 4a4e68f2690a..000000000000
--- a/sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/gentoo/portage/commit/0fdbbbdb5a80e331adf701f2b2c1f096695447c4
-
-From 0fdbbbdb5a80e331adf701f2b2c1f096695447c4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 20 Nov 2022 23:32:08 +0000
-Subject: [PATCH] install-qa-check.d/90gcc-warnings: don't make implicit func
- decls fatal for now
-
-We need to do this at some point (as Clang 16 and GCC 14 are doing it, and
-they indicate runtime problems anyway), but there's too much breakage for now.
-
-We did find some extra bugs though. The main issue is too much high-profile
-stuff breaks rather than the total number of bugs, wrt Portage behaviour
-changing being suitable or not.
-
-Bug: https://bugs.gentoo.org/870412
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/install-qa-check.d/90gcc-warnings
-+++ b/bin/install-qa-check.d/90gcc-warnings
-@@ -153,9 +153,10 @@ gcc_warn_check() {
- 			#	always_overflow=yes
- 			#fi
- 
--			if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then
--				implicit_func_decl=yes
--			fi
-+			# Disabled for now because too many failures. bug #870412.
-+			#if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then
-+			#	implicit_func_decl=yes
-+			#fi
- 
- 			if [[ ${always_overflow} = yes || ${implicit_func_decl} = yes ]] ; then
- 				eerror
-
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1bbe3bab50d9..e02c4f702e11 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,4 @@
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
-AUX 251-meson-0.64.patch 919 BLAKE2B e9eb5f82235f60f18658e4a6a3bc262525cb3152f8b6953b38683c51d439ebebe215dc4b71935e4059e17d82a07bc9e0ffd1354453d5c6977c927d0ba8f52646 SHA512 2d331194071c6cd0c1e8cf3c50de71b3a06b65ec7cf03f0ced15f2d060dd1b0b252efd59604bc871a8b3bb60794cdafecd9ab01ca17f73d854fce77528cf3f4a
-AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
diff --git a/sys-apps/systemd/files/251-meson-0.64.patch b/sys-apps/systemd/files/251-meson-0.64.patch
deleted file mode 100644
index 6cc200bbd87d..000000000000
--- a/sys-apps/systemd/files/251-meson-0.64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001
-From: Jan Janssen <medhefgo@web.de>
-Date: Sun, 9 Oct 2022 17:16:12 +0200
-Subject: [PATCH] meson: Fix build with --optimization=plain
-
-Note that -O0 is deliberately filtered out as we have to compile with at
-least -O1 due to #24202.
-
-Fixes: #24323
----
- src/boot/efi/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
-index e0cd4ebad993..395386d3eda7 100644
---- a/src/boot/efi/meson.build
-+++ b/src/boot/efi/meson.build
-@@ -223,7 +223,7 @@ endif
- if get_option('debug') and get_option('mode') == 'developer'
-         efi_cflags += ['-ggdb', '-DEFI_DEBUG']
- endif
--if get_option('optimization') != '0'
-+if get_option('optimization') in ['1', '2', '3', 's', 'g']
-         efi_cflags += ['-O' + get_option('optimization')]
- endif
- if get_option('b_ndebug') == 'true' or (
diff --git a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
deleted file mode 100644
index bbe45f85dcf2..000000000000
--- a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Tue, 24 May 2022 23:21:50 +0100
-Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using
- __builtin_dynamic_object_size."
-
-Breaks Clang (even without F_S=3).
-
-This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64.
-
-Bug: https://bugs.gentoo.org/841770
-Bug: https://github.com/systemd/systemd/issues/23150
---- a/src/basic/alloc-util.h
-+++ b/src/basic/alloc-util.h
-@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
-  * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the
-  * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of
-  * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by
-- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated
-- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801).
-- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
-+ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the
-+ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory,
-+ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
-  * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner
-  * case. */
--
--#if defined __has_builtin
--#  if __has_builtin(__builtin_dynamic_object_size)
--#    define MALLOC_SIZEOF_SAFE(x) \
--        MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0))
--#  endif
--#endif
--
--#ifndef MALLOC_SIZEOF_SAFE
- #define MALLOC_SIZEOF_SAFE(x) \
-         MIN(malloc_usable_size(x), __builtin_object_size(x, 0))
--#endif
- 
- /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items
-  * that fit into the specified memory block */