14 files changed, 58 insertions, 221 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c2088fcf2dfd..22515ce129b5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 85c66045c0d7..9b1e86c22560 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -16,5 +16,5 @@ EBUILD curl-8.7.1-r3.ebuild 11043 BLAKE2B 3d468dea6498e583f32d9ab2d1f46d318ff1be
 EBUILD curl-8.7.1-r4.ebuild 11267 BLAKE2B 50dba5d100c3fee6b1721a63c059e365a27e02924c514164f13b082f7afabb4afc5aa47a14eb48283701828c834906bcde012530cd60697167a09d615da7df1d SHA512 aa5b768414133e81cdafb774f44c33f14de19c607013f64d83f5e2460285215e1792e738746d8665f2b98ff85ab0d50c03d96d65145ae72967193a34be3aae13
 EBUILD curl-8.8.0-r1.ebuild 11500 BLAKE2B 82e2f840b63d5dcf87d4480a58ed5ba70486a8d779a80c1acd2106fa7710bce2749b9613bbf8d04f4aca6faa8acb735ffc18e355b51e65d4e2f58ef220480295 SHA512 f999143e45a76acada5485dcf2ff6a2d6aa840a95f3768eae67f3eeb1e5ebf2baa4310cd506ab5fb8605e6304d567012a3566a63ff2c2a53641e72a2df18f000
 EBUILD curl-8.8.0.ebuild 11117 BLAKE2B d088f434876adfaee0e4b4983c2b9cd047460496260b2a2678581bec7a63bf2e93272159b3e82fbd472df17f062f1b3fe6f81e75a5e2dd1ab588b208a6f6909f SHA512 8419bcac5a90e96a0ae896787ab632d85c29c373365c4084bfa14e414f2e9494f01ad0c812e2fb1b8596ee96f682cc76da2818f3b5cc992801c0a1660f61ac9a
-EBUILD curl-9999.ebuild 11379 BLAKE2B 5f5bba218c26ee3af4fcda9eaf95f78749dfe287f10bf96d7f87366a276356cdbd1ddd91581eb1858195f159a47aec4b4d2acbf1ab8267c8250c60989bd09bf3 SHA512 ca9081fb8fc07cdd5771879ed48562b895c6d7c1623e44ede4c50201e261b9ca4db0c0c42ffe956644df44846d7b95b63f987779b1647329fb9465441a1c4999
-MISC metadata.xml 2090 BLAKE2B 54d366aadfc25650c40081ff10eb150bcb9811a29f802c418afce166c384e2bafc999ff7e69ceeb25a96e952d4875d808e8e89240b437741cd363fab46267a25 SHA512 2103a849b67f9a14a85eb769b870e7272bf8f9c78ca579b4271150be01f26787a884614bff874d50f90be99af4a6ecb136510fca2837463e0bc91611ddbeae40
+EBUILD curl-9999.ebuild 11092 BLAKE2B 366122c9c5c9ff592959d8932b0adb04b73fce5b3155a5e47bd2246ae3922546c4e39a4b0f9a556e0f6163953398ac8270f49ab4af34d05c88f815e40e807d53 SHA512 0551db5807a5d02e096548d3b9116ce6563bff1c6be661a04da6ccdae077cee1cd9936d1f61c8ee38dd4442e4b519dcab7c04c5034f207ce1c002f0ab2bf0808
+MISC metadata.xml 2215 BLAKE2B aa0851849ffda831aeec7a6315d23892c35680ab42c0bc9a5662238e7b8289d5f48d5f2a60ab0bacba06f71271bf60d14958bfec029a048f732d22fdc60faded SHA512 7da9247a1bbb533ae0bdc919f5bd2ad7ed298a7f9e986dce6d2471cedeee9f1542a8ef79b1fdbca5a1a0d33194b99ff3d3f5c27054ac01a3f1e40a1e94d6c1b2
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 7f560fb74a9b..b42cca9c5152 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -26,16 +26,22 @@ fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
 SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
 RESTRICT="!test? ( test )"
 
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
 REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+	)
 	ssl? (
 		^^ (
 			curl_ssl_gnutls
@@ -44,13 +50,13 @@ REQUIRED_USE="
 			curl_ssl_rustls
 		)
 	)
+	curl_quic_openssl? ( openssl )
+	curl_quic_ngtcp2? ( gnutls )
 	curl_ssl_gnutls? ( gnutls )
 	curl_ssl_mbedtls? ( mbedtls )
 	curl_ssl_openssl? ( openssl )
 	curl_ssl_rustls? ( rustls )
-	nghttp3? (
-		!openssl
-		alt-svc )
+	http3? ( alt-svc quic )
 "
 
 # cURL's docs and CI/CD are great resources for confirming supported versions
@@ -60,20 +66,21 @@ REQUIRED_USE="
 # - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
 # However 'supported' vs 'works' are two entirely different things; be sane but
 # don't be afraid to require a later version.
-
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
 RDEPEND="
 	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
 	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
 	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
 	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
 	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
 	ssl? (
@@ -104,7 +111,7 @@ BDEPEND="
 	test? (
 		sys-apps/diffutils
 		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
 	)
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
 "
@@ -262,8 +269,9 @@ multilib_src_configure() {
 		--without-libgsasl
 		$(use_with psl libpsl)
 		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
 		--without-quiche
 		$(use_with rtmp librtmp)
 		--without-schannel
@@ -285,7 +293,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
 		myconf+=(
 			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
 		)
@@ -305,30 +313,6 @@ multilib_src_configure() {
 		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
 	fi
 
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
 }
 
 multilib_src_compile() {
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index d79a1ed4affd..884608c7c1f5 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -17,11 +17,13 @@
 		<flag name="hsts">Enable HTTP Strict Transport Security</flag>
 		<flag name="imap">Enable Internet Message Access Protocol support</flag>
 		<flag name="mbedtls">Enable mbedtls ssl backend</flag>
-		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
+		<flag name="nghttp3">Enable HTTP/3 support using <pkg>net-libs/nghttp3</pkg></flag>
+		<flag name="http3">Enable HTTP/3 support</flag>
 		<flag name="openssl">Enable openssl ssl backend</flag>
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
 		<flag name="psl">Enable Public Suffix List (PSL) support. See https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/.</flag>
+		<flag name="quic">Enable support for QUIC (RFC 9000); a UDP-based protocol intended to replace TCP</flag>
 		<flag name="rtmp">Enable RTMP Streaming Media support</flag>
 		<flag name="rustls">Enable Rustls ssl backend</flag>
 		<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 0fbc5514a96e..1da88c139853 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -7,7 +7,7 @@ DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417
 EBUILD passt-2024.03.26.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32
 EBUILD passt-2024.04.05.ebuild 842 BLAKE2B 8cd4f2806d61b2e4d567bea4ba90d629d43f518153b36e5f343690b4bb7e70a476c35ec89305bc1d701f202b18af64ab2c65574642d72e1cf037b43b5fada0e6 SHA512 f7bfb90004c0a78b0a7a68e01c9431581dc1ade39457c8957555a157862716b27b0a6a814fc499674a69642467a913e7915b2a7554dd57b8638045dc676c3ea4
 EBUILD passt-2024.04.26.ebuild 842 BLAKE2B 37a59ee6ef1ad40cc3af87a8c4a565ba5aa06183a9802b9bfdf54cf2cfe578c94473fd0605379224d39b5c7763bd05664c00b22c74ab6e97be7a6056f7c8c4cf SHA512 784ecc5756ec3cda106b5c730317dd15947790b4f9910aa9026c46b8d1220592fd470727df93402acb21c2bc8795c12a1e9da45309ce9691e53fb423e69fab28
-EBUILD passt-2024.05.10.ebuild 842 BLAKE2B 94b37052fbc670b3f3d9a6aead0dee723bf7e2a44219ff1efd0dfa54caca078f935aa2c3371f8d13bac0add09e16d0fe97840ef07e9eeba735c3e75407bdb742 SHA512 7c62b8cea6099b8d743beecf6a0d70f6b5acd3f46a5d0d80eb3a58a74b233dd5e0446dcb704966fca3f701c852e54482ca7aae2ba15a5f174c2df7a38127ad5c
+EBUILD passt-2024.05.10.ebuild 840 BLAKE2B e75807026ae5090cb14ee123451d3d37ddce5841d879a2bab90a0bb5e40bf8c418982dc69d61063fd941287381c6e5bdf4715e13a98f743aa25813c24a996128 SHA512 5d70ab7976a254bd0617bd4c3a39b5cdb06e5f8503f3690748c4f85987ccdbc998e23a5e0482ef6ccef76319a9ee9e849251650e2484b3518c159f5e0629d92a
 EBUILD passt-2024.06.07.ebuild 842 BLAKE2B 15a709cd30d0435189229b069c91edc16e1302fdcdb8e9897f7db18d0f3281f700a6d3b189a71a8446c106935020725b355eaef54460e82667eca79417352930 SHA512 590d1059863928e35048d3229232874334bdb968d311525fe6ea5bed83e074fe95549b7953eb476e01d7fb65c3a244a121275530cdf7d0ee6a71fab18f63c9dc
 EBUILD passt-9999.ebuild 842 BLAKE2B 15a709cd30d0435189229b069c91edc16e1302fdcdb8e9897f7db18d0f3281f700a6d3b189a71a8446c106935020725b355eaef54460e82667eca79417352930 SHA512 590d1059863928e35048d3229232874334bdb968d311525fe6ea5bed83e074fe95549b7953eb476e01d7fb65c3a244a121275530cdf7d0ee6a71fab18f63c9dc
 MISC metadata.xml 1410 BLAKE2B 415cf4ab3e0d993066251ff9e136ea4a5ef13fc50b838b5dd057784600b5fb89fecb411cc0d61d08459e34da7fe34097d22b8908240f3e46e6ff50f503aa7089 SHA512 85d756f5b8077fb0838e1881f9ef48f08ca8da1ca540d8677632c81d34765d6fb1483b3fdd0eead64467aa7872b1ca133745610736d0afc5a2b8223abacc1cb6
diff --git a/net-misc/passt/passt-2024.05.10.ebuild b/net-misc/passt/passt-2024.05.10.ebuild
index 9e4992ffaab0..ce44d6abe4eb 100644
--- a/net-misc/passt/passt-2024.05.10.ebuild
+++ b/net-misc/passt/passt-2024.05.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 78ee99b73a4f..40bfd656b458 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -1,6 +1,4 @@
 AUX r8152-2.16.3-asus-c5000-support.patch 581 BLAKE2B a502be8abc3e714fd6c1d904472e40989d051cef8a1d5fb9a1f4437f47c0cbb0a408fb612f0feb4bdd28fa2bfc9097118746ded59cc05ba9a75eed0e1273647b SHA512 f7055796e243e1783f50677aef850448b85253ed3eb5a4490ae12c245d3f9ebbd6fe3fd9546bce312313537455a1a71076c0d61109d146a42c8a1ba39caa1b75
-AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a
-AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
 AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
 AUX r8152-2.17.1-kernel-6.9-fix.patch 4008 BLAKE2B 6566782e57e8b69a2cf183a0d63a9e0c17ce9c83974dc23ef1d8588adca14105b4ef8682ca33225be0c4e2ed5121bbc4cd9d5180f44b9c36655d875505c99668 SHA512 4859d41116474e14aec2b03952d155ec07293941181db5cecb27b389c79d4c03ef8ec1abe540ce3b9f04c1ad835f98a11562484dcf168afb100cad91bc96d334
diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch
deleted file mode 100644
index 076d78f46062..000000000000
--- a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: https://github.com/wget/realtek-r8152-linux/commit/6ffb3760c34a904467d70830ac9c10211e8f5d3a
-From: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
-Date: Wed, 14 Sep 2022 15:13:31 +0200
-Subject: [PATCH] Fix for linux 5.19 without breaking older kernel
- compatibility
-
---- a/r8152.c
-+++ b/r8152.c
-@@ -20458,9 +20458,13 @@ static ssize_t sg_en_store(struct device *dev, struct device_attribute *attr,
- 		return -EINVAL;
- 	}
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */
-+	netif_set_tso_max_size(netdev, tso_size);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
- 	netif_set_gso_max_size(netdev, tso_size);
--#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
-+#endif
- 
- 	return count;
- }
-@@ -20620,12 +20624,16 @@ static int rtl8152_probe(struct usb_interface *intf,
- 	rtl_get_mapt_ver(tp);
- 
- 	netdev->ethtool_ops = &ops;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */
-+	netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
- 	if (!tp->sg_use)
- 		netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
- #else
- 	netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
--#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */
-+#endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
- 	/* MTU range: 68 - 1500 or 9194 */
diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch
deleted file mode 100644
index d20db413a16b..000000000000
--- a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/ervinpopescu/realtek-r8152-linux/commit/0029747c3cf68dbccbebfcb560277040673dfe36.patch
-From: ervinpopescu <ervin.popescu10@gmail.com>
-Date: Tue, 15 Nov 2022 19:30:16 +0200
-Subject: [PATCH] Fix for linux 6.1 without breaking older kernel compatibility
-
---- a/r8152.c
-+++ b/r8152.c
-@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp)
- //		break;
- //	}
- 
--
- 	r8153b_mcu_spdown_en(tp, false);
- 
- 	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS);
-@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
- 		cmd->autoneg = AUTONEG_DISABLE;
- 	}
- 
--
- 	if (netif_running(netdev) && netif_carrier_ok(netdev)) {
- 		u16 speed = rtl8152_get_speed(tp);
- 
-@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr)
- 		}
- 		break;
- 
--
- 	case RTLTOOL_USB_OCP_WRITE_DWORD:
- 		if (!tp->rtk_enable_diag && net_ratelimit())
- 			netif_warn(tp, drv, netdev,
-@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf,
- 
- 	usb_set_intfdata(intf, tp);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- 	if (tp->support_2500full)
- 		netif_napi_add(netdev, &tp->napi, r8152_poll, 256);
- 	else
- 		netif_napi_add(netdev, &tp->napi, r8152_poll, 64);
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */
-+  netif_napi_add(netdev, &tp->napi, r8152_poll);
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */
- 
- 	ret = register_netdev(netdev);
- 	if (ret != 0) {
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index ea850124624b..2529987154d5 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,7 +1,6 @@
 DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f56888ff29da7bbe9f94b74838d628052520b3c5f97e52d4f3b3dd20c0207d1e706e398b24a54c7a03cc3b9c5693c70e18f4418bfd9c83d8e3ce48cd19fe9 SHA512 004ebf52194a2801c01429990b00ada1b7e2850d1087d3efacf29542cac6a9bb351181ff8ef6713550279d9c5c2f415dcdfba847ef5c848a564b2454e6c05e81
 DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28
-DIST smb4k-3.2.71.tar.xz 4344004 BLAKE2B 12365fc1b93a0b78b5da16fad276d0b295209cf02fc5fb39a95fe1e695ec6a5427428e41ae31ad4784dc84978564eedc0955d0071455522bcc31997f26d62f61 SHA512 d3e871b67ddee027341e7973f7204c44e93843a340553cf5588c7de4a225db83af3a376a54d7f0e8c099271e33dc4f65fffcc96fb32a911dc1787814981be279
-EBUILD smb4k-3.2.5-r1.ebuild 2049 BLAKE2B 0d565ab01d914c19be5c9561956f1e69b874567d8a7b9ab93c3cb78234d6ff0eb95a73218ea566b4a3a9f7833500bcfc2e412bcdd5af198afb369fcf1bc80c25 SHA512 f933a5f7f09377bdeb86f02a9eb0f99a0b8f352fa9ba83df41ddf43f0f19d8abb7064f1485e8ec75b4943e32e4a12fc1d502eb8bdf84d2eea1d10518245d4c0e
+DIST smb4k-3.2.72.tar.xz 4341620 BLAKE2B 8fe3a2f6e30c9565197882aed92f27db862e0e6c9df35dda1b9187d7279618cae6359c1282ba474ae5b4fe39b8446e133aa95e0f10d0d4087580813944b49ba2 SHA512 0140bca46d21f0355e0cf06ec3cc140b84bd3f334c291c7f2f7dcf379c5520c35d8e77fe7eade5b156462c3a366730405fff8f9678cc5e0e061b3ca837b9de6d
 EBUILD smb4k-3.2.5-r2.ebuild 2332 BLAKE2B 926572e0d143e7906a4c0048539c30f746e8942ed5bac4eeb60e018406aa502e7216f6e8b2bb7b35f0e2f23d0bd2f300b863a9737e3074d172dced30ec630c52 SHA512 fe42de522dbe88095929542436cc2ab544c010bef3474b01dabaf02507bfe5ac16f7cd9e2571035e25a60c5e0462bd0a91eddf5784d00c60b980d6b089f52875
-EBUILD smb4k-3.2.71.ebuild 2042 BLAKE2B 576bec3179831b6b7ea22e489b39182adc48a11d508601eb97e2aad6906ad3b0fe4faf6be98fc4c592ded97b10524a0e011ab45ff8b28eda405cea50dda5e3b5 SHA512 26e2c0e2d98d90fb2a0f89705cfb523d023e01e337efee5d41a1d3bf6f0fa838c8792c67d8ac932b1864fa5d99b10d95ded2dd69ae3aed6a507b7682b05b1ad3
+EBUILD smb4k-3.2.72.ebuild 2068 BLAKE2B a0b7ba523896953d68ca20596357e77f813173cc3db4f917e7c368f29d7312ac9d2bebd9a11f3cb108c1ce5ea16daafbd9a18b1c26d776c779aa25812b59fb85 SHA512 854532502950acee016ebcb13de1cb786aaad12f6ea10b520080afb85c2f5199e9c9de2d165129eab36d3b6c6d61d879388b21005ff798f6376164191c4e5dd8
 MISC metadata.xml 593 BLAKE2B 087dedf151163d8d8f02f41a9aa08117219c50556e3e60c97bf3bf3175fbe41fe9cdc1f0ada27aacc660095b41edfcb9502d02568bcd9eea26e8cecdbceaebe9 SHA512 f090b6f9b968087c912cc88187089a0eb891e77713fd5aabed03931b9da6f2f6673e48b37edf57de5da3a421f25d82371f9568db302e9e35e64f5f8200a2418e
diff --git a/net-misc/smb4k/smb4k-3.2.5-r1.ebuild b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild
deleted file mode 100644
index b164be6392cd..000000000000
--- a/net-misc/smb4k/smb4k-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-	discovery? (
-		net-libs/kdsoap:=[qt5(+)]
-		<net-libs/kdsoap-ws-discovery-client-0.3.0
-	)
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.2.71.ebuild b/net-misc/smb4k/smb4k-3.2.72.ebuild
index cbab044124ff..797a9d0554c5 100644
--- a/net-misc/smb4k/smb4k-3.2.71.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.72.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=6.0.0
+KFMIN=6.3.0
 QTMIN=6.6.2
 inherit ecm kde.org
 
@@ -22,6 +22,7 @@ SLOT="0"
 IUSE="+discovery plasma"
 
 DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6]
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/kauth-${KFMIN}:6
@@ -53,7 +54,7 @@ RDEPEND="${DEPEND}
 	!${CATEGORY}/${PN}:5
 	plasma? (
 		>=kde-frameworks/kirigami-${KFMIN}:6
-		>=kde-plasma/libplasma-${KFMIN}:6
+		kde-plasma/libplasma:6
 	)
 "
 
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index 0afa8da96004..2fe38b0f0158 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,2 +1,3 @@
 EBUILD tigervnc-xorg-module-1.13.1.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
+EBUILD tigervnc-xorg-module-1.13.90.ebuild 458 BLAKE2B dddc7a3fabe0b412abea968dc134087325b1c70855c2c246d6fe411167883133da4d99f57fcc786103f818b2dfcceda9beb1e1499042861e5c5cdad45eca95ba SHA512 38e45e112970dc866a6f40edec73bd0bf266355f6c3a8be4d9351afa5798ceab443a157a33961db708725f1a1a458ea17c034947d3260bbbfc062e79a82366b8
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild
new file mode 100644
index 000000000000..65b3a6997f9c
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.13"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"