10 files changed, 68 insertions, 113 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 44b20dcfa85e..a4b0bd20b004 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index ecd54fddae6d..b92d50b67589 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,11 +1,7 @@
-AUX libgssglue-0.3-protos.patch 471 BLAKE2B 2b60d3786c74fc104f7bd329560ba348b087653f2f5f23acaf942fd8301f25286d558f0dbcda23fa04b3baecbd170d34dbeff8a3f62cbe832ecd39b43142512d SHA512 920d0cce943f62b3e826b6d6b56c4629a3bb11f1d0835b2eea6607ba98a3d30f544617b2de06c1fb4d879e0fa0a6d3e4aa0079f6d2b26c1017df54b8d36d505f
-AUX libgssglue-0.4-implicit-declarations.patch 530 BLAKE2B ee86f8cc22ec18834944c459340fb7b8e9114efb02f3f1b402b4fcb7d21260b4f4ad97d43783ab0dcf0a8a627f4348ca17420bcc2497d0e847c6d8e8d458f82b SHA512 c49ae441600d6f7971778bccbf20b26cc8f37c07d6f73f9f1fb95560d25772f6847322eff9a3e8c89369b11bb3540db1f61645d4fd37db1cb6c7f763c4753dc6
-DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
 DIST libgssglue-libgssglue-0.7.tar.bz2 31415 BLAKE2B 4017ff17b876b00d93d5120ca8fe2a1f472b61c7b73dec0194d0ebaa244176b5d6f85fbfe5ce52cd77bcce9e1718f979b36e8926577640bbad38208fcea78f5a SHA512 04ea9af9f56afeca40b1dd22708dfa2e844d587106f370820a8976a22e8b95c646cdc5c5ef4256e34780cdb34c5617c45187fe3866670662f15ac579ef22dcca
 DIST libgssglue-libgssglue-0.8.tar.bz2 34586 BLAKE2B 4dcd39f53904c2d5e559b15329bd6c1b8931dda426ef156d65e21d68cce85bc12d20338254a0d9fffb6acc7cec074a56e355f4bc95c065e4dafe787d4b8c077b SHA512 7866875d7394fd8c6eeb9621a88ab0393c0d30606c407fa5d5b25a30579642d37bdafb81b748bb84cf026f47716e4c4f68da6e6eb2d5afeedfb37270f1749aa1
 DIST libgssglue-libgssglue-0.9.tar.bz2 35115 BLAKE2B 365e872c0e730e5a04d2c9b0be4796ca9c6667f4a9713d51b820d0b7c89ca675052b4fe09073a4bdd9b4f57e336f51d4eee46d049550730a3adf2a93c37fd05b SHA512 fc452883e1ce0f22c1dae80f948b4f4fd581a025cad66d3f1a8c701657a01f537c327d8e0ec5c7840650e99b6012a47de8b269e279df2aaf007045273356ca48
-EBUILD libgssglue-0.4-r1.ebuild 897 BLAKE2B 365fcbfeef49e423541b409f180d401200f21bae33e205dbb6802003d14f4c4aeac3df1d9fe4c7daa9d450047bff6b98f5ec32c41e1961c97823a98bac1d818f SHA512 81b3c379b9e772bf3085dc309c8edf9e780c1015ef6f00b66c7ed1c325b52f8f171156013dfa8d7998145d35fc607e19e72b2e13a3948ef5a147228ecc948d1a
 EBUILD libgssglue-0.7.ebuild 1148 BLAKE2B 1316c73948290c43031b36db99d16fc49cd07717c58f06951273f878bfac34a2a95e089f267141dcaf9a13de6fa04e3f025d967ce6cd9c49dc9cf2ccc0846abd SHA512 e319bb7b2dbacb6095df12eb5bba36b344852ffb6faea1f8b093571922b1296efa4c4041406ea3ce44578ce82bd054c45ec77b62c777ec3357fe427f7a162e6a
 EBUILD libgssglue-0.8.ebuild 1157 BLAKE2B 1f6a3ebb6cdfa170db6cfce838d15e39036d06846862b22a2b6c032abfc7ac1455d8c73df2ec27b2565d79dca466f62c39c58c81497f4efff73de21dc4c8bfcf SHA512 1e6bcd4bcf0f75b20dff47467afc61f23daa08597dddbfeac834cb77e3b2d5eb28379c1bbe3eb5c1883b963284ad80e119ceeb4184603f4e3341d71777e6a770
-EBUILD libgssglue-0.9.ebuild 1157 BLAKE2B 12ad7d7febab4a617ec431ae5901fdd082a7e028ab0653c56228267cce5e325f1ae14b468e92ca1394e70abbc7a276b46a9ae03d259f99b591b2cdb25b6b5db5 SHA512 0c549b36ba3b4456b2f22aed947eaf4ea8fb772c65795a82cf7a3d0efee421766ec16e9beb2ff96542f7d59c45731d1eb3d1db8fbaa6b8695d2521ecd9dab345
+EBUILD libgssglue-0.9.ebuild 1162 BLAKE2B 2dc72dc2e01ae7e1f4ea558bff405d69585230c3c5e3f2748b9f58d4b9a96d8057236c14134cd2fb35130876500aa0fd93203d8ab5df0711a4913a7727e2500d SHA512 10e4d990feab3a5222b5ee1e9064c59ac18366eb75ec1b80aacfd5ef437572576e32c31fce5a47e6049ad002974a3217ce5aa1e3849269f02e99cddf7dda8526
 MISC metadata.xml 249 BLAKE2B 83b0c3cbb109f3a5fe471176078244f62b6db5cd38cc72a2a4ca3d7accc1bf39c12bf0e3e902cd8ecf4f80b72159f658e31cd55065893da3882c7b471551ec5a SHA512 235a0cd45a87d913d5f64cb14acad34258055a7f7cac2808aec35cc022fdfb5c76780016dc22131281235634424d23a6ddaafdaa4ee62a577ac5e3ef40cce843
diff --git a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
deleted file mode 100644
index 8c15108d32e7..000000000000
--- a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.com/gsasl/libgssglue/-/merge_requests/1
-
-add missing prototype to header
-
---- a/src/mglueP.h
-+++ b/src/mglueP.h
-@@ -477,6 +477,10 @@ OM_uint32 generic_gss_str_to_oid
- 	    gss_OID *		/* oid */
- 	   );
- 
-+OM_uint32
-+generic_gss_copy_oid_set(OM_uint32 *minor_status,
-+                         const gss_OID_set_desc * const oidset,
-+                         gss_OID_set *new_oidset);
- 
- gss_OID gss_find_mechanism_from_name_type (gss_OID); /* name_type */
- 
diff --git a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
deleted file mode 100644
index 92a96305b406..000000000000
--- a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.com/gsasl/libgssglue/-/merge_requests/1
-
-* g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
-* g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration]
-
---- a/src/g_initialize.c
-+++ b/src/g_initialize.c
-@@ -29,6 +29,9 @@
- #include "mglueP.h"
- #include <stdlib.h>
- 
-+#include <unistd.h> /* getuid, geteuid */
-+#include <sys/types.h> /* ditto */
-+
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
deleted file mode 100644
index 585714049450..000000000000
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="!app-crypt/libgssapi"
-DEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3-protos.patch
-	"${FILESDIR}"/${PN}-0.4-implicit-declarations.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s,/lib/,/$(get_libdir)/," doc/gssapi_mech.conf #646126
-}
-
-src_configure() {
-	# No need to install static libraries, as it uses libdl
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins doc/gssapi_mech.conf
-}
diff --git a/net-libs/libgssglue/libgssglue-0.9.ebuild b/net-libs/libgssglue/libgssglue-0.9.ebuild
index 7574054feb34..77599822a95e 100644
--- a/net-libs/libgssglue/libgssglue-0.9.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.9.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit autotools readme.gentoo-r1
 
 DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue"
+HOMEPAGE="
+	http://www.citi.umich.edu/projects/nfsv4/linux/
+	https://gitlab.com/gsasl/libgssglue
+"
 SRC_URI="https://gitlab.com/gsasl/libgssglue/-/archive/${P}/${PN}-${P}.tar.bz2"
 S="${WORKDIR}"/${PN}-${P}
 
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index bc32b7d2acc9..399a0b47f4a8 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,6 +1,4 @@
 AUX libnatpmp-20150609-gentoo.patch 2811 BLAKE2B 2125f030a90a20845616d28ecbf0554953408856b8e78d61a020d7ce95c357397f50263e7838c034510221dd6627e066bed19b1c75cb468a97f2517bee79b744 SHA512 ef3717dcc5b0f83522f45d7799fdec539f6148c24ea6d2800c601a5d0847c9c26f848b9654464d23e140426b32ed3aeed0030e7ade600e974129aef729786436
-DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
 DIST libnatpmp-20230423.tar.gz 26506 BLAKE2B 01386509e410312d5063038a4a929e2c838d8e6061f693cd43144f98dc4725deff459cb476842e6fab78323fb87ac0ce0f74efe3837031d89ea846932dc4fdcf SHA512 1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7
-EBUILD libnatpmp-20150609.ebuild 792 BLAKE2B fe8fcd8cd2c9339db176c34681f32482a83e990b922d7c17ce2803a4cc8cdf4f5cd5f626e63a480957e5c1a014857705d4064fccbe0428146d5b478a2bd3e87d SHA512 d67291394514570e29fa50e1ab690c511cfcdcb599a1813a4ae4d008613574d39679545815c64d89993bf0c2d9438cf8215dda3febab55e319b1f25a2014217f
 EBUILD libnatpmp-20230423-r1.ebuild 799 BLAKE2B 128ab6b98be69d779000ed546cda7d9848c5fd9e56434ae856d4a804fedc1ef38a419d46675e629e47af9da3780af60fe7da27dfdd3a690395405e51aa7f6426 SHA512 4e51afd809d1f681d8522d8274067fd9e3ed472ec587241ab4e607aaa159dcffdde76d903ce459e7c03497b9efaee741ec9d76b0e0660543e10feef4fc416d10
 MISC metadata.xml 251 BLAKE2B aff27f0414b759d8b480b5ff7510ad6b4c7247587e98da4e5110a1b20067eede21609515f370ecd8ece32e7a6667bb9b3e38718e4be4d3f584858db7459d030b SHA512 0afc6591b2d966f15fd3fbece3fc4c74f3c36ac26b51884c8a21f63ce26cacae12e8b7d8b90967818c6ec3d110d33282f5635bb0b606b8a08f7a573fc9f1f8fb
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
deleted file mode 100644
index e52252b93031..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An alternative protocol to UPnP IGD specification"
-HOMEPAGE="
-	http://miniupnp.free.fr/libnatpmp.html
-	https://miniupnp.tuxfamily.org/libnatpmp.html
-	https://github.com/miniupnp/libnatpmp/
-"
-SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${ED}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index fc7dc46c488a..73b5bc6022a3 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,10 @@
 DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
 DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88
 DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c
+DIST nghttp2-1.63.0.tar.xz 1606480 BLAKE2B 8c4158b8855b3b4b0a576f5cc894f77f88bab35bbb995809c7494bd73030d50d0189153ef5434a3071267bc6f198ea3ff5d7e3bd8bac4299fb8fbf3be91e11c7 SHA512 ac5005f33664981e194730223881f4207c9570cb8d9bba51b5592a3e7eb59455ebe25bf190211811513c64497a1b42ec7a82cc7f810059f46c99a83dd2d6cef9
 EBUILD nghttp2-1.61.0.ebuild 1816 BLAKE2B 53ee685bca4dd3040979ecae97195b30caec91d09ddd91b0235de955b7848192bdc3c26c6d8d4efd3e5011ff5f0d669c5a7e403925432393c926d976aea6ee05 SHA512 8683d54a28e42d8f5d5b2e25ee360d4a7f2e9ada858afac520c943ec93934971108edf2e3051ee48dd2fa603fe00e95411ab84bc4cfdd8d9ceea9ba30c1320cb
 EBUILD nghttp2-1.62.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
 EBUILD nghttp2-1.62.1.ebuild 1817 BLAKE2B df18472dafebfd0ca64a248b7927e3c47cd1f8e1f743a7c30ed599ed5ade98ed8c43eec5d129225416e308d87f80eccf79b705fa2ed59f4099404eeb035cb9b5 SHA512 97fbe7b545dfafc6e6fafbacee1cd4f82fe3e17b895a5fb052062b009de59073f0291489ffec7a0776d6c7c88ed402ceb4a0d7adec13c8a48ce1ec72c34402ec
+EBUILD nghttp2-1.63.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
 EBUILD nghttp2-9999.ebuild 1607 BLAKE2B 86247f2c6086da22f6d506e8e31c63d558aa45276d2deb202ca515c35034419829be8b6fef0be10b15367b6880ee35f7b62cae6424ecf6c7ae2cac90b090f3bb SHA512 e30a674093644da312f76a7ce8c25ae468c95bbf2e3b69c8618cb21b3852799dfeb674007ae5694d77de46c093228f97c517fcc23e9791fd42c708e55431114e
 MISC metadata.xml 553 BLAKE2B 694d0da32dab7f6eebd3b83a12b490b62d262de96e2bbb5c5822befbac792bc560cfe21c194d83d1afabf725967e0508c65057c8382904353abb0219d5ff3338 SHA512 4bce2e01c0b64eee279fc8a425393acf63e859a8b63346ddb2c5486d913bc58d0485d4c7fd6663bec88b070f21b6c9bbfd28e5775dbcbee02248e631610becd0
diff --git a/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
new file mode 100644
index 000000000000..040b77645d76
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 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"
+
+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
+}