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

[Marek Szuba]

commit:     ffba27233d352a46ed74f24436179cd8c19274e1
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 17:12:47 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 17:36:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffba2723

net-libs/nodejs: add 16.6.2, drop 16.6.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-libs/nodejs/Manifest                                 |  2 +-
 .../{nodejs-16.6.1.ebuild => nodejs-16.6.2.ebuild}       | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 8db508c40b0..e9feb6ee67f 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,4 +4,4 @@ DIST node-v12.22.4.tar.xz 23653388 BLAKE2B 
dfed2c23f7bbafe20d955dbe382ee8b2b40d1
 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.4.tar.xz 33592020 BLAKE2B 
ad8a49715b3d568a5dc66b759d9c3074ea78c1c2293b1642549e32d26c5213ccc8fce4a531ef7727e3a74a63ddc26d8b71ac20bf5c86bf0af09467c2306363ef
 SHA512 
c06228f1a82cf887fa1557be58a8814027926f5c9750c9f1a1656afd6f58151be08e05203343c62fb9a3957d99a73bee6fe509e52543fdbc5bd4c05a1e76c3cf
-DIST node-v16.6.1.tar.xz 33715224 BLAKE2B 
2a95dbac7606de45e6c0669ee1c1ec1ee7c105ebbb241fbcae2ec0611df1da21ade28d28d9e011569d600b46fbcb6a32fff11456efb676386ed3cbbdc26d3e16
 SHA512 
408924c587f7d92074d8cb66903bd4f6c13a3a1f50fd05ead67feb85ed44cbf2ba1a4aebec8fe51ec77c102d3c310fbabb6e2557795a29536c091e9140fcf143
+DIST node-v16.6.2.tar.xz 33713996 BLAKE2B 
a4974da7004779179bd3bb0f99bb703f789a89c3ffcf194e83ed4ad07b005cc4ff23dd16f69ed1fee5f2d142e9cd813acb9687021a8cf1a64475093928b4e107
 SHA512 
978fd8204f7512a42256b0b50d674280c418595970a1327f3197fcde1f8787816c243611c24cada8c979352d77452393481600b96e66c72c294bcd04cf33f45f

diff --git a/net-libs/nodejs/nodejs-16.6.1.ebuild 
b/net-libs/nodejs/nodejs-16.6.2.ebuild
similarity index 91%
rename from net-libs/nodejs/nodejs-16.6.1.ebuild
rename to net-libs/nodejs/nodejs-16.6.2.ebuild
index 23645553646..df3eeec96e6 100644
--- a/net-libs/nodejs/nodejs-16.6.1.ebuild
+++ b/net-libs/nodejs/nodejs-16.6.2.ebuild
@@ -23,7 +23,7 @@ else
        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"
+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 )
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/brotli-1.0.9
        >=dev-libs/libuv-1.40.0:=
-       >=net-dns/c-ares-1.17.0
+       >=net-dns/c-ares-1.17.2
        >=net-libs/nghttp2-1.41.0
        sys-libs/zlib
        system-icu? ( >=dev-libs/icu-67:= )
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+       "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
        "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
 
@@ -72,6 +73,17 @@ src_prepare() {
        export V=1
        export BUILDTYPE=Release
 
+       # There have been cases of other bundled deps bypassing --shared-foo / 
USE=system-bar,
+       # therefore play it safe and make sure dependencies which are not 
supposed to be bundled
+       # aren't there in the first place.
+       rm -r deps/{brotli,cares,nghttp2,uv,zlib} || die "Failed to remove 
undesired bundled deps"
+       if use system-icu; then
+               rm -r deps/icu-small || die "Failed to remove bundled ICU"
+       fi
+       if use system-ssl; then
+               rm -r deps/openssl || die "Failed to remoce bundled OpenSSL"
+       fi
+
        # 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