1 |
commit: 3e7c8207ba4c7fe17cbe834faa279b411367626a |
2 |
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 29 09:00:15 2016 +0000 |
4 |
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 29 09:00:31 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c8207 |
7 |
|
8 |
net-libs/nodejs: Bump, remove old |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
net-libs/nodejs/Manifest | 9 +- |
13 |
net-libs/nodejs/nodejs-4.2.2.ebuild | 155 ---------------- |
14 |
.../{nodejs-4.1.1.ebuild => nodejs-4.4.1.ebuild} | 44 ++--- |
15 |
net-libs/nodejs/nodejs-5.0.0.ebuild | 155 ---------------- |
16 |
net-libs/nodejs/nodejs-5.3.0.ebuild | 155 ---------------- |
17 |
net-libs/nodejs/nodejs-5.4.1.ebuild | 155 ---------------- |
18 |
net-libs/nodejs/nodejs-5.7.1.ebuild | 195 --------------------- |
19 |
...{nodejs-5.6.0-r1.ebuild => nodejs-5.9.1.ebuild} | 5 +- |
20 |
8 files changed, 22 insertions(+), 851 deletions(-) |
21 |
|
22 |
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest |
23 |
index 0b47e63..0dbe90e 100644 |
24 |
--- a/net-libs/nodejs/Manifest |
25 |
+++ b/net-libs/nodejs/Manifest |
26 |
@@ -1,13 +1,8 @@ |
27 |
DIST node-v0.12.10.tar.gz 19572955 SHA256 edbd3710512ec7518a3de4cabf9bfee6d12f278eef2e4b53422c7b063f6b976d SHA512 d217f52dfedb5355df89b9c726f6bc68e53a713e6e005a66beefdbd20666b55770bab2eca6f39275aa1a64aca922a2a78808900ebaa4005eb21042a915413a7b WHIRLPOOL 4fe3e370cc645672590483e4b388a37a82fb04dfbbcf16a7a9cc2c1a47600e650ae5712133b205c3067180305a61e76fde9a7b78ad53d25f8f07b97e86271751 |
28 |
DIST node-v0.12.6.tar.gz 19750717 SHA256 7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f WHIRLPOOL 3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380 |
29 |
DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525 |
30 |
-DIST node-v4.1.1.tar.xz 12818088 SHA256 f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680 WHIRLPOOL e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629 |
31 |
-DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb WHIRLPOOL 2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167 |
32 |
DIST node-v4.4.0.tar.xz 13107524 SHA256 6ae44ae9a9cd1f102ca7f3ea09ca6223afe88fab4911f1bf21c9da2a1e795f1d SHA512 4bb1f660c5a80fffb3399c4465c311bd13c2f78e65fc9aaa7df96d3c2db5d3b3de3b4be9f50040065fa1889ad247a2949a84a6d9044301a636ebb8baf73edd4d WHIRLPOOL 50b126fc3a7b8b6be693334375b4704217b4e6f00e7e32404a17ebad512e3cc72434f00863a1e69bb85e01859054faac7bb5c2d25889b8ef131191a388528e0c |
33 |
-DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923 |
34 |
-DIST node-v5.3.0.tar.xz 12776504 SHA256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e SHA512 f65773c35ce774bc6fe242f8627e5786f441f0286f7d272e854e2e2d6b927d5f368c366ff52dd780f7817fedf3935ec25e78ed3f81d4613495663eb81e2afbb1 WHIRLPOOL 5f270ed6fe35dba091bd75e6ad9de419c781fc6f919915a4117b8c0bbb2ea11a05369a9149e4f69614de508ff109eb94b24bdafc0832e91e055f01b0ef214c67 |
35 |
-DIST node-v5.4.1.tar.xz 12812444 SHA256 4e7d3fdfeac85c46ddaef0224695620f218e7a178e97d6e210d6d643483f1d53 SHA512 9803478d502bf11bfc77e56109568b0f64186826be35a9b36b47b63ec744595db128955e6f7bec7eb4db39e85afdd364b1215427954ce33ab67689ff03a5bc57 WHIRLPOOL 87f791f4f0722a2d3bcb630d22548f395ac0e86dedc37849caab2d63bc43bad2621058f95eb2b31b1f3b01ec8585c0731c969a1f0167d95495008b44f3b69066 |
36 |
-DIST node-v5.6.0.tar.xz 13311288 SHA256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 SHA512 ef38d9ce708b8283b7f7441a0c2787e64c0602fb50542b4ccd29e705f879626adf2c1d89a9040af55b1f00b6e45d1d87ca829bf6816768933af9b5661f654aa7 WHIRLPOOL 6b5dcd85a74b47554400a6ff62e4001bb04b9063987571ac4434116d807d04ee58a0ca622973ff4b81c064e4ec1b0cd2f881680eb7f1ced5aeda745bf48538ab |
37 |
-DIST node-v5.7.1.tar.xz 13191096 SHA256 029ed8aeb997c68d1a901cd837af02d24b6b5e20a4ff93bed090fd289f91a9a1 SHA512 11b38722f1bb4c8310d66304541b6a644c453b770d562c0f172391b1234a304493ed39ddbd6790f0f98d3fa72a0be2ac0ae292d67604178a108217276530a463 WHIRLPOOL 6a7ea4bbfb0418912b4505a09a926b3a518368142e77bbddf78e325d719180254c6157ef46851eee61469749e1eb9dbd671960544b9cb0f8264f8c13d3542a1c |
38 |
+DIST node-v4.4.1.tar.xz 13112424 SHA256 3a37c89a3ac965688f9e6557579993b73eee44195a5fd53fded03a667d3d6a0a SHA512 53b479085a6f43b5932c75729b21a3efa67534ce6c10445c2ba66492a0e3f12d8e5de8d75bd583239b68f3d5ac1b639d45fd43d631d8a5ef013e25bff0fdab22 WHIRLPOOL d9cee2193a0f94f17ab84722ffb9999f156014cbe0b83bd138d5404ec543a3398bb4d1b965940b19230cf069337dfb5e0159aae3e694137e09261133ae2e2fdd |
39 |
DIST node-v5.8.0.tar.xz 13214028 SHA256 c1246d473d6650ca02ab168eaf840e9edda82a4190ff08165fc44a7b381a9361 SHA512 ab23b90714be2efc937da2fe11457f266e4bb392da9856e548012d1812546ecebf4b49546d82c595b15d4c78835df612681a2bbd62dd925e1db204a19b6a09ce WHIRLPOOL 5f6dfdaf1e87ae79f92c9b075dec03287b896b05a4bc1c477404f571f25672ca8512a5cb88e602923135e2fd0ee27aea12bcb1349a6a5f2ac52b8855512f44b2 |
40 |
DIST node-v5.9.0.tar.xz 13223372 SHA256 9bdf2f8e44a721df459dfad0072a8ac46f11c05d25fc33dc0dc9c522827e34bb SHA512 d0ec18fbb497d91d1520362af4a882357e1d6b33c3ae0e6cbb9697e1d1f4504361f8d6aeeada6a959b2bb190a81b5f118a66c768421344dcb6aebda512a24fa7 WHIRLPOOL 0f895fcc9e2fb82d203e80cf3166f9f524fb4e82ae2d5b1706a5dfe0db08588b474a32294c7865198cde116f228e60a6dfd3f1a965549792c884db7b44fca690 |
41 |
+DIST node-v5.9.1.tar.xz 13226192 SHA256 668067077dfceb3d2039d0df693fec6aa20b920d01a42b53dc61d4aa91e0ae55 SHA512 34774d88eda775bdf153a76bd02b26c499e4a9ef47d8e94ad7b66d360d04891b45ce8f211833ca69e8c0a786ca36424b0c620a90b1fbc6d5afc77d20f4b5fadb WHIRLPOOL d666aa6fd4d577f7a6f89c3bfa75e62a0281e0dd7592373f384bfe01fa2dcbf81156bf6a21fc2097d48d5024a39057713c2593f4609c70ff8f84090471b073a9 |
42 |
|
43 |
diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild b/net-libs/nodejs/nodejs-4.2.2.ebuild |
44 |
deleted file mode 100644 |
45 |
index 73c1cdb..0000000 |
46 |
--- a/net-libs/nodejs/nodejs-4.2.2.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,155 +0,0 @@ |
49 |
-# Copyright 1999-2016 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
-# $Id$ |
52 |
- |
53 |
-EAPI=5 |
54 |
- |
55 |
-PYTHON_COMPAT=( python2_7 ) |
56 |
- |
57 |
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
58 |
- |
59 |
-DESCRIPTION="Evented IO for V8 Javascript" |
60 |
-HOMEPAGE="http://nodejs.org/" |
61 |
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
62 |
- |
63 |
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
64 |
-SLOT="0" |
65 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
66 |
-IUSE="debug icu +npm snapshot +ssl" |
67 |
- |
68 |
-RDEPEND="icu? ( >=dev-libs/icu-55:= ) |
69 |
- ${PYTHON_DEPS} |
70 |
- >=net-libs/http-parser-2.5:= |
71 |
- >=dev-libs/libuv-1.6.1:= |
72 |
- >=dev-libs/openssl-1.0.2d:0=[-bindist] |
73 |
- sys-libs/zlib |
74 |
-" |
75 |
-DEPEND="${RDEPEND}" |
76 |
- |
77 |
-S="${WORKDIR}/node-v${PV}" |
78 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
79 |
- |
80 |
-pkg_pretend() { |
81 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
82 |
- if ! test-flag-CXX -std=c++11 ; then |
83 |
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
84 |
- fi |
85 |
- fi |
86 |
-} |
87 |
- |
88 |
-src_prepare() { |
89 |
- tc-export CC CXX PKG_CONFIG |
90 |
- export V=1 # Verbose build |
91 |
- export BUILDTYPE=Release |
92 |
- |
93 |
- # fix compilation on Darwin |
94 |
- # https://code.google.com/p/gyp/issues/detail?id=260 |
95 |
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
96 |
- |
97 |
- # make sure we use python2.* while using gyp |
98 |
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
99 |
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
100 |
- |
101 |
- # less verbose install output (stating the same as portage, basically) |
102 |
- sed -i -e "/print/d" tools/install.py || die |
103 |
- |
104 |
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
105 |
- local LIBDIR=$(get_libdir) |
106 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || 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 a test that I've only been able to reproduce from emerge. It doesnt |
111 |
- # seem sandbox related either (invoking it from a sandbox works fine). |
112 |
- # The issue is that no stdin handle is openened when asked for one. |
113 |
- # It doesn't really belong upstream , so it'll just be removed until someone |
114 |
- # with more gentoo-knowledge than me (jbergstroem) figures it out. |
115 |
- rm test/parallel/test-stdout-close-unref.js || die |
116 |
- # AssertionError: 1 == 2 (on line 97) |
117 |
- rm test/parallel/test-cluster-disconnect.js || die |
118 |
- # AssertionError: Client never errored |
119 |
- rm test/parallel/test-tls-hello-parser-failure.js || die |
120 |
- # --- TIMEOUT --- |
121 |
- rm test/parallel/test-child-process-fork-net.js \ |
122 |
- test/parallel/test-child-process-fork-net2.js \ |
123 |
- test/parallel/test-child-process-recv-handle.js \ |
124 |
- test/parallel/test-cluster-dgram-1.js \ |
125 |
- test/parallel/test-cluster-send-deadlock.js \ |
126 |
- test/parallel/test-cluster-shared-handle-bind-error.js \ |
127 |
- test/parallel/test-dgram-exclusive-implicit-bind.js \ |
128 |
- test/parallel/test-tls-ticket-cluster.js || die |
129 |
- |
130 |
- # debug builds. change install path, remove optimisations and override buildtype |
131 |
- if use debug; then |
132 |
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die |
133 |
- BUILDTYPE=Debug |
134 |
- fi |
135 |
- |
136 |
- epatch_user |
137 |
-} |
138 |
- |
139 |
-src_configure() { |
140 |
- local myarch="" |
141 |
- local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) |
142 |
- use npm || myconf+=( --without-npm ) |
143 |
- use icu && myconf+=( --with-intl=system-icu ) |
144 |
- use snapshot && myconf+=( --with-snapshot ) |
145 |
- use ssl || myconf+=( --without-ssl ) |
146 |
- use debug && myconf+=( --debug ) |
147 |
- |
148 |
- case ${ABI} in |
149 |
- x86) myarch="ia32";; |
150 |
- amd64) myarch="x64";; |
151 |
- x32) myarch="x32";; |
152 |
- arm) myarch="arm";; |
153 |
- arm64) myarch="arm64";; |
154 |
- *) die "Unrecognized ARCH ${ARCH}";; |
155 |
- esac |
156 |
- |
157 |
- GYP_DEFINES="linux_use_gold_flags=0 |
158 |
- linux_use_bundled_binutils=0 |
159 |
- linux_use_bundled_gold=0" \ |
160 |
- "${PYTHON}" configure \ |
161 |
- --prefix="${EPREFIX}"/usr \ |
162 |
- --dest-cpu=${myarch} \ |
163 |
- --without-dtrace \ |
164 |
- "${myconf[@]}" || die |
165 |
-} |
166 |
- |
167 |
-src_compile() { |
168 |
- emake -C out mksnapshot |
169 |
- pax-mark m "out/${BUILDTYPE}/mksnapshot" |
170 |
- emake -C out |
171 |
-} |
172 |
- |
173 |
-src_install() { |
174 |
- local LIBDIR="${ED}/usr/$(get_libdir)" |
175 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
176 |
- if use npm; then |
177 |
- dodoc -r "${LIBDIR}"/node_modules/npm/html |
178 |
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die |
179 |
- find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die |
180 |
- fi |
181 |
- |
182 |
- # set up a symlink structure that npm expects.. |
183 |
- dodir /usr/include/node/deps/{v8,uv} |
184 |
- dosym . /usr/include/node/src |
185 |
- for var in deps/{uv,v8}/include; do |
186 |
- dosym ../.. /usr/include/node/${var} |
187 |
- done |
188 |
- |
189 |
- pax-mark -m "${ED}"/usr/bin/node |
190 |
-} |
191 |
- |
192 |
-src_test() { |
193 |
- out/${BUILDTYPE}/cctest || die |
194 |
- declare -xl TESTTYPE="${BUILDTYPE}" |
195 |
- "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die |
196 |
-} |
197 |
- |
198 |
-pkg_postinst() { |
199 |
- einfo "When using node-gyp to install native modules, you can avoid" |
200 |
- einfo "having to download the full tarball by doing the following:" |
201 |
- einfo "" |
202 |
- einfo "node-gyp --nodedir /usr/include/node <command>" |
203 |
-} |
204 |
|
205 |
diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.4.1.ebuild |
206 |
similarity index 76% |
207 |
rename from net-libs/nodejs/nodejs-4.1.1.ebuild |
208 |
rename to net-libs/nodejs/nodejs-4.4.1.ebuild |
209 |
index ed3202b..5512f91 100644 |
210 |
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild |
211 |
+++ b/net-libs/nodejs/nodejs-4.4.1.ebuild |
212 |
@@ -5,32 +5,38 @@ |
213 |
EAPI=5 |
214 |
|
215 |
PYTHON_COMPAT=( python2_7 ) |
216 |
+PYTHON_REQ_USE="threads" |
217 |
|
218 |
inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
219 |
|
220 |
-DESCRIPTION="Evented IO for V8 Javascript" |
221 |
-HOMEPAGE="http://nodejs.org/" |
222 |
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
223 |
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
224 |
+HOMEPAGE="https://nodejs.org/" |
225 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
226 |
|
227 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
228 |
SLOT="0" |
229 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
230 |
-IUSE="debug icu +npm snapshot +ssl" |
231 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" |
232 |
+IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test" |
233 |
|
234 |
RDEPEND="icu? ( >=dev-libs/icu-55:= ) |
235 |
+ npm? ( ${PYTHON_DEPS} ) |
236 |
+ >=net-libs/http-parser-2.5.2:= |
237 |
+ >=dev-libs/libuv-1.8.0:= |
238 |
+ >=dev-libs/openssl-1.0.2g:0=[-bindist] |
239 |
+ sys-libs/zlib" |
240 |
+DEPEND="${RDEPEND} |
241 |
${PYTHON_DEPS} |
242 |
- >=net-libs/http-parser-2.5:= |
243 |
- >=dev-libs/libuv-1.6.1:= |
244 |
- >=dev-libs/openssl-1.0.2d:=[-bindist]" |
245 |
-DEPEND="${RDEPEND}" |
246 |
+ test? ( net-misc/curl )" |
247 |
|
248 |
S="${WORKDIR}/node-v${PV}" |
249 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
250 |
|
251 |
pkg_pretend() { |
252 |
- if ! test-flag-CXX -std=c++11 ; then |
253 |
+ (use x86 && ! use cpu_flags_x86_sse2) && \ |
254 |
+ die "Your CPU doesn't support the required SSE2 instruction." |
255 |
+ |
256 |
+ ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ |
257 |
die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
258 |
- fi |
259 |
} |
260 |
|
261 |
src_prepare() { |
262 |
@@ -61,19 +67,6 @@ src_prepare() { |
263 |
# It doesn't really belong upstream , so it'll just be removed until someone |
264 |
# with more gentoo-knowledge than me (jbergstroem) figures it out. |
265 |
rm test/parallel/test-stdout-close-unref.js || die |
266 |
- # AssertionError: 1 == 2 (on line 97) |
267 |
- rm test/parallel/test-cluster-disconnect.js || die |
268 |
- # AssertionError: Client never errored |
269 |
- rm test/parallel/test-tls-hello-parser-failure.js || die |
270 |
- # --- TIMEOUT --- |
271 |
- rm test/parallel/test-child-process-fork-net.js \ |
272 |
- test/parallel/test-child-process-fork-net2.js \ |
273 |
- test/parallel/test-child-process-recv-handle.js \ |
274 |
- test/parallel/test-cluster-dgram-1.js \ |
275 |
- test/parallel/test-cluster-send-deadlock.js \ |
276 |
- test/parallel/test-cluster-shared-handle-bind-error.js \ |
277 |
- test/parallel/test-dgram-exclusive-implicit-bind.js \ |
278 |
- test/parallel/test-tls-ticket-cluster.js || die |
279 |
|
280 |
# debug builds. change install path, remove optimisations and override buildtype |
281 |
if use debug; then |
282 |
@@ -139,8 +132,7 @@ src_install() { |
283 |
|
284 |
src_test() { |
285 |
out/${BUILDTYPE}/cctest || die |
286 |
- declare -xl TESTTYPE="${BUILDTYPE}" |
287 |
- "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die |
288 |
+ "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die |
289 |
} |
290 |
|
291 |
pkg_postinst() { |
292 |
|
293 |
diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild b/net-libs/nodejs/nodejs-5.0.0.ebuild |
294 |
deleted file mode 100644 |
295 |
index 73c1cdb..0000000 |
296 |
--- a/net-libs/nodejs/nodejs-5.0.0.ebuild |
297 |
+++ /dev/null |
298 |
@@ -1,155 +0,0 @@ |
299 |
-# Copyright 1999-2016 Gentoo Foundation |
300 |
-# Distributed under the terms of the GNU General Public License v2 |
301 |
-# $Id$ |
302 |
- |
303 |
-EAPI=5 |
304 |
- |
305 |
-PYTHON_COMPAT=( python2_7 ) |
306 |
- |
307 |
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
308 |
- |
309 |
-DESCRIPTION="Evented IO for V8 Javascript" |
310 |
-HOMEPAGE="http://nodejs.org/" |
311 |
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
312 |
- |
313 |
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
314 |
-SLOT="0" |
315 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
316 |
-IUSE="debug icu +npm snapshot +ssl" |
317 |
- |
318 |
-RDEPEND="icu? ( >=dev-libs/icu-55:= ) |
319 |
- ${PYTHON_DEPS} |
320 |
- >=net-libs/http-parser-2.5:= |
321 |
- >=dev-libs/libuv-1.6.1:= |
322 |
- >=dev-libs/openssl-1.0.2d:0=[-bindist] |
323 |
- sys-libs/zlib |
324 |
-" |
325 |
-DEPEND="${RDEPEND}" |
326 |
- |
327 |
-S="${WORKDIR}/node-v${PV}" |
328 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
329 |
- |
330 |
-pkg_pretend() { |
331 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
332 |
- if ! test-flag-CXX -std=c++11 ; then |
333 |
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
334 |
- fi |
335 |
- fi |
336 |
-} |
337 |
- |
338 |
-src_prepare() { |
339 |
- tc-export CC CXX PKG_CONFIG |
340 |
- export V=1 # Verbose build |
341 |
- export BUILDTYPE=Release |
342 |
- |
343 |
- # fix compilation on Darwin |
344 |
- # https://code.google.com/p/gyp/issues/detail?id=260 |
345 |
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
346 |
- |
347 |
- # make sure we use python2.* while using gyp |
348 |
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
349 |
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
350 |
- |
351 |
- # less verbose install output (stating the same as portage, basically) |
352 |
- sed -i -e "/print/d" tools/install.py || die |
353 |
- |
354 |
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
355 |
- local LIBDIR=$(get_libdir) |
356 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
357 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
358 |
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
359 |
- |
360 |
- # Avoid a test that I've only been able to reproduce from emerge. It doesnt |
361 |
- # seem sandbox related either (invoking it from a sandbox works fine). |
362 |
- # The issue is that no stdin handle is openened when asked for one. |
363 |
- # It doesn't really belong upstream , so it'll just be removed until someone |
364 |
- # with more gentoo-knowledge than me (jbergstroem) figures it out. |
365 |
- rm test/parallel/test-stdout-close-unref.js || die |
366 |
- # AssertionError: 1 == 2 (on line 97) |
367 |
- rm test/parallel/test-cluster-disconnect.js || die |
368 |
- # AssertionError: Client never errored |
369 |
- rm test/parallel/test-tls-hello-parser-failure.js || die |
370 |
- # --- TIMEOUT --- |
371 |
- rm test/parallel/test-child-process-fork-net.js \ |
372 |
- test/parallel/test-child-process-fork-net2.js \ |
373 |
- test/parallel/test-child-process-recv-handle.js \ |
374 |
- test/parallel/test-cluster-dgram-1.js \ |
375 |
- test/parallel/test-cluster-send-deadlock.js \ |
376 |
- test/parallel/test-cluster-shared-handle-bind-error.js \ |
377 |
- test/parallel/test-dgram-exclusive-implicit-bind.js \ |
378 |
- test/parallel/test-tls-ticket-cluster.js || die |
379 |
- |
380 |
- # debug builds. change install path, remove optimisations and override buildtype |
381 |
- if use debug; then |
382 |
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die |
383 |
- BUILDTYPE=Debug |
384 |
- fi |
385 |
- |
386 |
- epatch_user |
387 |
-} |
388 |
- |
389 |
-src_configure() { |
390 |
- local myarch="" |
391 |
- local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) |
392 |
- use npm || myconf+=( --without-npm ) |
393 |
- use icu && myconf+=( --with-intl=system-icu ) |
394 |
- use snapshot && myconf+=( --with-snapshot ) |
395 |
- use ssl || myconf+=( --without-ssl ) |
396 |
- use debug && myconf+=( --debug ) |
397 |
- |
398 |
- case ${ABI} in |
399 |
- x86) myarch="ia32";; |
400 |
- amd64) myarch="x64";; |
401 |
- x32) myarch="x32";; |
402 |
- arm) myarch="arm";; |
403 |
- arm64) myarch="arm64";; |
404 |
- *) die "Unrecognized ARCH ${ARCH}";; |
405 |
- esac |
406 |
- |
407 |
- GYP_DEFINES="linux_use_gold_flags=0 |
408 |
- linux_use_bundled_binutils=0 |
409 |
- linux_use_bundled_gold=0" \ |
410 |
- "${PYTHON}" configure \ |
411 |
- --prefix="${EPREFIX}"/usr \ |
412 |
- --dest-cpu=${myarch} \ |
413 |
- --without-dtrace \ |
414 |
- "${myconf[@]}" || die |
415 |
-} |
416 |
- |
417 |
-src_compile() { |
418 |
- emake -C out mksnapshot |
419 |
- pax-mark m "out/${BUILDTYPE}/mksnapshot" |
420 |
- emake -C out |
421 |
-} |
422 |
- |
423 |
-src_install() { |
424 |
- local LIBDIR="${ED}/usr/$(get_libdir)" |
425 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
426 |
- if use npm; then |
427 |
- dodoc -r "${LIBDIR}"/node_modules/npm/html |
428 |
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die |
429 |
- find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die |
430 |
- fi |
431 |
- |
432 |
- # set up a symlink structure that npm expects.. |
433 |
- dodir /usr/include/node/deps/{v8,uv} |
434 |
- dosym . /usr/include/node/src |
435 |
- for var in deps/{uv,v8}/include; do |
436 |
- dosym ../.. /usr/include/node/${var} |
437 |
- done |
438 |
- |
439 |
- pax-mark -m "${ED}"/usr/bin/node |
440 |
-} |
441 |
- |
442 |
-src_test() { |
443 |
- out/${BUILDTYPE}/cctest || die |
444 |
- declare -xl TESTTYPE="${BUILDTYPE}" |
445 |
- "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die |
446 |
-} |
447 |
- |
448 |
-pkg_postinst() { |
449 |
- einfo "When using node-gyp to install native modules, you can avoid" |
450 |
- einfo "having to download the full tarball by doing the following:" |
451 |
- einfo "" |
452 |
- einfo "node-gyp --nodedir /usr/include/node <command>" |
453 |
-} |
454 |
|
455 |
diff --git a/net-libs/nodejs/nodejs-5.3.0.ebuild b/net-libs/nodejs/nodejs-5.3.0.ebuild |
456 |
deleted file mode 100644 |
457 |
index 73c1cdb..0000000 |
458 |
--- a/net-libs/nodejs/nodejs-5.3.0.ebuild |
459 |
+++ /dev/null |
460 |
@@ -1,155 +0,0 @@ |
461 |
-# Copyright 1999-2016 Gentoo Foundation |
462 |
-# Distributed under the terms of the GNU General Public License v2 |
463 |
-# $Id$ |
464 |
- |
465 |
-EAPI=5 |
466 |
- |
467 |
-PYTHON_COMPAT=( python2_7 ) |
468 |
- |
469 |
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
470 |
- |
471 |
-DESCRIPTION="Evented IO for V8 Javascript" |
472 |
-HOMEPAGE="http://nodejs.org/" |
473 |
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
474 |
- |
475 |
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
476 |
-SLOT="0" |
477 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
478 |
-IUSE="debug icu +npm snapshot +ssl" |
479 |
- |
480 |
-RDEPEND="icu? ( >=dev-libs/icu-55:= ) |
481 |
- ${PYTHON_DEPS} |
482 |
- >=net-libs/http-parser-2.5:= |
483 |
- >=dev-libs/libuv-1.6.1:= |
484 |
- >=dev-libs/openssl-1.0.2d:0=[-bindist] |
485 |
- sys-libs/zlib |
486 |
-" |
487 |
-DEPEND="${RDEPEND}" |
488 |
- |
489 |
-S="${WORKDIR}/node-v${PV}" |
490 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
491 |
- |
492 |
-pkg_pretend() { |
493 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
494 |
- if ! test-flag-CXX -std=c++11 ; then |
495 |
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
496 |
- fi |
497 |
- fi |
498 |
-} |
499 |
- |
500 |
-src_prepare() { |
501 |
- tc-export CC CXX PKG_CONFIG |
502 |
- export V=1 # Verbose build |
503 |
- export BUILDTYPE=Release |
504 |
- |
505 |
- # fix compilation on Darwin |
506 |
- # https://code.google.com/p/gyp/issues/detail?id=260 |
507 |
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
508 |
- |
509 |
- # make sure we use python2.* while using gyp |
510 |
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
511 |
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
512 |
- |
513 |
- # less verbose install output (stating the same as portage, basically) |
514 |
- sed -i -e "/print/d" tools/install.py || die |
515 |
- |
516 |
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
517 |
- local LIBDIR=$(get_libdir) |
518 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
519 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
520 |
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
521 |
- |
522 |
- # Avoid a test that I've only been able to reproduce from emerge. It doesnt |
523 |
- # seem sandbox related either (invoking it from a sandbox works fine). |
524 |
- # The issue is that no stdin handle is openened when asked for one. |
525 |
- # It doesn't really belong upstream , so it'll just be removed until someone |
526 |
- # with more gentoo-knowledge than me (jbergstroem) figures it out. |
527 |
- rm test/parallel/test-stdout-close-unref.js || die |
528 |
- # AssertionError: 1 == 2 (on line 97) |
529 |
- rm test/parallel/test-cluster-disconnect.js || die |
530 |
- # AssertionError: Client never errored |
531 |
- rm test/parallel/test-tls-hello-parser-failure.js || die |
532 |
- # --- TIMEOUT --- |
533 |
- rm test/parallel/test-child-process-fork-net.js \ |
534 |
- test/parallel/test-child-process-fork-net2.js \ |
535 |
- test/parallel/test-child-process-recv-handle.js \ |
536 |
- test/parallel/test-cluster-dgram-1.js \ |
537 |
- test/parallel/test-cluster-send-deadlock.js \ |
538 |
- test/parallel/test-cluster-shared-handle-bind-error.js \ |
539 |
- test/parallel/test-dgram-exclusive-implicit-bind.js \ |
540 |
- test/parallel/test-tls-ticket-cluster.js || die |
541 |
- |
542 |
- # debug builds. change install path, remove optimisations and override buildtype |
543 |
- if use debug; then |
544 |
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die |
545 |
- BUILDTYPE=Debug |
546 |
- fi |
547 |
- |
548 |
- epatch_user |
549 |
-} |
550 |
- |
551 |
-src_configure() { |
552 |
- local myarch="" |
553 |
- local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) |
554 |
- use npm || myconf+=( --without-npm ) |
555 |
- use icu && myconf+=( --with-intl=system-icu ) |
556 |
- use snapshot && myconf+=( --with-snapshot ) |
557 |
- use ssl || myconf+=( --without-ssl ) |
558 |
- use debug && myconf+=( --debug ) |
559 |
- |
560 |
- case ${ABI} in |
561 |
- x86) myarch="ia32";; |
562 |
- amd64) myarch="x64";; |
563 |
- x32) myarch="x32";; |
564 |
- arm) myarch="arm";; |
565 |
- arm64) myarch="arm64";; |
566 |
- *) die "Unrecognized ARCH ${ARCH}";; |
567 |
- esac |
568 |
- |
569 |
- GYP_DEFINES="linux_use_gold_flags=0 |
570 |
- linux_use_bundled_binutils=0 |
571 |
- linux_use_bundled_gold=0" \ |
572 |
- "${PYTHON}" configure \ |
573 |
- --prefix="${EPREFIX}"/usr \ |
574 |
- --dest-cpu=${myarch} \ |
575 |
- --without-dtrace \ |
576 |
- "${myconf[@]}" || die |
577 |
-} |
578 |
- |
579 |
-src_compile() { |
580 |
- emake -C out mksnapshot |
581 |
- pax-mark m "out/${BUILDTYPE}/mksnapshot" |
582 |
- emake -C out |
583 |
-} |
584 |
- |
585 |
-src_install() { |
586 |
- local LIBDIR="${ED}/usr/$(get_libdir)" |
587 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
588 |
- if use npm; then |
589 |
- dodoc -r "${LIBDIR}"/node_modules/npm/html |
590 |
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die |
591 |
- find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die |
592 |
- fi |
593 |
- |
594 |
- # set up a symlink structure that npm expects.. |
595 |
- dodir /usr/include/node/deps/{v8,uv} |
596 |
- dosym . /usr/include/node/src |
597 |
- for var in deps/{uv,v8}/include; do |
598 |
- dosym ../.. /usr/include/node/${var} |
599 |
- done |
600 |
- |
601 |
- pax-mark -m "${ED}"/usr/bin/node |
602 |
-} |
603 |
- |
604 |
-src_test() { |
605 |
- out/${BUILDTYPE}/cctest || die |
606 |
- declare -xl TESTTYPE="${BUILDTYPE}" |
607 |
- "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die |
608 |
-} |
609 |
- |
610 |
-pkg_postinst() { |
611 |
- einfo "When using node-gyp to install native modules, you can avoid" |
612 |
- einfo "having to download the full tarball by doing the following:" |
613 |
- einfo "" |
614 |
- einfo "node-gyp --nodedir /usr/include/node <command>" |
615 |
-} |
616 |
|
617 |
diff --git a/net-libs/nodejs/nodejs-5.4.1.ebuild b/net-libs/nodejs/nodejs-5.4.1.ebuild |
618 |
deleted file mode 100644 |
619 |
index 73c1cdb..0000000 |
620 |
--- a/net-libs/nodejs/nodejs-5.4.1.ebuild |
621 |
+++ /dev/null |
622 |
@@ -1,155 +0,0 @@ |
623 |
-# Copyright 1999-2016 Gentoo Foundation |
624 |
-# Distributed under the terms of the GNU General Public License v2 |
625 |
-# $Id$ |
626 |
- |
627 |
-EAPI=5 |
628 |
- |
629 |
-PYTHON_COMPAT=( python2_7 ) |
630 |
- |
631 |
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs |
632 |
- |
633 |
-DESCRIPTION="Evented IO for V8 Javascript" |
634 |
-HOMEPAGE="http://nodejs.org/" |
635 |
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
636 |
- |
637 |
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
638 |
-SLOT="0" |
639 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
640 |
-IUSE="debug icu +npm snapshot +ssl" |
641 |
- |
642 |
-RDEPEND="icu? ( >=dev-libs/icu-55:= ) |
643 |
- ${PYTHON_DEPS} |
644 |
- >=net-libs/http-parser-2.5:= |
645 |
- >=dev-libs/libuv-1.6.1:= |
646 |
- >=dev-libs/openssl-1.0.2d:0=[-bindist] |
647 |
- sys-libs/zlib |
648 |
-" |
649 |
-DEPEND="${RDEPEND}" |
650 |
- |
651 |
-S="${WORKDIR}/node-v${PV}" |
652 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
653 |
- |
654 |
-pkg_pretend() { |
655 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
656 |
- if ! test-flag-CXX -std=c++11 ; then |
657 |
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
658 |
- fi |
659 |
- fi |
660 |
-} |
661 |
- |
662 |
-src_prepare() { |
663 |
- tc-export CC CXX PKG_CONFIG |
664 |
- export V=1 # Verbose build |
665 |
- export BUILDTYPE=Release |
666 |
- |
667 |
- # fix compilation on Darwin |
668 |
- # https://code.google.com/p/gyp/issues/detail?id=260 |
669 |
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
670 |
- |
671 |
- # make sure we use python2.* while using gyp |
672 |
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
673 |
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
674 |
- |
675 |
- # less verbose install output (stating the same as portage, basically) |
676 |
- sed -i -e "/print/d" tools/install.py || die |
677 |
- |
678 |
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
679 |
- local LIBDIR=$(get_libdir) |
680 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
681 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
682 |
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
683 |
- |
684 |
- # Avoid a test that I've only been able to reproduce from emerge. It doesnt |
685 |
- # seem sandbox related either (invoking it from a sandbox works fine). |
686 |
- # The issue is that no stdin handle is openened when asked for one. |
687 |
- # It doesn't really belong upstream , so it'll just be removed until someone |
688 |
- # with more gentoo-knowledge than me (jbergstroem) figures it out. |
689 |
- rm test/parallel/test-stdout-close-unref.js || die |
690 |
- # AssertionError: 1 == 2 (on line 97) |
691 |
- rm test/parallel/test-cluster-disconnect.js || die |
692 |
- # AssertionError: Client never errored |
693 |
- rm test/parallel/test-tls-hello-parser-failure.js || die |
694 |
- # --- TIMEOUT --- |
695 |
- rm test/parallel/test-child-process-fork-net.js \ |
696 |
- test/parallel/test-child-process-fork-net2.js \ |
697 |
- test/parallel/test-child-process-recv-handle.js \ |
698 |
- test/parallel/test-cluster-dgram-1.js \ |
699 |
- test/parallel/test-cluster-send-deadlock.js \ |
700 |
- test/parallel/test-cluster-shared-handle-bind-error.js \ |
701 |
- test/parallel/test-dgram-exclusive-implicit-bind.js \ |
702 |
- test/parallel/test-tls-ticket-cluster.js || die |
703 |
- |
704 |
- # debug builds. change install path, remove optimisations and override buildtype |
705 |
- if use debug; then |
706 |
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die |
707 |
- BUILDTYPE=Debug |
708 |
- fi |
709 |
- |
710 |
- epatch_user |
711 |
-} |
712 |
- |
713 |
-src_configure() { |
714 |
- local myarch="" |
715 |
- local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) |
716 |
- use npm || myconf+=( --without-npm ) |
717 |
- use icu && myconf+=( --with-intl=system-icu ) |
718 |
- use snapshot && myconf+=( --with-snapshot ) |
719 |
- use ssl || myconf+=( --without-ssl ) |
720 |
- use debug && myconf+=( --debug ) |
721 |
- |
722 |
- case ${ABI} in |
723 |
- x86) myarch="ia32";; |
724 |
- amd64) myarch="x64";; |
725 |
- x32) myarch="x32";; |
726 |
- arm) myarch="arm";; |
727 |
- arm64) myarch="arm64";; |
728 |
- *) die "Unrecognized ARCH ${ARCH}";; |
729 |
- esac |
730 |
- |
731 |
- GYP_DEFINES="linux_use_gold_flags=0 |
732 |
- linux_use_bundled_binutils=0 |
733 |
- linux_use_bundled_gold=0" \ |
734 |
- "${PYTHON}" configure \ |
735 |
- --prefix="${EPREFIX}"/usr \ |
736 |
- --dest-cpu=${myarch} \ |
737 |
- --without-dtrace \ |
738 |
- "${myconf[@]}" || die |
739 |
-} |
740 |
- |
741 |
-src_compile() { |
742 |
- emake -C out mksnapshot |
743 |
- pax-mark m "out/${BUILDTYPE}/mksnapshot" |
744 |
- emake -C out |
745 |
-} |
746 |
- |
747 |
-src_install() { |
748 |
- local LIBDIR="${ED}/usr/$(get_libdir)" |
749 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
750 |
- if use npm; then |
751 |
- dodoc -r "${LIBDIR}"/node_modules/npm/html |
752 |
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die |
753 |
- find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die |
754 |
- fi |
755 |
- |
756 |
- # set up a symlink structure that npm expects.. |
757 |
- dodir /usr/include/node/deps/{v8,uv} |
758 |
- dosym . /usr/include/node/src |
759 |
- for var in deps/{uv,v8}/include; do |
760 |
- dosym ../.. /usr/include/node/${var} |
761 |
- done |
762 |
- |
763 |
- pax-mark -m "${ED}"/usr/bin/node |
764 |
-} |
765 |
- |
766 |
-src_test() { |
767 |
- out/${BUILDTYPE}/cctest || die |
768 |
- declare -xl TESTTYPE="${BUILDTYPE}" |
769 |
- "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die |
770 |
-} |
771 |
- |
772 |
-pkg_postinst() { |
773 |
- einfo "When using node-gyp to install native modules, you can avoid" |
774 |
- einfo "having to download the full tarball by doing the following:" |
775 |
- einfo "" |
776 |
- einfo "node-gyp --nodedir /usr/include/node <command>" |
777 |
-} |
778 |
|
779 |
diff --git a/net-libs/nodejs/nodejs-5.7.1.ebuild b/net-libs/nodejs/nodejs-5.7.1.ebuild |
780 |
deleted file mode 100644 |
781 |
index 3a04fa7..0000000 |
782 |
--- a/net-libs/nodejs/nodejs-5.7.1.ebuild |
783 |
+++ /dev/null |
784 |
@@ -1,195 +0,0 @@ |
785 |
-# Copyright 1999-2016 Gentoo Foundation |
786 |
-# Distributed under the terms of the GNU General Public License v2 |
787 |
-# $Id$ |
788 |
- |
789 |
-EAPI=6 |
790 |
- |
791 |
-PYTHON_COMPAT=( python2_7 ) |
792 |
-PYTHON_REQ_USE="threads" |
793 |
- |
794 |
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
795 |
- |
796 |
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
797 |
-HOMEPAGE="https://nodejs.org/" |
798 |
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
799 |
- |
800 |
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
801 |
-SLOT="0" |
802 |
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" |
803 |
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test" |
804 |
- |
805 |
-RDEPEND="icu? ( >=dev-libs/icu-56:= ) |
806 |
- npm? ( ${PYTHON_DEPS} ) |
807 |
- >=net-libs/http-parser-2.6.2:= |
808 |
- >=dev-libs/libuv-1.8.0:= |
809 |
- >=dev-libs/openssl-1.0.2f:0=[-bindist] |
810 |
- sys-libs/zlib" |
811 |
-DEPEND="${RDEPEND} |
812 |
- ${PYTHON_DEPS} |
813 |
- !!net-libs/iojs |
814 |
- test? ( net-misc/curl )" |
815 |
- |
816 |
-S="${WORKDIR}/node-v${PV}" |
817 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
818 |
- |
819 |
-PATCHES=( |
820 |
- "${FILESDIR}"/gentoo-global-npm-config.patch |
821 |
-) |
822 |
- |
823 |
-pkg_pretend() { |
824 |
- (use x86 && ! use cpu_flags_x86_sse2) && \ |
825 |
- die "Your CPU doesn't support the required SSE2 instruction." |
826 |
- |
827 |
- ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ |
828 |
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." |
829 |
-} |
830 |
- |
831 |
-src_prepare() { |
832 |
- tc-export CC CXX PKG_CONFIG |
833 |
- export V=1 |
834 |
- export BUILDTYPE=Release |
835 |
- |
836 |
- # fix compilation on Darwin |
837 |
- # https://code.google.com/p/gyp/issues/detail?id=260 |
838 |
- sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die |
839 |
- |
840 |
- # make sure we use python2.* while using gyp |
841 |
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
842 |
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
843 |
- |
844 |
- # less verbose install output (stating the same as portage, basically) |
845 |
- sed -i -e "/print/d" tools/install.py || die |
846 |
- |
847 |
- # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
848 |
- local LIBDIR=$(get_libdir) |
849 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
850 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
851 |
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
852 |
- |
853 |
- # Avoid writing a depfile, not useful |
854 |
- sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die |
855 |
- |
856 |
- # Avoid a test that I've only been able to reproduce from emerge. It doesnt |
857 |
- # seem sandbox related either (invoking it from a sandbox works fine). |
858 |
- # The issue is that no stdin handle is openened when asked for one. |
859 |
- # It doesn't really belong upstream , so it'll just be removed until someone |
860 |
- # with more gentoo-knowledge than me (jbergstroem) figures it out. |
861 |
- rm test/parallel/test-stdout-close-unref.js || die |
862 |
- |
863 |
- # debug builds. change install path, remove optimisations and override buildtype |
864 |
- if use debug; then |
865 |
- sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die |
866 |
- BUILDTYPE=Debug |
867 |
- fi |
868 |
- |
869 |
- default |
870 |
-} |
871 |
- |
872 |
-src_configure() { |
873 |
- local myarch="" |
874 |
- local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) |
875 |
- use npm || myconf+=( --without-npm ) |
876 |
- use icu && myconf+=( --with-intl=system-icu ) |
877 |
- use snapshot && myconf+=( --with-snapshot ) |
878 |
- use ssl || myconf+=( --without-ssl ) |
879 |
- use debug && myconf+=( --debug ) |
880 |
- |
881 |
- case ${ABI} in |
882 |
- x86) myarch="ia32";; |
883 |
- amd64) myarch="x64";; |
884 |
- x32) myarch="x32";; |
885 |
- arm) myarch="arm";; |
886 |
- arm64) myarch="arm64";; |
887 |
- *) die "Unrecognized ARCH ${ARCH}";; |
888 |
- esac |
889 |
- |
890 |
- GYP_DEFINES="linux_use_gold_flags=0 |
891 |
- linux_use_bundled_binutils=0 |
892 |
- linux_use_bundled_gold=0" \ |
893 |
- "${PYTHON}" configure \ |
894 |
- --prefix="${EPREFIX}"/usr \ |
895 |
- --dest-cpu=${myarch} \ |
896 |
- --without-dtrace \ |
897 |
- "${myconf[@]}" || die |
898 |
-} |
899 |
- |
900 |
-src_compile() { |
901 |
- emake -C out mksnapshot |
902 |
- pax-mark m "out/${BUILDTYPE}/mksnapshot" |
903 |
- emake -C out |
904 |
- |
905 |
- use doc && emake doc |
906 |
-} |
907 |
- |
908 |
-src_install() { |
909 |
- local LIBDIR="${ED}/usr/$(get_libdir)" |
910 |
- emake install DESTDIR="${ED}" |
911 |
- pax-mark -m "${ED}"usr/bin/node |
912 |
- |
913 |
- # set up a symlink structure that node-gyp expects.. |
914 |
- dodir /usr/include/node/deps/{v8,uv} |
915 |
- dosym . /usr/include/node/src |
916 |
- for var in deps/{uv,v8}/include; do |
917 |
- dosym ../.. /usr/include/node/${var} |
918 |
- done |
919 |
- |
920 |
- if use doc; then |
921 |
- # Patch docs to make them offline readable |
922 |
- for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do |
923 |
- sed -i '/fonts.googleapis.com/ d' $i; |
924 |
- done |
925 |
- # Install docs! |
926 |
- dohtml -r "${S}"/out/doc/api/* |
927 |
- fi |
928 |
- |
929 |
- if use npm; then |
930 |
- dodir /etc/npm |
931 |
- |
932 |
- # Install bash completion for `npm` |
933 |
- # We need to temporarily replace default config path since |
934 |
- # npm otherwise tries to write outside of the sandbox |
935 |
- local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" |
936 |
- sed -i -e "s|'/etc'|'${D}/etc'|g" "${ED}/${npm_config}" || die |
937 |
- local tmp_npm_completion_file="$(emktemp)" |
938 |
- "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" |
939 |
- newbashcomp "${tmp_npm_completion_file}" npm |
940 |
- sed -i -e "s|'${D}/etc'|'/etc'|g" "${ED}/${npm_config}" || die |
941 |
- |
942 |
- # Move man pages |
943 |
- doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* |
944 |
- |
945 |
- # Clean up |
946 |
- rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die |
947 |
- rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die |
948 |
- |
949 |
- local find_exp="-or -name" |
950 |
- local find_name=() |
951 |
- for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ |
952 |
- ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ |
953 |
- "*.md" "*.markdown" "*.bat" "*.cmd"; do |
954 |
- find_name+=( ${find_exp} "${match}" ) |
955 |
- done |
956 |
- |
957 |
- # Remove various development and/or inappropriate files and |
958 |
- # useless docs of dependend packages. |
959 |
- find "${LIBDIR}"/node_modules \ |
960 |
- \( -type d -name examples \) -or \( -type f \( \ |
961 |
- -iname "LICEN?E*" \ |
962 |
- "${find_name[@]}" \ |
963 |
- \) \) -exec rm -rf "{}" \; |
964 |
- fi |
965 |
-} |
966 |
- |
967 |
-src_test() { |
968 |
- out/${BUILDTYPE}/cctest || die |
969 |
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die |
970 |
-} |
971 |
- |
972 |
-pkg_postinst() { |
973 |
- einfo "The global npm config lives in /etc/npm. This deviates slightly" |
974 |
- einfo "from upstream which otherwise would have it live in /usr/etc/." |
975 |
- einfo "" |
976 |
- einfo "Protip: When using node-gyp to install native modules, you can" |
977 |
- einfo "avoid having to download extras by doing the following:" |
978 |
- einfo "$ node-gyp --nodedir /usr/include/node <command>" |
979 |
-} |
980 |
|
981 |
diff --git a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild b/net-libs/nodejs/nodejs-5.9.1.ebuild |
982 |
similarity index 98% |
983 |
rename from net-libs/nodejs/nodejs-5.6.0-r1.ebuild |
984 |
rename to net-libs/nodejs/nodejs-5.9.1.ebuild |
985 |
index 913f2cf..deb2fc3 100644 |
986 |
--- a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild |
987 |
+++ b/net-libs/nodejs/nodejs-5.9.1.ebuild |
988 |
@@ -20,13 +20,12 @@ IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test" |
989 |
|
990 |
RDEPEND="icu? ( >=dev-libs/icu-56:= ) |
991 |
npm? ( ${PYTHON_DEPS} ) |
992 |
- >=net-libs/http-parser-2.6.1:= |
993 |
+ >=net-libs/http-parser-2.6.2:= |
994 |
>=dev-libs/libuv-1.8.0:= |
995 |
- >=dev-libs/openssl-1.0.2f:0=[-bindist] |
996 |
+ >=dev-libs/openssl-1.0.2g:0=[-bindist] |
997 |
sys-libs/zlib" |
998 |
DEPEND="${RDEPEND} |
999 |
${PYTHON_DEPS} |
1000 |
- !!net-libs/iojs |
1001 |
test? ( net-misc/curl )" |
1002 |
|
1003 |
S="${WORKDIR}/node-v${PV}" |