gentoo auto-resync : 19:03:2025 - 00:30:03

25 files changed, 279 insertions, 565 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6a70c0ae21b2..e0cdf7ff82be 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libtlsrpt/Manifest b/net-libs/libtlsrpt/Manifest
index b674efb2c5ed..c1bdd8bf35fe 100644
--- a/net-libs/libtlsrpt/Manifest
+++ b/net-libs/libtlsrpt/Manifest
@@ -1,4 +1,4 @@
 DIST libtlsrpt-0.5.0.tar.gz 350824 BLAKE2B ebee79803edc76aa7948409d1f54385b5cffc29c8fb54fde192e4f4ea802da9d3c89cfc590d4b819ec0c6328a8831065381cd5ac1f31b7f4002816d85d545f9f SHA512 dca6fa36381969ea25574b50106b774cae0c625c63e56034ae9efe42603fbe2922c39a34525b47baf760bec923a83eef3a9d3372674aa5ee9f84d172df88bb74
-EBUILD libtlsrpt-0.5.0.ebuild 745 BLAKE2B 12309491dcc9fa14198f62a2eedff60862070a0143ad148d5018f30c25769f36e99caab7d860c953de52cdb92c5781d04556c96bb6b8331ae885985be64d7a91 SHA512 ce2a6470ff0ddaad010b0a380be90bce860694e4dc5ab8d60efe1065eae4466a6bce0c7b3146f6cd0fb0d68ea950f66e6b02320f7e58df9564d57678bf92583d
+EBUILD libtlsrpt-0.5.0.ebuild 750 BLAKE2B 40cb77110eb8c732f3144b4043d25468bd429666a58c778eaafb5b3a395477c56ab2801171fbf000ee587aa9fd20222867f333bdd4d79d8dbf4275e36d7b6059 SHA512 53f152318034c0be41debdbbaaf0bddb5c2cdeae2ee1d16861f6338ebcf84a258770a6845386fa00b97b6fae1cb203c3cfb7c6793eec1c76d015b7065306b2fb
 EBUILD libtlsrpt-9999.ebuild 702 BLAKE2B 4da4a95b19fcfac66bdb6bb73a11d3c06dd97668b56d6b4216cd08ad384ecde8cfe49be25116fe587c148d6cc1b1c7421ed753782e24ec88012b88fe4dbf2dae SHA512 1c16c3eaefea6339968ea87b8a1d23cbeaf47fe0d1da92d3ef3e10a429ae5402492259118144b55c2267c211d806977ed02dceb42887e6266c626e3f1d43d3bd
 MISC metadata.xml 298 BLAKE2B 69177a5203ff83c5fcdc4e825a7e065ac5a4ed5ab8d8b42903628d38a2e9cebddd9a951229598f43874df8830e174a4497fc822142555c48f40686318893f0bb SHA512 d2e1aba7173d041ecda3c7d21cb4b02fba2959c87f0e9fa7051811b0706fe8dbc3e5c9c5611cbff6303bd3016fb2e95c5699bb2b137327292d83d61d647b4b28
diff --git a/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild b/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
index dd7fb4434d51..d1df3b52a2ec 100644
--- a/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
+++ b/net-libs/libtlsrpt/libtlsrpt-0.5.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://github.com/sys4/${PN}/releases/download/v${PV/_/-}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 8a99db93eee1..bd10635a3364 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,5 @@
 DIST libwebsockets-4.3.3.tar.gz 15618186 BLAKE2B 24393e0238160767e77a428b1db8430ae5c6efa715e9d917a3fc64c8272e92c8617031c50a75adea4199d678f5ba752f49c24a5d9214aaf43d4e2349c03494ca SHA512 2ffd248ddf283369725097ca7410f947fe0389c360b329c76f0754afab4ba87c20a0687c5e7b8bd991b157f9d20c6faa3049757b3398e66d08662c3aa7ff9658
-DIST libwebsockets-4.3.4.tar.gz 15619906 BLAKE2B 3ab873adcee81f7c56590a099970f3c9e53954a84a45d253d9ec28bf7a88e907387923cc93da094f6bbece28b537268f5fb6009fdfa5f0f55844415b491df8da SHA512 867dfcdd7f7c8878e6511441040a8bf9527f9240716a7377569c4757a96376c96294cc6805d45de7ea6de1fdcff9a683bd0c462267a10928ef51e99565ac2d26
 DIST libwebsockets-4.3.5.tar.gz 15620674 BLAKE2B 52cfd55684a7770a180e419b6b2b6ebb29e71bd8fade0e1a6c549e4877df3ba5d5d2797b9ff99be9ec34db01cdd83c26f6839fb6bb080e987e26749f3ce35543 SHA512 629a4fe6b0c8f6b4a1d38128201f5a856bdcf8a33923120c24ceb8d7f7602906608ef4e289e98b66bb94633ed95f5901e2e46d8214dcc61cf276cc975b9d7134
 EBUILD libwebsockets-4.3.3-r1.ebuild 2375 BLAKE2B 3d99775719f841fff7e6893ba06520af0d91fd7ce24433872cfad559c787eab9f43d7da009851182e1da9c7e6a0a2a426cde5d3a9c261d7a97d0d147c1582545 SHA512 b3845c7be04f0645fc60f995ee18f134440132c96fd462cda7391355d4d1ecb592a50af0af8cb75d1a9187308c07726c89a349a01fa7fcd3c0da65e50a062b11
-EBUILD libwebsockets-4.3.4.ebuild 2380 BLAKE2B 7a5f84e8645fda87937231fc52f95f17b90c2eeb8bcd1e9f5f8fc18b5e0a49418f9410b11362420f5c0c6418553642bfebe69767da9142c5dac447680e52a2c2 SHA512 689794c81a3e46955056bbb1299ff96d1354609ad9f2fcce0e59bcbc766c2b8c1420455398e039d868b06ef6b19ef32263d11a41163e7f8be4c935c6cbbfab40
 EBUILD libwebsockets-4.3.5.ebuild 2380 BLAKE2B 7a5f84e8645fda87937231fc52f95f17b90c2eeb8bcd1e9f5f8fc18b5e0a49418f9410b11362420f5c0c6418553642bfebe69767da9142c5dac447680e52a2c2 SHA512 689794c81a3e46955056bbb1299ff96d1354609ad9f2fcce0e59bcbc766c2b8c1420455398e039d868b06ef6b19ef32263d11a41163e7f8be4c935c6cbbfab40
 MISC metadata.xml 1444 BLAKE2B 2273176491418aba627a4aa9f2e0d944af502632eb83a6896ddb86483567842b67c37a50e226448dd21d0fb51ddebf254919960fd40c824ba9a6a0ecaf9f7830 SHA512 b958602935b6c0e72ce6e1044345980b8dcc1469e875771bb147fda2911a04382b290828c22c440d39a67ba5e36b0b7989cde08a6f06f53667963c393e36355c
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.4.ebuild
deleted file mode 100644
index 85f7923e1092..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.3.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
-	sqlite3 ssl threads zip"
-
-REQUIRED_USE="
-	access-log? ( http2 )
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	mbedtls? ( ssl )
-	smtp? ( libuv )
-	socks5? ( client http-proxy )
-	?? ( libev libevent )"
-
-RDEPEND="
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	http-proxy? ( net-libs/libhubbub )
-	libev? ( dev-libs/libev )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	sqlite3? ( dev-db/sqlite:= )
-	ssl? (
-		!mbedtls? ( dev-libs/openssl:0= )
-		mbedtls? ( net-libs/mbedtls:0= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DDISABLE_WERROR=ON
-		-DLWS_BUILD_HASH="unknown"
-		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_ROLE_DBUS=$(usex dbus)
-		-DLWS_WITHOUT_CLIENT=$(usex !client)
-		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
-		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
-		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
-		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HUBBUB=$(usex http-proxy)
-		-DLWS_WITH_LEJP=$(usex lejp)
-		-DLWS_WITH_LIBEV=$(usex libev)
-		-DLWS_WITH_LIBEVENT=$(usex libevent)
-		-DLWS_WITH_LIBUV=$(usex libuv)
-		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
-		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
-		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
-		-DLWS_WITH_SMTP=$(usex smtp)
-		-DLWS_WITH_SOCKS5=$(usex socks5)
-		-DLWS_WITH_SQLITE3=$(usex sqlite3)
-		-DLWS_WITH_SSL=$(usex ssl)
-		-DLWS_WITH_STATIC=OFF
-		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
-		-DLWS_WITH_THREADPOOL=$(usex threads)
-		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_EXTENSIONS=$(usex !extensions)
-		-DLWS_WITHOUT_TESTAPPS=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index d1a500586895..42cb973e6f55 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,7 +1,5 @@
-AUX nghttp2-1.64.0-munit-c23.patch 961 BLAKE2B 30f969117b8f8a74747d5c6d466ec9be7b35ef852d5b05d7f2900fdc8867a9859289ccadfe071262f5d45838da3282666f012a581c08640e26d3893d88fe08cb SHA512 815c47f9bcc600de920e81a7630104b0a3875123831b131b7d95fc8a022d4c38a42b0a9681e6cfc941a0bd71093e960b1f608a84df7cf5289c7fad77a2ecc7a0
-DIST nghttp2-1.64.0.tar.xz 1676124 BLAKE2B e2cad95fbe8447e99728af3ad7656d4dd2d1f51f31294bd38b6c69ee07e6e8e6302c124d47e6274a9a1531257a90bcc5833de390ac704b4b3adf435b9ce38fc9 SHA512 b544196c3b7a55faacd11700d11e2fe4f16a7418282c9abb24a668544a15293580fd1a2cc5f93367c8a17c7ee45335c6d2f5c68a72dd176d516fd033f203eeec
 DIST nghttp2-1.65.0.tar.xz 1604848 BLAKE2B 8fb752f55936110a8b5c27873e7e262a0c84740beac46444a80596e25b256ca3a4b0f0cc97a91e104a0f1c59ac0304546310a2817af126efabd2ce26cfd0ee06 SHA512 e1ef685a425017474ea0412c8ad13a217a45a320322b3aee48e646be21457d9b1f374abb9f681f47595a0ad8feb07d076bd0aa3279d35c5c9b5b8c921d8dd39e
-EBUILD nghttp2-1.64.0.ebuild 1873 BLAKE2B 4faacb99968a0ff2f96398a083c49f00121149e97a3daefa031a069e4796de389eda528561715da1e69af769ac4a0446cd81e211f263d760401b6e00bb3ed99b SHA512 af4ebdb24a385288c83b561464ed73465e2d410706d0aa80413b434a27acadb8c5c8afea8c1fb0d7f5577dcb5ebe1683abe093a2b0eb72cd5956c87f9146e522
-EBUILD nghttp2-1.65.0.ebuild 1824 BLAKE2B 7686b7160e5a5b0be52d4daf1c5d6facd989a6db8d68c23d57efc42173148116fba6be1bb3b4af1a99d16d357889bf89ffcfc2fd36e999d427de74a9c9472070 SHA512 88ff88747af4f8a45839cadaddba9800cf5018716da9ee948fb0984c2b4538bf3235621507cf3d08fcf65dace93c779e878083302212b0b1c33a865c36841db9
-EBUILD nghttp2-9999.ebuild 1607 BLAKE2B 86247f2c6086da22f6d506e8e31c63d558aa45276d2deb202ca515c35034419829be8b6fef0be10b15367b6880ee35f7b62cae6424ecf6c7ae2cac90b090f3bb SHA512 e30a674093644da312f76a7ce8c25ae468c95bbf2e3b69c8618cb21b3852799dfeb674007ae5694d77de46c093228f97c517fcc23e9791fd42c708e55431114e
+EBUILD nghttp2-1.65.0-r1.ebuild 1951 BLAKE2B f7ae5ca6c3340fb1c5150df50f11df20a473774d1f568db351c79308ffb8c75143c83dfa58453540c86d584ff68215ff05eabae753162b110534385da4486989 SHA512 63b694442bdbfbbf61a3c2370ec6bc549c924c01f8418ddd273138e17e062ab55b64f7c7486db482fd08ca00a1eb3b7e0ac355f45a6c055ddef93b2294d8ea31
+EBUILD nghttp2-1.65.0.ebuild 1816 BLAKE2B 28ae2a4cbf79160552af39888633fd73aaaf041ae8b7d81fc709419ea7ad24376f92e3ee0d8da5256a76c554d74e2067a9b25591034b1d873a565f605a1facff SHA512 31fce5b0528e85586ff945621ebecf8872a0bb63fa9123ffc9e571f295f3f019691a8b10688bb3aa17533d6be852b576536149ec967d8c86b90064e0fb2bf124
+EBUILD nghttp2-9999.ebuild 1959 BLAKE2B 56293778562b49e17e8f54dafc183ed0ec0dec555f7811de38c89d569130e2ee880e0daa33d7e8248b16dd1769ef23a7f3bb4da76210ef66463c38f4e95e32a7 SHA512 d5c7218ccfd6fd1973bed2dbade1dfaeb659701bd55bb9e0d99f31c8614ce6cf8897f18741242b92d1b2be377f1a31deee89934a866479400af12bd62f4693a9
 MISC metadata.xml 553 BLAKE2B 694d0da32dab7f6eebd3b83a12b490b62d262de96e2bbb5c5822befbac792bc560cfe21c194d83d1afabf725967e0508c65057c8382904353abb0219d5ff3338 SHA512 4bce2e01c0b64eee279fc8a425393acf63e859a8b63346ddb2c5486d913bc58d0485d4c7fd6663bec88b070f21b6c9bbfd28e5775dbcbee02248e631610becd0
diff --git a/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch b/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
deleted file mode 100644
index 93d208fa4215..000000000000
--- a/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/nemequ/munit/pull/105
---- a/tests/munit/munit.c
-+++ b/tests/munit/munit.c
-@@ -858,23 +858,18 @@ static psnip_uint64_t munit_clock_get_elapsed(struct PsnipClockTimespec *start,
- 
- #if defined(_OPENMP)
- #  define ATOMIC_UINT32_T uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(HAVE_STDATOMIC)
- #  include <stdatomic.h>
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x)
- #elif defined(HAVE_CLANG_ATOMICS)
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(_WIN32)
- #  define ATOMIC_UINT32_T volatile LONG
--#  define ATOMIC_UINT32_INIT(x) (x)
- #else
- #  define ATOMIC_UINT32_T volatile uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #endif
- 
--static ATOMIC_UINT32_T munit_rand_state = ATOMIC_UINT32_INIT(42);
-+static ATOMIC_UINT32_T munit_rand_state = 42;
- 
- #if defined(_OPENMP)
- static inline void munit_atomic_store(ATOMIC_UINT32_T *dest,
diff --git a/net-libs/nghttp2/nghttp2-1.64.0.ebuild b/net-libs/nghttp2/nghttp2-1.64.0.ebuild
deleted file mode 100644
index d29f89a46402..000000000000
--- a/net-libs/nghttp2/nghttp2-1.64.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/1.14" # 1.<SONAME>
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
-
-REQUIRED_USE="test? ( static-libs )"
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	systemd? ( >=sys-apps/systemd-209 )
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.64.0-munit-c23.patch
-)
-
-multilib_src_configure() {
-	#TODO: enable HTTP3
-	#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
-	local mycmakeargs=(
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_FAILMALLOC=OFF
-		-DENABLE_HTTP3=OFF
-		-DENABLE_WERROR=OFF
-		-DENABLE_THREADS=ON
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
-		$(cmake_use_find_package hpack-tools Jansson)
-		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		$(cmake_use_find_package systemd Systemd)
-		-DENABLE_APP=$(multilib_native_usex utils)
-		-DWITH_LIBXML2=$(multilib_native_usex xml)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	eninja check
-}
diff --git a/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild
new file mode 100644
index 000000000000..bd68d3e0955f
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.65.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Built with autotools rather than cmake to avoid circular dep (bug #951525)
+
+inherit multilib-minimal
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	inherit autotools
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0/1.14" # 1.<SONAME>
+IUSE="debug hpack-tools jemalloc systemd test utils xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+	)
+	systemd? ( >=sys-apps/systemd-209 )
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	# TODO: enable HTTP3
+	# requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--enable-threads
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(multilib_native_use_with hpack-tools jansson)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
+}
diff --git a/net-libs/nghttp2/nghttp2-1.65.0.ebuild b/net-libs/nghttp2/nghttp2-1.65.0.ebuild
index c9976024b97e..4aaf85ea7b69 100644
--- a/net-libs/nghttp2/nghttp2-1.65.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.65.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0/1.14" # 1.<SONAME>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
 
 REQUIRED_USE="test? ( static-libs )"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 4ff41e17c664..9f6a317734dc 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,59 +1,70 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib git-r3
+# Built with autotools rather than cmake to avoid circular dep (bug #951525)
+
+inherit multilib-minimal
 
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
-EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	inherit autotools
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 
 LICENSE="MIT"
 SLOT="0/1.14" # 1.<SONAME>
-IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
-
+IUSE="debug hpack-tools jemalloc systemd test utils xml"
 RESTRICT="!test? ( test )"
 
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
 RDEPEND="
 	hpack-tools? ( >=dev-libs/jansson-2.5:= )
 	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
-		${SSL_DEPEND}
+		>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 	)
 	systemd? ( >=sys-apps/systemd-209 )
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 multilib_src_configure() {
-	#TODO: enable HTTP3
-	#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
-	local mycmakeargs=(
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_FAILMALLOC=OFF
-		-DENABLE_HTTP3=OFF
-		-DENABLE_WERROR=OFF
-		-DENABLE_THREADS=ON
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
-		$(cmake_use_find_package hpack-tools Jansson)
-		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		$(cmake_use_find_package systemd Systemd)
-		-DENABLE_APP=$(multilib_native_usex utils)
-		-DWITH_LIBXML2=$(multilib_native_usex xml)
+	# TODO: enable HTTP3
+	# requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--enable-threads
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(multilib_native_use_with hpack-tools jansson)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with xml libxml2)
 	)
-	cmake_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-multilib_src_test() {
-	eninja check
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
 }
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index 6546011324c9..bda05f8d61d5 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,9 +1,5 @@
-AUX nghttp3-1.7.0-munit-c23.patch 961 BLAKE2B 30f969117b8f8a74747d5c6d466ec9be7b35ef852d5b05d7f2900fdc8867a9859289ccadfe071262f5d45838da3282666f012a581c08640e26d3893d88fe08cb SHA512 815c47f9bcc600de920e81a7630104b0a3875123831b131b7d95fc8a022d4c38a42b0a9681e6cfc941a0bd71093e960b1f608a84df7cf5289c7fad77a2ecc7a0
-DIST nghttp3-1.5.0.tar.xz 391668 BLAKE2B cbafd1e927bc39db78e238c0a7330170ec8e7a6fad96489fe754088cd40def9ddff7f7eef64bc9dc6efc729acbd4dfe2779bb5ac72092bfe91e3e6aab5b97456 SHA512 76a089fb0dd88b9aced41fccf36758c6504f8faf68c143ca81c260c017ac6dfd83fe678c401304de8bf65e859b0559dc5e8fcb37e88e547076d0ba9fd2c4a59c
-DIST nghttp3-1.7.0.tar.xz 395808 BLAKE2B 2a13747518883a0f11005ee1189dc6a32a73fdf390416f6e3c352a7be76cccd68522581c2148c6a86c24f14ba13fc21a7c6d6815ab3ad724c08a8088d1421d3b SHA512 77510e2056206e3e149bc3535a0e7e6095afb0a0358a9dda48c8be82199eaefd0dadbba7e027c5c14eb46572d2dbc929a99c3b9c6d27c83a1c80428263ccecab
 DIST nghttp3-1.8.0.tar.xz 398640 BLAKE2B 14866d9efdfc847367dde782770f43374209bd4229fa621c3142bb6c8ac3b3db6feb34e7732365edaded49b6d27ca9c02b376d11a082c6f7ad2b3e8b4d799e01 SHA512 01b7a6e313e13ebfecd63afdfaed8c8518b49cff64d08359ec7fb7f05f2dc615c4d58a8338d789e54c2d85cb5fa8e2151c91df40ec39826283f7328fc86fc18b
-EBUILD nghttp3-1.5.0.ebuild 958 BLAKE2B ad076ae8c16c3d5bb071a0eaeca6dcd8e50346a2004e058f7cb6974dcf40dc96ff3bebba87e90347a6ef5bc7419e9d532aaf4e91974c44d50c66e7aef2f0e6a3 SHA512 fe607a954531eba7c467bf58903a2e0400b2396076426ed8b8466a7cd953885573f0b29e6b183d4d33aea4fa95a17d656517b45676f97290adbdd6c9401b65ce
-EBUILD nghttp3-1.7.0.ebuild 1039 BLAKE2B 9819c00a0da273c4ca6d919e4fd1cf69b5caf6c32955aca6a24e92c315dcd2215b209da3bbae8fcebc3f65ed2fcbd82cea80d899e9ea4bd24bc72d5b65078e58 SHA512 8aa03df078b222ef9d0d32914b9b3f488e659db84aeee1438d4cea09343cdb34fc1281afca547afac5723373c759edd667f2e41cc63f4c9e3e31e8777471d0e9
-EBUILD nghttp3-1.8.0.ebuild 990 BLAKE2B 2f03bf1ea8952cf39aea3bce381fc3b496c9b15488add9d1ab23302eedb6b551ea04a330c7023a239b65faa1df2a03592bddf390683c74e120888e72638409ee SHA512 94ce9a7c7057f599f7015cfd1053c8276f65e7097bdbefa7a2c67f1d545c0a64275981ddb85fac86a22c5ecd63e1789c771ce46b6611fc675f054f936f118060
-EBUILD nghttp3-9999.ebuild 984 BLAKE2B 0d40265ad80a7de0188d97018c466fe0ebf95da3aece4c2e47fae75b296eb852a5db16b99c471fc30c903bdf96a0decf6108dc055627494c61fe37ceb6778b6a SHA512 998b287ae1ed0f033ec4a2633b2a304d0463af2c80f8896341a208397ec607c89b0980d01157594f0a17d8024971e4cb5d47ba3cfa8dc54d68658d5137be053f
+EBUILD nghttp3-1.8.0-r1.ebuild 973 BLAKE2B e87f8e2cac6e32fc10a141768486540505112f3a8ca3ab8a106198b66416e8edb2dc38c9db9bd2a6aad06be3de3fa598fbeeddb06c7b0b7fd7a01931d1dbcc2b SHA512 1aacad545d3aef95349031fc51254241514bd5128b4245b305a892ac7bbea126c5db7e2fab6e678fc700a5cb10eeb0eaae21dd612d764ce6790bc5f0d7085df6
+EBUILD nghttp3-1.8.0.ebuild 988 BLAKE2B b9ceaf1f6fff3e99d320140d12339be50b015513a1225e9d42a74a4924da7f56146815704f165c4c158d39b88479d6b3eca38ffcdeb5da52548fb72a91d445b4 SHA512 a4dc4cf2a8b52ee52e82b9a7ab210699e9fb3305227059141d7a031821c299c3b5857235dbb3f6e024f1aadb3f56c449fffd4cf2658cfa26af76ad494d910025
+EBUILD nghttp3-9999.ebuild 980 BLAKE2B 17c4849c84c29755dc506438dd514642bc0ecc2c421c45f16ec9e4441fb13dd3767ce93ab2628e8d05e553905fb22a525e78d1de30a405a9b90f1cddf17f5e88 SHA512 b5d6dbf6cba7c7830045bde4f9f41146db039355f4a9d47fd34648a5a602831a54f4904afc0f9d63b373cc9835ab82f6197265108aa5d9be16e7e3987c307d0d
 MISC metadata.xml 328 BLAKE2B 6f0147cead329ef6b779485417ff33e5814b0cd86e99b571b0dc5653a7ca8f80f65fddb8b1b58fe249b7b86c0aecd32a446d415065fc70a0c72bf69651b19d25 SHA512 54e49a9c82c6a7f7a50daf557416845fa5c548f11ca243ff236105ad97903ea983436e94067c831b93ca95da154dd2561e314e96e8bde6d4678efd1adaf02f11
diff --git a/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch b/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch
deleted file mode 100644
index 93d208fa4215..000000000000
--- a/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/nemequ/munit/pull/105
---- a/tests/munit/munit.c
-+++ b/tests/munit/munit.c
-@@ -858,23 +858,18 @@ static psnip_uint64_t munit_clock_get_elapsed(struct PsnipClockTimespec *start,
- 
- #if defined(_OPENMP)
- #  define ATOMIC_UINT32_T uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(HAVE_STDATOMIC)
- #  include <stdatomic.h>
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x)
- #elif defined(HAVE_CLANG_ATOMICS)
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(_WIN32)
- #  define ATOMIC_UINT32_T volatile LONG
--#  define ATOMIC_UINT32_INIT(x) (x)
- #else
- #  define ATOMIC_UINT32_T volatile uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #endif
- 
--static ATOMIC_UINT32_T munit_rand_state = ATOMIC_UINT32_INIT(42);
-+static ATOMIC_UINT32_T munit_rand_state = 42;
- 
- #if defined(_OPENMP)
- static inline void munit_atomic_store(ATOMIC_UINT32_T *dest,
diff --git a/net-libs/nghttp3/nghttp3-1.5.0.ebuild b/net-libs/nghttp3/nghttp3-1.5.0.ebuild
deleted file mode 100644
index dd7323b616ea..000000000000
--- a/net-libs/nghttp3/nghttp3-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="HTTP/3 library written in C"
-HOMEPAGE="https://github.com/ngtcp2/nghttp3/"
-
-LICENSE="MIT"
-SLOT="0/0"
-
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	test? ( static-libs )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIB_ONLY=ON
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_EXAMPLES=OFF
-	)
-	use test && mycmakeargs+=( -DBUILD_TESTING=ON )
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && cmake_build check
-}
diff --git a/net-libs/nghttp3/nghttp3-1.7.0.ebuild b/net-libs/nghttp3/nghttp3-1.7.0.ebuild
deleted file mode 100644
index 82670074d0c0..000000000000
--- a/net-libs/nghttp3/nghttp3-1.7.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="HTTP/3 library written in C"
-HOMEPAGE="https://github.com/ngtcp2/nghttp3/"
-
-LICENSE="MIT"
-SLOT="0/0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-# Without static-libs, src_test just won't run any tests and "pass".
-REQUIRED_USE="
-	test? ( static-libs )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-munit-c23.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIB_ONLY=ON
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build check
-}
diff --git a/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..3e35d36e944c
--- /dev/null
+++ b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Built with autotools rather than cmake to avoid circular dep (bug #951524)
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTTP/3 library written in C"
+HOMEPAGE="https://github.com/ngtcp2/nghttp3"
+
+LICENSE="MIT"
+SLOT="0/0"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		--disable-debug
+		--enable-lib-only
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
+}
diff --git a/net-libs/nghttp3/nghttp3-1.8.0.ebuild b/net-libs/nghttp3/nghttp3-1.8.0.ebuild
index 6bcc7ff1a4c8..73452eb82322 100644
--- a/net-libs/nghttp3/nghttp3-1.8.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.8.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 9e1fdeb754e4..175e47477ab4 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.ebuild
@@ -3,40 +3,41 @@
 
 EAPI=8
 
-inherit cmake-multilib
+# Built with autotools rather than cmake to avoid circular dep (bug #951524)
+
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
-HOMEPAGE="https://github.com/ngtcp2/nghttp3/"
+HOMEPAGE="https://github.com/ngtcp2/nghttp3"
 
 LICENSE="MIT"
 SLOT="0/0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-# Without static-libs, src_test just won't run any tests and "pass".
-REQUIRED_USE="
-	test? ( static-libs )
-"
 
-BDEPEND="virtual/pkgconfig"
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
 
 multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIB_ONLY=ON
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
+	local myeconfargs=(
+		--disable-werror
+		--disable-debug
+		--enable-lib-only
 	)
-	cmake_src_configure
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-multilib_src_test() {
-	cmake_build check
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
 }
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 615ad6387f7b..b57e7766bf3e 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,11 +1,7 @@
 AUX ngtcp2-1.10.0-gcc15-uninit.patch 1686 BLAKE2B 8122058a83c28c4eae25ed592c60b32bdaaf8259fbc8ee6d50d82da7c6a175b897c5231ba82589e7cd8e45606f1857314c542c52e853b79b816d48262cef5428 SHA512 ae8ef45cf943ca8c73b76407a1fc3548989f536d4944687b37830fbd0a873952364bbd4e51d08cf5c7eb83381bf79b0895f742c63fa829cbdde148aba8e3f700
 AUX ngtcp2-1.10.0-munit-c23.patch 961 BLAKE2B 30f969117b8f8a74747d5c6d466ec9be7b35ef852d5b05d7f2900fdc8867a9859289ccadfe071262f5d45838da3282666f012a581c08640e26d3893d88fe08cb SHA512 815c47f9bcc600de920e81a7630104b0a3875123831b131b7d95fc8a022d4c38a42b0a9681e6cfc941a0bd71093e960b1f608a84df7cf5289c7fad77a2ecc7a0
-DIST ngtcp2-1.10.0.tar.xz 636296 BLAKE2B 21ca85ed0652d9c3721f1a8dcb890bc21ea37bb49095c3fcc418e818462629463f4410e169465ff19960b09e47684e99b9fc713919f114c3ef765cc2d754aadb SHA512 de61f9c2b8135d0d08740215002a3e1688f93825ce6ab6d074ce36569bde0e789d4f1a2abd708773c4ab123c4584e94f0eeee8f7e8ef238891f9bb36be001f9b
 DIST ngtcp2-1.11.0.tar.xz 652904 BLAKE2B 138a0e10cdca8ca3a38718ddd0155cea7ed8493483186d1242e7b949477774fe8d67b00f07688e1c098984598125c3e137fa697198efe0f64d3c562961a84b94 SHA512 8c4c8faa24d34e8d6c66df99ba7f3a4dbae689b38bf2bfa68e147af11abc050dc1de790ffc5de1f7379405c91d736f67e58d5661c2d2b72126ba079fadee72d3
-DIST ngtcp2-1.7.0.tar.xz 631072 BLAKE2B 1a1ce134c54974418c0cf0bacc09a770e29cd7c7bfc44a2b5420f3bef3e70502f610bee4e9bb5ed9b87024153aa9390d5a233d2d6e2689166e1079e0e4f52600 SHA512 6efa42d17772fde00d9d0a67f2cbcf0704a8462c7305a5e3f213d1e98c9302a1ceee847081ecef358c7a421db56236e571a1ad9ff7fa5f5037987c5cb14e517d
-EBUILD ngtcp2-1.10.0-r1.ebuild 1465 BLAKE2B bf05b9ed99b701418dd5ab393187dd03964e388531a04405be060ca12187ccdb5169d2c8337f63b2175215bd4f7c8b605d9ab7ac9c24c25e32a5de076bded031 SHA512 38e373966a5cb0d2d0dca6a1d94a561f733e22471df688601936253e5440d4dc64d0e3111f76011466752cf6481d7619015e9dfb4a9cfdbfc76788cab3101a87
-EBUILD ngtcp2-1.10.0-r2.ebuild 1497 BLAKE2B 76946d0ab26969c2831fc745682f2543aae2d63332a34624e62270cecabfb47ab2cf16e51719cfc6ee8bda76cca12bc2b282f7198c3a239e2d3fe5b5e3cb8539 SHA512 018f6ca6314b378ba6f828fe5e66df708f7b0370b6eef19a91a4353d3f3bfc949d678f7c401eea7c6721d7f8c9a68e59003d69584fa2d4db5d77a2f0c753f56f
-EBUILD ngtcp2-1.11.0.ebuild 1408 BLAKE2B abe1b71efcc67cf088ef4f50faa625485b8445f08866cbd08abddbcfc46c90d47de62ff57162c088c7e665a70b1106751064ca2928b3cca26883ff391bd42859 SHA512 5136bcde44dd0a5ba3037ce7d48ad009a614f78592f01755c09633934c7cbc44db1052d978c93e437bf0279df8c8326c4fb3e76e4ea5d2b69468ce5d6308a017
-EBUILD ngtcp2-1.7.0-r1.ebuild 1332 BLAKE2B 023b18e726148cf593bdee277a5094dd4539699f96ab814a373e9188fe730603a49f81211ce98a7ffc75cbd7963616e44020055db18c5f37f2ce4f57622f29c5 SHA512 9d83417bd659bccd8cb9b32dfe9154b8cc545d8e9ec509fae5a2607cec8d29557150dabb9534cf46bea0015b3ade1f49e5604926d9bd1d1533137848a9ce6b77
-EBUILD ngtcp2-9999.ebuild 1408 BLAKE2B abe1b71efcc67cf088ef4f50faa625485b8445f08866cbd08abddbcfc46c90d47de62ff57162c088c7e665a70b1106751064ca2928b3cca26883ff391bd42859 SHA512 5136bcde44dd0a5ba3037ce7d48ad009a614f78592f01755c09633934c7cbc44db1052d978c93e437bf0279df8c8326c4fb3e76e4ea5d2b69468ce5d6308a017
+EBUILD ngtcp2-1.11.0-r1.ebuild 1358 BLAKE2B 780c044aa724303b238f6ca268107d180be86df8097b959d48e239ace5a6ccb5b87c26d89e0076298adf5f68ff4f6af99cd03c439de5805bd5cd1dfe0a4f01d6 SHA512 6b12af160cf6782f24b5bcbad595882425ae4d6885140f956b28626eeffba9aa60ac558998716c9c63e7176715f66ab111eb6b835133e786124ac2e7028bb074
+EBUILD ngtcp2-1.11.0.ebuild 1401 BLAKE2B a7b4e132361ff6f3356946442c545d4afe9136d7b45f80b01c53ab74cc90f7e71e2674a65490ddde19e1ca9b984800dda82c9f7eb1d928d1bed2d823d15d81d7 SHA512 3a8840dbc0e234527e08c17dedfe2f810109bd0a622d4638c3bb4b91007231498f28d49ce9eca83f516deaf8ef884325534d5faed022952ed82b1c07a7f19b1e
+EBUILD ngtcp2-9999.ebuild 1362 BLAKE2B 93b6973b655c98a53ce30c45538f2c1ce38bd3fde2d72b5a3e5e18839546b45029b5c6e741b3927d33748e7fbca80e5d5ad743781b934c442d985400915ee8c5 SHA512 187c383edf18f0f7d6a39aeb494763931df62546dd74db65be0adacb8f7f6869315e4dd355a5ed80ebfe380d65da07eed24fad9dca6af5cb5b41d11b764441c0
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild b/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
deleted file mode 100644
index f59f2eb6f3a2..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Implementation of the IETF QUIC Protocol"
-HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
-
-LICENSE="MIT"
-SLOT="0/0"
-IUSE="+gnutls openssl +ssl static-libs test"
-# Without static-libs, src_test just won't run any tests and "pass".
-REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
-		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_OPENSSL=$(usex openssl)
-		-DENABLE_BORINGSSL=OFF
-		-DENABLE_PICOTLS=OFF
-		-DENABLE_WOLFSSL=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build check
-}
diff --git a/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild b/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild
deleted file mode 100644
index 8a3f82912f5e..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="Implementation of the IETF QUIC Protocol"
-HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
-
-LICENSE="MIT"
-SLOT="0/0"
-IUSE="+gnutls openssl +ssl static-libs test"
-# Without static-libs, src_test just won't run any tests and "pass".
-REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
-		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
-	"${FILESDIR}"/${P}-gcc15-uninit.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_OPENSSL=$(usex openssl)
-		-DENABLE_BORINGSSL=OFF
-		-DENABLE_PICOTLS=OFF
-		-DENABLE_WOLFSSL=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build check
-}
diff --git a/net-libs/ngtcp2/ngtcp2-1.11.0-r1.ebuild b/net-libs/ngtcp2/ngtcp2-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..fa38d20afdeb
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-1.11.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Built with autotools rather than cmake to avoid circular dep (bug #951524
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		--enable-lib-only
+		$(use_with openssl)
+		$(use_with gnutls)
+		--without-boringssl
+		--without-picotls
+		--without-wolfssl
+		--without-libev
+		--without-libnghttp3
+		--without-jemalloc
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
+}
diff --git a/net-libs/ngtcp2/ngtcp2-1.11.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.11.0.ebuild
index 0f374b9abbda..014edc9d0dd9 100644
--- a/net-libs/ngtcp2/ngtcp2-1.11.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.11.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild b/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
deleted file mode 100644
index 0d9a9f85c100..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="Implementation of the IETF QUIC Protocol"
-HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
-
-LICENSE="MIT"
-SLOT="0/0"
-IUSE="+gnutls openssl +ssl static-libs test"
-REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
-		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_OPENSSL=$(usex openssl)
-		-DENABLE_BORINGSSL=OFF
-		-DENABLE_PICOTLS=OFF
-		-DENABLE_WOLFSSL=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build check
-}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 0f374b9abbda..1120f2fc5e63 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -3,53 +3,58 @@
 
 EAPI=8
 
-inherit cmake-multilib
+# Built with autotools rather than cmake to avoid circular dep (bug #951524
+
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
-HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2"
 
 LICENSE="MIT"
 SLOT="0/0"
-IUSE="+gnutls openssl +ssl static-libs test"
-# Without static-libs, src_test just won't run any tests and "pass".
-REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
+IUSE="+gnutls openssl +ssl"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
 
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
 		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
 	)
 "
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
 
 multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_OPENSSL=$(usex openssl)
-		-DENABLE_BORINGSSL=OFF
-		-DENABLE_PICOTLS=OFF
-		-DENABLE_WOLFSSL=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-		-DBUILD_TESTING=$(usex test)
+	local myeconfargs=(
+		--disable-werror
+		--enable-lib-only
+		$(use_with openssl)
+		$(use_with gnutls)
+		--without-boringssl
+		--without-picotls
+		--without-wolfssl
+		--without-libev
+		--without-libnghttp3
+		--without-jemalloc
 	)
-	cmake_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-multilib_src_test() {
-	cmake_build check
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}"/usr -type f -name '*.la' -delete || die
 }