From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B819415800A for ; Fri, 18 Aug 2023 17:10:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D75482BC015; Fri, 18 Aug 2023 17:10:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA7EC2BC015 for ; Fri, 18 Aug 2023 17:10:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFAC6335DB1 for ; Fri, 18 Aug 2023 17:10:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83C69B8B for ; Fri, 18 Aug 2023 17:10:53 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1692378648.528f8d631eee9108ed70c748428ae8f6aa730a9f.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/nodejs-99999999.ebuild X-VCS-Directories: net-libs/nodejs/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 528f8d631eee9108ed70c748428ae8f6aa730a9f X-VCS-Branch: master Date: Fri, 18 Aug 2023 17:10:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6091b686-f6a4-46db-8887-aea24c2bf4a6 X-Archives-Hash: 16b5e512847821743514d57c882f8589 commit: 528f8d631eee9108ed70c748428ae8f6aa730a9f Author: William Hubbs gentoo org> AuthorDate: Fri Aug 18 17:08:45 2023 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Aug 18 17:10:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528f8d63 net-libs/nodejs: sync live Signed-off-by: William Hubbs gentoo.org> net-libs/nodejs/nodejs-99999999.ebuild | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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