gentoo resync : 26.11.2017

6 files changed, 142 insertions, 125 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 47dcd7dcb14e..7a18b16107df 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,18 +1,16 @@
-AUX gentoo-global-npm-config.patch 1511 SHA256 a6575286a4f0c3b4db07c2f353d2e6c093eb3caba6cd0d3b11e546734b16bfad SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f WHIRLPOOL 7e748dd02dd248fde544ee088fe4e7b295919f5da1fcaf9511071c716d073ed45380831677082f9748c3802b7bdc6004b78275f39d29f1396330a1b196c5f1e1
-AUX nodejs-8.9.0-shared-nghttp2.patch 3158 SHA256 f5589a4e9133a9ec80cca2deeb22489ee424a798fae81271b603ebbee32a46d9 SHA512 eea090e1543f718e8bb72b5923cc4e065617ec8bc6c16a27c79d2e88fd78e54d3d741a694d5fd8979025d1cdd5a761c96feb5bb1a65de771a70102118badd3a8 WHIRLPOOL 06e2542c7c742b273fec3f2a6bdd88bfb1bf3f10f442005c26e77871a82cbbd0154e378473b137b31c31aa5ad61e4124e57b7eb74a1c1db07bf2a73b3ceb711c
-AUX nodejs-9.2.0-shared-nghttp2.patch 2614 SHA256 d8bc1bcc5bc3cdff2ab1eb52508086ca5bdd505882e7f5b3fcfe3098749f72ac SHA512 b7960e828ef0da8b78ede0e06884624067870d8a3af5e01ea2e4202caf441b406767d83dd53c2296f53cd000d32194b9d84afc768cd5308ae0c688dc0ae989b3 WHIRLPOOL 4da2bdaf534e93b2dd95112e6031068083171d682694cc251e99fb1ed420353174910de6f080ea0628f5be2006928818d5fe746be5b1a49c7264ef8795d4d01f
+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 SHA256 ddea5e253812f167608fbdda6ff29ffc30dc6f669cf2f6e4249938d28b9cd44d SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7 WHIRLPOOL 5fba1f95de0a7dbda7e7649bc0f8553cd8595eb87cd27062efbdc59a54673e7e1e6f80191abede683a686043a81d82b76e141aa765b98e3dc39e015aca98e41f
-DIST node-v4.8.5.tar.xz 13316060 SHA256 a48aeefc2b4fae0ea6410a8045ca106af244223012eab003bd5cb00aa3b50d53 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12 WHIRLPOOL 8d74323f38b4f55bf2e95a628005cbb65c0f4ea0e5dd55699408e26b724ff65fd0a7f674399ed92ac3a56592064133daffcbb37d7076b8da33d28b4d17d61410
-DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
-DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
-DIST node-v8.9.1.tar.xz 18290848 SHA256 ef160c21f60f8aca64145985e01b4044435e381dc16e8f0640ed0223e84f17e0 SHA512 e1d93def34c1b91de90b807031e2f313661658cd045d44d290950190b10512770df05cb92e9657bab7ad6654d3359364193567cf693ddb2b3574d2a48e4ee256 WHIRLPOOL f1e47a0d078e0c1c29c993c8266337ae1fa0ee18ac81e053c4deabe85a94a5de0681ea9ed7f81119d108235055b849bc30557eb0d86345675580d76bd7c05f4d
-DIST node-v9.2.0.tar.xz 18347108 SHA256 64caf263eadc1aea072ce5d30ded7f4534aa7f59c8c6993eee4accad96e3bbc2 SHA512 3335a2ec17f4698bda58f2a2c9548546912b9a4109c0bff0ffc57bca14d40101bcc00356231c95c08733860286ac340e227ca79debac581835f84ae3967cdb4b WHIRLPOOL f14cd3f537d2f1f41ee299f2492f2dc275587846dc231f668ccb3c2d31720020b982474130ae7ce4b8ca709e2f67c510d3e65b7641fbc3fff0e3f9be3321ca2a
-EBUILD nodejs-0.12.17.ebuild 3425 SHA256 4dbd8abed45e7a0266b9cd379bb95e205e8edf006e57711dde176ba954b996a8 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075 WHIRLPOOL fee27aa0ccbcc6e8d827de12e49fb1e549b2784b9edf6e19304ccc24ad243a28556d01fdc046a74e9023ebf394d0e47f2e60442b2c23b0b49c7c169a66beeb11
-EBUILD nodejs-4.8.5.ebuild 4435 SHA256 561010c1e09bc161951e6eb5148dda8226cf113f023459f6895438ffc4a701ae SHA512 66f3bfae15bef4755f9ec630c4bc50a44ae0b63102c3568bf6ca41caea66bca09cd67eb8dc314a27b0a571f2672e93f3937b9f14e3b19a0eaf36221c36c07d66 WHIRLPOOL 2c409f26070282eb4734a35a4763f01bd71beaeb63af07834ef997e005769794e5e92933e6678064cdf21f22d65091bf82c505406df63ad70e0e88af5b80a877
-EBUILD nodejs-6.11.5.ebuild 6090 SHA256 a2c84b62e2a9f8f7333023fac04aa1a5a8f396d6eb5d53a520a1f4d5dddf3121 SHA512 3b203a496f10605a816d5cd8ca9563b9d8ce6829dccf6b8934d9c63275e042aca2371bb5b9356ad88d299aa7336c94e074fa5e8d9ebe8259bd80c76205216486 WHIRLPOOL 80f4c4ff3cbae9b6a48f10857d1ff5d8de3f3f5c3195269f27ad784e32d77cbc6d52cd80b1320ee62801d3f5cdebcc0b3e510a29b373a503c9782495c04e5316
-EBUILD nodejs-6.9.4.ebuild 6073 SHA256 150fdc85c99024a7280f3b5c23f11c9a5c7f99ac5a075fccaa8c1dfd4f52865d SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7 WHIRLPOOL 58aabc7cc764c8a47538dff634bdb295a2c93ab646ae544cbd61fb32961a465a5da65cb9a068ff837675cd5f41ef8c769d1e06a184740e7fc86819fb4e1d1be2
-EBUILD nodejs-8.9.1.ebuild 6275 SHA256 0fb5c3f0697408a8f47899989ddfae01bd92a7749045d2f722f4319a4a1949f6 SHA512 77843bffc6ba3cec789eb92c79b3563b47b2d63efb480b9ec0435decbfff4ec7e9023b0191e22576f5edc2cf4f80fe1cfeeea17246638ed526ae799d656a89ec WHIRLPOOL b39b1d58568f16cef94897007b203a6dbb35ee5f6ebfa2e6890f3c2db1408e162eb21276831edb5911730af1fb545ca7ce33206d5a1eb2a23db50ad424b5d333
-EBUILD nodejs-9.2.0.ebuild 6275 SHA256 10d03023ca07d0c4743e3a88bf0492f4f5bc3eeb11b273ee6dae06575bf12a8b SHA512 b02744fce2c1bc6adf644bf5835f021f8931e9a687d58b83984734b6f22502305536a063589087687378a22e92992bd86262a489da5a6aa986dc88be2ef8467b WHIRLPOOL 4c44b0bb9e8da01b1908ed09136dad842433a5ca5cd7300aa9c35edda16529d319edd5d05c620199eafb7c3a614de61958ee40f4c21df24bc5cbb4acfaae17f7
-MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
-MISC ChangeLog-2015 23934 SHA256 354bd9c41192f651dd4426b236bc63a6bb41ea76831855a0ec00550a369a1b97 SHA512 28421b67fa37d71d97f976bd938cdaded4c994c08fa68d469b1d193a4cb380da633acb352cdcbda0f4cdfaf6cf671c82132c3e64bb48721df9d78843bcf49d74 WHIRLPOOL 65cad5043c8d83e0d342c1e593a7c0eb2d2400968507ef48e2de0384baab13861c99ed7e44cdf41eb6027826b174695be598d77077587a01ce96adbb43a5b633
-MISC metadata.xml 451 SHA256 d2b12ec796c41fd4010281119313aaad1248591cc31c8e570a44a1dd28f49e80 SHA512 d3baf438dbd581a2b8a980ab591044fd929467f3872556e04e422f09568b63ac4fe4f0841841f1e37e702ff2cd8e10fdce8e754fba83cc0bc14b3dd5944ab12f WHIRLPOOL e8a5f8efd991292d27bd33f620be996cb1be1993f580b63824d70ad5f384082ba4591cc7a37dd5e34411ed0a53054b66972a5628004e67d487be4cc074d6b36b
+DIST node-v4.8.5.tar.xz 13316060 BLAKE2B fb32f176b9d4add3e9695f0bee7ebd0bba66770d479b1fade572de4694566603f08875da6ff97a1904edd1156708b58670fb1c4717e213aab6ad44ae5d470f40 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12
+DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
+DIST node-v6.9.4.tar.xz 15519264 BLAKE2B 4dfad88b06b209272b8468501cc3c87c40425781fb55011ee93326555c2df88a166ffaff1877563668e06389703053849361739556f1bc87c1e2386d48b9542e SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce
+DIST node-v8.9.1.tar.xz 18290848 BLAKE2B b2a89d759bd19df6a6ea8db31ab3e63d111f24d9e00dbd8cdfc2d5d89a56ee7789c51b936516cdbce8384cc91591f4c1fb1eb0f2b3c18148a9211168cfe8121f SHA512 e1d93def34c1b91de90b807031e2f313661658cd045d44d290950190b10512770df05cb92e9657bab7ad6654d3359364193567cf693ddb2b3574d2a48e4ee256
+DIST node-v9.2.0.tar.xz 18347108 BLAKE2B ff98445ac3e7649b4c6fde3a2fe8375e541f7e120d0b2dbd39a07f3953784793752a927c99a74da50f34cfe1447672f8b14af84a56e899fd46e52b9a7f8d19bc SHA512 3335a2ec17f4698bda58f2a2c9548546912b9a4109c0bff0ffc57bca14d40101bcc00356231c95c08733860286ac340e227ca79debac581835f84ae3967cdb4b
+EBUILD nodejs-0.12.17.ebuild 3425 BLAKE2B b1c8ea2a39ee873c2d46a68af2e6050ae6e879ae9a80d20543e4486fda5885385b702394b4af1284883cc0685541ae7184e3b0c9b97866190d28e66a3d508534 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075
+EBUILD nodejs-4.8.5.ebuild 4435 BLAKE2B 0a226e511e27eef347c542d1830e86208636159384983d1be76f08b220008e5e999e303a78feeff58beb52d6f3f18382804b9114cd1d73a4b1aaab329f676406 SHA512 66f3bfae15bef4755f9ec630c4bc50a44ae0b63102c3568bf6ca41caea66bca09cd67eb8dc314a27b0a571f2672e93f3937b9f14e3b19a0eaf36221c36c07d66
+EBUILD nodejs-6.11.5.ebuild 6090 BLAKE2B c90aa71b89dab6ff99da43cdfeae4eabcbd28f4e865bcd4129a0978070f176a826bd81b7464453ea54f4a17a582667a1a2f4622eec5d76117d4c4b2af6ae15e0 SHA512 3b203a496f10605a816d5cd8ca9563b9d8ce6829dccf6b8934d9c63275e042aca2371bb5b9356ad88d299aa7336c94e074fa5e8d9ebe8259bd80c76205216486
+EBUILD nodejs-6.9.4.ebuild 6073 BLAKE2B cf41081773527f8efb120d6d7ba8d21dc834fc47fbf1964fc235853d842321899c605f42e2799136a54f65e6140c89a05726ba49d86a5fcd78fa4c78114f1e96 SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7
+EBUILD nodejs-8.9.1-r1.ebuild 6421 BLAKE2B 1cc15687b44dc144b6f004483ed7fb875a3ebc3b2d82c6fdc95cd62b2c2e2ba2400dbb95c5a7ffa9cb338d6bab09fb4ef098fa71e3b3c2d32f6ddd302f384a6e SHA512 8c312851a25fd71aa64fc9b3a209f463b1c5099d87a0ae5ad3b6ba6c4c41651a683249c09b81079cc990c8bdb38bcca12138eec7f4a3d03d04a75c9036c60d7d
+EBUILD nodejs-9.2.0-r1.ebuild 6421 BLAKE2B 8373da68cf051d055edfe47e737ecd091dce243430efb25cd9ce2b04213a16364aac0613ff793ef7e44dde94a1c28bfa7b0711c7bfa02a80c01097fb6dfcb546 SHA512 25d09d0fed3bf63d67edfc98699388b8fdd33812577417704f2a242f9e8290dce509c6c90b335020960a387999e35c0343256e5a85003b9a253bcd14ba805eb1
+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
index dfccb1b0aea2..c5e0d837f306 100644
--- a/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
+++ b/net-libs/nodejs/files/nodejs-8.9.0-shared-nghttp2.patch
@@ -1,8 +1,10 @@
+diff --git a/configure b/configure
+index 5703a70cb2d..3b6fc7347db 100755
 --- a/configure
 +++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
+@@ -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',
@@ -23,48 +25,40 @@
 +shared_optgroup.add_option('--shared-nghttp2-libpath',
 +    action='store',
 +    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
++    help='a directory to search for the shared nghttp2 DLLs')
 +
- shared_optgroup.add_option('--shared-libuv',
+ shared_optgroup.add_option('--shared-openssl',
      action='store_true',
-     dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
+     dest='shared_openssl',
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
  configure_library('http_parser', output)
-+configure_library('nghttp2', 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
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
+@@ -16,6 +16,7 @@
      'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
      'node_shared_cares%': 'false',
      'node_shared_libuv%': 'false',
++    'node_shared_nghttp2%': 'false',
      'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
-       'type': '<(node_target_type)',
+     'node_shared_openssl%': 'false',
+     'node_v8_options%': '',
+@@ -177,7 +178,6 @@
  
        'dependencies': [
--        'node_js2c#host',
+         'node_js2c#host',
 -        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-+      ],
-+
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
        ],
  
        'includes': [
-@@ -180,8 +180,7 @@
+@@ -187,8 +187,7 @@
        'include_dirs': [
          'src',
          'tools/msvs/genfiles',
@@ -74,32 +68,33 @@
        ],
  
        'sources': [
-@@ -691,6 +696,15 @@
-                 'deps/http_parser/http_parser.gyp:http_parser'
-               ]
-             }],
-+            [ 'node_shared_nghttp2=="false"', {
-+              'dependencies': [
-+                'deps/nghttp2/nghttp2.gyp:nghttp2'
-+              ],
-+              'defines': [
-+                # We're using the nghttp2 static lib
-+                'NGHTTP2_STATICLIB'
-+              ]
-+            }],
-             [ 'node_shared_libuv=="false"', {
-               'dependencies': [
-                 'deps/uv/uv.gyp:libuv'
+@@ -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
-@@ -251,6 +251,10 @@
-       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+@@ -259,6 +259,10 @@
+     [ 'node_shared_libuv=="false"', {
+       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
      }],
- 
++
 +    [ 'node_shared_nghttp2=="false"', {
 +      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
 +    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
+ 
+     [ '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
index a145c0c71169..e8483ab279fb 100644
--- a/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
+++ b/net-libs/nodejs/files/nodejs-9.2.0-shared-nghttp2.patch
@@ -1,8 +1,10 @@
+diff --git a/configure b/configure
+index 5703a70cb2d..3b6fc7347db 100755
 --- a/configure
 +++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
+@@ -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',
@@ -23,48 +25,40 @@
 +shared_optgroup.add_option('--shared-nghttp2-libpath',
 +    action='store',
 +    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
++    help='a directory to search for the shared nghttp2 DLLs')
 +
- shared_optgroup.add_option('--shared-libuv',
+ shared_optgroup.add_option('--shared-openssl',
      action='store_true',
-     dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
+     dest='shared_openssl',
+@@ -1415,6 +1436,7 @@ configure_library('zlib', output)
  configure_library('http_parser', output)
-+configure_library('nghttp2', 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
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
+@@ -16,6 +16,7 @@
      'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
      'node_shared_cares%': 'false',
      'node_shared_libuv%': 'false',
++    'node_shared_nghttp2%': 'false',
      'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
-       'type': '<(node_target_type)',
+     'node_shared_openssl%': 'false',
+     'node_v8_options%': '',
+@@ -176,7 +177,6 @@
  
        'dependencies': [
--        'node_js2c#host',
+         'node_js2c#host',
 -        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-+      ],
-+
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
        ],
  
        'includes': [
-@@ -180,8 +180,7 @@
+@@ -186,8 +186,7 @@
        'include_dirs': [
          'src',
          'tools/msvs/genfiles',
@@ -74,16 +68,33 @@
        ],
  
        '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
-@@ -251,6 +251,10 @@
-       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+@@ -133,6 +133,10 @@
+       'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
      }],
  
 +    [ 'node_shared_nghttp2=="false"', {
 +      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
 +    }],
 +
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
+     [ 'OS=="mac"', {
+       # linking Corefoundation is needed since certain OSX debugging tools
+       # like Instruments require it for some features
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 2950626d4ef6..d512ddee8e7b 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<use>
+	<flag name="inspector">Enable V8 inspector</flag>
 	<flag name="npm">Enable NPM package manager</flag>
 	<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 	<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
diff --git a/net-libs/nodejs/nodejs-8.9.1.ebuild b/net-libs/nodejs/nodejs-8.9.1-r1.ebuild
index 38c6428ce065..e3f1fec1f463 100644
--- a/net-libs/nodejs/nodejs-8.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.9.1-r1.ebuild
@@ -16,22 +16,27 @@ 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 +npm +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
 
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.7.0:=
+RDEPEND="
 	>=dev-libs/libuv-1.15.0:=
+	>=net-libs/http-parser-2.7.0:=
 	>=net-libs/nghttp2-1.25.0
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-56:= )
+	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}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
@@ -70,7 +75,7 @@ src_prepare() {
 	# 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 || 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).
@@ -89,14 +94,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
+	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+=( --without-ssl )
-	use debug && myconf+=( --debug )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
 
+	local myarch=""
 	case ${ABI} in
 		amd64) myarch="x64";;
 		arm) myarch="arm";;
diff --git a/net-libs/nodejs/nodejs-9.2.0.ebuild b/net-libs/nodejs/nodejs-9.2.0-r1.ebuild
index aaab3c90a4b0..782c12252046 100644
--- a/net-libs/nodejs/nodejs-9.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-9.2.0-r1.ebuild
@@ -16,22 +16,27 @@ 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 +npm +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
 
-RDEPEND="icu? ( >=dev-libs/icu-59:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.7.0:=
+RDEPEND="
 	>=dev-libs/libuv-1.16.1:=
+	>=net-libs/http-parser-2.7.0:=
 	>=net-libs/nghttp2-1.25.0
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
+	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}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
@@ -70,7 +75,7 @@ src_prepare() {
 	# 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 || 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).
@@ -89,14 +94,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
+	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+=( --without-ssl )
-	use debug && myconf+=( --debug )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
 
+	local myarch=""
 	case ${ABI} in
 		amd64) myarch="x64";;
 		arm) myarch="arm";;