commit: 9ecc5462cbfc224ddb23a30254c43fee93a150fe Author: Sasha Finkelstein <fnkl.kernel <AT> gmail <DOT> com> AuthorDate: Tue Dec 9 12:49:46 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 24 17:20:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ecc5462
net-libs/nodejs: Unvendor dev-cpp/ada and dev-cpp/simdutf Signed-off-by: Sasha Finkelstein <fnkl.kernel <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44969 Closes: https://github.com/gentoo/gentoo/pull/44969 Signed-off-by: Sam James <sam <AT> gentoo.org> ...js-99999999.ebuild => nodejs-24.11.1-r1.ebuild} | 35 ++++++++++++---------- net-libs/nodejs/nodejs-99999999.ebuild | 10 +++---- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-24.11.1-r1.ebuild similarity index 93% copy from net-libs/nodejs/nodejs-99999999.ebuild copy to net-libs/nodejs/nodejs-24.11.1-r1.ebuild index 4b625339020e..d180f1d58e46 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-24.11.1-r1.ebuild @@ -33,21 +33,23 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.1.0:= +COMMON_DEPEND=">=app-arch/brotli-1.1.0:= dev-db/sqlite:3 + >=dev-cpp/ada-3.3.0:= + >=dev-cpp/simdutf-7.3.4:= >=dev-libs/libuv-1.51.0:= - >=dev-libs/simdjson-3.10.1:= - >=net-dns/c-ares-1.34.4:= - >=net-libs/nghttp2-1.64.0:= + >=dev-libs/simdjson-4.0.7:= + >=net-dns/c-ares-1.34.5:= + >=net-libs/nghttp2-1.66.0:= >=net-libs/nghttp3-1.7.0:= virtual/zlib:= corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( - >=net-libs/ngtcp2-1.9.1:= - >=dev-libs/openssl-1.1.1:0= + >=net-libs/ngtcp2-1.11.0:= + >=dev-libs/openssl-3.5.4:0= ) - !system-ssl? ( >=net-libs/ngtcp2-1.9.1:=[-gnutls] ) + !system-ssl? ( >=net-libs/ngtcp2-1.11.0:=[-gnutls] ) || ( sys-devel/gcc:* llvm-runtimes/libatomic-stub @@ -58,7 +60,8 @@ BDEPEND="${PYTHON_DEPS} virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" # These are measured on a loong machine with -ggdb on, and only checked # if debugging flags are present in CFLAGS. @@ -110,7 +113,8 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch ) + use pax-kernel && + PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch ) default } @@ -127,9 +131,7 @@ src_configure() { local myconf=( --ninja - # ada is not packaged yet - # https://github.com/ada-url/ada - # --shared-ada + --shared-ada --shared-brotli --shared-cares --shared-libuv @@ -137,9 +139,7 @@ src_configure() { --shared-nghttp3 --shared-ngtcp2 --shared-simdjson - # sindutf is not packaged yet - # https://github.com/simdutf/simdutf - # --shared-simdutf + --shared-simdutf --shared-sqlite --shared-zlib ) @@ -268,6 +268,11 @@ src_test() { test/sequential/test-tls-session-timeout.js test/sequential/test-util-debug.js ) + # https://bugs.gentoo.org/963649 + has_version '>=dev-libs/openssl-3.6' && + drop_tests+=( + test/parallel/test-tls-ocsp-callback + ) use inspector || drop_tests+=( test/parallel/test-inspector-emit-protocol-event.js diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 4b625339020e..d9a352f5360c 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -34,6 +34,8 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.1.0:= + >=dev-cpp/ada-3.3.0:= + >=dev-cpp/simdutf-7.3.4:= dev-db/sqlite:3 >=dev-libs/libuv-1.51.0:= >=dev-libs/simdjson-3.10.1:= @@ -127,9 +129,7 @@ src_configure() { local myconf=( --ninja - # ada is not packaged yet - # https://github.com/ada-url/ada - # --shared-ada + --shared-ada --shared-brotli --shared-cares --shared-libuv @@ -137,9 +137,7 @@ src_configure() { --shared-nghttp3 --shared-ngtcp2 --shared-simdjson - # sindutf is not packaged yet - # https://github.com/simdutf/simdutf - # --shared-simdutf + --shared-simdutf --shared-sqlite --shared-zlib )
