gentoo auto-resync : 03:01:2025 - 06:31:16

7 files changed, 48 insertions, 137 deletions

diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index dcfe5d287573..305fd4bd8a34 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,12 +1,7 @@
-DIST nghttp3-1.3.0.tar.xz 390176 BLAKE2B 8ff17da3e53efb27b13e9ab17dba4ca27cc8fd948b160a36a0b0496f61a49c2729f1281f9a29cb8fecd4dd2c274696885a3c5e001be3dcfc30f5f1c9b6339467 SHA512 a862e7a3c3f6722b07d5437976850b2998032d1f7b9da7a49e6863d59c611ff7204c9923e8e570301a9bfbd91931a30f8f85e96cfb35481783adfc2f955a8b8c
-DIST nghttp3-1.4.0.tar.xz 389036 BLAKE2B f8292aded56c0778dc285cf7d8261494c89e70e1e2128b0196be97706b1ce45edfd885031d069990429ef82c56c4922e0fe07d7471d4851642ce5e8afaf02bb9 SHA512 39ff9418009dcf84ae58d8297f53427da91509a69ecc4fc78c4c00f0fe6bbe348f7afffeafe535ae4c02ff9f0413016b4f51de6a87d8e8c8f6b415bb7f2b0895
+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.6.0.tar.xz 392480 BLAKE2B 43cedaaddaf450a8c3cac4be2353605c85230ef394a94bd40d74f1561fb3593d022f865da41aa05d301de43ccc0aade69f015866cfb93501c4c9083808ef81cf SHA512 d0f585cf388a48d391f803897b0998c12c39e118ca380ecc48c4d3dfd3ff4588a5e456dc89a96f2f5ffd5afc261a2d60a71fd4d8ebb82af35bfe6668737538d8
 DIST nghttp3-1.7.0.tar.xz 395808 BLAKE2B 2a13747518883a0f11005ee1189dc6a32a73fdf390416f6e3c352a7be76cccd68522581c2148c6a86c24f14ba13fc21a7c6d6815ab3ad724c08a8088d1421d3b SHA512 77510e2056206e3e149bc3535a0e7e6095afb0a0358a9dda48c8be82199eaefd0dadbba7e027c5c14eb46572d2dbc929a99c3b9c6d27c83a1c80428263ccecab
-EBUILD nghttp3-1.3.0.ebuild 744 BLAKE2B 994f0c78236499781bd2f9614027cece2269bec984b84832072a5b2a13c4bce12b41db6e0cbbe64837d42a2b534eaf51c4293bce57c584b62be791739ab91773 SHA512 7de158fd566b4a1e85db9f4a7cf6b2da7204618dffc59a5b5ded3284becc80b68bfa71d952505ca393eea9f10b31c02eda355eced3c68428768fb47ea0c76fd9
-EBUILD nghttp3-1.4.0.ebuild 953 BLAKE2B c3aa735822acdf3c34b2c013fa8744b822e78072f3f7fd6c59f1df8a39621efbd160970bcfbeeb0a3afb39fef40bb091c304bff85decb5e4a418fc2c56a5089e SHA512 ff2fe912a4e9aa9c7f061d1efb0db7aa4d0c2b6c87580ec93776fc1470a6b3336866b14c5ac54939df5f18e0ed050ed0d79571abfe92b5c36d78181ad0c2f8b9
 EBUILD nghttp3-1.5.0.ebuild 958 BLAKE2B ad076ae8c16c3d5bb071a0eaeca6dcd8e50346a2004e058f7cb6974dcf40dc96ff3bebba87e90347a6ef5bc7419e9d532aaf4e91974c44d50c66e7aef2f0e6a3 SHA512 fe607a954531eba7c467bf58903a2e0400b2396076426ed8b8466a7cd953885573f0b29e6b183d4d33aea4fa95a17d656517b45676f97290adbdd6c9401b65ce
-EBUILD nghttp3-1.6.0.ebuild 957 BLAKE2B bca7ced66a05e7168e1a5e984d16549d156040b536a38d7959e634f0c52f9e74cf24cf22b789567ce6bb90d3ad7779c1d52349ec72e95c1e7a1c0ba995d8bf99 SHA512 a43e8ee53e7c55e4b537cfb13ea73e142960bb1c0331a473a5578ab4688814a4574ec1920a0548fdea545e0dac5c1c29d99df440d708141461233966fb1732f0
-EBUILD nghttp3-1.7.0.ebuild 957 BLAKE2B bca7ced66a05e7168e1a5e984d16549d156040b536a38d7959e634f0c52f9e74cf24cf22b789567ce6bb90d3ad7779c1d52349ec72e95c1e7a1c0ba995d8bf99 SHA512 a43e8ee53e7c55e4b537cfb13ea73e142960bb1c0331a473a5578ab4688814a4574ec1920a0548fdea545e0dac5c1c29d99df440d708141461233966fb1732f0
-EBUILD nghttp3-9999.ebuild 903 BLAKE2B 688e8d22b7ce67aa1b6605bd4c0cce375b7943d5999f4644801494e3da7e51e16027b26b1cd0b3f560aa083a3a24b32a94960dc47aa5c321bfec35d9212e4959 SHA512 34c929f7296197bda8e6c082726ddc7c5770849c0d7336649e180ca3830c9b634db8d4160f476b4518437ef436c13ffa0825a317e1ce17db8d71bae0adc0dbd8
+EBUILD nghttp3-1.7.0.ebuild 1037 BLAKE2B 9ccda00946f4118bc93fddc3b0b9a83a3df401094cbe878b1f9b50b06e21db969783370873d628e0eb9ca3c30f8354f8f753f477a3e1e80aec99b6c7fe7c8c1e SHA512 eecc3e7b4bdf8771ff3ee4ad599723fb35198e198786a9b46fbe803d69880a1cc427aab0d0973c6878b03f7180f5c9f0a53af0454227796de398b1c4805ba17d
+EBUILD nghttp3-9999.ebuild 1040 BLAKE2B 17e3e65e2ee4f717edddb01bdaf2f6d6dded715e2080b746b674b91acfdacefbcb85a7c65a59cbe8d12da430e9452ab7179e5f608b7b60ac7374e702152aecef SHA512 baf915564151d952a4aa4be69fba90bcfd203d512d427a9098284aededbbf3da4afec2bf6e15edf81340928d6da3a58b4986872534ea9313f71083341719a9a4
 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
new file mode 100644
index 000000000000..93d208fa4215
--- /dev/null
+++ b/net-libs/nghttp3/files/nghttp3-1.7.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/nghttp3/nghttp3-1.3.0.ebuild b/net-libs/nghttp3/nghttp3-1.3.0.ebuild
deleted file mode 100644
index 090a05628f65..000000000000
--- a/net-libs/nghttp3/nghttp3-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +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 ~riscv x86"
-fi
-
-DESCRIPTION="HTTP/3 library written in C"
-HOMEPAGE="https://github.com/ngtcp2/nghttp3/"
-
-LICENSE="MIT"
-SLOT="0/0"
-IUSE="static-libs"
-
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIB_ONLY=ON
-		-DENABLE_STATIC_LIB=$(usex static-libs)
-		-DENABLE_EXAMPLES=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build check
-}
diff --git a/net-libs/nghttp3/nghttp3-1.4.0.ebuild b/net-libs/nghttp3/nghttp3-1.4.0.ebuild
deleted file mode 100644
index b25dc423857e..000000000000
--- a/net-libs/nghttp3/nghttp3-1.4.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 ~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.6.0.ebuild b/net-libs/nghttp3/nghttp3-1.6.0.ebuild
deleted file mode 100644
index 435f7754e75c..000000000000
--- a/net-libs/nghttp3/nghttp3-1.6.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 ~m68k 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
index 435f7754e75c..ddeee7aee2f3 100644
--- a/net-libs/nghttp3/nghttp3-1.7.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.7.0.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
@@ -18,25 +18,29 @@ 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)
 	)
-	use test && mycmakeargs+=( -DBUILD_TESTING=ON )
 	cmake_src_configure
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && cmake_build check
+	cmake_build check
 }
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 42309a43581b..75bde0f87eca 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-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
@@ -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 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
@@ -18,25 +18,29 @@ 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)
 	)
-	use test && mycmakeargs+=( -DBUILD_TESTING=ON )
 	cmake_src_configure
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && cmake_build check
+	cmake_build check
 }