net-libs/nodejs: Adjust dependencies, update live ebuild

* Fix various dependencies' minimum version
* Fix sed script that removes -O3
* Set econf --openssl-use-def-ca-store as app-misc/ca-certificates is
arguably more up to date than the included Mozilla certificate chain

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-libs/nodejs/nodejs-11.14.0.ebuild b/net-libs/nodejs/nodejs-11.14.0.ebuild
index 9ecdc16ab4ed0d9fb02a35e4e319ffb73503c4c8..6084b2ec3d4f9e33f09afb7f143665cd8030b758 100644 (file)
--- a/net-libs/nodejs/nodejs-11.14.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.14.0.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 RDEPEND="
        >=dev-libs/libuv-1.27.0:=
        >=net-dns/c-ares-1.15.0
-       >=net-libs/http-parser-2.9.0:=
+       >=net-libs/http-parser-2.8.0:=
        >=net-libs/nghttp2-1.37.0
        sys-libs/zlib
        icu? ( >=dev-libs/icu-63.1:= )

diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 2515d42685360f2b087b0cc9920ead1700431e8d..d8f4436a0093701e947e6147c6de6d3733238b7d 100644 (file)
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -23,13 +23,13 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-       >=dev-libs/libuv-1.27.0:=
+       >=dev-libs/libuv-1.28.0:=
        >=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.38.0
        sys-libs/zlib
        icu? ( >=dev-libs/icu-63.1:= )
-       ssl? ( >=dev-libs/openssl-1.1:0= )
+       ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 DEPEND="
        ${RDEPEND}
@@ -74,7 +74,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).
@@ -102,7 +102,7 @@ src_configure() {
        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