gentoo auto-resync : 06:02:2025 - 00:10:59

22 files changed, 431 insertions, 562 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 33f853c2e692..4f18effc0e6a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 2a6b9d879490..6b5796ca3350 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -12,21 +12,19 @@ AUX curl-8.8.0-multi_wait-timeout.patch 2732 BLAKE2B ae2f40f6dcec16761d959fe5eea
 AUX curl-8.9.1-sigpipe.patch 773 BLAKE2B 7ef3bbd4ca9558621b4f1ea5cb9847705cd6331b7f3d5d2a950642d090c789b802c0ff4f96ff2805b9e1dfe807b14daaee223dbcb2ff1426458dadb3e71d1e79 SHA512 55e55da046425e9a60064ff79ec3f8ab37a10275210f46cfb10ad29e9a29cb137a28ba6a0effa90bfc46d687aab929565b97bfa7549ac8a202746e332d1fa6ed
 AUX curl-prefix-2.patch 1075 BLAKE2B 657ac450c9d50a08f62be72dc9d1bc68c494dcc0c8153f1a89d5cb50d240aa6bcd56b48242ed3ea1352da5cd5d98b8c6daaff6fdcc672a95a0233db1f8d27bdd SHA512 91a531291426477a68108dcc40656e6a56caabfda26f351d4b7cdb39e66f500ffd532f2417a81c5a789ea624b4f6325aa8006155292910612e54ab3d9daa3620
 AUX curl-prefix-3.patch 1068 BLAKE2B dbaf21f38874a308557997d6a3a7a1f9fdb817b22d9846b4d6bd2bae413b7177650f20f17b10bfcc4a6747a89470dc2672ce79ba67d08fc92ebbbba353ba6c3a SHA512 c10a0062564be885f36e7c37bb58f3aa59c387369b9aae6342f818d4671e31cec99fd9ddda3577f03d1f8e87b926b8d75b006ca543f41a264e8595af79242b62
+AUX curl-prefix-4.patch 1078 BLAKE2B 3211f94da95bb4299c3ffb34db160f92ca5ffaf2995854a97f5fa935895d31e39fe52bc9a9459071f2ba844a8bb86cbacf6fe9dc0e337499138507420d4cbf91 SHA512 ca2cec79636d69d38da41292d8da6d682c5522f0afc883b3210506f8c9c532e8231c205b7b940272de2d085be28cc3838ac721302377fef634751bb40b3b3941
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-8.10.1.tar.xz 2726748 BLAKE2B bfdfa24f6d652884044c5e8eea5d70daad651b46255c99c9df502f9595a2dcbf8c4034446becf9e87f8e8a3f397a8fda29ab3e0d6020ac0dae62dd42b8136b78 SHA512 f1c7a12492dcfb8ba08be69b96a83ce9074592cbaa6b95c72b3c16fc58ad35e9f9deec7b72baca7d360d013b0b1c7ea38bd4edae464903ac67aa3c76238d8c6c
 DIST curl-8.10.1.tar.xz.asc 488 BLAKE2B 8e8f2b628d4e8964a76c1c43c5557aacbfc2d2dbc51be8a0fa1b157c257f15f29aedba842cba7cb270c4adcf0b4a5d9c8b0b3d49633c48b061fb3e1472303d66 SHA512 21d6d560c027efc9e3e5db182a77501d6376442221ba910df817e2ec980bee44a9fe2afc698205f8d5e8313ae47915a341d60206a46b46e816d73ee357a894ac
-DIST curl-8.11.0.tar.xz 2750684 BLAKE2B 3db13ed558bee332e07e1eab878b5ecae14cd049c115eea3a25fcb78cf28aadfe577dc224df75b62844529994ec478a9a74fed5c9bae338f809d231420ae5d0a SHA512 3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e
-DIST curl-8.11.0.tar.xz.asc 488 BLAKE2B 5d91dc654d6a62c66e344ca92676b42e7a49f437e14f9fb714f7ae64a266d24d9bb7006b4512fc323459072ff0d9e05f627e494f34f845eadbedbd83acacc2ce SHA512 71073dde48e8f0013e392eb88bf70f6b8a4a4f0c955a3fb56db98e74aa10acc1004e2a0483f30be082e61b59a76fa75ae1d90545ace7c6b07bca8164078375f0
 DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f6c63145205fda18f33ddd3adce386058ead8f9b713f8e595f5e059acd13479eb00edc226247aabd3c2234112 SHA512 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57
 DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
-DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a
-DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
+DIST curl-8.12.0.tar.xz 2777552 BLAKE2B b38c7465a38f6bbdc6daa1e8a27dc810f970c9172ddf532881e83965e1fa6001beff1bf358e5138e1a0ae1121d877f6a5a4f38ef7ea7e03c8b06dc46fbf24022 SHA512 ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
+DIST curl-8.12.0.tar.xz.asc 488 BLAKE2B 8977dabab96b6f188e8b16497e7a4e589f05b5512a9bc6ec0ee36797615c720b9cb5c34bc90df6ee037d898b8fa7f708ad2b2ff789163adcb5308a2e0d7cf9df SHA512 8526554ffb2187b48b6a4c6a0d4a8c73d484ef3ce4c3791add0e759baf953ac7ae0b2f88d688365b1f09c5745198611fa1761aa14d02ddf52823c4ff238779cd
 DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
 DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
 EBUILD curl-8.10.1-r2.ebuild 11386 BLAKE2B 4fc98c3aa27836ed387bee340f1c197bd1c3eeb902bc976de4a04e35df38df8e57f790d827583fb08e6634b160adbf35ffa97b036162542bbc540e5425bfa1b2 SHA512 be8490b399f27925e0f911f7aa4a21f4967c68b1e22b0c3e85776118b8db68161b7c9568f4f1fa85bdf4acbdc876068cf2054a17e04ba0640ceb18165091f30b
-EBUILD curl-8.11.0-r1.ebuild 11727 BLAKE2B 8386cba44cc2c6ac8a8dad85d2a9217dffe9afe40ddf48b426a72cd8359431a27e5e1551b3b5ccc1235c0f951d4901133cc2cdab961486e161300581775070e3 SHA512 42c57478c0414b8aaaac8172e284ef1b2f90f4e8eef5474657413ee220865840861a18553edb6de7f214e9a72d899f646cb9cb0db6db23e68e3e4e280c65c782
-EBUILD curl-8.11.1-r2.ebuild 11446 BLAKE2B 96b3d96450b93d129a41ef870fe5121fa438292093d31cfc9eae7d159b16472f989291124e75c20afe05ed4cf8abff924a802a921db8e1c8b1097525f158a23d SHA512 0aa07995ce7ec28de0b8dc12e86d07cca1998ffb96d7f3cae0f5497fb647822ce6cdf8a76aeeac2dba475b0acda205a21794ec88c22609432d94f162d9326a6e
-EBUILD curl-8.8.0-r2.ebuild 11487 BLAKE2B 3b5110df27891b5284b0be5d4a6803098bf59994b50131c08eae5879ceab4a50f17a9300abb00bd0224154e1cd856b5d589af287fd1ad700e6b345acbe1b06b6 SHA512 8cc6d797e02e88c3886e890f5add39dd47a65d7f41a23a9f9f5baa92f769cae3e0138aa7dd269a7fec81a8db77c05bb3e8916fbbc8603c5ba4b764f10e138307
+EBUILD curl-8.11.1-r2.ebuild 11440 BLAKE2B 7b9b657400dc526b4f3e062d930861c11a783d6ca749df3d4673aa5409fed3c4cff25adea2263e8713de28db99b7a66a74fe0508c60773a028157af31e1ee2eb SHA512 5c80516ee662687c65e5f77e19469a8d36d65277f40110b3c3d54a6c94481aad0212ff98783f65ef0667b37b971cd7472f55b662eb1ad2754b6b881a4dd14a68
+EBUILD curl-8.12.0.ebuild 11637 BLAKE2B e2263e9b91e5629d126cd3a151e0bc5f8cf289148d50d70df2237ff5d73c1afc4473813ac08081a2818e2b4069f7e7b7f9121cfdeb9025c19a7ca71263f8c7dc SHA512 98599baa5514c7a1010b149dc5b15610464a5f188f4ec2bc479102cac35a551e49f0418dad01236be277dc3619d129af4d9aab949a6b85ee3247afa4080e9294
 EBUILD curl-8.9.1-r2.ebuild 11436 BLAKE2B d3c76be0c731c44b2f5a2005f1820582c359128b4d1936789fd6d10bdfb8c6f2b9edeb12e978b5e211f2af4ee4a1381195ebcb4082ba756bd26fea7114b7998c SHA512 85430bf7f790d20368926e0b512277daff19f299517824d23aa7dc80fa96150b203abaa9a36736a7e6cc232a437198605df8860f84ae56c2d62027cfdbe7f663
-EBUILD curl-9999.ebuild 11393 BLAKE2B df200dae83a68044d5d393c2ae35bfa20a00f297398436879050b54a6a19a26c4544e292f0794b48ee802b18e3c76a3f8828ba29b323c55b083a0646a4f9cf45 SHA512 e09178525e2172a55e6fdcbf7d5b6127063912b9b4903a53c036459ae40653f500b5d86dd647731f775ca5c4b2706433168c5a0c51cd455e0b2d4a08d9e901d7
-MISC metadata.xml 2215 BLAKE2B aa0851849ffda831aeec7a6315d23892c35680ab42c0bc9a5662238e7b8289d5f48d5f2a60ab0bacba06f71271bf60d14958bfec029a048f732d22fdc60faded SHA512 7da9247a1bbb533ae0bdc919f5bd2ad7ed298a7f9e986dce6d2471cedeee9f1542a8ef79b1fdbca5a1a0d33194b99ff3d3f5c27054ac01a3f1e40a1e94d6c1b2
+EBUILD curl-9999.ebuild 11637 BLAKE2B e2263e9b91e5629d126cd3a151e0bc5f8cf289148d50d70df2237ff5d73c1afc4473813ac08081a2818e2b4069f7e7b7f9121cfdeb9025c19a7ca71263f8c7dc SHA512 98599baa5514c7a1010b149dc5b15610464a5f188f4ec2bc479102cac35a551e49f0418dad01236be277dc3619d129af4d9aab949a6b85ee3247afa4080e9294
+MISC metadata.xml 2129 BLAKE2B 89432da852617c89e67c8927a7dddf43a4b69753b201623a7d94071724bc1dd9a936cfabfce6cb224700a47d33257f4945bbb695bfde5d20b9fd4796bd712242 SHA512 8ac6fa9535920904ff70c5cadf1fe28b1e806deff5b37a5a326e9ec25d6c54cc1bf2ecbfd8843af34b26dbe270a1a3ac3ca8ec8730d62180af8237fae5ba255a
diff --git a/net-misc/curl/curl-8.11.1-r2.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild
index 96c0bc7723d3..1c959b004fb5 100644
--- a/net-misc/curl/curl-8.11.1-r2.ebuild
+++ b/net-misc/curl/curl-8.11.1-r2.ebuild
@@ -21,7 +21,7 @@ else
 		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"
+	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 )"
diff --git a/net-misc/curl/curl-8.11.0-r1.ebuild b/net-misc/curl/curl-8.12.0.ebuild
index 256378637261..f8c605501860 100644
--- a/net-misc/curl/curl-8.11.0-r1.ebuild
+++ b/net-misc/curl/curl-8.12.0.ebuild
@@ -156,15 +156,8 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-prefix-3.patch"
+	"${FILESDIR}/${PN}-prefix-4.patch"
 	"${FILESDIR}/${PN}-respect-cflags-3.patch"
-	"${FILESDIR}/${P}-cmdline-ech-docs.patch"
-	"${FILESDIR}/${P}-curl-libssh-ipv6-brackets.patch"
-	"${FILESDIR}/${P}-mbedtls-global-init.patch"
-	"${FILESDIR}/${P}-setopt-http_content_decoding.patch"
-	"${FILESDIR}/${P}-cookie-case-sensitive.patch"
-	"${FILESDIR}/${P}-duphandle-init-netrc.patch"
-	"${FILESDIR}/${P}-netrc-large-file.patch"
 )
 
 src_prepare() {
@@ -277,15 +270,12 @@ multilib_src_configure() {
 		--enable-socketpair
 		--disable-sspi
 		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
 		--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)
-		--without-hyper
 		$(use_with idn libidn2)
 		$(use_with kerberos gssapi "${EPREFIX}"/usr)
 		--without-libgsasl
@@ -321,9 +311,17 @@ multilib_src_configure() {
 		)
 	fi
 
-	if [[ ${CHOST} == *mingw* ]] ; then
+	# 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-pthreads
+			--disable-threaded-resolver
+		)
+	else
+		myconf+=(
+			--enable-threaded-resolver
 		)
 	fi
 
diff --git a/net-misc/curl/curl-8.8.0-r2.ebuild b/net-misc/curl/curl-8.8.0-r2.ebuild
deleted file mode 100644
index 89b07c74c60e..000000000000
--- a/net-misc/curl/curl-8.8.0-r2.ebuild
+++ /dev/null
@@ -1,387 +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 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"
-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
-REQUIRED_USE="
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	nghttp3? (
-		!openssl
-		alt-svc )
-"
-
-# 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/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.
-
-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}] )
-	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}] )
-	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.13.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}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES 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-2.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${P}-install-manpage.patch
-	"${FILESDIR}"/${P}-mbedtls.patch
-	"${FILESDIR}"/${P}-multi_wait-timeout.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)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--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)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		--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 nghttp3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	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
-
-	# 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() {
-	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 which 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/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 5a37525caae2..f8c605501860 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -156,7 +156,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-prefix-3.patch"
+	"${FILESDIR}/${PN}-prefix-4.patch"
 	"${FILESDIR}/${PN}-respect-cflags-3.patch"
 )
 
@@ -270,15 +270,12 @@ multilib_src_configure() {
 		--enable-socketpair
 		--disable-sspi
 		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
 		--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)
-		--without-hyper
 		$(use_with idn libidn2)
 		$(use_with kerberos gssapi "${EPREFIX}"/usr)
 		--without-libgsasl
@@ -314,9 +311,17 @@ multilib_src_configure() {
 		)
 	fi
 
-	if [[ ${CHOST} == *mingw* ]] ; then
+	# 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-pthreads
+			--disable-threaded-resolver
+		)
+	else
+		myconf+=(
+			--enable-threaded-resolver
 		)
 	fi
 
diff --git a/net-misc/curl/files/curl-prefix-4.patch b/net-misc/curl/files/curl-prefix-4.patch
new file mode 100644
index 000000000000..796b67fd927f
--- /dev/null
+++ b/net-misc/curl/files/curl-prefix-4.patch
@@ -0,0 +1,35 @@
+From f18f4362d7ca60fb12248a559dab26aea330771c Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Wed, 5 Feb 2025 17:27:11 +1000
+Subject: [PATCH] Update prefix patch for 8.12.0
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+---
+ curl-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index 55184167b..df31fdb46 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -141,7 +141,7 @@ while test "$#" -gt 0; do
+     ;;
+ 
+   --cflags)
+-    if test "X@includedir@" = 'X/usr/include'; then
++    if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+       echo '@LIBCURL_PC_CFLAGS@'
+     else
+       echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
+@@ -149,7 +149,7 @@ while test "$#" -gt 0; do
+     ;;
+ 
+   --libs)
+-    if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
++    if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+       curllibdir="-L@libdir@ "
+     else
+       curllibdir=''
+-- 
+2.48.0
+
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 884608c7c1f5..b3581ad82856 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -17,7 +17,6 @@
 		<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 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>
diff --git a/net-misc/ethflop/Manifest b/net-misc/ethflop/Manifest
deleted file mode 100644
index a7dc4c01889c..000000000000
--- a/net-misc/ethflop/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX ethflop-20191003-makefile.patch 350 BLAKE2B b268ad12b98a3333397906570ac261caf06761df6d195366be1a889baabee6a49d402208c01bab6d1fa816cae6caf0222a94bd691d977a86320886bf145f47ca SHA512 f160b0285864cfdc076b354cf5e5a7738e3d58d9a22d984ffb754d1616eea24d00b6c2f5854e495feddf59ea383b0acb81d284a611b2f4726f3106b6337a432d
-AUX ethflop-20240916-makefile.patch 252 BLAKE2B d594316713c7aa548900b961b16818cc0979ed9e8cc4eef7c5007d13dc5922701e6a92d6e0ef3d2a9dedb68d2f2c59b4addcfd654aa3c55be5c8117d9e222273 SHA512 df349393d3eb4372627831b72c5915d38f845eebbf8f8119e740a03821e9ef0d624614c2ba876e654317732ddc3aab7bcba422e9b12dceb81dd189c137bbd847
-AUX ethflopd.confd 270 BLAKE2B f88ff41ed7b083b3251b0aed5612eefbb4e6d652f4ba7fcbae7dfbcf85fe072a478abdc07ff9051869a2fa4a9b9051749a138aef2d5cc79fc00b2dc341cb0b03 SHA512 d46fba4546f6146cd11cc2e161943ddd20720f78749664d72a0f14e3e012466d0d882bafcbba2794c6630c735cc6bf204e4e1baf90a98b892cc92c8debf8a318
-AUX ethflopd.initd 236 BLAKE2B 938ff83700a252586b83b4d3f209a71bafe3b9ec87e1fff8ac86ceecd00ddc245c2e74dc7f66aed940fc7fa858c027c7ea1482343f0c59e86aaba393ec9b16f7 SHA512 974369721f6da77da247bdac70e077f4b93323af4ccb3ba5db30e6901c5a6962007592dcece1650c1e6fec12be9b9c8088b42fddec3db2ecb506e044292a5b8e
-AUX ethflopd.service-r1 185 BLAKE2B 1d5f50667e826b2545e66fa1fd41b1dcc232b7eac2d207e3ae3bff24445e9af6088ec1c85891b95b209ac5e2cf42a542290674044f98baf7634a554d9fd86ae4 SHA512 5f35d6a527a7c9b287df43b3a9c0d1173a9ebcfb292aede867617a268e00c70ad985416b9844bee872bbd2bc030c53fafe30ae18ebdffb328985fa6f418358b7
-DIST ethflop-20191003.zip 29858 BLAKE2B e5a4068d45c398d6c7bfd08299b57566c3d30bea4ef79692cae065adb61f3c41fd3ed568260e82e19d90e17c7b6d92c0698bb7f7c40edea9d44804a7a61e18ae SHA512 808e65d45e2ff74380bc2f1a31b7bb59fdca4acdf44eb7f60deef9aa0976462ddc64982e8a7b7c225d7f88e11a33dfcdf73fd7169f942018976d4d086e7ec477
-DIST ethflop-20240920-src.zip 22250 BLAKE2B d644c2e2cec9a6d0d303c38412833ff46c26a572138e7bbfbac55437895deb36e843685ee25e5797b7dacb2842b6c7896e6f9e4d819154f1cd2f1a95ca10b721 SHA512 6dc84b1db4fd6a83037c1f1395da5cc4bf5f43b9650f64d20c05fef4ceccdca1661e890a96f85e7a96ee94ee89b1d96994bfbe8d048a8f7d690e53f21ebde518
-DIST ethflopd-20240916-src.tar.gz 55737 BLAKE2B 8b6a886829f1f7c19c95965b48182c66da04d6f5364ff0cc1b820db62794f33e64900c9df6e7584a0ee3190d70121c7d52853f1d54bf9977e9f0fa7af6e2dfbd SHA512 b442dc4f0be8357cc406c0f67aa4234bebfb648c42342b0858ee06d162386323e2fa89d1d7d54d327b07c10f50bc5452958fdd8b41066a8bece08e4a65aa59c3
-EBUILD ethflop-20191003-r2.ebuild 831 BLAKE2B e2684199e3678475d0da4b23c027644db18ddaeab45e43c890718319d8f0062ed0c078c6d0f6e03934fde2fc865db4e4de04d35d7014aa793045cf20e883413d SHA512 f9b10850124e873b2399592f4e2847e11fe355c81e69f224e1eb2ce0894119db27696940552a04da6bcf24cf704f390f17aa55584378bdf546d20484fd677527
-EBUILD ethflop-20240916.ebuild 1193 BLAKE2B 6a460c73108ce97ac40e6267cff7858c4bb800d3687f7d21749687f89bb1340f508f12b989f5c8371f5454568de855ab5f0988c71b5c86bdfb655b2342252aeb SHA512 2be4c3d4f77c35f159816a4d7722cbdc2834f7b3763dbd2f6d42b60b0d7a305a7024b784b53953e755de7fd6bfefe066c5a5280ee41e1f2e4d825b475344a620
-MISC metadata.xml 1005 BLAKE2B 53476c21744a6300cf693817062667c1db71a9fb85c174b37802c5bd875bee9e5a6b396a7d09ffd10c49bc9e8d63daa032823db25bc0245155acb8c89ed1b339 SHA512 fd7a538735fafb244a27a33539650ea56d06e97655843b7fe1436b461a8c113db9a2fee524571b2fb55ec01e8a47a0bd9ee0b63aae623f172a83c56bb0a7315a
diff --git a/net-misc/ethflop/Manifest.gz b/net-misc/ethflop/Manifest.gz
new file mode 100644
index 000000000000..833ecc5da297
--- /dev/null
+++ b/net-misc/ethflop/Manifest.gz
diff --git a/net-misc/ethflop/ethflop-20191003-r2.ebuild b/net-misc/ethflop/ethflop-20191003-r2.ebuild
deleted file mode 100644
index 714882673aba..000000000000
--- a/net-misc/ethflop/ethflop-20191003-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A network-backed floppy emulator for DOS"
-HOMEPAGE="http://ethflop.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tsr"
-
-BDEPEND="
-	app-arch/unzip
-	tsr? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
-
-src_compile() {
-	tc-export CC
-	default
-
-	use tsr && emake tsr
-}
-
-src_install() {
-	dobin ethflopd
-
-	if use tsr; then
-		insinto /usr/share/ethflop
-		doins ethflop.com
-	fi
-
-	newinitd "${FILESDIR}"/ethflopd.initd ethflopd
-	newconfd "${FILESDIR}"/ethflopd.confd ethflopd
-	systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service
-
-	dodoc ethflop.txt
-}
diff --git a/net-misc/ethflop/ethflop-20240916.ebuild b/net-misc/ethflop/ethflop-20240916.ebuild
deleted file mode 100644
index 772d9062cd8a..000000000000
--- a/net-misc/ethflop/ethflop-20240916.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV_TSR="20240920"
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A network-backed floppy emulator for DOS"
-HOMEPAGE="https://ethflop.sourceforge.net/"
-SRC_URI="
-	https://ethflop.sourceforge.net/${PN}d-${PV}-src.tar.gz
-	tsr? ( https://ethflop.sourceforge.net/${PN}-${MY_PV_TSR}-src.zip )
-"
-S="${WORKDIR}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tsr"
-RESTRICT="test"
-
-BDEPEND="
-	app-arch/unzip
-	tsr? ( dev-lang/nasm )
-"
-
-PATCHES="${FILESDIR}/${PN}-20240916-makefile.patch"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-	# Files are shipped uppercase, but need to be lowercase
-	if use tsr; then
-		for file in *.ASM *.SH; do
-			mv ${file} ${file,,} || die
-		done
-		chmod +x build.sh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	default
-
-	if use tsr; then
-		./build.sh || die
-	fi
-}
-
-src_install() {
-	dobin ethflopd
-
-	if use tsr; then
-		insinto /usr/share/ethflop
-		doins ethflop.com
-	fi
-
-	newinitd "${FILESDIR}"/ethflopd.initd ethflopd
-	newconfd "${FILESDIR}"/ethflopd.confd ethflopd
-	systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service
-}
diff --git a/net-misc/ethflop/files/ethflop-20191003-makefile.patch b/net-misc/ethflop/files/ethflop-20191003-makefile.patch
deleted file mode 100644
index 7005dfdbb44b..000000000000
--- a/net-misc/ethflop/files/ethflop-20191003-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile	2019-10-03 23:02:15.000000000 +0200
-+++ b/Makefile	2019-10-15 08:31:49.541999473 +0200
-@@ -14,8 +14,8 @@
- #CFLAGS = -O2 -Wall -std=gnu89 -pedantic -Wextra -Wformat-security -D_FORTIFY_SOURCE=1 -Weverything -Wno-padded

- 

- # production

--CC = gcc

--CFLAGS = -O2 -std=gnu89

-+CC ?= gcc

-+CFLAGS ?= -O2 -std=gnu89

- 

- all: ethflopd

- 

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 823f686f8f80..16936f71cbd8 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -3,10 +3,14 @@ AUX frr-8.4.1-logrotate.patch 2487 BLAKE2B f3eb9b9ce25dd9dd796668ecef5dfeb51b5f3
 AUX frr-9.1-mimic-gnu-basename-api-for-non-glibc.patch 958 BLAKE2B 669961fd225132acf04133339a15828ade83df847b2853687fd41ea71c3f33cffc829be1d008351e144092e5ddf1f1c21532c2552bfc8a485db8154fcad78006 SHA512 bf96b96008ff7c5eef4b1773a6694458b3bae3b6d96ecba04b7cbfe1a54e74212bdc6c30bcc443d0f9c5ce27bb4d9fe21f6aef959d949899329fadecb8e7918c
 AUX frr-openrc-v2 7079 BLAKE2B abbad56f0715b79ba5ba24df373ccb8ab63caa12b04d892693b060c771d47323fd7fcebd9b5688720d4aded23fcb79a36e89a7734b315b0862d16e5ce08d8b10 SHA512 5744c433fd983a56abb8f45e34229b3ab3a03c3e9d5532e2b30a31f3e875076fb56b81a06e661dba7df9f76e463190e831c82ae79deefe1add22d7f0365098ce
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-10.0.2.tar.gz 10968487 BLAKE2B 420503f25e2e40ce9f53cbb04416ba6d2fd8c7c0958f2d42391d7b534e0547e9ee429ad419cb87a06331efa75603bac1a8439844fe6a478f3b5513e656cab726 SHA512 d37373faab6b004b2bb3d99bee76a4a620ef9dcacfeadb9bbea611cb01ece869467583cde656715d50912b44a84da27103da9b2e76da8bcec9c95436ac45393c
-DIST frr-10.1.1.tar.gz 11044980 BLAKE2B 32e50394c35712bc4799cae23c369aca6307d92b20a52ca9c2264b9ee82798d4372816cf87fc6e5c00c14d7aa85b08d3560f7ef6e0d72dd2a2ad231f8f7e3841 SHA512 c555bafc7437e8ba0216bd9cc7e0a432af4c9877255ab4ffdd97a0b7626eb3c9022051b91f6cd5d27d06531f6edef84742b67169ebbc040b8a904e58712cb654
+DIST frr-10.0.3.tar.gz 10968934 BLAKE2B 18ef81af21b9ca2861dd66c7c3d4ec7faa2ba322793d1a7d4f16e967be01f0776b82e7cffb70ba289770008ad64f44117fb108ba4f88fdcb444483e89deac6ac SHA512 ca2011d720d1069a574dc4a5d87c07b7a9556d1eac7078d5f4a2eed1bac458eea41b5f1c3d0a6df78fe3fae0dab45ce5b701b60534cb219919f67ee4e22bd1a5
+DIST frr-10.1.2.tar.gz 11046539 BLAKE2B db983becc4c00256cfc87032252f85f763d9acfdc5eb8488206b32fe8caddfb8e9371808d929cb708b4df1a32d2a2df148d036f3eef98ff432812ae6a865d539 SHA512 257844687c0132819bedf559a527217d4c01abfa6b98c787f18f24e5006a53d9d3e561b22ab36631d691ba53d3f206c1d52d8020cb1b962d7ad117b159f674c6
+DIST frr-10.2.1.tar.gz 11178677 BLAKE2B 8bcc8ccf8febee1012d94a9f3de40cc177bec1af464cd935303df8859a72607d03e5f9030f05bed5d56a7a413a0029479f538b3c0b35acc4a66295b4229f6be1 SHA512 8544280a0c536e8688cbf2811d96cdc2fa3413f662013bb1b58cb02d4d56a08d98e870b39e477f6b0294e6aceb5dcc99c5facdeee165ce7597c2150ebb79101e
 DIST frr-9.1.2.tar.gz 10790677 BLAKE2B dfa4967ee0e0bbecea016b9deeb70b1c1b9e409469de145050602608dddd41857be946e8df5c8a594dfaf6a124729af55d7ce4483e6fe6edc41125f09d9dabd2 SHA512 e0ed613090140ece181bff077a7067a00a5fca648ec6627c02d815060087497c68712c1ba244fa1534cdbcef49db92bd9432545d05027dc4b04db4f423726882
-EBUILD frr-10.0.2.ebuild 3589 BLAKE2B 6cbc18f29644015bcaf316c8fa3b82de71f94081ba75c1798ee82133254939a1a93e0d4bec931b4eec03268fe8a072a4000e6e662519747385803f8754613148 SHA512 995f319edb9ab65e0985fe0b81e3831092a50d6ae9dda3f0f83fe6fda8e1efeec5fc2ce38e26911ffbe1174cbd9e0d467230b16e8a333cdeedc1b557da85b591
-EBUILD frr-10.1.1.ebuild 3590 BLAKE2B 28cbff36c8d3f1dae34807c82d69a2f7a19f16bef5dc2a6c0793886189573ae18b0bee7e4c0456c6129c9390d11a57e43d933463d5f8350bfe16948742811401 SHA512 67d15ab63a9faf5734dc309b5f180395ce353fd4ac67725d23efb772c32a2ff34f5425ea18817f6627d469910bd61cca7122f4de36935a25465635812a8b2bcc
+DIST frr-9.1.3.tar.gz 10790704 BLAKE2B e8e68aa7bd4c4c9e01d82c2ef2788fb66fad0332000fc61bcc094af22628a09ce4dc28d41891a4a48e8493a6377f9fa02c5b782cf8a989fd7f54484ecb24e0eb SHA512 5f07ae1dcea2bca8de30dba97011de999a08cebdd1b2dd05f1eb24c4dbde2746a51de54867d77a6b5a205c8d13636589e0513c360d453143fd64802d5956a682
+EBUILD frr-10.0.3.ebuild 3527 BLAKE2B c44ee14d2871f82e741fcf0fcad2d57b0cd82a416bd75d0420cdf494aa202c4916b214c44f1865f0bb8fcddc11d810f1329fefdeed80f65d7236383eed152e1d SHA512 7b6289b8cc03cc4de104de5ad34e65c2c46eb56447d103659c21b31dcfe2bdf45226f5c34011f8bdf76862625d720a23e78c8023e6b80d7d368108d0d8568e74
+EBUILD frr-10.1.2.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
+EBUILD frr-10.2.1.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
 EBUILD frr-9.1.2.ebuild 3403 BLAKE2B 5534c9fa814ca3c614fbd2c77b9894c5b0228d7d50aecb5c755fdca5ad8a7eda10edbc3515d14574345f1af92290ca5bbe97c8f167bd072e8ce3f1b807f0b416 SHA512 684f516c8e0086ebc5753d6d06bfc2f302dd2e3093319dbda31d78626b6ec1f984b7064be43ca36c2658723367e460e523ba98429d058a59ff482d4bf0dd6556
+EBUILD frr-9.1.3.ebuild 3342 BLAKE2B 007f01df37c030d85dd45a8c1a4e6954b45892d6e201e5ba0af6d5a534e4d58ca815619b1885a4ec581a3a598cedd8afd56c365badcac101455b8257beb0b9ae SHA512 9c5196dd3550f77e030dcee21399f3e3169e6c7a96ef67514f89996eb31a65ddf9c15389569a1d7e7c2cc82e7f26f45357d1aef0a4154dc7978cbcdd3bf67dca
 MISC metadata.xml 1001 BLAKE2B 32254a7ceb76fb6869dc4b140b54968001eaee2347cde49597a6a599f98b5efcb3e0102e3c7cbd9969a1bc137228be07efb56f791b490ddbaaa8e5c2cf13fba4 SHA512 e63bee06b1eb237fb9e5872a16c294d3378b1a48da1d950e6cc7d6734128c81d019d66fc8be02b9935c9a4e19552f20db335a3296070bcebf4621ffcb3efe91b
diff --git a/net-misc/frr/frr-10.0.2.ebuild b/net-misc/frr/frr-10.0.3.ebuild
index cd06f42a6e40..c4bf6cacfc21 100644
--- a/net-misc/frr/frr-10.0.2.ebuild
+++ b/net-misc/frr/frr-10.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools pam python-single-r1 systemd
 
 DESCRIPTION="The FRRouting Protocol Suite"
@@ -49,7 +49,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
 "
 
 PATCHES=(
diff --git a/net-misc/frr/frr-10.1.1.ebuild b/net-misc/frr/frr-10.1.2.ebuild
index 63a5e4f8de35..6e1d6a35e541 100644
--- a/net-misc/frr/frr-10.1.1.ebuild
+++ b/net-misc/frr/frr-10.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools pam python-single-r1 systemd
 
 DESCRIPTION="The FRRouting Protocol Suite"
@@ -49,7 +49,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
 "
 
 PATCHES=(
diff --git a/net-misc/frr/frr-10.2.1.ebuild b/net-misc/frr/frr-10.2.1.ebuild
new file mode 100644
index 000000000000..6e1d6a35e541
--- /dev/null
+++ b/net-misc/frr/frr-10.2.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	dev-libs/protobuf-c:0=
+	>=net-libs/libyang-2.1.128
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+		dev-util/cunit
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo # No functional impact.
+	mallinfo2
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		LEX=flex
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	# Create logs directory with the correct permissions
+	diropts -ofrr -gfrr -m0775
+	keepdir /var/log/frr /etc/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v2 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
+}
diff --git a/net-misc/frr/frr-9.1.3.ebuild b/net-misc/frr/frr-9.1.3.ebuild
new file mode 100644
index 000000000000..271bab6bccbd
--- /dev/null
+++ b/net-misc/frr/frr-9.1.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	dev-libs/protobuf-c:0=
+	>=net-libs/libyang-2.0.0
+	<net-libs/libyang-2.1.111
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+		dev-util/cunit
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo # No functional impact.
+	mallinfo2
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		LEX=flex
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	# Create logs directory with the correct permissions
+	diropts -ofrr -gfrr -m0775
+	keepdir /var/log/frr /etc/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v2 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index d39d9bdbdb08..d2d32da8b14e 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,10 +1,11 @@
 AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
+AUX nx-3.5.99.26-gcc14-32bit.patch 2033 BLAKE2B feefddc7af011ffd6e1432b3abb4846d5b6a3ba6eedf19ad3eed144599670335430da1b5dfdfc207f72a04189b2fbafd4dbc3297ddf1965b9933a22f2e19967f SHA512 9596c717b98951eaec930dda2b72a440bcc3e0fa5806130a23c66cb3d3e6a47f00c7dcb794498b9a29954b9e44d40298aa997f773ede277cf71a19eb85789291
 AUX nx-3.5.99.26-musl.patch 2203 BLAKE2B f4c43ed04ef6f35ef159ff30102cc6b52154e1a620a5a419f82e20f721f37832826ce0f8f141b6fdb6ce8a6814cd2fd5fec308c6f69f0b235b72578e67c1cbbd SHA512 f99052424faa49324aa79deeb92890e018872615c3d10bb0426e26487c3394201c6cb477628676583fda1794b1c980c07f31fdfe6379558694cce17734787131
 AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052
 AUX nx-3.5.99.26-which.patch 1157 BLAKE2B 0118abda74ceffa96bbf7fc1518ca5073c3a51b4762ba5769e061878613e27491e01c1d9ba3ca632b4de1166fce345e55f6840daf27608ce627f0c58b2b869b0 SHA512 b31ea5a6cbf5f65ac9a15ce83e2181dd1c9783e8b0ac9af24260399539a9c93bd0466d10cd7cf1eddbc95edfb1a1f7bd403f4cf1ebc66816463a2252300f4835
 AUX nx-3.5.99.27-which.patch 758 BLAKE2B 6d8841c80f086592365042d225128ebd897b118f5fdf6c573df2a845ae08d54e08f8c5c349a3a601325fb82f83bc5411262cc48b05f28a6ba24de685ab11a491 SHA512 3adca92c7e6aad36eec354f7a637c864e0ebba99535d6568c52e033ebd07ce1b026204f9b849889b324184f479ffe6195249c7d3affb1852934cca980b7c018c
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
 DIST nx-libs-3.5.99.27.tar.gz 11076330 BLAKE2B 713f6052a8405bd61916bc2c31cff1b3b14f63f78138a2d8a3c8d85170fede3d126071ef0e03fa267ef1533432f324992ed67edc86f922e3dda4f0cb40811045 SHA512 bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0
-EBUILD nx-3.5.99.26.ebuild 3976 BLAKE2B 6828daf2673119018868dea0b46fc333aa0b646134fb90a81d1cbd5a7fcd5350f91706cabe677a8ade0146830ac9490d27a6fe5b1218573690ddcf3a7b7a6696 SHA512 1b069fbaaf9b797208de3268d126a0e4f11b7faf2bd79dc552b65cd066e9e4ad810d028e7ff7f5c87b6909244223c669e9ef4eb758968ee9a0fb1ba4e70bb0ff
-EBUILD nx-3.5.99.27.ebuild 3718 BLAKE2B 5c3eaa3e1a308e9712079289b6db7681a25a8153f114a2917cc6d017d1375bb49e5e3e296ba8d31e602c1d2cb73888948690a6133a6d8932a5044637d4bc1d24 SHA512 37b2f9e526b240209a6ca504d0c8d7c01d8d7356fc523b8a2cf001f6f066f7a11aa8a8cacc7e36a63caf872be5e4c00a4fe6b49f73cfb5a0ae455b69736b2723
+EBUILD nx-3.5.99.26.ebuild 4079 BLAKE2B b0728e3ccfa65db9aec0c13dc7d445f2f5d85478a7a148276ecbb8deb5d2e1a18ae800791678026c883cb9c7d00cc0e47eb8b5251396840453be18df82de0c5a SHA512 06f147874ccee72357334dab53542f87dd6037ae3c8c97bd59c368a0af1a33e26367310dd6e98e02b043de48a2a8edd6d16f3d145e29c03a0c59b1047fb3acfe
+EBUILD nx-3.5.99.27.ebuild 3822 BLAKE2B 234e6eb1fa670d4135c38f36b27797c85100080c6ba8c3b1cdd090b75d8e972b4ef9ce0ddace1f045d4ff4517c0752c81b46f0ee762bca3b5b3bbcb8577fc219 SHA512 f9c3abed8a12d4164b3c008cd549e1b1286efc736ec550a2540d4eec5ab4ec7b105d7561dd5276ce38dddcba4791789b2a795694da7994460a5e63678514763d
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
new file mode 100644
index 000000000000..c641b033f956
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
@@ -0,0 +1,51 @@
+Bugs: https://bugs.gentoo.org/927780
+https://github.com/ArcticaProject/nx-libs/pull/1087
+
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 15 Jan 2025 22:03:00 +0000
+Subject: [PATCH] dix: Fix a warning about GetTimeInMillis return value in
+ XFont2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ported over from XOrg Server:
+
+    commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
+    Author: Emma Anholt <emma@anholt.net>
+    Date:   Mon May 7 16:46:15 2018 -0700
+
+        dix: Fix a warning about GetTimeInMillis return value in XFont2.
+
+        Signed-off-by: Eric Anholt <eric@anholt.net>
+        Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+This resolves the following issue when built with GCC-14 (and beyond):
+
+    ../../dix/dixfonts.c: At top level:
+    ../../dix/dixfonts.c:2485:27: error: initialization of âuint32_t (*)(void)â {aka âunsigned int (*)(void)â} from incompatible pointer type âCARD32 (*)(void)â {aka âlong unsigned int (*)(void)â} [-Wincompatible-pointer-types]
+     2485 |     .get_time_in_millis = GetTimeInMillis,
+          |
+--- a/nx-X11/programs/Xserver/dix/dixfonts.c
++++ b/nx-X11/programs/Xserver/dix/dixfonts.c
+@@ -2471,6 +2471,11 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo
+     RemoveFontWakeup(fpe);
+ }
+ 
++static uint32_t wrap_time_in_millis(void)
++{
++    return GetTimeInMillis();
++}
++
+ #ifdef HAS_XFONT2
+ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+     .version = XFONT2_CLIENT_FUNCS_VERSION,
+@@ -2482,7 +2487,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+     .get_client_resolutions = get_client_resolutions,
+     .get_default_point_size = get_default_point_size,
+     .get_new_font_client_id = get_new_font_client_id,
+-    .get_time_in_millis = GetTimeInMillis,
++    .get_time_in_millis = wrap_time_in_millis,
+     .init_fs_handlers = _init_fs_handlers,
+     .register_fpe_funcs = register_fpe_funcs,
+     .remove_fs_handlers = _remove_fs_handlers,
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 3a112d2be6bb..c08c5941821d 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.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=7
@@ -50,6 +50,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
 	"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
 	"${FILESDIR}/${PN}-3.5.99.26-which.patch"
+	# https://github.com/ArticaProject/nx-libs/pull/1087
+	"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 60a90c7c8d28..095b3d048849 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.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
@@ -44,6 +44,8 @@ S="${WORKDIR}/nx-libs-${PV}"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
 	"${FILESDIR}/${PN}-3.5.99.27-which.patch"
+	# https://github.com/ArcticaProject/nx-libs/pull/1087
+	"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
 )
 
 src_prepare() {