gentoo auto-resync : 02:01:2025 - 06:31:11

10 files changed, 77 insertions, 256 deletions

diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 4e008ed186f2..71562b41ee6d 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,16 +1,9 @@
+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.5.0.tar.xz 627464 BLAKE2B 6a6fc91f2755d9cbccd6118b53b56b0b4fd3b445c9a491a2d7469ad59d7fe1983516eb79242196db009e7b0875c4db5305bd4c285d2437073b605033f812084d SHA512 6c05beccac5d53c575ceaa594ac6b1d91ae9f0be01394b3520e84b51a44d3c6a71612c2c6f613d3d1b9d2992a83a68696fedbfdc3842f02d4009c95b463ad97f
 DIST ngtcp2-1.7.0.tar.xz 631072 BLAKE2B 1a1ce134c54974418c0cf0bacc09a770e29cd7c7bfc44a2b5420f3bef3e70502f610bee4e9bb5ed9b87024153aa9390d5a233d2d6e2689166e1079e0e4f52600 SHA512 6efa42d17772fde00d9d0a67f2cbcf0704a8462c7305a5e3f213d1e98c9302a1ceee847081ecef358c7a421db56236e571a1ad9ff7fa5f5037987c5cb14e517d
-DIST ngtcp2-1.8.0.tar.xz 632052 BLAKE2B efa8de7e8405c1360de1c8043e66e236024cacebd8be7564e2575cc568daede15ca6ceafa415b7c579a4fc205a507d6731cbff5c5a88dfab70e356f846012150 SHA512 4bb838ed94977515ad7fcd86bbafddfb9733264999b268c109b8f487caf01967b0e6d9d0791f19aa549177a375a7d4182662f14b09e7dc5240fa03b68de16235
-DIST ngtcp2-1.8.1.tar.xz 625204 BLAKE2B c86e975d0c41971c3671d31e152a1b65950135ea8a7c120665ef8466484da1c7d4543afd5552a917dae7bc241c9e66a4729c06be4d9e101952b9e5ce7d4ab66e SHA512 18728ee0376de319a99c3c5a294a7250a8fefa82fd530f0f2882540da2bada2451644898561be6bb6d95e6c8b7e129337edefe3e71d5ca820beb67db0db7d331
-DIST ngtcp2-1.9.0.tar.xz 636976 BLAKE2B 333dba2ca972dc9a119f118014fb7879d78f2a919e4c9905f2e11dc3fde09fe9ac114f83a9024b9465d360dea4f3f9f190dd2f06469e940689b5f11c068c6035 SHA512 2ecec2ec968878caa41df621a9054cca00b1b7b96dedc7c9c6f46b3c5e7534d9b07c985bdfc5e762ee68751e40ba06318aa54948ec01219eee4156f717e85b8c
-DIST ngtcp2-1.9.1.tar.xz 633404 BLAKE2B ee0802acbfc5b1e2dd601090c3a8cd58494132a144c3532c61b8b78e1e0f34ca554c3a351d479db0bd04dea8088c52073871ae29dd1027157eb8c354f856bd8c SHA512 2f1ea7c97b248cbcfc2d616c2285e8d105176d94642649e4629fba279ebdd92424bcc6a96517e17e12005cb64bc2e9bbc0c54bb9da7f49337b6d8257e5be963b
-EBUILD ngtcp2-1.10.0.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
-EBUILD ngtcp2-1.5.0.ebuild 1279 BLAKE2B cd46a3d51926dd3154f9b03fac3e285bfcba86b9e09bfa0d7dc00673289bb4734806d3d2707a050dbbe17f9764547692f3b2d921ecf9f0266c9ec15d5d2f05e0 SHA512 bac06a9a9d9272394965377c969d648eb4099d810bbf91d67ca906a39022bee6ab603aa374a029650c6bff7dca552efcb46de64caffe32f0087787e273a37808
-EBUILD ngtcp2-1.7.0.ebuild 1295 BLAKE2B d3464cd2dc591ab9db36c38356404ced342fca2e1b79e06c8865c1a10986cb9cde6655738445bf2827c53dda282df4c2227a6c4f2f467102dcf32edf038ae083 SHA512 4afe33f5f93037ff568f9bcaa9d65b4e600cf50950d2a80e621c5e7b118d15aa13c1c0f5140c6f7d02734ff4ceabd3bf29f56fed839f3227e30867c2ece45f8a
-EBUILD ngtcp2-1.8.0.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
-EBUILD ngtcp2-1.8.1.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
-EBUILD ngtcp2-1.9.0.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
-EBUILD ngtcp2-1.9.1.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
-EBUILD ngtcp2-9999.ebuild 1302 BLAKE2B e8b99066e3671cadeb16fdb621509dbd9c8da8d81112ec469cb198d3c8b6dd049c62c1031dea6f9c624411c49829c3e1bc34adc1bb63bb028182b9ee5b4c1562 SHA512 c11fb0122456dc490cf580f6d403c8b0d01bce976ed2ccb868b67bbe7ee7583b5207b5acbdb2a3200be25ff0a75fbd78997525d2bce25661925a78f306936d27
+EBUILD ngtcp2-1.10.0-r1.ebuild 1396 BLAKE2B cf059dc3ea2628f6ab9deb7b689024d87ca41c99b213780d5e93d271f7a95029a5faeb3a341099fe85b7f5fe4d8320de9d1792652adf3dfba9c566b4d4939f37 SHA512 8fe9383db3e34aa94c6a747cc8c602d6c91835a0b4d0ecdbfcfed42ad8b743343c81141362067d71536a7d93e35c886099df2f2ce4fdefd9cc54dce4000d88f1
+EBUILD ngtcp2-1.5.0-r1.ebuild 1316 BLAKE2B d1a4435440228514efefbdd6663591a05eeaf0d25fbf4271919bcb7df92f8d30038165500b29c76440bfb5ae0f0dcae34fac01f30788fae051788b059d961c37 SHA512 b156ee635493b18bd483aa46d77ab4832cc6d439f2e190538bc0099a9b82124df9af9f5be1d02e411f932597f5957566ea853c8f3ba4ab0f63d6d32eb5833e29
+EBUILD ngtcp2-1.7.0-r1.ebuild 1332 BLAKE2B 023b18e726148cf593bdee277a5094dd4539699f96ab814a373e9188fe730603a49f81211ce98a7ffc75cbd7963616e44020055db18c5f37f2ce4f57622f29c5 SHA512 9d83417bd659bccd8cb9b32dfe9154b8cc545d8e9ec509fae5a2607cec8d29557150dabb9534cf46bea0015b3ade1f49e5604926d9bd1d1533137848a9ce6b77
+EBUILD ngtcp2-9999.ebuild 1396 BLAKE2B cf059dc3ea2628f6ab9deb7b689024d87ca41c99b213780d5e93d271f7a95029a5faeb3a341099fe85b7f5fe4d8320de9d1792652adf3dfba9c566b4d4939f37 SHA512 8fe9383db3e34aa94c6a747cc8c602d6c91835a0b4d0ecdbfcfed42ad8b743343c81141362067d71536a7d93e35c886099df2f2ce4fdefd9cc54dce4000d88f1
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/files/ngtcp2-1.10.0-munit-c23.patch b/net-libs/ngtcp2/files/ngtcp2-1.10.0-munit-c23.patch
new file mode 100644
index 000000000000..93d208fa4215
--- /dev/null
+++ b/net-libs/ngtcp2/files/ngtcp2-1.10.0-munit-c23.patch
@@ -0,0 +1,28 @@
+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/ngtcp2/ngtcp2-1.10.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.10.0-r1.ebuild
index 789b94518acb..d3a2c73278eb 100644
--- a/net-libs/ngtcp2/ngtcp2-1.10.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.10.0-r1.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
@@ -24,15 +24,20 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+		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)
diff --git a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.5.0-r1.ebuild
index bc6df468fc15..e035dd055783 100644
--- a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.5.0-r1.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
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+		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() {
diff --git a/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.7.0-r1.ebuild
index 70833ee25820..0d9a9f85c100 100644
--- a/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.7.0-r1.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
@@ -24,13 +24,14 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+		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() {
diff --git a/net-libs/ngtcp2/ngtcp2-1.8.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.8.0.ebuild
deleted file mode 100644
index 789b94518acb..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.8.0.ebuild
+++ /dev/null
@@ -1,53 +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/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:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-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-1.8.1.ebuild b/net-libs/ngtcp2/ngtcp2-1.8.1.ebuild
deleted file mode 100644
index 789b94518acb..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.8.1.ebuild
+++ /dev/null
@@ -1,53 +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/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:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-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-1.9.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.9.0.ebuild
deleted file mode 100644
index 789b94518acb..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.9.0.ebuild
+++ /dev/null
@@ -1,53 +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/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:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-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-1.9.1.ebuild b/net-libs/ngtcp2/ngtcp2-1.9.1.ebuild
deleted file mode 100644
index 789b94518acb..000000000000
--- a/net-libs/ngtcp2/ngtcp2-1.9.1.ebuild
+++ /dev/null
@@ -1,53 +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/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:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-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 789b94518acb..d3a2c73278eb 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.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
@@ -24,15 +24,20 @@ REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
-		openssl? (
-			>=dev-libs/openssl-1.1.1:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+		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)