commit: 889194e648e41fc1179e590d926dbee5371b37ce
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 10:47:59 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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
