[arch-commits] Commit in npm/trunk (PKGBUILD)

[Felix Yan]

    Date: Saturday, March 24, 2018 @ 03:51:17
  Author: felixonmars
Revision: 311708

upgpkg: npm 5.8.0-1

Modified:
  npm/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-24 03:50:34 UTC (rev 311707)
+++ PKGBUILD	2018-03-24 03:51:17 UTC (rev 311708)
@@ -2,19 +2,17 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=npm
-pkgver=5.7.1
+pkgver=5.8.0
 pkgrel=1
 pkgdesc='A package manager for javascript'
 arch=('any')
 url='https://www.npmjs.com/'
 license=('custom:Artistic')
-depends=('nodejs' 'semver')
-provides=('nodejs-node-gyp')
+depends=('nodejs' 'node-gyp' 'semver')
 makedepends=('procps-ng' 'marked-man')
-optdepends=('python2: for node-gyp')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/npm/archive/v$pkgver.tar.gz")
-sha512sums=('e100e0819bae1e5d9b4766319a8280801160dca75244a50a99a2f2b9ca36da2dba432e9ee615735e21030684982f811bf7b90349e073e8c6e740f5eb8a446298')
+sha512sums=('63864ad8e6a6204f010bbe1ce728df00f97f1ef0c7e6bff9b59faec1d200eb1ea8687ffb42d032d040fe6e12a50756dacb50191e8d03687ed9e2f4d38013f35b')
 
 prepare() {
   cd npm-$pkgver
@@ -30,21 +28,12 @@
   cd npm-$pkgver
   make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
 
-  # Provide node-gyp executable
-  cp "$pkgdir"/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp "$pkgdir"/usr/bin/node-gyp
-  sed -i 's|"`dirname "$0"`/../../|"`dirname "$0"`/../lib/node_modules/npm/|' "$pkgdir"/usr/bin/node-gyp
-
   # Why 777? :/
   chmod -R u=rwX,go=rX "$pkgdir"
 
   # Experimental dedup
-  for _d in "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules \
-            "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/node-gyp/node_modules; do
-    cd "$_d"
-    for dep in semver; do
-      rm -r $dep;
-    done
-  done
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/semver
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/npm-lifecycle/node_modules/node-gyp
 
   install -dm755 "$pkgdir"/usr/share/bash-completion/completions
   node "$srcdir"/npm-$pkgver/bin/npm-cli.js completion > "$pkgdir"/usr/share/bash-completion/completions/npm