[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     8b49d82a1512ca6fd1bc2204d8a6baf14ac7c03a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 07:23:47 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 07:25:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b49d82a

net-libs/nodejs: Versions 10.16.2 12.8.0

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/nodejs/Manifest                           |  3 +-
 ...nodejs-10.16.1.ebuild => nodejs-10.16.2.ebuild} |  0
 ...{nodejs-10.16.1.ebuild => nodejs-12.8.0.ebuild} | 39 ++++++++++++----------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 03d3dd61cd4..f86050d17dc 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,11 +1,12 @@
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
 DIST node-v10.16.0.tar.xz 21480088 BLAKE2B de91e718893aa0bb87b75225a484281370ca1054fed919d6177911ca8e57228a0925c077a02397efd05594f72438d47b264d6f4b91623173e3a577a58a5d86db SHA512 df197c7b929fe1e0acf0334dbeb45be4c0cfa3266f9ddb513eafffcd6405bc02cba2fcbd34a7a5bef2e45a1d61ef3734ca0afe7295904ed563744fe06751cc62
-DIST node-v10.16.1.tar.xz 21509272 BLAKE2B f0c60265d6689b1bd5ce6c6fa0fb80555f503d3da1ba3664125c2a35a7ce9a5e2926515d868ddb8760daa85dfbe566cfb0e6cc1843683cfb6c004b8bfcb42375 SHA512 315270b0210070475cfb46a9259ec47bc1653f6f18fd1eb27ba2c3e28b9032493dbdb142a26e54602d07a1e19f11bed6ee35ffd69c2f86ff77cfeb7863cf5987
+DIST node-v10.16.2.tar.xz 21509460 BLAKE2B dabbd7aab2929e2f238e50463daeea59a89573abf71a619a98b8718184cecec15f74ec3a772b385aeca9baf365d5cbf922b4118ef96f9dd33518e1421d2d3623 SHA512 aad6dd2f8677b38f63e04ef81917fcbf7913fe398c3b73ddde68be821e19398949c05517d9277802c55975dfd013dd4132009c92301d09ccd89920b03454153c
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
 DIST node-v12.6.0.tar.xz 22609832 BLAKE2B cc304e0b41bd7c455d4a014b612259c5f91d897432bd1f02bd6088fcb5c7acf0c11d323b44e842bb699003b760425b0c9fd3c9a3587abba9ba25652ca1f2decb SHA512 cd6c1b9c0d1f9db6d3a413f1b437cfaff51a67e66033d2235eaacb49650fe9789cd8994cb374cc8aeccfc82f1dd6e6cc5aed1f39a751d7044a5af45c74d6013f
 DIST node-v12.7.0.tar.xz 22657592 BLAKE2B 21e74b42769bad5aa41b08d0e96b2dc44821eef8f1dbe7a10412935f6b69d49591f6fd42a25b1a3624bb230b88eb53a5f77a231c4c6925244438c833004a0018 SHA512 314baaa0ad30b592f63ece22c87c734b794af3bd630c16306017249cbbbcd77a75f8d5073c5a17578589fd1a502cb736bc75b69e6ffb2a4cc66927c69b62a3e8
+DIST node-v12.8.0.tar.xz 22637864 BLAKE2B 24b8469a172edcec5d53e7d6a29334f3666043f0e2a7f2c6359d9464e85350284830c29cd7c9c8fdc58cdc122c26ea5d746643c69492f4846729870f066267d0 SHA512 a85ec2385d1e4e947678c12a9097d116228d1c091f4ce45be220ccc9b5d76f86df628f7424969e1ddbbeee41fc8b5b556c5b06e7e37ed2c677572f8e7021717d
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868

diff --git a/net-libs/nodejs/nodejs-10.16.1.ebuild b/net-libs/nodejs/nodejs-10.16.2.ebuild
similarity index 100%
copy from net-libs/nodejs/nodejs-10.16.1.ebuild
copy to net-libs/nodejs/nodejs-10.16.2.ebuild

diff --git a/net-libs/nodejs/nodejs-10.16.1.ebuild b/net-libs/nodejs/nodejs-12.8.0.ebuild
similarity index 86%
rename from net-libs/nodejs/nodejs-10.16.1.ebuild
rename to net-libs/nodejs/nodejs-12.8.0.ebuild
index c55a7a4b975..f14881f3a8a 100644
--- a/net-libs/nodejs/nodejs-10.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.8.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-single-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -23,10 +21,10 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
+	>=dev-libs/libuv-1.30.1:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.34.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.39.1
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
@@ -39,6 +37,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 S="${WORKDIR}/node-v${PV}"
 
@@ -74,7 +73,7 @@ src_prepare() {
 	# 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 deps/v8/gypfiles/toolchain.gypi || die
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
 
 	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
 	# seem sandbox related either (invoking it from a sandbox works fine).
@@ -93,13 +92,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
 
 	local myarch=""
 	case ${ABI} in
@@ -130,7 +132,8 @@ src_compile() {
 
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
+	default
+
 	pax-mark -m "${ED}"usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
@@ -187,7 +190,7 @@ src_install() {
 			\) \) -exec rm -rf "{}" \;
 	fi
 
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
 }
 
 src_test() {
@@ -196,10 +199,10 @@ src_test() {
 }
 
 pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
 }