gentoo auto-resync : 18:08:2023 - 21:36:58

3 files changed, 12 insertions, 5 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 44aaa3aaa712..8c6bf4b52117 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index d2848fc53fe2..017c01c00f55 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -14,5 +14,5 @@ EBUILD nodejs-18.16.0.ebuild 7328 BLAKE2B 991dce66c991b452fd3e207bcf5dcf9116b2a7
 EBUILD nodejs-18.17.1.ebuild 7465 BLAKE2B 8242fd905ff62b4645d4c8dacc69a4ac301b9d322f2a45301272b53ddec118f272d90c557dfd18eb4c4fb3aec13d99465d0951780f08644d7757b56bb6ee17ac SHA512 9c2c0b57aafb88ea1796e9015f48c32a4077e45d56964ffd69df553c31252647cb67afd622d10ba7738a46aabe997f74ddd917f4f7828391bb1e938327f27d8c
 EBUILD nodejs-20.2.0.ebuild 7138 BLAKE2B d7de0fce607c8b2118d52c06a9cb106095268ae6befbb472eceb12348efa84f0b5b5a3ff37756ef8f4e1151cc985ca716efa030746a94d710bf0a55d4b31a054 SHA512 40f9e0e5a8d04f91c7357a8c4497978ccc3c0c4cd77973a8350840e418ca1b4d644a5c19732c0b773e14ae9002ccbd043ac9cf88e5010f439be63edffe2a69dd
 EBUILD nodejs-20.5.1.ebuild 7443 BLAKE2B 84b70eec7778acf732626b709784e0eab0162438fda418f11809534ba93cc3dab60c39ce204234a0350c3a30070f9050241cb46fc727bc543ca03316632edc2b SHA512 0d48ae01d16a230581f5fdf0d7506f60438fb2dc42c75cfda8c08fd915515591a56b2b197396838abc8433f6a68b5bd356147024d9d287c79a72ec8b37225120
-EBUILD nodejs-99999999.ebuild 7142 BLAKE2B 0a127841349fff417f328e207c6a030e811d482c67a75f1813b2f73a32620953a9bb1d413208c853d75b879ab51904e608ddb819a8680e2446bd4c6dc217e0d7 SHA512 7073de0294f0d36dc4c6b733da26f2bf8e4bfe01d9d9fecf45e16de07e8ce9a8e3694c14c458a61807d0dfe5978fc6d7e0fe2cc93f74db2fe7b439f110bf9163
+EBUILD nodejs-99999999.ebuild 7391 BLAKE2B 9036b0461f447aee6e75723085bae591264f0bb20aa33480398b5f17458912e2a8f75a6c76c3761879e216e437a0cb2c9eda8aeb84c3f65fd0c1ce590cc6c7b5 SHA512 ea53f8f425b2ea902d6e1b2e24ce9eaab9b290e672d432241a22dbd7ca23c8357e5f9cb438da16f5aa3cb6d9cb0cf7e1af426e1c733f0631b560e0b758d21ded
 MISC metadata.xml 986 BLAKE2B 67133c97db85eced638323a93514e084da381b7cbebcab2f0f2ce2781cf0da02be705ab5781c18205a8d4e8b679b6f77f3c9e97ea6ef72b36b6a8a854a39617d SHA512 3f749720ea0623fefa703f8b4563ebabfd5e4aeff4f2e8998576860177d3b1a075afaabc2aa0dc5100df59b3cb787d70d44284976bad3409966b68c11ec64d7a
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index c2dd85a0a06c..d20a84d587a8 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -24,8 +24,9 @@ else
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
+IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+REQUIRED_USE="corepack? ( !npm )
+	inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
 	system-ssl? ( ssl )
@@ -38,6 +39,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=net-dns/c-ares-1.18.1:=
 	>=net-libs/nghttp2-1.41.0:=
 	sys-libs/zlib
+	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-67:= )
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 	sys-devel/gcc:*"
@@ -120,7 +122,7 @@ src_configure() {
 	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
 
 	local myconf=(
-	--ninja
+		--ninja
 		--shared-brotli
 		--shared-cares
 		--shared-libuv
@@ -136,6 +138,7 @@ src_configure() {
 	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 )
@@ -223,6 +226,9 @@ src_install() {
 			\) \) -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
 }
 
@@ -231,12 +237,13 @@ src_test() {
 		test/parallel/test-dns-setserver-when-querying.js
 		test/parallel/test-fs-mkdir.js
 		test/parallel/test-fs-utimes-y2K38.js
+		test/parallel/test-fs-watch-recursive-add-file.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
 	)
-	rm "${drop_tests[@]}" || die "disabling tests failed"
+	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