gentoo resync : 24.06.2021

4 files changed, 243 insertions, 123 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 8b8f2104752b..1e93ce27cd38 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -7,16 +7,17 @@ AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
 AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
-AUX nodejs-16.1.0-ppc64-segfault.patch 4664 BLAKE2B fd66e8e6332b763b008b56dcbf6c755e80f3494f995beef0b2d041c52fafdcfda8122de633754c989bf7c033e0980515e33b6369c19a5a8f7cbba269d798feeb SHA512 d1e886cafb64108f4c0a7200f8994c30fb15c60b3090bd151a080d2df71afec6996de408fa0dc671093c4c7c2312f4dfc4eee09bbc777cc00f7e122e6dce3a59
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
-DIST node-v16.3.0.tar.xz 33801084 BLAKE2B aa1f2fc6639ccb995252e483b68e1b425a9ad47cd148f5536fad168e94b0582819df511f797b3a278fd54d45e45f64dc701a997c2f17ad72d94d8b02d590cf81 SHA512 f25243521869ee9d99c2490150f8f9361b1603e497364ec559917d5c76e4a857e6c25c90d54b11e5a9d16fabb85e12b052ea768f3c2977ff18e96d33f60d9eff
+DIST node-v14.17.1.tar.xz 33580416 BLAKE2B da5234087945327fc7f3a666a8869426ec5adff3b31b800c59135d9937507bcca7be3c8ca6720c2593b45ec6a9b49c30f71dadbcc03dc0a68c082e3f1746e6df SHA512 354f9f215a4915ca3dbccdbb90c14fb8bfb8b0ed8ece4f95106d7b068affdeab65a79db0beb2c7d6af03dc15567edc5250629deedd38a9de7d581f76716315f8
+DIST node-v16.4.0.tar.xz 33597252 BLAKE2B c43543057f58ed706e525db9956cb258ace88026c9ef1c87d85f07bc02bb382482e9044748b6c865d913ef167544f089e9c5c11fb00c2f0fa7ca9e6bf8d06de8 SHA512 c4e12d8e50c26f21170e998a209d060acfac792bf2a5970efc482f431f483841d40427aafe72a63d5b2bd2cd8d5d1fd19678105ab9b1265f68de6359d98fa1a3
 EBUILD nodejs-12.22.1-r1.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
 EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
 EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B 9f8bfa1c3d01f79f62faf84764279727eb2bb27909c51e14dfdbd3540b8ea01e17b6eb789da165e309d5876fb362ef84b92fd63eeeff6aecd00ac0323231461c SHA512 f52f9c57ec23e60949246362205bcf3f5f61314d81c22c291caca23c5f706ae799e00456b387a3f375e7fc9e8c0f037b7de44fd14c1b9e1981bd7f56158c842a
-EBUILD nodejs-16.3.0.ebuild 6644 BLAKE2B 695992d43c289484b349d066c1c8aca1974b5484e819d34cff8d5e2c5a44c75ee571bbb5b3cabf4dfb226c3633040f73061fc12a90592a89125654f61c9e838d SHA512 f77ef14a5b7a52245a3c1131e344f686b836270c90722dc0878747d132315069e07e412243d1a77fd39b15f9793a917a1d019ca97b9d66b9af7661167eec495e
+EBUILD nodejs-14.17.1.ebuild 7039 BLAKE2B 4715929679ecba85fc3029a5478188470d4a6565225b78a5a6a79a6c3eccbff9ea1125a132eabd2cf7249d16568fb2282c6ce8c477b4f080b9b8328e2d50d52f SHA512 d5a2a42472fe1c60730a8d06bde1243e31e3ad2900ad407f79ba66b0f28593962afa318ae35178f6b50995245032160a024390672dba84fb018be081f9f0ca26
+EBUILD nodejs-16.4.0.ebuild 6557 BLAKE2B 61f509e6ac25c26baafa2719dadc79f97f0539ea381a91bff6f2fd783222cd1b7f4608ec5ff981ae91c1df03e41c1d41acac0b35b6c941f937709b54acc99810 SHA512 c3b2bce4b10457bc2283d3911bfc17f460b0d916ca82ad26cd15a2af821bd179f10afd03f68f6f62b50a035fe05a91d01072daf62847a739421830e6b84ab986
 EBUILD nodejs-99999999.ebuild 6483 BLAKE2B a5d15db975cc25ebe8464c99f57ea34a7fa2c98a8874251a9e6bf6b9772040cea6455e31722b4796e17115b83a0363416985864cbf42045e2dac044214aba05c SHA512 1f7dc8503e02a11bc408c0ff476f10f5e056efe19bcc2cc526a214a8aee61439762d8e963ce8288cccaf3f51b78a4a461e9e587e485652fe7068cc9ecd125ee9
 MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
deleted file mode 100644
index 5ddd1fe7d08d..000000000000
--- a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From ca4bf75504d07db5e1e66ec5c867cd76c90268af Mon Sep 17 00:00:00 2001
-From: Junliang Yan <jyan@ca.ibm.ca>
-Date: Tue, 11 May 2021 08:57:03 -0400
-Subject: [PATCH] ppc: Prevent trampoline emission on deoptimization table generation
-
-The deoptimization table needs to be continuously, so we need to block
-trampoline pool emission during the whole process.
-
-bug: v8:11759
-Change-Id: Ie5e0ffe27dc8e6cdb18985dc2cf26bdadeff318f
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2881918
-Commit-Queue: Junliang Yan <junyan@redhat.com>
-Reviewed-by: Jakob Gruber <jgruber@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#74506}
-X-Gentoo-bug: https://bugs.gentoo.org/785751
-Backported by gyakovlev@gentoo.org
----
-
-diff --git a/src/codegen/ppc/assembler-ppc.h b/src/codegen/ppc/assembler-ppc.h
-index 794b917..ae04118 100644
---- a/deps/v8/src/codegen/ppc/assembler-ppc.h
-+++ b/deps/v8/src/codegen/ppc/assembler-ppc.h
-@@ -195,6 +195,12 @@
- 
-   void MaybeEmitOutOfLineConstantPool() { EmitConstantPool(); }
- 
-+  inline void CheckTrampolinePoolQuick(int extra_space = 0) {
-+    if (pc_offset() >= next_trampoline_check_ - extra_space) {
-+      CheckTrampolinePool();
-+    }
-+  }
-+
-   // Label operations & relative jumps (PPUM Appendix D)
-   //
-   // Takes a branch opcode (cc) and a label (L) and generates
-@@ -1334,12 +1340,6 @@
-   }
- 
-   inline void UntrackBranch();
--  void CheckTrampolinePoolQuick() {
--    if (pc_offset() >= next_trampoline_check_) {
--      CheckTrampolinePool();
--    }
--  }
--
-   // Instruction generation
-   void a_form(Instr instr, DoubleRegister frt, DoubleRegister fra,
-               DoubleRegister frb, RCBit r);
-diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc
-index 023e697..62e57fe 100644
---- a/deps/v8/src/compiler/backend/code-generator.cc
-+++ b/deps/v8/src/compiler/backend/code-generator.cc
-@@ -416,23 +416,29 @@
-     std::sort(deoptimization_exits_.begin(), deoptimization_exits_.end(), cmp);
-   }
- 
--  for (DeoptimizationExit* exit : deoptimization_exits_) {
--    if (exit->emitted()) continue;
--    if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
--      exit->set_deoptimization_id(next_deoptimization_id_++);
--    }
--    result_ = AssembleDeoptimizerCall(exit);
--    if (result_ != kSuccess) return;
-+  {
-+#ifdef V8_TARGET_ARCH_PPC64
-+    v8::internal::Assembler::BlockTrampolinePoolScope block_trampoline_pool(
-+        tasm());
-+#endif
-+    for (DeoptimizationExit* exit : deoptimization_exits_) {
-+      if (exit->emitted()) continue;
-+      if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
-+        exit->set_deoptimization_id(next_deoptimization_id_++);
-+      }
-+      result_ = AssembleDeoptimizerCall(exit);
-+      if (result_ != kSuccess) return;
- 
--    // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
--    // order, which is always the case since they are added to
--    // deoptimization_exits_ in that order, and the optional sort operation
--    // above preserves that order.
--    if (exit->kind() == DeoptimizeKind::kLazy) {
--      int trampoline_pc = exit->label()->pos();
--      last_updated = safepoints()->UpdateDeoptimizationInfo(
--          exit->pc_offset(), trampoline_pc, last_updated,
--          exit->deoptimization_id());
-+      // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
-+      // order, which is always the case since they are added to
-+      // deoptimization_exits_ in that order, and the optional sort operation
-+      // above preserves that order.
-+      if (exit->kind() == DeoptimizeKind::kLazy) {
-+        int trampoline_pc = exit->label()->pos();
-+        last_updated = safepoints()->UpdateDeoptimizationInfo(
-+            exit->pc_offset(), trampoline_pc, last_updated,
-+            exit->deoptimization_id());
-+      }
-     }
-   }
- 
-diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
-index 3e4e94a..0281376 100644
---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-@@ -4296,7 +4296,15 @@
- 
- void CodeGenerator::PrepareForDeoptimizationExits(
-     ZoneDeque<DeoptimizationExit*>* exits) {
--  // __ EmitConstantPool();
-+  int total_size = 0;
-+  for (DeoptimizationExit* exit : deoptimization_exits_) {
-+    total_size += (exit->kind() == DeoptimizeKind::kLazy)
-+                      ? Deoptimizer::kLazyDeoptExitSize
-+                      : Deoptimizer::kNonLazyDeoptExitSize;
-+  }
-+
-+  __ CheckTrampolinePoolQuick(total_size);
-+  DCHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
- }
- 
- void CodeGenerator::AssembleMove(InstructionOperand* source,
diff --git a/net-libs/nodejs/nodejs-14.17.1.ebuild b/net-libs/nodejs/nodejs-14.17.1.ebuild
new file mode 100644
index 000000000000..bccefc5543bc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.17.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs 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 ~ppc64 ~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"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+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
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.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}-13.8.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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--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 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 ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		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} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+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
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		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
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# 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
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+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'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-16.3.0.ebuild b/net-libs/nodejs/nodejs-16.4.0.ebuild
index f4ae0ff1f25f..f4221d00ab45 100644
--- a/net-libs/nodejs/nodejs-16.3.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.4.0.ebuild
@@ -50,7 +50,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
 	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
 )
 
 pkg_pretend() {