7 files changed, 21 insertions, 283 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7e4f51386751..6338c5429a73 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index eaddec73f8f2..44acb915696e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,17 +3,15 @@ AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674
 AUX nodejs-22.2.0-riscv.patch 1760 BLAKE2B f5f033dd589637481d2a2f3e67cdbb7a6052bdb187d2666b145a76f23da6e36adeddfe2b6e1718ae4412df914f8517bec2cdc5c15b18eb9dca5dad7a6668cc04 SHA512 f2ff6da8cf5dcc994a7a20342e2928dc1821fbbf42891009a6234b6051277e0200d7e3fbba63b9a2773887591d0ad5ceb1bb3d25e5efeb557f6d00109a80253c
 DIST node-v18.20.4.tar.xz 40445740 BLAKE2B 0675f2aba1d9a9cd9aeb665ecb3a0f61b9caf39daeb6154941f84b9c423caa7a658c14b8c2c5e12d94424b2470748ec7fad28ecb10390d37f92eb7e50f8adc26 SHA512 1ccef99ebee3906f5bad3c1582f9551ced9bed15e6a047d59d1a23c6110004fb46ea4bebcf9899748c64109f78788d7365ee956444e645eaf397dabbcddda21e
 DIST node-v20.15.1.tar.xz 41880412 BLAKE2B f113856db03a3306d50a659e21d11f585e9e78b85ce7ad9926cc778837f905c618ac762faf56e03caaa862ab0a38c5f34770cd2bfb0854d79650ee9d9b9e2bfe SHA512 2a2935490c4c629f47cc67819094904a1b91eaf0b75cbb8ebe92f5eb34b0929230932fa456bf1bec00213155ea8b6337b2e02e946fc18606543c8c71082615b9
-DIST node-v20.16.0.tar.xz 41822608 BLAKE2B 90421b9bf5fad96fadee3eb6fc12461aa6a3456a5266a03f1286f977429af6992e5b1c81a72faa54b3349d46e93881fbfad8970bdebe56afde16b17a1a59dd26 SHA512 494ac16904ecb9f799789f190b869b7509bc66e99713d72723d2bf5051a8a5ca57a4f7303c732aa1fd121cff0defd238be4f656cb4d4e81cc7416b63d9c8677d
 DIST node-v20.17.0.tar.xz 41751520 BLAKE2B 157cf4c3326fcd2f1324c0898018c88327df05c717acfa8d96728e1ebf378ea04e46da56b93e89041a49b5ee4b7e6070373401a2bc2e9163eec3b0dffb6ff4d3 SHA512 3f21c9b5b292143d25a9d51e24d8f9b366429872b3d905d705fb2293e4f4b11e8861650535425d498b999974971a8dec7bf9f9c398af03170caa84bdc63b94da
 DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e12fdb10c50cfe05b0ec25ddbe71eaa3187ba25d99efb258ab14d31927216e6816aacdfa29efdb1dc70a06e9b135 SHA512 840423e9738cad9f6024e9b51b683893eab16487ba18183251a189b5d4acf9b4168e9245623092705b014bff2058174127d5d7ecb31c1a8b324961074cb8ca54
-DIST node-v22.6.0.tar.xz 46900628 BLAKE2B 52d566fcc25c370dd2cddbc21f4f9a9d7293b454b832eaaece979fa25232fef59270ba980ebfe6b8ac2424c733ef3ec33a7e7f689b818a30071ec9d3854bc553 SHA512 31a1ad99bf131917b45ec353929525686d22ed3eea1ea9f9498b5a43c0bf38b5f68885fc4a174f9d819a01745767a8b4e8d0577a7eec150456b4a102ddad639b
 DIST node-v22.7.0.tar.xz 46875872 BLAKE2B f0dcd07d3040ddc0df335b51da82bce8a963ce7848892cda5f593b7fa954a61d0b789f0f70d6b2d4ca80716fcabf70268ac94297c2acd3886ac8172eb5fdf6df SHA512 6d5b751a03b68beec3f046697a806918571b04799a0c5fbb0374026729cc2e88fb1787bef6235c19e0bfda4e7545a618bf375410553c7d9e1eb149c6d43c0c3b
+DIST node-v22.8.0.tar.xz 46899840 BLAKE2B 04dc53ad42c6a913335ecd9b5bfd5bf2f2a8d3429f28d5eba59ebde62fd76be5dea90f12212bfa9dfaa6698000da6bfec08cb1f0e1e3d3b9e8af70cab005268e SHA512 c2942c65dc9909b1f412489a54d16afae7be46a5c2a8bd292cde75e4c56ec763ccee6572fd72774c3f9d94796cfff6edbd9e93976893873cc182548225ac162a
 EBUILD nodejs-18.20.4.ebuild 7502 BLAKE2B 3eccdf88d47b7be4554a4dc9081319d7c1086941b3291c35a1d30fc9f4ae4baefe7d6279276f2de8ac553e8de21a24a0745b1f961ff1407a33c78dc5fcaf03cd SHA512 62fbe27d352c6e28661a05c7290dc7f82cc871cd733f9750e882da0101c74dffaef41869bcf585ec05742e8852e9e23a8e24d0cebc58fdf08cba6c54b686eaba
 EBUILD nodejs-20.15.1.ebuild 7680 BLAKE2B ead46416ff32f2ec63ff79df0ee2431107d9de327c27f1f30d5d28e49649ddd220a63a88fed7e6339cd89e97a56527bd025b0999eb30d5a28e6ebf108b0158e1 SHA512 0e4d2bb01a6e367b6d25cd4ffc001b8720868b32d0a98101852698fc0143cff6bbf63b761da60238fae3a34c7cc592c4b93edd4f1c157a4b7b4a4de93a674080
-EBUILD nodejs-20.16.0.ebuild 7833 BLAKE2B 2aa442bd9bb246a3a8713681c875ed69ee6044750f48f5a11fe9d714d2b75027035a6ed637f48275c66c5d4c33f4ce8c40b44d2443c210e40211be53c2c6ce9b SHA512 a0079249b72eb151a8f1bb55cf17f4187c2a5e55e247d41ca7239bb1bd6455e6df481209e16e85d85810abcf6a8183a3d53c161835667a28bd3e441dc97a06bb
-EBUILD nodejs-20.17.0.ebuild 7832 BLAKE2B 1e9ae705a2f665880e09e74e6507b71862e9fe7d4e06ce45143a6fe1220e866f10ca6c1ffbfd95af239301fe309af50a58e6a84f95defa8f86cbe978c307c331 SHA512 6c570e2cd42812db56a73be05b4f303831ff2b7b147b4620505c6c00adb6643fab0ab5300b832e2a29ad3a31cc768ee9ab789393da340b3258beda0b2082b173
+EBUILD nodejs-20.17.0.ebuild 7830 BLAKE2B 0b0b915b46ee8b579b242002faea6d8961a6b93395f7de451a6217ad933f434790c9e4c7ea9714f6ffe49221a5a90080df0f2f15e335486cb70d14ed37463f4f SHA512 39263f42231da710b14ed34a0990a3368c3428908281548605786b2c86d6e76ca02e8289d3975e9043fe703132ba06e5c7e1f0fe363a22e0410e0e75c05719f5
 EBUILD nodejs-22.4.1-r1.ebuild 8480 BLAKE2B 911e3bf47339a7686e1b1185df256aede40a895b87fc707bdd26b7621c14231f15fab65cb1665cf26737af4510dd43570bb477f41f63a7e36e12d2cc476d3d4a SHA512 855323f19f14929db1634373a3491f9a183740c878c903da3bf4bac69653c88283da0935fa09939c8eb07c96d6cece62faf98644e38958fc184606ea7eceb88f
-EBUILD nodejs-22.6.0.ebuild 8495 BLAKE2B 33ef4cc2f41f4feac8dc85b8686a62b63e9e2a6be3847b29bb38fc15c9419e14365b4e266c94606982ae53efc25b15d05eb1ccb5bb20c63a579f7dd6ffb1d1f0 SHA512 e9f23d84e4aa99fd26344a718e875bfe3f171efc6e7e8d276d6dca508de71759e1b782c24264699d397830273aed4e03fcf403986cf0165ff40e4fabeb77653f
-EBUILD nodejs-22.7.0.ebuild 8567 BLAKE2B 90e637e119bae122058be00ecf62f4dd5b883e1fa5829bde80908acfc59aa8cf5731a0b8b068d10058c4d9fac05f6777994f9569200e74b5f50de3f0dd8dd025 SHA512 2db592c44832de8224c71248ea8f479bef51a5fdbff96879104d90e0e005506259a8e9b412fe67efbf57e0b48028b332fe2b14241f3dbe362fa6afb303ddbad5
-EBUILD nodejs-99999999.ebuild 8495 BLAKE2B 33ef4cc2f41f4feac8dc85b8686a62b63e9e2a6be3847b29bb38fc15c9419e14365b4e266c94606982ae53efc25b15d05eb1ccb5bb20c63a579f7dd6ffb1d1f0 SHA512 e9f23d84e4aa99fd26344a718e875bfe3f171efc6e7e8d276d6dca508de71759e1b782c24264699d397830273aed4e03fcf403986cf0165ff40e4fabeb77653f
+EBUILD nodejs-22.7.0.ebuild 8565 BLAKE2B 9d4dfb5d22d96bf26db9a5183b3f0e13490f2c0f0226d4fadda5853c9935b1efe80001e96affb794458735a0138f982c4dd90e4fe65ee576fe15a25060f9f1d3 SHA512 be18feba5794e232b81c3cc803e321a720de4b6ddabb2adfdbe67e9bd3c23ca36a1582ad95857a43fd7adc070af31b86f0305602e5c37a908ad1c0feba66f5f4
+EBUILD nodejs-22.8.0.ebuild 8567 BLAKE2B 90e637e119bae122058be00ecf62f4dd5b883e1fa5829bde80908acfc59aa8cf5731a0b8b068d10058c4d9fac05f6777994f9569200e74b5f50de3f0dd8dd025 SHA512 2db592c44832de8224c71248ea8f479bef51a5fdbff96879104d90e0e005506259a8e9b412fe67efbf57e0b48028b332fe2b14241f3dbe362fa6afb303ddbad5
+EBUILD nodejs-99999999.ebuild 8567 BLAKE2B 90e637e119bae122058be00ecf62f4dd5b883e1fa5829bde80908acfc59aa8cf5731a0b8b068d10058c4d9fac05f6777994f9569200e74b5f50de3f0dd8dd025 SHA512 2db592c44832de8224c71248ea8f479bef51a5fdbff96879104d90e0e005506259a8e9b412fe67efbf57e0b48028b332fe2b14241f3dbe362fa6afb303ddbad5
 MISC metadata.xml 983 BLAKE2B 61908ba329bb50767f9a366c75acbedfb59da75a3e9966923af3fd4c686960115bfa53564e9dff19c1e5c3085a79ab5f5ca9a631da77ec4700fa2b663623d96e SHA512 471ee30d82ac553f975fe1e1e68ffcc79e8c709274ed6794a1c9fd2acee301734d36b6e607cc7b2cd386ed1e4621eb4a725efe440cb76d4dd6a2af4b76cdbd45
diff --git a/net-libs/nodejs/nodejs-20.16.0.ebuild b/net-libs/nodejs/nodejs-20.16.0.ebuild
deleted file mode 100644
index 810d175eaacf..000000000000
--- a/net-libs/nodejs/nodejs-20.16.0.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.46.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	>=net-libs/ngtcp2-1.1.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--ninja
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-ngtcp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use corepack || myconf+=( --without-corepack )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	export NINJA_ARGS=" $(get_NINJAOPTS) "
-	emake -Onone
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	use inspector || drop_tests+=( test/sequential/test-watch-mode.mjs )
-	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-20.17.0.ebuild b/net-libs/nodejs/nodejs-20.17.0.ebuild
index d2d7d8abc320..44f8a7a5ea5b 100644
--- a/net-libs/nodejs/nodejs-20.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.17.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.7.0.ebuild b/net-libs/nodejs/nodejs-22.7.0.ebuild
index 2c68aa6262a1..bc4c9333bb81 100644
--- a/net-libs/nodejs/nodejs-22.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.7.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.6.0.ebuild b/net-libs/nodejs/nodejs-22.8.0.ebuild
index 40e5d335039b..2c68aa6262a1 100644
--- a/net-libs/nodejs/nodejs-22.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.8.0.ebuild
@@ -7,7 +7,7 @@ CONFIG_CHECK="~ADVISE_SYSCALLS"
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 xdg-utils
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -39,11 +39,14 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/simdjson-3.9.1:=
 	>=net-dns/c-ares-1.18.1:=
 	>=net-libs/nghttp2-1.61.0:=
-	>=net-libs/ngtcp2-1.3.0:=
 	sys-libs/zlib
 	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? (
+		>=net-libs/ngtcp2-1.3.0:=
+		>=dev-libs/openssl-1.1.1:0=
+	)
+	!system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
 	sys-devel/gcc:*"
 BDEPEND="${PYTHON_DEPS}
 	app-alternatives/ninja
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 40e5d335039b..2c68aa6262a1 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -7,7 +7,7 @@ CONFIG_CHECK="~ADVISE_SYSCALLS"
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 xdg-utils
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -39,11 +39,14 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/simdjson-3.9.1:=
 	>=net-dns/c-ares-1.18.1:=
 	>=net-libs/nghttp2-1.61.0:=
-	>=net-libs/ngtcp2-1.3.0:=
 	sys-libs/zlib
 	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? (
+		>=net-libs/ngtcp2-1.3.0:=
+		>=dev-libs/openssl-1.1.1:0=
+	)
+	!system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
 	sys-devel/gcc:*"
 BDEPEND="${PYTHON_DEPS}
 	app-alternatives/ninja