From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-985376-garchives=archives.gentoo.org@lists.gentoo.org>
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 1F7641396D9
for <garchives@archives.gentoo.org>; Tue, 21 Nov 2017 18:39:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 55A9CE0F1F;
Tue, 21 Nov 2017 18:39:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 22407E0F1F
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Nov 2017 18:39:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 79F8C33BF3C
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Nov 2017 18:39:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B9F2A2C2
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Nov 2017 18:39:48 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1511289586.68a9362fd26f69996823c36ead90fe053537f1fe.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/nodejs/nodejs-8.9.1.ebuild net-libs/nodejs/nodejs-9.2.0.ebuild
X-VCS-Directories: net-libs/nodejs/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 68a9362fd26f69996823c36ead90fe053537f1fe
X-VCS-Branch: master
Date: Tue, 21 Nov 2017 18:39:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2f49e799-30a2-42d8-9fec-4648f4547057
X-Archives-Hash: 9098acdba29ceb9e87f62781c590f1ab
commit: 68a9362fd26f69996823c36ead90fe053537f1fe
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 18:39:24 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 18:39:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a9362f
net-libs/nodejs: Fix USE=-ssl (bug #615448 by Toralf Förster).
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-libs/nodejs/nodejs-8.9.1.ebuild | 22 ++++++++++++----------
net-libs/nodejs/nodejs-9.2.0.ebuild | 22 ++++++++++++----------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/net-libs/nodejs/nodejs-8.9.1.ebuild b/net-libs/nodejs/nodejs-8.9.1.ebuild
index 38c6428ce06..9cc359cb23f 100644
--- a/net-libs/nodejs/nodejs-8.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.9.1.ebuild
@@ -18,13 +18,15 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
- npm? ( ${PYTHON_DEPS} )
- >=net-libs/http-parser-2.7.0:=
+RDEPEND="
>=dev-libs/libuv-1.15.0:=
+ >=net-libs/http-parser-2.7.0:=
>=net-libs/nghttp2-1.25.0
- >=dev-libs/openssl-1.0.2g:0=[-bindist]
- sys-libs/zlib"
+ sys-libs/zlib
+ icu? ( >=dev-libs/icu-56:= )
+ npm? ( ${PYTHON_DEPS} )
+ ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
systemtap? ( dev-util/systemtap )
@@ -89,14 +91,14 @@ src_prepare() {
}
src_configure() {
- local myarch=""
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
- use npm || myconf+=( --without-npm )
+ local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+ use debug && myconf+=( --debug )
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+ use npm || myconf+=( --without-npm )
use snapshot && myconf+=( --with-snapshot )
- use ssl || myconf+=( --without-ssl )
- use debug && myconf+=( --debug )
+ use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+ local myarch=""
case ${ABI} in
amd64) myarch="x64";;
arm) myarch="arm";;
diff --git a/net-libs/nodejs/nodejs-9.2.0.ebuild b/net-libs/nodejs/nodejs-9.2.0.ebuild
index aaab3c90a4b..d430a7b0cef 100644
--- a/net-libs/nodejs/nodejs-9.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-9.2.0.ebuild
@@ -18,13 +18,15 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-RDEPEND="icu? ( >=dev-libs/icu-59:= )
- npm? ( ${PYTHON_DEPS} )
- >=net-libs/http-parser-2.7.0:=
+RDEPEND="
>=dev-libs/libuv-1.16.1:=
+ >=net-libs/http-parser-2.7.0:=
>=net-libs/nghttp2-1.25.0
- >=dev-libs/openssl-1.0.2g:0=[-bindist]
- sys-libs/zlib"
+ sys-libs/zlib
+ icu? ( >=dev-libs/icu-59:= )
+ npm? ( ${PYTHON_DEPS} )
+ ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
systemtap? ( dev-util/systemtap )
@@ -89,14 +91,14 @@ src_prepare() {
}
src_configure() {
- local myarch=""
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
- use npm || myconf+=( --without-npm )
+ local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+ use debug && myconf+=( --debug )
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+ use npm || myconf+=( --without-npm )
use snapshot && myconf+=( --with-snapshot )
- use ssl || myconf+=( --without-ssl )
- use debug && myconf+=( --debug )
+ use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+ local myarch=""
case ${ABI} in
amd64) myarch="x64";;
arm) myarch="arm";;