gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /net-libs
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
55 files changed, 1351 insertions, 452 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 406dbc5536a9..a11bd68a9f85 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 22eb64960304..d507bbc91fc3 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,7 +1,8 @@
+AUX glib-networking-2.70.0-time_t-32-bit.patch 1837 BLAKE2B dbe1ae6dc1e3ba4f0033a72a36cc37354cf47b09371e3d8d74513a7bf1b1b6a6470b9dc9c77d3454b4fae505ed7bde31ae5114111e2785a4bcada1303940e179 SHA512 97cbc0f75eb6a90ced37539b01f68cbadc0cefd186b6121aa32bfb772f85d7bec40a38322aea38019af248dcb0f9311a5c4d069ee80f56341a3c49547f2dd700
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
 DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
 DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
 EBUILD glib-networking-2.68.2.ebuild 1983 BLAKE2B 21b2aa19571376085bcb9138188a4b743b62f81bd164b800a79d0f13f80925c2471e53a70b0c29430c7e17c5f19ba27c2be1faf383f70f5e20cd1b0131258c65 SHA512 6326da990fb32f4d480bafad98c30255da69bceca9b30c44f958a90c189e4c9cfe144c0482160ebd13d3142c3d96bd3d47f75cfc76a88ca422592bf592a6cc22
-EBUILD glib-networking-2.70.0.ebuild 1990 BLAKE2B ea40834d7f4c62b5b574614f09d13172c98d7b1583d43d31cf18dfd090c62cfb4de3b98b8f9d1c141c2bb4737be4b3d35d7484b518bfb5064092618878ae45c6 SHA512 07c97ce0f54b012fc3865685f55572209a4641dad84072a5044e8a76747a26f136494a106b0b8780508fccb7e1ea2092c912d494de763b907c37d6d792a91c61
+EBUILD glib-networking-2.70.0.ebuild 2043 BLAKE2B 3c953ae769632b8548c127589adcc65e076c2fe02991a9350eb808fc7f211b1a2da68dd3d6c0aedb8a7f208d0a0c22ad9ef074935960f624cb3b280dd7ff4d72 SHA512 eb8c01bbea519f28e3f9556c932bdca981a2d7618225f069809b8a3378f196b49a28ccce4efe05dd26fb59ca8c348227216d0f5da4ed72dfd191a184730e7f12
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch b/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
new file mode 100644
index 000000000000..fc9ccea13952
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
@@ -0,0 +1,52 @@
+Workaround/fix test failure on 32-bit arches. Should be in release
+after 2.70.0.
+
+https://gitlab.gnome.org/GNOME/glib-networking/-/commit/4f8ca86a0e460794188c3355f0c7cc11fdbe4229.patch
+
+From: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: Tue, 21 Sep 2021 17:07:44 +0000
+Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t
+
+--- a/tls/tests/certificate.c
++++ b/tls/tests/certificate.c
+@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void)
+   g_object_unref (cert);
+ }
+ 
++/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid
++ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have
++ * died out, or GNUTLS will rethink its approach to
++ * https://gitlab.com/gnutls/gnutls/-/issues/370 */
++#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603
++
+ static void
+ test_certificate_not_valid_after (void)
+ {
+@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void)
+   actual = g_tls_certificate_get_not_valid_after (cert);
+   g_assert_nonnull (actual);
+   actual_str = g_date_time_format_iso8601 (actual);
++
++#if SIZEOF_TIME_T <= 4
++  if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX)
++    g_test_incomplete ("not-valid-after date not representable on 32-bit");
++  else
++    g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
++#else
+   g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
++#endif
++
+   g_free (actual_str);
+   g_date_time_unref (actual);
+   g_object_unref (cert);
+--- a/tls/tests/meson.build
++++ b/tls/tests/meson.build
+@@ -69,6 +69,7 @@ foreach backend: backends
+     test_cflags = cflags + [
+       '-DBACKEND="@0@"'.format(backend),
+       '-DBACKEND_IS_' + backend.to_upper(),
++      '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include <time.h>')),
+     ]
+ 
+     if backend == 'openssl'
+GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.70.0.ebuild b/net-libs/glib-networking/glib-networking-2.70.0.ebuild
index 860454cb0242..8bdcf6b9b5c7 100644
--- a/net-libs/glib-networking/glib-networking-2.70.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.70.0.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 	test? ( sys-apps/dbus )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-time_t-32-bit.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index cf99e5883c59..030cc66abe05 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,3 @@
 DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
-EBUILD gnutls-3.7.2.ebuild 4232 BLAKE2B 35454524038a30fcc8d83f3bdc4b3f3773710c3a0e64881e4a29cefb205385b7693ac01ee24fd97e09a5941f1e2f67a91f0bbdf23cde404c88da80fe17c0c00c SHA512 31e764285b44dbb55d5aae1b070bec327a9544211ec89e74039220816b8140ee04d35e1d78b2118d89df4f141253695741366cb85dcdfa017ffb5b39ca6f0491
+EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
 MISC metadata.xml 1259 BLAKE2B c268a1e19fbfe5c046eb378ec704b078073df107f3b2df4f1dcc9b09697b7dcca635b86e22a0835f7c700ebd79acd5668aec4cd8fc82d9f235a514bea97eb31b SHA512 55d832a6a691eca628f00d62530b58265a9f17ae2a33de41379b0ca4286132e4e369fbaab655cedff1fde76f68dc0748919c729c07e3f6ecbf0496984a70c32d
diff --git a/net-libs/gnutls/gnutls-3.7.2.ebuild b/net-libs/gnutls/gnutls-3.7.2.ebuild
index 82de8ba5e7a9..5448b73bad2e 100644
--- a/net-libs/gnutls/gnutls-3.7.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.2.ebuild
@@ -42,7 +42,7 @@ BDEPEND=">=virtual/pkgconfig-0-r1
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
+		dev-libs/softhsm:2[-bindist(-)]
 		net-dialup/ppp
 		net-misc/socat
 	)"
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 24ffa39ba912..fab4b6fdccce 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,7 +1,9 @@
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
 DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
+DIST grpc-1.41.1.tar.gz 8346512 BLAKE2B fbb453f7ab398ac843b19922b7e3f71121bc9ba44b3e0c558796dc519dbbc5d34e31d1059bfa7552fefdd7c05d5a8b03645f5c5257e73126ba14a73bec0b1fb1 SHA512 17d4c0867a51e33c029bcce86371f8e1d4680ba78fe4f02fb63b8614e9c5f7f6078c22b7c56c63c6ff461429a70d2ec87cb3c0d30c897a88321fe7f26de6e052
 EBUILD grpc-1.37.1-r2.ebuild 2717 BLAKE2B 4b806690625388aa29ce60f40ba918ebacd2e384db9021913dc5e1c61575bc8c5a2382ffd38bc02af8e004a5f4ddd7daa70ba72636d1f0b04bab8f8588f8204e SHA512 e9d838e67b7c8554fc53d74f97b15c431364107b2f50b9459687bd1bb90fa6e3f68a9358fe347011809597da3c5cd39ff195719881e3af8265e9d5da83705b14
 EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
 EBUILD grpc-1.41.0.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
+EBUILD grpc-1.41.1.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.41.1.ebuild b/net-libs/grpc/grpc-1.41.1.ebuild
new file mode 100644
index 000000000000..e9f7052206f3
--- /dev/null
+++ b/net-libs/grpc/grpc-1.41.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/19.141"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20210324*:=
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-3.17.3:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	soversion_check
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index 2939bb170903..baf1ecd09422 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,5 +1,3 @@
-DIST kdsoap-1.10.0.tar.gz 1399777 BLAKE2B d04393e34536eca43edb612339cfc40ff024849b74231d472f9936d86172d299f973e4140ae2bde363dca441e26016126db5f0782807c3d5598543ec4afcd737 SHA512 c0e0108f74e5d4075a71369f428862b7f3eb6a7b1968eea7a7b01f4536d999468a7af8013be722c02b303a0580e7cd649fe78c1588f837405ede4bb753fb56b7
 DIST kdsoap-2.0.0.tar.gz 2916527 BLAKE2B 7b9cf71b181b88180fb00cb2f0c2b84b5fd7d997531aa68957a84811959befd9c8909c8892d3b60d47a654916fa5b8841fa7b389a006a8ca6a2cdce98a433cfb SHA512 50305866595048e0ec6cd6dabba9e63a948f1e1263e7f03e9e3bc56f09a843bade944df95b5ff57d4fc3a62896e72f02b0d7b3d5cc2be2823da67001ca459428
-EBUILD kdsoap-1.10.0.ebuild 904 BLAKE2B d95f8dd776d6ffa3adb844c2930a147e91e8e83c11edce0310dbed7419b5ce3aeb188bc4c4a4935b15e1d18de8f975df4140dc58335154c654b6fc4fc72faccb SHA512 3e4ad0da6ecc4b092e74d5952b5092a1761aa11adcab837e490d5ee9c3086879a417fa73b0bcf7f1d2548fba97d53cd01802627a3f00b72dcc1af73fb48facba
-EBUILD kdsoap-2.0.0.ebuild 968 BLAKE2B fb05ba7f0bf3759f3b37697ab2dcbc844401a4034281bd20ef24e25a64b2927dc4ba14645988fd1fb44da56813993ecb69f48cffd4f776c2b83fa27b482e3dbb SHA512 da9ce6a77198f5cded52e487dbf3e29f9a59827fab9af063053e3cea881b94fb88974e5b5a08d5a7488079deaa4768923de25d0f6242053218046b371d1c0702
+EBUILD kdsoap-2.0.0.ebuild 965 BLAKE2B 711da17f4859234a1f552d62b8bab9f37f9701d53ecdd1454789ee985b7578d63a93493b809e6aabd250d326a9ec4d91512f3016add0067263767481dfbb53eb SHA512 9c6e12a4c38b12b4b21ab1fa8e11111b04db322296782100904d2d0352cae847d732b761a1afeb8edca7b9fdd3d520f215a055e48be0c3328742dcf2fbe6eb53
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/kdsoap/kdsoap-1.10.0.ebuild b/net-libs/kdsoap/kdsoap-1.10.0.ebuild
deleted file mode 100644
index 14c69cf32217..000000000000
--- a/net-libs/kdsoap/kdsoap-1.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-else
-	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
-	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
-	inherit git-r3
-fi
-inherit cmake
-
-DESCRIPTION="Qt-based client-side and server-side SOAP component"
-HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
-
-LICENSE="GPL-3 AGPL-3"
-SLOT="0/1"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDSoap_EXAMPLES=OFF # no install targets
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/kdsoap/kdsoap-2.0.0.ebuild b/net-libs/kdsoap/kdsoap-2.0.0.ebuild
index 5c37b52bcec6..951fd52d0a65 100644
--- a/net-libs/kdsoap/kdsoap-2.0.0.ebuild
+++ b/net-libs/kdsoap/kdsoap-2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 else
 	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
 	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 37b8d0152f01..8e31b0a48b58 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,4 +1,8 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
+DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
 EBUILD ldns-1.7.1-r5.ebuild 2618 BLAKE2B 45660918f86ea19a7d6fbec418c642bdea4e74114b35558f1a183baed4b5cbc17f3c7364c40d63d8b9c50d3158825811c11c124557b46e2e00185488199e40ad SHA512 c6b4a485068fdc10b459be1d88e22af98e0f6a140b20edcf3bae438fb22146fcad5f424f9876559210b7e0eded08334d89fd26ade4c3a705b1f741e217e27d29
+EBUILD ldns-1.7.1-r6.ebuild 2344 BLAKE2B 7167648ba5ab423819900cbe26825504a960d6ab034a104540438541600ee2f545dce128bf5b405edff09a119aa45aaa4fd9ab31051843f64eca8e8b6516b8a9 SHA512 2a36d0997fb7b1b8aef41d4766a43266fa913d18cbfd514e2ff548c2a9f99d6c78e3ee6e0056b044ef8d7b04d9709308d2bee55b2b5eb24dc5f12290ff18aff7
+EBUILD ldns-1.8.0-r1.ebuild 3139 BLAKE2B 2e0e77df8774f15d69661543adc0a27b607e08751bc98e52747d70abfdda125ac5a7e2ddff4be8bd76b9e8a6bae14655ea138a1cf53b043d47f460142c7760ab SHA512 4fb65885581994dfa6ff62c5361214a43a1440e6492fa3c818936da1334446ca674060cd5f4a85452b631f8e822c5dd3fd2011eb35b3c3615f1028f7f995fa99
+EBUILD ldns-1.8.0-r4.ebuild 2980 BLAKE2B 662e3a8f15caff90b20dface61db03d14a79ed1d281a7a65370b49c53ef6c264f0d3d57194bc1d72849dd818d68f5235b4e43267c7ea6b3a90e6cf7a9456facf SHA512 0dc5c6c261726f39506bcfadafa1f5de3f6fccb42a4155b0916e51e600480a78801b4f218fe4750a0c9de5acdd979ee7cddcd8ad514e4435537529ee17f34abb
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.7.1-r6.ebuild b/net-libs/ldns/ldns-1.7.1-r6.ebuild
new file mode 100644
index 000000000000..a0986afdac4b
--- /dev/null
+++ b/net-libs/ldns/ldns-1.7.1-r6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+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"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0"; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gost) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable dane) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		--enable-sha2 \
+		--without-drill \
+		--without-examples \
+		${dane_ta_usage} \
+		--disable-rpath
+}
+
+src_prepare() {
+	default
+	eapply -p0 "${FILESDIR}/${P}-Makefile.patch"
+	# remove non-existing dependency for target packaging/libldns.pc
+	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill and examples"
+	einfo
+}
diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..05b556614f52
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit python-single-r1 autotools multilib-minimal
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+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"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	ecdsa? (
+		>=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
+	)
+	ed25519? (
+		>=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
+	)
+	ed448? (
+		>=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
+	)
+	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0"; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gost) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable dane) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		--enable-sha2 \
+		--without-drill \
+		--without-examples \
+		${dane_ta_usage} \
+		--disable-rpath
+}
+
+src_prepare() {
+	default
+	# remove non-existing dependency for target packaging/libldns.pc
+	sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+
+	# remove $(srcdir) from path for multilib build
+	sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+
+	# remove Libs.private, see bug #695672
+	sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in'
+
+	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
+	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
+
+	eautoreconf
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill and examples"
+	einfo
+}
diff --git a/net-libs/ldns/ldns-1.8.0-r4.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild
new file mode 100644
index 000000000000..b0a5b7749b48
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.0-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit python-single-r1 autotools multilib-minimal
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+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"
+IUSE="+dane doc +ecdsa ed25519 ed448 examples gost python static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
+	examples? ( net-libs/libpcap )
+"
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<net-dns/ldns-utils-1.8.0-r2
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0"; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gost) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable dane) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		--enable-sha2 \
+		$(multilib_native_with drill) \
+		$(multilib_native_use_with examples) \
+		${dane_ta_usage} \
+		--disable-rpath
+}
+
+src_prepare() {
+	default
+	# remove non-existing dependency for target packaging/libldns.pc
+	sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+
+	# remove $(srcdir) from path for multilib build
+	sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+
+	# remove Libs.private, see bug #695672
+	sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in'
+
+	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
+	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
+
+	eautoreconf
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+}
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index 5a543bb0833f..e5f8c8cecc1a 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -2,5 +2,5 @@ AUX libbloom-1.5-AR.patch 492 BLAKE2B 1149e58d6c333b0ae442633e1c4824fc37cd07eb29
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
 DIST libbloom-1.6.tar.gz 1872005 BLAKE2B de3368724e9c05489efae74ce36e880e2db29f78792b84b13325a24a3c302154fdbb621d672e9ef7f612ef00df1ec8fe010c59461822f5d04b4c5b27996ef773 SHA512 3dd4343d68def05800dd6ffc5a05b05d0702a8c0c9f0a397f105d4389c88a7bffa419734aeb4fa4e1a2c418b12a8192fa27ddcbaeee72906450d64cbfd64db15
 EBUILD libbloom-1.5-r2.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
-EBUILD libbloom-1.6.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
+EBUILD libbloom-1.6.ebuild 602 BLAKE2B 910b16bc9cfa4739e1bb54e333af5856f50813a00ecd691c62da66e3c57a5fddeef9f4bf67d039bc4ae065b16827a72080a4a4fbd4b703faac057d39b45ab76c SHA512 121652c4fa718defd6a9f600fafc90436fe39ad099599762c1d2206519160b56c2c7fb93c0e70ae377ffdfdfae82b64c0f66613e409ee09fbf839681964a8e8b
 MISC metadata.xml 322 BLAKE2B ccf8ee2efd91b7e6ada82afcb00f67de420d5d2c1680e0fe1c3c4d5f2d1556494f5a9ed50c994d0e23d3fca239c2d8b24ae00bc25babe950d042c99a514820ab SHA512 5cfd32799c2bad0dd515be059453d54b23bb4c7e19718e9477549bd33baafff1a11debc9f25e9eba5979cc83d748b8cdddedad09d7d469fefa08a7dba8bdc1d4
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
index 9be6bd8a03a9..4ba1dfabf23f 100644
--- a/net-libs/libbloom/libbloom-1.6.ebuild
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-libs/libcork/Manifest b/net-libs/libcork/Manifest
index 3bcea4cda247..8efc41b8f49c 100644
--- a/net-libs/libcork/Manifest
+++ b/net-libs/libcork/Manifest
@@ -1,5 +1,5 @@
 AUX libcork-0.15.0-git.patch 539 BLAKE2B c3b50675afd74b3bd5c5049bf311ccf33dd4fc257bb4b9ccfb50007bff022ec9c260de0b507dfcf2ecd3ce3036e00fa1ef52f0d437003e6c2e5c52a8de3daab5 SHA512 2e32bd6c53c9fc3f7c27344a724138e5f3073a8d6f5b63a30cd86b48bf430a63b70cc0a2fdb93000f944cbc12655d12926c01ba374ec52e12cc126712fc41442
 AUX libcork-0.15.0-version.patch 498 BLAKE2B 15fbafc607e6a3dab0376ade883db9a783b1490b7a9063f1d3d815149198caf962e9375ed752fc077a5bf9a5cb767499071cf2aab8bf29a912024bac6eaa33da SHA512 1a0a0cf02bf51423760626a3e886c36b3e58f02cc09a5898313c185c339f08194b4bc9e118d8546aa8529d2a3047faecf85dbcf7a9097d0422b416306db05222
 DIST libcork-0.15.0.tar.gz 182736 BLAKE2B cfabcf4b040d3d2796511b5d7dce005fcff9bc6704dfaf89ea9eac36617b0c544e932ab3e12c0b06e4e3e916c50da10ba26401527a8e83bde523b91b911fd6da SHA512 8f41cce2101b96707068a21e5bd0a43c23f996c3620e7dd36621ed4bdd3f92851a92ea56ed92db40d7d8fe55ddfbdfcdaac4d2c8b2fc6cb3b1abe3b0e74c6a75
-EBUILD libcork-0.15.0-r2.ebuild 857 BLAKE2B 3c29914498da021266b6e616d33e6013b1054cd2bdf36426f7bb7b7f2d5c09d0ee3837b95e802447bee0561bc49469612a0a4249d196b5a89f329bd45b0c5669 SHA512 884bfc2446d0398b6701c198dc14fb28ad55dcac6fe1615e376a9020383da08a8bcfe3dc40c75f601f5011ad58b4c1d8bf7e9798450e3e6ab67e364665077848
+EBUILD libcork-0.15.0-r2.ebuild 864 BLAKE2B 9832f7df948d7c3bf8d85deab4fe9e7014daf6c740eeeeb43ce42ec484b780593c204672db7f6c625c892dec5cb8e06d0efb53ae666788251167344021bdff27 SHA512 d97a9bb1e6b01afb49a85e10da9cf3ed03928311df9fc7e031a2626f1af498fda69390f0a75aa769260514969f03fea32055ea972d9e00497642730af838f3a7
 MISC metadata.xml 322 BLAKE2B 01a2beb82cd0007f58d375a6a303d6199e971bdb7b10ac5d3f8d8148fe99ee41355f37c93efd23aca6c6ba5502e5dd503bcf28d45d5de366e898c174d1af61fe SHA512 699a0eccc1e2b54e060e80ce8ae634c4889c5b2dd100fcdc8f215039709eb73448a2c11ebb660af905b60a2fc84891d1c0e8f97f6b83aaf34b08e4585ba90c3a
diff --git a/net-libs/libcork/libcork-0.15.0-r2.ebuild b/net-libs/libcork/libcork-0.15.0-r2.ebuild
index fe49522a5e98..d3dec4a8179c 100644
--- a/net-libs/libcork/libcork-0.15.0-r2.ebuild
+++ b/net-libs/libcork/libcork-0.15.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/check"
diff --git a/net-libs/libcorkipset/Manifest b/net-libs/libcorkipset/Manifest
index 257d3cfc53b6..f50c17d05d7a 100644
--- a/net-libs/libcorkipset/Manifest
+++ b/net-libs/libcorkipset/Manifest
@@ -1,3 +1,3 @@
 DIST libcorkipset-1.1.1.20150311_p8.tar.gz 78188 BLAKE2B cb32200a522c69b440963b11eb45e04a4ebc13a42e0067b51ffbbaa9ed15bc91e6dd4c58e6f11028f9cb309b63660e5a3bf33426157bedc6e4ddea626eb2450b SHA512 5bbce2727da1665e734981959ecb253b4052d8cc6c426fded7e1678b6e2505bc9f4c0ab3cd3b6a03f834f5e20bd1d670cc19f7491fe0ad5b7cb772e7309f5009
-EBUILD libcorkipset-1.1.1.20150311_p8.ebuild 1002 BLAKE2B e7c7af96d3a3ff5c6a11d1a063699e88c06eba530924ec54484aa9a81c0b2b00be3201083595376c3a746f9770a0afc2b638d8391cba0791545bf86f81ddca76 SHA512 1a6e59db19f7823a2aa795b715ca52b8260f539e34e4c2641d84977f10fbc8ce7d63c1c7f1fee463c92b4214c46f7daf98ffa1a7be5b9a8a64582b92d58b4e5d
+EBUILD libcorkipset-1.1.1.20150311_p8.ebuild 1009 BLAKE2B 80d7967bbbfe4bba9c8f2ba41d113963eb40f302346f36ab6b2251772da50c0280650139e51d10f6f1832009e6c4d57b03a34679ce79f18850e7bad5f002b6b3 SHA512 a2945adbd03829edc08ffdaa69524c6090fc764b293bf73c715497f05ba4a80ddfb3f6f1f47eceaa4267dd31e63e028ed3c92da825aea2b7c165326e3f5b6aed
 MISC metadata.xml 326 BLAKE2B 92032fcf51a149780c9ea10c8a1054fe3c9f025a390844fda072bd098fad909976c1474c870bdafb6a3a755a4b2fba50e2ccb0bf7596c4670206ce562e85bc9c SHA512 ba9384519dc549de6b3a48cd59049f6a25ec8f8038aaabbed4b15c041c4fe64caaf9d7e90123fd8e6591e883877768762f4a816fbb0619465647906e1eab5ee2
diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
index c811d6770717..d6114f0e9bfb 100644
--- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
+++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rogers0/${PN}/archive/debian/${MY_PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="net-libs/libcork"
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 9fddbfcb5ef8..fccfd9659f3b 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,3 @@
-DIST libhtp-0.5.38.tar.gz 497753 BLAKE2B 84c4a89914dfadb9e3ab076e6f2354034cd384e7e76c9cbf00a7bf344cfcd7c24de200bd1af7f37356b00fbe13196fd3e49896f301b75fa05ce5b4e4ed297115 SHA512 6f2aa3b564948bde738ff60b917d64ffdcb71bbd5b25f11270ce16400fab6b8aab5c0e2372aff7f6be8818efab4b90843df527604835547691a4585fec9a19fe
-EBUILD libhtp-0.5.38.ebuild 863 BLAKE2B eaf5310ee316f7503149da00179a8af3de3073b73c30c2fca3518be3741e6b27048431b5bc51de54f675ffa03f934eab9f43cb2ff984c1f6f526ead3ff4b412f SHA512 6c1f9dcffce525a3a888cba242e4c1fe7514633be357509e459dffe5c248bdd53dd9455b3d605df9ee4a347ab4562d8c26c260c1958cc8c0fc37b0eeb0e1edf3
+DIST libhtp-0.5.39.tar.gz 499233 BLAKE2B fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712 SHA512 2c62b0a9a2f69f999a58acade362e5fcd9d85da5c720a403b0b6e7352981a206781f123aaa2f730803f2ea6088b4491d58b3c2783f8b32e4cfe1517d812e66ff
+EBUILD libhtp-0.5.39.ebuild 788 BLAKE2B e22cdd2ca143c6d328a9b733d2240ab100ca09db213c0ad154ffc344a2498bc74687e84729b169a3e9ae27b77b8406d5a1aea74183d000cf3e2029343332e747 SHA512 a5d7de74797ad55999f731a4623dc62596fb1d21ddc3f7099a62765bc3972c03ad4c858c39b8c710c35b89a6ebfffd1ff26723a89574c5802d99dcf768a21966
 MISC metadata.xml 315 BLAKE2B 6bc47ec9cf301e16cb6047079014a7de8068847b18b822a078f7ca4c99284020af1fa716eb87d06c2e0aaf3bd8577761f77134e9417e7286dce954caef6ec8a1 SHA512 a92ed083085ed48b0735e088a55bd5a1d55cfba73531ae4a3b13aefc46afd108e189188e69d8246f0a4003b5e534b72be5f72c561d57564b7c708d0212a495f4
diff --git a/net-libs/libhtp/libhtp-0.5.38.ebuild b/net-libs/libhtp/libhtp-0.5.39.ebuild
index fb42824c9846..4e39f91bf8c4 100644
--- a/net-libs/libhtp/libhtp-0.5.38.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.39.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -12,9 +12,9 @@ SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
-RDEPEND="sys-libs/zlib[static-libs?]"
+RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -27,11 +27,9 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		$(usex debug '--enable-debug' '') \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
-	fi
+	find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
 }
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index c5ce46c5c537..6323f073f8f7 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,4 +1,4 @@
 DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
 EBUILD libisds-0.11.1.ebuild 1125 BLAKE2B 3403b3684ca0fca0f956bccea15fa998d1eb997f3974b45f576cee64e797fee6c858ac1f1452a4239d3e4521c2fee6330aff11309c688192ce00fc4788fe1fd7 SHA512 da3ca32f39d13ebf5b73b7dd07092e345325a97900dbe2c01557dae1f323f73852c96330eaf1a4c6c18b00918315c026bd2c6280f05feb5bda49df683f6d93cd
-EBUILD libisds-9999.ebuild 1154 BLAKE2B 0b944facaec152943b9cac24ffb6f9e6f46b2be459e16d38b327d3a76f566420ff759fb318406546a46af5a3f0e53e25f14314945d37bd33fbcffff188b70918 SHA512 33d0fd8dd98c0dca1e33a748ba9a8780913360cb49decc9b872ae143d6078f9fb6d4166221f9bc3478821ffd703070c40d71e3ffe3e8cba60b374215e10fc9ee
+EBUILD libisds-9999.ebuild 1156 BLAKE2B a2808213dc02b38ed947e09e2bd788348f547b8de704e05e0896cb5f70e92dd2864794383ed235d10bb03c4cf4fa2b391fce3cb216680654ef786efee349e8a3 SHA512 09cf3ceea3abdd24d3b67bb07771f5d656e7914b416ad0fa0fa899179ace1902e14aaa707afd299a8233f23efb691d973c960bfb038946b3328f8bdbf4a20e96
 MISC metadata.xml 759 BLAKE2B 44fb8b08e5ad1984aa1eeb48bb64dcf6848aae470e33410bc67d574902b7b9eb3908a869ba81d2c0ab9124a3e83f48cd4624eaaf31be6810d7237f9adfea0e55 SHA512 b906b7af1ca064394ddea620ebb26bece762a7dbbc3e2aa235dca71412c1b219c97af216b54d71e766d2af22abfb56e1c88bc74749ab2cf50b2955b627ef2b04
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index eb24a312d360..05e9b62f8308 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools git-r3
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index c79211140eb5..e85ba7a26272 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
-DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 DIST libktorrent-21.08.3.tar.xz 607028 BLAKE2B 1d0a1c2ddb406e709669bc0adb9812c510d8e02c9b325a9ad41d8523cf29bedbbf6d8209151fbc119412b239cf9a8b2907e34faf4c992f5f2f0bd10235f7cf2f SHA512 7c07b470b447497adf8faf0f17004d88130fb243682e28a34b6b86c1520e3cf09044401707f0014a229e589a93caf67efdc83f711580979e6e9603fa3892c5ec
-EBUILD libktorrent-21.04.3.ebuild 1437 BLAKE2B 066e9af041e881c1a4e45c69cff5e671eba2f96933dd1d3054f06895a3b662c18baee17407f77ce9136ff7551d50ada8a77b414046a2a9fc9ecb16141e30a883 SHA512 7c6ff4abd4bf4a2baaf131cf10c353f5a78355dd2930e61867341fd9bc5f48ad20f6122604f46f6df26ac83c595e6319f544135807aad5a1acdf5b350eddea09
-EBUILD libktorrent-21.08.3.ebuild 1454 BLAKE2B 53f3c39d69d59d343190475829e4ef5f83a01d2b3a11ac1cbcfb6039ebff664ac43fffcdd2a24051c18d43d9db538de1a7af1d07e967b88b7057224f745a9918 SHA512 7c28bf7a037cbf669c3cc299066bf4fb7966ce615ac0f1bf99afd5d8ff850ef30414ccf5bfae5fefd2f889e44427c0523598ca5d0ab7db7a027ba1d2cc4851a8
+DIST libktorrent-21.11.90.tar.xz 605964 BLAKE2B c19b7f5d4ef19a60421cec17ed6eecbff3ec31a1b7b21f2732f1055289719460aed603fac05af901c76a32a5499917524307a60545026f2cab505998ca08c23f SHA512 28e4fc098baed6b9f7f07befa8a10cfa4d6ce30b55b5c09aa3bedc40089efd7bc02b69a53adc84c3c7404dd788dec6c86271edafaa6e8e1076998191072f9a49
+EBUILD libktorrent-21.08.3.ebuild 1451 BLAKE2B d75856de9629eb7be725756d2245dea6d5dd05b79c0f7e844b926c8701fa1ccdc9da5a8fcc0dbb16d9e08d95428efae6a034d7e7e1fbc80aa3c6431ae561d254 SHA512 96322bc21fd2599dee2420b7d85e3b54a6d39428c1ffa2e5cb27fc0be92bd5cf5cb59b99c7d26c4ee843ba08010a0e2df13a6d1f286c1648a84e963f3c64f700
+EBUILD libktorrent-21.11.90.ebuild 1454 BLAKE2B 9e3230f6fbb715dc5a60c4ebf7af2b2445e7210da797c86a3805bfd5643c14215f1da534a2213f617f09524702b45fc06a389b60a0cad3e306cb883808794457 SHA512 62e75ee27f3986864644692fbee1e35eeeea45b29a0432774e791a83e22313df7dabda75880761437910d17d0bae56a37a0c372c5386da749699ec026e3abc9f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-21.08.3.ebuild b/net-libs/libktorrent/libktorrent-21.08.3.ebuild
index 29b3a843561b..8d194a8f2fca 100644
--- a/net-libs/libktorrent/libktorrent-21.08.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/libktorrent/libktorrent-21.04.3.ebuild b/net-libs/libktorrent/libktorrent-21.11.90.ebuild
index 3c79e4f37585..580da05f4f09 100644
--- a/net-libs/libktorrent/libktorrent-21.04.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 KDE_GEAR="true"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,10 +16,9 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
 	>=app-crypt/qca-2.3.0:2
 	>=dev-libs/gmp-6.0.0a:0=
@@ -35,11 +34,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	>=dev-libs/boost-1.71
 "
 RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
+BDEPEND="sys-devel/gettext"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 3e580a197395..a229523ffd07 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,4 +1,6 @@
 DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
+DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
 EBUILD libnftnl-1.2.0-r1.ebuild 1358 BLAKE2B 8bec388f4c9b7b8317a45731f931b9a13df4dc37e952b5ea37d27def9bd61c7c47d212e27c945bd942b61a8f0cab4b07065d25ddc59bdabeff1bb4ca550c9709 SHA512 22e5dbce5186f0ef931811f356c7d429bd3c49eacce001f1c62d48548aad9ff86297e81428bae01e69249174161f3ef9131c4eefd054fc78e060aef44b9d401e
+EBUILD libnftnl-1.2.1.ebuild 1365 BLAKE2B a9a51f3646bc178f7e3968ecdd037aa271114d60f52a13f6b6dde6c8cf23fbdc1ebc418bf25f243ceaf09b3bed49aab46735be73324148c3bf9794970d1a6867 SHA512 e710777258e088cca0b02aa2138525eca626b98392e26376196aaa80c82b67bda1e4152f4cff94e61256a45c248f0e7ed43f1233fad858a328cab8744da6814b
 EBUILD libnftnl-9999.ebuild 1365 BLAKE2B a9a51f3646bc178f7e3968ecdd037aa271114d60f52a13f6b6dde6c8cf23fbdc1ebc418bf25f243ceaf09b3bed49aab46735be73324148c3bf9794970d1a6867 SHA512 e710777258e088cca0b02aa2138525eca626b98392e26376196aaa80c82b67bda1e4152f4cff94e61256a45c248f0e7ed43f1233fad858a328cab8744da6814b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/libnftnl-1.2.1.ebuild b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
new file mode 100644
index 000000000000..75e1ab39a6c8
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4:="
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 6c176e6b116f..47d9f2b33911 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-4.1.4.tar.gz 544243 BLAKE2B 4e2d0ad827fd566d70df440246ad8fe081c5eb125fac72827e84680a1d842125562449866dab69305c16e170e8b04679ad40f73c2ac573aae266d24679053c76 SHA512 8a41f52a5665470ddf48233a5262cd906a384f89308423020a6f4d2b67d38b53d9608ec6f01a1118f703dce41ba0c58a863965e7226411b4f8aababd7b1d22b0
 DIST libnpupnp-4.1.5.tar.gz 545672 BLAKE2B 75f3236cd18324ffa35215f152ef2b84d81b4bc81b9c73488e7274ecb5d76918f0ef328edcf089d81202e92f4fa3922bfe46d6eb3e9a1bbd065858bf6e5cff60 SHA512 a7b2f620c846f2127220a062eab76f2c06b3eee4503d9f4922d7d6342feea19381be1486bf1cb033c44275f83ab90be3f8f2c09f0ec6f0af7367c314023c889e
-EBUILD libnpupnp-4.1.4.ebuild 719 BLAKE2B 415ea177563e017e1a6e72f2c1454a82026a1fd6e5cd4faeb90ee22c7bafc6ce003cd25047eb0e73b41c8130663c917f512176a4c21189ebe27da34ca2f9e53f SHA512 2526b70fb5f9598987493ece325c757050221ebda0f432550b485cafcdd808b2a7dd4286e9d1b27f4d0430c46b9362c89dbc8ac2eeec9ebd95e3b21b8c05e8c7
-EBUILD libnpupnp-4.1.5.ebuild 721 BLAKE2B 19fa3530e0d7edd98b5f22bc571ef9fdf4c964778fe23942c75e10677af50af4ab9cd54e8a3c3dc68a6b27eb5f39d74c6b95ae0f11a46fffd0e68a0042ffdd5e SHA512 28c69380aef94fb50c19738d2c56d303c13d6d2ec375a3b6e07f82ece9cf8beef35ce8bc8b3cdebb5b2e53b6508226913a23da1290e6988da35ed4864696ce21
+EBUILD libnpupnp-4.1.5.ebuild 719 BLAKE2B 415ea177563e017e1a6e72f2c1454a82026a1fd6e5cd4faeb90ee22c7bafc6ce003cd25047eb0e73b41c8130663c917f512176a4c21189ebe27da34ca2f9e53f SHA512 2526b70fb5f9598987493ece325c757050221ebda0f432550b485cafcdd808b2a7dd4286e9d1b27f4d0430c46b9362c89dbc8ac2eeec9ebd95e3b21b8c05e8c7
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
deleted file mode 100644
index 12dfef202a9e..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild
index d35dc2f8d1ed..12dfef202a9e 100644
--- a/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://framagit.org/medoc92/npupnp"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 6a0bfd35e4eb..09a94f55f969 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,5 +1,3 @@
-DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
 DIST librsync-2.3.2.tar.gz 194461 BLAKE2B 72f55c3809c35ee4eff4af03776aed6acfc33cf6109ea8e7fc5cdb4c3919e8f69f156d17ace4443bbb520cbdbe5220df7b5059f00173298839cbb86e0df491c7 SHA512 77d826dbaf02061b759d876a6b537238bad40379a08e4494ebfd3e380b2eb921b7b060bc570330aeac9424ef1a9d521f449d559c9ffa3be24acdef4ad530fe90
-EBUILD librsync-2.3.1.ebuild 594 BLAKE2B 5df6a99d740e44862e52a48bee73080e33137b612cd01587f5721a94a6bf6561ed53f2966c9d5e22cd9c71f87f12e43004e39e80bbfd5ad3fb031782019f9abd SHA512 1e2c13dae7ff32a99b039e837548a505c50ddea1f1e8ff742fe6a0b10334c0a30dd9989658ee2d382c1befce6fd2bbc5d03eaf2dd92aff00d636a4b6e5917c70
-EBUILD librsync-2.3.2.ebuild 588 BLAKE2B 3a766705041dc7d33ec1d85249852ab13446c31f7110bc245135e26fac951c40f4febc69e847b1420cd5e29479397439b8bc24e0172936e97bc7399e740af040 SHA512 2985f766f40c4084bce9389ba0f960dd9ea0d17684e19d81b57727deea4283e22edf41f1f4b3aa9ba4c222d06b778b1a719062fde13b3b49df4fb0882bdf4376
+EBUILD librsync-2.3.2.ebuild 579 BLAKE2B e7f48eb3de47f1ca6e56540e875ca920a3a5a792c2f167dcb19523f11e64dcecba60146393e84952679fd10866311b873ed9ef80142bd4c1c9caf356d1b1c5f8 SHA512 b2c45503bca52641d235f43df2ab9dd75511d63a7103415b43e6afbdfb2dcb17d855aeb7aa9b33293ec44d69f04479e797f1cf840d586e4ec7ed5b8786408651
 MISC metadata.xml 388 BLAKE2B 80d7575764d0921330e63232cde4810b5b93b6e4c1dd02d05b21dbd93cad44facf9bfaec7a03eb39042e25e22e22a96ba00a669e60853d5134647a0373e19f91 SHA512 e2fdddabaf1450596f679d5214671e5695ef026d171aaa9dbd84cde16247996295e70677485b64df59c360a3036fef5bd20d0666653be78a4091392a245e3d67
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
deleted file mode 100644
index 5cdb27d2e655..000000000000
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_LIBB2=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.3.2.ebuild b/net-libs/librsync/librsync-2.3.2.ebuild
index ac6abbb3ceaf..d8676d8ba1a5 100644
--- a/net-libs/librsync/librsync-2.3.2.ebuild
+++ b/net-libs/librsync/librsync-2.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,11 +11,9 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-RDEPEND="
-	dev-libs/popt
-"
+RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 48cb4cb34dbb..3d0b3bb502b4 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,7 +1,5 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
-DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
 EBUILD libssh2-1.10.0.ebuild 1314 BLAKE2B e58d79dd103034825ea7a67bcc69c3ae5b4cba9ec180bbfb00c08e11474bdb8e17619806f81745e777c15264577bd0aa39e82db4b7bef9d08178afd0e792bb4a SHA512 0e2842331b687eaa5086a998d6d110e54f464b47886817c793eacabc232800f3c18cd6661f891d7f81338566b78e4b2ae63253f92a9564206258a99186f65aef
-EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1421 BLAKE2B 37519a216486fb45b11fda8d1d1913bcde8d87161d871a91e3bcab8f5b5d35c1e0c118802de8e0a8d1bfa5bb44d3012661139d6e009d033df844dbc327ba33a8 SHA512 b2fbcc7ef09762597fc637e8a0df46df2b5caca586a5e4f7cdfaa3f0508278e89fa67792a90231c767efe45e8fb1a61ccb6717eb8f6fcfa4299e6862c6fc25e1
 EBUILD libssh2-9999.ebuild 1171 BLAKE2B bf50faa5cc98d82483b1bef3f640d9bd112ecc18e8478477b46ef070fc817646227c0a235d2ab0215fd4f2ef2ae2ec95e6a15eb947664f97a74da2f3f0bc20b6 SHA512 3a79004b8e22ae696db0e47754bd011576ff70b06fc15405b8c8968cec96992b7379bfb4c270cc7fa3c8d221e615633f2a4431319a0e2345d837f0c7b41bc8a3
 MISC metadata.xml 533 BLAKE2B e4c675e12d0d2e906d061b66dd698081dff4560e5e055f2a88c9d77f8502460241e995d6ca6572f4404f20d2bdd3afa26d241756f97c9ef7dd6610c30fa3bac5 SHA512 7cdb591fc1ca9db8428a402a0ca8805ef28589c7af015d59debd7700ca46f2cc0bab8c18e3acaa5cbd773ce4bba1c675376eaf5c5f9be07aa75256864533de2a
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
deleted file mode 100644
index 5b45044a02c4..000000000000
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt mbedtls zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
-
-RDEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-)
-
-multilib_src_configure() {
-	local crypto_backend=OpenSSL
-	if use gcrypt; then
-		crypto_backend=Libgcrypt
-	elif use mbedtls; then
-		crypto_backend=mbedTLS
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCRYPTO_BACKEND=${crypto_backend}
-		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 9bd24aeb7088..ad6b7172fffb 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,3 @@
-DIST libwebsockets-4.2.2.tar.gz 14589100 BLAKE2B 371bae4790e92aa4f48e51b40fbe2e4efc3b885e07740db14c96146eb857616fd3f7a1b6c83c11fded2791b1db59cb1f6761bc4eebaee918ada7e9bcf4be52d0 SHA512 52d9b4511fc484781108a3036f870905d4427fcbab02f3e84ee38f534ae7d1979c2cc3eec0719f4609226d4aae788a79fe7d99a8506537bbcf8fc3d9b8a7b478
 DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
-EBUILD libwebsockets-4.2.2.ebuild 2346 BLAKE2B 7e0f277a5e9d8bcc6dc9f6377341eb00e4dc6d0dd566e374bb1d4eaac0d0c422f03a00d72cc7cf722d2fdab44fa0d5aa3fb3d83b8646404f6d23e25095d25ab5 SHA512 2dbdbf89687faf2aab61532a31a7a955bc66f19987447f02ebd9e778e1a2a235db5b26e4aa6d2b5a7e9f43ec514c3eb3be7386cfb52126b5a2dc0b1cde79e4c7
-EBUILD libwebsockets-4.3.0.ebuild 2303 BLAKE2B 9baf0748508a40ba4ddbf4c4fd668dbd39213ebbb16d3bc1c638d776a8994d6628f09ed8ea5547421d8672aaa9ae7ba746a8c2fe32635bb77895a90e6ef3dba1 SHA512 0c238c76c62ba26a8043b32b2ab9826fd017164ff8e8dd2befe9d2be61eae0386a86dba68162d5e95b6bcdd84ed9d13a4c34c447ef5222b67b6b64b377dbbe6a
+EBUILD libwebsockets-4.3.0.ebuild 2302 BLAKE2B 518b38be595d1e64deaf3c03fdd1d6f400edff952505a02e06d089a7408b6ff1f99430bcbc2311eed4cf3b29d3866e643838ef15cdcdd3d65fdf138e85b118f5 SHA512 195cfa3acb7e8e1cb7734fb54ce83908c5f983315a0675ef626e1bf50ce6bb771cfd5c91a0fef2bbb20d3ac17412dd677d5c39b55bbf75c0bd29a89ba438da11
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
deleted file mode 100644
index e0fef87bc3b6..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/18" # libwebsockets.so.18
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
-	sqlite3 ssl threads zip"
-
-REQUIRED_USE="
-	access-log? ( http2 )
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	mbedtls? ( ssl )
-	smtp? ( libuv )
-	socks5? ( client http-proxy )
-	?? ( 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:= )
-	libuv? ( dev-libs/libuv:= )
-	sqlite3? ( dev-db/sqlite:= )
-	ssl? (
-		!mbedtls? ( dev-libs/openssl:0= )
-		mbedtls? ( net-libs/mbedtls:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DDISABLE_WERROR=ON
-		-DLWS_BUILD_HASH="unknown"
-		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_ROLE_DBUS=$(usex dbus)
-		-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=ON
-		-DLWS_WITHOUT_CLIENT=$(usex !client)
-		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
-		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
-		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
-		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HUBBUB=$(usex http-proxy)
-		-DLWS_WITH_LEJP=$(usex lejp)
-		-DLWS_WITH_LIBEV=$(usex libev)
-		-DLWS_WITH_LIBEVENT=$(usex libevent)
-		-DLWS_WITH_LIBUV=$(usex libuv)
-		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
-		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
-		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
-		-DLWS_WITH_SMTP=$(usex smtp)
-		-DLWS_WITH_SOCKS5=$(usex socks5)
-		-DLWS_WITH_SQLITE3=$(usex sqlite3)
-		-DLWS_WITH_SSL=$(usex ssl)
-		-DLWS_WITH_STATIC=OFF
-		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
-		-DLWS_WITH_THREADPOOL=$(usex threads)
-		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_TESTAPPS=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
index 4c2792012f7c..5c1d4449fa63 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 92af1c95c79c..ca2fb7d032df 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,8 +1,4 @@
 AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
-AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
 DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
-DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
-EBUILD loudmouth-1.5.3-r1.ebuild 1170 BLAKE2B 796ee7350f10ddf6f962dffc0b0514da80650e8b515208230f960353a3e8346c599f498f012e4dadac5e849ebad52a5d1addb736ffc51ec825a48ee5e8f956d2 SHA512 ebce5d4cb91189e8451f371720579ae803d21c387f5d94e0a3ca8d7406e5a7a13072ea8331eb2b42e73122a20c50e1563bc86732cb22fa5091d419162576ccc4
-EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
 EBUILD loudmouth-1.5.3-r3.ebuild 1081 BLAKE2B 432f2a710d14400adbbaa55b2c973d9e8022dedf57f8a9af4513c77647b2f281cf9d9fc7ed21f1d2c3b915e8b96beb18e109a680596e706d86beddb946a8e3ff SHA512 b18bcf635a5c63d1c91ec0a0d8c4b7bf7991ea81ac38b6afdcea969275b899b21221d496a7b0826160c05803973d246d06506132c9a7cc6c7ad20ed62b8625a5
 MISC metadata.xml 563 BLAKE2B f44dddc4df6f315de0c29f89b1289f8c3ad22b5c475953ea71bb270d0f51e86c97ba0b70aceab8c1fa347e50411eb7bb0b4b587461fde9dce9a2bbaf78fd2e38 SHA512 3824533be94b80a627930881ec08ad942bc6d1f6127ffd339ecb86a0bfaad48097742935d7909d76aba60089fa94d703dd03a8f916aac32cba0a375332d5adb1
diff --git a/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch b/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch
deleted file mode 100644
index 097447cc7a1d..000000000000
--- a/net-libs/loudmouth/files/loudmouth-1.5.3-skip-gtk-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/docs/reference/Makefile.am	2018-08-22 18:11:17.138111534 +0100
-+++ b/docs/reference/Makefile.am	2018-08-22 18:11:23.105118175 +0100
-@@ -80,9 +80,6 @@
- 	$(top_builddir)/loudmouth/libloudmouth.la
- 
- 
--# This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/gtk-doc.make
--
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
- EXTRA_DIST +=
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
deleted file mode 100644
index 2ec2b71854fa..000000000000
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="https://github.com/mcabber/loudmouth"
-SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
-
-IUSE="asyncns ssl openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-# Automagic libidn dependency
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	net-dns/libidn
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-1.4.0:0= )
-		openssl? ( dev-libs/openssl:0= )
-	)
-	asyncns? ( >=net-libs/libasyncns-0.3 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc7.patch
-	"${FILESDIR}"/${P}-skip-gtk-doc.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use ssl; then
-		if ! use openssl; then
-			myconf="${myconf} --with-ssl=gnutls"
-		else
-			myconf="${myconf} --with-ssl=openssl"
-		fi
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with asyncns) \
-		${myconf}
-}
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
deleted file mode 100644
index 6b2b320208a2..000000000000
--- a/net-libs/loudmouth/loudmouth-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="https://github.com/mcabber/loudmouth"
-SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-
-IUSE="asyncns ssl openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-# Automagic libidn dependency
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	net-dns/libidn:=
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-1.4.0:0= )
-		openssl? ( dev-libs/openssl:0= )
-	)
-	asyncns? ( >=net-libs/libasyncns-0.3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	test? ( dev-libs/check )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc7.patch
-	"${FILESDIR}"/${P}-skip-gtk-doc.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use ssl; then
-		if ! use openssl; then
-			myconf="${myconf} --with-ssl=gnutls"
-		else
-			myconf="${myconf} --with-ssl=openssl"
-		fi
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with asyncns) \
-		${myconf}
-}
diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest
index 90b2dc99323b..d8bfdc3ace90 100644
--- a/net-libs/netwib/Manifest
+++ b/net-libs/netwib/Manifest
@@ -1,4 +1,4 @@
 DIST netwib-5.39.0-doc_html.tgz 139572 BLAKE2B 4680ab22206fee6f09dec4bbd9d352bdc8e30db2cd7080278586eec81ee9bf940aa98ab2d9180a9f202a10578064cea966968616ec4f33e51be5380194fdfbce SHA512 0920642854f71b4c20a8b0844d152aa1107b7cfe927524391626bac97185024261e0efbcb681b978fa612d04cb71a804c7ae604d2040c87d27d118c004940345
 DIST netwib-5.39.0-src.tgz 641757 BLAKE2B c5c17f971888b292e78d65e2b437c58e53040951a727f1d37b556f9ed9b28a67d9d2756d69754459ee531cedd48d3ec24e92c2118b69ee50bee99fa7f791a210 SHA512 eeb3c51c48ed22762fa0e4215dfd239fb97fc0b34f28382d77ad863ed1f2f4a1f26195517fcd26c4b1a96195c895bd7b7ed121af975b5dc49b1bc378b11ef234
-EBUILD netwib-5.39.0.ebuild 1297 BLAKE2B 9bac482c4b594f83b82e482265da51b7395632f82d525f711b939c324f26fca62fceb3339e7e7c020591403ed34361bb834c80eb4dcd1b72df68d7bb0c0c40de SHA512 e77d5c23492e3c4dec2bb23215a45bd7234c4b4752dfb24c74a3b2a18acc1e2d5f7230704424ebe8add528fda100eeaeb485a3bd641f8a4247374d275df665b2
+EBUILD netwib-5.39.0.ebuild 1320 BLAKE2B 1b15ee5d5a0cb90d84a2c0a050b367573d57a9dfff0c4215521840d1ded07f06b85a943888602b66ce9f7c85ace48a431a4bc63b3488540b41ba2d4161ff075b SHA512 b44c1bace73b498c8c57a13f5900e4694c93789a1221b9770ee51cc6df506a8b9df8ac6bfc53410ecc50aa8ab37ac0026b9eb022fcf70e6b076362d7e4ac7fc0
 MISC metadata.xml 356 BLAKE2B 5268876897034598b81a4a02394cdd1168965e90faa9bdf4c8df085b8be545db72f005e97fcc897a58474fcb5bfa5384d630ffadd02476a9eb11ef5f0557bbf6 SHA512 c590d7b7442f468010c30212b216519951e51204dcebcb539da49e0a5f2ade0d932cc4db9fe27adc1e295396712fd31fe5de74f0f2208fd8ba3998d96c03f039
diff --git a/net-libs/netwib/netwib-5.39.0.ebuild b/net-libs/netwib/netwib-5.39.0.ebuild
index 0a94f4cb4132..c73eb6097f01 100644
--- a/net-libs/netwib/netwib-5.39.0.ebuild
+++ b/net-libs/netwib/netwib-5.39.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: netwib, netwox and netwag go together, bump all or bump none
 
-EAPI=5
-inherit toolchain-funcs multilib
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols"
 HOMEPAGE="
@@ -13,6 +14,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://sourceforge/ntwib/${P}-src.tgz
 	doc? ( mirror://sourceforge/ntwib/${P}-doc_html.tgz )"
+S="${WORKDIR}/${P}-src/src"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,9 +27,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P}-src/src
-
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:/man$:/share/man:g' \
 		-e "s:/lib:/$(get_libdir):" \
@@ -47,12 +49,12 @@ src_install() {
 	default
 	dodoc ../README.TXT
 	if use doc; then
-		mkdir "${D}"/usr/share/doc/${PF}/html
+		mkdir "${ED}"/usr/share/doc/${PF}/html || die
 		mv "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} \
-			"${D}"/usr/share/doc/${PF}/html
+			"${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
-	cd "${S}"/..
+	cd "${S}"/.. || die
 	dodoc \
 		doc/{changelog.txt,credits.txt,integration.txt} \
 		doc/{problemreport.txt,problemusageunix.txt,todo.txt}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 66a850ebc0e0..c00beee29e06 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -9,17 +9,23 @@ AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8b2ddd2a69506dec96efbb1269a19a08e9ab8d44dfe10f8429bc239e4102f3f030adb25e9c41901c7d94b53e88c8 SHA512 80f3c673a1f2af7fffd6aaa556c06b8225034c8413e1a738c19d491aff1b3e6ed388df66ecbff88e4bfbefe1013dac7e3beb301456c2099b6a954ba468b21883
 DIST node-v12.22.6.tar.xz 23664904 BLAKE2B 04dd4fd4cbe39642a1c3dd8639a4d9e3362055f56bc2565303d0095cda1655033ba4e0ce5a969647d2be73df13ddbcccc4907825a94a41b45c0723b3c02ca980 SHA512 d107f1ff7073d2db9f0198f14b0523870e9b262c71055de2e03fba54f87bc98a57dad43d902c0b349957df21de71dc066133d4831eb7eb07f4e548d0ac724fb2
+DIST node-v12.22.7.tar.xz 23661696 BLAKE2B aa162e2aee98568c207b11a27651cefdf6444568ad0c0dc602d63a6767fc7d00d10e93626168b334d6fe1774fc8da420ed05b9d2ce485f0ec3544d992bfb5b83 SHA512 7697b409537114abf14a3847fffd8952fd35f54569bfa84ba527f231ac1defced5d11fe7bc39ff8ec7cccb282d584ff50a33bcbba16474c6a125808a29104222
 DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5
 DIST node-v14.17.6.tar.xz 33606464 BLAKE2B c2c449e5eaf8214d7ed4bfab8db0208034cee1d08ef0e1fca478c30fc5cf95be037eb141080dbcfbe4fc58ef734457747dcbd0fe585a0536f9c0bec495435f25 SHA512 581c5698112426042fbf54fa793e56a30cae0c54ce8f23af6ac20d73c69a4f1166c5410f357c5a7b0409a773f99e3b9291e4afffd53b3c0e00569725dc4c47d3
 DIST node-v14.18.0.tar.xz 33698388 BLAKE2B 0a26aac559f2cd44d863b5375bc26692f1abf121c368df040041c9916e56410c3c919be377f099651e9a5e27bad972705d02a20f108f527cf23044e8ba95dd78 SHA512 0603e2466bf89b57e404e2992dda25012866a347489fb811a9757aea07056fc4f346236adf44a56d52c442f5f298f4dfdfc961f8582cd194d062beeb80c60cbf
+DIST node-v14.18.1.tar.xz 33693816 BLAKE2B 310a53a7319620d8ff77b4e5947c7f2196efe96eb0d4311c8fb91b500331128750096e7b0471def73bee00cfa6a9da968cc8176b1d46d06d14c3409dedb9203b SHA512 a92d6f392e960008efd0c1f48471a3e294aa5292065fb31acc62723e8924f7f1a22bb02f3ab51a440f6e190bdee3c1667a275808c6b76d053a77aa6d7ad68aef
 DIST node-v16.10.0.tar.xz 34046720 BLAKE2B e745443a4707eca97ebfc0d3cb8e697f64cd3eb98a419debde79100291ab64306d2c7cbda6ce1bfe6174cbc53880ddbda2965b0b6b8aa4b4b278781f002da277 SHA512 278f3e29f14362c017fbfa768bf0aa54cd208048741622413a67d3277e35fbdbc099fb84ce1de77837616e0e6f485916ccc771a7bee0b2ac5d30b4d4a6cf94f6
+DIST node-v16.13.0.tar.xz 33502788 BLAKE2B d30a63e77ef3b423bfa3a43299f7f6576ee5b0544757d1dbf233cbbc4bc9c70971927283ca87497add5ed05c9bf5d5501b36992cd242468fcd12e7f950ee29c2 SHA512 5d840fa49e8e637398f20b166b590a57e1070fd04c62bcb9b2d56646cf5a97719a70dbd9e0e29a548a268ac84c9a6c63c02ed6d38536ed45d82ffb96896a61c0
 DIST node-v16.9.1.tar.xz 34026992 BLAKE2B 8bb0d75ab91a00d5b03a31ded17a6b8845894630185d353ded616bf8435b672ea5cef06b4ca5bd01bb3536c5c50774f6ad0aa08a0fa8cbb00d8866e29561c2ab SHA512 e570c39fffa5d79c8d3fa1fe90ece53b22729af6e882416a35b54362be7169eeb3d37cf8be69ee1b748a981b1fbc725d8c85a739bc5cb0b22d6d2e313ab646ac
 EBUILD nodejs-12.22.5-r1.ebuild 7142 BLAKE2B bfaf19e3bd423ea2bbfce9c1686acd0131ed4fac60317ddf0bfa4ceb8a377740258d354ac4e92b3b8229d348002fdd3ed4b0c26f6c65c6e2cd0567956320fe50 SHA512 fcaa734a798a031ddfa918e62500cb2f8821def45cae91519c34b454c4e709a4e799a66d44e8b57666b94aaaa084017aeee4c907c827afa2b2fd7c1b70ea9608
-EBUILD nodejs-12.22.6.ebuild 7146 BLAKE2B 9e01959841aca021e53dbb1e0405af2741350dd12e9b81355c167d957ec71e836d3f0a9fcbf0842817ab04ca83fa6f63f59c22a809cf803f40708e79282eb605 SHA512 041d7e353b1c1dd2852fcb5df2c0950df3ac2332d6b2e2801b0bfafc72177857a8684e617693e4871a43eeb7d29247c08370494fff75a91aa71ebc913892129b
+EBUILD nodejs-12.22.6.ebuild 7142 BLAKE2B b98dea007a50bf3ed4c99fc68388bd7a73860e01e944f772ef121e148eff46a74042731841ee4baca2bceaf43c1d2c4ada7b16ded13aab00e21f79a349854ead SHA512 3f6421f074ca6b81fefcd18fe2a0f629f14a6f427c9befdb4024c861324ea64076c6189f113b3d7acb0c63f23f70a8be7f0fc8b65140eec299d2415f8b716693
+EBUILD nodejs-12.22.7.ebuild 7147 BLAKE2B c9d13de1d499943bc76f6222acc9e509bd035de6d6c45a85a59fd3176e9562baaa3fad6cd4e167ac8039933da30c85bed40fc1aa3f2404eda0118da3937f3f62 SHA512 cf6c9ece6fbd9e42d301bb5dbbdd299de170562ca39780fb2f3acaa574e55f3c7ead45a3e6fb4e8f87948267f139622c6733471d9c829a4a59a495df0bc30413
 EBUILD nodejs-14.17.5-r1.ebuild 7174 BLAKE2B ade6eebc522024960fb6ffad54ac0035f52692e3a6ea5b9a685f6164e53a81ee8eb8f115377b7e459f50eaea101f419bfc038b183784fe2877fd83e9e960da95 SHA512 c0bff9a4bbb32bbd2e832bf1b30966f7c0433a34ad3cdb83d874bcd7fdcedfda85618c50321336eac7a53f939a2ce12c944cc208c47b44ed8f1d22ffd5b8835b
-EBUILD nodejs-14.17.6.ebuild 7185 BLAKE2B c4bd07572c3c377779e365ea507d2c8a1517feffc263fc720b317c22c1f0868cd253f864b9ac96cd007839e48786f61d6c9ea44c42693d6778ecf359d086df64 SHA512 992af68281629a4eb642ed86f343f0b14d0d33baf92639b465539dc0ecec967e492ce103d13818979a5af0de2b55455c9856b24bb889dbc100f80d8939cfefd7
+EBUILD nodejs-14.17.6.ebuild 7181 BLAKE2B 3f823bdb6a4f20f57fea27cd19f45ace7703314bdd8d87e427b47971d48fdaa49082ad9963a6f40209e445e9395467e45284d4df95a07a680b4db63cd291ffa6 SHA512 44c7f0d28ef45ae7fca65311a342cea9847feaf5a87563953b08e15aef726be40d33b2d11fa13a75b6d543406adfa9be5459a4bad6f3c61ced2c50de9b36634d
 EBUILD nodejs-14.18.0.ebuild 7131 BLAKE2B 2b4c6af8c96bb0be0c16254ac6a017766f94460f46501388611cefea94dbfed342aff0c5b62b4a8299137528f10cf71b7318b52f9b9b9e9aa5c77ceff53cf63d SHA512 40b6313d9f089783688d5fe2e4e71d289ddd7fb74e188c393f8c552e42940a2bcb105c6075943cb61e948d89c0d5a03b56107ff5ab23bc2456ddf75a97ea6488
+EBUILD nodejs-14.18.1.ebuild 7131 BLAKE2B 2b4c6af8c96bb0be0c16254ac6a017766f94460f46501388611cefea94dbfed342aff0c5b62b4a8299137528f10cf71b7318b52f9b9b9e9aa5c77ceff53cf63d SHA512 40b6313d9f089783688d5fe2e4e71d289ddd7fb74e188c393f8c552e42940a2bcb105c6075943cb61e948d89c0d5a03b56107ff5ab23bc2456ddf75a97ea6488
 EBUILD nodejs-16.10.0.ebuild 6632 BLAKE2B 626aca3ced6df517ab6235d061fc53b77bcc9fa53f5f20805187aa2845c04e76210be44d6df718dbd5f13b24c9686c03dc672712c7c5af52567431913cd2c96b SHA512 5927f4ef96d126aecbbc9926be4b64990e91d08fa23277f4a82b62054083c2b43ee9a0d46e1fafda8597899541df08b216378315e0f8d53e573ca65c04b95404
+EBUILD nodejs-16.13.0.ebuild 6575 BLAKE2B fe9e15c9ddf726c90562877fa676d02d3d9bf1fa1d5b6c7b7554a54d0b839abdafd02107d9455ed3d861f9c455a99188853e0c884b12f02077137321cee89f1a SHA512 7f5f987705341b956e681019ae8aaef7abcd6d85d65ac5904838dc964b26fdb6cbb526d379ef5d6d900f86b260e193e849bac132aadd375679bcbb968075d73b
 EBUILD nodejs-16.9.1.ebuild 6632 BLAKE2B 626aca3ced6df517ab6235d061fc53b77bcc9fa53f5f20805187aa2845c04e76210be44d6df718dbd5f13b24c9686c03dc672712c7c5af52567431913cd2c96b SHA512 5927f4ef96d126aecbbc9926be4b64990e91d08fa23277f4a82b62054083c2b43ee9a0d46e1fafda8597899541df08b216378315e0f8d53e573ca65c04b95404
 EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
 MISC metadata.xml 822 BLAKE2B 159eb2a921f10115d8d42c4c7bce446984f020b096f238c107c3cbcc960775340bd68a5fa43f8b5580cccc226aaaab915ffc1604ef0b4ee15ccb8f84b969839e SHA512 ee4e6b8c56ef5987c849e571b98c9bd7695d47f1581c22671b165d80b9448aa0cf61120b87f34279710423bcfffdbf6d6b2ab48df4c8cc9bf2ff7fe318582007
diff --git a/net-libs/nodejs/nodejs-12.22.6.ebuild b/net-libs/nodejs/nodejs-12.22.6.ebuild
index 6a7020bb38dc..fc7f6f38aaa1 100644
--- a/net-libs/nodejs/nodejs-12.22.6.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.6.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-12.22.7.ebuild b/net-libs/nodejs/nodejs-12.22.7.ebuild
new file mode 100644
index 000000000000..b76dbf7ea807
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.22.7.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=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=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export 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
+
+	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
+
+	# 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
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	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="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -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.17.6.ebuild b/net-libs/nodejs/nodejs-14.17.6.ebuild
index 9baf11507ddb..dc855697bb82 100644
--- a/net-libs/nodejs/nodejs-14.17.6.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.6.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-14.18.1.ebuild b/net-libs/nodejs/nodejs-14.18.1.ebuild
new file mode 100644
index 000000000000..745a7dace6a9
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.18.1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-16.13.0.ebuild b/net-libs/nodejs/nodejs-16.13.0.ebuild
new file mode 100644
index 000000000000..b7c26db64cbe
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.13.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 1aa78450c292..655c2ea6baa0 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 EBUILD zeromq-4.3.3-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21
-EBUILD zeromq-4.3.4-r1.ebuild 1460 BLAKE2B e410de28a77238db473402987be9933734ac53f546e31563b6d0a71f36077f2a3c412d821f592fa6e2e1dd25c4bd41f5b7b6e8161cc6a30ef330bf318c8dbea1 SHA512 14f6acb5f89ba1b37949eb43b84598bbdbe9c024ec294524e090f91e186a25c09eee1f33e2464dce9e41fdbfaba81952e35448ebc3be61a1a2b555c193c77e57
+EBUILD zeromq-4.3.4-r1.ebuild 1459 BLAKE2B 10cdbd13d96649c08cf3f65a9a1509a3bd41294436267676a1f52afc08a775b0ad711f2f911f58bd8e9d72961fbc3f1cadc8add6887371be9b9430526d568b0f SHA512 bdee0c7805f77c91b793d2bf0ea5d65e3924708312b74cfb19adf0e2afe6e6953bfb8fbbe30c6127edbf0cc6cb690c0fc65a67b6e0a397ad18036e8adc5b3622
 MISC metadata.xml 1625 BLAKE2B e8c1e2a40f768db02b55dc045ef54863b8de6010345c78fd9ab42b95890e32aff0bb108d00191412f32aeb201bce16e803838b2b60c22d132f12b6f652129d3d SHA512 1cad56aa313c4f1c5791bc94a5df828b190252ea75c0e3ee39946b49d87d5906b3f1ae5006e03d2693517d31e9950f5d842a393ece44fd3e50024df81c386ba0
diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index e2cfe7b05891..a326c9f95e1a 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /net-libs
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)