From b0634db88352a3d54ca3f5ae2f47ff0690fcba1a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 27 Apr 2016 17:51:44 +0000
Subject: nodejs: update to 6.0.0

---
 abs/extra/nodejs/PKGBUILD | 67 ++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 45 deletions(-)

diff --git a/abs/extra/nodejs/PKGBUILD b/abs/extra/nodejs/PKGBUILD
index 2bb2da5..2fd031c 100644
--- a/abs/extra/nodejs/PKGBUILD
+++ b/abs/extra/nodejs/PKGBUILD
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -9,84 +9,61 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.10.32
-_npmver=2.0.2
-pkgrel=3
+pkgver=6.0.0
+pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
 url='http://nodejs.org/'
 license=('MIT')
-depends=('openssl')
-provides=('nodejs-node-gyp')
-makedepends=('python2' 'git' 'procps-ng')
-optdepends=('python2: for node-gyp')
-checkdepends=('curl')
-options=('!emptydirs')
-source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
-        git+https://github.com/npm/npm.git#tag=v$_npmver)
-sha256sums=('c2120d0e3d2d191654cb11dbc0a33a7216d53732173317681da9502be0030f10'
-            'SKIP')
+depends=('openssl' 'zlib' 'icu' 'libuv' 'http-parser') # 'v8')
+makedepends=('python2' 'procps-ng' 'git')
+optdepends=('npm: nodejs package manager')
+source=("git+https://github.com/nodejs/node.git#tag=v$pkgver")
+sha256sums=('SKIP')
 
 prepare() {
-  cd node-v$pkgver
-
-  # We need newer version of npm to fix bugs
-  rm -r deps/npm
-  ln -s "$srcdir/npm" deps
-  rm -r "$srcdir/npm/.git"
+  cd node
 
   msg 'Fixing for python2 name'
   find -type f -exec sed \
     -e 's_^#!/usr/bin/env python$_&2_' \
     -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
     -e 's_^#!/usr/bin/python$_&2_' \
+    -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
+    -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
     -e "s_'python'_'python2'_" -i {} \;
   find test/ -type f -exec sed 's_python _python2 _' -i {} \;
 }
 
 build() {
-  cd node-v$pkgver
+  cd node
 
   export PYTHON=python2
   ./configure \
     --prefix=/usr \
-    --shared-openssl
+    --with-intl=system-icu \
+    --without-npm \
+    --shared-openssl \
+    --shared-zlib \
+    --shared-libuv \
+    --shared-http-parser
+    # --shared-v8
 
   make
-
-  cd ../npm
-  ../node-v$pkgver/node cli.js install ronn marked
-  PATH="$srcdir/node-v$pkgver:$PATH" make
-  ../node-v$pkgver/node cli.js uninstall ronn marked
 }
 
 check() {
-  cd node-v$pkgver
-  make test || warning "Tests failed"
+  cd node
+  make test
 }
 
 package() {
-  cd node-v$pkgver
+  cd node
 
   make DESTDIR="$pkgdir" install
 
-  # install docs as per user request
-  install -d "$pkgdir"/usr/share/doc/nodejs
-  cp -r doc/api/{*.html,assets} \
-    "$pkgdir"/usr/share/doc/nodejs
-
   install -D -m644 LICENSE \
     "$pkgdir"/usr/share/licenses/nodejs/LICENSE
-
-  install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
-  for _dir in man1 man3 man5 man7; do
-    cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
-    for _file in *; do
-      ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
-    done
-  done
-
-  ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v0.12

