net-libs/nodejs: Fix npm patch (bug #660450).
authorJeroen Roovers <jer@gentoo.org>
Mon, 23 Jul 2018 10:47:59 +0000 (12:47 +0200)
committerJeroen Roovers <jer@gentoo.org>
Mon, 23 Jul 2018 10:47:59 +0000 (12:47 +0200)
Package-Manager: Portage-2.3.43, Repoman-2.3.10

net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
net-libs/nodejs/nodejs-10.6.0-r1.ebuild [moved from net-libs/nodejs/nodejs-10.6.0.ebuild with 100% similarity]
net-libs/nodejs/nodejs-10.7.0-r1.ebuild [moved from net-libs/nodejs/nodejs-10.7.0.ebuild with 100% similarity]

index e2bbbbe97a38399b9cf64de91ae0e319d55a4265..9c7fe6888fb8400e13a926bf9bf45ebc771801dc 100644 (file)
@@ -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')