gentoo resync : 04.01.2018

8 files changed, 277 insertions, 414 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 23dbca57fdfa..acd83c147711 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,21 +1,21 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
-AUX nodejs-8.9.0-shared-nghttp2.patch 3094 BLAKE2B 6736390b0f8fb8d5d68b517bf3b2e93c1beca921288ffc9f0c80c382206431579b42e1927f042e9cce72c55ac75bda97c5a6710b7bb2e38e810fe5eec7c9ca27 SHA512 e833e75521c222ab5742b8be020661d6fb82935983e87504c2fb6d4ec6ff42d44ab7323c984c4d07d0c29989c90575d50c57a1974555a5705eba74c140a6eb45
-AUX nodejs-9.2.0-shared-nghttp2.patch 3166 BLAKE2B 2dfdc5b79ce5c2bb55c016ae78922208b0a269c278f54f98e2e5e17f48d84463c3dd15ae6e674bdc8361dbcf238e31941d54296b8a000028eea4428ac009de2f SHA512 8e08599fd896f24388b7e70fdee87692c0e4c327230b20ce929c3cde529187c2cd94e6fadaa0421aad3e54bff63936ad81d8c4b6cbd27c97bbee7346423eecac
 DIST node-v0.12.17.tar.gz 19938029 BLAKE2B 0118fb016c70afc9940c3b9e2fbed9fd3a56ae7fd8bff6f2ec69320f1e3a71868f7e882783871e842d163b5195628040736e679ca715ebddc6eb6a76fff1288f SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7
+DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v4.8.5.tar.xz 13316060 BLAKE2B fb32f176b9d4add3e9695f0bee7ebd0bba66770d479b1fade572de4694566603f08875da6ff97a1904edd1156708b58670fb1c4717e213aab6ad44ae5d470f40 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12
+DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
-DIST node-v6.12.2.tar.xz 15760164 BLAKE2B 89daf5d52a430a729f9c55f10483805a6b802abdffa2a3bbcaa8ce71c78321eadedaabe1b28cd781c6b894923821bbb1743754cbabafda0a0e9abb7b6b11fa78 SHA512 914eea968dacb086f5083ee0845a982969a5c56ab183c8da17812d8386095db1e9c2d07dee4f6186091d64cde605d1ffc15d17025ea28d1c3ee3bceefff6c399
+DIST node-v6.12.3.tar.xz 15767900 BLAKE2B 2a986c8099d14b199e33676e1a7d416919407558a42d14e526794baa29d8788c74a5ff47e8d2a8509a747682bea393b45e31965569a4b72976b7691f2a84e971 SHA512 dcf30bc221aa949e6ca3bd9321ac68adb05d93af0b06119b4b73bfd4cfa2c31897520d90247ac0f783946c1fc2efe77178f52225150dad4522ac9408d036a8e4
 DIST node-v6.9.4.tar.xz 15519264 BLAKE2B 4dfad88b06b209272b8468501cc3c87c40425781fb55011ee93326555c2df88a166ffaff1877563668e06389703053849361739556f1bc87c1e2386d48b9542e SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce
-DIST node-v8.9.3.tar.xz 18298212 BLAKE2B 7d19fcb77c496fb3aa717d426a3db4630e382738f0fe3273bba3137814470a5fe5e9593c18934cfd62816a0ac33d195eb241c810f4756d84eaa8f974606a485b SHA512 7bd037189925387bfd1339eef5be9af10af0a063914b4cdb2a1f3befec2e76eb566f7d14874b8c70a02172ebeb4d1c1fdbb0715ca8f18b0b5711a38b30214bc8
-DIST node-v9.2.1.tar.xz 18346796 BLAKE2B 8fe82a9b50636fef21f9bba05e89381f6785f18599adb5183d4276df4d0e5b2a4d1bb3d8137143fb87d8638ce82f6812ff237764f7b76f1bee65199a93c91e88 SHA512 379a340186c8299df02a90dce730250d46b502ef58ca4720ede48a5053d0f1e6ee958003dd9e3c0b76f4575980217d9dc5a9cd93a2a4e58da324d04d6d5edc7e
+DIST node-v8.9.4.tar.xz 18338980 BLAKE2B 81180fc0c9b10cebc051a72649fb40650c89a05d427b826a6f3937e2b108b97edd27dd1c1521e57168e5a92b37e590429735c07c3198e4b912774c305ae61693 SHA512 9656b57145c2b3048ff9ad70f91dbff33a7349dca564efe3b2ff585e2ffad004ea8de920a7a049ff4c5487683986d78b5a578306c2c99f3b1a3de96d9ad1dece
 DIST node-v9.3.0.tar.xz 18385364 BLAKE2B 825fd8786b68020f7bb2735e519cd5ecb49552766646425613780736e7c20f555007e90048abd3e985d27656a39da6737ced5c905f113b0e531549312751e2d8 SHA512 bafc3bbd01ce0cc00f13e6f34b8ed361cff337c71b90836132c8188b1103ba2d6aab145258b6afafafc2455fa8a5de54be265435a553793946fd6d308095ae3e
 EBUILD nodejs-0.12.17.ebuild 3425 BLAKE2B b1c8ea2a39ee873c2d46a68af2e6050ae6e879ae9a80d20543e4486fda5885385b702394b4af1284883cc0685541ae7184e3b0c9b97866190d28e66a3d508534 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075
+EBUILD nodejs-0.12.18.ebuild 3437 BLAKE2B 7e4f091b468b62780e479360c9a1afda0eb792d475aed7bef93fee9631f9beb7f883cdea83dc0c21cb4b638c0cb60d7dd07051c36aac4f52d13bc7ffff3d89f5 SHA512 3fe9bbcb88764aa3f143d28eb8749f2d8daa8750979196b6b307cb8d820e43e9d91eda620c914c9c843cab542c5d3051fc081f4f5ba9dba35e75708be72331ba
 EBUILD nodejs-4.8.5.ebuild 4435 BLAKE2B 0a226e511e27eef347c542d1830e86208636159384983d1be76f08b220008e5e999e303a78feeff58beb52d6f3f18382804b9114cd1d73a4b1aaab329f676406 SHA512 66f3bfae15bef4755f9ec630c4bc50a44ae0b63102c3568bf6ca41caea66bca09cd67eb8dc314a27b0a571f2672e93f3937b9f14e3b19a0eaf36221c36c07d66
+EBUILD nodejs-4.8.7.ebuild 4433 BLAKE2B c5c073d61215f80b3a80d150f867e8392d053b6480df209c9486ba4f9f081d4120cfccc0a179c606dd5a96d909f19ff4198351d800d10bb262b7e9981cc87c3c SHA512 c037bc483828db1ea11ac0ad379da5453a9f263fb3298d20b897346ea18bd54f8820365846cf092a4fde1bfb1e8b86360b4d45e0b467cb58193f4f556beda342
 EBUILD nodejs-6.11.5.ebuild 6090 BLAKE2B c90aa71b89dab6ff99da43cdfeae4eabcbd28f4e865bcd4129a0978070f176a826bd81b7464453ea54f4a17a582667a1a2f4622eec5d76117d4c4b2af6ae15e0 SHA512 3b203a496f10605a816d5cd8ca9563b9d8ce6829dccf6b8934d9c63275e042aca2371bb5b9356ad88d299aa7336c94e074fa5e8d9ebe8259bd80c76205216486
-EBUILD nodejs-6.12.2.ebuild 6179 BLAKE2B 6dfcc4acf5977db1fb003583e194158ba2d5cd5f01873822c17368afe152959bb84fe40587f585a06ba5590bed19b669cbf7816b48d7154d7585e925935dd1a7 SHA512 a5f364c27a4c90be5580329b209f68bbe480626b79bb5f8d0299db1cc6a87f76bd5e80244d6a3b5d4ef10232537e9aa9f82475d5182a8083bda499cdbdbc7bc1
+EBUILD nodejs-6.12.3.ebuild 6179 BLAKE2B f7343d5fcf848e46790ef98f63e9fa96b3f9635383f4a3ccfc35547d2a0f59a5f3419aaae2cbab88b58d889db87588597bbb347fcbcd065cc2eef53dabc92fde SHA512 3bfbd565dc0f29d2a286b54e3f355d8960f8cab40d04caa693ff02d6c185cdb224195e603ab8cb178f3ce9dabd6313751367185b43b1f7c58e21335862132964
 EBUILD nodejs-6.9.4.ebuild 6073 BLAKE2B cf41081773527f8efb120d6d7ba8d21dc834fc47fbf1964fc235853d842321899c605f42e2799136a54f65e6140c89a05726ba49d86a5fcd78fa4c78114f1e96 SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7
-EBUILD nodejs-8.9.3.ebuild 6398 BLAKE2B d5a432f78b1613d30fbcf3552665530b1db8f7401e60c858f9160517ce19fbdae99071d41c7cd0c018969b419bb3b54fd11d571f6ff8fc7ba5dfa48efbba1e00 SHA512 7f6ac6b6ba793a09eadde6e7fde3c6787157d60a40d51ba873a85917f72679ee40d57fdbd8b91d93aa7049196abdd2c5faf13a318498dae303fa512a71c16531
-EBUILD nodejs-9.2.1.ebuild 6421 BLAKE2B 8373da68cf051d055edfe47e737ecd091dce243430efb25cd9ce2b04213a16364aac0613ff793ef7e44dde94a1c28bfa7b0711c7bfa02a80c01097fb6dfcb546 SHA512 25d09d0fed3bf63d67edfc98699388b8fdd33812577417704f2a242f9e8290dce509c6c90b335020960a387999e35c0343256e5a85003b9a253bcd14ba805eb1
+EBUILD nodejs-8.9.4.ebuild 6349 BLAKE2B 7a090373ca9551e2853f5637206a69e7f2e55efedb65694defc39f7cd5530b7858bc2285f1a1ee622d72b7b4e940de7445f272ea37194db10527892f9a2272af SHA512 8fa17c50b027ef4439b465612dbb81bb848da88e18d531bcd18a520fe91962567d03638e9b8449d30725197625653b435e3d95771294bc61ec397dbf57a4755a
 EBUILD nodejs-9.3.0.ebuild 6350 BLAKE2B 1b8b2ed276c850a2065804e19e79b5a32eb2d768a52f169794732075663cf6ab8d5133cc3b5b5f41f58547745455a0b189af440473db5157539fed6f698afa7d SHA512 dc75843801d5075d8e6b627b85a5272d21e5f7e0a622044578aba30d326b657291b1d9630b0ed293a6b8dda09722edc0b97c037abcd5ea7ad1701d7a0f66a763
 EBUILD nodejs-99999999.ebuild 6281 BLAKE2B a994bcf6c89d23f551c9b16bdcc85633b91f27f3317c929470350413ecbd16bfc3c22a3d506cd77b6960be3810919092eb7d48025b1614e93099071abfb8ea8b SHA512 d1871476fb4ce74d921bfc35b36fa1e7e59d7a8c8a9fb660e61e3a4b0d5b8536c5ef0667e6079a68d0feef798ea62a74cfa85caf86b00e2483265ad8e94ca269
 MISC metadata.xml 502 BLAKE2B 8640b71810454f7c091026e02910563ee44866ed666fc18be431415054ce38e6dab45f8e1890161d5b39e6eafe0279caed936046b803e619880a7ddeb3e4e428 SHA512 bc6fd0a671ad96d8c3f190514932ccc19319c895829136cd04d99b4123666380ed84502d7dea711dfb1d0ba7f0c6edb88afdc95ff24fbca4a6ad636062b5c32a
diff --git a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
deleted file mode 100644
index c5e0d837f306..000000000000
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
-     dest='shared_libuv_libpath',
-     help='a directory to search for the shared libuv DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
-     action='store_true',
-     dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
-     output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 86a4331a4ed..38241302e26 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
-     'node_shared_http_parser%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_use_openssl%': 'true',
-     'node_shared_openssl%': 'false',
-     'node_v8_options%': '',
-@@ -177,7 +178,6 @@
- 
-       'dependencies': [
-         'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-       ],
- 
-       'includes': [
-@@ -187,8 +187,7 @@
-       'include_dirs': [
-         'src',
-         'tools/msvs/genfiles',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -930,6 +929,14 @@
-             'deps/uv/uv.gyp:libuv'
-           ]
-         }],
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ],
-+          'include_dirs': [
-+            'deps/nghttp2/lib/includes'
-+          ]
-+        }],
-         [ 'node_use_v8_platform=="true"', {
-           'dependencies': [
-             'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -259,6 +259,10 @@
-     [ 'node_shared_libuv=="false"', {
-       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
-     }],
-+
-+    [ 'node_shared_nghttp2=="false"', {
-+      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+    }],
- 
-     [ 'OS=="win"', {
-       'sources': [
diff --git a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
deleted file mode 100644
index e8483ab279fb..000000000000
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index 5703a70cb2d..3b6fc7347db 100755
---- a/configure
-+++ b/configure
-@@ -220,6 +220,27 @@ shared_optgroup.add_option('--shared-libuv-libpath',
-     dest='shared_libuv_libpath',
-     help='a directory to search for the shared libuv DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLLs')
-+
- shared_optgroup.add_option('--shared-openssl',
-     action='store_true',
-     dest='shared_openssl',
-@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
- configure_library('http_parser', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
-+configure_library('nghttp2', output)
- # stay backwards compatible with shared cares builds
- output['variables']['node_shared_cares'] = \
-     output['variables'].pop('node_shared_libcares')
-diff --git a/node.gyp b/node.gyp
-index 43a6576206d..c8ba6759246 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -16,6 +16,7 @@
-     'node_shared_http_parser%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_use_openssl%': 'true',
-     'node_shared_openssl%': 'false',
-     'node_v8_options%': '',
-@@ -176,7 +177,6 @@
- 
-       'dependencies': [
-         'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-       ],
- 
-       'includes': [
-@@ -186,8 +186,7 @@
-       'include_dirs': [
-         'src',
-         'tools/msvs/genfiles',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -929,6 +928,14 @@
-             'deps/uv/uv.gyp:libuv'
-           ]
-         }],
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ],
-+          'include_dirs': [
-+            'deps/nghttp2/lib/includes'
-+          ]
-+        }],
-         [ 'node_use_v8_platform=="true"', {
-           'dependencies': [
-             'deps/v8/src/v8.gyp:v8_libplatform',
-diff --git a/node.gypi b/node.gypi
-index ec78df2a339..3990c59ef98 100644
---- a/node.gypi
-+++ b/node.gypi
-@@ -133,6 +133,10 @@
-       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
-     }],
- 
-+    [ 'node_shared_nghttp2=="false"', {
-+      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+    }],
-+
-     [ 'OS=="mac"', {
-       # linking Corefoundation is needed since certain OSX debugging tools
-       # like Instruments require it for some features
diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild
new file mode 100644
index 000000000000..2b8a1d203454
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.12.18.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit 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.gz"
+
+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 )
+	${PYTHON_DEPS}
+	ssl? ( dev-libs/openssl:0=[-bindist] )
+	>=net-libs/http-parser-2.6.1
+	>=dev-libs/libuv-1.4.2"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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
+
+	# 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 myconf=()
+	local myarch=""
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-snapshot )
+	use ssl || myconf+=( --without-ssl )
+
+	case ${ABI} in
+		x86) myarch="ia32";;
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--shared-openssl \
+		--shared-libuv \
+		--shared-http-parser \
+		--shared-zlib \
+		--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
+	use npm && 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
+
+	# 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() {
+	declare -xl TESTTYPE="${BUILDTYPE}"
+	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message simple || 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.8.7.ebuild b/net-libs/nodejs/nodejs-4.8.7.ebuild
new file mode 100644
index 000000000000..2d8146e4c393
--- /dev/null
+++ b/net-libs/nodejs/nodejs-4.8.7.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit 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 ~arm64 ~ppc64 ~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}
+	test? ( net-misc/curl )"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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 # 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
+
+	# 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
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) 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
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -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-6.12.2.ebuild b/net-libs/nodejs/nodejs-6.12.3.ebuild
index d4deaf929b2d..ab8e2550ebd3 100644
--- a/net-libs/nodejs/nodejs-6.12.2.ebuild
+++ b/net-libs/nodejs/nodejs-6.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/nodejs/nodejs-8.9.3.ebuild b/net-libs/nodejs/nodejs-8.9.4.ebuild
index dac3eab7cd80..8adc5609710a 100644
--- a/net-libs/nodejs/nodejs-8.9.3.ebuild
+++ b/net-libs/nodejs/nodejs-8.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,6 @@ S="${WORKDIR}/node-v${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.9.0-shared-nghttp2.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-9.2.1.ebuild b/net-libs/nodejs/nodejs-9.2.1.ebuild
deleted file mode 100644
index 782c12252046..000000000000
--- a/net-libs/nodejs/nodejs-9.2.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-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 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.7.0:=
-	>=net-libs/nghttp2-1.25.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-59:= )
-	npm? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-9.2.0-shared-nghttp2.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/|| 'python2'/|| '${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 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
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || 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 myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	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} \
-		$(use_with systemtap 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="${D}"
-	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}"/doc/*
-	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'|'${ED}/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|'${ED}/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>"
-}