7 files changed, 77 insertions, 34 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 418392f6361c..9cab3dd75dbe 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index b67927586ff2..b67be09fbb93 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
 DIST libmbim-1.28.4.tar.bz2 213993 BLAKE2B 86418182fea2ed50d6b606b898e58f0511ecc5ed4be36748678befa3c005d37a2364db6f4f5537f6a616015f635bb77cfcae282b328b1dd3f5807eae360e93a7 SHA512 f6ac196106e70c790727438a4f42c14b3f8e82dc96b9ac244fbe44b9173132d9562dd6250a51bbf21fc3b84a2a059ae9d7d02d08cac5ba5775715507a64d66d2
 EBUILD libmbim-1.26.4.ebuild 818 BLAKE2B 0e5a56b61c8ecd00f64567c92bbfc231300074127801ce45faac59d6542ffa241dfa41fe230baefb21e3c233df0465bf950490106da11abf614e9ea64de2fdec SHA512 c8ef5404377c880cab18f6831646f1a4251ad0d67e190f4f129243c4f464f00da07a78ae23ad3726fe614cdcbd8fe5d694813231bd0d58d565d623141aa75dc0
-EBUILD libmbim-1.28.4.ebuild 1114 BLAKE2B 37c85420e961d7f5f8d06d800c568eaf2b308139d34506ca9bea0e2a6a5cd11c42cd4bf87cf15dd3c40e0d9f941a92bb2080dc4e9acd52cef9273f28561b078a SHA512 0788ab83afbcb8963eb0891053b64eed85bab796b86afec9e7785f37e89d9b7c86da7a5e1b2f4106d2e577f1e2d999233514b92eb34cae73527b3e2cc936efa7
+EBUILD libmbim-1.28.4.ebuild 1114 BLAKE2B f5c4b744906e33fd74b987efb162c17877af330552f69d57774d9b93efd954ada51d03eebce3a7d2fd823d668e15e1b77fd3fa080000ebd3154a3efed7400eb3 SHA512 bf3916afc206c5e45f54ef72570f9268f1fc80fbaa36bc257ce035f482154419a837c5e6fbe8e26ab14022ac479c0f91fefeeba6407e542c31393fc64ca0138e
 MISC metadata.xml 338 BLAKE2B 2815902ffac2d76180100eebb3c6b7e72c17b024325d0e4dabf24a7dd1a0365c409e95b2d735595c762f9f16dca663ce34106bbedaa872a5ed72435778914b6c SHA512 f43d3c8e5b608e73f8a230760bffc555c0728f9109b321d7205288de0a52e4867135b026b8775b4443f9db761874736bc849d8b16cfa636685e115fe9b9f53b2
diff --git a/net-libs/libmbim/libmbim-1.28.4.ebuild b/net-libs/libmbim/libmbim-1.28.4.ebuild
index 10aa74fce7b3..828de99f0a11 100644
--- a/net-libs/libmbim/libmbim-1.28.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.28.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 meson python-any-r1
 
 DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index ba4e20effbf8..f06797f23561 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,5 @@
 AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9
 AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69
-AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8
 DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3
 DIST node-v18.20.2.tar.xz 40550044 BLAKE2B 119e1c0a1817b982940704c3fb92bca8fa09d6d26921ffa01aa1240103704d2e2779774a759246f9b00372bcd991e8cff035f3c5ad0bf92e0fde9f640721904a SHA512 b613e1cf5c87535fc3db908cd258359813aae7636ab0e2fdd00ffe813f99e33050926f10016280d8fac4905fb933d1f20315b919fbf3b0b37cd7a9936ae415e3
diff --git a/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch b/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch
deleted file mode 100644
index 8011c2bbdfb9..000000000000
--- a/net-libs/nodejs/files/nodejs-20.3.0-gcc14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ad0bbaf34aa3150b4f3507b9973b6f5e8ed47474 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@cmpct.info>
-Date: Fri, 9 Jun 2023 18:29:00 +0100
-Subject: [PATCH] test: add missing <algorithm> include for std::find
-
-GCC 14 drops some transitive includes within libstdc++.
-
-Explicitly include <algorithm> for std::find.
-
-Signed-off-by: Sam James <sam@gentoo.org>
-PR-URL: https://github.com/nodejs/node/pull/48380
-Reviewed-By: LiviaMedeiros <livia@cirno.name>
-Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
-Reviewed-By: Matthew Aitken <maitken033380023@gmail.com>
----
- test/embedding/embedtest.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc
-index 3592ccb98132..dbb420f34682 100644
---- a/test/embedding/embedtest.cc
-+++ b/test/embedding/embedtest.cc
-@@ -5,6 +5,8 @@
- #include "uv.h"
- #include <assert.h>
- 
-+#include <algorithm>
-+
- // Note: This file is being referred to from doc/api/embedding.md, and excerpts
- // from it are included in the documentation. Try to keep these in sync.
- // Snapshot support is not part of the embedder API docs yet due to its
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index c48ce79b074a..b2c59b4c8c33 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -6,6 +6,8 @@ AUX serf-1.3.9-openssl-3-errgetfunc.patch 402 BLAKE2B d142dc567dad42966ff7a9bf84
 AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a0756ddea3b081378a7180f334eca697cccc5fe637dc8226d72daafbe5440aa595def447f76a52ab9f11e8bc626be846b SHA512 2538c2c80f924fa823a28e00e40688af0a38cb94ae2302cee83070645017e8321a0647e947a98c9d541228054acb8e470a465e4f2d5782b99a9b782aac86dfc1
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
+DIST serf-1.3.10.tar.bz2 147744 BLAKE2B fed9ef4d5b16a5f1276a4a6f72ab938db18d4bd51c2a58311d2918f52f891bdb636f947cdc612b12a8978f75d27715b7695f21730d1b8a0545746281535369fc SHA512 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
+EBUILD serf-1.3.10.ebuild 1854 BLAKE2B 41c434cfb2e6dfc097d0be6df012620da92d492ff3dbeeeade002499fa0d8ad20942da1de78cac4dc14a9204b7c2a9ec710d01ffc74ff518daab557e261e67fc SHA512 c8a49ca1e7abe104c02f578d65ca027fb97b35d07af23723147dcaf84083276b9f1ecb66cfc6126bd814db045863ea59fe55537f7f3bf73701881d2c8fe053d7
 EBUILD serf-1.3.9-r4.ebuild 2187 BLAKE2B 239e0c488972e1535cd32bb8dae10f25eaad37e49125cb441f38caacfad7ffbebff0e5cbc9705238f9a612a699fb6b047a8d036d86113164f7e6007a306e76d9 SHA512 5e5a57e7f462f8353bafdd4bb7c15e9d57a43506ffcad6bd5af0fbf6fab04b4ea264f8cbd2521af776558843120d7081577b1bf74bad11aba5967a610c84876f
 MISC metadata.xml 242 BLAKE2B 9323724392947eec7347e9052aadab6d31da88b1fe94720fdd3993f37aeb74d00e43a34ec26642c79b0d471bd0146aaaf3489a3ab341445c6ddfcf305c581989 SHA512 c20cc4c38ff85c11dafe9981b45f20d2343d817cdfbb0c1e8cb77b0964e5d2b74762dfb8384c9fb47e8f0427b1f3f3e38a3a81f81c76ca30ade4a0994db14cea
diff --git a/net-libs/serf/serf-1.3.10.ebuild b/net-libs/serf/serf-1.3.10.ebuild
new file mode 100644
index 000000000000..f9f22cb29bd0
--- /dev/null
+++ b/net-libs/serf/serf-1.3.10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="kerberos"
+# Many test failures.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/apr-util:1=
+	dev-libs/openssl:0=
+	sys-libs/zlib:0=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-build/scons-2.3.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch )
+
+src_prepare() {
+	default
+
+	# https://code.google.com/p/serf/issues/detail?id=133
+	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die
+
+	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
+}
+
+src_compile() {
+	myesconsargs=(
+		BUILD_STATIC=no
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		# These config scripts are sent through a shell with an empty env
+		# which breaks the SYSROOT usage in them.  Set the vars inline to
+		# avoid that.
+		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
+		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+	)
+
+	if use kerberos; then
+		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
+	fi
+
+	escons "${myesconsargs[@]}"
+}
+
+src_test() {
+	escons check
+}
+
+src_install() {
+	escons install --install-sandbox="${D}"
+}