From 4a7ea6d83d36125cbeae45801e4430f2f300a785 Mon Sep 17 00:00:00 2001 From: Stefan Strogin Date: Wed, 26 Feb 2020 02:35:59 +0200 Subject: [PATCH] net-libs/nodejs: replace wrongly used subshell with 'if' Closes: https://bugs.gentoo.org/710784 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Stefan Strogin --- net-libs/nodejs/nodejs-10.19.0.ebuild | 6 +++++- net-libs/nodejs/nodejs-12.16.1.ebuild | 6 +++++- net-libs/nodejs/nodejs-13.9.0.ebuild | 6 +++++- net-libs/nodejs/nodejs-99999999.ebuild | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild index db37b4f35189..1aedca2b28c8 100644 --- a/net-libs/nodejs/nodejs-10.19.0.ebuild +++ b/net-libs/nodejs/nodejs-10.19.0.ebuild @@ -100,7 +100,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot && myconf+=( --with-snapshot ) - use ssl && ( use system-ssl && myconf+=( --shared-openssl ) ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl ) + else + myconf+=( --without-ssl ) + fi 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 6c929f702786..d0e7e0c5b4cf 100644 --- a/net-libs/nodejs/nodejs-12.16.1.ebuild +++ b/net-libs/nodejs/nodejs-12.16.1.ebuild @@ -107,7 +107,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi 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 4d35b0880936..00513e8978c4 100644 --- a/net-libs/nodejs/nodejs-13.9.0.ebuild +++ b/net-libs/nodejs/nodejs-13.9.0.ebuild @@ -105,7 +105,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 71618f3c5232..7a8dc689fddd 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -102,7 +102,11 @@ src_configure() { use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) - use ssl && ( use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) ) || myconf+=( --without-ssl ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi local myarch="" case ${ABI} in -- 2.26.2