[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

[William Hubbs]

commit:     d44065194a94cb00b105732b9c159d59fc98e871
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 05:19:15 2023 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 05:19:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4406519

net-libs/nodejs: sync live

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 net-libs/nodejs/nodejs-99999999.ebuild | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/net-libs/nodejs/nodejs-99999999.ebuild 
b/net-libs/nodejs/nodejs-99999999.ebuild
index ef61e71e60d6..9277dca7ff05 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -24,7 +24,7 @@ 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 systemtap test"
+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 )
        npm? ( ssl )
        system-icu? ( icu )
@@ -43,7 +43,6 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 BDEPEND="${PYTHON_DEPS}
        sys-apps/coreutils
        virtual/pkgconfig
-       systemtap? ( dev-util/systemtap )
        test? ( net-misc/curl )
        pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
@@ -104,14 +103,7 @@ src_prepare() {
        fi
 
        # We need to disable mprotect on two files when it builds Bug 694100.
-       use pax-kernel && PATCHES+=( 
"${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
-
-       # All this test does is check if the npm CLI produces warnings of any 
sort,
-       # failing if it does. Overkill, much? Especially given one possible 
warning
-       # is that there is a newer version of npm available upstream (yes, it 
does
-       # use the network if available), thus making it a real possibility for 
this
-       # test to begin failing one day even though it was fine before.
-       rm -f test/parallel/test-release-npm.js
+       use pax-kernel && PATCHES+=( 
"${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
 
        default
 }
@@ -172,7 +164,6 @@ src_configure() {
        "${EPYTHON}" configure.py \
                --prefix="${EPREFIX}"/usr \
                --dest-cpu=${myarch} \
-               $(use_with systemtap dtrace) \
                "${myconf[@]}" || die
 }
 
@@ -236,11 +227,16 @@ src_install() {
 }
 
 src_test() {
-       if has usersandbox ${FEATURES}; then
-               rm -f "${S}"/test/parallel/test-fs-mkdir.js
-               ewarn "You are emerging ${PN} with 'usersandbox' enabled. 
Excluding tests known to fail in this mode." \
-                       "For full test coverage, emerge =${CATEGORY}/${PF} with 
'FEATURES=-usersandbox'."
-       fi
+       local drop_tests=(
+               test/parallel/test-dns-setserver-when-querying.js
+               test/parallel/test-fs-mkdir.js
+               test/parallel/test-fs-utimes-y2K38.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"
 
        out/${BUILDTYPE}/cctest || die
        "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare 
-J message parallel sequential || die