commit:     c051b9e04dd9197a973595a8536baf191f32f1d1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 14:08:54 2024 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 14:08:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c051b9e0

net-libs/nodejs: fix -systen-ssl dependency in 22.7.0

If system-ssl isn't used, also require that net-libs/ngtcp2 be
built without gnutls.

Bug: https://bugs.gentoo.org/934497
Bug: https://bugs.gentoo.org/938455
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 net-libs/nodejs/nodejs-22.7.0.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-libs/nodejs/nodejs-22.7.0.ebuild 
b/net-libs/nodejs/nodejs-22.7.0.ebuild
index 40e5d335039b..a6437d109013 100644
--- a/net-libs/nodejs/nodejs-22.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.7.0.ebuild
@@ -7,7 +7,7 @@ CONFIG_CHECK="~ADVISE_SYSCALLS"
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils 
pax-utils python-any-r1 xdg-utils
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils 
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,11 +39,14 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
        >=dev-libs/simdjson-3.9.1:=
        >=net-dns/c-ares-1.18.1:=
        >=net-libs/nghttp2-1.61.0:=
-       >=net-libs/ngtcp2-1.3.0:=
        sys-libs/zlib
        corepack? ( !sys-apps/yarn )
        system-icu? ( >=dev-libs/icu-73:= )
-       system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+       system-ssl? (
+               >=net-libs/ngtcp2-1.3.0:=
+               >=dev-libs/openssl-1.1.1:0=
+       )
+       !system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
        sys-devel/gcc:*"
 BDEPEND="${PYTHON_DEPS}
        app-alternatives/ninja

Reply via email to