gentoo auto-resync : 04:02:2023 - 21:14:48

4 files changed, 270 insertions, 2 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index dd1313b76fb5..55e6f6e09b48 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c4ea1ce5a78a..a30e00ad0c7f 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -12,11 +12,13 @@ DIST node-v16.18.1.tar.xz 35843876 BLAKE2B f57bc1122207e846b9490960d648f412d72e6
 DIST node-v16.19.0.tar.xz 35897484 BLAKE2B 44069405b9cca3f9e6c0198383ea01692cf38b7e1401cce1f8d289427e6d50c10204f09e6ff35db8d62c5f74585a08658223e0c1dea15bceb3ddbc309e09d05a SHA512 cbc70067a7aefb6b8d2e238c9611fa901ddee8e9ffc3e6becddec4b156cc52da6e172b33e797265858cacbd014e0e1f0c93bd7c412a7afb436731b3fecd384a3
 DIST node-v18.12.1.tar.xz 38454588 BLAKE2B dade180304ebe2bf30fc3270a13b8e024dd48a6dda26be7f730925500f997a9c703608b782eb40a16ed174699af256430434759678ae683b92f4fb4ba48b4707 SHA512 1eb4978a1de19c026561a8484df87bdeb6f7f2ec8ae1eb38b6241d0b0ff6158a4a7d19f42df7e295a63b8047eaf862a7470494143b2e27bb36b65e4663966588
 DIST node-v18.13.0.tar.xz 40324048 BLAKE2B 643a96edf5ee02e29b213d216d73b3d5f3175b70a776f9efb7146ec05c3c137397b498ba7ac6cbf3e2205e6b6fd08d8ead4f4940ddeaa23f288d3f69459874b8 SHA512 d32c8e333d8ee7ba24c9420c943a0e57f5a48e734ce7ced210a2977fc274db133bb01ba4f604cc06271357675fde0b6e9b5cd208de4d5202b08e722e9f32e20d
+DIST node-v18.14.0.tar.xz 41425240 BLAKE2B 3229845225613c129da4379b9ae87c66e0e313ace230a9455ec88a2e64dc3dde28a8d37ccbcab7c46bbc2bef544b812c2e248419a126ef0f7d65ec798f398194 SHA512 bf1072d17a5ae003310f792b5acf7c36c2f294a802aadbb0977df240e8214344b0d4e9c3ee6fc8351e6249154b4468f1e5db15561168715ae1ecdeb8868b884b
 EBUILD nodejs-14.21.1.ebuild 7148 BLAKE2B ecd8918a645ec356baf03704bb80825a79254bd10008073957c34ea247d0e8b1b720f1c5cf9d0a82c677cf4287092d7c1b303150d611c4a0a40f29487aa95c2e SHA512 92893f7c22c769aed918f5afca14092c877c36e4c923a72dec2a1c66ac1a26292fe0814a49adbb3a4c02e65792154f4c84331b272e1554749efd82867958bbb5
 EBUILD nodejs-14.21.2.ebuild 7153 BLAKE2B 520ca1b77f1c0485bf47893cebdbee4eab5fb5ab4162918c955ae26b365038601be47b7bfe96e1edee341db73ec72be9e4e74ac6a40ae8ad5a215cda92e57f01 SHA512 3081c5e247b7c518055647b6938dceb70425dcb2ecdf96e517c0879d4e56e4096e483d1170afb62a20b499dcac961ad6410fa24806ecf99f60694e0b7e68908c
 EBUILD nodejs-16.18.1.ebuild 6762 BLAKE2B 116bcfd6c91b607e79b4f3683f47e06893196c8193733d415f49bab394e97e98ca44f38f471848f45aecd524ff45465b20ca660d4ee535b9008008ee4713a2b6 SHA512 65206ad12b74f21a31cac476240f5f93cb5468f9254e622f4fe1cfdb5524cea58b09444515e36a17992e8a35a18bf9e3c8530d7710ea2f25e2fcc9078ed7378e
 EBUILD nodejs-16.19.0.ebuild 6767 BLAKE2B 7523b1ea165e51910be2446a7402d3bebe1e5c605c5d6ebae04768e9416517f55d98da543b6f5f0ebfe48365d4566eec004997bb6b86d7444d5599c42c76c78e SHA512 0692a463ed14676d51850a1b2bbb0f433a8ecadc4238ec38e3fac0925619dddc522102460b0e509bd8496eef103fb82cf2419f27d2a842101cf3e58d12f562b9
 EBUILD nodejs-18.12.1.ebuild 7521 BLAKE2B 2e9c3da423016cc273dc8ff97fd65c3e61959cb5136d04d29299647a05620f2d6f8a62c8bda745c1cb51f749e7cb577506c36e77e17d913eb990b728d93faf4d SHA512 051a5cde9653ef822561a3b78304345df5163c5849619aa785b0eef8e3502255619d6e7ed1fafbcb117d2436d8edfe6c0b964b987a81c1622e3844a1ce160c12
 EBUILD nodejs-18.13.0.ebuild 7492 BLAKE2B a23ea462082a7a4220900b36330d156337dd2991c341d5a9c2894f4140ea60fae4d76439d83073a8e53ad03a2e26cade8230a8273e9ef6837673410a51d5ba89 SHA512 f188f21c945b824dbf51f74fd3c02bc582d0ece7c3c6e1902653a8dcb795bb5f20e459fdcdc9e2275a3699ed3334d447518249a9a0e62bc55b41713e691ced54
-EBUILD nodejs-99999999.ebuild 7492 BLAKE2B a23ea462082a7a4220900b36330d156337dd2991c341d5a9c2894f4140ea60fae4d76439d83073a8e53ad03a2e26cade8230a8273e9ef6837673410a51d5ba89 SHA512 f188f21c945b824dbf51f74fd3c02bc582d0ece7c3c6e1902653a8dcb795bb5f20e459fdcdc9e2275a3699ed3334d447518249a9a0e62bc55b41713e691ced54
+EBUILD nodejs-18.14.0.ebuild 7683 BLAKE2B e49ee6107489088c4eaffecda5ff77210d78eabab76d24a1e9f76fd3e45d9872ec4a30076e65f200d74809931af9850bee508a1044f1610c8f5d1246c9ed5c60 SHA512 34dc784f2eb6256b0ef8193811beb9899d4d58dc6761792eea19826135863e8ad4ac0a4426a1e52aabc39209153fdb2d908358c248ec78bcb82238b7794d5c12
+EBUILD nodejs-99999999.ebuild 7683 BLAKE2B e49ee6107489088c4eaffecda5ff77210d78eabab76d24a1e9f76fd3e45d9872ec4a30076e65f200d74809931af9850bee508a1044f1610c8f5d1246c9ed5c60 SHA512 34dc784f2eb6256b0ef8193811beb9899d4d58dc6761792eea19826135863e8ad4ac0a4426a1e52aabc39209153fdb2d908358c248ec78bcb82238b7794d5c12
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-18.14.0.ebuild b/net-libs/nodejs/nodejs-18.14.0.ebuild
new file mode 100644
index 000000000000..4e6da58645d6
--- /dev/null
+++ b/net-libs/nodejs/nodejs-18.14.0.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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 ~loong ~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"
+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.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+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}-12.22.5-shared_c-ares_nameser_h.patch
+)
+
+# These are measured on a loong machine with -ggdb on, and only checked
+# if debugging flags are present in CFLAGS.
+#
+# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
+# limit for memory usage. Disk usage was 19.1GiB for the build directory and
+# 1.2GiB for the installed image, so we leave some room for architectures with
+# fatter binaries and set the disk requirement to 22GiB.
+CHECKREQS_MEMORY="8G"
+CHECKREQS_DISK_BUILD="22G"
+
+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 is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+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}-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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	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 "${ARCH}:${ABI}" in
+		*:amd64) myarch="x64";;
+		*:arm) myarch="arm";;
+		*:arm64) myarch="arm64";;
+		loong:lp64*) myarch="loong64";;
+		riscv:lp64*) myarch="riscv64";;
+		*: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
+		keepdir /etc/npm
+		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
+		doenvd "${T}"/50npm
+
+		# Install bash completion for `npm`
+		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
+
+		# 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() {
+	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
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	if use npm; then
+		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
+		ewarn "	in your current shell"
+	fi
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index cb4f9e37b767..4e6da58645d6 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
 
 # These are measured on a loong machine with -ggdb on, and only checked
@@ -205,6 +204,8 @@ src_install() {
 
 	if use npm; then
 		keepdir /etc/npm
+		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
+		doenvd "${T}"/50npm
 
 		# Install bash completion for `npm`
 		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
@@ -248,3 +249,10 @@ src_test() {
 	out/${BUILDTYPE}/cctest || die
 	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
 }
+
+pkg_postinst() {
+	if use npm; then
+		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
+		ewarn "	in your current shell"
+	fi
+}