| 1 |
commit: 8879e4b3957a10551641e9e045397a908b1dd982 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 28 10:38:49 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 29 22:19:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8879e4b3 |
| 7 |
|
| 8 |
net-libs/nodejs: Versions 6.15.0 8.14.0 10.14.0 11.3.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Bug: https://bugs.gentoo.org/672136 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
net-libs/nodejs/Manifest | 4 ++ |
| 15 |
...odejs-99999999.ebuild => nodejs-10.14.0.ebuild} | 28 ++++++------ |
| 16 |
...nodejs-99999999.ebuild => nodejs-11.3.0.ebuild} | 26 ++++++----- |
| 17 |
...nodejs-99999999.ebuild => nodejs-6.15.0.ebuild} | 43 +++++++++---------- |
| 18 |
...nodejs-99999999.ebuild => nodejs-8.14.0.ebuild} | 50 ++++++++++++---------- |
| 19 |
net-libs/nodejs/nodejs-99999999.ebuild | 2 +- |
| 20 |
6 files changed, 85 insertions(+), 68 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest |
| 23 |
index ef046a9481c..fc906623cea 100644 |
| 24 |
--- a/net-libs/nodejs/Manifest |
| 25 |
+++ b/net-libs/nodejs/Manifest |
| 26 |
@@ -1,10 +1,14 @@ |
| 27 |
DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b |
| 28 |
DIST node-v10.13.0.tar.xz 20184740 BLAKE2B 4c063889341eb2aa128096466cfdc2c91631a760ec7dea3e06b30990252cf6575b96a6d61dd1ba467c8d134b75ee51c897d4ec5c8f60b64ba51d3bc4113df63c SHA512 90431414f45c858efd6ed6259916b778e29712b57bc758f12fa7d7fafe5073c85fc379e56c86795936515f4c4f772ac308d3f6d0569c46305a7d49dc55c884c8 |
| 29 |
+DIST node-v10.14.0.tar.xz 20193912 BLAKE2B a72411c9b7bfc9e257089d26cfc7a00321d1db7836b9a292544971fbceaaeae8b178ef53735175621d42169eb6839173340b00e441e498187bf4fffc02edca71 SHA512 82900373993ae2a068ccc9217eadc700a91956893f0a9973c5003ca648e16859a5b37919ea15c06bc1bd746957db6915ad75aa3d8ddb18c1b949c5723617c0c9 |
| 30 |
DIST node-v11.2.0.tar.xz 20332812 BLAKE2B 2bb8cd409dc5328faa1404a36bff5c6bf554de397ce1d010886ee5fd7b15d148abb758d54c48e3f7db46e117f2e5cfe2cf8ff4565a551f1424725c75b40d4bf9 SHA512 6251706437c0344bd4994619b7fe09c36a15e99e707d36b3a3746b7b379a03a9a4758a4fc6fdc0214fbd107eef4ec39bd8b75d88ccab207d97cbf21852eb81b2 |
| 31 |
+DIST node-v11.3.0.tar.xz 20332400 BLAKE2B b237cb6b9a8004f06c72734fec0f9cea6b7ca86d1d289fbad4a232fd7e966d5e20e25929db9ff4a0dc32b6d917aaee12966e53895777cc7a1c2a426ada9e8dbc SHA512 d43b2f3b9835cce5ae411d96ee381a93fa60fa726cb6639580f5ae680fb9f461b1da63dc5f2cee3272341be85cff82073246a501460151e19622e75674ef7627 |
| 32 |
DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696 |
| 33 |
DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa |
| 34 |
DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 |
| 35 |
DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa |
| 36 |
+DIST node-v6.15.0.tar.xz 15849408 BLAKE2B 484446311ed68250b6b7d42f9260e66b267f03b6ad4458b0c7f37c526b73616571b45cc0f6a181bae150d7319cf523778d67d8971e3e406393703067ea80679c SHA512 805299c52e9a22fe4c36509adeb4559c71ba14bc023c70af8efbd9589849d40dfe88191f1e6e88afa0327e399a775884bd482055949cc93fd41ce0e406288946 |
| 37 |
DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42 |
| 38 |
DIST node-v8.13.0.tar.xz 18477528 BLAKE2B 6b4e1c0c881395a194799743cdb9cf186a4b168ae3a8c74267f64b0d89c88dae525d56cb45f3a55f7fea3fd0f1c814dbb88c28d9f49c9af66ea0bbe9d68460d4 SHA512 1e4bf25cd177fb4c3cfd787388acaf5832d92220ed294853d09e95dda14021359c620b42a77de8307929add1f49e47da905689b67d290648a20b6e0b3500514f |
| 39 |
+DIST node-v8.14.0.tar.xz 18485252 BLAKE2B df4d59a8532bad056467f737a2de83f10b1b129ccc759fa8b7fbd97b8dbdfa84284c3b09d99ccf0b3d0195d9ef3e2b51e2bcb205b4937de75d9e47ee438cc607 SHA512 7d80ea370ec445614331dd774c8fdf8c504c9916b5af18f8f9005e87da7abca21ff5b139dd66d25a6dd29b6e6af72b36c8037fee96174ebd2ac36feb18495f9a |
| 40 |
DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13 |
| 41 |
|
| 42 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-10.14.0.ebuild |
| 43 |
similarity index 90% |
| 44 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
| 45 |
copy to net-libs/nodejs/nodejs-10.14.0.ebuild |
| 46 |
index be54bc3f1d6..ea37a260ff5 100644 |
| 47 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 48 |
+++ b/net-libs/nodejs/nodejs-10.14.0.ebuild |
| 49 |
@@ -6,30 +6,30 @@ EAPI=6 |
| 50 |
PYTHON_COMPAT=( python2_7 ) |
| 51 |
PYTHON_REQ_USE="threads" |
| 52 |
|
| 53 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
| 54 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
| 55 |
|
| 56 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
| 57 |
HOMEPAGE="https://nodejs.org/" |
| 58 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
| 59 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
| 60 |
|
| 61 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
| 62 |
SLOT="0" |
| 63 |
-KEYWORDS="" |
| 64 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
| 65 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
| 66 |
REQUIRED_USE=" |
| 67 |
${PYTHON_REQUIRED_USE} |
| 68 |
inspector? ( icu ssl ) |
| 69 |
+ npm? ( ssl ) |
| 70 |
" |
| 71 |
|
| 72 |
RDEPEND=" |
| 73 |
- >=dev-libs/libuv-1.19.2:= |
| 74 |
- >=net-dns/c-ares-1.15.0 |
| 75 |
+ >=dev-libs/libuv-1.23.2:= |
| 76 |
+ >=net-dns/c-ares-1.14.0 |
| 77 |
>=net-libs/http-parser-2.8.0:= |
| 78 |
- >=net-libs/nghttp2-1.29.0 |
| 79 |
+ >=net-libs/nghttp2-1.34.0 |
| 80 |
sys-libs/zlib |
| 81 |
- icu? ( >=dev-libs/icu-61.1:= ) |
| 82 |
- npm? ( ${PYTHON_DEPS} ) |
| 83 |
- ssl? ( >=dev-libs/openssl-1.1:0= ) |
| 84 |
+ icu? ( >=dev-libs/icu-62.1:= ) |
| 85 |
+ ssl? ( =dev-libs/openssl-1.1.0*:0= ) |
| 86 |
" |
| 87 |
DEPEND=" |
| 88 |
${RDEPEND} |
| 89 |
@@ -37,6 +37,7 @@ DEPEND=" |
| 90 |
systemtap? ( dev-util/systemtap ) |
| 91 |
test? ( net-misc/curl ) |
| 92 |
" |
| 93 |
+S="${WORKDIR}/node-v${PV}" |
| 94 |
PATCHES=( |
| 95 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 96 |
) |
| 97 |
@@ -68,7 +69,7 @@ src_prepare() { |
| 98 |
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
| 99 |
local LIBDIR=$(get_libdir) |
| 100 |
sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
| 101 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die |
| 102 |
+ sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die |
| 103 |
|
| 104 |
# Avoid writing a depfile, not useful |
| 105 |
sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die |
| 106 |
@@ -144,8 +145,9 @@ src_install() { |
| 107 |
for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do |
| 108 |
sed -i '/fonts.googleapis.com/ d' $i; |
| 109 |
done |
| 110 |
- # Install docs! |
| 111 |
- dohtml -r "${S}"/doc/* |
| 112 |
+ # Install docs |
| 113 |
+ docinto html |
| 114 |
+ dodoc -r "${S}"/doc/* |
| 115 |
fi |
| 116 |
|
| 117 |
if use npm; then |
| 118 |
@@ -184,6 +186,8 @@ src_install() { |
| 119 |
"${find_name[@]}" \ |
| 120 |
\) \) -exec rm -rf "{}" \; |
| 121 |
fi |
| 122 |
+ |
| 123 |
+ mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die |
| 124 |
} |
| 125 |
|
| 126 |
src_test() { |
| 127 |
|
| 128 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-11.3.0.ebuild |
| 129 |
similarity index 91% |
| 130 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
| 131 |
copy to net-libs/nodejs/nodejs-11.3.0.ebuild |
| 132 |
index be54bc3f1d6..0f0eca94f04 100644 |
| 133 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 134 |
+++ b/net-libs/nodejs/nodejs-11.3.0.ebuild |
| 135 |
@@ -6,30 +6,30 @@ EAPI=6 |
| 136 |
PYTHON_COMPAT=( python2_7 ) |
| 137 |
PYTHON_REQ_USE="threads" |
| 138 |
|
| 139 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
| 140 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
| 141 |
|
| 142 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
| 143 |
HOMEPAGE="https://nodejs.org/" |
| 144 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
| 145 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
| 146 |
|
| 147 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
| 148 |
SLOT="0" |
| 149 |
-KEYWORDS="" |
| 150 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
| 151 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
| 152 |
REQUIRED_USE=" |
| 153 |
${PYTHON_REQUIRED_USE} |
| 154 |
inspector? ( icu ssl ) |
| 155 |
+ npm? ( ssl ) |
| 156 |
" |
| 157 |
|
| 158 |
RDEPEND=" |
| 159 |
- >=dev-libs/libuv-1.19.2:= |
| 160 |
+ >=dev-libs/libuv-1.23.2:= |
| 161 |
>=net-dns/c-ares-1.15.0 |
| 162 |
>=net-libs/http-parser-2.8.0:= |
| 163 |
- >=net-libs/nghttp2-1.29.0 |
| 164 |
+ >=net-libs/nghttp2-1.34.0 |
| 165 |
sys-libs/zlib |
| 166 |
- icu? ( >=dev-libs/icu-61.1:= ) |
| 167 |
- npm? ( ${PYTHON_DEPS} ) |
| 168 |
- ssl? ( >=dev-libs/openssl-1.1:0= ) |
| 169 |
+ icu? ( >=dev-libs/icu-63.1:= ) |
| 170 |
+ ssl? ( =dev-libs/openssl-1.1.0*:0= ) |
| 171 |
" |
| 172 |
DEPEND=" |
| 173 |
${RDEPEND} |
| 174 |
@@ -37,6 +37,7 @@ DEPEND=" |
| 175 |
systemtap? ( dev-util/systemtap ) |
| 176 |
test? ( net-misc/curl ) |
| 177 |
" |
| 178 |
+S="${WORKDIR}/node-v${PV}" |
| 179 |
PATCHES=( |
| 180 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 181 |
) |
| 182 |
@@ -68,7 +69,7 @@ src_prepare() { |
| 183 |
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
| 184 |
local LIBDIR=$(get_libdir) |
| 185 |
sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
| 186 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die |
| 187 |
+ sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die |
| 188 |
|
| 189 |
# Avoid writing a depfile, not useful |
| 190 |
sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die |
| 191 |
@@ -144,8 +145,9 @@ src_install() { |
| 192 |
for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do |
| 193 |
sed -i '/fonts.googleapis.com/ d' $i; |
| 194 |
done |
| 195 |
- # Install docs! |
| 196 |
- dohtml -r "${S}"/doc/* |
| 197 |
+ # Install docs |
| 198 |
+ docinto html |
| 199 |
+ dodoc -r "${S}"/doc/* |
| 200 |
fi |
| 201 |
|
| 202 |
if use npm; then |
| 203 |
@@ -184,6 +186,8 @@ src_install() { |
| 204 |
"${find_name[@]}" \ |
| 205 |
\) \) -exec rm -rf "{}" \; |
| 206 |
fi |
| 207 |
+ |
| 208 |
+ mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die |
| 209 |
} |
| 210 |
|
| 211 |
src_test() { |
| 212 |
|
| 213 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-6.15.0.ebuild |
| 214 |
similarity index 84% |
| 215 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
| 216 |
copy to net-libs/nodejs/nodejs-6.15.0.ebuild |
| 217 |
index be54bc3f1d6..82289475261 100644 |
| 218 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 219 |
+++ b/net-libs/nodejs/nodejs-6.15.0.ebuild |
| 220 |
@@ -6,39 +6,36 @@ EAPI=6 |
| 221 |
PYTHON_COMPAT=( python2_7 ) |
| 222 |
PYTHON_REQ_USE="threads" |
| 223 |
|
| 224 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
| 225 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
| 226 |
|
| 227 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
| 228 |
HOMEPAGE="https://nodejs.org/" |
| 229 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
| 230 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
| 231 |
|
| 232 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
| 233 |
SLOT="0" |
| 234 |
-KEYWORDS="" |
| 235 |
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
| 236 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 237 |
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test" |
| 238 |
REQUIRED_USE=" |
| 239 |
${PYTHON_REQUIRED_USE} |
| 240 |
inspector? ( icu ssl ) |
| 241 |
" |
| 242 |
|
| 243 |
RDEPEND=" |
| 244 |
- >=dev-libs/libuv-1.19.2:= |
| 245 |
- >=net-dns/c-ares-1.15.0 |
| 246 |
- >=net-libs/http-parser-2.8.0:= |
| 247 |
- >=net-libs/nghttp2-1.29.0 |
| 248 |
+ >=dev-libs/libuv-1.16.1:= |
| 249 |
+ >=net-libs/http-parser-2.7.0:= |
| 250 |
sys-libs/zlib |
| 251 |
- icu? ( >=dev-libs/icu-61.1:= ) |
| 252 |
- npm? ( ${PYTHON_DEPS} ) |
| 253 |
- ssl? ( >=dev-libs/openssl-1.1:0= ) |
| 254 |
+ icu? ( >=dev-libs/icu-58.2:= ) |
| 255 |
+ ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) |
| 256 |
" |
| 257 |
DEPEND=" |
| 258 |
${RDEPEND} |
| 259 |
${PYTHON_DEPS} |
| 260 |
- systemtap? ( dev-util/systemtap ) |
| 261 |
test? ( net-misc/curl ) |
| 262 |
" |
| 263 |
+S="${WORKDIR}/node-v${PV}" |
| 264 |
PATCHES=( |
| 265 |
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 266 |
+ "${FILESDIR}"/gentoo-global-npm-config.patch |
| 267 |
) |
| 268 |
|
| 269 |
pkg_pretend() { |
| 270 |
@@ -60,21 +57,23 @@ src_prepare() { |
| 271 |
|
| 272 |
# make sure we use python2.* while using gyp |
| 273 |
sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die |
| 274 |
- sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
| 275 |
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die |
| 276 |
|
| 277 |
# less verbose install output (stating the same as portage, basically) |
| 278 |
sed -i -e "/print/d" tools/install.py || die |
| 279 |
|
| 280 |
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
| 281 |
local LIBDIR=$(get_libdir) |
| 282 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
| 283 |
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die |
| 284 |
+ sed -i \ |
| 285 |
+ -e "s|lib/|${LIBDIR}/|g" \ |
| 286 |
+ -e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \ |
| 287 |
+ tools/install.py || die |
| 288 |
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die |
| 289 |
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die |
| 290 |
|
| 291 |
# Avoid writing a depfile, not useful |
| 292 |
sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die |
| 293 |
|
| 294 |
- sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die |
| 295 |
- |
| 296 |
# Avoid a test that I've only been able to reproduce from emerge. It doesnt |
| 297 |
# seem sandbox related either (invoking it from a sandbox works fine). |
| 298 |
# The issue is that no stdin handle is openened when asked for one. |
| 299 |
@@ -92,15 +91,15 @@ src_prepare() { |
| 300 |
} |
| 301 |
|
| 302 |
src_configure() { |
| 303 |
- local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) |
| 304 |
+ local myarch="" |
| 305 |
+ local myconf=( --shared-libuv --shared-http-parser --shared-zlib ) |
| 306 |
use debug && myconf+=( --debug ) |
| 307 |
- use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) |
| 308 |
+ use icu && myconf+=( --with-intl=system-icu ) |
| 309 |
use inspector || myconf+=( --without-inspector ) |
| 310 |
use npm || myconf+=( --without-npm ) |
| 311 |
use snapshot && myconf+=( --with-snapshot ) |
| 312 |
use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) |
| 313 |
|
| 314 |
- local myarch="" |
| 315 |
case ${ABI} in |
| 316 |
amd64) myarch="x64";; |
| 317 |
arm) myarch="arm";; |
| 318 |
@@ -117,7 +116,7 @@ src_configure() { |
| 319 |
"${PYTHON}" configure \ |
| 320 |
--prefix="${EPREFIX}"/usr \ |
| 321 |
--dest-cpu=${myarch} \ |
| 322 |
- $(use_with systemtap dtrace) \ |
| 323 |
+ --without-dtrace \ |
| 324 |
"${myconf[@]}" || die |
| 325 |
} |
| 326 |
|
| 327 |
|
| 328 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-8.14.0.ebuild |
| 329 |
similarity index 89% |
| 330 |
copy from net-libs/nodejs/nodejs-99999999.ebuild |
| 331 |
copy to net-libs/nodejs/nodejs-8.14.0.ebuild |
| 332 |
index be54bc3f1d6..69c390294cd 100644 |
| 333 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 334 |
+++ b/net-libs/nodejs/nodejs-8.14.0.ebuild |
| 335 |
@@ -2,43 +2,45 @@ |
| 336 |
# Distributed under the terms of the GNU General Public License v2 |
| 337 |
|
| 338 |
EAPI=6 |
| 339 |
+RESTRICT="test" |
| 340 |
|
| 341 |
PYTHON_COMPAT=( python2_7 ) |
| 342 |
PYTHON_REQ_USE="threads" |
| 343 |
|
| 344 |
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-single-r1 toolchain-funcs |
| 345 |
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs |
| 346 |
|
| 347 |
DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" |
| 348 |
HOMEPAGE="https://nodejs.org/" |
| 349 |
-EGIT_REPO_URI="https://github.com/nodejs/node" |
| 350 |
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" |
| 351 |
|
| 352 |
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" |
| 353 |
SLOT="0" |
| 354 |
-KEYWORDS="" |
| 355 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" |
| 356 |
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" |
| 357 |
REQUIRED_USE=" |
| 358 |
${PYTHON_REQUIRED_USE} |
| 359 |
inspector? ( icu ssl ) |
| 360 |
+ npm? ( ssl ) |
| 361 |
" |
| 362 |
|
| 363 |
RDEPEND=" |
| 364 |
- >=dev-libs/libuv-1.19.2:= |
| 365 |
- >=net-dns/c-ares-1.15.0 |
| 366 |
+ >=dev-libs/libuv-1.23.2:= |
| 367 |
+ >=net-dns/c-ares-1.10.1 |
| 368 |
>=net-libs/http-parser-2.8.0:= |
| 369 |
- >=net-libs/nghttp2-1.29.0 |
| 370 |
+ >=net-libs/nghttp2-1.33.0 |
| 371 |
sys-libs/zlib |
| 372 |
- icu? ( >=dev-libs/icu-61.1:= ) |
| 373 |
- npm? ( ${PYTHON_DEPS} ) |
| 374 |
- ssl? ( >=dev-libs/openssl-1.1:0= ) |
| 375 |
+ icu? ( >=dev-libs/icu-60.1:= ) |
| 376 |
+ ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) |
| 377 |
" |
| 378 |
-DEPEND=" |
| 379 |
- ${RDEPEND} |
| 380 |
+DEPEND="${RDEPEND} |
| 381 |
${PYTHON_DEPS} |
| 382 |
systemtap? ( dev-util/systemtap ) |
| 383 |
- test? ( net-misc/curl ) |
| 384 |
-" |
| 385 |
+ test? ( net-misc/curl )" |
| 386 |
+ |
| 387 |
+S="${WORKDIR}/node-v${PV}" |
| 388 |
+ |
| 389 |
PATCHES=( |
| 390 |
- "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 391 |
+ "${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch |
| 392 |
) |
| 393 |
|
| 394 |
pkg_pretend() { |
| 395 |
@@ -67,7 +69,11 @@ src_prepare() { |
| 396 |
|
| 397 |
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 |
| 398 |
local LIBDIR=$(get_libdir) |
| 399 |
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die |
| 400 |
+ sed -i \ |
| 401 |
+ -e "s|lib/|${LIBDIR}/|g" \ |
| 402 |
+ -e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \ |
| 403 |
+ tools/install.py || die |
| 404 |
+ |
| 405 |
sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die |
| 406 |
|
| 407 |
# Avoid writing a depfile, not useful |
| 408 |
@@ -127,6 +133,11 @@ src_compile() { |
| 409 |
emake -C out |
| 410 |
} |
| 411 |
|
| 412 |
+src_test() { |
| 413 |
+ out/${BUILDTYPE}/cctest || die |
| 414 |
+ "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die |
| 415 |
+} |
| 416 |
+ |
| 417 |
src_install() { |
| 418 |
local LIBDIR="${ED}/usr/$(get_libdir)" |
| 419 |
emake install DESTDIR="${D}" |
| 420 |
@@ -144,8 +155,8 @@ src_install() { |
| 421 |
for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do |
| 422 |
sed -i '/fonts.googleapis.com/ d' $i; |
| 423 |
done |
| 424 |
- # Install docs! |
| 425 |
- dohtml -r "${S}"/doc/* |
| 426 |
+ # Install docs |
| 427 |
+ dodoc -r "${S}"/doc/* |
| 428 |
fi |
| 429 |
|
| 430 |
if use npm; then |
| 431 |
@@ -186,11 +197,6 @@ src_install() { |
| 432 |
fi |
| 433 |
} |
| 434 |
|
| 435 |
-src_test() { |
| 436 |
- out/${BUILDTYPE}/cctest || die |
| 437 |
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die |
| 438 |
-} |
| 439 |
- |
| 440 |
pkg_postinst() { |
| 441 |
einfo "The global npm config lives in /etc/npm. This deviates slightly" |
| 442 |
einfo "from upstream which otherwise would have it live in /usr/etc/." |
| 443 |
|
| 444 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild |
| 445 |
index be54bc3f1d6..f6a2fedbb6b 100644 |
| 446 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 447 |
+++ b/net-libs/nodejs/nodejs-99999999.ebuild |
| 448 |
@@ -29,7 +29,7 @@ RDEPEND=" |
| 449 |
sys-libs/zlib |
| 450 |
icu? ( >=dev-libs/icu-61.1:= ) |
| 451 |
npm? ( ${PYTHON_DEPS} ) |
| 452 |
- ssl? ( >=dev-libs/openssl-1.1:0= ) |
| 453 |
+ ssl? ( =dev-libs/openssl-1.1.0*:0= ) |
| 454 |
" |
| 455 |
DEPEND=" |
| 456 |
${RDEPEND} |
Archives