Gentoo Archives: gentoo-commits

From: Jonathan Callen <jcallen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
Date: Thu, 08 Oct 2015 22:54:19
Message-Id: 1444344788.071e6473715de3bf9e1626bd290ebafaaa3b2310.jcallen@gentoo
1 commit: 071e6473715de3bf9e1626bd290ebafaaa3b2310
2 Author: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 8 22:52:30 2015 +0000
4 Commit: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 22:53:08 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e6473
7
8 net-libs/nodejs: Fix build with USE=-npm
9
10 Gentoo-Bug: 562518
11 Package-Manager: portage-2.2.22
12
13 net-libs/nodejs/nodejs-4.1.1.ebuild | 8 +++++---
14 1 file changed, 5 insertions(+), 3 deletions(-)
15
16 diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.1.1.ebuild
17 index af811ba..fb66363 100644
18 --- a/net-libs/nodejs/nodejs-4.1.1.ebuild
19 +++ b/net-libs/nodejs/nodejs-4.1.1.ebuild
20 @@ -119,9 +119,11 @@ src_compile() {
21 src_install() {
22 local LIBDIR="${ED}/usr/$(get_libdir)"
23 emake install DESTDIR="${ED}" PREFIX=/usr
24 - use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
25 - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
26 - find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
27 + if use npm; then
28 + dodoc -r "${LIBDIR}"/node_modules/npm/html
29 + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
30 + find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
31 + fi
32
33 # set up a symlink structure that npm expects..
34 dodir /usr/include/node/deps/{v8,uv}