gentoo resync : 29.12.2022

12 files changed, 213 insertions, 405 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 46a9215b491e..99c1fa071599 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,4 @@
-AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
-AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4
+AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461
 AUX nodejs-12.22.5-shared_c-ares_nameser_h.patch 15742 BLAKE2B e55d3aec80abffc81230ea46619d82d61fd2266ef62a96f39c47d7f9f5b6f61a4e978475c2e963214abdc45d5582d98c21e6be9f926f078108feb5f655b5c88a SHA512 080ede859262f5507a913b1f9995092ed075777e94c73c23ee74d74c739e9b2e6b4cc3afad189a333692f10485e7e3e12a15662286df2c946f73bdd6083baee8
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
@@ -7,16 +6,14 @@ AUX nodejs-14.19.0-global-npm-config.patch 914 BLAKE2B 015fd323cbdb3548f4858f988
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.0.0-paxmarking.patch 4343 BLAKE2B 92ddc9c5911b077eb0dcb42aeb8bc2486474d0294532cdee6ecf4c5141ce1953c15ac64432d3f527cf44d504dd8165fef35d458e713b4dea5b3ecc4288c5d5d2 SHA512 c60e389136e0876149f0c5945832195455f8c51f125ef006d40604d6306d990c1751bd36ef02db8a27596aa7d88b8bf94b90e640c0505b0d32dedef7831384f2
-AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5
-DIST node-v14.17.6.tar.xz 33606464 BLAKE2B c2c449e5eaf8214d7ed4bfab8db0208034cee1d08ef0e1fca478c30fc5cf95be037eb141080dbcfbe4fc58ef734457747dcbd0fe585a0536f9c0bec495435f25 SHA512 581c5698112426042fbf54fa793e56a30cae0c54ce8f23af6ac20d73c69a4f1166c5410f357c5a7b0409a773f99e3b9291e4afffd53b3c0e00569725dc4c47d3
-DIST node-v14.19.0.tar.xz 34486868 BLAKE2B 12e571a366c1d4b2475ef258e338f516bb81e9c08f7e6b7f951decbf371028cdcf32c72181d8504d0890496eaecce0d6b23437b8dad6c6e498d30bf6636bd1e7 SHA512 80573fa3a0882c1f2a40b991f187f49714748ca4c56c78133e2d2be0322f201816eb059a1a7d38ea8a925229c1b1324d0ffc28ff4002d0115bfae44fe87efe97
-DIST node-v16.14.2.tar.xz 34332624 BLAKE2B 756895f81ecabbacf30b1e513890d100192c367443a5d041cd3e383985acb6fae189213f44b7a533b43d1b759d5a2677a5ee787c72d3abdb480879d6d24cc95e SHA512 b97274f6e0d63f19e01497c43af36e6561f019e7b0b5b4f6ea19d0fbe2cb4d3c514c06f49e237d1e327936db03c3f437ae0d0b2f830a35f1b7c3a723fbe2a1be
-DIST node-v18.1.0.tar.xz 36841136 BLAKE2B 77cc028f61391c483cf9bdff09a2101790119257ceee5b6702347aee771c7ed9656458f482bceb89d9921a598b9e2134ef6c424e6c879934dce9bcc85fbb3552 SHA512 edaf830b90b74ff7e8d1098f7f09cff91dc60738bfc612f6847bd7ac283ca76453f624057f64ba3ddcc86804bfbd652eaf8eae1398118220fd54fbf9c0a0e49c
-EBUILD nodejs-14.17.5-r1.ebuild 7174 BLAKE2B ade6eebc522024960fb6ffad54ac0035f52692e3a6ea5b9a685f6164e53a81ee8eb8f115377b7e459f50eaea101f419bfc038b183784fe2877fd83e9e960da95 SHA512 c0bff9a4bbb32bbd2e832bf1b30966f7c0433a34ad3cdb83d874bcd7fdcedfda85618c50321336eac7a53f939a2ce12c944cc208c47b44ed8f1d22ffd5b8835b
-EBUILD nodejs-14.17.6.ebuild 7181 BLAKE2B 3f823bdb6a4f20f57fea27cd19f45ace7703314bdd8d87e427b47971d48fdaa49082ad9963a6f40209e445e9395467e45284d4df95a07a680b4db63cd291ffa6 SHA512 44c7f0d28ef45ae7fca65311a342cea9847feaf5a87563953b08e15aef726be40d33b2d11fa13a75b6d543406adfa9be5459a4bad6f3c61ced2c50de9b36634d
-EBUILD nodejs-14.19.0.ebuild 7062 BLAKE2B 67a3db383c6bf8d76a026e57ad78504e583e3843ac451ea90f74964e3c0289437e149d4f0e799981cb257140274504c0cf4a7fc99f5c47944fe594c8549fab5d SHA512 3ece626995a0bbf505f9728cfaf7c627861eeb76f08256716e624415c251cc667666ad195a8a0739d9eaccd5962ea97dc3f6c72e1fefc330312460cb007ca086
-EBUILD nodejs-16.14.2.ebuild 6580 BLAKE2B 0ade58c4914600577c5cfd7d8b0f16ee9972ed602b79c26f2166150065cea96e2f90e9261fa484c23c1849de788b9c9f99d9fe47121bd433f63ca3adf0bba122 SHA512 25c8db5082d757a543a5be552ad75e36ff0beccf71fc40f9a39685584f21480ef965babf53d88ed821fe505879b6a93ca918c5f686b20f2ece07a6067dbb685b
-EBUILD nodejs-18.1.0.ebuild 6582 BLAKE2B d6896dc2f3490e3235d6e23ce355322d836631cb67e360e83f6ac8a6eb93828b56e572449c8e27efed71b1426c82e08793252e4db4bc6139f66d0f17ecef0321 SHA512 e216bbe321d8f3370c18efed3e2b8d392018975b53155e60876bc8470b73254711fd86574e2532b789f3798d13bc484b8b07292b5fca0471945f07f60c6ae5f7
-EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
+AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
+DIST node-v14.19.3.tar.xz 34483792 BLAKE2B 24b598b4c613ad63f8a2ffa15b2ad5663eef68e75842fac4ef988b43f8e6f9c1a242c9b352c411661dc7d1c9f6800426e12934fc4e7788061a8b9f918491a9b7 SHA512 0d03d9efee23664faf368a6ab42fa7d653033aebda1f2730c80692577825e31ff5522f1a940933245050a6f9af4ee64b6d65fc890e3d2ecfced327a909b63b6f
+DIST node-v16.15.1.tar.xz 34618208 BLAKE2B 6bba1dcc01cf18710e75b998d90b2b1f75476052c85e730a1309a6fecf2994530ce65b45e53ff0cee17bfe07728d4f3eb166f460337cc74f3c7975aee858a6cf SHA512 18c05876f0afe6fd402a11824d1987ddadcb103d3ac16d5b500371536a5d53632c9cbf651b6f4a8d69b69e8bda2575beb7b68675c67fd6cd53e205acfba11038
+DIST node-v18.3.0.tar.xz 36941104 BLAKE2B 947d38aa8637f01421fcf5261832b2fd3f53a5f38868fd03b6c9213c2ba3bdff214be12585a60c4cf88dd9390673e068eb08da07d7da28443a9c56cd024186fc SHA512 c793459c38d72d65d5caaa7fbab37269fe6031766609ab2fd7c921b205d314b1ddebc40738b292669bbbaf166a97328f64af7a0a1aaac111903a42cf98057afd
+DIST node-v18.4.0.tar.xz 37109064 BLAKE2B d222ad41eef88a2fed13b0591b8c24037f8425c1e788d6ed00e033e28fa88162de6fcf25d094188952a7866e2f488c1ea635a80162c8b01d42c31f1d56406137 SHA512 c00d90cf5cfa8cd5629ed0b7810c436c962e50bd78313789457fd4003900808a190769db9d41e9a22186c6d2cda232bd362d432089eb8990913f7786140e2813
+EBUILD nodejs-14.19.3.ebuild 6640 BLAKE2B a926d525e227ec2a8f09be3b5ca58807f711df9b19993f4c41360d84d51e28bb9f2297753026b8e8c8d93ceeb011dbd8336f03007de6f5fe5cd4f6c8620fc1fe SHA512 24dda7157f0b267da8e561e0283a6cf03699b470b82fc2df6d0094e8391ec79c971b6072620162744c1ca911a20335ec83d849614174fee6b3e21a6aa7985068
+EBUILD nodejs-16.15.1.ebuild 6254 BLAKE2B 98cc5726d97d0bd474c67ec3377cc96fbd99cc643ea538db1a7ab8dc2df01449ce9ad4439e6f9a9bb484be2a97eebfe5b50557f52ef0667b7bad6055867f1673 SHA512 b403db60b341c67594f8c171d5e001cca8b458b7ec0dbc64e026e550b4dc9440afcc81d8eda737e23437064b945cef75acdd72688bdafeeb522e02a6fd7bc349
+EBUILD nodejs-18.3.0.ebuild 6254 BLAKE2B f83d0866c7f969d725acae5ed100de85b2286804111c3d13799f22e4932eaf7b8501c0d7516ce5a817da83d3c74d109da966cb1352f037c7a6d73f63bab02d02 SHA512 889c74c867da24f73f8b67ff89f38a392323e39c23dffd86f7804508f0b8112400e940ee9af4dc9b0f78c78f6d2ca8a70553db9e29bf69fb3d56a35abd79651a
+EBUILD nodejs-18.4.0.ebuild 6259 BLAKE2B 2babcb0352dffd9cd8aee43da7b474139cabd8dc2c1edb18fdfda3843f92c226fba1d498f96e0d9e7f25c67016e7a7f923dbe3f1ea082b6150c7d860fdcf9aa2 SHA512 bd050889a11048ecac5db807e772e4fc897dcc28e4c37c7141e9f945caec41f890b1acc6d39f56d2db3880d5c72671280bed55eba03aaff3913c252c4e5753b1
+EBUILD nodejs-99999999.ebuild 6135 BLAKE2B dc0d8749313aeb1445ac553917527fd653927869cc0cbae3ac9cab5886d55796faff814ae2699beaf2f2b5b047a7193bd812932b1d2d7bd0cfd60f406a7195ae SHA512 3d0d4c9694154291c07c374de2acd61242f5a184aa550b3bb5ab1c6ce86d9feeb33187487c60a59ee91ec99bcaa5713efda531b2b009f31c89e2fe6fa432eba2
 MISC metadata.xml 822 BLAKE2B 159eb2a921f10115d8d42c4c7bce446984f020b096f238c107c3cbcc960775340bd68a5fa43f8b5580cccc226aaaab915ffc1604ef0b4ee15ccb8f84b969839e SHA512 ee4e6b8c56ef5987c849e571b98c9bd7695d47f1581c22671b165d80b9448aa0cf61120b87f34279710423bcfffdbf6d6b2ab48df4c8cc9bf2ff7fe318582007
diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
deleted file mode 100644
index 9c7fe6888fb8..000000000000
--- a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/deps/npm/lib/config/core.js
-+++ b/deps/npm/lib/config/core.js
-@@ -153,11 +153,12 @@
-     // Eg, `npm config get globalconfig --prefix ~/local` should
-     // return `~/local/etc/npmrc`
-     // annoying humans and their expectations!
--    if (conf.get('prefix')) {
--      var etc = path.resolve(conf.get('prefix'), 'etc')
--      defaults.globalconfig = path.resolve(etc, 'npmrc')
--      defaults.globalignorefile = path.resolve(etc, 'npmignore')
--    }
-+    // gentoo deviates wrt global config; store in /etc/npm
-+    var globalconfig = path.resolve('/etc', 'npm')
-+    mkdirp(globalconfig, function () {
-+      defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
-+      defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
-+    })
- 
-     conf.addFile(conf.get('globalconfig'), 'global')
- 
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
deleted file mode 100644
index eb56bb87d86d..000000000000
--- a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/deps/uvwasi/uvwasi.gyp
-+++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },
diff --git a/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch
new file mode 100644
index 000000000000..fd7ef431045e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch
@@ -0,0 +1,85 @@
+diff -urNp node-v15.8.0-orig/node.gyp node-v15.8.0-dwok/node.gyp
+--- node-v15.8.0-orig/node.gyp	2021-02-24 22:21:44.202911780 +0100
++++ node-v15.8.0-dwok/node.gyp	2021-02-24 22:25:34.298281739 +0100
+@@ -55,6 +55,7 @@
+       'deps/undici/undici.js',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       ['GENERATOR == "ninja"', {
+         'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
+@@ -331,10 +332,24 @@
+             }, {
+               'actions': [
+                 {
++                  'action_name': 'run_pax_mksnapshot',
++                  'inputs': [
++                    '<(node_mksnapshot_exec)',
++                  ],
++                  'outputs': [
++                    '<(node_mksnapshot_u_exec)',
++                  ],
++                  'action': [
++                    'bash',
++                    '-c',
++                    'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++                  ],
++                },
++                {
+                   'action_name': 'node_mksnapshot',
+                   'process_outputs_as_sources': 1,
+                   'inputs': [
+-                    '<(node_mksnapshot_exec)',
++                    '<(node_mksnapshot_u_exec)',
+                   ],
+                   'outputs': [
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+diff -urNp node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp
+--- node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp	2021-02-24 22:21:44.654910571 +0100
++++ node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp	2021-02-24 22:25:54.834224791 +0100
+@@ -9,6 +9,7 @@
+     'v8_vector_stores%': 0,
+     'v8_embed_script%': "",
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1413,7 +1414,7 @@
+       ],
+     },  # bytecode_builtins_list_generator
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': [
+         'v8_base_without_compiler',
+@@ -1432,6 +1433,27 @@
+           'toolsets': ['host'],
+         }],
+       ],
++    },  # mksnapshot_u
++    {
++      'target_name': 'mksnapshot',
++      'type': 'none',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'bash',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++          ],
++        },
++      ],
+     },  # mksnapshot
+     {
+       'target_name': 'torque',
diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
deleted file mode 100644
index 1b6eb9fb7fa1..000000000000
--- a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/node.gypi
-+++ b/node.gypi
-@@ -169,11 +169,15 @@
- 
-     [ 'node_shared_http_parser=="false"', {
-       'dependencies': [
--        'deps/http_parser/http_parser.gyp:http_parser',
--        'deps/llhttp/llhttp.gyp:llhttp'
-+        'deps/http_parser/http_parser.gyp:http_parser'
-       ],
-     } ],
- 
-+    [ '"true"', { 'dependencies': [
-+        'deps/llhttp/llhttp.gyp:llhttp'
-+      ],
-+    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
diff --git a/net-libs/nodejs/nodejs-14.17.6.ebuild b/net-libs/nodejs/nodejs-14.17.6.ebuild
deleted file mode 100644
index dc855697bb82..000000000000
--- a/net-libs/nodejs/nodejs-14.17.6.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? (
-		>=dev-libs/openssl-1.1.1:0=
-		<dev-libs/openssl-3.0.0_beta1:0=
-	)"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR 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
-
-	# 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}'/" 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 node.gypi || 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
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	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" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	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
-		docinto html
-		dodoc -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="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${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 -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		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
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.19.0.ebuild b/net-libs/nodejs/nodejs-14.19.3.ebuild
index 20db05ccbc22..e86978056ae4 100644
--- a/net-libs/nodejs/nodejs-14.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.19.3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 ~arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -52,26 +52,12 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-	"${FILESDIR}"/${P}-global-npm-config.patch
+	"${FILESDIR}"/${PN}-14.19.0-global-npm-config.patch
 )
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
diff --git a/net-libs/nodejs/nodejs-16.14.2.ebuild b/net-libs/nodejs/nodejs-16.15.1.ebuild
index d5a7de09fe13..26d1ffb649f4 100644
--- a/net-libs/nodejs/nodejs-16.14.2.ebuild
+++ b/net-libs/nodejs/nodejs-16.15.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -54,17 +54,6 @@ PATCHES=(
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
diff --git a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild b/net-libs/nodejs/nodejs-18.3.0.ebuild
index 07bb48eee028..5ab2bfa29de9 100644
--- a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild
+++ b/net-libs/nodejs/nodejs-18.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -37,10 +37,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=net-libs/nghttp2-1.41.0:=
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? (
-		>=dev-libs/openssl-1.1.1:0=
-		<dev-libs/openssl-3.0.0_beta1:0=
-	)"
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
@@ -50,30 +47,13 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
@@ -105,7 +85,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
@@ -153,6 +133,7 @@ src_configure() {
 		amd64) myarch="x64";;
 		arm) myarch="arm";;
 		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
 		ppc64) myarch="ppc64";;
 		x32) myarch="x32";;
 		x86) myarch="ia32";;
@@ -192,17 +173,12 @@ src_install() {
 	fi
 
 	if use npm; then
-		dodir /etc/npm
+		keepdir /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="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${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}/*
diff --git a/net-libs/nodejs/nodejs-18.1.0.ebuild b/net-libs/nodejs/nodejs-18.4.0.ebuild
index f546bf353cfc..ab8116548114 100644
--- a/net-libs/nodejs/nodejs-18.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.4.0.ebuild
@@ -54,17 +54,6 @@ PATCHES=(
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
@@ -96,7 +85,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.0.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index d9745115c19f..577230345a35 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -19,11 +19,11 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0:=
+	>=net-dns/c-ares-1.17.2:=
 	>=net-libs/nghttp2-1.41.0:=
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
@@ -46,24 +46,9 @@ BDEPEND="${PYTHON_DEPS}
 	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch  # still needed as of 2021-06-04
-)
-
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
@@ -95,7 +80,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
 
 	# All this test does is check if the npm CLI produces warnings of any sort,
 	# failing if it does. Overkill, much? Especially given one possible warning
@@ -143,6 +128,7 @@ src_configure() {
 		amd64) myarch="x64";;
 		arm) myarch="arm";;
 		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
 		ppc64) myarch="ppc64";;
 		x32) myarch="x32";;
 		x86) myarch="ia32";;
@@ -217,10 +203,10 @@ src_install() {
 }
 
 src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
 	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
 	fi
 
 	out/${BUILDTYPE}/cctest || die