gentoo auto-resync : 29:05:2024 - 00:07:15

17 files changed, 61 insertions, 576 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f1d02d778fe5..55beb085ce9f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index e1100c7eca8f..750c856f6616 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -4,5 +4,5 @@ DIST davix-0.8.5.tar.gz 7371985 BLAKE2B 134c4bd35627edcb46bfa5be3ea56b5a6373ea2b
 DIST davix-0.8.6.tar.gz 7372108 BLAKE2B 01405cab344d62facc494f2f70f52dc616775830e0ecdd02195fe21c67eea90803eb73138ea0cec91d47f2eb46379d2d2431bbeea74b9487e4c201d3261cac10 SHA512 de9aebb35dc81009fe2f82e5db80f102569d4c6c400e8f99bbead6cc10b1519c598b204ff93606a6d7f824717e8feda4b367234c4a893b7e83705f390a2c9d21
 EBUILD davix-0.8.4.ebuild 1749 BLAKE2B f521c0e537082706742bdd0b756592a9d4a2305065e2d83620f9ca0ed4a30b39bacb48972e4178c509d6ee63e34bed680ee801b0f5c6d5cca43b84123386fd29 SHA512 9c24ea88b90cbe15eb813612661557281bbd643b80165c8bc9f690f5951d2063d24639d7f32a383e940eda078b993250e8e277d9e9e732b28f7a50d7543e26dd
 EBUILD davix-0.8.5.ebuild 1797 BLAKE2B dd33c7980f1baffa160c2d8f793e3d665c420e4d63d1d0319debe905fe2cee37fd5ef3825ba69ea14a46cbaf122d723bbce27c58f7ec8e17605fe603b09bd8a9 SHA512 0d8c349d555ccc63c395b498d5ec11fdd2b4fef3b04f4b95e9f8b0b414cb65a45b7198620794bf4a2badfa65310190bd311c1aee11bf634a42648108d629601b
-EBUILD davix-0.8.6.ebuild 1804 BLAKE2B 27cc741b8c897d557582df0e421ba00c161a2ff0dfc95d6b61f37d016110742dd7fcf782cabbfd0c124e749c0578e0a9c2951d3d6cb1158704a0dfcf511c273a SHA512 005b6fd7a9146ce5856c3077ad04c8cf4930da068396b6784d7f044ded8bb560ac21f387668b9678817c3166d774f8eb85beb07c7d3b92c00cbaf89a8420563c
+EBUILD davix-0.8.6.ebuild 1803 BLAKE2B dec4577a2b1f3f22acf7007692afb609a92f61802e09824554684e3b29af3ea60a88fbf0e1b08b01f82f439d4337944cc1cd6a8d8c4ea97dfce1bb64b07ea244 SHA512 1faba4812a298dabb4c077bbb7e989dbe85da1d2ebf0fdde579d011c656e12e96bd6fbd54f00dd9c76fda96970095f7e77002baaf7c0ae4845df6afda0c2830c
 MISC metadata.xml 411 BLAKE2B 2337249e053b9d5328625bc392a9234c61dab65c76d7eab80cf3ae928eadb39d9de9c952fe9f52dca01623ff4012eb121f78b0c32138e0c833dec494e683ef84 SHA512 dcd6132646ff919ba6ec3c4dbb9a31745edbc0b5faa658fe7c0f4d42737122d5294aff00c293a11ba7d8c0bafd10a931dd519c04245c8618c6ea969ec4f9e2ea
diff --git a/net-libs/davix/davix-0.8.6.ebuild b/net-libs/davix/davix-0.8.6.ebuild
index 3d0668485246..328b23376f85 100644
--- a/net-libs/davix/davix-0.8.6.ebuild
+++ b/net-libs/davix/davix-0.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 11fe026df7a8..726517211e73 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -5,5 +5,5 @@ AUX ldns-1.8.3-swig-4.2.0.patch 2935 BLAKE2B 15626ba3f3835bc9e3f86a639177eb6ceb8
 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
 EBUILD ldns-1.8.3-r1.ebuild 1943 BLAKE2B d37692bced21132fb8da0c52219641fe340a10bc8e63c1e756fa04765fb6fa5bc621973f029c3c291bc296daec6e322ea0dc33896e59dd0f324ddbeae6f31b16 SHA512 7a612d4b5a1dbbb833059529905b94ec272f0bde71fe60295ab54a52be37f17909fcaa5e0752de6f5e453ef568c07cda32d4bfa453caaecfad55f9068dc793c5
 EBUILD ldns-1.8.3-r2.ebuild 1996 BLAKE2B e5dbca6c36a8a230a51482b1c1b7db3b25d27ab51416fb9350d8d8d61fedbc299289c36b3415c9238e386f16b4fc8ff640367f03554d945bfce9a2fd81eae32f SHA512 976894604aed6d47baabceed8a0185312daa589ce9ec7b433dff899462b181fdc6120c4cef490e03c78ca445cb3ba51d43d1dd92d5c34bb885f23437c6b369b0
-EBUILD ldns-1.8.3-r3.ebuild 1965 BLAKE2B e5dd228cbfbf229580dd4c983541b3cb509bb8d30e0bd3a2c3b5e7c2bde2c71e584350c2f26333c0219c6b021817de93d6b7b23bbe766968fb94c03a3d565d7b SHA512 0bada3ec2b1ddf9d794ffd404b18e665b887cba7780efae3df357590de79831c8b8ded07f54ef4d217971c98810007e94e8325b0e6607ab578817bcee854a77a
+EBUILD ldns-1.8.3-r3.ebuild 1961 BLAKE2B fff5d166abbb8eb0ee8ab91a3ecadd7dc59b235f018c23314603cbadaf8ec6e3df9171bcfbed834c9ad9ef080d8b57f0f71b18c928b9ef84966cae322971aa1d SHA512 47570383ca07f9338f0ca2a07a0c30d0aee883f0d311c4afcfdfeeb9b99d0b753ee3f67103a160e3ccdbb54ac2c7fe4bb8efcf54f579a616572618be8b2fc493
 MISC metadata.xml 616 BLAKE2B 17f79a6324d889cc626bb3fceef622a45f112587618bad54422503d7a43914c46a03563f5e0b8d9d170e25c2e77666325607e485d421853359cbae13e7f00b34 SHA512 a764ec840b5dc9cc90c5952b93e2e226914c9eaca52f18f0c4f4d7d128bd1b2bc1eea9e699720d37b2c041fb6b01e0b298ac7f000ed72f0a7e0e2dce733febff
diff --git a/net-libs/ldns/ldns-1.8.3-r3.ebuild b/net-libs/ldns/ldns-1.8.3-r3.ebuild
index 8b6b4d2afbe2..e44d317cee45 100644
--- a/net-libs/ldns/ldns-1.8.3-r3.ebuild
+++ b/net-libs/ldns/ldns-1.8.3-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test" # missing test directory
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index e53725338305..30d7bafd3a1f 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
 DIST libmbim-1.28.4.tar.bz2 213993 BLAKE2B 86418182fea2ed50d6b606b898e58f0511ecc5ed4be36748678befa3c005d37a2364db6f4f5537f6a616015f635bb77cfcae282b328b1dd3f5807eae360e93a7 SHA512 f6ac196106e70c790727438a4f42c14b3f8e82dc96b9ac244fbe44b9173132d9562dd6250a51bbf21fc3b84a2a059ae9d7d02d08cac5ba5775715507a64d66d2
 EBUILD libmbim-1.26.4.ebuild 818 BLAKE2B 0e5a56b61c8ecd00f64567c92bbfc231300074127801ce45faac59d6542ffa241dfa41fe230baefb21e3c233df0465bf950490106da11abf614e9ea64de2fdec SHA512 c8ef5404377c880cab18f6831646f1a4251ad0d67e190f4f129243c4f464f00da07a78ae23ad3726fe614cdcbd8fe5d694813231bd0d58d565d623141aa75dc0
-EBUILD libmbim-1.28.4.ebuild 1120 BLAKE2B e00c78075ef8621b9d1ce31b0f26b98ca4e7f6497bf896a84c4f609b5f79a532381b68340b807cd1707f259091d132f769a820b493a33b80353bfb90ebbf6a27 SHA512 3207a26d63be7bbbbe3ed11abbaf01318719d4b4e266680a25163f24175a75cadceccb37d7a6e832f60a07cd8fa4f97096c1a0cf1abd7f17d95980f64972de97
+EBUILD libmbim-1.28.4.ebuild 1116 BLAKE2B 39b5d18adf92e9a38735e44d4a47e215378a6290a66984e8feff2dbd303ea45395c20b4f031c0e754539d21c43b7436c49167888874e9d4e6273632767aa7e19 SHA512 61885b4cb44324f96b1ee6d10224da03046acd8a913eb47c12b247ee54b182153d59b5b2f4c3ae8f589c6a28a6aee50d87664cf9f300df6d05fd93f668586fc2
 MISC metadata.xml 338 BLAKE2B 2815902ffac2d76180100eebb3c6b7e72c17b024325d0e4dabf24a7dd1a0365c409e95b2d735595c762f9f16dca663ce34106bbedaa872a5ed72435778914b6c SHA512 f43d3c8e5b608e73f8a230760bffc555c0728f9109b321d7205288de0a52e4867135b026b8775b4443f9db761874736bc849d8b16cfa636685e115fe9b9f53b2
diff --git a/net-libs/libmbim/libmbim-1.28.4.ebuild b/net-libs/libmbim/libmbim-1.28.4.ebuild
index c66c9a6a7cab..fc6d8990b679 100644
--- a/net-libs/libmbim/libmbim-1.28.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.28.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/${PV}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 7b3dac09c292..4a07c4562e86 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
 DIST libqmi-1.32.4.tar.bz2 3710575 BLAKE2B 728cc821208432ec69d21d6b1b16e82f982e27ba899e0a2426b6e1ae6ce8cc800f15417e4d5ff6fd9a60ad2a0e7c3f3ddc77caee9115431d174e29bd40a8398b SHA512 6f68e2dd4bf5493de0c9298d88e477f9477b367f887bf5321a1faab7e8217fd10e761748326deb37ca26659bef70d5c8464bcb964d0ed0ba1f44c423785ebb0f
 EBUILD libqmi-1.30.8.ebuild 1268 BLAKE2B 8c7eedda6bcbab7e0e401980883b80fa2425c43e5537121689d0d180d3cea553e3b05eb9a492341a0ffc7c93554846b8f3b0901d8f0fba6b39f268a30c905555 SHA512 80dde870797eb4e8ecdf7f3df8eaddec90d884de1b293e24059b5648d396cd0bb0351ce59bd649b16d3db9449cf585d32659082cd2af4c7c1df8b53ca8b7b4bb
-EBUILD libqmi-1.32.4.ebuild 1419 BLAKE2B 9c41b6e9bec6d317df230a043785e5d970ccdae9a1c17ed9a2f51ba3c1bf7b121411f51c6c06473d4bb72b947c2fa169867efebf2821fb2ab6c09570b7c5924d SHA512 99522e01dce8a5cd78fc9233956cf810cabe101265e400acc4dfcf93f4927a0e74b1c373d22c08241b158dfd938f9b6ffae9dd0bc07ab7b16af2ff100da3475e
+EBUILD libqmi-1.32.4.ebuild 1416 BLAKE2B 7c07fc8bca584f13ff286f15990783a3eeaa2013bd82de0a97fafe70e79e39cae3aa0576a213f293cb50b1f61ce25ab5543970366bd09fab0b6c424a6187122b SHA512 56990666f17f3f5780eea0d444d713e4a6bafd1c4312584bd971ce7c998edf7d471e7a6e8d30dc6826e63363a3593d9a392866844b2f0dce6897ca60b8357b2a
 EBUILD libqmi-9999.ebuild 1419 BLAKE2B 9c41b6e9bec6d317df230a043785e5d970ccdae9a1c17ed9a2f51ba3c1bf7b121411f51c6c06473d4bb72b947c2fa169867efebf2821fb2ab6c09570b7c5924d SHA512 99522e01dce8a5cd78fc9233956cf810cabe101265e400acc4dfcf93f4927a0e74b1c373d22c08241b158dfd938f9b6ffae9dd0bc07ab7b16af2ff100da3475e
 MISC metadata.xml 584 BLAKE2B b68349a0ffdd18d892129b88e33fae82e294fd52cbe4c4d90bd750750aa7918ed96ef2a734e01b2b70af525e7fc2bc2bac6bf2592fa941ce8805de7f810de856 SHA512 50549b9ad459c518b1248df30b428e585e14ce7285d442a1d070ea9a98c268fbc282c21bf1349111fcd0d1226f86534791aeb565514618a4a0b8543930164cd3
diff --git a/net-libs/libqmi/libqmi-1.32.4.ebuild b/net-libs/libqmi/libqmi-1.32.4.ebuild
index 5336e7de9c06..6f4aa3e9572d 100644
--- a/net-libs/libqmi/libqmi-1.32.4.ebuild
+++ b/net-libs/libqmi/libqmi-1.32.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 4fe41130e458..7c1b7c3147db 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,7 @@
-DIST mbedtls-2.28.5.tar.gz 4005000 BLAKE2B 755287e1a1e0be5d193a8a184a9ae3ab2b6c216235657f7f2e422fe06226cd4c7d11811bcb53519018137e7ed838b241704c955872e28f133bb17a5f42222acb SHA512 339911d244b4e6e4d77b344c796f018d9ad4c56249530b8a56e0dc305ddf30bc709dca96a19c5a06710e92d167ef22893e9e17e20837e9daee0d0be00a8ccae9
 DIST mbedtls-2.28.7.tar.gz 3990571 BLAKE2B 91a11d9d56fc058c3aef797e644c2c141cd70dc96716e75d9074de89717298a10c93e403a2fed9ae6f34c7549753a70d61b6602fbc21bc568c2e260d4f369f65 SHA512 1cf6722d60a49375f857c8d84f06dbb50ea08accaa12b329d75a93b959aef382410e7b6e0a1511407402b3eec5e2208eaf5e9fc2c8574ed0f8f44234bc4401b3
-DIST mbedtls-3.5.2.tar.gz 5584711 BLAKE2B f1d0e7368ad156cc5cde4cd396ccaf3e1cacfda38f7d7ee89c908245944d22152d141928e8aeebd298437079e7fdb74207875e2f48ce3ef1a6f5fb8840b19df3 SHA512 99f4110d8410415982cb9b71994b069e4d2f89841decccc68b629250c7497c10d5e3ffe867c4ac1518ec7d6edd9703c38fd8afb6c238e9e0e7132def2b09b4e3
-EBUILD mbedtls-2.28.5.ebuild 2703 BLAKE2B c47d404259f4c490c72583a0794e0fe7256e9e8157dc6a90bdd3cc27c41a5ade354ba007dbbbb413c091e31a2472818b3f64fe7b1f84224e0d650910a0890efe SHA512 c60e280dda496816c5dc40314d05349d8a81739c0d1dfeadc5146f2788305d2b758bfbd7e23688d73fc98a83149bd55631aa921a1eb04869e57e5b5170f3ed28
+DIST mbedtls-2.28.8.tar.bz2 3343796 BLAKE2B 1efde6698662873c40df9733bae902db4e009f3dd26a937e05707ca1a208b71675df0737b44b5895a60cfbf42f18f92dae88cba62f32b55733947b9c0481880e SHA512 c8e91ec50ab2caf1f33e907279dc30fca2a8cd97e6e531be857149589e52aeffb95b445b2a9fa674886f0071f446381da3bb8107f7e850f3390128b069ac9ea7
+DIST mbedtls-3.6.0.tar.bz2 4811255 BLAKE2B d453f072c39aa2ca5669f0fe84ab01ea826a98e1e48b59b5a788e3ae948c33500e8e0565ed6481ef049ee3efc72eb92828c9d08f5606766cb6c9dbde749459b8 SHA512 5c395890d486144af882aa96c9430103f79df889139969a64a490c0cafbdd5631a72bb668aa59b062204f19a5bb36dfcc5a096b59d76c7ef27f2560cd2388682
 EBUILD mbedtls-2.28.7.ebuild 2784 BLAKE2B 7cc403832b6bdfd94244755f94021771d1252ded59e52062d4c9692660935bce71df7ec11df01af02c8cfd1ec86896133b096cf1e2e67ecf528143a3047fd3c8 SHA512 e6e4847a94a9092c4fb161c1e86e778c6581dbb65f8948367723fce817438be8f5fbab46dde49a87b4c06937ed65b74f364e4db2fb29210b2452fa9d82ddc9bb
-EBUILD mbedtls-3.5.2.ebuild 2498 BLAKE2B 5747289ed398df2cc5101830e64742baf47a394023517cd8d0e439453492a66b94739625241f5a70f6a99d3fc85d405b904b7af746a6780471da11fdec1f1645 SHA512 985a2c98e02ea27aef1e3b38f6a99cc57def21e9351e170d0eaa5717ade0b3b6b46a32c648e9fa12de552f153e176f25b18407696a4fb79db8176b9ef8e88860
+EBUILD mbedtls-2.28.8.ebuild 2783 BLAKE2B e1d56a0251125cd8a343aa49e5160ff6eda00e07f5484ac59a56d4e2e2bd3904d1ccb8b4117a2cef997696ad99fa70d972c8c96d30512de650467647d48c26fd SHA512 2191649f677a9d8e5cdc39e2a1ef272c07f607449747e8f5d83424f06653a198dbe790045d323053aa8588b5ed5fab2a77fdfaf0bc5d0da5421911fa64a56365
+EBUILD mbedtls-3.6.0.ebuild 2490 BLAKE2B 12db043b219c7e107907e09aeb8817663ede8e7bddc3f9832d6fc0f90d4135da90032d06263e0ebad8c784d8a354b2beafdb8e99182091136326ba65885dbfe7 SHA512 01f664005db60f5eb04b5187be6568aa54c00016dc92264759cc291ecddbbcaf958dbbc2e9086c3139f13e1d8376ff69b5d562d184e8eb8c45782f1142c3f2af
 MISC metadata.xml 1058 BLAKE2B 6b3d24de59849c4fe1a629007300b3bc85aa9e7808e54f91a257c5d9de5eaf7b0567ad248aa928ea6b30a8977ff2d70410721bb03a7839c3f97d7d1c5f416e13 SHA512 8f8a6fef48532d23d10efc7a2334606840ae80d46373a423ab1898950e23487587c8babca2aacfbe7fa5dd4d1327d42e171ad01235f813541acfce27a0fa968b
diff --git a/net-libs/mbedtls/mbedtls-2.28.5.ebuild b/net-libs/mbedtls/mbedtls-2.28.8.ebuild
index 0ef263d1a1fe..3a5fad9968c5 100644
--- a/net-libs/mbedtls/mbedtls-2.28.5.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.8.ebuild
@@ -3,27 +3,26 @@
 
 EAPI=8
 
-inherit cmake multilib-minimal
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
-SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${P}
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/v${PV}/${P}.tar.bz2"
 
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 GPL-2+ )"
 SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	programs? (
-		dev-libs/openssl:=
-	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	doc? (
 		app-text/doxygen
 		media-gfx/graphviz
@@ -53,13 +52,14 @@ src_prepare() {
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
 		-DINSTALL_MBEDTLS_HEADERS=ON
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLINK_WITH_PTHREAD=$(usex threads)
 		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 	)
 
 	cmake_src_configure
diff --git a/net-libs/mbedtls/mbedtls-3.5.2.ebuild b/net-libs/mbedtls/mbedtls-3.6.0.ebuild
index 963a8edbe27c..4930d2404ccf 100644
--- a/net-libs/mbedtls/mbedtls-3.5.2.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.6.0.ebuild
@@ -9,11 +9,10 @@ inherit cmake multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
-SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${P}
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 GPL-2+ )"
-SLOT="0/15.20.6" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+SLOT="0/16.21.7" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9e59c8e718b3..ba4e20effbf8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,24 +2,20 @@ AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3
 AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69
 AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8
-DIST node-v18.17.1.tar.xz 40788836 BLAKE2B 50e0dc0eecd68620ffa7457319e71124bbba302f6acff79286a30cf97442fb09a96cf8781456bafd5c2e497ba88cf392c141f0e221683da421b87f653b1ad7ca SHA512 fd6f586447ecd44ac6738da1cf7d54e74bd33ffd1ee1acc2e0e1bdaf0031bcaef85751d3dd590bb278eb502daf9c77f0763b5a181a30ee4cf537aef254629622
-DIST node-v18.19.0.tar.xz 41248748 BLAKE2B 24f9c99737a6d455ad83a7c55d0c668190570b5947bb3a6b2f321a25ff1e30b2913a4e144821ddf794a975cd9765582426252933235ce033623ccf3ecce816a4 SHA512 db2f1342f028e5cd2ab0a3719b4c822e22439aa097b59df768fb7f6aa581394f81af6f51f7764b99d119ea2c849b55c02897af8caafab7c0f9d0112608a8867f
 DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3
 DIST node-v18.20.2.tar.xz 40550044 BLAKE2B 119e1c0a1817b982940704c3fb92bca8fa09d6d26921ffa01aa1240103704d2e2779774a759246f9b00372bcd991e8cff035f3c5ad0bf92e0fde9f640721904a SHA512 b613e1cf5c87535fc3db908cd258359813aae7636ab0e2fdd00ffe813f99e33050926f10016280d8fac4905fb933d1f20315b919fbf3b0b37cd7a9936ae415e3
-DIST node-v20.11.0.tar.xz 42162348 BLAKE2B c090a3b118c9f3b497450ea2572b08a7a0df0834f280b212d6f068e5fb75a0a095cc41fe5d530c51dd7c2ae4815cedce1c52642fdc5aa07345fb546c2ea3b396 SHA512 405cbd53f75d94b9c31536a638c6508215b34a77505471319c46f66eb87ac907cb6796b25efa27162da53cb6a013aaf9ad1a5690eb7ed793969055a648d1d53c
 DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8f93ef1760c520a40c9130e6138f95ab4e87f1acbaa72142bdd801ec3050bc42d7e4fae8d6a62192c3511b922e0a SHA512 c51c4aa37cc80f3fe34381f2cdf431053124ec6b83fc8490573502adfab48601c382448132c9962ab135bebaffc257a9d5b63334ba8ff480db57b5706bbfed67
 DIST node-v20.12.2.tar.xz 41634476 BLAKE2B 4a402cd4d2a3d59e249581b8dafbd09802f1fc6c1173810a7198ebf73bbe9ccbe085226c1889461d6faa2654138f21a2636594dca1a02847af9fd64ef80293e5 SHA512 2ff2873f3e1a15d529d07a74af601194c9dc7c24e566b989c96fadda8636d7ea1c97787642e9483a00db320cf1cf0817b43c4ba3ad45b15a241997c9f0c6c288
-DIST node-v20.6.1.tar.xz 41791920 BLAKE2B c131aa9dd2a155eb24dda80e4997895aab7d935e46d1f21e9e176aa15021aa68be41f49cc43557f0b2c962baf3b2da4ea0ba044efd5016ea58bf2dc0b76c4edd SHA512 8a6d998ae9b52872ff8cdcd44261f644161f31bcb565329ae05e68945c8da939eabcb76d2e0f628c8eb634de37d7b16334823f64122e4483c390117d8aa511bf
+DIST node-v20.13.1.tar.xz 41770976 BLAKE2B 1ee95ed15aecbc5d611abdba305f97adf2769e769db8ecccce1609aec5ed8e746ce4531d7a809bacec1da304f2dea44e98167ee01c57da0250c6a8b54cafa984 SHA512 646ac044e5699ba4740d3d4caa262b1c39b0a590c333fdb05bd35f4cb1bc52695b31169fb94264417dd553f46706e6dfea5b31eb336ba865d05397df67ba3b15
 DIST node-v22.1.0.tar.xz 44377532 BLAKE2B 161618a71d8f2c5f828e29e45f5eb410fb2c6695012ca7559bddbe3884e578d643414ebf59c1b3292dbe93bf115de43c4145f6ff24e11fb9e87a32cf4eff1859 SHA512 d991fe069e43cfab587f06e81df71b56b82fbdd7042cdbe46136fc9ccad654d6f8bd39ec9fd3a5c00fe73a82732b12e13632c26602c6f8d67c628938c2a55688
+DIST node-v22.2.0.tar.xz 44334460 BLAKE2B ab81534f1bc97ed66aaa60b07876605315ffdbffba97d2e2823ca570ca2ffe9f413e0dc7ab34ca45db06f7494003a79e583964c5c8f14787b34b60bed98a8a6f SHA512 c75c4907eaabc042c75f2c2aede8e23b2f204b70f4a777405132b3548ae35e58413f80147e3d7fadefc8048bcae175fc3064eda0138718e6f38e1dbf39ca8050
 DIST nodejs-22.1.0-deps-import-simdjson-3.9.1-for-GCC-14.patch.xz 192248 BLAKE2B 8acd447cea7ce7d68750c89a1778f0b43279ecd3b7fdbc4db36b9d0f97974efc6769266fbde2934b80e96db5a11f2550098b92d74ef72708d6e2cf542ebf0060 SHA512 7fe3f057b8785ff944cee5ad185a8708ee114f86344b9199f03443d149bc26bd2434c1ad32b8eb388f982f90632643b28aeff60177403c4851d3e7897b0272a6
-EBUILD nodejs-18.17.1.ebuild 7482 BLAKE2B 9ac4dc8d50e1f26df146f4159e34a1cc636eef2375daa10919e5ccb5b7c505f285872f8427c51c7640fd049b9f1a5ffe29c68b3bf7b07f6677f68565e7a61164 SHA512 6cef7adedd4a409c322abf44b0e1c0f53ea32ff9f3206b8d71e1626196860744c5fa7a4fca08815ec40af2de891027d7fad591bb2a725556c59c5152fe12313e
-EBUILD nodejs-18.19.0.ebuild 7555 BLAKE2B 5ed5167442f3ba68281f5e2634604f4108bab34931e2967ca37da66dac9917b125f4069bd85ce7426a50d7d6d9ae57f43409c412eeee52890e753d0a44591a70 SHA512 cb2aa8ad51c7fb4d01d747681df3a39435127aa227504c4d6570e9bb1b35438743b87afa3ef96dc0a1d13f06884149fd0ff151f746ebd19bd185764c0007d49a
 EBUILD nodejs-18.20.1.ebuild 7433 BLAKE2B e366853288364eddb38a0a598db70f83e5188a489ac2c5970eb21f9c993abd4807d87826536d0a1ea12315603edd5f0a714876d95d2aae1ef8e1ded8ee3e7030 SHA512 0a20a965b9c25f7319bc5dfca87e0ddf9f78f603a4dc334c68e750b847d5687b0e636fa199f089a004e72536435b334309ad042753a95f93800fb65515d77402
 EBUILD nodejs-18.20.2.ebuild 7438 BLAKE2B 156d9ca41a4c966d641cd6ba0b4a1d56634dc0a55c1797917a67d078f3c6e9a54eca3a89fb19b36f6200a9a7006628ba76b56ea7df7c499bf570a577c6db458b SHA512 02d95f400c38efdee04993d10be04ec0e3cd88f42f5fbf8852db5591a49fdbf1ae652eb057d17cce86fcc6d4f48142a01c1691e33119f1fdd3263a5ee8bf6af3
-EBUILD nodejs-20.11.0.ebuild 7545 BLAKE2B c8279df6be74f1d4b57870b2385932ad9a4d738845f84276bb152d8ecfcc96df2a330b645a2ca40c6803ddb97b65512739c4468e17b57956b8695b9c7e6bd9fb SHA512 a680797d1d59eef6ab1a285877bb5e52739ffdc43f5e43f1c78b124343aaf60cb2c5d5ff78f91f50e10db04e068f4e73937947e8f44b7db70f7444a984699b5b
 EBUILD nodejs-20.12.1.ebuild 7599 BLAKE2B 10339e186e827ab88b9830fbd76bab4a12a181fab9d6a6ce054948d8e1e64c32e54491bcc29ef6304827da39352f25ad73b01122c872c2667ee9d945f43368ca SHA512 cac02959f6cdfc3d99dbf918b910453a8175b2fce0a8dcaeebc64a21e4cb4186b19d5f4ce46b237de52c7e66e8f9a9dc4a353b9c12969f7370c82d91ef281b02
 EBUILD nodejs-20.12.2.ebuild 7522 BLAKE2B 29dcafce452678b5cce45321961fa50fcf95571f71990e4266589a9551ee15d6538b46af8721150a34fe329aa352937af38c7f29e5a53e265108841302d952b5 SHA512 5cd70ce3dfd4c0a1102be071784a0964b990b53e0729652a759b2d3d8678e4eb0240bbfbc943fd836e11965aeae4de70040d93654892480845143971b50127e8
-EBUILD nodejs-20.6.1.ebuild 7495 BLAKE2B 83f47c14b57b63d72cd940388adbda2c3c4e70e63b2123d2bc4651585cbe2ed8f07851805a78edaae0bb6959e2bf15eb378f9a95aecdbc4956a3377e07255130 SHA512 6d83a4e45aa952dcae536493fd7f13d4ea2c5f101355f574490a112663437bf6a95152dc6297b1359ba7f3a2a4583ccbcefe29d4abff41cccb9cb3069f07008b
+EBUILD nodejs-20.13.1.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b
 EBUILD nodejs-22.1.0.ebuild 7809 BLAKE2B 461d79a24bb270546c396e6a94d584ced1abcf604671c9606be953e89cca87b8fdc8271073fce2485744d5395568f861b17d6542e783edc7677978fa15ab863a SHA512 48bb51eafd4f1dd5eb08e0c141186db7d27ed6d0fa3219042a9abdec24335cfedd400308e0a551976f9f917b043433bcd926c86381501ed88b4af1b1ec0da729
+EBUILD nodejs-22.2.0.ebuild 7788 BLAKE2B 8e1de08dd2d0d60367d72c4dae504f0cd542da5f316daf1f706b9a871a5ed3cc52ee4f153ed83ca82d29e1da32744452badcdaed22351761378f08a01b6f8d27 SHA512 d302640c0c5857204d18d759ce607bdbce5bc490f6188b6218f52fb9b96bf2c20a182c819bd4bcc49aff7e2e951155fec34861a9f27401cc71adf0c7b9c8b625
 EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e
 MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6
diff --git a/net-libs/nodejs/nodejs-18.17.1.ebuild b/net-libs/nodejs/nodejs-18.17.1.ebuild
deleted file mode 100644
index 393119c2658e..000000000000
--- a/net-libs/nodejs/nodejs-18.17.1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="corepack? ( !npm )
-	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.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-debug/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-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 is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-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}-18.16.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# 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
-		--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 corepack || myconf+=( --without-corepack )
-	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 "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*: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 -Onone
-}
-
-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
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		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
-
-		# 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
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-18.19.0.ebuild b/net-libs/nodejs/nodejs-18.19.0.ebuild
deleted file mode 100644
index d3efbaec84e1..000000000000
--- a/net-libs/nodejs/nodejs-18.19.0.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack 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.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-debug/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-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 is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-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}-18.16.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# 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
-		--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 corepack || myconf+=( --without-corepack )
-	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 "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*: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 -Onone
-}
-
-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
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		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
-
-		# 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
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns-resolveany.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-20.11.0.ebuild b/net-libs/nodejs/nodejs-20.13.1.ebuild
index a1f833f49275..1ce818bc4013 100644
--- a/net-libs/nodejs/nodejs-20.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.13.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -20,7 +20,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 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -37,6 +37,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/libuv-1.46.0:=
 	>=net-dns/c-ares-1.18.1:=
 	>=net-libs/nghttp2-1.41.0:=
+	>=net-libs/ngtcp2-1.1.0:=
 	sys-libs/zlib
 	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-71:= )
@@ -83,9 +84,6 @@ src_prepare() {
 	# 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
@@ -105,9 +103,6 @@ src_prepare() {
 	# We need to disable mprotect on two files when it builds Bug 694100.
 	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
 
-	# bug 922725
-	use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch )
-
 	default
 }
 
@@ -129,6 +124,7 @@ src_configure() {
 		--shared-cares
 		--shared-libuv
 		--shared-nghttp2
+		--shared-ngtcp2
 		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
@@ -237,11 +233,15 @@ src_install() {
 src_test() {
 	local drop_tests=(
 	test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-fs-read-stream.js
 		test/parallel/test-dns-setserver-when-querying.js
 		test/parallel/test-fs-mkdir.js
+		test/parallel/test-fs-read-stream.js
 		test/parallel/test-fs-utimes-y2K38.js
 		test/parallel/test-fs-watch-recursive-add-file.js
+		test/parallel/test-process-euid-egid.js
+		test/parallel/test-process-initgroups.js
+		test/parallel/test-process-setgroups.js
+		test/parallel/test-process-uid-gid.js
 		test/parallel/test-release-npm.js
 		test/parallel/test-socket-write-after-fin-error.js
 		test/parallel/test-strace-openat-openssl.js
diff --git a/net-libs/nodejs/nodejs-20.6.1.ebuild b/net-libs/nodejs/nodejs-22.2.0.ebuild
index 1255419a47d8..37c99da5a59e 100644
--- a/net-libs/nodejs/nodejs-20.6.1.ebuild
+++ b/net-libs/nodejs/nodejs-22.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -20,13 +20,12 @@ 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 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
 IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="corepack? ( !npm )
-	inspector? ( icu ssl )
+REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
 	system-ssl? ( ssl )
@@ -35,9 +34,11 @@ REQUIRED_USE="corepack? ( !npm )
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
+	>=dev-libs/libuv-1.46.0:=
 	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
+	>=net-libs/nghttp2-1.61.0:=
+	>=net-libs/ngtcp2-1.3.0:=
+	>=dev-libs/simdjson-3.9.1:=
 	sys-libs/zlib
 	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-71:= )
@@ -61,10 +62,6 @@ DEPEND="${RDEPEND}"
 CHECKREQS_MEMORY="8G"
 CHECKREQS_DISK_BUILD="22G"
 
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-20.3.0-gcc14.patch
-	)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
 		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -88,9 +85,6 @@ src_prepare() {
 	# 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
@@ -127,10 +121,18 @@ src_configure() {
 
 	local myconf=(
 		--ninja
+		# ada is not packaged yet
+		# https://github.com/ada-url/ada
+		# --shared-ada
 		--shared-brotli
 		--shared-cares
 		--shared-libuv
 		--shared-nghttp2
+		--shared-ngtcp2
+		--shared-simdjson
+		# sindutf is not packaged yet
+		# https://github.com/simdutf/simdutf
+		# --shared-simdutf
 		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
@@ -238,11 +240,16 @@ src_install() {
 
 src_test() {
 	local drop_tests=(
-		test/parallel/test-fs-read-stream.js
+	test/parallel/test-dns-resolveany-bad-ancount.js
 		test/parallel/test-dns-setserver-when-querying.js
 		test/parallel/test-fs-mkdir.js
+		test/parallel/test-fs-read-stream.js
 		test/parallel/test-fs-utimes-y2K38.js
 		test/parallel/test-fs-watch-recursive-add-file.js
+		test/parallel/test-process-euid-egid.js
+		test/parallel/test-process-initgroups.js
+		test/parallel/test-process-setgroups.js
+		test/parallel/test-process-uid-gid.js
 		test/parallel/test-release-npm.js
 		test/parallel/test-socket-write-after-fin-error.js
 		test/parallel/test-strace-openat-openssl.js