10 files changed, 26 insertions, 422 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a499137868af..e24089472d3d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index daadcbf5dc43..3f07f56a1729 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,12 +1,7 @@
-AUX gnutls-3.8.7.1-configure-brotli.patch 5647 BLAKE2B 7d19434915ad74687ebd4540f6abe3ee153ee8e2c5a44ede6955f7d70993fdb746f08ad26e74b13a404a9e26200e482b86507f370e7bb0b6671e29ec3c5cd7ac SHA512 2418bab977fccbe33bc05966fc4f60336e34c9eaef8592588531f18ad0f85e4498bb9f59fe98395f2ecaa8be3eb75b8ddaee72d51c6a903b3f44c9bc4e1b95d2
-AUX gnutls-3.8.7.1-tests.patch 1372 BLAKE2B 56cbc8d129acfd84eaf9b2094952bd7d8837f244c620f47c09d12f7a531d251dcdb7273dfe66f8bb62cebc1a24209a1dc67e9b9b1b86c8af755e9464d3f0f100 SHA512 54925063c7571500860627f3d3e60c91d540bedd79da6582c8575e08b08f96fac776e61c835f2ead35eab9e0db57c9ce9e83a4f201a1357326da6b702d0025ed
-DIST gnutls-3.8.7.1.tar.xz 6695404 BLAKE2B 43334190ce1e45c5302b195f17d06e767d1bea7376278bfbc6ff181a2f57423ba5f334c00ae1833938c7a7a8d15cf607ac862e57435a756ccfa98527d469fd3a SHA512 429cea78e227d838105791b28a18270c3d2418bfb951c322771e6323d5f712204d63d66a6606ce9604a92d236a8dd07d651232c717264472d27eb6de26ddc733
-DIST gnutls-3.8.7.1.tar.xz.sig 580 BLAKE2B ca627d7b3f089205c94f556bee9c06428ada9e0116bb50486dc7dd70f611ae744416d96b17452749d102ccd16bf7b400577b1886a7c8be55833c9e2fde85f9ae SHA512 53ebdaa9775ae22f7eb5e7d6f5411ec667c9c880cea84e23651b6d1994fb1398c09d8efa39b21c96f8be29fa09c2436bdd732a061308956ca1650e3e1878ed57
 DIST gnutls-3.8.8.tar.xz 6696460 BLAKE2B d1498b0b9f14789599fd5b984d5370b632611f2702e9f4fc504ddba2a3e0dd4137bec858eb6150d031f9f50e6b3a3a7d905864f0a9f50a1f01e5ea8f37a44ba8 SHA512 4f617c63e8e8392e400d72c9e39989fcd782268b4a4c4e36bbfb0444a4b5bcb0f53054f04a6dce99ab89c0f38f57430c95aaaec6eb9209b8e9329140abf230c3
 DIST gnutls-3.8.8.tar.xz.sig 580 BLAKE2B 11a30f09e3a478615df2c6a0e40c0b9b2aad5794a82ae0cc871fcf3699b5d9725c9d04708c6f0b983da6e21f90a81f7550e723d0d04f97d1a16d526efbe91b1e SHA512 fdff792511e9e5de203a1dfd66bf521c12fb74a19de651ffa1f7359dafdd1dad59ae57d0f95fa363c4167f798e6b624b4ae1f84d4e0737ff690c2fb0e5a5bdce
 DIST gnutls-3.8.9.tar.xz 6847364 BLAKE2B 0fd4751e24649a9c4b8ee7616350a4b6a504ec10b3ef39b450af25abc4935f30df9e8f732435166516f89c692ac7cb7a0aafb76c4c86c1faff53119840d26ae7 SHA512 b3b201671bf4e75325610a0291d4cd36a669718e22b3685246b64bde97b5bd94f463ab376ed817869869714115f4ff11bdc53c32604bb04a8ff8e10daa6d1fc7
 DIST gnutls-3.8.9.tar.xz.sig 566 BLAKE2B 3e723c90186a00b33f1d036c564039f7340ae495400f05d31bb054dad93a9529be4761ba9f97b2df51e8483dd1433c902cf5b8f9bdc127d0f540c9faf82a8f1c SHA512 5a47a519ef35f21b59e2122528246d6109dd95667bfe5d01713b9a7efa2931f8523bf325b8824433f3117d63e0e50d66f8c467a7ee4bd2068ae039601a28441e
-EBUILD gnutls-3.8.7.1-r1.ebuild 5191 BLAKE2B a4081e3d31b9931ceee1f1eb700cbc7924745374aa716d4d49c3aafd8e933f39b75a5740fe7ec3be56c00cb57663bb2a6a0306417e3ddc4bf83a502d8234fe62 SHA512 35b489e084a74fac97ebd9ae54d025845578e5ad24b72f60e26b7aa2e29fd44a2ebf47b454b877a0d538dc32e09fb0b134750e9912fadb81c566ec59b35d130d
-EBUILD gnutls-3.8.8.ebuild 5086 BLAKE2B 16b51653889c4afe6d05f5f23f854c4f8ddc25bec7d09d003aedad5b2fc7ed22f397ec161bf1cd2cd24774fb898d25ad5fb296ffbe7f9b6bf07f804d0179e9fc SHA512 3772d84e310ca06036d8bf2e80cac6f8c196bb70ee55feaa796445da55bd3d858f869534712267507d12e79c3391cf61751d6cc2482b373e21e4809b2523ace1
+EBUILD gnutls-3.8.8.ebuild 5085 BLAKE2B a7b927f7b5596966dfed3b728a8eb3392b33c1732bbcb80817e3a2dadb1cea0132c90f3feeb61b01f6f12fa7e3c8e1811c69a0acb141ef9bb82e747f665514b2 SHA512 377ee541c0f336b434014239df1c67740b1079e5a486f2746a99a819a80d1f3e374d2c37672f65cf99e452a49a0f5420f5a7e61490bae45e114b914666d5c554
 EBUILD gnutls-3.8.9.ebuild 5093 BLAKE2B 050bcfe998590f13c90dbc902df6975f9314808e8331baf2365af15bcbc81ae10230c5bd59fa7ad245283bf30c38d16f803b119e42dd146f2130c76aaf84f4a8 SHA512 dbea450671801af03ca1d5fb0e6b0b32398d3332a9c1339fcf210675b8f76466d29fb0d72ed7eaafe72c269fd2fb17e6fe5164ef527c2ca1c019d0dde35931f8
 MISC metadata.xml 1181 BLAKE2B 9902770b982d606070b2e34452bd732385f9abdca7ffc89b1a3bcfce9ab471fbd35f87c7fd3aeb610046e50eec13f64ee80d1093f3f9853ec8ecf35521129766 SHA512 b910b2087b83e2dafe3093be4b0d942e2f728b62aa4b3cd8101f681d51752f84b961c8524896cd13d853b96eb5f62f74b7d30edbe84fa42a260eac9e263efcf8
diff --git a/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch b/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch
deleted file mode 100644
index 1dac6f514f0b..000000000000
--- a/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-https://bugs.gentoo.org/937997
-https://gitlab.com/gnutls/gnutls/-/merge_requests/1867
-
-From 292f96f26d7ce80e4a165c903c4fd569b85c1c1f Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 16 Aug 2024 09:42:15 +0900
-Subject: [PATCH 1/3] build: fix setting AM_CONDITIONAL for brotli and zstd
-
-As the with_{libbrotli,libzsttd} variables are unset if configured
-with --without-{brotli,zstd}, check the unequality to "no" doesn't
-work; use explicit matching with "yes" instead.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1158,7 +1158,7 @@ if test x$ac_brotli != xno; then
- else
-     AC_MSG_RESULT(no)
- fi
--AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no")
-+AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes)
- 
- AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-     save_CFLAGS=$CFLAGS
-@@ -1203,7 +1203,7 @@ if test x$ac_zstd != xno; then
- else
-     AC_MSG_RESULT(no)
- fi
--AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no")
-+AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" = yes)
- 
- AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-     save_CFLAGS=$CFLAGS
--- 
-GitLab
-
-
-From 546153198d2fb8fc4902f23de6254bb7988de534 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 16 Aug 2024 09:48:31 +0900
-Subject: [PATCH 2/3] build: don't emit Requires.private for dlopened libraries
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1100,11 +1100,6 @@ if test x$ac_zlib != xno; then
-     PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
-     if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
-         PKG_CHECK_MODULES(ZLIB, [zlib])
--	if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
--	    GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
--	else
--	    GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
--	fi
- 	ac_zlib=yes
-     else
- 	AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
-@@ -1134,6 +1129,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-                    compress (0, 0, 0, 0);])])
-     LIBS="$save_LIBS"
-     CFLAGS="$save_CFLAGS"
-+],
-+      [test "$ZLIB_HAS_PKGCONFIG" = y && test "$ac_zlib" = yes], [
-+    if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
-+        GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
-+    else
-+        GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
-+    fi
- ])
- 
- AC_ARG_WITH(brotli,
-@@ -1146,11 +1148,6 @@ if test x$ac_brotli != xno; then
-     PKG_CHECK_MODULES(LIBBROTLIDEC, [libbrotlidec >= 1.0.0], [with_libbrotlidec=yes], [with_libbrotlidec=no])
-     if test "${with_libbrotlienc}" = "yes" && test "${with_libbrotlidec}" = "yes"; then
- 	AC_DEFINE([HAVE_LIBBROTLI], 1, [Define if BROTLI compression is enabled.])
--	if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
--	    GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec"
--	else
--	    GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec"
--	fi
- 	need_ltlibdl=yes
-     else
- 	AC_MSG_WARN(*** LIBBROTLI was not found. You will not be able to use BROTLI compression.)
-@@ -1180,6 +1177,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-            BrotliDecoderVersion();])])
-     LIBS="$save_LIBS"
-     CFLAGS="$save_CFLAGS"
-+],
-+      [test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes], [
-+    if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
-+        GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec"
-+    else
-+        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec"
-+    fi
- ])
- 
- AC_ARG_WITH(zstd,
-@@ -1191,11 +1195,6 @@ if test x$ac_zstd != xno; then
-     PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no])
-     if test "${with_libzstd}" = "yes"; then
- 	AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.])
--	if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
--	    GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd"
--	else
--	    GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd"
--	fi
- 	need_ltlibdl=yes
-     else
- 	AC_MSG_WARN(*** LIBZSTD was not found. You will not be able to use ZSTD compression.)
-@@ -1215,6 +1214,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-            ZSTD_versionNumber();])])
-     LIBS="$save_LIBS"
-     CFLAGS="$save_CFLAGS"
-+],
-+      [test "$with_libzstd" = yes], [
-+    if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
-+        GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd"
-+    else
-+        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd"
-+    fi
- ])
- 
- AC_ARG_WITH(liboqs,
--- 
-GitLab
-
-
-From 8d0ec0ccdfeaae0d56426169d4c7b490e3b07826 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 16 Aug 2024 13:35:47 +0900
-Subject: [PATCH 3/3] build: add liboqs in Requires.private in gnutls.pc if
- needed
-
-When --with-liboqs is specified and liboqs cannot be dlopen'ed, it
-will be linked at build time. In that case gnutls.pc should indicate
-that through Requires.private.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1256,6 +1256,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-                    OQS_version ();])])
-     LIBS="$save_LIBS"
-     CFLAGS="$save_CFLAGS"
-+],
-+      [test "$have_liboqs" = yes], [
-+    if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
-+        GNUTLS_REQUIRES_PRIVATE="Requires.private: liboqs"
-+    else
-+        GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, liboqs"
-+    fi
- ])
- 
- AM_CONDITIONAL(NEED_LTLIBDL, test "$need_ltlibdl" = yes)
--- 
-GitLab
diff --git a/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch b/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch
deleted file mode 100644
index 1e1b3b54f49d..000000000000
--- a/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.com/gnutls/gnutls/-/commit/f3e8eac0586a19f4dafd89f68006a536b826e65a
-
-From f3e8eac0586a19f4dafd89f68006a536b826e65a Mon Sep 17 00:00:00 2001
-From: Andreas Metzler <ametzler@bebt.de>
-Date: Thu, 15 Aug 2024 16:22:02 +0200
-Subject: [PATCH] revert back to datefudge for "openssl ocsp".
-
-openssl's -attime only changes the verification logic but not the
-generation.
-
-Broken by: d1bc7f644422c4d87edfcd9fafe7f292a1a3a6de
-
-Signed-off-by: Andreas Metzler <ametzler@bebt.de>
---- a/tests/ocsp-tests/ocsp-must-staple-connection.sh
-+++ b/tests/ocsp-tests/ocsp-must-staple-connection.sh
-@@ -48,6 +48,8 @@ fi
- 
- . "${srcdir}/scripts/common.sh"
- 
-+skip_if_no_datefudge
-+
- eval "${GETPORT}"
- # Port for gnutls-serv
- TLS_SERVER_PORT=$PORT
-@@ -69,7 +71,6 @@ fi
- 
- CERTDATE="2016-04-28 00:00:00"
- TESTDATE="2016-04-29 00:00:00"
--EPOCHTESTDATE=1461888000
- EXP_OCSP_DATE="2016-03-27 00:00:00"
- 
- OCSP_PID=""
-@@ -129,8 +130,8 @@ cp "${srcdir}/ocsp-tests/certs/ocsp_index.txt.attr" ${ATTRFILE}
- # SO_REUSEADDR usage.
- PORT=${OCSP_PORT}
- launch_bare_server \
--	  "${OPENSSL}" ocsp -attime "${EPOCHTESTDATE}" \
--	  -index "${INDEXFILE}" -text \
-+	  "$FAKETIME" "${TESTDATE}" \
-+	  "${OPENSSL}" ocsp -index "${INDEXFILE}" -text \
- 	  -port "${OCSP_PORT}" \
- 	  -rsigner "${srcdir}/ocsp-tests/certs/ocsp-server.pem" \
- 	  -rkey "${srcdir}/ocsp-tests/certs/ocsp-server.key" \
--- 
-GitLab
diff --git a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
deleted file mode 100644
index 4bea59830e07..000000000000
--- a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-if [[ ${PV} == 3.8.7.1 ]] ; then
-	# Workaround for botched dist tarball
-	S="${WORKDIR}"/gnutls-3.8.7
-fi
-
-LICENSE="GPL-3 LGPL-2.1+"
-# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
-# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
-# Subslot format:
-# <libgnutls.so number>.<libgnutlsxx.so number>
-SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# >=nettle-3.10 as a workaround for bug #936011
-RDEPEND="
-	>=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.10:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test-full? ( sys-libs/libseccomp )
-"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		|| ( sys-libs/libfaketime >=app-misc/datefudge-1.22 )
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 )
-"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# gnulib FPs
-	MIN
-	alignof
-	static_assert
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.7.1-configure-brotli.patch
-	"${FILESDIR}"/${PN}-3.8.7.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=( doc/gnutls.html )
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	#elibtoolize
-
-	# Switch back to elibtoolize after 3.8.7.1
-	eautoreconf
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable test-full seccomp-tests)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# gnulib ends up defining its own pthread_mutexattr_gettype
-		# otherwise, which is causing versioning problems
-		echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >> config.h || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.8.8.ebuild b/net-libs/gnutls/gnutls-3.8.8.ebuild
index 4fb2c9156071..97af7a7619d3 100644
--- a/net-libs/gnutls/gnutls-3.8.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.8.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index c72750b76ab2..943957c5fe70 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,3 +1,5 @@
 DIST libnpupnp-6.2.0.tar.gz 449563 BLAKE2B 2b89878969ec0a5f6aaf8a0ada188a5df21c27633ff1af21164186670f8bd8e94d690ad4e3abf8dc1b078f9269ae96178ef9f8aae44ea264f5b935b8f193e49f SHA512 6c5bf0e26e61c5eecf93c1afe6a051db8b4d35a8d77f829afebae82cca0bfe2fe10ca20911f2f030eb6833acdeb2d001ea2b5ea863202559457347f6a6d41a07
+DIST libnpupnp-6.2.1.tar.gz 471007 BLAKE2B 7d9c6a641e42f9fb79156c6878ee0e47ec5447504e99478c36edd9e7376672ebb346052b9b09178aae1fb1114748647bb421cc221e923c4cf585b818f705c2e5 SHA512 5718616321e5204e79de78095951fd48789fb0a7f7b8539420429743cf1cb2443fc0005be4ba4a1df26387620b95c8b924be59353c419467e6d359d29f991f11
 EBUILD libnpupnp-6.2.0.ebuild 491 BLAKE2B 9eb16a43b76c6c2af6d33b4cd8d24a6649f1db248ce9ff25fb4b4368a005cc780858d02a9a7707100802b2f433816bb267a46cb791ca084ed776811cb5ba0086 SHA512 8d9d4c9b1aeac8864f0dc8a3959c614ca6d5c0ee360003025d72598c127037e5ed7ea74d9ea28f99f08361c7d0139c4a1e4585cad99aefe1f5412ed36aa411a4
+EBUILD libnpupnp-6.2.1.ebuild 493 BLAKE2B 32d69689aa70cd54b3076763b2841fbec0e9d631f0dd1bda8395b86483864cfcf3bde895a3fd75befc2e73db029ab438adcbd6f1d5bf5c91ed6df066c17d482b SHA512 25d0df9f866d9232cf28ab63acdd2910f8f2e2ac0b0068045d9b3cd229e1e2e8d0c07a7a4c4257e519fd614a510c34124535ce341b8afaf69ed88c9798e7676c
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-6.2.1.ebuild b/net-libs/libnpupnp/libnpupnp-6.2.1.ebuild
new file mode 100644
index 000000000000..b877c51f62e5
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-6.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	net-libs/libmicrohttpd:=
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 3aa7ce9d1c76..84f6ce9a4965 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,9 +1,7 @@
 AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e56e07ab70dbdc7a6824cefd010edf99c6c0b8fdf9f00ffe5e0feffab01cecc6a96dc7444536371adac7157eaa SHA512 37457cae1ed15dbfc9d72bdd6701e20abb027da1e01e48a5202ac209654a014a0f7352701790a643aa7ff12b7be0abff998596a5e09afb6f1f76eb5458f600e2
 DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
-DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784
 DIST libnsl-2.0.1.tar.xz 281892 BLAKE2B 91ad7558127a675bc861dee11d00d82a999462d34753f579a77c1579a7f8be1ded2eff11ecfde9dc81e2466118c288ee18a8b280453f6548cc2b4528021e1503 SHA512 0ffdf15b4380fc89bf11f4f64b74ed999099c0ab3ee39cafd52f933a5000f9b1ed3987c8c13533a7cd92474aadd4cc9909a2e1eabc9143f0cb11746385e5fc57
 EBUILD libnsl-0-r2.ebuild 550 BLAKE2B 5930871570d46dc1db73f5be925fbb832ca9604c5f848fb63efb415cfab698e48d59b97deba265547e4197af0edd393571ecc13e050b84316a7c4efe8d165030 SHA512 af375eb534f762de67d53cfc158beb20de2a92c9531f69feba7dce3339c96ddf8529fb974fd4f5550b40e26603c932f2f5390d810d778aefee4955c272444b9f
 EBUILD libnsl-1.3.0-r2.ebuild 945 BLAKE2B 9b33661ff17edcdc67353d9e1ce816581aef1c9968d277922973054c6ff3d79d6029ce349a820840ab9d02ef419a1692979a699055677032ae6f59bbc796508e SHA512 d49dfc9f46c2a815229ce666e6c150b9c8cca5959a21da57949fff3c19edc3af755663695555b082091d3696a8b2445ef440b742b33c5862ebc5e93a6db37f8e
-EBUILD libnsl-2.0.0-r1.ebuild 1233 BLAKE2B 51a8ff3809a76dd39eab2e09ff2adb86057f8f7cb73e80ed6750ccd283eee0e938c7e9203f00e5ab13e47e0751a2997a3f08eb5c7c7d0073405c6e915d42cb75 SHA512 7e9f1573e1fd774fd77025127438b101e7569dd50c71f49394388d5df8d88d25561609ceb00283a3be4d17ba2ac1bd3d2a5bce1f334e61f0262748863b1a7179
 EBUILD libnsl-2.0.1.ebuild 1237 BLAKE2B 79cb372bb129c76c5b29ad15bb0c8b51a10ec9a1427102def4a6f1407423462bf476718dc32d79588f6e5aa07af4af1e35578d322913e0426c627e630982971a SHA512 36528bc76cb08d0ab19f82e8c07e98d496f1966d769c835cb595f87c91b2387567745b55532537ffa4e9c7ce631a7c480a99e9a9bc59ef0750436dada19fbbad
 MISC metadata.xml 467 BLAKE2B 2d74b806716719c1934f23891142a8d0637a8d18b9d4d135f5bd81171c0014f74e5ba29f84cccc5b05ed93c565e067890b6790aedcb6017431483657cbb1eb68 SHA512 2b506946ace202df654cd398987122955c32d0cb42df1cd5cb159178b6c5df7786c33a309515fd43e2e130dde936536200af1beea2f973efcada4e4dd915d3ce
diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
deleted file mode 100644
index 1de61c58df2c..000000000000
--- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal preserve-libs
-
-DESCRIPTION="Public client interface for NIS(YP) in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-# This is a core package which is depended on by e.g. PAM in some cases.
-# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
-# with FEATURES="-preserved-libs" or another package manager if SONAME
-# changes.
-SLOT="0/3"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
-	!<sys-libs/glibc-2.26
-"
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libnsl.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libnsl.so.2
-}