1 |
commit: b564bb55ad89ea410dc4d9c397343e1a16d038a3 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 24 10:50:17 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 24 10:54:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b564bb55 |
7 |
|
8 |
net-libs/nodejs: Versions 6.13.0 9.6.1. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
net-libs/nodejs/Manifest | 2 ++ |
13 |
...nodejs-99999999.ebuild => nodejs-6.13.0.ebuild} | 41 ++++++++++------------ |
14 |
...{nodejs-99999999.ebuild => nodejs-9.6.1.ebuild} | 24 ++++++------- |
15 |
net-libs/nodejs/nodejs-99999999.ebuild | 3 +- |
16 |
4 files changed, 34 insertions(+), 36 deletions(-) |
17 |
|
18 |
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest |
19 |
index d9ba6f0d9b0..62a5d8b6345 100644 |
20 |
--- a/net-libs/nodejs/Manifest |
21 |
+++ b/net-libs/nodejs/Manifest |
22 |
@@ -2,7 +2,9 @@ DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b9 |
23 |
DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696 |
24 |
DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 |
25 |
DIST node-v6.12.3.tar.xz 15767900 BLAKE2B 2a986c8099d14b199e33676e1a7d416919407558a42d14e526794baa29d8788c74a5ff47e8d2a8509a747682bea393b45e31965569a4b72976b7691f2a84e971 SHA512 dcf30bc221aa949e6ca3bd9321ac68adb05d93af0b06119b4b73bfd4cfa2c31897520d90247ac0f783946c1fc2efe77178f52225150dad4522ac9408d036a8e4 |
26 |
+DIST node-v6.13.0.tar.xz 15843504 BLAKE2B 0fdbdf4ccd4b0953f786426aef0c7006972de125d9cd53c8d4ab797ceb5ad1ffad8c87cd271866405db372a871322039c8de865d736a16daec0e10c9a0a0305b SHA512 bcc757adc9ac9fd2d1cc8a575a1fb4b15b1ca893fffa134f5101278d72932c6b7e0cbd491e60fd0833854dfe507823251bd41e34d146a2be8176d46dccc8fb24 |
27 |
DIST node-v6.9.4.tar.xz 15519264 BLAKE2B 4dfad88b06b209272b8468501cc3c87c40425781fb55011ee93326555c2df88a166ffaff1877563668e06389703053849361739556f1bc87c1e2386d48b9542e SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce |
28 |
DIST node-v8.9.4.tar.xz 18338980 BLAKE2B 81180fc0c9b10cebc051a72649fb40650c89a05d427b826a6f3937e2b108b97edd27dd1c1521e57168e5a92b37e590429735c07c3198e4b912774c305ae61693 SHA512 9656b57145c2b3048ff9ad70f91dbff33a7349dca564efe3b2ff585e2ffad004ea8de920a7a049ff4c5487683986d78b5a578306c2c99f3b1a3de96d9ad1dece |
29 |
DIST node-v9.4.0.tar.xz 18444244 BLAKE2B 498f7db473a31d127dd6bf86ab0f8a5cfbf6924f65ab15ab18a6137594c044ec3c68847498d0923329f6c9aef84bd3ea228788bd45061db8d8e846c9e76f29f6 SHA512 2c5423f150b69caa0afc9e171cc91a3e7dc2860d1d7aec163bf085f1a087001e1766af34159b505fd9f0f0dad25bc247358939c5b3bca562eb5c8de3edf29a41 |
30 |
DIST node-v9.5.0.tar.xz 18456216 BLAKE2B 8e0f00be0e03af50c8d84ec3f647f8946312f60e78a6a3762d09e918f1467fcb3239a8cb9d8cfab263b96749f307cead8c9e4a383378dca6538e85aea9aad576 SHA512 f2f4d78e7c70ab32357bd35af7afeb59feca8839fb7e652421c4ac4d0c55c1c1c78cf9a2e433f3ed714be45e658c9e04cf465e751eb5a40a67d2b1afdebae4a9 |
31 |
+DIST node-v9.6.1.tar.xz 18501328 BLAKE2B f107f8cb01c9e4a4ba983798b0d613b8db3c2bf3bc0294d5ff85bd4bf31630f0df4c9b0ab7f8d75ad601633150a45980b8e47c2802016077f25428ab51869d9e SHA512 488d1a0ed28128e6db63be29ac575cf8899a00bf8972aee1f9d6b1b0224a29a34b3915d2b0106156fbdb82df61985ee998e4861475df1c0504789f51ec4c0711 |
32 |
|
33 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-6.13.0.ebuild |
34 |
similarity index 85% |
35 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
36 |
copy to net-libs/nodejs/nodejs-6.13.0.ebuild |
37 |
index 153f4bb9a85..d00288db71c 100644 |
38 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
39 |
+++ b/net-libs/nodejs/nodejs-6.13.0.ebuild |
40 |
@@ -1,22 +1,21 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
+# Copyright 1999-2018 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
EAPI=6 |
46 |
-RESTRICT="test" |
47 |
|
48 |
PYTHON_COMPAT=( python2_7 ) |
49 |
PYTHON_REQ_USE="threads" |
50 |
|
51 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
52 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
53 |
|
54 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
55 |
HOMEPAGE="https://nodejs.org/" |
56 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
57 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
58 |
|
59 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
60 |
SLOT="0" |
61 |
-KEYWORDS="" |
62 |
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
63 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
64 |
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" |
65 |
REQUIRED_USE=" |
66 |
${PYTHON_REQUIRED_USE} |
67 |
inspector? ( icu ssl ) |
68 |
@@ -25,17 +24,16 @@ REQUIRED_USE=" |
69 |
RDEPEND=" |
70 |
>=dev-libs/libuv-1.16.1:= |
71 |
>=net-libs/http-parser-2.7.0:= |
72 |
- >=net-libs/nghttp2-1.25.0 |
73 |
sys-libs/zlib |
74 |
- icu? ( >=dev-libs/icu-60.1:= ) |
75 |
- npm? ( ${PYTHON_DEPS} ) |
76 |
- ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) |
77 |
+ icu? ( >=dev-libs/icu-58.2:= ) |
78 |
+ ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) |
79 |
" |
80 |
-DEPEND="${RDEPEND} |
81 |
+DEPEND=" |
82 |
+ ${RDEPEND} |
83 |
${PYTHON_DEPS} |
84 |
- systemtap? ( dev-util/systemtap ) |
85 |
- test? ( net-misc/curl )" |
86 |
- |
87 |
+ test? ( net-misc/curl ) |
88 |
+" |
89 |
+S="${WORKDIR}/node-v${PV}" |
90 |
PATCHES=( |
91 |
"${FILESDIR}"/gentoo-global-npm-config.patch |
92 |
) |
93 |
@@ -59,7 +57,7 @@ src_prepare() { |
94 |
|
95 |
# make sure we use python2.* while using gyp |
96 |
sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
97 |
- sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
98 |
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
99 |
|
100 |
# less verbose install output (stating the same as portage, basically) |
101 |
sed -i -e "/print/d" tools/install.py || die |
102 |
@@ -67,13 +65,12 @@ src_prepare() { |
103 |
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
104 |
local LIBDIR=$(get_libdir) |
105 |
sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
106 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die |
107 |
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
108 |
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
109 |
|
110 |
# Avoid writing a depfile, not useful |
111 |
sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die |
112 |
|
113 |
- sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die |
114 |
- |
115 |
# Avoid a test that I've only been able to reproduce from emerge. It doesnt |
116 |
# seem sandbox related either (invoking it from a sandbox works fine). |
117 |
# The issue is that no stdin handle is openened when asked for one. |
118 |
@@ -91,15 +88,15 @@ src_prepare() { |
119 |
} |
120 |
|
121 |
src_configure() { |
122 |
- local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) |
123 |
+ local myarch="" |
124 |
+ local myconf=( --shared-libuv --shared-http-parser --shared-zlib ) |
125 |
use debug && myconf+=( --debug ) |
126 |
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |
127 |
+ use icu && myconf+=( --with-intl=system-icu ) |
128 |
use inspector || myconf+=( --without-inspector ) |
129 |
use npm || myconf+=( --without-npm ) |
130 |
use snapshot && myconf+=( --with-snapshot ) |
131 |
use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) |
132 |
|
133 |
- local myarch="" |
134 |
case ${ABI} in |
135 |
amd64) myarch="x64";; |
136 |
arm) myarch="arm";; |
137 |
@@ -116,7 +113,7 @@ src_configure() { |
138 |
"${PYTHON}" configure \ |
139 |
--prefix="${EPREFIX}"/usr \ |
140 |
--dest-cpu=${myarch} \ |
141 |
- $(use_with systemtap dtrace) \ |
142 |
+ --without-dtrace \ |
143 |
"${myconf[@]}" || die |
144 |
} |
145 |
|
146 |
|
147 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-9.6.1.ebuild |
148 |
similarity index 93% |
149 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
150 |
copy to net-libs/nodejs/nodejs-9.6.1.ebuild |
151 |
index 153f4bb9a85..54abeab28bd 100644 |
152 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
153 |
+++ b/net-libs/nodejs/nodejs-9.6.1.ebuild |
154 |
@@ -1,21 +1,20 @@ |
155 |
-# Copyright 1999-2017 Gentoo Foundation |
156 |
+# Copyright 1999-2018 Gentoo Foundation |
157 |
# Distributed under the terms of the GNU General Public License v2 |
158 |
|
159 |
EAPI=6 |
160 |
-RESTRICT="test" |
161 |
|
162 |
PYTHON_COMPAT=( python2_7 ) |
163 |
PYTHON_REQ_USE="threads" |
164 |
|
165 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
166 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
167 |
|
168 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
169 |
HOMEPAGE="https://nodejs.org/" |
170 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
171 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
172 |
|
173 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
174 |
SLOT="0" |
175 |
-KEYWORDS="" |
176 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
177 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
178 |
REQUIRED_USE=" |
179 |
${PYTHON_REQUIRED_USE} |
180 |
@@ -23,19 +22,20 @@ REQUIRED_USE=" |
181 |
" |
182 |
|
183 |
RDEPEND=" |
184 |
- >=dev-libs/libuv-1.16.1:= |
185 |
+ >=dev-libs/libuv-1.18.0:= |
186 |
>=net-libs/http-parser-2.7.0:= |
187 |
- >=net-libs/nghttp2-1.25.0 |
188 |
+ >=net-libs/nghttp2-1.29.0 |
189 |
sys-libs/zlib |
190 |
icu? ( >=dev-libs/icu-60.1:= ) |
191 |
- npm? ( ${PYTHON_DEPS} ) |
192 |
- ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) |
193 |
+ ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) |
194 |
" |
195 |
-DEPEND="${RDEPEND} |
196 |
+DEPEND=" |
197 |
+ ${RDEPEND} |
198 |
${PYTHON_DEPS} |
199 |
systemtap? ( dev-util/systemtap ) |
200 |
- test? ( net-misc/curl )" |
201 |
- |
202 |
+ test? ( net-misc/curl ) |
203 |
+" |
204 |
+S="${WORKDIR}/node-v${PV}" |
205 |
PATCHES=( |
206 |
"${FILESDIR}"/gentoo-global-npm-config.patch |
207 |
) |
208 |
|
209 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild |
210 |
index 153f4bb9a85..62953844e68 100644 |
211 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
212 |
+++ b/net-libs/nodejs/nodejs-99999999.ebuild |
213 |
@@ -1,8 +1,7 @@ |
214 |
-# Copyright 1999-2017 Gentoo Foundation |
215 |
+# Copyright 1999-2018 Gentoo Foundation |
216 |
# Distributed under the terms of the GNU General Public License v2 |
217 |
|
218 |
EAPI=6 |
219 |
-RESTRICT="test" |
220 |
|
221 |
PYTHON_COMPAT=( python2_7 ) |
222 |
PYTHON_REQ_USE="threads" |