Gentoo Archives: gentoo-commits

From: Stefan Strogin <stefan.strogin@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-libs/nodejs/, net-libs/nodejs/files/
Date: Wed, 17 Apr 2019 04:47:24
Message-Id: 1555467778.6a7d1658e6e4bb90bd5029677c00c84c10c6628d.steils@gentoo
1 commit: 6a7d1658e6e4bb90bd5029677c00c84c10c6628d
2 Author: maurerpe <junk4me46806 <AT> yahoo <DOT> com>
3 AuthorDate: Sat Apr 13 23:36:54 2019 +0000
4 Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
5 CommitDate: Wed Apr 17 02:22:58 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6a7d1658
7
8 net-libs/nodejs: Add 11.14.0
9
10 Add net-libs/nodejs-11.14.0. Continue to use bundled openssl.
11
12 Reported-by: maurerpe <junk4me46806 <AT> yahoo.com>
13 Closes: https://github.com/gentoo/libressl/pull/290
14 Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>
15
16 net-libs/nodejs/Manifest | 1 +
17 net-libs/nodejs/files/nodejs-99999999-llhttp.patch | 20 ++
18 net-libs/nodejs/nodejs-11.14.0.ebuild | 213 +++++++++++++++++++++
19 3 files changed, 234 insertions(+)
20
21 diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
22 index 2488786..41732df 100644
23 --- a/net-libs/nodejs/Manifest
24 +++ b/net-libs/nodejs/Manifest
25 @@ -1,5 +1,6 @@
26 DIST node-v10.15.2.tar.xz 20232972 BLAKE2B 3ffaa0890ddec6b9d00a0b3f32fc62e55a665ea6faba6265df71be601f88a1c948011f908851f1cbb198974ca36f8626fa9a2b4b8827f0155e57ff48f3e25c10 SHA512 2d4ef4758d3a73a160b95249c7dce32307287ef84511f56c3077f18c0d87a53bb73b44dd86131a402c4e86686e5e7cb5aeedb2b075b8ab261fc43d5abbe70ce6
27 DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
28 +DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
29 DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
30 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
31 DIST node-v8.13.0.tar.xz 18477528 BLAKE2B 6b4e1c0c881395a194799743cdb9cf186a4b168ae3a8c74267f64b0d89c88dae525d56cb45f3a55f7fea3fd0f1c814dbb88c28d9f49c9af66ea0bbe9d68460d4 SHA512 1e4bf25cd177fb4c3cfd787388acaf5832d92220ed294853d09e95dda14021359c620b42a77de8307929add1f49e47da905689b67d290648a20b6e0b3500514f
32
33 diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
34 new file mode 100644
35 index 0000000..1b6eb9f
36 --- /dev/null
37 +++ b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
38 @@ -0,0 +1,20 @@
39 +--- a/node.gypi
40 ++++ b/node.gypi
41 +@@ -169,11 +169,15 @@
42 +
43 + [ 'node_shared_http_parser=="false"', {
44 + 'dependencies': [
45 +- 'deps/http_parser/http_parser.gyp:http_parser',
46 +- 'deps/llhttp/llhttp.gyp:llhttp'
47 ++ 'deps/http_parser/http_parser.gyp:http_parser'
48 + ],
49 + } ],
50 +
51 ++ [ '"true"', { 'dependencies': [
52 ++ 'deps/llhttp/llhttp.gyp:llhttp'
53 ++ ],
54 ++ }],
55 ++
56 + [ 'node_shared_cares=="false"', {
57 + 'dependencies': [ 'deps/cares/cares.gyp:cares' ],
58 + }],
59
60 diff --git a/net-libs/nodejs/nodejs-11.14.0.ebuild b/net-libs/nodejs/nodejs-11.14.0.ebuild
61 new file mode 100644
62 index 0000000..1256a78
63 --- /dev/null
64 +++ b/net-libs/nodejs/nodejs-11.14.0.ebuild
65 @@ -0,0 +1,213 @@
66 +# Copyright 1999-2019 Gentoo Authors
67 +# Distributed under the terms of the GNU General Public License v2
68 +
69 +EAPI=6
70 +
71 +PYTHON_COMPAT=( python2_7 )
72 +PYTHON_REQ_USE="threads"
73 +
74 +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
75 +
76 +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
77 +HOMEPAGE="https://nodejs.org/"
78 +SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
79 +
80 +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
83 +IUSE="bundled-ssl cpu_flags_x86_sse2 debug doc icu inspector libressl +npm +snapshot +ssl systemtap test"
84 +REQUIRED_USE="
85 + ${PYTHON_REQUIRED_USE}
86 + bundled-ssl? ( ssl )
87 + inspector? ( icu ssl )
88 + libressl? ( bundled-ssl )
89 + npm? ( ssl )
90 +"
91 +
92 +RDEPEND="
93 + >=dev-libs/libuv-1.27.0:=
94 + >=net-dns/c-ares-1.15.0
95 + >=net-libs/http-parser-2.9.0:=
96 + >=net-libs/nghttp2-1.37.0
97 + sys-libs/zlib
98 + icu? ( >=dev-libs/icu-63.1:= )
99 + ssl? (
100 + !bundled-ssl? ( >=dev-libs/openssl-1.1:0= )
101 + )
102 +"
103 +DEPEND="
104 + ${RDEPEND}
105 + ${PYTHON_DEPS}
106 + systemtap? ( dev-util/systemtap )
107 + test? ( net-misc/curl )
108 +"
109 +PATCHES=(
110 + "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
111 + "${FILESDIR}"/${PN}-99999999-llhttp.patch
112 +)
113 +S="${WORKDIR}/node-v${PV}"
114 +
115 +pkg_pretend() {
116 + (use x86 && ! use cpu_flags_x86_sse2) && \
117 + die "Your CPU doesn't support the required SSE2 instruction."
118 +
119 + ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
120 + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
121 +}
122 +
123 +src_prepare() {
124 + tc-export CC CXX PKG_CONFIG
125 + export V=1
126 + export BUILDTYPE=Release
127 +
128 + # fix compilation on Darwin
129 + # https://code.google.com/p/gyp/issues/detail?id=260
130 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
131 +
132 + # make sure we use python2.* while using gyp
133 + sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
134 + sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
135 +
136 + # less verbose install output (stating the same as portage, basically)
137 + sed -i -e "/print/d" tools/install.py || die
138 +
139 + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
140 + local LIBDIR=$(get_libdir)
141 + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
142 + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
143 +
144 + # Avoid writing a depfile, not useful
145 + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
146 +
147 + sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
148 +
149 + # Avoid a test that I've only been able to reproduce from emerge. It doesnt
150 + # seem sandbox related either (invoking it from a sandbox works fine).
151 + # The issue is that no stdin handle is openened when asked for one.
152 + # It doesn't really belong upstream , so it'll just be removed until someone
153 + # with more gentoo-knowledge than me (jbergstroem) figures it out.
154 + rm test/parallel/test-stdout-close-unref.js || die
155 +
156 + # debug builds. change install path, remove optimisations and override buildtype
157 + if use debug; then
158 + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
159 + BUILDTYPE=Debug
160 + fi
161 +
162 + default
163 +}
164 +
165 +src_configure() {
166 + local myconf=(
167 + --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
168 + --shared-zlib
169 + )
170 + use debug && myconf+=( --debug )
171 + use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
172 + use inspector || myconf+=( --without-inspector )
173 + use npm || myconf+=( --without-npm )
174 + use snapshot && myconf+=( --with-snapshot )
175 + use ssl && ( use bundled-ssl || myconf+=( --shared-openssl ) ) || myconf+=( --without-ssl )
176 +
177 + local myarch=""
178 + case ${ABI} in
179 + amd64) myarch="x64";;
180 + arm) myarch="arm";;
181 + arm64) myarch="arm64";;
182 + ppc64) myarch="ppc64";;
183 + x32) myarch="x32";;
184 + x86) myarch="ia32";;
185 + *) myarch="${ABI}";;
186 + esac
187 +
188 + GYP_DEFINES="linux_use_gold_flags=0
189 + linux_use_bundled_binutils=0
190 + linux_use_bundled_gold=0" \
191 + "${PYTHON}" configure \
192 + --prefix="${EPREFIX}"/usr \
193 + --dest-cpu=${myarch} \
194 + $(use_with systemtap dtrace) \
195 + "${myconf[@]}" || die
196 +}
197 +
198 +src_compile() {
199 + emake -C out mksnapshot
200 + pax-mark m "out/${BUILDTYPE}/mksnapshot"
201 + emake -C out
202 +}
203 +
204 +src_install() {
205 + local LIBDIR="${ED}/usr/$(get_libdir)"
206 + emake install DESTDIR="${D}"
207 + pax-mark -m "${ED}"usr/bin/node
208 +
209 + # set up a symlink structure that node-gyp expects..
210 + dodir /usr/include/node/deps/{v8,uv}
211 + dosym . /usr/include/node/src
212 + for var in deps/{uv,v8}/include; do
213 + dosym ../.. /usr/include/node/${var}
214 + done
215 +
216 + if use doc; then
217 + # Patch docs to make them offline readable
218 + for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
219 + sed -i '/fonts.googleapis.com/ d' $i;
220 + done
221 + # Install docs
222 + docinto html
223 + dodoc -r "${S}"/doc/*
224 + fi
225 +
226 + if use npm; then
227 + dodir /etc/npm
228 +
229 + # Install bash completion for `npm`
230 + # We need to temporarily replace default config path since
231 + # npm otherwise tries to write outside of the sandbox
232 + local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
233 + sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
234 + local tmp_npm_completion_file="$(emktemp)"
235 + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
236 + newbashcomp "${tmp_npm_completion_file}" npm
237 + sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
238 +
239 + # Move man pages
240 + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
241 +
242 + # Clean up
243 + rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
244 + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
245 +
246 + local find_exp="-or -name"
247 + local find_name=()
248 + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
249 + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
250 + "*.md" "*.markdown" "*.bat" "*.cmd"; do
251 + find_name+=( ${find_exp} "${match}" )
252 + done
253 +
254 + # Remove various development and/or inappropriate files and
255 + # useless docs of dependend packages.
256 + find "${LIBDIR}"/node_modules \
257 + \( -type d -name examples \) -or \( -type f \( \
258 + -iname "LICEN?E*" \
259 + "${find_name[@]}" \
260 + \) \) -exec rm -rf "{}" \;
261 + fi
262 +
263 + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
264 +}
265 +
266 +src_test() {
267 + out/${BUILDTYPE}/cctest || die
268 + "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
269 +}
270 +
271 +pkg_postinst() {
272 + elog "The global npm config lives in /etc/npm. This deviates slightly"
273 + elog "from upstream which otherwise would have it live in /usr/etc/."
274 + elog ""
275 + elog "Protip: When using node-gyp to install native modules, you can"
276 + elog "avoid having to download extras by doing the following:"
277 + elog "$ node-gyp --nodedir /usr/include/node <command>"
278 +}