gentoo resync : 17.08.2021

7 files changed, 9 insertions, 245 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index fce7bfb91d50..c1189e657004 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -15,15 +15,13 @@ DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb
 DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5
-DIST node-v16.6.1.tar.xz 33715224 BLAKE2B 2a95dbac7606de45e6c0669ee1c1ec1ee7c105ebbb241fbcae2ec0611df1da21ade28d28d9e011569d600b46fbcb6a32fff11456efb676386ed3cbbdc26d3e16 SHA512 408924c587f7d92074d8cb66903bd4f6c13a3a1f50fd05ead67feb85ed44cbf2ba1a4aebec8fe51ec77c102d3c310fbabb6e2557795a29536c091e9140fcf143
 DIST node-v16.6.2.tar.xz 33713996 BLAKE2B a4974da7004779179bd3bb0f99bb703f789a89c3ffcf194e83ed4ad07b005cc4ff23dd16f69ed1fee5f2d142e9cd813acb9687021a8cf1a64475093928b4e107 SHA512 978fd8204f7512a42256b0b50d674280c418595970a1327f3197fcde1f8787816c243611c24cada8c979352d77452393481600b96e66c72c294bcd04cf33f45f
-EBUILD nodejs-12.22.1-r1.ebuild 6456 BLAKE2B 29a755a858a2a1eefccfb2f42339b53c9e5ef44c833874e08cc600800af87268405af2f24df34f9f4b4c186acd1150a2b5bd76351063f9a4c2d9e1340c62a3fd SHA512 e9c80caf28d669d1cae2c3a957360e802826212cca3245580b87122030172e2559144a77efc40e851805e00391699928be4266dfa8881cf9fc4dee8c0e18c59f
-EBUILD nodejs-12.22.3-r1.ebuild 7087 BLAKE2B d0aefc2c382287b43363e128a2aef8426c30cdabf4866da0daff3de38cc80d854938d305f30829416ce730e951411eb401b0663a0ae9d493db3db6ad7437f4f8 SHA512 24d08f94b7fd54e6fdb3bc4d7388886ab7ed7e518aec8a713d4677ff03a60d79cd32efb8349983d86a41597569aeb5cc40703e35ccc4b3f52a3c1e8fa9d9d508
+EBUILD nodejs-12.22.1-r1.ebuild 6422 BLAKE2B 94ebdc2679e45c13e6423866b7f133fe908aa1158a4a14fd66a1e1eec1616006492fbc27461c3fac5058f2a2fd8d5effbdf1048270397d2ee2eba0898d4784ee SHA512 4639c682aa866f175c3834501db26881e60d2aeccb7c986f571961d96d94cffcf1872a4369a136c16d69fb6271082ad32fac4a51e62327a84fead401e62a446c
+EBUILD nodejs-12.22.3-r1.ebuild 7038 BLAKE2B 0e6083e2db08da69df4568091be662f8ef66e11aae85210a7b581185f586a0381e849e9cef7db3c3a0698b6f9a0daf7ac4fbfd9b473b73f08db559613a072ce5 SHA512 e7eef757ab711e43cc7bc988c29da7b88730bbf9f339624c1fa092ab313d5762fd597f1399b127efbe97bfecdf40e39bc24ecc960ec83e274556177e4184588d
 EBUILD nodejs-12.22.5-r1.ebuild 7139 BLAKE2B 799386c24e9a9e6374d27467a24004ba7b75822b7dd8b98ebff460788bcd992d11f0d40b1733dd9586881bebd71a442c77ff5a3ada8eeb4d4ae180d39186746c SHA512 afc5134414c3633f71c023914dbb94feabb58c1f3145d0475f628302fea9104910c31e73d34de596a30f594413780bbe072ad17432fbecb9649751295a751d53
-EBUILD nodejs-14.16.1-r1.ebuild 6153 BLAKE2B f689b1e81329f64e179e7c8c2e4feea3c12792592d8d0cc26392304f9cbfa1649396f3452ed58e299aa7573763583143c3436071c724d1a6e3fccaff628d6d3e SHA512 f79b28c87879b16c73138543dee685a3eee0c710087f1c6cf12b2b8f81bddefb1e3b5d9ea275d9c181a796f7490796bf154c1a7eff7eba4c958ef42f397aabab
-EBUILD nodejs-14.17.3-r1.ebuild 7081 BLAKE2B 97ce89a4b40783c8277e1e7f74af3928797f5db3baf8046ac755ed544c65b986ed964258a4a9e9392210d1959929d4be1969c7ca19cefae394744e7de6a7f296 SHA512 8935847e62f3df16f7f73dd94f7c0e8290cb0db4309cb356ccca9de425f1190175b64a1c33e519954f8323ba02f32816a5d9b01e81b8572b36ff571b2b670447
+EBUILD nodejs-14.16.1-r1.ebuild 6119 BLAKE2B 41ba4ef9e92d29879c15307a37b716366522aeba83e42e147c9cfd0040c4c679d6567d9317185581cb00b3fd50a9b7a5463a9e837c020388c7c2f1b436b60d26 SHA512 da0fa713cc03fbb30261524eb99e342d622f8b081d6265680ae444109e7ff9593302b294fc4a1f59cb6fe24bf4b2a88211dcfe0cda9c0970b138eb9eae9bd336
+EBUILD nodejs-14.17.3-r1.ebuild 7032 BLAKE2B 65facf1b4dcbb3b158020702fcad525dd936fefea3e64112a5325a84a9c120fb47a3b4fd7b08a6a8c9645d043df0c306941208fcbab7a6a6f097c75decbb0f85 SHA512 3b13c0559bb723705b5e6392119e36c0ff8cc91aa397a42b30000000ce6b997377b142b46ab817fccdef3d1a1052f2dcf399d3c2e88946b01dd717275d9d1640
 EBUILD nodejs-14.17.5-r1.ebuild 7178 BLAKE2B e53fa59e142c9c4e7764466ad3ef783298841c5007009ca3c767f8370a39a3e715b1604b35f5b3dc79094f35ba2eb57d587f48b3097dd1792fa386e44a3ddfec SHA512 9e428c7d7c87bb1dd72c11e0c36ddb2d4c4bfe892fd57179ef0b28e82386f49f4f5ff32d20565beeceb852cb021c69c4f3d3343de2589a23644aa0c8844f9d0b
-EBUILD nodejs-16.6.1-r1.ebuild 6544 BLAKE2B 73f3d973cbc445f46f90be8d8e96edb1f03e8a34a26c145d87cbcb90ca19d65f21e12f263ec3e0aff6db472120163e8d7247cdb6f571bb73bc33034e5ef0de28 SHA512 0a248eed198782d5b4abfd738cc3007cc6ab4743e7ee8c018ef5eaeb106b4036a8ced89a5be42fd739964900c90460972e6aa4bb1ad57c297118b4d84c7fe1c7
 EBUILD nodejs-16.6.2-r1.ebuild 6604 BLAKE2B 6998b4499705dbdaba2a2a14545fcb5c9ead195811419516f7fbaa0f686bd11f0b7448a526442fb2c892f886722b04c95150ae2626f44263ece10af51787447e SHA512 867da8350e320a2ab214e0c23e65b5c1b513ebfdce55d93f5309fdb8410ef870af9ccbb5cf17a1e6fcd8f086bc37217f7bb5bddfe517cc53bf762f04583cb88e
 EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
-MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c
+MISC metadata.xml 821 BLAKE2B 960884e07436d0c59691c49505dd89f486165dad1b6f013820a12186df25d3f9a2a3a7bace0a382126a67bb51314350166e2eb907bddce4a8ff49d95c7af5f0a SHA512 88d9bd1cd3f6bb90e5d861dffcc8f5edb3582c61d4f3d407a76bb808b9a9b59ce72ce903d57b291b8585e72cf3ab91700272ec507131fca7ef32951613be3227
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 33f1fbc671e1..d30a570efc37 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -5,11 +5,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-		<description>Do not Cc on bugs related to grsecurity/PaX</description>
-	</maintainer>
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="lto">Build with link-time optimisation</flag>
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
index 3d3ce369fbb6..eeda8119a76e 100644
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="arm64 ppc64 x86"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-12.22.3-r1.ebuild b/net-libs/nodejs/nodejs-12.22.3-r1.ebuild
index 27428510de80..c9edbd626d27 100644
--- a/net-libs/nodejs/nodejs-12.22.3-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.3-r1.ebuild
@@ -19,7 +19,7 @@ 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="arm"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
index 472fe628bfe2..b65beeceecb4 100644
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="arm64 ppc64 x86"
 
 IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.17.3-r1.ebuild b/net-libs/nodejs/nodejs-14.17.3-r1.ebuild
index e18f47e1cf7d..af0c97b42fcb 100644
--- a/net-libs/nodejs/nodejs-14.17.3-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.3-r1.ebuild
@@ -19,7 +19,7 @@ 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="arm"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-16.6.1-r1.ebuild b/net-libs/nodejs/nodejs-16.6.1-r1.ebuild
deleted file mode 100644
index 4e4fc546d14c..000000000000
--- a/net-libs/nodejs/nodejs-16.6.1-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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.17.0:=
-	>=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}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.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
-			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
-		keepdir /etc/npm
-
-		# 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
-}