From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 055E913888F for ; Thu, 8 Oct 2015 22:54:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43005E080A; Thu, 8 Oct 2015 22:54:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC594E080A for ; Thu, 8 Oct 2015 22:54:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9CA333E3A9 for ; Thu, 8 Oct 2015 22:54:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 748D0C8F for ; Thu, 8 Oct 2015 22:54:09 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <1444344788.071e6473715de3bf9e1626bd290ebafaaa3b2310.jcallen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/nodejs-4.1.1.ebuild X-VCS-Directories: net-libs/nodejs/ X-VCS-Committer: jcallen X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 071e6473715de3bf9e1626bd290ebafaaa3b2310 X-VCS-Branch: master Date: Thu, 8 Oct 2015 22:54:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 14c44fd7-cd69-4da9-8f80-6d0d0aee1d3e X-Archives-Hash: f42c03beae20ac201757c4a5d4e7be3c commit: 071e6473715de3bf9e1626bd290ebafaaa3b2310 Author: Jonathan Callen gentoo org> AuthorDate: Thu Oct 8 22:52:30 2015 +0000 Commit: Jonathan Callen gentoo 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}