commit: b564bb55ad89ea410dc4d9c397343e1a16d038a3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 10:50:17 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 10:54:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b564bb55
net-libs/nodejs: Versions 6.13.0 9.6.1.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-libs/nodejs/Manifest | 2 ++
...nodejs-99999999.ebuild => nodejs-6.13.0.ebuild} | 41 ++++++++++------------
...{nodejs-99999999.ebuild => nodejs-9.6.1.ebuild} | 24 ++++++-------
net-libs/nodejs/nodejs-99999999.ebuild | 3 +-
4 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index d9ba6f0d9b0..62a5d8b6345 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,7 +2,9 @@ DIST node-v0.12.18.tar.gz 19842591 BLAKE2B
f94f4de6e2875267be194580c645087a262b9
DIST node-v4.8.7.tar.xz 13370828 BLAKE2B
b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab
SHA512
25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
DIST node-v6.11.5.tar.xz 15699404 BLAKE2B
ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94
SHA512
62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
DIST node-v6.12.3.tar.xz 15767900 BLAKE2B
2a986c8099d14b199e33676e1a7d416919407558a42d14e526794baa29d8788c74a5ff47e8d2a8509a747682bea393b45e31965569a4b72976b7691f2a84e971
SHA512
dcf30bc221aa949e6ca3bd9321ac68adb05d93af0b06119b4b73bfd4cfa2c31897520d90247ac0f783946c1fc2efe77178f52225150dad4522ac9408d036a8e4
+DIST node-v6.13.0.tar.xz 15843504 BLAKE2B
0fdbdf4ccd4b0953f786426aef0c7006972de125d9cd53c8d4ab797ceb5ad1ffad8c87cd271866405db372a871322039c8de865d736a16daec0e10c9a0a0305b
SHA512
bcc757adc9ac9fd2d1cc8a575a1fb4b15b1ca893fffa134f5101278d72932c6b7e0cbd491e60fd0833854dfe507823251bd41e34d146a2be8176d46dccc8fb24
DIST node-v6.9.4.tar.xz 15519264 BLAKE2B
4dfad88b06b209272b8468501cc3c87c40425781fb55011ee93326555c2df88a166ffaff1877563668e06389703053849361739556f1bc87c1e2386d48b9542e
SHA512
86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce
DIST node-v8.9.4.tar.xz 18338980 BLAKE2B
81180fc0c9b10cebc051a72649fb40650c89a05d427b826a6f3937e2b108b97edd27dd1c1521e57168e5a92b37e590429735c07c3198e4b912774c305ae61693
SHA512
9656b57145c2b3048ff9ad70f91dbff33a7349dca564efe3b2ff585e2ffad004ea8de920a7a049ff4c5487683986d78b5a578306c2c99f3b1a3de96d9ad1dece
DIST node-v9.4.0.tar.xz 18444244 BLAKE2B
498f7db473a31d127dd6bf86ab0f8a5cfbf6924f65ab15ab18a6137594c044ec3c68847498d0923329f6c9aef84bd3ea228788bd45061db8d8e846c9e76f29f6
SHA512
2c5423f150b69caa0afc9e171cc91a3e7dc2860d1d7aec163bf085f1a087001e1766af34159b505fd9f0f0dad25bc247358939c5b3bca562eb5c8de3edf29a41
DIST node-v9.5.0.tar.xz 18456216 BLAKE2B
8e0f00be0e03af50c8d84ec3f647f8946312f60e78a6a3762d09e918f1467fcb3239a8cb9d8cfab263b96749f307cead8c9e4a383378dca6538e85aea9aad576
SHA512
f2f4d78e7c70ab32357bd35af7afeb59feca8839fb7e652421c4ac4d0c55c1c1c78cf9a2e433f3ed714be45e658c9e04cf465e751eb5a40a67d2b1afdebae4a9
+DIST node-v9.6.1.tar.xz 18501328 BLAKE2B
f107f8cb01c9e4a4ba983798b0d613b8db3c2bf3bc0294d5ff85bd4bf31630f0df4c9b0ab7f8d75ad601633150a45980b8e47c2802016077f25428ab51869d9e
SHA512
488d1a0ed28128e6db63be29ac575cf8899a00bf8972aee1f9d6b1b0224a29a34b3915d2b0106156fbdb82df61985ee998e4861475df1c0504789f51ec4c0711
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild
b/net-libs/nodejs/nodejs-6.13.0.ebuild
similarity index 85%
copy from net-libs/nodejs/nodejs-99999999.ebuild
copy to net-libs/nodejs/nodejs-6.13.0.ebuild
index 153f4bb9a85..d00288db71c 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-6.13.0.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-RESTRICT="test"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils
python-single-r1 toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1
toolchain-funcs
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
HOMEPAGE="https://nodejs.org/";
-EGIT_REPO_URI="https://github.com/nodejs/node";
+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=""
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap
test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
inspector? ( icu ssl )
@@ -25,17 +24,16 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/libuv-1.16.1:=
>=net-libs/http-parser-2.7.0:=
- >=net-libs/nghttp2-1.25.0
sys-libs/zlib
- icu? ( >=dev-libs/icu-60.1:= )
- npm? ( ${PYTHON_DEPS} )
- ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+ icu? ( >=dev-libs/icu-58.2:= )
+ ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
${PYTHON_DEPS}
- systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )"
-
+ test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
PATCHES=(
"${FILESDIR}"/gentoo-global-npm-config.patch
)
@@ -59,7 +57,7 @@ src_prepare() {
# make sure we use python2.* while using gyp
sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp
|| die
- sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/"
deps/npm/node_modules/node-gyp/lib/configure.js || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/"
deps/npm/node_modules/node-gyp/lib/configure.js || die
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -67,13 +65,12 @@ src_prepare() {
# proper libdir, hat tip @ryanpcmcquen
https://github.com/iojs/io.js/issues/504
local LIBDIR=$(get_libdir)
sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js ||
die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
# Avoid writing a depfile, not useful
sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
- sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
# Avoid a test that I've only been able to reproduce from emerge. It
doesnt
# seem sandbox related either (invoking it from a sandbox works fine).
# The issue is that no stdin handle is openened when asked for one.
@@ -91,15 +88,15 @@ src_prepare() {
}
src_configure() {
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2
--shared-zlib )
+ local myarch=""
+ local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
use debug && myconf+=( --debug )
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=(
--with-intl=none )
+ use icu && myconf+=( --with-intl=system-icu )
use inspector || myconf+=( --without-inspector )
use npm || myconf+=( --without-npm )
use snapshot && myconf+=( --with-snapshot )
use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
- local myarch=""
case ${ABI} in
amd64) myarch="x64";;
arm) myarch="arm";;
@@ -116,7 +113,7 @@ src_configure() {
"${PYTHON}" configure \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
- $(use_with systemtap dtrace) \
+ --without-dtrace \
"${myconf[@]}" || die
}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild
b/net-libs/nodejs/nodejs-9.6.1.ebuild
similarity index 93%
copy from net-libs/nodejs/nodejs-99999999.ebuild
copy to net-libs/nodejs/nodejs-9.6.1.ebuild
index 153f4bb9a85..54abeab28bd 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-9.6.1.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-RESTRICT="test"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils
python-single-r1 toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1
toolchain-funcs
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
HOMEPAGE="https://nodejs.org/";
-EGIT_REPO_URI="https://github.com/nodejs/node";
+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=""
+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"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -23,19 +22,20 @@ REQUIRED_USE="
"
RDEPEND="
- >=dev-libs/libuv-1.16.1:=
+ >=dev-libs/libuv-1.18.0:=
>=net-libs/http-parser-2.7.0:=
- >=net-libs/nghttp2-1.25.0
+ >=net-libs/nghttp2-1.29.0
sys-libs/zlib
icu? ( >=dev-libs/icu-60.1:= )
- npm? ( ${PYTHON_DEPS} )
- ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+ ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
${PYTHON_DEPS}
systemtap? ( dev-util/systemtap )
- test? ( net-misc/curl )"
-
+ test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
PATCHES=(
"${FILESDIR}"/gentoo-global-npm-config.patch
)
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild
b/net-libs/nodejs/nodejs-99999999.ebuild
index 153f4bb9a85..62953844e68 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-RESTRICT="test"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
