| 1 |
commit: 68a9362fd26f69996823c36ead90fe053537f1fe |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 21 18:39:24 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 21 18:39:46 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a9362f |
| 7 |
|
| 8 |
net-libs/nodejs: Fix USE=-ssl (bug #615448 by Toralf Förster). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-libs/nodejs/nodejs-8.9.1.ebuild | 22 ++++++++++++---------- |
| 13 |
net-libs/nodejs/nodejs-9.2.0.ebuild | 22 ++++++++++++---------- |
| 14 |
2 files changed, 24 insertions(+), 20 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/nodejs/nodejs-8.9.1.ebuild b/net-libs/nodejs/nodejs-8.9.1.ebuild |
| 17 |
index 38c6428ce06..9cc359cb23f 100644 |
| 18 |
--- a/net-libs/nodejs/nodejs-8.9.1.ebuild |
| 19 |
+++ b/net-libs/nodejs/nodejs-8.9.1.ebuild |
| 20 |
@@ -18,13 +18,15 @@ SLOT="0" |
| 21 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
| 22 |
IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test" |
| 23 |
|
| 24 |
-RDEPEND="icu? ( >=dev-libs/icu-56:= ) |
| 25 |
- npm? ( ${PYTHON_DEPS} ) |
| 26 |
- >=net-libs/http-parser-2.7.0:= |
| 27 |
+RDEPEND=" |
| 28 |
>=dev-libs/libuv-1.15.0:= |
| 29 |
+ >=net-libs/http-parser-2.7.0:= |
| 30 |
>=net-libs/nghttp2-1.25.0 |
| 31 |
- >=dev-libs/openssl-1.0.2g:0=[-bindist] |
| 32 |
- sys-libs/zlib" |
| 33 |
+ sys-libs/zlib |
| 34 |
+ icu? ( >=dev-libs/icu-56:= ) |
| 35 |
+ npm? ( ${PYTHON_DEPS} ) |
| 36 |
+ ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) |
| 37 |
+" |
| 38 |
DEPEND="${RDEPEND} |
| 39 |
${PYTHON_DEPS} |
| 40 |
systemtap? ( dev-util/systemtap ) |
| 41 |
@@ -89,14 +91,14 @@ src_prepare() { |
| 42 |
} |
| 43 |
|
| 44 |
src_configure() { |
| 45 |
- local myarch="" |
| 46 |
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib ) |
| 47 |
- use npm || myconf+=( --without-npm ) |
| 48 |
+ local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) |
| 49 |
+ use debug && myconf+=( --debug ) |
| 50 |
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |
| 51 |
+ use npm || myconf+=( --without-npm ) |
| 52 |
use snapshot && myconf+=( --with-snapshot ) |
| 53 |
- use ssl || myconf+=( --without-ssl ) |
| 54 |
- use debug && myconf+=( --debug ) |
| 55 |
+ use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) |
| 56 |
|
| 57 |
+ local myarch="" |
| 58 |
case ${ABI} in |
| 59 |
amd64) myarch="x64";; |
| 60 |
arm) myarch="arm";; |
| 61 |
|
| 62 |
diff --git a/net-libs/nodejs/nodejs-9.2.0.ebuild b/net-libs/nodejs/nodejs-9.2.0.ebuild |
| 63 |
index aaab3c90a4b..d430a7b0cef 100644 |
| 64 |
--- a/net-libs/nodejs/nodejs-9.2.0.ebuild |
| 65 |
+++ b/net-libs/nodejs/nodejs-9.2.0.ebuild |
| 66 |
@@ -18,13 +18,15 @@ SLOT="0" |
| 67 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
| 68 |
IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test" |
| 69 |
|
| 70 |
-RDEPEND="icu? ( >=dev-libs/icu-59:= ) |
| 71 |
- npm? ( ${PYTHON_DEPS} ) |
| 72 |
- >=net-libs/http-parser-2.7.0:= |
| 73 |
+RDEPEND=" |
| 74 |
>=dev-libs/libuv-1.16.1:= |
| 75 |
+ >=net-libs/http-parser-2.7.0:= |
| 76 |
>=net-libs/nghttp2-1.25.0 |
| 77 |
- >=dev-libs/openssl-1.0.2g:0=[-bindist] |
| 78 |
- sys-libs/zlib" |
| 79 |
+ sys-libs/zlib |
| 80 |
+ icu? ( >=dev-libs/icu-59:= ) |
| 81 |
+ npm? ( ${PYTHON_DEPS} ) |
| 82 |
+ ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) |
| 83 |
+" |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
${PYTHON_DEPS} |
| 86 |
systemtap? ( dev-util/systemtap ) |
| 87 |
@@ -89,14 +91,14 @@ src_prepare() { |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
- local myarch="" |
| 92 |
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib ) |
| 93 |
- use npm || myconf+=( --without-npm ) |
| 94 |
+ local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) |
| 95 |
+ use debug && myconf+=( --debug ) |
| 96 |
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |
| 97 |
+ use npm || myconf+=( --without-npm ) |
| 98 |
use snapshot && myconf+=( --with-snapshot ) |
| 99 |
- use ssl || myconf+=( --without-ssl ) |
| 100 |
- use debug && myconf+=( --debug ) |
| 101 |
+ use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) |
| 102 |
|
| 103 |
+ local myarch="" |
| 104 |
case ${ABI} in |
| 105 |
amd64) myarch="x64";; |
| 106 |
arm) myarch="arm";; |
Archives