commit: f34fb3dfee9ff4f5f9e015efe9371ebecd4080df
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 16:24:49 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 16:26:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34fb3df
net-libs/nodejs: sync live
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
net-libs/nodejs/nodejs-99999999.ebuild | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild
b/net-libs/nodejs/nodejs-99999999.ebuild
index 27f6e1677949..577230345a35 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+)"
@@ -19,11 +19,11 @@ 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 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
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 systemtap test"
REQUIRED_USE="inspector? ( icu ssl )
npm? ( ssl )
system-icu? ( icu )
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
RDEPEND=">=app-arch/brotli-1.0.9:=
>=dev-libs/libuv-1.40.0:=
- >=net-dns/c-ares-1.17.0:=
+ >=net-dns/c-ares-1.17.2:=
>=net-libs/nghttp2-1.41.0:=
sys-libs/zlib
system-icu? ( >=dev-libs/icu-67:= )
@@ -46,10 +46,6 @@ BDEPEND="${PYTHON_DEPS}
pax-kernel? ( sys-apps/elfix )"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch # still needed
as of 2021-06-04
-)
-
pkg_pretend() {
(use x86 && ! use cpu_flags_x86_sse2) && \
die "Your CPU doesn't support the required SSE2 instruction."
@@ -84,7 +80,7 @@ src_prepare() {
fi
# We need to disable mprotect on two files when it builds Bug 694100.
- use pax-kernel && PATCHES+=(
"${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+ 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
@@ -132,6 +128,7 @@ src_configure() {
amd64) myarch="x64";;
arm) myarch="arm";;
arm64) myarch="arm64";;
+ lp64*) myarch="riscv64";;
ppc64) myarch="ppc64";;
x32) myarch="x32";;
x86) myarch="ia32";;
@@ -206,10 +203,10 @@ src_install() {
}
src_test() {
- # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
if has usersandbox ${FEATURES}; then
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \
- "Expect some test failures or emerge with
'FEATURES=-usersandbox'!"
+ 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
out/${BUILDTYPE}/cctest || die
