[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

["Patrick Lauer" <patrick@gentoo.org>]

commit:     3e7c8207ba4c7fe17cbe834faa279b411367626a
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 09:00:15 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 09:00:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c8207

net-libs/nodejs: Bump, remove old

Package-Manager: portage-2.2.28

 net-libs/nodejs/Manifest                           |   9 +-
 net-libs/nodejs/nodejs-4.2.2.ebuild                | 155 ----------------
 .../{nodejs-4.1.1.ebuild => nodejs-4.4.1.ebuild}   |  44 ++---
 net-libs/nodejs/nodejs-5.0.0.ebuild                | 155 ----------------
 net-libs/nodejs/nodejs-5.3.0.ebuild                | 155 ----------------
 net-libs/nodejs/nodejs-5.4.1.ebuild                | 155 ----------------
 net-libs/nodejs/nodejs-5.7.1.ebuild                | 195 ---------------------
 ...{nodejs-5.6.0-r1.ebuild => nodejs-5.9.1.ebuild} |   5 +-
 8 files changed, 22 insertions(+), 851 deletions(-)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0b47e63..0dbe90e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,13 +1,8 @@
 DIST node-v0.12.10.tar.gz 19572955 SHA256 edbd3710512ec7518a3de4cabf9bfee6d12f278eef2e4b53422c7b063f6b976d SHA512 d217f52dfedb5355df89b9c726f6bc68e53a713e6e005a66beefdbd20666b55770bab2eca6f39275aa1a64aca922a2a78808900ebaa4005eb21042a915413a7b WHIRLPOOL 4fe3e370cc645672590483e4b388a37a82fb04dfbbcf16a7a9cc2c1a47600e650ae5712133b205c3067180305a61e76fde9a7b78ad53d25f8f07b97e86271751
 DIST node-v0.12.6.tar.gz 19750717 SHA256 7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f WHIRLPOOL 3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380
 DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
-DIST node-v4.1.1.tar.xz 12818088 SHA256 f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680 WHIRLPOOL e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629
-DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb WHIRLPOOL 2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167
 DIST node-v4.4.0.tar.xz 13107524 SHA256 6ae44ae9a9cd1f102ca7f3ea09ca6223afe88fab4911f1bf21c9da2a1e795f1d SHA512 4bb1f660c5a80fffb3399c4465c311bd13c2f78e65fc9aaa7df96d3c2db5d3b3de3b4be9f50040065fa1889ad247a2949a84a6d9044301a636ebb8baf73edd4d WHIRLPOOL 50b126fc3a7b8b6be693334375b4704217b4e6f00e7e32404a17ebad512e3cc72434f00863a1e69bb85e01859054faac7bb5c2d25889b8ef131191a388528e0c
-DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923
-DIST node-v5.3.0.tar.xz 12776504 SHA256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e SHA512 f65773c35ce774bc6fe242f8627e5786f441f0286f7d272e854e2e2d6b927d5f368c366ff52dd780f7817fedf3935ec25e78ed3f81d4613495663eb81e2afbb1 WHIRLPOOL 5f270ed6fe35dba091bd75e6ad9de419c781fc6f919915a4117b8c0bbb2ea11a05369a9149e4f69614de508ff109eb94b24bdafc0832e91e055f01b0ef214c67
-DIST node-v5.4.1.tar.xz 12812444 SHA256 4e7d3fdfeac85c46ddaef0224695620f218e7a178e97d6e210d6d643483f1d53 SHA512 9803478d502bf11bfc77e56109568b0f64186826be35a9b36b47b63ec744595db128955e6f7bec7eb4db39e85afdd364b1215427954ce33ab67689ff03a5bc57 WHIRLPOOL 87f791f4f0722a2d3bcb630d22548f395ac0e86dedc37849caab2d63bc43bad2621058f95eb2b31b1f3b01ec8585c0731c969a1f0167d95495008b44f3b69066
-DIST node-v5.6.0.tar.xz 13311288 SHA256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 SHA512 ef38d9ce708b8283b7f7441a0c2787e64c0602fb50542b4ccd29e705f879626adf2c1d89a9040af55b1f00b6e45d1d87ca829bf6816768933af9b5661f654aa7 WHIRLPOOL 6b5dcd85a74b47554400a6ff62e4001bb04b9063987571ac4434116d807d04ee58a0ca622973ff4b81c064e4ec1b0cd2f881680eb7f1ced5aeda745bf48538ab
-DIST node-v5.7.1.tar.xz 13191096 SHA256 029ed8aeb997c68d1a901cd837af02d24b6b5e20a4ff93bed090fd289f91a9a1 SHA512 11b38722f1bb4c8310d66304541b6a644c453b770d562c0f172391b1234a304493ed39ddbd6790f0f98d3fa72a0be2ac0ae292d67604178a108217276530a463 WHIRLPOOL 6a7ea4bbfb0418912b4505a09a926b3a518368142e77bbddf78e325d719180254c6157ef46851eee61469749e1eb9dbd671960544b9cb0f8264f8c13d3542a1c
+DIST node-v4.4.1.tar.xz 13112424 SHA256 3a37c89a3ac965688f9e6557579993b73eee44195a5fd53fded03a667d3d6a0a SHA512 53b479085a6f43b5932c75729b21a3efa67534ce6c10445c2ba66492a0e3f12d8e5de8d75bd583239b68f3d5ac1b639d45fd43d631d8a5ef013e25bff0fdab22 WHIRLPOOL d9cee2193a0f94f17ab84722ffb9999f156014cbe0b83bd138d5404ec543a3398bb4d1b965940b19230cf069337dfb5e0159aae3e694137e09261133ae2e2fdd
 DIST node-v5.8.0.tar.xz 13214028 SHA256 c1246d473d6650ca02ab168eaf840e9edda82a4190ff08165fc44a7b381a9361 SHA512 ab23b90714be2efc937da2fe11457f266e4bb392da9856e548012d1812546ecebf4b49546d82c595b15d4c78835df612681a2bbd62dd925e1db204a19b6a09ce WHIRLPOOL 5f6dfdaf1e87ae79f92c9b075dec03287b896b05a4bc1c477404f571f25672ca8512a5cb88e602923135e2fd0ee27aea12bcb1349a6a5f2ac52b8855512f44b2
 DIST node-v5.9.0.tar.xz 13223372 SHA256 9bdf2f8e44a721df459dfad0072a8ac46f11c05d25fc33dc0dc9c522827e34bb SHA512 d0ec18fbb497d91d1520362af4a882357e1d6b33c3ae0e6cbb9697e1d1f4504361f8d6aeeada6a959b2bb190a81b5f118a66c768421344dcb6aebda512a24fa7 WHIRLPOOL 0f895fcc9e2fb82d203e80cf3166f9f524fb4e82ae2d5b1706a5dfe0db08588b474a32294c7865198cde116f228e60a6dfd3f1a965549792c884db7b44fca690
+DIST node-v5.9.1.tar.xz 13226192 SHA256 668067077dfceb3d2039d0df693fec6aa20b920d01a42b53dc61d4aa91e0ae55 SHA512 34774d88eda775bdf153a76bd02b26c499e4a9ef47d8e94ad7b66d360d04891b45ce8f211833ca69e8c0a786ca36424b0c620a90b1fbc6d5afc77d20f4b5fadb WHIRLPOOL d666aa6fd4d577f7a6f89c3bfa75e62a0281e0dd7592373f384bfe01fa2dcbf81156bf6a21fc2097d48d5024a39057713c2593f4609c70ff8f84090471b073a9

diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild b/net-libs/nodejs/nodejs-4.2.2.ebuild
deleted file mode 100644
index 73c1cdb..0000000
--- a/net-libs/nodejs/nodejs-4.2.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="debug icu +npm snapshot +ssl"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:0=[-bindist]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++11 ; then
-			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1 # Verbose build
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-	# AssertionError: 1 == 2 (on line 97)
-	rm test/parallel/test-cluster-disconnect.js || die
-	# AssertionError: Client never errored
-	rm test/parallel/test-tls-hello-parser-failure.js || die
-	# --- TIMEOUT ---
-	rm test/parallel/test-child-process-fork-net.js \
-		test/parallel/test-child-process-fork-net2.js \
-		test/parallel/test-child-process-recv-handle.js \
-		test/parallel/test-cluster-dgram-1.js \
-		test/parallel/test-cluster-send-deadlock.js \
-		test/parallel/test-cluster-shared-handle-bind-error.js \
-		test/parallel/test-dgram-exclusive-implicit-bind.js \
-		test/parallel/test-tls-ticket-cluster.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		x32) myarch="x32";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}

diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.4.1.ebuild
similarity index 76%
rename from net-libs/nodejs/nodejs-4.1.1.ebuild
rename to net-libs/nodejs/nodejs-4.4.1.ebuild
index ed3202b..5512f91 100644
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.4.1.ebuild
@@ -5,32 +5,38 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
 
 inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
 
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="debug icu +npm snapshot +ssl"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-55:= )
+	npm? ( ${PYTHON_DEPS} )
+	>=net-libs/http-parser-2.5.2:=
+	>=dev-libs/libuv-1.8.0:=
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:=[-bindist]"
-DEPEND="${RDEPEND}"
+	test? ( net-misc/curl )"
 
 S="${WORKDIR}/node-v${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 pkg_pretend() {
-	if ! test-flag-CXX -std=c++11 ; then
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
 		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-	fi
 }
 
 src_prepare() {
@@ -61,19 +67,6 @@ src_prepare() {
 	# It doesn't really belong upstream , so it'll just be removed until someone
 	# with more gentoo-knowledge than me (jbergstroem) figures it out.
 	rm test/parallel/test-stdout-close-unref.js || die
-	# AssertionError: 1 == 2 (on line 97)
-	rm test/parallel/test-cluster-disconnect.js || die
-	# AssertionError: Client never errored
-	rm test/parallel/test-tls-hello-parser-failure.js || die
-	# --- TIMEOUT ---
-	rm test/parallel/test-child-process-fork-net.js \
-		test/parallel/test-child-process-fork-net2.js \
-		test/parallel/test-child-process-recv-handle.js \
-		test/parallel/test-cluster-dgram-1.js \
-		test/parallel/test-cluster-send-deadlock.js \
-		test/parallel/test-cluster-shared-handle-bind-error.js \
-		test/parallel/test-dgram-exclusive-implicit-bind.js \
-		test/parallel/test-tls-ticket-cluster.js || die
 
 	# debug builds. change install path, remove optimisations and override buildtype
 	if use debug; then
@@ -139,8 +132,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {

diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild b/net-libs/nodejs/nodejs-5.0.0.ebuild
deleted file mode 100644
index 73c1cdb..0000000
--- a/net-libs/nodejs/nodejs-5.0.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="debug icu +npm snapshot +ssl"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:0=[-bindist]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++11 ; then
-			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1 # Verbose build
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-	# AssertionError: 1 == 2 (on line 97)
-	rm test/parallel/test-cluster-disconnect.js || die
-	# AssertionError: Client never errored
-	rm test/parallel/test-tls-hello-parser-failure.js || die
-	# --- TIMEOUT ---
-	rm test/parallel/test-child-process-fork-net.js \
-		test/parallel/test-child-process-fork-net2.js \
-		test/parallel/test-child-process-recv-handle.js \
-		test/parallel/test-cluster-dgram-1.js \
-		test/parallel/test-cluster-send-deadlock.js \
-		test/parallel/test-cluster-shared-handle-bind-error.js \
-		test/parallel/test-dgram-exclusive-implicit-bind.js \
-		test/parallel/test-tls-ticket-cluster.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		x32) myarch="x32";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}

diff --git a/net-libs/nodejs/nodejs-5.3.0.ebuild b/net-libs/nodejs/nodejs-5.3.0.ebuild
deleted file mode 100644
index 73c1cdb..0000000
--- a/net-libs/nodejs/nodejs-5.3.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="debug icu +npm snapshot +ssl"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:0=[-bindist]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++11 ; then
-			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1 # Verbose build
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-	# AssertionError: 1 == 2 (on line 97)
-	rm test/parallel/test-cluster-disconnect.js || die
-	# AssertionError: Client never errored
-	rm test/parallel/test-tls-hello-parser-failure.js || die
-	# --- TIMEOUT ---
-	rm test/parallel/test-child-process-fork-net.js \
-		test/parallel/test-child-process-fork-net2.js \
-		test/parallel/test-child-process-recv-handle.js \
-		test/parallel/test-cluster-dgram-1.js \
-		test/parallel/test-cluster-send-deadlock.js \
-		test/parallel/test-cluster-shared-handle-bind-error.js \
-		test/parallel/test-dgram-exclusive-implicit-bind.js \
-		test/parallel/test-tls-ticket-cluster.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		x32) myarch="x32";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}

diff --git a/net-libs/nodejs/nodejs-5.4.1.ebuild b/net-libs/nodejs/nodejs-5.4.1.ebuild
deleted file mode 100644
index 73c1cdb..0000000
--- a/net-libs/nodejs/nodejs-5.4.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="debug icu +npm snapshot +ssl"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:0=[-bindist]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++11 ; then
-			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1 # Verbose build
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-	# AssertionError: 1 == 2 (on line 97)
-	rm test/parallel/test-cluster-disconnect.js || die
-	# AssertionError: Client never errored
-	rm test/parallel/test-tls-hello-parser-failure.js || die
-	# --- TIMEOUT ---
-	rm test/parallel/test-child-process-fork-net.js \
-		test/parallel/test-child-process-fork-net2.js \
-		test/parallel/test-child-process-recv-handle.js \
-		test/parallel/test-cluster-dgram-1.js \
-		test/parallel/test-cluster-send-deadlock.js \
-		test/parallel/test-cluster-shared-handle-bind-error.js \
-		test/parallel/test-dgram-exclusive-implicit-bind.js \
-		test/parallel/test-tls-ticket-cluster.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		x32) myarch="x32";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}

diff --git a/net-libs/nodejs/nodejs-5.7.1.ebuild b/net-libs/nodejs/nodejs-5.7.1.ebuild
deleted file mode 100644
index 3a04fa7..0000000
--- a/net-libs/nodejs/nodejs-5.7.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2f:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	!!net-libs/iojs
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		x32) myarch="x32";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-
-	use doc && emake doc
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/out/doc/api/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${D}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${D}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}

diff --git a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild b/net-libs/nodejs/nodejs-5.9.1.ebuild
similarity index 98%
rename from net-libs/nodejs/nodejs-5.6.0-r1.ebuild
rename to net-libs/nodejs/nodejs-5.9.1.ebuild
index 913f2cf..deb2fc3 100644
--- a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-5.9.1.ebuild
@@ -20,13 +20,12 @@ IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
 	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.1:=
+	>=net-libs/http-parser-2.6.2:=
 	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2f:0=[-bindist]
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	!!net-libs/iojs
 	test? ( net-misc/curl )"
 
 S="${WORKDIR}/node-v${PV}"