diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2018-07-23 12:47:59 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2018-07-23 12:47:59 +0200 |
| commit | 889194e648e41fc1179e590d926dbee5371b37ce (patch) | |
| tree | 89ab5379a297faf43b5235b88cbe00d3e6dbfc9a /net-libs/nodejs | |
| parent | net-mail/ytnef: Security bump to version 1.9.3 (diff) | |
| download | gentoo-889194e648e41fc1179e590d926dbee5371b37ce.tar.gz gentoo-889194e648e41fc1179e590d926dbee5371b37ce.tar.bz2 gentoo-889194e648e41fc1179e590d926dbee5371b37ce.zip | |
net-libs/nodejs: Fix npm patch (bug #660450).
Package-Manager: Portage-2.3.43, Repoman-2.3.10
Diffstat (limited to 'net-libs/nodejs')
| -rw-r--r-- | net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch | 4 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-10.6.0-r1.ebuild (renamed from net-libs/nodejs/nodejs-10.6.0.ebuild) | 0 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-10.7.0-r1.ebuild (renamed from net-libs/nodejs/nodejs-10.7.0.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 e2bbbbe97a38..9c7fe6888fb8 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 index b02e635479a6..b02e635479a6 100644 --- a/net-libs/nodejs/nodejs-10.6.0.ebuild +++ b/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 index f5919ddd574e..f5919ddd574e 100644 --- a/net-libs/nodejs/nodejs-10.7.0.ebuild +++ b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild |