From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 992A4138334 for ; Mon, 23 Jul 2018 10:49:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB2E6E0A8B; Mon, 23 Jul 2018 10:49:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BC67E0A8B for ; Mon, 23 Jul 2018 10:49:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68E26335DB3 for ; Mon, 23 Jul 2018 10:49:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D8CE2E0 for ; Mon, 23 Jul 2018 10:49:25 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1532342879.889194e648e41fc1179e590d926dbee5371b37ce.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/, net-libs/nodejs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch net-libs/nodejs/nodejs-10.6.0-r1.ebuild net-libs/nodejs/nodejs-10.6.0.ebuild net-libs/nodejs/nodejs-10.7.0-r1.ebuild net-libs/nodejs/nodejs-10.7.0.ebuild X-VCS-Directories: net-libs/nodejs/files/ net-libs/nodejs/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 889194e648e41fc1179e590d926dbee5371b37ce X-VCS-Branch: master Date: Mon, 23 Jul 2018 10:49:25 +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: d135463d-6965-4f3c-9ddf-0a109eaadb59 X-Archives-Hash: 9cc4839615726ff45d27ccb9af50dd63 commit: 889194e648e41fc1179e590d926dbee5371b37ce Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jul 23 10:47:59 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jul 23 10:47:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889194e6 net-libs/nodejs: Fix npm patch (bug #660450). Package-Manager: Portage-2.3.43, Repoman-2.3.10 net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch | 4 ++-- net-libs/nodejs/{nodejs-10.6.0.ebuild => nodejs-10.6.0-r1.ebuild} | 0 net-libs/nodejs/{nodejs-10.7.0.ebuild => nodejs-10.7.0-r1.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch index e2bbbbe97a3..9c7fe6888fb 100644 --- a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch +++ b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch @@ -1,6 +1,6 @@ --- a/deps/npm/lib/config/core.js +++ b/deps/npm/lib/config/core.js -@@ -153,11 +153,13 @@ +@@ -153,11 +153,12 @@ // Eg, `npm config get globalconfig --prefix ~/local` should // return `~/local/etc/npmrc` // annoying humans and their expectations! @@ -8,12 +8,12 @@ - var etc = path.resolve(conf.get('prefix'), 'etc') - defaults.globalconfig = path.resolve(etc, 'npmrc') - defaults.globalignorefile = path.resolve(etc, 'npmignore') +- } + // gentoo deviates wrt global config; store in /etc/npm + var globalconfig = path.resolve('/etc', 'npm') + mkdirp(globalconfig, function () { + defaults.globalconfig = path.resolve(globalconfig, 'npmrc') + defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') - } + }) conf.addFile(conf.get('globalconfig'), 'global') diff --git a/net-libs/nodejs/nodejs-10.6.0.ebuild b/net-libs/nodejs/nodejs-10.6.0-r1.ebuild similarity index 100% rename from net-libs/nodejs/nodejs-10.6.0.ebuild rename to net-libs/nodejs/nodejs-10.6.0-r1.ebuild diff --git a/net-libs/nodejs/nodejs-10.7.0.ebuild b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild similarity index 100% rename from net-libs/nodejs/nodejs-10.7.0.ebuild rename to net-libs/nodejs/nodejs-10.7.0-r1.ebuild