From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E61F138350 for ; Tue, 25 Feb 2020 05:19:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34B61E08D9; Tue, 25 Feb 2020 05:19:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A733E08D9 for ; Tue, 25 Feb 2020 05:19:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98DF934F2BE for ; Tue, 25 Feb 2020 05:19:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E28CAF for ; Tue, 25 Feb 2020 05:19:26 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1582607833.c26bf678ea85fdbbbe8d3d14908cd25ca94397c4.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/metadata.xml net-libs/nodejs/nodejs-10.19.0.ebuild net-libs/nodejs/nodejs-12.16.1.ebuild net-libs/nodejs/nodejs-13.9.0.ebuild net-libs/nodejs/nodejs-99999999.ebuild X-VCS-Directories: net-libs/nodejs/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: c26bf678ea85fdbbbe8d3d14908cd25ca94397c4 X-VCS-Branch: master Date: Tue, 25 Feb 2020 05:19:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84ceb930-a42e-4203-9b50-1d7ef60504c0 X-Archives-Hash: 79cfd02a43cad7c4a0d5ba7a58c4c452 commit: c26bf678ea85fdbbbe8d3d14908cd25ca94397c4 Author: Stefan Strogin gentoo org> AuthorDate: Sun Jan 26 14:34:35 2020 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Tue Feb 25 05:17:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26bf678 net-libs/nodejs: add USE=+system-ssl For now net-libs/nodejs fails to build on LibreSSL systems. Add USE=+system-ssl which can be explicitly disabled in order to use bundled OpenSSL. Bug: https://bugs.gentoo.org/613344 Closes: https://github.com/gentoo/gentoo/pull/14460 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> net-libs/nodejs/metadata.xml | 1 + net-libs/nodejs/nodejs-10.19.0.ebuild | 7 ++++--- net-libs/nodejs/nodejs-12.16.1.ebuild | 7 ++++--- net-libs/nodejs/nodejs-13.9.0.ebuild | 7 ++++--- net-libs/nodejs/nodejs-99999999.ebuild | 7 ++++--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml index 3f344f0d8ed..3e9bb1da9c0 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -9,6 +9,7 @@ Enable NPM package manager Enable building under a PaX enabled kernel Enable snapshot creation for faster startup + Use system OpenSSL instead of the bundled one Enable SystemTAP/DTrace tracing diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild index 31d605f6adb..db37b4f3518 100644 --- a/net-libs/nodejs/nodejs-10.19.0.ebuild +++ b/net-libs/nodejs/nodejs-10.19.0.ebuild @@ -13,10 +13,11 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" @@ -26,7 +27,7 @@ RDEPEND=" >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " DEPEND=" ${RDEPEND} @@ -99,7 +100,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 && ( use system-ssl && myconf+=( --shared-openssl ) ) || myconf+=( --without-ssl ) local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild index 3850f958b73..6c929f70278 100644 --- a/net-libs/nodejs/nodejs-12.16.1.ebuild +++ b/net-libs/nodejs/nodejs-12.16.1.ebuild @@ -15,10 +15,11 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" @@ -28,7 +29,7 @@ RDEPEND=" >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} @@ -106,7 +107,7 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.9.0.ebuild index aefd3239857..4d35b088093 100644 --- a/net-libs/nodejs/nodejs-13.9.0.ebuild +++ b/net-libs/nodejs/nodejs-13.9.0.ebuild @@ -15,10 +15,11 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" @@ -27,7 +28,7 @@ RDEPEND=" >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} @@ -104,7 +105,7 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 00962bc7bcb..71618f3c523 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -13,11 +13,12 @@ EGIT_REPO_URI="https://github.com/nodejs/node" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" KEYWORDS="" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" RESTRICT="!test? ( test )" REQUIRED_USE=" inspector? ( icu ssl ) npm? ( ssl ) + system-ssl? ( ssl ) " RDEPEND=" @@ -26,7 +27,7 @@ RDEPEND=" >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) " BDEPEND=" ${PYTHON_DEPS} @@ -101,7 +102,7 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) + use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) local myarch="" case ${ABI} in