[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

[Jonathan Callen]

commit:     071e6473715de3bf9e1626bd290ebafaaa3b2310
Author:     Jonathan Callen <jcallen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 22:52:30 2015 +0000
Commit:     Jonathan Callen <jcallen <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 22:53:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e6473

net-libs/nodejs: Fix build with USE=-npm

Gentoo-Bug: 562518
Package-Manager: portage-2.2.22

 net-libs/nodejs/nodejs-4.1.1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild 
b/net-libs/nodejs/nodejs-4.1.1.ebuild
index af811ba..fb66363 100644
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.1.1.ebuild
@@ -119,9 +119,11 @@ src_compile() {
 src_install() {
        local LIBDIR="${ED}/usr/$(get_libdir)"
        emake install DESTDIR="${ED}" PREFIX=/usr
-       use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
-       rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-       find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name 
"LICENCE*" -delete || die
+       if use npm; then
+               dodoc -r "${LIBDIR}"/node_modules/npm/html
+               rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+               find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or 
-name "LICENCE*" -delete || die
+       fi
 
        # set up a symlink structure that npm expects..
        dodir /usr/include/node/deps/{v8,uv}