gentoo auto-resync : 08:08:2024 - 12:38:45

3 files changed, 297 insertions, 2 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9e9a6196f112..2febbbc349cd 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -12,6 +12,7 @@ DIST node-v22.3.0.tar.xz 44517412 BLAKE2B 38ed4e6de9be48fb252b809a0174420f0f201f
 DIST node-v22.4.0.tar.xz 46116620 BLAKE2B 262fc22bfe8bab2158a9e9fa274b03bb1ffd875814144fbd6cee45bf2641813363061affa5ebb9b657066899722616d41486046be11425d1a2005fa1261796e3 SHA512 6f7907021ec8c0b16d737da68ae9efa1e424aa38964456e01eb10a3f0111a6d6ceff31ba0f8876cd9df19d92de202e17cccf528b844242e5c66ff1f6b1867f55
 DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e12fdb10c50cfe05b0ec25ddbe71eaa3187ba25d99efb258ab14d31927216e6816aacdfa29efdb1dc70a06e9b135 SHA512 840423e9738cad9f6024e9b51b683893eab16487ba18183251a189b5d4acf9b4168e9245623092705b014bff2058174127d5d7ecb31c1a8b324961074cb8ca54
 DIST node-v22.5.1.tar.xz 46149824 BLAKE2B 99a215e211ac12fe83106dee142d9411ea4e0fcbe8b360431b2211148ee34cbe041c19eaf2936f21ccf6405ab18aec5ba983a280942101682347ffb319babea6 SHA512 ad0efb9552cf9658b16a7d97edca8ac601841d9ef5b2383927d53181505fd5f0893bb0b4bbf2b42a17b15db66c6690d8e5a1c9e7f8d031325368bc6d47d0642c
+DIST node-v22.6.0.tar.xz 46900628 BLAKE2B 52d566fcc25c370dd2cddbc21f4f9a9d7293b454b832eaaece979fa25232fef59270ba980ebfe6b8ac2424c733ef3ec33a7e7f689b818a30071ec9d3854bc553 SHA512 31a1ad99bf131917b45ec353929525686d22ed3eea1ea9f9498b5a43c0bf38b5f68885fc4a174f9d819a01745767a8b4e8d0577a7eec150456b4a102ddad639b
 EBUILD nodejs-18.20.3.ebuild 7503 BLAKE2B 01da001379fd0c808128bf8dd43ec64296ae38da432673c118909a71c25408b5f6b2913b63733c35d52116b666addeeac93e838ecf254c219076e4083fcc6673 SHA512 509cd980b28b7b6e9ce2c4443dce9c2bf718d31845b7daf4a868d3d87e0ebca53071bc8727629234aa28cba2479e0cab2b90fe41f28e6955c69b24172b0adcfc
 EBUILD nodejs-18.20.4.ebuild 7504 BLAKE2B 01439061d5d8387eaf9a5d3edc735a2cbd38200fab5b3fb02f679b3ca7460b32342fc06d2a106f7a94a4488dff940bbf99f2db384b62b37d41fede1f6eb7abc0 SHA512 4a9f36b1be0915e4388a2f3e1331e51014b706be26b656983d3f80c9c01aef5cb9fc6e2b2c93f7cd79769f7507e0f269dc2cee47b6c0765d03c170a50e937ea8
 EBUILD nodejs-20.14.0.ebuild 7632 BLAKE2B fe815e1f2a056086cd89ce022c39505821c6713aaa42b48977ae8e0d68c094c36a48213b7b2bc5167a63e729a04beeb2e2829bf657b96a0b523bb10767ec431e SHA512 c491b0397f2f7a3df0e7a6df014d9fd810cd1e797e5b7bf2599e7897be5d2cf3b6e7851f40a03fd4c55a295f971a12b03bf496b4440ec5cb7039e9cf47e200d6
@@ -22,5 +23,6 @@ EBUILD nodejs-22.3.0.ebuild 7997 BLAKE2B 4c6845d076745ed3f5a27c68b43ae9cd0ea3a78
 EBUILD nodejs-22.4.0.ebuild 8119 BLAKE2B cd87a7ec25e3fa4226144f1b9687204e3e668f2cd92fa5d24c4ed234a64c25b91d1e6b8ca9cffa5ca06619f902d48f6c5b631b3210b5cca0044dccab15052f05 SHA512 e9e1b0dd910c511b154a1f2c56e05383d367f0f1f59f495d88429fcf738b0f63d05e4925d1fa989bdac694a2accf55b5ca58058b490b4a679b3ebaf7b7b66bb4
 EBUILD nodejs-22.4.1-r1.ebuild 8481 BLAKE2B 282ab8e501299e3558c110679fe266fc9465d6130fd4e1fd6d04e6f15fbee8f37f8ecffb0ca72e4b7605c28b184a33ca661e5b6102963df6eb6c09c2f8e16db9 SHA512 427896732aab549c9cf618e6a5b9148e55a0b95ef15417a27740b991018b139eaaccfcd2c38fbd58f6ee9331cbeb45c06d24c17c6982001f88c34f16fe46be71
 EBUILD nodejs-22.5.1.ebuild 8383 BLAKE2B f3fb0a8d83e54b3084e211824e9120f47e0d64f450dd1bc9f375939b7918446c161e889a2ee02b79b278f3efcb4a6d51c6808af949d4c8d2649d949a1804bf8a SHA512 aad50270b0723100d2b6d09160e5e6e42eea4a73b2abefce832029d956f78179b9d35e9c0b3dfb61758cf65f17ce0e6287c5b55687cb9558533de294ab18eaca
-EBUILD nodejs-99999999.ebuild 8383 BLAKE2B f3fb0a8d83e54b3084e211824e9120f47e0d64f450dd1bc9f375939b7918446c161e889a2ee02b79b278f3efcb4a6d51c6808af949d4c8d2649d949a1804bf8a SHA512 aad50270b0723100d2b6d09160e5e6e42eea4a73b2abefce832029d956f78179b9d35e9c0b3dfb61758cf65f17ce0e6287c5b55687cb9558533de294ab18eaca
+EBUILD nodejs-22.6.0.ebuild 8495 BLAKE2B 33ef4cc2f41f4feac8dc85b8686a62b63e9e2a6be3847b29bb38fc15c9419e14365b4e266c94606982ae53efc25b15d05eb1ccb5bb20c63a579f7dd6ffb1d1f0 SHA512 e9f23d84e4aa99fd26344a718e875bfe3f171efc6e7e8d276d6dca508de71759e1b782c24264699d397830273aed4e03fcf403986cf0165ff40e4fabeb77653f
+EBUILD nodejs-99999999.ebuild 8495 BLAKE2B 33ef4cc2f41f4feac8dc85b8686a62b63e9e2a6be3847b29bb38fc15c9419e14365b4e266c94606982ae53efc25b15d05eb1ccb5bb20c63a579f7dd6ffb1d1f0 SHA512 e9f23d84e4aa99fd26344a718e875bfe3f171efc6e7e8d276d6dca508de71759e1b782c24264699d397830273aed4e03fcf403986cf0165ff40e4fabeb77653f
 MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6
diff --git a/net-libs/nodejs/nodejs-22.6.0.ebuild b/net-libs/nodejs/nodejs-22.6.0.ebuild
new file mode 100644
index 000000000000..40e5d335039b
--- /dev/null
+++ b/net-libs/nodejs/nodejs-22.6.0.ebuild
@@ -0,0 +1,288 @@
+# 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_{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
+
+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-db/sqlite:3
+	>=dev-libs/libuv-1.46.0:=
+	>=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= )
+	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 )
+
+	# bug 931256
+	use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-lto
+	# GCC with -ftree-vectorize miscompiles node's exception handling code
+	# causing it to fail to catch exceptions sometimes
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
+	tc-is-gcc && append-cxxflags -fno-tree-vectorize
+	# 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
+		# ada is not packaged yet
+		# https://github.com/ada-url/ada
+		# --shared-ada
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-ngtcp2
+		--shared-simdjson
+		# sindutf is not packaged yet
+		# https://github.com/simdutf/simdutf
+		# --shared-simdutf
+		--shared-sqlite
+		--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
+	)
+	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
+	use inspector ||
+		drop_tests+=(
+			test/parallel/test-inspector-emit-protocol-event.js
+			test/parallel/test-inspector-network-domain.js
+			test/sequential/test-watch-mode.mjs
+		)
+	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-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 42854806e256..40e5d335039b 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -268,7 +268,12 @@ src_test() {
 		test/sequential/test-util-debug.js
 	)
 	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	use inspector || drop_tests+=( test/sequential/test-watch-mode.mjs )
+	use inspector ||
+		drop_tests+=(
+			test/parallel/test-inspector-emit-protocol-event.js
+			test/parallel/test-inspector-network-domain.js
+			test/sequential/test-watch-mode.mjs
+		)
 	rm -f "${drop_tests[@]}" || die "disabling tests failed"
 
 	out/${BUILDTYPE}/cctest || die