gentoo auto-resync : 14:08:2023 - 12:12:48

17 files changed, 9 insertions, 407 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0f78d5c44856..50eacf8012a5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 3de25475d280..d921c91bffa1 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,24 +1,13 @@
 AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
-AUX ltrace-0.7.3-disable-munmap-test.patch 629 BLAKE2B 52b8f22ea7f59642899dd39a7967c96aa32a7576afd28f332613c1fecafa224b0284fd028dd1e3e38dabe13f30abda7fef4db1a0c7dd1027d922967d3b170a94 SHA512 55d7b318b64100d6712fa7e3c89fe000d1bd1c743384cdf7d1cc7e32aba5763138bb444d5cb6df368b339c2211ad7c10eb41cefcdd4ccbd5c308d11e23c4d8ef
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-musl-host.patch 313 BLAKE2B 3ff936391668b118db37aabcf197081b85ed1ac67759a275ae3d18b398fb7af96ec74475f1c50d1dfa22153c459c079fe95789826b8c4eaecb6c38575f7be8aa SHA512 4aa92f406a45aa10cf8b456fd4eb1421d74c682040c71a6819f9caea60dd275cd268a42d0c656e68d7cda70b152bc4e83bc70461c5ac0732d09b70abc77f0ed8
-AUX ltrace-0.7.3-no-REG_NOERROR.patch 1367 BLAKE2B a321d9f621a3b919382bff3e42cfdd5f172780acdfb4f2ee4bde15d3f265641bb16aea41cc5c25562d7b64d69c5cae94a5d6500e64cf38c008db5ec80295280a SHA512 c22055e97bc7dfe5af150093e024fd1557751cb7181abcafb38fceb87d83cda5002a20bae39178ccdfaa9aa6f07fbd88d38104b79c9270109ce5ea667a43f684
-AUX ltrace-0.7.3-no-error.h-2.patch 1676 BLAKE2B 55451613cb1a5e37503dcfe38ac5535c79525c64bcb1c91f4cadff9958416a23bbde57c379c2c3df67363af6a1c444c98a14ecd4d6d5f593b1105894677c9c78 SHA512 570b8bbe2b86f12898841da9f24d7d8ef2389f657cde2faebb820348011f128732a6491a746de5ea93aa6fea88cdd4a8eff0702373e9d5d7305277304011d000
-AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0a027bee2ed6a25e104c407e7c4372cbb2b0774c6feb3e7691f3b8f1b194d0e2377d0e9244564c2edb6d143574952c1 SHA512 193fc57ef6df54c39a099db7991237dbd2bcb1454fd5b889074c54e005fc50175f5702e118b25a3c4d09bb2d1e03ce38734798ce0143cd3b7293383b93775e2d
-AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
-AUX ltrace-0.7.3-test-glibc-2.33.patch 569 BLAKE2B 43bacf629135268f4495d98cbb394b9811e30b907f48de343bb52ec2f0322958c5da50d0626ffe16f58da389e6bd92a4e6d6f3eee035ae906c208b36c31d65ba SHA512 8812f808db5f7213ec3547ac9cef79374d1e5a2589fcb99bc5e3aa7cc717909457321b4fdb60e933070d1d50c3900e3282ba825f15d1943e4e1aba3676c1bf98
-AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
-AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 AUX ltrace-0.7.91-debian-patchset-6.4.patch 1868 BLAKE2B 6d3a8565c8dba4b4d73f9df2b0fd9c85971477ddc6e549310476ad7a81c050328fb51104f8801cbc1ca6b458a41cd14113faf9ccf219db2fffd195619d0a3bf2 SHA512 5ba893f3295b11193a56d49bab5c874350f42e58ed8ecc397c33e2f51947609a607cb84e06d8ff8f38392815afbd75f567ab6366ffded93345477bec8e92ae10
 AUX ltrace-0.7.91-pid_t.patch 182 BLAKE2B 0425953956211429741d7a2f1527e8614428af250f12d0a93687000b54ab58b7ced0bc3cd278f0f64ecef6cd20dc1c87625ebfc033f518f2571ca450205409dc SHA512 93207907df8300aa5e396d1fa2bfd35993e4e5c5308a0ba1a2fcdc95cae7c817df9d67a108e3c392a2b13152ea3b73dd721f61bad99203f04b016d6d939fb508
 AUX ltrace-0.7.91-test-glibc-2.33.patch 351 BLAKE2B 8daacf679828735a37ec062ce775b6087de363a447bb35d25e20e51d256a30b80f3bdc87867c0752ad0e5011eb625fc0b0c54998cd7c0ddc4cde6be33a35f138 SHA512 b689072e5d7a098aff5dcc0a424e69c48a859514fefc459144c24d0ddd7ee800c82766d0fac741e75de1691dd874369db7a44db676e60f2176426115c0e21a04
 AUX ltrace-0.7.91-tuple-tests.patch 431 BLAKE2B 452e19ff22cd4453e73f1652777ffd998c3af1bb510815c5867a38b53cc25924a02aa055bb335491b0292c430749db6febca79222d1669a3f416ff1dcde4c715 SHA512 6ec368bc19f870322e21d05a409b29aa1064c8c901c98d4281a35513149bc6104282bb4b655506fdd22dd305edb10d438416e2f42bf65cd59748c17ce5a386d9
 DIST ltrace-0.7.91_pre20221216.tar.bz2 288077 BLAKE2B cadc2ac551a96dfa95aee0d0eb251d8f41a8631350ba3be3f67d0cb10774a3db6abbd42481d24febdfcb0d565107e66b4de0056a85a7954bb050adb8e8fa5b4a SHA512 993c247797551b4fbb202c04f9af08063c8641946825b17d1f32c4647c606ece803a6b049c4afa3046c798add161ab58f01d90106f3b6029a223af03bca27a99
-DIST ltrace_0.7.3-6.1.debian.tar.xz 11404 BLAKE2B d38ce51dfcbf809d7622029fb6dd0acd61c8d8213be0bf2625fd746adbe6dd6830faf208b7e864c1185013d7d5e17f3e10e8a8fb45f8e0a4bc9859fde96a55d7 SHA512 c0753935d74be530886ce5202429cabbbe73814c9ac120eaf90a1c4e03dfd4de5381e3e85a27fbbbce694b23cd72a273199575419446b6159b0925d85e1938ab
-DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3.6.1.ebuild 2350 BLAKE2B 0e75d0d6edaafef759a5423be9b25034e2d1366b4099f4287614b6795769482c1bea385123ea70ca53a6df921f4af090ab4eb748bfb605ee545e633fdd96b587 SHA512 57f7164f8c89d7bd9434b2c355f88e4deccade43efeb944f24c528ef9a1d2d38350b64cafbd07bff6a61f282b7909cc54812127680c452db48c08d9fbeab2f74
 EBUILD ltrace-0.7.91_pre20221216-r1.ebuild 1732 BLAKE2B c2e269992dfcf884cc6e33bb57ed5d27306a47acc26fd6571e636ec57b7065098b4893b80b2db5f54dfd95ec144af7dbac30633d4526d6b3f5c7443701d7db78 SHA512 da7171184bc83400235315401bfffc7ca9cf88f13ba9086788121cd1e1fc92f1cd9ce05f4ddf096703135ee722220b8800e963f12f38a974754f8d311a10bb18
 MISC metadata.xml 538 BLAKE2B afe59cab726a943553596e4832fd64b5a2ddec40779d38af87261b89662fed5fc0a80e92d40ecc09434c362c72d93381a57ca19f8315ce311aba78c70ac7bb4f SHA512 8c11169bbbef21e4ffce5f911048f754714d96af30c64b7a5cd8e44606a616cc2259812185bd6c03cecd0ecda0375f987ecac8edcf9238130882255354f3de86
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch b/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
deleted file mode 100644
index fdd7412efeda..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/testsuite/ltrace.main/system_calls.exp
-+++ b/testsuite/ltrace.main/system_calls.exp
-@@ -29,8 +29,10 @@ if [regexp {ELF from incompatible architecture} $exec_output] {
- }
- 
- 
--set pattern "SYS_munmap"
--ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
-+## disabled in Gentoo: libc's stdio tends to call (or not to call) munmap
-+## depending on heuristics of stdio buffer sizes.
-+##set pattern "SYS_munmap"
-+##ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
- set pattern "SYS_write"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
- set pattern "SYS_unlink"
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
deleted file mode 100644
index 7fc8b60aa48a..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b6c5c8c51f954cfbe76424fd57c33a87166f0545 Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:23:39 +0100
-Subject: [PATCH] Avoid using REG_NOERROR
-
-Not all systems define this (IRIX 6.5 doesn't).  Comparing to 0 is not
-terribly less readable, so do that instead.
----
- glob.c    | 4 ++--
- options.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glob.c b/glob.c
-index 9af633f..b26637f 100644
---- a/glob.c
-+++ b/glob.c
-@@ -180,7 +180,7 @@ glob_to_regex(const char *glob, char **retp)
- 			goto fail;
- 	}
- 	*retp = buf;
--	return REG_NOERROR;
-+	return 0;
- }
- 
- int
-@@ -188,7 +188,7 @@ globcomp(regex_t *preg, const char *glob, int cflags)
- {
- 	char *regex = NULL;
- 	int status = glob_to_regex(glob, &regex);
--	if (status != REG_NOERROR)
-+	if (status != 0)
- 		return status;
- 	assert(regex != NULL);
- 	status = regcomp(preg, regex, cflags);
-diff --git a/options.c b/options.c
-index e8fd2a2..4c7441e 100644
---- a/options.c
-+++ b/options.c
-@@ -204,7 +204,7 @@ compile_libname(const char *expr, const char *a_lib, int lib_re_p,
- 
- 		regex_t lib_re;
- 		int status = (lib_re_p ? regcomp : globcomp)(&lib_re, lib, 0);
--		if (status != REG_NOERROR) {
-+		if (status != 0) {
- 			char buf[100];
- 			regerror(status, &lib_re, buf, sizeof buf);
- 			fprintf(stderr, "Rule near '%s' will be ignored: %s.\n",
--- 
-2.25.2
-
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
deleted file mode 100644
index 6b798b274909..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1233b37167097dffa9a78bd7bd0a8117c75fe8ff Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:13:29 +0100
-Subject: [PATCH] expr_node_zero and expr_self should be stack-allocated
-
----
- expr.c | 14 ++++++--------
- zero.c | 14 ++++++--------
- 2 files changed, 12 insertions(+), 16 deletions(-)
-
---- a/expr.c
-+++ b/expr.c
-@@ -21,7 +21,6 @@
- #include <string.h>
- #include <assert.h>
- #include <errno.h>
--#include <error.h>
- #include <stdlib.h>
- 
- #include "expr.h"
-@@ -327,12 +326,11 @@ expr_eval_constant(struct expr_node *node, long *valuep)
- struct expr_node *
- expr_self(void)
- {
--	static struct expr_node *node = NULL;
--	if (node == NULL) {
--		node = malloc(sizeof(*node));
--		if (node == NULL)
--			error(1, errno, "malloc expr_self");
--		expr_init_self(node);
-+	static struct expr_node *nodep = NULL;
-+	if (nodep == NULL) {
-+		static struct expr_node node;
-+		expr_init_self(&node);
-+		nodep = &node;
- 	}
--	return node;
-+	return nodep;
- }
---- a/zero.c
-+++ b/zero.c
-@@ -18,7 +18,6 @@
-  * 02110-1301 USA
-  */
- 
--#include <error.h>
- #include <errno.h>
- 
- #include "zero.h"
-@@ -93,13 +92,12 @@ build_zero_w_arg(struct expr_node *expr, int own)
- struct expr_node *
- expr_node_zero(void)
- {
--	static struct expr_node *node = NULL;
--	if (node == NULL) {
--		node = malloc(sizeof(*node));
--		if (node == NULL)
--			error(1, errno, "malloc expr_node_zero");
--		expr_init_cb1(node, &zero1_callback,
-+	static struct expr_node *nodep = NULL;
-+	if (nodep == NULL) {
-+		static struct expr_node node;
-+		expr_init_cb1(&node, &zero1_callback,
- 			      expr_self(), 0, (void *)-1);
-+		nodep = &node;
- 	}
--	return node;
-+	return nodep;
- }
--- 
-2.25.2
-
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
deleted file mode 100644
index 56aea7a54d4d..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 86a7b48310e0fd551f7f3d88ea9ad39c1a2807c6 Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Sat, 8 Dec 2012 03:33:47 +0100
-Subject: [PATCH] Avoid using non-portable error.h in generic code
-
----
- read_config_file.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/read_config_file.c
-+++ b/read_config_file.c
-@@ -27,7 +27,6 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <error.h>
- #include <assert.h>
- 
- #include "common.h"
-@@ -1258,8 +1257,11 @@ void
- init_global_config(void)
- {
- 	struct arg_type_info *info = malloc(2 * sizeof(*info));
--	if (info == NULL)
--		error(1, errno, "malloc in init_global_config");
-+	if (info == NULL) {
-+		fprintf(stderr, "Couldn't init global config: %s\n",
-+			strerror(errno));
-+		exit(1);
-+	}
- 
- 	memset(info, 0, 2 * sizeof(*info));
- 	info[0].type = ARGTYPE_POINTER;
--- 
-2.25.2
-
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
deleted file mode 100644
index b54a5bf3a00c..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/proc.h
-+++ b/proc.h
-@@ -26,6 +26,7 @@
- #include "config.h"
- 
- #include <sys/time.h>
-+#include <unistd.h> /* pid_t */
- 
- #if defined(HAVE_LIBUNWIND)
- # include <libunwind.h>
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
deleted file mode 100644
index 0b8592d82a1f..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/testsuite/ltrace.main/system_calls.exp
-+++ b/testsuite/ltrace.main/system_calls.exp
-@@ -55,7 +55,7 @@ set pattern "SYS_symlink"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
- set pattern "SYS_unlink"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
--set pattern "SYS_(new)?stat"
-+set pattern "SYS_(new)?stat|SYS_fstatat64|SYS_newfstatat"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1 egrep
- set pattern "SYS_access"
- ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
deleted file mode 100644
index caafff4b2637..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://bugs.gentoo.org/421649
-
-For some reason testsuite does not handle warnings well:
-  /tmp/lt-cZI2cFo0z7.c:2:24: warning: inplicit function declaration «puts» [-Wimplicit-function-declaration]
-       void func2(void) { puts("func2"); }
-                          ^
-and abandons problematic tests:
-  Testcase compile failed, so all tests in this file will automatically fail.
-diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp
-index 988346f..f7f4140 100644
---- a/testsuite/ltrace.main/filters.exp
-+++ b/testsuite/ltrace.main/filters.exp
-@@ -24,2 +24,3 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c {
- set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c {
-+    #include <stdio.h>
-     void func2(void) { puts("func2"); }
-diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
-index ff24a38..9569dbe 100644
---- a/testsuite/ltrace.main/parameters.c
-+++ b/testsuite/ltrace.main/parameters.c
-@@ -19,2 +19,3 @@ void func_strfixed(char*);
- void func_ppp(int***);
-+void func_string(char*);
- void func_stringp(char**);
-diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c
-index a02e795..fda4ab9 100644
---- a/testsuite/ltrace.main/signals.c
-+++ b/testsuite/ltrace.main/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c
-index a66b838..7d5e5e3 100644
---- a/testsuite/ltrace.minor/time-record.c
-+++ b/testsuite/ltrace.minor/time-record.c
-@@ -7,2 +7,3 @@
- #include <time.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c
-index db1936d..c68b128 100644
---- a/testsuite/ltrace.minor/trace-clone.c
-+++ b/testsuite/ltrace.minor/trace-clone.c
-@@ -10,2 +10,3 @@
- #include <sched.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c
-index c5f0c71..e1ab17f 100644
---- a/testsuite/ltrace.minor/trace-fork.c
-+++ b/testsuite/ltrace.minor/trace-fork.c
-@@ -8,2 +8,4 @@
- #include <sys/types.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
- 
-@@ -29,3 +31,4 @@ main ()
-       printf("My child pid is %d\n",pid);
--      wait(); 
-+      int status;
-+      wait(&status);
-     }
-diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c
-index b786c81..86e2dba 100644
---- a/testsuite/ltrace.torture/signals.c
-+++ b/testsuite/ltrace.torture/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
deleted file mode 100644
index 9abeb28b4883..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use $CC instead of gcc in testsuite.
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -39,6 +39,8 @@ env.exp: Makefile
- 	rm -f env.exp
- 	echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
- 	echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
-+	echo set CC_FOR_TARGET '"$(CC)"' >> $@
-+	echo set CXX_FOR_TARGET '"$(CXX)"' >> $@
- 
- CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp
- 
diff --git a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild b/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
deleted file mode 100644
index abc626186b4c..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-LTRACE_V=$(ver_cut 1-3)
-DB_V=$(ver_cut 4-)
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://gitlab.com/cespedes/ltrace"
-SRC_URI="
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="virtual/libelf:=
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind:= )"
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs
-	test? ( dev-util/dejagnu )"
-
-# Effectively abandoned upstream. Extremely sensitive to the sandbox, versions
-# of core libraries, kernel security settings...
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${LTRACE_V}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
-	"${FILESDIR}"/${PN}-0.7.3-musl-host.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-error.h.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-error.h-2.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-no-REG_NOERROR.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
-	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
-	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
-	"${FILESDIR}"/${PN}-0.7.3-test-glibc-2.33.patch
-	"${FILESDIR}"/${PN}-0.7.3-disable-munmap-test.patch
-)
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/[0-9]*
-
-	default
-
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
-
-src_test() {
-	# On kernels with Yama enabled this will not run, even without sandbox,
-	# unless /proc/sys/kernel/yama/ptrace_scope == 0. Just don't bother.
-	# Note: we only delete it here in order to avoid Makefile.am patching.
-	rm -f testsuite/ltrace.minor/attach-process.exp
-	# sandbox redirects vfork() to fork(): bug # 774054
-	# Let's avoid sandbox entirely.
-	SANDBOX_ON=0 LD_PRELOAD= emake check
-}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 98f734d616e7..ceb6b9c1c0bf 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,7 +4,7 @@ DIST cuda_12.1.1_530.30.02_linux.run 4317456991 BLAKE2B 562865cc63202906d0a5c251
 DIST cuda_12.2.0_535.54.03_linux.run 4315928767 BLAKE2B 99eb9e0fc81e65809cfcf7937f21ef0ec96c9f049cc988c936a5ee1e3d1f99131a97e1b71e3f4e38732cb309440d0fe96b933a0b9534874f790a31d27bd52809 SHA512 151827e0c1e9400597837c49dc07cf85bebb1c492306bf231b4a1ee00b48433f4ff3da24ed6235d70304fd6f5ee389bb43debbdf69958ef221deb7df0d7d7dae
 DIST cuda_12.2.1_535.86.10_linux.run 4332490379 BLAKE2B 73686e68cffce2bee5b48f0a15abfec5adba52c7070a9f02190d4030fd4afd38de91157f617fa8e3f25e4be0524cb5668f3b1c82e24709966825a04a498265e9 SHA512 f6446dd1cbebffef1581cd72025b69007eb47083e8d340256e48d092c6dc539d062078ede9ad07d78f27df860db2250c1f5a1a494bd448aac138725564749ac3
 EBUILD nvidia-cuda-toolkit-11.8.0-r4.ebuild 7972 BLAKE2B fbe811911b5b646f9a3ddb2bcd483f8ecdeb3f185e5d56ad1b4378276d3047d343efb20ac8f4fa186524254dc1917941161004811c131b17e90decaf31999b93 SHA512 a3f4511631efaaecbdf7489d04b4b8674db24ff6bf7ba61027dfb663da1eacd1db7f2bd2e21cb6b433f82f27f4f8900a9341d12371115c3e6d9f7ebcbd325fb2
-EBUILD nvidia-cuda-toolkit-12.1.1-r1.ebuild 9297 BLAKE2B fc99b6813203a0d38f887fd635be9e4bd948a8a07b83f03f99800bf0cc3d1f08c592e0ff8abfd710ae8bfd8001df7df1f3acbf86a963d29c7589842a751fc199 SHA512 c0d818d14eb9158fec6b0a8a5d4fb72180f4170727dc519f7cd179385d6963f2a0b23cf3ecb83035de8b6c37ecf4572c6468328bddbf3c4f2f98d3f6e4760d72
-EBUILD nvidia-cuda-toolkit-12.2.0.ebuild 9297 BLAKE2B 81a68b23744842792d3be7ef449686298f80465b21f5bfb8b1d010e42532f35da7229760cecfb78af9cfdb04b0c4dff5750754bac92c53963594c0977c733160 SHA512 dae8626bf12cdf0c109585046d80fb51786e743b45bdf92667c5ba2306fa371f80f7a42c40ff8d642c803cf1e5d0ea9725bfb9f7064a3ca7123cce84cf354917
-EBUILD nvidia-cuda-toolkit-12.2.1.ebuild 9297 BLAKE2B 1921bde46169194d0650abc20f1c574fda85cefd38e1fe332453decf4754e1cdacd5d396c2054ee091469ecf4643a51e83a6d5d50aa65c1b4b5d362bdf4a0017 SHA512 7003a010730ee62ac5a7c511b3f16e6928e74e82c0363434ee16e985bacb2359016fc66bf11776415625b7414708ef145c238eceda5202c21de2fb59a988b081
+EBUILD nvidia-cuda-toolkit-12.1.1-r1.ebuild 9295 BLAKE2B 45dd76de691d436c14556e4e50b20d38761d7ccb3ea6d3828ef2379d39b2a2613ce619c027202a6d839364c2d34b1eeec6d011513dafad0bcc1c7b484baa88e1 SHA512 1f2f7220b75c6b46256fe7e62f13768e906355a717aa2574f5e981e028c1560dc86df4b900e6b782a161888576389e2d512081d564921268f01b4ba9e89a2f35
+EBUILD nvidia-cuda-toolkit-12.2.0.ebuild 9295 BLAKE2B 6c39edf9f4fcf25e4b06196987c70ab3336fbede87b89f1056f97700560f8f25bc7c24f2e053538401aa4f2ef66d90b407daba17c732b7a64b07b213fb528777 SHA512 36215e6975e7111ad3baf0eff999be24b01a9080919278119f2440307fbb282ea3e4994602714214b459127770c4a652215644f7554ebfd7400725a4a0133739
+EBUILD nvidia-cuda-toolkit-12.2.1.ebuild 9295 BLAKE2B 50908b122472a3f93e1cbb7eada789719dfbf230aa535a822300f587b418da2c7e128046b017ccc7d311b4ecfc496eefac95d6df02d1346bd5cbbef5ec44fd93 SHA512 89f2e69adcc70b2049c39ac9f124729526088f30a346c22cce7d27d982582c589e27371068a34c59d3f0f169bc555519784532653c4ba9b968ab9ac711d777e4
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
index 89752e0c6d16..039bae19520e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
@@ -257,8 +257,8 @@ src_install() {
 	fi
 
 	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${ecudadir}/include
-	dosym targets/x86_64-linux/lib ${ecudadir}/lib64
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
 
 	# Remove bad symlinks
 	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild
index 56e08afe36fc..f1281e52c3d6 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild
@@ -257,8 +257,8 @@ src_install() {
 	fi
 
 	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${ecudadir}/include
-	dosym targets/x86_64-linux/lib ${ecudadir}/lib64
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
 
 	# Remove bad symlinks
 	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild
index 5f9a12343567..10250e337e5c 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild
@@ -257,8 +257,8 @@ src_install() {
 	fi
 
 	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${ecudadir}/include
-	dosym targets/x86_64-linux/lib ${ecudadir}/lib64
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
 
 	# Remove bad symlinks
 	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 19af9a563c98..85ac881b9788 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-headers-2023.02.06.tar.gz 66125 BLAKE2B 75018fab7e530c955b4a61dc40626751894cf9c471234f0d1d5346d1eb38d00b13df5f87cbd2af59bfa17d014bb20f9ed13727fb660bc79b3728c075b7b1c613 SHA512 41730e80b267de45db9d7a3bcf9e0f29bfc86b25475a86d50180a7258e1240fc8c8f2ad3e222b03b3ef50c10ef63fb5b1647c056fec615e87965aa3196e8ac60
 DIST opencl-headers-2023.04.17.tar.gz 73963 BLAKE2B 93b792559bb9dca0a2b62a113dd91f81297f86aabd1ca613f3770f02ff70b77276f02d13e0b8eb203495f520005fdd66da37e00fb49a2322f65b86671bb13271 SHA512 55945cdbd79b8a70b074dd09dd9cb6a560c454ce98c16341c75ac197cc85e57314f0e8fafd25aa51d4c4b4f7f8cf401a144d52aebfc8893bbbd1f28ec2850625
-EBUILD opencl-headers-2023.02.06.ebuild 616 BLAKE2B 357a31bfbeca35b3a4900345fa617ef7f8d38b254eb0f20a9e36e51ac773df6eec09f5950a89d6762b0b444096c43bd025c7aebf8c37cd94b0671c54e8737d6b SHA512 ffa2378293a4ba70da1a9edc30fe1da4f7b9543d3c385c7d8b8a5985592dbdbfbedddc98a406e34a98cc02111266835331bc60ccf37065ac6636ea4375c898df
 EBUILD opencl-headers-2023.04.17.ebuild 616 BLAKE2B 357a31bfbeca35b3a4900345fa617ef7f8d38b254eb0f20a9e36e51ac773df6eec09f5950a89d6762b0b444096c43bd025c7aebf8c37cd94b0671c54e8737d6b SHA512 ffa2378293a4ba70da1a9edc30fe1da4f7b9543d3c385c7d8b8a5985592dbdbfbedddc98a406e34a98cc02111266835331bc60ccf37065ac6636ea4375c898df
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild b/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild
deleted file mode 100644
index 6790780253a5..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}