gentoo auto-resync : 16:09:2022 - 23:15:49

3 files changed, 8 insertions, 21 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 74040953dc3a..2e00ccda887f 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,7 +5,6 @@ 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.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
-AUX nodejs-18.9.0-clang-fix-libatomic.patch 318 BLAKE2B 2ddcfc4ee4d4dfa624497d2c2467974a2ab5d456198e72ec7bb4c4e9ab4c7d154e30df585df224b2eed2286e07f2261ee697652ad823f9fda96df4a5222c2f0c SHA512 cd00309605b6da706e18774f47f6029a2fa41d688c6e94fb28ed0ab17ffd6a5ad385e5cb1aa01f8ca52cac9b9ba3427d3750be35778798297e6457f38741354e
 DIST node-v14.20.0.tar.xz 34487684 BLAKE2B a3b8af94d2bb0e52f36ead91a5cd96a4a35a67f07b87e43da5ff598d693fd8b3b47c05dbb6c6b738aefa55b056eccedbcf782225a2abf49110b3371a544952bd SHA512 400eb247c1d37ca64f4d643ab1852d2e1415ee190cf726b1e9b058386a1ebd6d7a9f40092afff228ec7980f37a78978252c1ef115aee47ec5b90c065f136b10f
 DIST node-v16.16.0.tar.xz 35039712 BLAKE2B e4cf7debda3d32b515d60d11ac7ebd788fdab0ebc782a096571cd4b502dddfb9c63c9a3625198c6c545f95092ffcb247e94ee96e33d8a79a7c5e24c56039c229 SHA512 828bfee4f3789b02fec512a7d9785bf02650401c61b2d3ff80d8a3876420927fb9c8d0c2d66e45e1e8370c47cb81140d434747588322c4fedca7fd9e42b84ac3
 DIST node-v16.17.0.tar.xz 35664964 BLAKE2B 490bcb65440a81d356f6351c45b19a4022cd55834b8b90da9eed2006042ab73732d581d58983b34b12ddef618d3e99fe760ef93447a2201268e2ab86466d3bb1 SHA512 8906ee337562b6f0b1614aa57084499ffd3bdfe8f8e706de8fed98baed5a92f691c534528b98f6321cf8a1eaaed6b45a938f28bd08167fbd75bfeb432ca03181
@@ -17,6 +16,6 @@ EBUILD nodejs-16.16.0.ebuild 6361 BLAKE2B 24bfc86983bd48e388dd0114cddc3c3d62e9b4
 EBUILD nodejs-16.17.0.ebuild 6366 BLAKE2B 6950140fdf3254fed0b6914c321947e9c62d96e28ce6d88b994670247e1e049704d5ae985a793e5334bc3e7a37757d4c9e210747e60428179d0d05d4ea0ecfbd SHA512 4d94fb052b32240b0478618fcf1e821ccccf53063aa6ccd2ff31927b37c0f04881f5fc3436b1e67baf6cfd8ed32534ba26b49168f1e75fdb86ac5c14745aec4d
 EBUILD nodejs-18.6.0.ebuild 6361 BLAKE2B 35b15b80127645ad32194c32964b60d91b734efe6747e518d467794245c84d4a760f097c782d2f20456e4e5e118de26632c1680d0a46d6fa1a1ac0d9d23bfaf2 SHA512 9776b6ced2df5251f10141b979c81711abb0a84fd7215716a22004279f3e9646d272ddf1c957e8448a99d5dfc5862453292f386c8d84aea96df98cd96d7e3dd0
 EBUILD nodejs-18.7.0.ebuild 7125 BLAKE2B eff0321331d50597f520d64c28353a32ae90288302fff6dafdbc3c08799e309a387f91c7c3737d60232bf9712b224955aec73b6f53bba5b87556ead5dbf93897 SHA512 294ff0e892698489f86ed0c0f3eb05860059879b55131baa35bba4e62e28148561cf92732bf0bc7492f1f318457222c5d73842f652e9224066b5394d30e9dc4f
-EBUILD nodejs-18.9.0.ebuild 7245 BLAKE2B 142e40a22cc5b3e11306485d7edabf704ede4a8dfed488583f0722a0eba39b2b2ad428ba817d9e53a79cae41797f2187b3504a6fab420442d0b05935734a5da8 SHA512 4b89c403ac54a28772d4e3298b87bd1844266f1b6f45fcccfecb22a0dc8a8b51dc8b3fd9df48e1e4ec9f077b26df6574da36c504b0ec01dc7e253371fe543363
+EBUILD nodejs-18.9.0.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
 EBUILD nodejs-99999999.ebuild 6135 BLAKE2B dc0d8749313aeb1445ac553917527fd653927869cc0cbae3ac9cab5886d55796faff814ae2699beaf2f2b5b047a7193bd812932b1d2d7bd0cfd60f406a7195ae SHA512 3d0d4c9694154291c07c374de2acd61242f5a184aa550b3bb5ab1c6ce86d9feeb33187487c60a59ee91ec99bcaa5713efda531b2b009f31c89e2fe6fa432eba2
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/files/nodejs-18.9.0-clang-fix-libatomic.patch b/net-libs/nodejs/files/nodejs-18.9.0-clang-fix-libatomic.patch
deleted file mode 100644
index 5296ed1318b0..000000000000
--- a/net-libs/nodejs/files/nodejs-18.9.0-clang-fix-libatomic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/869992
-
-diff --git a/node.gyp b/node.gyp
-index 347d82d2e1..8c4ffea256 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -117,9 +117,6 @@
-           '-Wl,-bnoerrmsg',
-         ],
-       }],
--      ['OS == "linux" and llvm_version != "0.0"', {
--        'libraries': ['-latomic'],
--      }],
-     ],
-   },
-
diff --git a/net-libs/nodejs/nodejs-18.9.0.ebuild b/net-libs/nodejs/nodejs-18.9.0.ebuild
index 03af59cf2a80..6c803a2495ee 100644
--- a/net-libs/nodejs/nodejs-18.9.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.9.0.ebuild
@@ -38,7 +38,8 @@ 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= )"
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
@@ -50,7 +51,6 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${P}-clang-fix-libatomic.patch
 )
 
 # These are measured on a loong machine with -ggdb on, and only checked
@@ -127,7 +127,11 @@ src_configure() {
 	# LTO compiler flags are handled by configure.py itself
 	filter-flags '-flto*'
 	# nodejs unconditionally links to libatomic #869992
-	append-atomic-flags
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
 
 	local myconf=(
 		--shared-brotli