gentoo auto-resync : 26:01:2025 - 06:49:21

18 files changed, 30 insertions, 492 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c82d5322fe07..65f2854e3251 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index b2e844ac7447..d23cec3aff18 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -5,5 +5,5 @@ DIST gnutls-3.8.7.1.tar.xz.sig 580 BLAKE2B ca627d7b3f089205c94f556bee9c06428ada9
 DIST gnutls-3.8.8.tar.xz 6696460 BLAKE2B d1498b0b9f14789599fd5b984d5370b632611f2702e9f4fc504ddba2a3e0dd4137bec858eb6150d031f9f50e6b3a3a7d905864f0a9f50a1f01e5ea8f37a44ba8 SHA512 4f617c63e8e8392e400d72c9e39989fcd782268b4a4c4e36bbfb0444a4b5bcb0f53054f04a6dce99ab89c0f38f57430c95aaaec6eb9209b8e9329140abf230c3
 DIST gnutls-3.8.8.tar.xz.sig 580 BLAKE2B 11a30f09e3a478615df2c6a0e40c0b9b2aad5794a82ae0cc871fcf3699b5d9725c9d04708c6f0b983da6e21f90a81f7550e723d0d04f97d1a16d526efbe91b1e SHA512 fdff792511e9e5de203a1dfd66bf521c12fb74a19de651ffa1f7359dafdd1dad59ae57d0f95fa363c4167f798e6b624b4ae1f84d4e0737ff690c2fb0e5a5bdce
 EBUILD gnutls-3.8.7.1-r1.ebuild 5191 BLAKE2B a4081e3d31b9931ceee1f1eb700cbc7924745374aa716d4d49c3aafd8e933f39b75a5740fe7ec3be56c00cb57663bb2a6a0306417e3ddc4bf83a502d8234fe62 SHA512 35b489e084a74fac97ebd9ae54d025845578e5ad24b72f60e26b7aa2e29fd44a2ebf47b454b877a0d538dc32e09fb0b134750e9912fadb81c566ec59b35d130d
-EBUILD gnutls-3.8.8.ebuild 5087 BLAKE2B 8c93462644b1bc01b4a8084f7413e6647ad33929fcb31286a574357db939ac65f6e72cc2dc91242ae787d8facfc62dbfa8e8a3d9ebc8159cf71a0a27de1687a6 SHA512 aaff1ebbe050cf0a959548f5ceaffb0ba86627bcf322d0fe4f1c6376b459c75378e6e6653bf91f9b7e7e93b31d852fa8b3e780370d89b09033d170dd2ce88033
+EBUILD gnutls-3.8.8.ebuild 5086 BLAKE2B 16b51653889c4afe6d05f5f23f854c4f8ddc25bec7d09d003aedad5b2fc7ed22f397ec161bf1cd2cd24774fb898d25ad5fb296ffbe7f9b6bf07f804d0179e9fc SHA512 3772d84e310ca06036d8bf2e80cac6f8c196bb70ee55feaa796445da55bd3d858f869534712267507d12e79c3391cf61751d6cc2482b373e21e4809b2523ace1
 MISC metadata.xml 1181 BLAKE2B 9902770b982d606070b2e34452bd732385f9abdca7ffc89b1a3bcfce9ab471fbd35f87c7fd3aeb610046e50eec13f64ee80d1093f3f9853ec8ecf35521129766 SHA512 b910b2087b83e2dafe3093be4b0d942e2f728b62aa4b3cd8101f681d51752f84b961c8524896cd13d853b96eb5f62f74b7d30edbe84fa42a260eac9e263efcf8
diff --git a/net-libs/gnutls/gnutls-3.8.8.ebuild b/net-libs/gnutls/gnutls-3.8.8.ebuild
index a80a2157ee2c..4fb2c9156071 100644
--- a/net-libs/gnutls/gnutls-3.8.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.8.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ccfdc6b03a42..4a2bdf9baa83 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,4 @@
-AUX libssh-0.10.6-ipv6-hostname-parsing.patch 5095 BLAKE2B d231effe7a624f3d42ccae9ae2f8db5d567da3ff4c32f18ad217b11a19f9fa919b6feb42aeb82b8f9b15063ac252db44d79efe27e056f533d1eebdfe9b3d4b8e SHA512 8612f8c9f90e480e8ce4657ba6a150a09ad080c2ed8d4f4a1902fd57b4008d68edaaa31dd3cfb423f2619f580ec0c8b6cd711a91ad6c161f207c8e719200f385
-AUX libssh-0.10.6-libgcrypt-type-mismatches.patch 2544 BLAKE2B 14999447e240fa7a2a5e09d04a09f7a95049482eec3aa9e7094d11ed5a5720a901ac69b663e680e5413dac418792a0701ce3bd294b84e1d2310c8a5ca837de70 SHA512 949789b95347a23eccf9a1d4e4f37a1b410a912895d369aa3c845f44a3dd2213cd507b49ea3ef7f42b83fcb758ddcba7bc443e2f260253eec46e0c2d3adb4222
-DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57 SHA512 40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1
 DIST libssh-0.11.1.tar.xz 621108 BLAKE2B 87079b4eaf66ceb77803b3d854f847b3f3fb6a67ac3bfa756ebcf8f06bf2b313e976044e0a1d81227fb5278fb04bc56f1a82877d14a6ee76bec0c690b14f38a7 SHA512 284d376ad9ea30b0274b4ac754b27d168286dca862ece43ef15ca6d89e66865ad7a6703cc12dd4a8564a60b8449ae9b36e6496fd51d34cc27ac4030f6cf216d6
-EBUILD libssh-0.10.6-r2.ebuild 3672 BLAKE2B a16d2da21aa10401c208e9f9b26c6103a9906b70b835d5feaacdae1d5cf71c82945a03f96beaa03a70f0cbdabbaba1e30013845510516606f26e1ae5ebc6f960 SHA512 f4324b1e50014caed6d65db77538bed53f2af7bfe46fddfb17b1837dad4712dc595b9d3a9af8c808d77cfadd22b8b46b3f5289fd1de626f3af0d62f6735fdbbb
-EBUILD libssh-0.11.1-r1.ebuild 3409 BLAKE2B 93ab6046adfb24bfa30f16a782cf9aa1e14af8ef10262ef34387af3ec2abbe71c2350734fd35adbd6eabaf490e40b7eaa4a53a540d8e8387f4df2ce9a1d0e338 SHA512 8af58521e67aeedb3af7b38a31b80f5dbda3f5fe07ed0678613f6b06d89786921a381dc6611480d1d71cf9374cbc9df7d4e7425d709a20c12379cb1352c0246f
+EBUILD libssh-0.11.1-r1.ebuild 3408 BLAKE2B 54de13c6cd2190a41ee768f503e7902289665dcb7782cd94c8a6bdee18ed7e9a72960593bab503c47890dd552725cc50774e34b0c6251b7c9b2430e64a30c0e8 SHA512 892c863897a8c5866517babdb1fd2fcbbe66dc4164228c684e35bd6023aa6c7265c779d9700d93011fa8c58481ba2cb50e5167c28923f5697b1db25a09603621
 EBUILD libssh-9999.ebuild 3416 BLAKE2B 5d6a3d09ff28400a3f77d59090694607bd4b68977700687ef5ba348d457781246b4eaeac08026c264009cbb41201aad30d856a284b71f6e3fbd12ec593f52655 SHA512 41ec2b870a27a64eb13e3260507b8d9c4afa66414cbdd26e38fd59729c3686f6ebfecbba88eca16e3353f5439a81728a48e01fcf89f4876b70e8f6ffba3183e5
-MISC metadata.xml 783 BLAKE2B 79be0ef9802a5f1d58b866dd2738a721696b0a4a1b6fcf44b024c74593ba9737e4a64ce2cf1cb8ba4a17139da06ccbe2fe3d8365221159ebf797de1c4aa5b490 SHA512 f2204075966244ebc337663f1a9d010320dffeda90954c6bac69c22859fefd2b6ca0ff5809fc2d34743de6400e3d9da234c5b8a9ef211cc634f381ded5d97825
+MISC metadata.xml 704 BLAKE2B 5a3e9f32decb26a947dc4c51845cb8979ee071e90782367d1f0bec0eb89b54f0374bc0943e4cefcfbd5c0033bca49f613824c31f302873cccd14fdbc15eb696e SHA512 6b6fc79261d7e7d921be1b7f288a5207d5d95ba36b93db3719e39527ef6036716698412bc7fb214667040e6ca0651aedb0b09ee726e3351af44fab9ce64bdd6a
diff --git a/net-libs/libssh/files/libssh-0.10.6-ipv6-hostname-parsing.patch b/net-libs/libssh/files/libssh-0.10.6-ipv6-hostname-parsing.patch
deleted file mode 100644
index 4d62ca5e9459..000000000000
--- a/net-libs/libssh/files/libssh-0.10.6-ipv6-hostname-parsing.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 4f997aee7c7d7ea346b3e8ba505da0b7601ff318 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Fri, 22 Dec 2023 10:32:40 +0100
-Subject: [PATCH] Fix regression in IPv6 addresses in hostname parsing
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
----
- include/libssh/config_parser.h | 11 ++++++++---
- src/config.c                   |  4 ++--
- src/config_parser.c            | 16 +++++++++++-----
- src/options.c                  | 10 ++--------
- 4 files changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/include/libssh/config_parser.h b/include/libssh/config_parser.h
-index a7dd42a2c..ca353432b 100644
---- a/include/libssh/config_parser.h
-+++ b/include/libssh/config_parser.h
-@@ -30,6 +30,8 @@
- extern "C" {
- #endif
- 
-+#include <stdbool.h>
-+
- char *ssh_config_get_cmd(char **str);
- 
- char *ssh_config_get_token(char **str);
-@@ -49,14 +51,17 @@ int ssh_config_get_yesno(char **str, int notfound);
-  *                       be stored or NULL if we do not care about the result.
-  * @param[out]  port     Pointer to the location, where the new port will
-  *                       be stored or NULL if we do not care about the result.
-+ * @param[in]   ignore_port Set to true if the we should not attempt to parse
-+ *                       port number.
-  *
-  * @returns     SSH_OK if the provided string is in format of SSH URI,
-  *              SSH_ERROR on failure
-  */
- int ssh_config_parse_uri(const char *tok,
--        char **username,
--        char **hostname,
--        char **port);
-+                         char **username,
-+                         char **hostname,
-+                         char **port,
-+                         bool ignore_port);
- 
- #ifdef __cplusplus
- }
-diff --git a/src/config.c b/src/config.c
-index 5eedbce96..7135c3b19 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -464,7 +464,7 @@ ssh_config_parse_proxy_jump(ssh_session session, const char *s, bool do_parsing)
-         }
-         if (parse_entry) {
-             /* We actually care only about the first item */
--            rv = ssh_config_parse_uri(cp, &username, &hostname, &port);
-+            rv = ssh_config_parse_uri(cp, &username, &hostname, &port, false);
-             /* The rest of the list needs to be passed on */
-             if (endp != NULL) {
-                 next = strdup(endp + 1);
-@@ -475,7 +475,7 @@ ssh_config_parse_proxy_jump(ssh_session session, const char *s, bool do_parsing)
-             }
-         } else {
-             /* The rest is just sanity-checked to avoid failures later */
--            rv = ssh_config_parse_uri(cp, NULL, NULL, NULL);
-+            rv = ssh_config_parse_uri(cp, NULL, NULL, NULL, false);
-         }
-         if (rv != SSH_OK) {
-             goto out;
-diff --git a/src/config_parser.c b/src/config_parser.c
-index 9ffc8b8b0..5f30cd3e1 100644
---- a/src/config_parser.c
-+++ b/src/config_parser.c
-@@ -162,9 +162,10 @@ int ssh_config_get_yesno(char **str, int notfound)
- }
- 
- int ssh_config_parse_uri(const char *tok,
--        char **username,
--        char **hostname,
--        char **port)
-+                         char **username,
-+                         char **hostname,
-+                         char **port,
-+                         bool ignore_port)
- {
-     char *endp = NULL;
-     long port_n;
-@@ -210,12 +211,17 @@ int ssh_config_parse_uri(const char *tok,
-         if (endp == NULL) {
-             goto error;
-         }
--    } else {
--        /* Hostnames or aliases expand to the last colon or to the end */
-+    } else if (!ignore_port) {
-+        /* Hostnames or aliases expand to the last colon (if port is requested)
-+         * or to the end */
-         endp = strrchr(tok, ':');
-         if (endp == NULL) {
-             endp = strchr(tok, '\0');
-         }
-+    } else {
-+        /* If no port is requested, expand to the end of line
-+         * (to accommodate the IPv6 addresses) */
-+        endp = strchr(tok, '\0');
-     }
-     if (tok == endp) {
-         /* Zero-length hostnames are not valid */
-diff --git a/src/options.c b/src/options.c
-index 2e73be462..676c49e7a 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -634,17 +634,11 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
-                 ssh_set_error_invalid(session);
-                 return -1;
-             } else {
--                char *username = NULL, *hostname = NULL, *port = NULL;
--                rc = ssh_config_parse_uri(value, &username, &hostname, &port);
-+                char *username = NULL, *hostname = NULL;
-+                rc = ssh_config_parse_uri(value, &username, &hostname, NULL, true);
-                 if (rc != SSH_OK) {
-                     return -1;
-                 }
--                if (port != NULL) {
--                    SAFE_FREE(username);
--                    SAFE_FREE(hostname);
--                    SAFE_FREE(port);
--                    return -1;
--                }
-                 if (username != NULL) {
-                     SAFE_FREE(session->opts.username);
-                     session->opts.username = username;
--- 
-GitLab
-
diff --git a/net-libs/libssh/files/libssh-0.10.6-libgcrypt-type-mismatches.patch b/net-libs/libssh/files/libssh-0.10.6-libgcrypt-type-mismatches.patch
deleted file mode 100644
index 89e6d012240e..000000000000
--- a/net-libs/libssh/files/libssh-0.10.6-libgcrypt-type-mismatches.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c01377081fc60132fd3e256ad56eab6b329f5493 Mon Sep 17 00:00:00 2001
-From: Gerald Combs <gerald@zing.org>
-Date: Thu, 1 Jun 2023 12:42:50 -0700
-Subject: [PATCH] libgcrypt.c: Fix type mismatches
-
-Fix
-
-    /build/libssh-0.10.5/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned long long)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
-        .encrypt     = des3_encrypt,
-                       ^~~~~~~~~~~~
-    /build/libssh-0.10.5/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned long long)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
-        .decrypt     = des3_decrypt
-                       ^~~~~~~~~~~~
-
-Fixes: #196
-
-Signed-off-by: Gerald Combs <gerald@zing.org>
-Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-Reviewed-by: Norbert Pocs <npocs@redhat.com>
----
- src/libgcrypt.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libgcrypt.c b/src/libgcrypt.c
-index cea20370b..58f510954 100644
---- a/src/libgcrypt.c
-+++ b/src/libgcrypt.c
-@@ -198,12 +198,12 @@ static int blowfish_set_key(struct ssh_cipher_struct *cipher, void *key, void *I
- }
- 
- static void blowfish_encrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_encrypt(cipher->key[0], out, len, in, len);
- }
- 
- static void blowfish_decrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
- }
- #endif /* WITH_BLOWFISH_CIPHER */
-@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
- }
- 
- static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_encrypt(cipher->key[0], out, len, in, len);
- }
- 
- static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
- }
- 
--- 
-GitLab
-
diff --git a/net-libs/libssh/libssh-0.10.6-r2.ebuild b/net-libs/libssh/libssh-0.10.6-r2.ebuild
deleted file mode 100644
index ff5c0510997d..000000000000
--- a/net-libs/libssh/libssh-0.10.6-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone )
-	)
-"
-BDEPEND="doc? ( app-text/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-libgcrypt-type-mismatches.patch" # bug 932715
-	"${FILESDIR}/${P}-ipv6-hostname-parsing.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-
-	if use test; then
-		local skip_tests=(
-			# keyfile torture test is currently broken
-			-e "/torture_keyfiles/d"
-
-			# Tries to expand ~ which fails w/ portage homedir
-			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
-			-e "/torture_misc/d"
-			-e "/torture_config/d"
-		)
-
-		# Disable tests that take too long (bug #677006)
-		if use sparc; then
-			skip_tests+=(
-				-e "/torture_threads_pki_rsa/d"
-				-e "/torture_pki_dsa/d"
-			)
-		fi
-
-		if (( ${#skip_tests[@]} )) ; then
-			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
-		fi
-
-		if use elibc_musl; then
-			sed -e "/SOLARIS/d" \
-				-i tests/CMakeLists.txt || die
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE=$(usex debug)
-		-DWITH_DEBUG_CRYPTO=$(usex debug)
-		-DWITH_GCRYPT=$(usex gcrypt)
-		-DWITH_GSSAPI=$(usex gssapi)
-		-DWITH_MBEDTLS=$(usex mbedtls)
-		-DWITH_PCAP=$(usex pcap)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_SFTP=$(usex sftp)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		# TODO: try enabling {CLIENT,SERVER}_TESTING
-		-DUNIT_TESTING=$(usex test)
-		-DWITH_ZLIB=$(usex zlib)
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_test() {
-	cmake_src_test --timeout 3000
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.11.1-r1.ebuild b/net-libs/libssh/libssh-0.11.1-r1.ebuild
index a1ddb76df753..ff8dea4ce6d1 100644
--- a/net-libs/libssh/libssh-0.11.1-r1.ebuild
+++ b/net-libs/libssh/libssh-0.11.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index ef1bf6cb8f62..4107f06edf3d 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
 		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
 		<flag name="pcap">Build with PCAP output support</flag>
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 03c0c4e12dd3..3d17d23ff77a 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -4,5 +4,5 @@ DIST miniupnpc-2.2.8.tar.gz.sig 543 BLAKE2B b4d056972fc7e46c1e41a658d301db8e9a0d
 DIST miniupnpc-2.3.0.tar.gz 105071 BLAKE2B a5a2d22d99eb9f20fcb0b61107db61b97fec8207f5d8079c7d8e1d7bbc73478c3b575c7ecf32cb3ffe64f82a93673ab1f734139755c512d48439358e314e8762 SHA512 63efda015c7f693499a6f1f28b8356c4bb05ed0354fe2fb79042295607bf4f12c15082a48ced348ca5647fca9d83b99068c28311623f46225e9b09b5dc23a290
 DIST miniupnpc-2.3.0.tar.gz.sig 543 BLAKE2B acbc2fedd1984e2488aac4618a70b2f0e5573ab17beaa84660117fada915b9ee94e419ee4ddbeae30c04e4eff8749d2a8724b4826bd5ce8ac972908fbda1189c SHA512 081d6c77fb08863760e4ddeb5bc1a5414603782b785f1f86efe516e59a113a4da794895ad160922818574029189df32a0c57fe2558c2ce99d521aa2673d40d43
 EBUILD miniupnpc-2.2.8-r1.ebuild 1551 BLAKE2B 55f8a70be27e4f5b0a6c5440b439999df86d0d4369286a13fd10cba216a8be9bf3fa371b82df4eef3b7cc2e1c304b0ec9d40555ea193f4d11e47f0cf901657fc SHA512 db8275d5a345bc478ac8b6c102cbbb0ba9b886873835b0a2b4bac5f6d0e105d90b02b8ab2a91d95107284e4b63f558e5c171eee835828de339a13bfb532166f6
-EBUILD miniupnpc-2.3.0.ebuild 1559 BLAKE2B 772e3d1dc0dce74b68bc18b0139d5bf50d2e0b940c53a0b75ed5189f3eeedd40a52179c70b6aeb6343128a7bf069798a4c558a03e6dcafd5775633f667b7ad96 SHA512 affd772877d272fe951f358fd76687550d338258f3acc539b38d7ed5c4b454d12f232375468558afdb2ae2d200cfe2f25ecc29eb73ab921173591dbb98ae0370
+EBUILD miniupnpc-2.3.0.ebuild 1553 BLAKE2B 15b8a0d056906cad86e02cfdd6dade6afb158374f0069a72be06f5d20591147a39a7f90f5aad0a75982a6ed12e3343b140d29f341d0cebe4fc441b004dc02d81 SHA512 d56937e5d87b5a9f615d5d5715d5ea3e83b5f2bb014c96df02bba9456d7270683167bbfbe5ae938d4d5a60ce7b942ebed8169bb94bbb73e41ec8f75b334fe340
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild
index 5c80be461765..ea88f1098451 100644
--- a/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	kernel_linux? ( sys-apps/lsb-release )
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 657bb1278986..722ac2d47fc3 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,11 +2,9 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 676 BLAKE2B 2ea3b4f82a6f432d7afbe5256fd61aea5d39313a1c02b001319d2dab760694b76b5846bb8fd2594589e026b123918fa7fb84580860f4deccd8005febcc3ee464 SHA512 0913e9eff00fac22af5b0929c05413e5e78c7268020c53d1f42c33ecc586a8ec9c921cb555157a8866af86ee8ec98a1c2e3ee2ab4d6842ca1913baee3ca16744
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 504 BLAKE2B 3ce3e96734220da225e292c2feffa1507917ba84372a9e76be34b3ffddd70f1d896f4ac2058b3a8826e5cd9b2d7b441cca5f39305c785422ecc5e12a9f65b757 SHA512 eb1dddc7c6de009c31c646a1384984fa92612414d51d531a4247057b34523f8ea32e0a615500a63a55910c994e99535018bfea8c8879926704e0c84ff102ab6f
-DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a
-DIST c-toxcore-0.2.18.tar.gz 653247 BLAKE2B c27da02753aede5056c42e5bf1949920fc30e98a23c058ab445c2fe345271e442885a3eeb011e8fde16d8fc8451376a015c5f821145785c75e7d0dda3a8b72eb SHA512 e9b0d73a2e0460290c8453a0a64fc91deed2e0cf87f945d0ba203b929f19a296571d7140f4df89b06f7e67f2b61894460ce4dd32ab9ecf6ea7d5b67538fadb23
 DIST c-toxcore-0.2.19.tar.gz 860531 BLAKE2B 5c341d85f9af2d44656600f1e2e95d5bc420effd7cb084f7568276831c489712ea39b8ffac7e901c50672f1a7adb68bcb9eab72cb3123bed5a5e7cc3a4749777 SHA512 793070e2f53e9736e23803d5e60dab8997b2e1f0b0655807b32667d660ee240b1904842aee1910f508ef26f0d4af8ca003fe384e6c59f26787a1059f5d5a5b22
-EBUILD tox-0.2.13-r1.ebuild 2923 BLAKE2B 48eb83d424000252e60af6e2402157450cfde117592a9a8c4dfe95bf13aecd9e79abd192366417c307ec196c8b3461e8c0d3f7be8729b8c42859bd9bfb437df1 SHA512 08bfa551014c05320a6ef30121ff5a21838b95779da7341f559a4a0e4f0e43ab2f3f9e8ca3b358ac98059c3f7b679c5379e6dd146db997a30c3790f127d7b0af
-EBUILD tox-0.2.18-r3.ebuild 3219 BLAKE2B d8b8498154980daacce72e20166760bf9aacb91988a96a30b57aabe70402b5a1645fc6b5a670e6d6b9fadd9aa877617de2956a04f52be139d9f2878ec456368f SHA512 aa463271610bd7032ce0092b0a281f2b50a93fca13da0239ae239e678a2189076ca5cc99089f9a29595ca472749aa274f541e08131e3bca10b3b5933982ebf7f
+DIST c-toxcore-0.2.20.tar.gz 862660 BLAKE2B 77f0d423f3579f83f114e2201315d8bb97a951a79aeefaf9ef6e012c7c98b6bba7889359a405746c976ac4689112a9366bdf291998c6f835972e540d01782b20 SHA512 84497bd8d542d8ccb4d77d9210852a0e73a0f2c4885b8282c39263042555495c37196b5f2ddf37f393bcc2b84d839bba3506da2c68440e4d5329d086b2ebefb6
 EBUILD tox-0.2.19.ebuild 3015 BLAKE2B 84ccc00a6b0f03457527219b8ce7a20267231347b57dac6354a5f65a9ff8d613c40a9c84ff6fe2654a13472d09d7e4c2c5783769a91359b1377805f98be72071 SHA512 3a5de51c28f2dfad107c926468ebfba2f3eb3163fcd0de8142b6d7368e196dab2516b29b152dc1ea81c61146bf0497848c337980b86c6ca3434348d7cbd2da8e
+EBUILD tox-0.2.20.ebuild 3029 BLAKE2B 8c3e4a3c947a6456e61219aff7fc5260894fe6b42b05c529d5a66565fdd08099103ed6027e4628c54cc0a11fb23ef11ce939d771d90702e7e90755cb2699102a SHA512 4b01caf9dc4382cd19c4a4387d20a9e5552b7ee4702e8d750cab7f96e47b84841246327256f09cf958cf5e664fa6acf3a0a24cc2b43a4ff9aa975282a07b77a4
 EBUILD tox-9999.ebuild 2812 BLAKE2B 46c506b763d13dc798c6933c6ac52458c97364eb9745706b3dca3658b3d7e5938c19c6c68f7b211ddc2b38046e06b96cb2df6df4ee9ee4dd1c2e9d107abe312e SHA512 88b3427ecc697f4faf7ccade7e6a6efbf81b7f0ca30b9bc68e82aebf22e454c144f3c26e0a04b7b85b6e589ef7940920a330faef07a06a7e5a7f3502060922f6
 MISC metadata.xml 1049 BLAKE2B 4150b812ccf96ccd8a98066054d37b0e74123f8c68b2f68a0cbe6e7227e628a34ed7813ea012b6e468f23b2e8f27a67922108014d8c019fe303e1f57a0dbb7ad SHA512 ed549db2d83091dbd6fba5c7b1997e3062b0739b83e12a7113f9da0fa3e70ee97871e52dfca4465ec13746c3f43002dd02db19168ce07437bcefe9dcd69bfbaf
diff --git a/net-libs/tox/tox-0.2.13-r1.ebuild b/net-libs/tox/tox-0.2.13-r1.ebuild
deleted file mode 100644
index cabfe0645e38..000000000000
--- a/net-libs/tox/tox-0.2.13-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test"
-
-REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
-		daemon? ( dht-node )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/libsodium:=[asm,urandom,-minimal(-)]
-	av? (
-		media-libs/libvpx:=
-		media-libs/opus
-	)
-	daemon? ( dev-libs/libconfig:= )"
-RDEPEND="
-	${DEPEND}
-	daemon? (
-		acct-group/tox
-		acct-user/tox
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	#Remove faulty tests
-	for testname in lan_discovery save_compatibility set_status_message; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUTOTEST=$(usex test ON OFF)
-		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
-		-DBUILD_MISC_TESTS=$(usex test ON OFF)
-		-DBUILD_TOXAV=$(usex av ON OFF)
-		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
-		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=OFF
-		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=150
-			-DUSE_IPV6=$(usex ipv6 ON OFF)
-		)
-	else
-		mycmakeargs+=(-DUSE_IPV6=OFF)
-	fi
-
-	if use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-	elif use log-error; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging disabled"
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use dht-node; then
-		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
-		ewarn "developers and is on their TODO list. For more information,"
-		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
-		ewarn ""
-		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node"
-		ewarn "that causes the program to be built with a null library reference."
-		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
-		ewarn "If you aren't running a node, please consider disabling the dht-node use flag."
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.18-r3.ebuild b/net-libs/tox/tox-0.2.20.ebuild
index e4a4b180f3e0..73970ba52867 100644
--- a/net-libs/tox/tox-0.2.18-r3.ebuild
+++ b/net-libs/tox/tox-0.2.20.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake systemd
 
-MY_P="c-toxcore-${PV}"
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
+MY_P="c-toxcore-${PV}"
+S="${WORKDIR}/${MY_P}"
 SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
+IUSE="+av debug daemon dht-node experimental ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
@@ -40,7 +39,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	#Remove faulty tests
-	for testname in lan_discovery save_load; do
+	for testname in group_topic, lan_discovery; do
 		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
@@ -50,21 +49,24 @@ src_configure() {
 		-DAUTOTEST=$(usex test ON OFF)
 		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
 		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
-		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
+		-DBUILD_FUZZ_TESTS=OFF #Requires the compiler to be Clang
 		-DBUILD_MISC_TESTS=$(usex test ON OFF)
 		-DBUILD_TOXAV=$(usex av ON OFF)
 		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
+		-DEXPERIMENTAL_API=$(usex experimental ON OFF)
 		-DFULLY_STATIC=OFF
 		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
+		-DUNITTEST=OFF
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=150
 			-DNON_HERMETIC_TESTS=OFF
+			-DPROXY_TEST=OFF
+			-DTEST_TIMEOUT_SECONDS=150
 			-DUSE_IPV6=$(usex ipv6 ON OFF)
 		)
 	else
@@ -106,14 +108,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use dht-node; then
-		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
-		ewarn "developers and is on their TODO list. For more information,"
-		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
-		ewarn ""
-		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node"
-		ewarn "that causes the program to be built with a null library reference."
-		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
-		ewarn "If you aren't running a node, please consider disabling the dht-node use flag."
+	if use daemon; then
+		elog "Before you can run the daemon, you need to add nodes to"
+		elog "configuration which exists at /etc/tox-bootstrapd.conf"
+		elog "Details about these nodes can be found at https://nodes.tox.chat"
+		elog "Then run, if necessary, #rc-update add tox-dht-daemon default"
 	fi
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 607182e5f3a6..5d7a70136cb1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,7 +5,7 @@ DIST webkitgtk-2.46.5.tar.xz 42898600 BLAKE2B 04f824f9864749c13810318c06e5da9026
 EBUILD webkit-gtk-2.44.4-r410.ebuild 8174 BLAKE2B 27c1b33a6a6e4f425dce0a6a9a07b884dd5ad8470c888535abeeeee264a87db81eaff47e5528be37847dbd789ed0c3db59c654cef133781e99d755e71ce90b05 SHA512 03777b824eddd54e158657380929734d5494f5f2de281c6e151c81073be19b20bb9466dec82b8544d9cfcd097b72f6cb3734b71345161b233370de138f5427be
 EBUILD webkit-gtk-2.44.4-r600.ebuild 8915 BLAKE2B 35b9ec4ce6c395a2ef1f2d1cdc9c78ff41ee72886a48f9c31ec941d51a7fa0f1da74f601d1e3c58948c2b813624cc49ecc82e5dc635fea94445b42bed9d6940d SHA512 6f99ef1732ecf1edb02eee13d248ebbc3819ba40bf4ab9dd18667447132a9ce52b7c688cf23ed257d5d22103073b0cac348e94025191d3f8e45ae293a47e2635
 EBUILD webkit-gtk-2.44.4.ebuild 8022 BLAKE2B 97d87ea9bf5201151aa3ca325900df54b530c6830f5de6744e57013ea5f8febefb5c9b3811c804f954ced7ab15825cd95264993a71c6ca6e687a7315d9a6087a SHA512 5940946a6c173eb2dbfe929b6eabb9c7506b9be3147a0b7a3c3ab6095e440c7356a5cfabb9920f6d772b067052421cf37b4fcc4b49e70d9d662e9d168a88d16a
-EBUILD webkit-gtk-2.46.5-r410.ebuild 8157 BLAKE2B 68c006bea8f1e91c63006e31b1b71512c4da9a741cae8a92aa47b4b8dd5ec5f3993d89f3dc50387ca3cfedad1b72e51272ec30dd7ef4bbfaaf9b547a49de5263 SHA512 a6c83eae4d328e5aa42bba585c6d697c69ed6e683f9fde13462e2bc8d9261b46f2007678cc305adb818974e051aac498e295b121df08f0c8295a0c54a7702a8d
-EBUILD webkit-gtk-2.46.5-r600.ebuild 8901 BLAKE2B 0ce4066fc49ecbb222f9bcfaf364ff6ab54cba4f27840de3526aeabda47bc2e4fc835d425717e50ddd40ed443cf0eb9a8b658e5a6792a7663672ce30cf52df0f SHA512 df06b7e47275eba8988231fa8a85fef0601c2ed7f6a831ac611f2a4930ba01c39ce9688ac164a428701b8bb031872251a8a20d2f5456beaf824578487e1198c3
-EBUILD webkit-gtk-2.46.5.ebuild 8155 BLAKE2B 8395d301571175acf145b34d897b66233f2282c79b728f9c79e15921425a28e6ef229f3b5946a56dade4cd7c3fe69e41b111acca16d4c06877aee0d8d59f6054 SHA512 8dc16ac64f4393b8d9c969e0e670e60e654df9aa15cf0e58b5541389d9024b5838570ac0b272e016440584504462cdcf6c039a5148b9d9779dc34158d57befda
+EBUILD webkit-gtk-2.46.5-r410.ebuild 8174 BLAKE2B 8385066221552584539f7215963253287e3298838b1ce18de445852abe6d8fc7948b56f28717c41885ce9a2990d572390b4316ab69ad624b9baff7f3d2a9e9ab SHA512 c016081cf9e31ec62d1ce74e64f29acd7e2e99db03b7ae77d1e21f848ae72c76d2bcef2e82cd444978fef1c20b7394bb689167e5031ae86c08d539b2794fc421
+EBUILD webkit-gtk-2.46.5-r600.ebuild 8918 BLAKE2B e99c11ec35df8e494a02c52256f5076cad05371befdb3cd5af8a0f9fee3540a5c47bf45992ad9de5341213c164647ce8f7fdd6003c392c3535a480b90cacda49 SHA512 8e48fc16902165d2267393fae20521b80ead4d685323a54cd25d653cb48eb94fa9f0d39d6e715e1bf822774b1064d368405ba7df98c1c53ed067033a3ba5282d
+EBUILD webkit-gtk-2.46.5.ebuild 8172 BLAKE2B 62b2640374bf3e9eb2da943297eed7aab3450a0ccc0f8f7f885c76c041586430ae91ab634c5de0eb9c386f01ce7dc7f2079d32beb22587e54cac700885513409 SHA512 b398eec64881e341133cc023c51e057d2680ff29e8d7f25901fa3a873d5ebcac45e1d18b575eb90d0ee8a33c2b8efc2f692fc133fd789430723be5acdfe6385a
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
index b0f3b324e3d8..5b6350daba31 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r410.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm64 ppc ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
index 8fa876338dd3..5dcdadc3bed1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r600.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm64 ppc ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
index 10097268c5fa..982fa22f27f7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ppc ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"