gentoo resync : 02.09.2020

59 files changed, 357 insertions, 2491 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8188f45880a1..2f6e32c53300 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 42af40abdb67..911c8cabbf13 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,3 +1,3 @@
 DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f02ce740655953bacbcb6fa805e441ac989fa1ef7504cf3417b366acc9dc5562b13788af72faedfd27778bd3097769 SHA512 57a4f1416efddff4ce0a7b1cd5f1035df95a01001fff3b43b0febbb62b322839b1d0e8be2c765863da6de3e30c85726a8866529d9b16162b18d5c204e7eb8081
-EBUILD aqbanking-6.0.1.ebuild 1401 BLAKE2B 62f4704d2c6d7ba8d7dbed14872d85a731b3112eb706d9603d5af6c295a43f1945171cee5d176bfec1f83df8cd581b9522cbeeb303179089b356f5d9b5cf3eda SHA512 e07837eb55fb8986fcf0c815f5949e1a8e5809531738e12c8d3310ba82378c8081ca8eb45d2e2324e077a9d8c34ed3026612156386b18a2f0a0eb19fd41432dc
+EBUILD aqbanking-6.0.1.ebuild 1408 BLAKE2B 053dd82a49aa370b45d0698b84b64f3e0441400947e578056a6718b39271c69e3c6cd41bdb58cc9d8263912154ca67264030aa60ca65e6d3c5dac757c7138c37 SHA512 76742499d90a0a9fd8c2097dc43cd4c5da919c66ae91da739aadc457308965cf760442494d766964c75096c6fe8b1f86db567bce6e05204a9b2c7ea50407cb32
 MISC metadata.xml 342 BLAKE2B 0bf9cf1a12561f8866abed7cdc86bcd8c7d669455c45124a7fa75245b5f824a43c12ebb32a068e941a34bf592555f400dc8d6564c498823038c9579a1fbcbedc SHA512 f31c89fe2a274397cf78c5b95f019090fcc80bb898f29d8beadbb3615425ae960f2d779329e96a2dcb0645021c8fa102110b82df8b353de28d1c9a717b44f38e
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
index bcdec3f90a61..f2a3e161f63d 100644
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index f4202af5a9cb..a0079a0a89e0 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
 DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
 EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
-EBUILD glib-networking-2.64.3.ebuild 1747 BLAKE2B aec83ed68210d0ee8db1d40489de6a1831e820387c46df0b0089ef3465cdee0c10ff2e1c1191a6d71dbbc9578d8c39b81269dded48aa0cb4ff35adf735099ea9 SHA512 d6902a8ed81ca0db91bdd36195a8a79b10b1e8a0f6984261f393aa36bad924baa4c25881ecb5089660c0f5dcccb158b2d8adcaa1232f69895869f499506ba344
+EBUILD glib-networking-2.64.3.ebuild 1744 BLAKE2B 5cddcdf4a6ac2cb7c59e93bd0fc4a05ceb6355ff281c571f3df40d8c5344afc8a9b4520b77998dd7e0d4ec0ca6dc56189c24bfdfee5599a39b32a10e9d282adf SHA512 a6fe537e5b403837c39e07f46a8de3042d55335adc5981a85908caafa30a67c82ed7030332a0a9b7c254e82b6ce31a8559af660371992ca2a9af9a29c95cb0b5
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index 6db91129b7e7..9dd87ae168f3 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index c120a2aad616..064844c5f74b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-accounts-3.34.1.tar.xz 856288 BLAKE2B 99a6c242dd57acf009a2b4451287fff5bbc61b0aeb0396b13368b179d1b1604b413ff9dcb56bf4415c990cb4f2cb434a0fcf17b9381dcb5055a99985249af5d4 SHA512 233f1b15d4a7bdbee4ed85ba252ea0d9af2ac15a2edd3ce2b40d76434285fd093f07375313a599fa191f8df1551eb37f48c4784e389fcbaec0565bb3aba28426
 DIST gnome-online-accounts-3.36.0.tar.xz 860472 BLAKE2B 921f2f5ed9ac3db07046507723d814fc41579aee76cd2437673cdc3612db1077627ab47586e719b56a5bce25afe75b8028477f69745791eeb774c82bf854863d SHA512 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81
 EBUILD gnome-online-accounts-3.34.1.ebuild 2047 BLAKE2B 793d38be2462edcac5bee0d9476cd21950a55a84feb681ebaf24ae9dedf1e886f42062a67eab7658abe74c9cca47f572b5df381ed8f90cf80f4367441f827524 SHA512 c8e1dd15ab4ee65accea210745fe2142ff3e23c2eba5c01988fd3d6f581e06b7eb89d14c393e88d053595d30b1c735cc3ec29c8a59044c18cca14d3af2dd130d
-EBUILD gnome-online-accounts-3.36.0.ebuild 2003 BLAKE2B 66023e42a0eff2a9b6230b2f15c6c594cdd9af69765da2c6ed35bbe9e72f58932b98d22bebb6e75f76e0a52288a87ae4a860da1a95a5e1304c333b12eb9da102 SHA512 7285b2dc2a309f247fdcd24228ac6ef946d01fd2f9a9b0a66b4d05f82856a73f456a58dddc5746026f567189bd12be9b8d4084b2634f512e0f9f4bc14181918a
+EBUILD gnome-online-accounts-3.36.0.ebuild 2000 BLAKE2B 6fa042b85c7bdbe0f80a52dfd62473cf15829c2f95bf14fc94f003ea000d33991f52426c63149221722fc73ae0ed408927acaaf848c751e9814ab57cc7881b46 SHA512 d1b8d5c98688831f218f4076bcf7cace567f712e56cd0a9f30ecc8482f81bdc7b020708c31d6efb69509ae1631188ec798a2c652c4f6e1c9f488f0332082881a
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
index 46f94f562491..1e103dd3910e 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index aa608f7a84f7..1199efcab11b 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -6,5 +6,5 @@ DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b
 EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
 EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
 EBUILD gupnp-1.2.3.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
-EBUILD gupnp-1.2.4.ebuild 2276 BLAKE2B ff89c5257db70b96078c653750f243f55ad546c3728399258bb769bbc88a79fa3824dfa3ff7a30be9dcdcefae5649f905b5c06a8003488128b8a476916998729 SHA512 66a9ea6ddd09feb0582dd3f3378ab6645d2a296c7a87dd80b6a18e88aa19ea039bb377d9951729009f8ac223f0c02785a9084daf390eef6190fa7a92883cea17
+EBUILD gupnp-1.2.4.ebuild 2273 BLAKE2B c60fbb6ae278049efe4d2094ab11b950ed2cf650fc8dc4c932724854a4b3ebfa5d8934222bbcba8e3d401c3538188101c1caf979cd39e8346562df8d37e61828 SHA512 db480d84eb26533be29d07552381d48956c8c77062244a4010aea37f65cb75c1d9b15e812f18f5b07e134fbb27ed15f3474f39f3db3f96e97b4154271f0110bf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.4.ebuild b/net-libs/gupnp/gupnp-1.2.4.ebuild
index 04d38d445038..3fe2d9a3b039 100644
--- a/net-libs/gupnp/gupnp-1.2.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index f99656007aab..e083ef812fa1 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -4,5 +4,5 @@ AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08
-EBUILD ldns-1.7.1-r1.ebuild 2750 BLAKE2B 99e56125cf917ae7b5857f3b163c5467ac8f50dd34a353a6194d21f544c33f335f890deae1c07a8c65e91ba1c0c56f1a7ff0ca61c9ed04642a1a5f68b8520b4f SHA512 2ebb841a5a46e0db3d2392fd0c73cd49891a544c1574329a30aba53890e57688805f99b6ef0d3ae2af8a7eccc69d83586721b8ee076f27b2cbffb0e58b32f4ec
+EBUILD ldns-1.7.1-r1.ebuild 2747 BLAKE2B 179adb5a5210721b9cfe86e63ae2fcc39104c57a438aeba9ca2628209ef8f7abdb18fab7fbd01590e039a4a3054308869c510021f3e10acc16b8cfc117b30159 SHA512 ee074557740485a44beae54b23bd2d3c595c969776cac5212af1dabf928831a3e5315405dada1a8d1142948f54e604dabcbca5dce258e5ba5c4244189066153a
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 87bd0db0d875..e4224bffd2a9 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index a8ee8800fa7e..8cfaea9148df 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,6 +1,6 @@
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
-EBUILD libbtbb-2018.08.1.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
-EBUILD libbtbb-2018.12.1.ebuild 3638 BLAKE2B d4ca9721c0693baf0dc4198362ff1f2cc87348afd54c41a335b6f45de9ae54be69914e3754ebd66b8f29b246ef52059623a1c0b74c1170308e147a1f288cf543 SHA512 a2ef2004e44d42e371dc214bb9ac6e7d72cb9ef2cf53888629cddfe0590bffa488f29579b295c2df3990883f549037b1a94b492d09d852ae220ec37d1f390b0a
-EBUILD libbtbb-9999.ebuild 3641 BLAKE2B e6d6929cb9d5df05fb7bd255a2d72e72a7d4851e901a1087217f0065743063535e2feef42532fdc9cae63d4f459d76690c84519711df5e972ba396be9c85b983 SHA512 69181d452d4acb95e03883705566ce31f33f2b57b1a53d8a12a529b7b73b01d901b8720efe6ae4667d08849852e772f1e00ff35146596f1b9c2804c069e878a2
-MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
+EBUILD libbtbb-2018.08.1.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
+EBUILD libbtbb-2018.12.1.ebuild 3476 BLAKE2B 726593872c2381dc76737e00bd1dd53a32fe56ff042615d8625a297dd3e177a925a27b1cd217b16d62511f88d0fd0d6d594d772646d46c38d13ed9041d24cc84 SHA512 c6bb6dd0de2cd46d8d8860b9afe5f5f126f5ad94d86e00f67d89c60f6a62bac1915ee21489f3160b9f73362fdfb4904b2524309922a1951b5afb3fecb05ca1d1
+EBUILD libbtbb-9999.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
+MISC metadata.xml 504 BLAKE2B 60d141d4d1d3cba4986ccbd980ea1e5e38e055cbfa533e3fb0d1a1f06f7bd6b88c19c217ba9ba3a5f4127ede213256662a6165581047ebc9f0edb8f114cae4ef SHA512 bd75845c471382ed6720c72f4597fcfe7527788273b222c74ce8ffbeb5c37e65a500e9c51626c3d969037fa583af99708817dc4b66f51534abae445bcb3b5c65
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index ee2dca3e96ce..a1587cd739a2 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
 
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
 	wireshark-plugins? (
 		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
 	wireshark-plugins? ( dev-libs/glib
 			virtual/pkgconfig )"
 
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
 get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
 
 which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
-		-DENABLE_PYTHON=$(usex extras)
+		-DENABLE_PYTHON=OFF
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index b2017354f2a1..d3976d1260b1 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
 
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
 	wireshark-plugins? (
 		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
 	wireshark-plugins? ( dev-libs/glib
 			virtual/pkgconfig )"
 
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
 get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
 
 which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
-		-DENABLE_PYTHON=$(usex extras)
+		-DENABLE_PYTHON=OFF
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index ee2dca3e96ce..a1587cd739a2 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib cmake-utils python-single-r1
+inherit multilib cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -24,9 +21,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="extras static-libs wireshark-plugins"
+IUSE="static-libs wireshark-plugins"
 
-RDEPEND="extras? ( ${PYTHON_DEPS} )
+RDEPEND="
 	wireshark-plugins? (
 		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
 	wireshark-plugins? ( dev-libs/glib
 			virtual/pkgconfig )"
 
-REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
-
 get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
 
 which_plugins() {
@@ -74,7 +69,7 @@ src_configure() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
-		-DENABLE_PYTHON=$(usex extras)
+		-DENABLE_PYTHON=OFF
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index 810dd5222c3e..3127bca391a0 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name="extras">Install pcapdump and btaptap tools</flag>
 		<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 8c6c2d23509a..2e3fa92678df 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,4 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
+EBUILD libmrss-0.19.2-r1.ebuild 1178 BLAKE2B 19aaa018be3ca1778524935f77d8da8400110e314042c9db74ce04774539daf63228278c8ad7172402c55068a0afb7a1baa4ede41330084f4e95f5bb6d07576a SHA512 bbc528a93bc4cc79de5fbb59f1323173aad82680f08dfc703a266b6e05b72398c40749d7dcc6bc9bdd069c62ee942fa24ae8d7241ede6b2c87764124ecefb828
 EBUILD libmrss-0.19.2.ebuild 980 BLAKE2B 973b0eed41f64477fb7d00a55a0ef32dfe7d6e2f252dbad8a7c25453fdac8b7161aac4422348105a3d52dd4c1d258c0f22b6d45d0acca0f38fcd6829713ba7ab SHA512 f3fc8203513bddd479e496329cbc524670c2a0a81fa79e6b88758b69a1b5e0b746b14906d9b5f3dfce4d8041f992885f1805f204ac4d740aee07db967c1976c0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
new file mode 100644
index 000000000000..11b589a29931
--- /dev/null
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
+HOMEPAGE="https://www.autistici.org/bakunin/libmrss/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	net-libs/libnxml
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# TODO: php-bindings
+
+src_prepare() {
+	default
+
+	# Fix lib dir in installed pkgconfig file
+	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" mrss.pc.in \
+		|| die "Failed to correct pkgconfig file"
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		ebegin "Creating documentation"
+		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
+		eend 0
+	fi
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto test
+		dodoc test/*.c
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 0a3251e0a8cb..b926b8d32d2e 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -8,6 +8,6 @@ EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac86
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
 EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
-EBUILD libnftnl-1.1.7.ebuild 1195 BLAKE2B 5e377c853ca587d38e69f878bf0995e77aa8952bbf0e577fb334fcd58ea609bb36d9e9a6a39180557c26d80265afc385e85087546effbca01eb503326b61d469 SHA512 813d19028f467dc7e913632f0f14687807cc1dd1ad16e02d4c275237b3d5fdd6476301836952c436fc4581a27a37f8c48b4c53e95faba3851532b6da36522fad
+EBUILD libnftnl-1.1.7.ebuild 1194 BLAKE2B 36f57ef4cbf46a224c6fe44d188725e7eb34d8a20191a4ac030b83bc33e3078763e0a0a012825444736ad0db8d11207c00838af53947d9592ab032d340da86a9 SHA512 3c641bad38bc162463b62ee2d361169c5ebda19249b7538cb026aa7aa099a2d7949c7a2bcec896845910b1d3db0c08a4a76e41c7f22bcd9acd189134a7285101
 EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
index b513b7c6303d..f0c5e98a2468 100644
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index ebecf49328d8..42ebf3e7c22e 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -3,5 +3,5 @@ DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0
 DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
 EBUILD libnsl-0-r1.ebuild 564 BLAKE2B 20dd0a9847b571117f74664778ef7b21906c5f7b822af15f05644789e41cc33b7fd924b5dc6bb76e98811148d8d592da75d805ff6610d712ed898ecb1662de19 SHA512 c243edc4f9f9ed5e7a98b7063dc8401495e5f9f821b5ae13008ce05cebdc4ffb79f5ed1a8dd8b0a13dd55e74f62f18c9566e74a3a09418647c2285c2519fb707
 EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B c79c866bbcee794929c8fb4c596f5db45da92fb62e888b761afe95665f67be12402fdae74e973901ad89b38743c7fbbad7a763e4e7b9dd0c492025119c3d3bf1 SHA512 45259a766144a673674f01bbcec425952b7aa3cff3a4556564843a560c59c0f9f436055b046cd893fa8f1c5eac9ef9d10abdbb920a1edcbcba5ee9d28ee734bd
-EBUILD libnsl-1.3.0-r1.ebuild 919 BLAKE2B 6fce877a68e4d75edd80ce7ad34dd7adc499a6c780f7374ed8f90572ecebfd6631cda5351ef311e72e0c9f18daada1cc27e648ad15172bbff9f0619074e6e517 SHA512 e954e1a9b76a4865656eb7083c178f640c75ef17d155ece248e6b829b06c1469f4be384b43a38595a27162640837aa99495d3a6877caef341f83e37cd36235a1
+EBUILD libnsl-1.3.0-r1.ebuild 918 BLAKE2B eea3d7b23c40aa58a5f57745df4fe273bb3cdcfe98d0ec27a5df45e746bf5bdee13c0096514da3d92820204dfc5aab7b0883f1bcae6b2cadaf64a715af3f6c2e SHA512 17ee8ca1b471b0551425a47c97aaca13ae5359e2130755931fed1341895189e04ed609171cb11a7a0921ccf404c74ed8ab097b9944310eb52174edfdf0e404a3
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
index 5a5cdfc6f771..3e2d6a38bf98 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index 75d3a6c2d292..0f52e51a7b2f 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,4 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
+EBUILD libnxml-0.18.3-r1.ebuild 1112 BLAKE2B f2ee4dbec855177e43d76947b114ef652b486d863fbe7d6402a086b9c4883ae7575b070624d45b1b460f4b4736e82612521e966daa40bc24d71f4d395de56274 SHA512 5a9a5132621ab607aaada5688139d5ce2ca26492c75e38073ca09b040df46166ed6d36461d55039bd9016dbda2271c701687f353dfe02842cd23e0107b98d73c
 EBUILD libnxml-0.18.3.ebuild 914 BLAKE2B 38f973759899df9afe7145d82b18f4a3f7eb7a2235ffe96b347cea12a7e83670904c4a2e23a0c4e4b5ec4190d9f5c4500865961fe773a95d1f94647d7340d03f SHA512 cc55562815a60568fd34427304273830bf9a3d4eb85a8f4dd7db433dc6748aedabef84d5e2d40f3810b011f7bf502f5bd8b37ef80f0d5279f4dda0b14d04268f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
new file mode 100644
index 000000000000..f973f45b72e4
--- /dev/null
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
+HOMEPAGE="https://www.autistici.org/bakunin/libnxml/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	# Fix lib dir in installed pkgconfig file
+	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" nxml.pc.in \
+		|| die "Failed to correct pkgconfig file"
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		ebegin "Creating documentation"
+		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
+		eend 0
+	fi
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto test
+		dodoc test/*.c
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 041af64b9c60..344cb97a22c4 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,9 +1,12 @@
+AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
 AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
+DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
+EBUILD libpcap-1.10.0_pre.ebuild 1964 BLAKE2B 3bc100b209597d14e241590612975d9f90e51d9d4992fac6f4909183ec4d6e47ca493c17d644ed0b3d99919ec64d4ddbff18a0376244bf30e4bfc1e0ea06379a SHA512 2b71c759029a5d0e32c82cd2ae9e25c04870783ea880f00231a9e2cf84ca13417be6d72fade91ee6bc0d60314afa57b33254b2b8af36490b3d7c9cca4dc0758e
 EBUILD libpcap-1.9.1-r3.ebuild 1915 BLAKE2B 07c0a1f8b90631cea3b1feb04a9b1c67cea39e5c994370f652c0e9fbcdb8f778631e74048cfe6dc9d7d1daf726b3d1ea96de6c0e0b767244056a145d7fb3deb0 SHA512 b77569c6ff1a51967507e8f722c40f8ee4473ae294bf80cb6af74e7300dcaff848be08305f77e35627dda12c919b625ccef510b245343cc7a7a71bdbb4c1ac5b
 EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
-EBUILD libpcap-9999.ebuild 1681 BLAKE2B 61f14972b19ff6acf3e11fa251b1fb3871537eb562e891ecf28b36446d077e76c2794e26afd802c41496fdcd01daeecee23a0f6991ab783710475d553a58dc70 SHA512 9bd65255fd37e834d05799fcb580c48f104f117e7eeb19e86aa559ee5e9f8235a19c0945c68e7b933d61f92a4c26097eb4638eac0fca596e0f81260971a1645e
+EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
new file mode 100644
index 000000000000..e5524ac3baee
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2225,10 +2225,7 @@
+       AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
+       MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
+       AC_MSG_RESULT(yes)
+-      ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+-      if test $? -ne 0 ; then
+-        ac_usb_dev_name="usbmon"
+-      fi
++      ac_usb_dev_name="usbmon"
+       AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+       AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+       #
diff --git a/net-libs/libpcap/libpcap-1.10.0_pre.ebuild b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
new file mode 100644
index 000000000000..3a80522a9f77
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${PN}-${P/_pre/-bp}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
+)
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 53f9d5815924..b716f8505940 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -34,6 +34,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index ef3dd27eae0d..459e8d2c6cb9 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,4 +1,6 @@
 AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c
+AUX libpcapnav-0.8-noinst_test.patch 609 BLAKE2B 191f9d223334160d8c3d904fe2540f44edbc65f83c263e8f90659ab9b92cc42a7f6addf60914d20bc77d13dda9e9cf500fa2bb03876ec8b9989af8682d22c19c SHA512 f3797711b665d0d094e1c814fcca5c761a51628bf0c807a6caa1a76e6cb06f06b74c741c010e05b84f1f39e61672a886519c81ceb2875101c5e28187633a67fe
 DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18
+EBUILD libpcapnav-0.8-r1.ebuild 929 BLAKE2B 24ee8a944d01d803852b8df77179f8837c566bcdbe2ecd954d06abf15c6c514517f0ada8764ceaa68dd8e996b9d0fe925d0c480b2c5287a4e55716a31ab41cd8 SHA512 19bde6af83439cd76e21978ec9cb76d041cb133e2ddb1283d69cca618dacc77b121490bc3f071270331acd97f5f6f6a9355a4a4b387faf24b90c1cb7cbd9b5ae
 EBUILD libpcapnav-0.8.ebuild 815 BLAKE2B 1b7df5b4e754936e84f01d8850a5b70dc8762a26290bb217ffbb319aab02a8c3d359095879308d723dc840dd16d8c79771528dcb97a0c893888fa2bef095ea12 SHA512 f39d670d58f9d0072a35a600f950323d13523b7291fa57d97f534342987483743d7d05152cbc7baf64fef52cc916b17e5bcb5dbcd891bb7f7e3c0ff3b98068c3
 MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8
diff --git a/net-libs/libpcapnav/files/libpcapnav-0.8-noinst_test.patch b/net-libs/libpcapnav/files/libpcapnav-0.8-noinst_test.patch
new file mode 100644
index 000000000000..7bac55b391e3
--- /dev/null
+++ b/net-libs/libpcapnav/files/libpcapnav-0.8-noinst_test.patch
@@ -0,0 +1,22 @@
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/src
+ 
+-bin_PROGRAMS = pcapnav-test1 pcapnav-offsets \
++check_PROGRAMS = pcapnav-test1 pcapnav-offsets \
+ 	pcapnav-jump pcapnav-concat pcapnav-filespan
+ 
+ pcapnav_test1_SOURCES = pcapnav-test1.c
+@@ -23,10 +23,6 @@
+ pcapnav_filespan_SOURCES = pcapnav-filespan.c
+ pcapnav_filespan_LDADD = -L$(top_builddir)/src/ -lpcapnav -lpcap @PCN_LIBADD@
+ 
+-# don't install any of this stuff
+-install-binPROGRAMS:
+-uninstall-binPROGRAMS:
+-
+ EXTRA_DIST = \
+ 	run-tests.sh \
+ 	test1.trace test1-correct.be.trace test1-correct.le.trace
diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
new file mode 100644
index 000000000000..4ac67c9e2d31
--- /dev/null
+++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
+HOMEPAGE="http://netdude.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="doc static-libs"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+RESTRICT="test"
+DOCS=( AUTHORS ChangeLog README )
+PATCHES=(
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-noinst_test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+jer_src_compile() {
+	emake SUBDIRS="src docs"
+}
+
+src_install() {
+	default
+
+	rm -fr "${D}"/usr/share/gtk-doc
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*.css docs/html/*.html docs/images
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 914c5b39a150..0179239de116 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,3 @@
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
-EBUILD libslirp-4.3.1.ebuild 726 BLAKE2B 9d775e7fd7ebcfcc42d8618ef8e3756d0ef5434eb10dd681bc98138e424053de9f33895b8cabd7ad92f96b4f95b295a46524b517494a9c36cbaa9745c7f2da0e SHA512 84b25b253c88959f0ad1c226d5869a6b0e633042c488e6bea9f7e64dc549fba2d2259eae43f2f3156f065272f6b1c8461ff1c78e51c402693148ef8756d4dd19
+EBUILD libslirp-4.3.1.ebuild 866 BLAKE2B 8b593217b287c6b0c7145256d20ac2249c1aacd22a6f78d52ecb785b446e2b979459ef2f94ccc94250810f76dcc24cd634b42d9c33f415b7f5dec00ba71e53f3 SHA512 89c0c8c6bed340aacbe107f6d056321da86bb000d1db484ca3f7b74ef5054619372888939e822fcd6ff5e2ab3e0c6a796a49ef830e750f44630f5fcd251e4045
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.1.ebuild b/net-libs/libslirp/libslirp-4.3.1.ebuild
index 5883ba4bc271..09463b75af17 100644
--- a/net-libs/libslirp/libslirp-4.3.1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="amd64 arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
@@ -13,6 +13,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
 
 LICENSE="BSD"
 SLOT="0"
+IUSE="static-libs"
 
 RDEPEND="dev-libs/glib:="
 
@@ -25,3 +26,10 @@ src_prepare() {
 	echo "${PV}" > .tarball-version || die
 	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
 }
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index e215dadcaf32..509003981ba9 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -4,5 +4,5 @@ DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96
 DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.2.5.ebuild 1645 BLAKE2B de2dec6ee157550e17fe25cf3e45fd3837c956753f7ec6c19d562ccaf014411959c3e7706582383d63fbe970c6e41e6cdde06fe687193681f0930853c7e3cd69 SHA512 c8cbe135c3ed50e0e77b59a6a7c93019fabccbc0105d941abe42c75e3313c47f990d64d83167603c8c4fdab7bf989bf1868ed9aa312c12bbd14f77ec98f5aac5
-EBUILD libtirpc-1.2.6.ebuild 1495 BLAKE2B 6ccfd69cdedffa56d5b165a58fa3e85ce1c3ca13a7e1f21f38ba31f7a74bb5bb5db11dc47281adce0a7144daa587b0f1db7069a33fdd82915986629d00f4cae1 SHA512 a60effb5039fdaa0eeb1525bead4385fc10db627a9bb85ee6a75b0ad707dbe02fa4928f83796eee0351068fe6729199b6af4b56688f8258632fb7cf06027c8ed
+EBUILD libtirpc-1.2.6.ebuild 1493 BLAKE2B 66e243917d5d90dbc525e8db028ac5975cfacd43e32b66ddd188f2fe946cb63e2f6f1c21f70ca1b1585839649dded33a1e21720103d44566c8a48064963f9036 SHA512 73fbee0d4359bbbed64e965b64bdf80e027119dcd7b103775fb08c86738e1b2730c587e58c5547ac01694b6e3754ab11f636b9d674a4e113cbda53301748c5bf
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
index ff2ac457a4d5..a4c292c39f1b 100644
--- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index f3a3d0361f49..cafca887a867 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,9 +1,7 @@
-DIST libtorrent-1.2.8.tar.gz 3583174 BLAKE2B ead7e28f7c29422526f8eab5611d98ba9a6d3827edf45c3819951a7ffb6f360debb818083bf0fa46e573005c3b9df3d3b4b3515c0498515449708b166e181705 SHA512 2a36412fb399f066de9768f4afd87ddbfc10fcd2a0b3a8be0a43bec6914497e71d9d4ffe4ff8ccc5544a048f799ccba6ce086ab6199f4dee66d1341f02d73f9a
+DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
-DIST libtorrent-rasterbar-1.2.7.tar.gz 4105179 BLAKE2B 126bb0b287c0573f755e918b3cf32a0a98c14b3b41f676d7842ea58deecc141b046b4bc18579cb9c20b324fb1361794ee6afedeff64d0b76f1bb6a95b82e10f7 SHA512 60dfb31b1300b3aa2219227b3a263ba73aedb54a90aa940c117027651779cb972d6e1badf9519f6ad7947233b54df608b829bab34493ceda9e4cb8913041a752
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
-EBUILD libtorrent-rasterbar-1.2.6.ebuild 2516 BLAKE2B 62917b73acec8bdb2b7112402dece5f50ebb888d4bddb581e124eb03b2da7e72f245e27cdfb542fba80e8a48ef9a99f02cee7fff0741733fa1914af5c760cf79 SHA512 9e762812c7f09fc129e3309c9883c24e8ea425daf938e8a0b3a88fddbd729980330b515a372eb016e0d711b67c862fefa315402f024836b4529a3deb9a033c2c
-EBUILD libtorrent-rasterbar-1.2.7.ebuild 2454 BLAKE2B fc6c9d855dc9fa56ee0fec1ca77d0e31cf19e749004617046d67835d537107621342a8d854a6d58ef86d33269d823ec7236b8d178feaae937e1fe04ab489a501 SHA512 780ff64b582acdb7d39698d08fd22f3a80739afd917698571a441b7599b6f24a21075315233dbbbaa588a0da577f8bd3700a3edd072a1e7bf59fd52e29a95064
-EBUILD libtorrent-rasterbar-1.2.8.ebuild 2489 BLAKE2B 53bec76310e46e9e3e01cb58ff079e4c415b30116638431f2568e7e645841772e92b2abd3123a58b13ddc6cbeca7a0d6aa1d65c8a4e057c32d197069b61cc978 SHA512 7368f58d563d1af074049d7fa9a534b2fdf5fa8b8d06e0d49f15ffa5ae0a208783a941d9dc2ce0f4ea6a6c3f0913c568b1ff7395b082e5daf4d917a0032d9d64
+EBUILD libtorrent-rasterbar-1.2.6.ebuild 2499 BLAKE2B 6d231b994347cfec324e0d7ccd754af3855903d2cba91d131ec748ae600fed32208d0f2d0836e38232e85ea1bdad9c34e0d07e42236d9c5fc525f1ce3a88adf0 SHA512 7e324f71303f21b936fde171c3cbfbd1ec56dd4f53dd11eaffdd133e1fa2c0e07469a4d55cd1389e326caca358718a7d7b215a847a180d265c38eac66d0269ba
+EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
index 2fb8281a2df6..45cbda7f47c4 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
+		--with-boost
 		--with-libiconv
 		--enable-logging
 	)
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
deleted file mode 100644
index 5db9e76e2041..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
index ffb200fbe91e..1500e4416637 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit autotools distutils-r1
+inherit autotools flag-o-matic distutils-r1
 
 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
 HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
@@ -45,6 +45,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	mkdir -p "${S}"/build-aux || die
 	touch "${S}"/build-aux/config.rpath || die
+	append-cxxflags -std=c++14
 	eautoreconf
 
 	default
@@ -70,7 +71,7 @@ src_configure() {
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
+		--with-boost
 		--with-libiconv
 		--enable-logging
 	)
@@ -81,6 +82,9 @@ src_configure() {
 			econf "${myeconfargs[@]}" \
 				--enable-python-binding \
 				--with-boost-python="boost_${EPYTHON/./}"
+				# git rid of c++11
+				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
+				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
 		}
 		distutils-r1_src_configure
 	fi
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 7db31371d170..5e4bdc6726f5 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -3,5 +3,5 @@ AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
 DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6fdee32ac6d57f4afe3fb42cd662202c290c21a28e9c107d61cd3b2ddb25478f93b56008dc939ced28cd1c5abd6314fb1b32 SHA512 b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.20.ebuild 2360 BLAKE2B fea0001ac14096d18610bde57aa7f3badbb977552aa7acfdb0ce7441d835570ad59f78e1bf0d5e065a0b5af2e6a7f5a3c068f2ca5608560845a718b3ebd1f8bb SHA512 3beda55b9097b8a6726331fb58fb8063adfadd1b9a018e50922e6635453d583b66cdd3dd56647a7339a2b26039e00b51c8fe0f1fc26c087b47d6b876b4848877
+EBUILD libwebsockets-4.0.20.ebuild 2402 BLAKE2B 3dc60c949de66936dc3b0df93fae8d9a9b14d626c4bf0dd2921d3f6a0abb877714d11e416859e834a06639fa870366976bb76e0bb732261d77a65cb0e8709cb3 SHA512 9c0242e0fc993af6f7d39ab9dda80f0d9a3e2d7eec4b79a65489978c72a7d7d2001e9e6835cbfe8553a7e9f90f02fe4e3bc341717233677f6fa26f1431bcfa8a
 MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
index 6bc4ebdb3917..70b507a93cd2 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
@@ -22,12 +22,14 @@ REQUIRED_USE="
 	http-proxy? ( client )
 	smtp? ( libuv )
 	ssl? ( ?? ( libressl mbedtls ) )
+	mbedtls? ( ssl )
 	?? ( libev libevent )
 "
 
 RDEPEND="
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
 	http-proxy? ( net-libs/libhubbub )
 	libev? ( dev-libs/libev )
 	libevent? ( dev-libs/libevent:= )
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 676be53e9a66..15340824fd38 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
-EBUILD nghttp2-1.41.0.ebuild 1978 BLAKE2B 9396ab56fd1c4d55efc308cfecf99cee154265a2a5c09234072d55d443e6b86871d22f71cbeb2ded297bb6285e5606758356d5db5741becc9a77c61c33588a30 SHA512 254d2af22098f1d55bb9e8730c9ae02b6588f7a1b34e3125cdb5c9abfe9320d286b6e61e0882790ff221a1259d388c9e1bd328158521d7d6a8407ebdadca9af3
+EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
 EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
index e18ea823126d..1673a2300ef0 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 5af098d8b874..ce7eb6bbb6b8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,36 +1,13 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
-AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
-DIST node-v10.20.1.tar.xz 21947588 BLAKE2B 6078e29a125fc1020de7b62c97174d82273af5f6def1dbd2be7968227400735d62f8427811cced69f6365f3232d8800cad388853c34dc6620dfbbc5a27d7f716 SHA512 be2f87e1089be37caa87f5c109121f3f054ffc5a66c4d468f631fa718e461425fbb2dc397459e252eb66c11a06b60659a449dcdcd9d44506732f3703660b597b
-DIST node-v10.21.0.tar.xz 21953796 BLAKE2B 6bdbeafb0f4ceb5c02df96ea74e8796680706756d3cadf48b813c46bdf91e3e1d5c49616ff827f01c17ed3bce1af303a5f7219c1995adb482b11203091d614f4 SHA512 613d3c1bca79ea5f127dc6793de2b5cfdfa056c01ec092e3b7ee79205894b21ca5ec4a367265122641dd1d360c675cfb36a4f7892894194ddd18abd1b2206544
-DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
-DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d
-DIST node-v12.16.3.tar.xz 23682432 BLAKE2B 91b97c0de9c76f33d080f3f12a42a15140be6e3f4d42022a55305dc2afc04de6a2b8364b9fc5df0dd71c9ec249eb9e4da8ff23f53be43a1f306d2a6fbc6d6bce SHA512 e5d2d1960972f19ef5acc667efb702d534eb436212dea9e0bfd817328c927b55734406f232b32bba366f05c2691e5085e3a6f8c1e2d959398745e60719e731b3
-DIST node-v12.17.0.tar.xz 23702040 BLAKE2B 4b35c6f7a3c16a7b737bc5b71f075fe6c66c9c4a5cd3ee240a0c1af9cfd4e10c61520d0489169a74354734083b7f7c68b97eefaa6f40e3320ec5b0126d36169f SHA512 0fc8483c6ae8994ff4f4b2465f1b8b1d3c620c90222fb270fe3d317d967294cc9e6bdcc50277fbe0ab28cb3ce9e73ec122c19adf8a686ecc95de3268b82ca4f7
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
-DIST node-v14.3.0.tar.xz 32985344 BLAKE2B 32ee357e109484422c3b22423ab9a593cd5d4611073c820f90c196dae4df2860573cdd06170879f675b738b01885eb2fe0f25c2328841838bf9367324cc981a7 SHA512 3afcc430bad57150baa8d1c0e5ef0f64691ef6549a052be654a86313fe28f31e7fdfeea4d2b3993798a7141bc6d7b1642747d1bc2636139e2f2fd79441580148
 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
-DIST node-v14.5.0.tar.xz 33141456 BLAKE2B ff268f44d0a4133a0efe091bec3cac945c656f355b19d8d577ba239aa65c07bf909d6f1b3d7db4f2f5c3c856e3125fe31f9e9e39ca7772f34f47521d5106a101 SHA512 8bcd3d72f294fff60a59815137a193b465b3a901a59fcf08a4840507e2cfc74ee165d7ae0ca6388662dc218213376f559a6c872a92062691c7413351a2ec2b5f
-DIST node-v14.6.0.tar.xz 33282140 BLAKE2B 0a7dbc290578ecc8ba008a1f2633df986b24b6d111a3cb9aed136f1160c319fc7b82d8aed7abf071e8ccc0918eb0c1369acb73b233e731d621396b06094b25eb SHA512 2189876d3e60bffbac7089c51b4a9ec78dd94f00dcc38bd0fe0d9a42b7de9b714c46468e3bb0513b60296dfaa6a474d80d14a8fa86a9e977b1ea76a0de02bda2
-DIST node-v14.7.0.tar.xz 33317268 BLAKE2B 470dd42338a2b9e7d6f29ccee544c7b3a5a55615556110fc1d12accfae79929f3a44186bd1c8c245d217ba67dcab22d1fd8b158e6595a7fefd2aa342f027961b SHA512 275875f2062d91617705b211fd254cdde61694c6a7ff657b66931f0d507220a9fde5a5f5c9e0e562ce80d531a87050b034d4e11bc3cfc4cf04d26ed15d1e0142
 DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068
-DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c
-EBUILD nodejs-10.20.1.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
-EBUILD nodejs-10.21.0.ebuild 6361 BLAKE2B b9cade7c3afd16ae8e365a6769480d6512ad12e44e1a101894b6637c165755d87e0bc5054c3c3c7121615fab584196f681e1cb6e29c75f3962c20a67649ebdbe SHA512 39e1f76ca82c6d46f919fbcc23c1bfbd4eaa8229e7c1d2b0b7ed14176e91c0847eb9362360f13a6d060552a76fbf07479e45886e8fb95e38c1d84d33cf021866
-EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
-EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
-EBUILD nodejs-12.16.3.ebuild 6203 BLAKE2B 244b4c61b0f6272b26e5664ddfbd67eb6bb8637af78b1e57b5a077d7ee978499875e7d4a8dacb29d93cfe6e589415c969fe52012b41d5dc718c78a25bc1d913f SHA512 19b19f7c108ae641833c1c8e1351de8ed511bf04b53a5003d5d6225b5aa59933857368ba8415afb88b2278d1daac8f4de9d57f3b755a3a27fa33b04a3f470a9e
-EBUILD nodejs-12.17.0.ebuild 6203 BLAKE2B 79828e49fec7611daefdaf87a5153b97feb88495fdbf666c4c7dd61abc6189d98dd978bdc19f1bfb4049fbb6a4dcea29d4ced7feda206a5f2b58c2b3e568c469 SHA512 3f73c09dc1e215985423e217276478b7ac160d85e2aea53feee017fb03a81358382725972e4c039887c50674521f2c37927ceca3c23412bdc415ebd7c4e25cc0
+DIST node-v14.9.0.tar.xz 33356264 BLAKE2B 61e4ad33ad5a80862730a89dbfab5c59395750f38d093944bbedc9ef167e09008e5f5f1545be3e01090d452eee3ab2ce6af9bb0455c731a0c6332c7d7b797e18 SHA512 2e628f4fea9d228e4e13d16166ba4e38a53d9a33edf0c26a63f55f61e99fd9069583613859e9b3ddbc87a6efe70803b723c310d064f9495359b450127b0c01b8
 EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
-EBUILD nodejs-14.3.0.ebuild 5860 BLAKE2B f06c5967350ba2a80010fd7fbdde840cd1357e3c0144bc56120dc8a97db85950d27b1739e13da8cf9352d425a69bf5a583897e777f3506b324248882a0636106 SHA512 f62d937f362a16c3025ccc81c95e1f85d1a85bda1df86b1778faa1bc8da85f69f02f6cd80acd92bd670781690f66ae43c00bfa21f04dd74c3b161839ae367134
 EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
-EBUILD nodejs-14.5.0.ebuild 5864 BLAKE2B d80c80ee1a0ed50bfd2592c7dec998e8114a5cb25a0e991388e6caea78c6619bc614bac753b4f80fe6af584a28d52d1be269291b0148fea03a62460628957cbc SHA512 92f6b920d7c98dfd3febb5f8457bccff14ed6105e811354e3e1394d46fd8227be7b07caed0a186dcbbb13c943aca4a44097dad18a104c7cd3a19b9c5775e627a
-EBUILD nodejs-14.6.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
-EBUILD nodejs-14.7.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
 EBUILD nodejs-14.8.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
-EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
+EBUILD nodejs-14.9.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
 EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 91b3e65a9809f00405872d40032d9411b655d00c6e498050efe303e578a723a0e3245d846fd84e4ed9ce91cd677df71d744bbbc956017d869a93e5c19d2113e3 SHA512 051a3e32e82faf388137f4be8be8df4d95fa9f1ec39ebed2ddea41c1f445262bdc6fe4538d9109d8dab60bc793e0e6fe178e79c5571ebc1e366cf240c7111d43
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
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-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
deleted file mode 100644
index 409bd25dff50..000000000000
--- a/net-libs/nodejs/nodejs-10.19.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl )
-	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" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.20.1.ebuild b/net-libs/nodejs/nodejs-10.20.1.ebuild
deleted file mode 100644
index 1f645e5535ca..000000000000
--- a/net-libs/nodejs/nodejs-10.20.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.2:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl )
-	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" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.21.0.ebuild b/net-libs/nodejs/nodejs-10.21.0.ebuild
deleted file mode 100644
index f7ab581674c5..000000000000
--- a/net-libs/nodejs/nodejs-10.21.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.2:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl )
-	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" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild
deleted file mode 100644
index 29723942409f..000000000000
--- a/net-libs/nodejs/nodejs-12.16.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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 mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.16.2.ebuild b/net-libs/nodejs/nodejs-12.16.2.ebuild
deleted file mode 100644
index 0be68355a99b..000000000000
--- a/net-libs/nodejs/nodejs-12.16.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.2:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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 mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.16.3.ebuild b/net-libs/nodejs/nodejs-12.16.3.ebuild
deleted file mode 100644
index 10346fcd3bc6..000000000000
--- a/net-libs/nodejs/nodejs-12.16.3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.2:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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 mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.17.0.ebuild b/net-libs/nodejs/nodejs-12.17.0.ebuild
deleted file mode 100644
index 8b860166ed51..000000000000
--- a/net-libs/nodejs/nodejs-12.17.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.37.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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 mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-14.3.0.ebuild b/net-libs/nodejs/nodejs-14.3.0.ebuild
deleted file mode 100644
index b1523bbc10df..000000000000
--- a/net-libs/nodejs/nodejs-14.3.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.37.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-65:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	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
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.5.0.ebuild b/net-libs/nodejs/nodejs-14.5.0.ebuild
deleted file mode 100644
index e2b60aae3bb8..000000000000
--- a/net-libs/nodejs/nodejs-14.5.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.38.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-65:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	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
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.7.0.ebuild b/net-libs/nodejs/nodejs-14.7.0.ebuild
deleted file mode 100644
index 9d912667e480..000000000000
--- a/net-libs/nodejs/nodejs-14.7.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils 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/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.38.1:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	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
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export 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
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --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="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.6.0.ebuild b/net-libs/nodejs/nodejs-14.9.0.ebuild
index 9d912667e480..43b934166628 100644
--- a/net-libs/nodejs/nodejs-14.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.9.0.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.38.1:=
+	>=dev-libs/libuv-1.39.0:=
 	>=net-dns/c-ares-1.16.0
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild
deleted file mode 100644
index 42936ad7d0d2..000000000000
--- a/net-libs/nodejs/nodejs-8.12.0.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="arm ppc ppc64 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.32.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 32c1099d9528..bcc937373b94 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -2,5 +2,5 @@ DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f145
 DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
 EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
-EBUILD rpcsvc-proto-1.4.2.ebuild 947 BLAKE2B b1644fbc2f2a2ca354b0d70828fe3dc5b2ebf35931ac18812dffef7abd231d2eeac6054ddc3beae738dc328ca752b34c786afb6ac81c7c3478bd2cd6298707da SHA512 5bdeab38f781826d7d5c39c07918b32502f52a5bdb9c69e48cdf6b03ac026ed1a806e7cbfafa48836a9d90bc5b682e3c1d1108a145cb8408659a933cc2c03ba4
+EBUILD rpcsvc-proto-1.4.2.ebuild 946 BLAKE2B 3d8e3dce7cd6c67d3a3c693b99482bf806ed353a5efb2bde2485e9b69ca21047f18b7c006412221b4347596cefbd9dd8fc74c7eda37b6a31457807b04ed21ddf SHA512 4f79dec2aef4aa0164ee561ee76335cce4fd2e2089b1135e737ed56d75e95940b593f06e579ff41f6339cac9897affd03a0bcfcfaeb2668792c7949890e89023
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
index 1da47c6a5bb8..d85094fa3c34 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.