gentoo resync : 03.11.2019

6 files changed, 40 insertions, 45 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index e258a123f1c4..96ebdefb5d2c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,14 +1,14 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v10.16.3.tar.xz 21505540 BLAKE2B 2ae6c3ce96a42cb72a388ca7727affb1e2eae06b997098bd8cad2b339b888f1f188c868d39631c51e10ef7b3a5a9173a3b016afe9fa7a4fb74c24a584781c329 SHA512 5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7
-DIST node-v12.11.1.tar.xz 22852156 BLAKE2B 38205c3ad52ccac2656c72b31c5714268e4771375b13d7c113e4a5fe7e9530d2826c43aeaa3ed3e30210f504d37221f90f3fb2a15f4c5fbca8878d0f2639b9fa SHA512 9567ee592ea8a05f899755d5e1c934413532676c78a663a1a861a6fa882c7eecae411c05c4b034191b7266776341609c098fbccfcd93c93eba7b84d138eeffb9
-DIST node-v12.12.0.tar.xz 22836688 BLAKE2B 81ff202fb807c557a30eeb08a76a8e95e2faec300d360caac5ce177cdfcda3963bcea904f3e79f9ced9fe2219e7e1d4a760a9c4e69dfe5b670c737e2a598cf6a SHA512 91872784a7a7e7e1e0beeb1166eb1ddd7a5432271e9f62265815d4c5b5d831f269916954bb36724e65108c57d6a7ebac3a2a5be2e49f51f7904a7d549c92176b
+DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc
+DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8
+DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd92e243d77453cfa7d335e9e1a37ce4f18eb1cbba141ff9a017a777e31ae64261f46dbf17d1f6ff0d6d5c263a2a SHA512 a39a64761ef3867379f3a2ef230f65ddeb91fb93d8833c1ada7312588fd75d060f4d73df1a106f7d7cc08886ac7c5335d453e4d882c8cdde28a25a0a8cbcbfa6
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
-EBUILD nodejs-10.16.3.ebuild 6451 BLAKE2B 99559c2e5e964f133e31b21263138c563cdde52ed3982c4ececb19e68df6348a7fb448234256465d8e22f38efbd9f1b6057b38cf6d0050c7c0093a6987dd7bb4 SHA512 699e010ef0e326f323f8f7599afa1ee4d810500844873de328f162aa03093af2b9a227008aaf5f9e3971919f0309525b45bbf07bc4c8c3a100e8db41444f4e98
-EBUILD nodejs-12.11.1.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
-EBUILD nodejs-12.12.0.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
+EBUILD nodejs-10.17.0.ebuild 6279 BLAKE2B 8eb86a20ee7b128cf6f367e6d1e0c4e3f59fa2920304b4715c98f2b93c2b3ef65df529f3be5dab0c84e41eb9197f42ef0931a832e6b2d8781f417c02af4ca572 SHA512 ee699e5805e2295ad1f06a022d7696b184d1e9ec504e4f7f468fcf04b8f003700f13cad2a1b6cda9be46debd4cc07c98379b7aec6cbb1f4a74be0cae37d98fcc
+EBUILD nodejs-12.13.0.ebuild 6402 BLAKE2B 2f90c426ffd9373534fb9ff5963b7a52735758695cb52e290affcddc95dd5963ad48c2cee68569976fe072ccfd2196fde6a7a6308c2bba231da2e46c3e6c99c8 SHA512 4192e1501436e59849ecd9ca126e351c2bcbc662f41aa8e2aa639e325f5c201ad41bc5128d7132d488c82a6506144b548ad03a0fcab9fa2375a92e50e90c8794
+EBUILD nodejs-13.0.1.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
-EBUILD nodejs-8.16.2.ebuild 6465 BLAKE2B 1b8fd1a7d393e88fea7f12e5622d701bdd4326d059ebc7f5845143f011e1ec3ac48e9a99323ba9673b01e84479bbb059df542a6904e4806e9addc4c8e653935a SHA512 4833463afeda2dba9dd8b44517ba8408785cf486a7f1c6550c01f00c2bc177b241b078bc7d084e111871f8d4aa93bd237978271d77d417f2e4347c1bfe32789d
-EBUILD nodejs-99999999.ebuild 6337 BLAKE2B 2db05ed8f94016c72fb9ee5f0d9bd1ebeb05627a4c596a703d17b33c9fca0a92494728453a1e829250e8bc1e9ae8807eeb396dad9f04c8954a86c5f56d5587df SHA512 8639490d22b8b7e0147960673a179c9d5bc712015afbf8a21f716115d9c6b9d54b6ff8055e7ebbba50fb80d3458f2d5050ff8587a8029c7329720e3b80ec58c0
+EBUILD nodejs-8.16.2.ebuild 6476 BLAKE2B 62c1c56423c4673f9eb40717c3636cd8262d8972a9ea8cc83d24bc3b7d6bf9a62c4273ff5e6103eae53def7079b3b46ef4c25fc0a6b920de1d8b5ec6c0732dbf SHA512 723231c6e64f60c9643358769fa0f6d55f1ec5405272f89a1ab7fbb1d9e8cafc7fc388505040395c2f040a8b344b0eff1a704454a459365d25a4e855f897983b
+EBUILD nodejs-99999999.ebuild 6261 BLAKE2B 993b25d35bef4f54655c6bc9c8679b1ef667c2130add32a2bbff2c3a521bfe1ddde903b021fbec291af1fc205b1226fa1062fb722f57a39b34faf58211831f43 SHA512 cae49616d8151ab0cfa590080cfe0263666900a2bbf7b0cc278192b096cdd24b365943ead6aeb8b894a91b2dacc3377a82de9ec47bc1a5b94495f05b446731ca
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.16.3.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild
index 4dfee5eb4434..1b63a38abb43 100644
--- a/net-libs/nodejs/nodejs-10.16.3.ebuild
+++ b/net-libs/nodejs/nodejs-10.17.0.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+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/"
@@ -39,6 +37,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
@@ -132,7 +131,7 @@ src_compile() {
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
+	pax-mark -m "${ED}"/usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
@@ -142,11 +141,6 @@ src_install() {
 	done
 
 	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
 		docinto html
 		dodoc -r "${S}"/doc/*
 	fi
diff --git a/net-libs/nodejs/nodejs-12.11.1.ebuild b/net-libs/nodejs/nodejs-12.13.0.ebuild
index fdf342ca0430..e76d005fd0b9 100644
--- a/net-libs/nodejs/nodejs-12.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -22,7 +22,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.31.0:=
+	>=dev-libs/libuv-1.32.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
@@ -30,16 +30,19 @@ RDEPEND="
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-12.12.0.ebuild b/net-libs/nodejs/nodejs-13.0.1.ebuild
index fdf342ca0430..64dd1ca4d151 100644
--- a/net-libs/nodejs/nodejs-12.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.0.1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+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"
@@ -22,24 +22,25 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.31.0:=
+	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
@@ -95,8 +96,7 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
-		--shared-zlib
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -146,11 +146,6 @@ src_install() {
 	done
 
 	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
 		docinto html
 		dodoc -r "${S}"/doc/*
 	fi
diff --git a/net-libs/nodejs/nodejs-8.16.2.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild
index 621189a0947e..a0f60063098e 100644
--- a/net-libs/nodejs/nodejs-8.16.2.ebuild
+++ b/net-libs/nodejs/nodejs-8.16.2.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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -30,12 +30,14 @@ RDEPEND="
 	icu? ( >=dev-libs/icu-60.1:= )
 	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
 )
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 098bb9968f85..1b6515a23d40 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 PYTHON_REQ_USE="threads"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -20,20 +20,22 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.30.1:=
+	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.1
+	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
+DEPEND="
+	${RDEPEND}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 )
@@ -57,7 +59,6 @@ src_prepare() {
 
 	# make sure we use python2.* while using gyp
 	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
 
 	# less verbose install output (stating the same as portage, basically)
 	sed -i -e "/print/d" tools/install.py || die