11 files changed, 35 insertions, 407 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 940522338f7b..858905b6e827 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 5d46d646fb0b..0c78fe645650 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -28,7 +28,6 @@ DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8b
 EBUILD curl-8.10.1-r2.ebuild 11386 BLAKE2B 4fc98c3aa27836ed387bee340f1c197bd1c3eeb902bc976de4a04e35df38df8e57f790d827583fb08e6634b160adbf35ffa97b036162542bbc540e5425bfa1b2 SHA512 be8490b399f27925e0f911f7aa4a21f4967c68b1e22b0c3e85776118b8db68161b7c9568f4f1fa85bdf4acbdc876068cf2054a17e04ba0640ceb18165091f30b
 EBUILD curl-8.11.1-r2.ebuild 11440 BLAKE2B 7b9b657400dc526b4f3e062d930861c11a783d6ca749df3d4673aa5409fed3c4cff25adea2263e8713de28db99b7a66a74fe0508c60773a028157af31e1ee2eb SHA512 5c80516ee662687c65e5f77e19469a8d36d65277f40110b3c3d54a6c94481aad0212ff98783f65ef0667b37b971cd7472f55b662eb1ad2754b6b881a4dd14a68
 EBUILD curl-8.12.0-r1.ebuild 11669 BLAKE2B 84f5d4b056b2f4a2e142cddd26d9c5d8143677350d2be116fe04c7dba6e7590fe075c02ba3466acb32091662f47254f489bef93ce8bb4c87edd3be1abb451a88 SHA512 b934aefa031d3242bbdbf6b676eab406ddeedf7d869361b800c42737dec6819f3bab7cd6618bc8ad8afdc72c0c965be93f57d2e03874e7ae283a053702a73626
-EBUILD curl-8.12.0.ebuild 11637 BLAKE2B e2263e9b91e5629d126cd3a151e0bc5f8cf289148d50d70df2237ff5d73c1afc4473813ac08081a2818e2b4069f7e7b7f9121cfdeb9025c19a7ca71263f8c7dc SHA512 98599baa5514c7a1010b149dc5b15610464a5f188f4ec2bc479102cac35a551e49f0418dad01236be277dc3619d129af4d9aab949a6b85ee3247afa4080e9294
 EBUILD curl-8.12.1.ebuild 11637 BLAKE2B e2263e9b91e5629d126cd3a151e0bc5f8cf289148d50d70df2237ff5d73c1afc4473813ac08081a2818e2b4069f7e7b7f9121cfdeb9025c19a7ca71263f8c7dc SHA512 98599baa5514c7a1010b149dc5b15610464a5f188f4ec2bc479102cac35a551e49f0418dad01236be277dc3619d129af4d9aab949a6b85ee3247afa4080e9294
 EBUILD curl-8.9.1-r2.ebuild 11436 BLAKE2B d3c76be0c731c44b2f5a2005f1820582c359128b4d1936789fd6d10bdfb8c6f2b9edeb12e978b5e211f2af4ee4a1381195ebcb4082ba756bd26fea7114b7998c SHA512 85430bf7f790d20368926e0b512277daff19f299517824d23aa7dc80fa96150b203abaa9a36736a7e6cc232a437198605df8860f84ae56c2d62027cfdbe7f663
 EBUILD curl-9999.ebuild 11637 BLAKE2B e2263e9b91e5629d126cd3a151e0bc5f8cf289148d50d70df2237ff5d73c1afc4473813ac08081a2818e2b4069f7e7b7f9121cfdeb9025c19a7ca71263f8c7dc SHA512 98599baa5514c7a1010b149dc5b15610464a5f188f4ec2bc479102cac35a551e49f0418dad01236be277dc3619d129af4d9aab949a6b85ee3247afa4080e9294
diff --git a/net-misc/curl/curl-8.12.0.ebuild b/net-misc/curl/curl-8.12.0.ebuild
deleted file mode 100644
index f8c605501860..000000000000
--- a/net-misc/curl/curl-8.12.0.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-	"
-	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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-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 / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/http3-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.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${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? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-prefix-4.patch"
-	"${FILESDIR}/${PN}-respect-cflags-3.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(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
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	# Since 8.12.0 adns/c-ares and the threaded resolver are mutually exclusive
-	# This is in support of some work to enable `httpsrr` to use adns and the rest
-	# of curl to use the threaded resolver; we'll just make `httpsrr` conditional on adns
-	# when the time comes.
-	if use adns; then
-		myconf+=(
-			--disable-threaded-resolver
-		)
-	else
-		myconf+=(
-			--enable-threaded-resolver
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index cc1683d5700b..ccb8e40963fa 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,7 +5,7 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04
 DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff
-EBUILD dhcpcd-10.1.0-r1.ebuild 4976 BLAKE2B 1f6d2267d9f45879b23321b23e61bf94d45ebee8636d2f3e7d2c0952205f00f136b234f59858f7d342b53977b7702a452f0bb64e46ab97978123c714e07b6abf SHA512 f986c753abd83ebacb0083d85dc747d5266807b73db634498279ac88e0316b807bee99a9ecaf1bfef5217d207160a6a4c6e710cb2cb6c93db915e1b1f658e0d6
+EBUILD dhcpcd-10.1.0-r1.ebuild 4975 BLAKE2B 4708e1afa8e197c93690a124f82f8b93dd8502feff79141f276f5691c15edcad79c94a72b2290e5bb0a00fc0dd92b5fa43d10206da0743cf9f5e16e649a85e2b SHA512 066e1195ae4049d7e5f899246801ef97915a5f78349f2570318ef1a8015598f4ea5a39fe000172220dee5e168eb506d7aa7db9331a3ceb0a8c7f30bbc5247a31
 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.2.0.ebuild 4975 BLAKE2B 80cd65893ab4a5c5b3cd6e9913278d2ecfcb013c40898e3a2f26fcf7ad2f8ac11825ccd26ba633ac420df20d46f6869c3e52c77c7afe286bb7e027262b0f5960 SHA512 5e3d62016332ee3c7c40c1ae2f2e1f23fc416d22a309f6f2f7122fc990a79dbb67f1bce03328abc1a6645a2e8f5cf2468eeac1225ee99539d1612d0f80de8d71
 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
diff --git a/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
index 008dcac7a8fa..fe148902a2c9 100644
--- a/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 89a8b66197c6..ab528d044d9e 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -2,9 +2,9 @@ AUX r8168-8.051.02-6.1-fix.patch 983 BLAKE2B 6c3ec1726f47ab51d702481a8e6817c2591
 AUX r8168-8.051.02-6.4.10-fix.patch 436 BLAKE2B 840f5c356ae3e9862b0d346186ee6a6b9e03d4b7b54453f80f3131e2cb5047f9f7ea61fba4a6f99f8a4b413f6dfcf973efdaec7e706b05c08f2a129727ccaf79 SHA512 c4e9400c331b9500ff87a0f44855570d4c4b20f814fc0c82cd3e8e076833df8ff91e4c581640f1db07c9453611d515a28f5118eb1db9d4124be620c2c6149dcf
 AUX r8168-8.053.00-kernel-6.9.patch 4625 BLAKE2B 6043101e08f3068369e42d80d848239e1de5adfcc40be29d1c6d1660758a8f0dda1543f4ab8c322e99af211a0a7d6127951b157b562c98e4f1652a513d4f2650 SHA512 444dd66d28696716cae8ab5be47184033aa1c16b275b0c604e96e85d616fdeeccb10cfb5d1cd44948a3238c3787b9193d5f126190579dd1a930681e5937964eb
 DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca
-DIST r8168-8.053.00.tar.gz 169102 BLAKE2B 4be044fec5edb78d3050c66f92ffce56487347c171da6d0e29593584e23b173536e48a18ffaf47df4e99999867a65b658a0deace333948bb0d77cd0f5c619719 SHA512 c44a63b04eb5cfb2b8ae434b26098c96067f7a2d6193e206801236fa38832b4f20a0b1a05a374f1d7d5b7ce973d38b6f49744f8b029e22930ebbd2763fbc6440
 DIST r8168-8.054.00.tar.gz 170346 BLAKE2B d237f8158434b86f123ad54615b3b7079ee54e066baf80304d19c9fcec247ebafb348340a01260f15692341add349ae6daf0f2ac4ad7953f16f804861c3a4480 SHA512 31b64c39ab3d4b8077e3a9880e20fdbfeee99e5fc3e26327d27085c2f97862ffa33af5d5c0ff7624c1216fa9230282ed835600c17ad4a6de8a87f29661156bbf
+DIST r8168-8.055.00.tar.gz 170917 BLAKE2B fc29066debac6d45f279f65a13e9dc812d270ec779f900acdc24a47dc94efd4ce65fb1d34553ff520ff9384382108b8fa14153bba70dbe58ad0eb8da2e39d30e SHA512 fb004b9921b75d984e847c9ac41fba58924f868485110dc4a8bc01933ec503f8a405b258d1c25f0884b1670aa0be4f4f250e36a176f31b4023032dc1c93577bb
 EBUILD r8168-8.051.02-r1.ebuild 1002 BLAKE2B 5d95ea2cd2d1ced3a6a93288e5822ef282db5eb142aab6ab72094c2ecba8c9b30216503297be8d95e03a2b55d30b3ad9806f52ff08fafad459219182ef29eaac SHA512 c6d44bec0bb85eee47187467eaceb55a991e250dc3856f18a48da305e0e954e60c42c5197503100e3588bcbdb31b60a0e2f55eb641b5a808b1f6338e80f6f809
-EBUILD r8168-8.053.00.ebuild 886 BLAKE2B fb798dda04751d136e32592811b85d09de08eead8193108dfcb9932fe5b3488c08195bccaa0768666b65c4a151a0e817ac060dad940cb32b9c324f829bfe6f74 SHA512 2dbe00c9402fd24e4c0a859e966cc8abd0de12f5af0798c37ecd6d218e70ec90d092e2e7d5facd8380ca78ebea0428582e451268a5f70caba218a4edfccbfe6c
 EBUILD r8168-8.054.00.ebuild 886 BLAKE2B eaf3dae01051fe7d2a43e7168c5d8659addb2039c8999907ccfe1de9ae588e6c74004acdb9f9c04aecc33f8b8838f8356b9878bbe5c214abc6d09bd434ffc333 SHA512 ca1dbd637b1a8f3ea2d789d1a77ceb1cf0ef558908cdb6a6b01d79a621713985bfa422f83c9e4c944ad1b59880f99238a416f267580deefb8b0bb9963d054f67
-MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
+EBUILD r8168-8.055.00.ebuild 1306 BLAKE2B 33497d647e637c6e69bae3c59944f08190c8b00fbcf4a202d190392214fbd928926b1628a5e0dae24d7ff15fa15751c3285751d7b0efd138f90015b6b79a64ad SHA512 d59082a0d01142b47f238c74f0347f7b8b02c277f3245167253ed33dfe1eb1f32e2870da4e02e82da9ab3fc2396155aee8a0fdbca322af5a7bab82569d896568
+MISC metadata.xml 1346 BLAKE2B 624e1a893cd566842358aaa4f1a683abbf2605a7a6dd735b41c49fbd0f0b5db2d2065c48a47a85b75aa490bb4395f35fc23b4f769fced369c5bee79eeb1c5147 SHA512 b704ed7fe8633ae9b5205b75122c78752eba6a8b4602e68af99937bc3ec5089a9708b150b73c37fb9eb46fa982deddda21dce6ad9cdcced77cbec798a604ea22
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
index 465ce5403e32..5968d1ccbd07 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/metadata.xml
@@ -9,6 +9,15 @@
 RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
 RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
 	<use>
+		<flag name="down-speed-100">Reduce speed to 100 Mbps in WOL-only modes</flag>
+		<flag name="eee">Enable Energy-Efficient Ethernet by default</flag>
+		<flag name="giga-lite">Enable support of 'Giga Lite' (500 Mbps over just two CAT5 pairs) by default</flag>
+		<flag name="hw-acceleration">Enable use of hardware acceleration by default. HW acceleration may cause problems on Realtek NICs!</flag>
+		<flag name="multi-tx-q">Enable Multiple Tx Queue ('RSS' for sending)</flag>
+		<flag name="rss">Enable Receive Side Scaling (RSS)</flag>
+		<flag name="s5-keep-mac">Keep set MAC address in S5 (switched off) by default</flag>
 		<flag name="use-firmware">Enable support for automatic firmware loading</flag>
+		<flag name="wol">Enable Wake-On-LAN by default</flag>
+		<flag name="wol-s5">Enable start from S5 (switched off) by Wake-On-LAN by default</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/r8168/r8168-8.053.00.ebuild b/net-misc/r8168/r8168-8.055.00.ebuild
index 940d0ae9f3df..056afbf2755b 100644
--- a/net-misc/r8168/r8168-8.053.00.ebuild
+++ b/net-misc/r8168/r8168-8.055.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,22 +11,30 @@ SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="use-firmware"
+IUSE="down-speed-100 hw-acceleration +eee +giga-lite multi-tx-q rss s5-keep-mac +wol-s5 use-firmware +wol"
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-PATCHES=( "${FILESDIR}"/${PN}-8.053.00-kernel-6.9.patch )
-
 src_compile() {
 	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
 	local modargs=(
 		# Build parameters
 		KERNELDIR="${KV_OUT_DIR}"
-		# Configuration settings
+		# Code build options
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
 		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+		CONFIG_DOWN_SPEED_100=$(usex down-speed-100 y n)
+		# Driver defaults
+		CONFIG_SOC_LAN=$(usex hw-acceleration y n)
+		ENABLE_EEE=$(usex eee y n)
+		ENABLE_GIGA_LITE=$(usex giga-lite y n)
+		DISABLE_WOL_SUPPORT=$(usex wol n y)
+		ENABLE_S5WOL=$(usex wol-s5 y n)
+		ENABLE_S5_KEEP_CURR_MAC=$(usex s5-keep-mac y n)
 	)
 
 	linux-mod-r1_src_compile
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index db8824cdf0e6..b8328a4ffb78 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.15.0.tar.gz 2126369 BLAKE2B c8646860884ae8fec7f81d9e87967bb279e7
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
 DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
 EBUILD tigervnc-1.14.1-r3.ebuild 5627 BLAKE2B db59a02eb600fee173539da9f7949e4e9cabb3dca487bb12f1983362888dc4a264f25c6acdcaac4427aeb3ce9e67431974ce08c4bdd292d3bfe1b5012c9249bd SHA512 7a9a27c13a46a9370cb18a494738f6e53524450d085bc00d84b7a789f97757ee1e301886a71baa294323afea810ffd69c81f565ea42db439759c04a4cec4228c
-EBUILD tigervnc-1.15.0.ebuild 5632 BLAKE2B 5601cb2151bd100e543b49e6d0cfa4b404e6e84d3d42cea799a42c1b41a5e0fb167a6c2d4791c43155484189a577d0c3e2b31d8818d6757ea7ccb41392049bc1 SHA512 9d2523d4fe1255f281023a00be26a07f5da5ab82f4d4a7f053210dc376524294e4979306a29e927d8d50fb049f3c768c48d6e99b1370e31c6820ea7be34e98ca
-EBUILD tigervnc-9999.ebuild 5543 BLAKE2B 956f93a567fdcb35afcf62b46fa316b44a7da1ea997ca64e173af535f1d1e8b0f742577b66fb5bb87b2a609ae03dfcd8ec1379408c1eb495f7c9d13ab3064571 SHA512 818c1b9025f391170d2fbe565e2c372e59b722289ab518533836b9548e930f66b600fe06b9badf1e3bfaac9afd560222a673959e884ea52dcb6d44e9047dbf81
+EBUILD tigervnc-1.15.0.ebuild 5589 BLAKE2B f584f9a0d90c45920441569c28652a1f7be7e58eedc35966a23c1a44f75053304554c53a895a4e8315d4427d01534ff0835ffba0f5ddfdd0af978855cb4da5dc SHA512 f9d3fad99da577d5e0a4208d25f3c1721c4b471f379b6c690949f5baa893d1f4e758c148132215148b3ad5225abaea9b33e787d8ec8f1ca7d5f402a8b1c65b27
+EBUILD tigervnc-9999.ebuild 5500 BLAKE2B 5b96af09bf491a9a0cdd87b8a0cf77360759e2e5550deeab0b626b3b4cf909d437fd317d57757e2ef93cbf8f8b2a2b997d8b7d861148dce3f4c44e5b15e90a44 SHA512 6f2a2b0a5d11a6d26d6faec08fa5e670d28e735b13d562e0af6ab6c2e201d031f845884586c5e67c40cf810bcebeb06cd00e6bbdb66cd3e6e66d5704f0624ab5
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.15.0.ebuild b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
index ef7fe09fa151..182341e8300f 100644
--- a/net-misc/tigervnc/tigervnc-1.15.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi9-ver flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.15"
 XSERVER_PATCH_VERSION="21"
@@ -216,7 +216,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+	use server && ver_replacing -lt 1.13.1-r3 && {
 		elog 'OpenRC users: please migrate to one service per display as documented here:'
 		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
 		elog
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index e6b48ddae8b5..fc3969c4f12e 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi9-ver flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.14"
 XSERVER_PATCH_VERSION="21"
@@ -215,7 +215,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+	use server && ver_replacing -lt 1.13.1-r3 && {
 		elog 'OpenRC users: please migrate to one service per display as documented here:'
 		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
 		elog