summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-03-16 15:44:52 +0100
committerJeroen Roovers <jer@gentoo.org>2019-03-16 15:45:36 +0100
commit63b2a3dad7c33d1129462e0df1b526399a3c17be (patch)
tree0fbbb1b96651853fd1bd0be4f028ca6092c5dcbd
parentnet-libs/nodejs: Old (diff)
downloadgentoo-63b2a3dad7c33d1129462e0df1b526399a3c17be.tar.gz
gentoo-63b2a3dad7c33d1129462e0df1b526399a3c17be.tar.bz2
gentoo-63b2a3dad7c33d1129462e0df1b526399a3c17be.zip
net-libs/nodejs: Update live ebuild
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--net-libs/nodejs/nodejs-99999999.ebuild36
1 files changed, 21 insertions, 15 deletions
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 23540898bdb..98c1addd667 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -19,17 +19,17 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
inspector? ( icu ssl )
+ npm? ( ssl )
"
RDEPEND="
- >=dev-libs/libuv-1.19.2:=
+ >=dev-libs/libuv-1.26.0:=
>=net-dns/c-ares-1.15.0
>=net-libs/http-parser-2.9.0:=
- >=net-libs/nghttp2-1.29.0
+ >=net-libs/nghttp2-1.34.0
sys-libs/zlib
- icu? ( >=dev-libs/icu-61.1:= )
- npm? ( ${PYTHON_DEPS} )
- ssl? ( =dev-libs/openssl-1.1.0*:0= )
+ icu? ( >=dev-libs/icu-63.1:= )
+ ssl? ( =dev-libs/openssl-1.1.1*:0= )
"
DEPEND="
${RDEPEND}
@@ -69,7 +69,7 @@ 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}'/" 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
@@ -93,7 +93,10 @@ src_prepare() {
}
src_configure() {
- local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+ local myconf=(
+ --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+ --shared-zlib
+ )
use debug && myconf+=( --debug )
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
use inspector || myconf+=( --without-inspector )
@@ -145,8 +148,9 @@ src_install() {
for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
sed -i '/fonts.googleapis.com/ d' $i;
done
- # Install docs!
- dohtml -r "${S}"/doc/*
+ # Install docs
+ docinto html
+ dodoc -r "${S}"/doc/*
fi
if use npm; then
@@ -185,6 +189,8 @@ src_install() {
"${find_name[@]}" \
\) \) -exec rm -rf "{}" \;
fi
+
+ mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
}
src_test() {
@@ -193,10 +199,10 @@ src_test() {
}
pkg_postinst() {
- einfo "The global npm config lives in /etc/npm. This deviates slightly"
- einfo "from upstream which otherwise would have it live in /usr/etc/."
- einfo ""
- einfo "Protip: When using node-gyp to install native modules, you can"
- einfo "avoid having to download extras by doing the following:"
- einfo "$ node-gyp --nodedir /usr/include/node <command>"
+ elog "The global npm config lives in /etc/npm. This deviates slightly"
+ elog "from upstream which otherwise would have it live in /usr/etc/."
+ elog ""
+ elog "Protip: When using node-gyp to install native modules, you can"
+ elog "avoid having to download extras by doing the following:"
+ elog "$ node-gyp --nodedir /usr/include/node <command>"
}