gentoo resync : 10.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
commit: 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree: 6c418a1546fff5becab5d8b9ed6803323e7f316e /net-libs
parent: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)
49 files changed, 678 insertions, 306 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c9dc2e6f45a2..9e7f7d680e85 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 9af9f423dea0..dce4823699f1 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,5 +1,7 @@
 AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
 DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
+DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
 EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD canlock-3.2.2.ebuild 1094 BLAKE2B 7985854245d18994bf0799d87da999cb3b9967142bf5c1eb6fb7df54090b672882c51f4753aa4ee97037f50dd314f2a83780ee53a6ffe7460b14d2b51a0e3921 SHA512 947e110d369b6f8000fae4d2e9e81ef03039ff1aeeb0ebdfb3b07d3ffe1b48b3ec50b73aee50f64e2fe8f66ea18332cf07d0dfeb7abaebb17fa4a3904542af55
+MISC metadata.xml 430 BLAKE2B 1ba5ef4f7e01a02316f6c08a8c8a2af7c22537d62221a8f3acfe72077cd99e56e5364931e1a0773d9b8bec9fdc281c543e54f1a5872eeb59439381864addf7c4 SHA512 4c6f198897b63a36817f64788390508a5416bb3df2c85a3671447e5042f5f223107109dae934d718f53efe82c90ca809261ab61d8e85ca9b0c3d86dd0959ac7b
diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.2.2.ebuild
new file mode 100644
index 000000000000..4df5cb37ec2c
--- /dev/null
+++ b/net-libs/canlock/canlock-3.2.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A library for creating and verifying Usenet cancel locks"
+HOMEPAGE="https://micha.freeshell.org/libcanlock/"
+SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2"
+S="${WORKDIR}/lib${P}"
+
+LICENSE="BSD MIT"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+legacy"
+
+BDEPEND="sys-devel/flex
+	virtual/yacc"
+
+DOCS=( ChangeLog{,_V{0..2}} README doc/sec_review.txt )
+
+src_prepare() {
+	default
+
+	# shatest fails to build with slibtool
+	sed 's/shatest$(EXEEXT) //g' -i test/Makefile.in || die
+}
+
+src_configure() {
+	local econf_args=(
+		--enable-pc-files
+		$(use_enable legacy legacy-api)
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# keep old header location for compability with canlock v2
+	use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h
+
+	# required for net-nntp/tin
+	dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc
+}
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 6f49eba8f496..fae3fb70cd16 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -2,4 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream>
+	<maintainer>
+		<name>Michael Baeuerle</name>
+		<email>michael.baeuerle@gmx.net</email>
+	</maintainer>
+</upstream>
+<use>
+	<flag name="legacy" restrict="&gt;=net-libs/canlock-3.0">
+		Enable or disable building legacy code (v2 compatible)
+	</flag>
+</use>
 </pkgmetadata>
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index 4ab250535690..a7c6e973f96e 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,3 +1,5 @@
 DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e
+DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315
 EBUILD dleyna-connector-dbus-0.4.0.ebuild 543 BLAKE2B 5ef64cf0c83e989e9c2bf3ade98445568da30acfdb44d9b46e7a7d589550f0ffd181cf1ecdfbe649418637631d82438a770218c18f73102f64fcd809a1d778a4 SHA512 d17af0735d4f1b0590e637c4a9e6c411d3b86cebf4be631f46622a05cb6b22a2be00b07117469f1256b0884cf99a85ad0cc43a9486475b8d438889142baeea13
+EBUILD dleyna-connector-dbus-0.4.1.ebuild 545 BLAKE2B 90a587e689be56c1abfe242d6a735db075b791872fc394b5c3563838520b1ced54b8fdc330184a2ddffc34863144450ca44b14c0bcd7489db6ad8f8009809533 SHA512 ab2020d8be306bfb7f2f008e9b78a247bfdd0cc9d4397c493f6816ee436ffca22fc0dd16ed549f1295d774429b448f7895b97a10f7786ae67e410cb1d412e7bd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
new file mode 100644
index 000000000000..ccb8ad30e32d
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://github.com/phako/dleyna-connector-dbus"
+SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/dleyna-core-0.7.0:1.0=
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-1
+"
+BDEPEND="virtual/pkgconfig"
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 20b81f3ce7b4..d5ec5e42762c 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 AUX farstream-0.2.9-make43.patch 1423 BLAKE2B d17a589cd2c91eab66cfb86c3050e0c9fa6cdf7a92ffb9e483f7cce2cbb9106ddc3755f56e70a33446b59aee68fb5e8bf9a4b6cde3d480f0ed411b42bb273ec3 SHA512 55c95b76e897b64b350f1740cf65311bf3ce1e2ed24515c713dbe8f0a4f1e4d4232e630e5c8abd8fce580f4ff7265f77bdefaf78ac3eb135342b2a70305bd104
 DIST farstream-0.2.9.tar.gz 1334833 BLAKE2B 3c23f9534cb8578acd82bb0f7308891e0448cbf5a5b986f27d14e4d727a1e52f4268532c44dcc84e2a1db19504840ddac128c9bd0a731f06e2972d233d8781b9 SHA512 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd
-EBUILD farstream-0.2.9.ebuild 1943 BLAKE2B a578b01556118a803f938231358bede085b0b33ea5481298d3cdddfcb0062b8e9a2afa0ec56d3dca831672f925056ca3baad44297cf2a42f2b272e8f2866cf53 SHA512 118ea3178fdd89133dd5bc1acd9df67fc4501c22d874fac7a0babe52c12801efb4bfdaf6d8469696aa74c928a19d6b5001a96884517705e6c1543098c2aeb51b
+EBUILD farstream-0.2.9.ebuild 1950 BLAKE2B e4fe853cfd75b0089e1a97d4ae2bc5a26c741f27a93287e4da666b2ef818778ed54a521b6a6d1751dab564dabf57d0c1cbf6aac0a32167d4c9dfcdbf07fd7494 SHA512 5866056d59511d4b87b2673c6d76825b4d0b20ad9fded8babee5222adef943b0b29873f184ac96d9a006b88523434402704841f95269ac41e2091fd2d2955312
 MISC metadata.xml 324 BLAKE2B 5d42923f0341e578e9a43d0a7c22a9f3c4110252bc5acd869d4a92a7e9ed08e7262d9ebc559cad8c3f7de63ff411daa6ff25178b37be3493eb464a7d48a88a2d SHA512 c97ce61625bf6ae20953c5164123c8494be83d4870787b247f460103c9965e9ad8d599ded1a67f7fcf91e4f0156674fdd4fa6d4177577f766d60a65eda7af93c
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9.ebuild
index bb9bc8aee73d..df34fa1c2ad0 100644
--- a/net-libs/farstream/farstream-0.2.9.ebuild
+++ b/net-libs/farstream/farstream-0.2.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp valgrind"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index b0749293d85e..bb4306f170fe 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,5 +1,5 @@
 DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
 DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
 EBUILD gnutls-3.7.1.ebuild 4232 BLAKE2B 35454524038a30fcc8d83f3bdc4b3f3773710c3a0e64881e4a29cefb205385b7693ac01ee24fd97e09a5941f1e2f67a91f0bbdf23cde404c88da80fe17c0c00c SHA512 31e764285b44dbb55d5aae1b070bec327a9544211ec89e74039220816b8140ee04d35e1d78b2118d89df4f141253695741366cb85dcdfa017ffb5b39ca6f0491
-EBUILD gnutls-3.7.2.ebuild 4236 BLAKE2B 77bd886841d3a15d9a0bb29d7a80fd800157274a0ddfb98cd8ae343d26fc593e8cd4c5bbd1427eb1ed29e728c92e285f66b2dd5bfc16e6704b70ff6d9535e7d5 SHA512 efde32bec8397d5ee3a456dc668e1eb313a6dfb450af6ef870f7dd58bdbb902aee908e9582bb39c830a6b9d989528966f28845b7fca94d8878975fc0b4923d46
+EBUILD gnutls-3.7.2.ebuild 4234 BLAKE2B 4bbcb12ad050cc5194549d429a161a2530aa0bcf60f7dd781d7a8f5b39e3be5d1d37405550177c5e027f64d14ff34781b51fbc624df035787be95bb3da67156d SHA512 251faee18d4b560902b235dd787e5bf48fa453b82c9896c83ea42b0d50d875790d5fc2a1c80fd6e4e39dd9970b8205b1bac50b72265d1c0f6755ac51b78de39d
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.7.2.ebuild b/net-libs/gnutls/gnutls-3.7.2.ebuild
index 46883e05c481..2a251871c77b 100644
--- a/net-libs/gnutls/gnutls-3.7.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 26e4360db0f3..21a78b15da8d 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,6 @@
 AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
-EBUILD gupnp-igd-0.2.5-r10.ebuild 1430 BLAKE2B e8ae3e32363644ce7c8f4988ec44b2b9d1aee5df419c344cc00b4c8e6a9611d4db105d59a8cd1598d87451bbf5271e4d419da9d82dfdf76dee0785d0d91acab1 SHA512 f74bda750feb5939a6175c96f689a6baea353ca1c2c16d719835569c2314e0a05c9390ba19cffad973cad1dac2ea9e5fd1ccec6b03bf41965f09dbcf9e58cf6e
-EBUILD gupnp-igd-1.2.0.ebuild 1102 BLAKE2B e1d611a561b72a9ac6389b6b5ccc6571e49000b132bb87712ba1338b1ba6eeb6d1e0b784b8229111c0c3e87223dc719e84eaa1c47d552d555ffb4bdba0f34d67 SHA512 297b47cac96cd8b039bf9859ddc90ceacc7b463c622464785e3a1510f79479f9d6e5668f87885cfda5b473f5d9c43422ad640ba1905267f21bd557cac8113193
+EBUILD gupnp-igd-0.2.5-r10.ebuild 1437 BLAKE2B 878e30278be7c3c9048c099db41096d6699106e907136787f220e9c89e141d3c71e72982962798c51acdd436d1d48dd425c9d8de5da89b0223615b5cbda7c913 SHA512 f2cfb991cdb627ee24bebbe9fb6371319562823e90d4e29aaea53f10f146f0d67fa762f7e0f568afc8e766a19f7e9dd193fe47749d50c55e905e735a657dfe8c
+EBUILD gupnp-igd-1.2.0.ebuild 1109 BLAKE2B 6afae317b24ebf00069c02ace8f8449867669c0bb1cce9b08b539732deb55fb211887613de947603bdc3fe7e234146f27f0b160ed3ba451cbf245c2f7cff6515 SHA512 febe33d6ae5cc1f17a9c74c4d7cac052de33c196498a3ee64b5568359b4664bd588f407b9c1e08ff2b04e6905269cc45561c9e8a6662650fcaf4e3cd41750b21
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
index dccc1aa812e6..664a38dca04f 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
index 4afadf5e7934..21344c0edbee 100644
--- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index ddbeb73771a7..787481d2fd41 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r3.ebuild 2617 BLAKE2B 1f137bfba50eb15e4390d6466c21ff09ac0b75e4a8abf7c0e9865b1ec7b931fa27eda22c19210ea05ec9dc08905541faf4f01f6e06550f95ca29b6d0f51830ec SHA512 29d8a964da4fbeaa0365d68a1ef9f6fa13ff588bde3fc2ca0281d962e9567ca590414f425feae7bfc7091512693852d75f6a7862446b86c1e52e4d3f54f206a1
 EBUILD ldns-1.7.1-r4.ebuild 2621 BLAKE2B 0585d412d07d38a2dd1744dbd539894c5a4e3d3391d5933464494420e1302cd7d935e39ae16d05bb12fcd9769cd2d1bd4ee15d2bf8e80132ab5ec95a83cd1b69 SHA512 26f81bb4f48a6c1f9f8ae7bf5fbcafc4fcddc1efbf14d34bfd0138cbb75449408731325bedc7179f093861e05696a518de3a7ad877cbf92c26110d3ed2a523d9
+EBUILD ldns-1.7.1-r5.ebuild 2625 BLAKE2B 3afc6b2be0ef0b376fcd0cefe0b3db936a28d2b7c197948c6550d2ad28feccfa6230c3f6b8b9781c21ec8d8aaf28fc6b3195cfc3af3587b14be230bec80c590f SHA512 2285b38c0e76a7f87084dfcb36a1dc3be698f8f0e7499b6fe83573b930324c0fb590f136ee36b950f7aa3f727ee9f6826a59766f255fdfd12812b0823491eceb
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r3.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild
index 4796d3ae7c41..14222d28541c 100644
--- a/net-libs/ldns/ldns-1.7.1-r3.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-inherit epatch multilib-minimal python-single-r1
+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/"
@@ -11,11 +11,13 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
@@ -73,7 +75,7 @@ multilib_src_configure() {
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}/${P}-Makefile.patch"
+	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'
 }
@@ -90,14 +92,14 @@ multilib_src_install() {
 	default
 
 	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
+		dodoc -r doc/html
 	fi
 }
 
 multilib_src_install_all() {
 	dodoc Changelog README*
 
-	find "${ED}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -delete || die
 	use python && python_optimize
 
 	if use vim-syntax ; then
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 79bcd1ce1f14..c82629310a9e 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -1,6 +1,8 @@
 AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b84a5cedc4a807992191766d51a5f5b672123a07e876972feba4753cd102851b9dbcbd15957bf11b5f794473f5a3bbdbe SHA512 b9567f60b37a4c2cc658a7215bdd864409f2b3626c28648547a9fe6bdaeebbc5f414cb5ca6e5a78dfd9d24b7b81a38bd358bd83887a56adb9ceed5049df6c187
 DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
 DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694
+DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
+EBUILD libaxc-0.3.6.ebuild 1345 BLAKE2B b38dc4d4eb07781ef697ca50275145d3a5c3063a765b97133c2a71021726567daa6b4c546ad092c735467f95a023f97129670d71db6da90917c79163ff9a1fc2 SHA512 6aaa85fa43881875485eee2a41cab39cf8cb01e46a90ef90a18040f82bd5b999d039b5f01da1939c64098e8a31f0e322b2920cd2a8ddea2416fb49d185ee914c
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libaxc/libaxc-0.3.6.ebuild b/net-libs/libaxc/libaxc-0.3.6.ebuild
new file mode 100644
index 000000000000..b5901be4efdc
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	net-libs/libsignal-protocol-c
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cmocka )
+	"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rm -R lib || die  # unbundle libsignal-protocol-c
+	default
+}
+
+src_compile() {
+	local make_args=(
+		PREFIX=/usr
+
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+	)
+	emake "${make_args[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${D}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${D}/usr/${libdir}/libaxc.a" || die
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index def862ca126b..04581fd34c8c 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -2,5 +2,5 @@ AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1059 BLAKE2B 5b15b69094220a19f8da329e839c05e4a52aac8d2ba0609580c2361c7016dc42552af3b48a3da9ea46cd138140202262006c3c1fb471b6d3a10535d1a569ca7b SHA512 754495fcea55eb89db427f48c016d52c9cb457c94bb4022f13089e4820cce8cdf29006afcc0654eb8318ae647b6349bbf28ed075ffbe733f15a7e2017678d3ca
-EBUILD libgadu-1.12.2-r1.ebuild 1174 BLAKE2B aa27f9b5f99a7929b096957bd56f8eb8700a39eae302e1dbeb215651fc9d106839573117d47da4d834530a9bcee7c145e6cda3723192371c428b4088f585f5c3 SHA512 7e4d8ca258f47ef40e58b0443267338fe1e5ccde20bb61f5fc880a5e2b5190680fa8ebf88e344c1648667d6c8a919d3e11664956472a3c07809ac01c8462b7a2
+EBUILD libgadu-1.12.2-r1.ebuild 1181 BLAKE2B 88de9e7a8cc5af99d2d3c852ef9ab250f1af474116d6e0d88109204b4f08d0e2958ea049d0406457b17542d77d888af274d0fa36b5c0f98e2b696e8ba459c66c SHA512 cf500abb2c1c4092857f60dc16590f226fad7912e97bd4e60eacbfd94f5b6d77e10c142623cb80da815fb6c199acb7f2aa7d59c48971cdd36f04902952269292
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index c0f284e5af43..795093415aee 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 33fd136919bf..cc9150a6a928 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -4,5 +4,5 @@ DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860d
 DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
 EBUILD libmicrohttpd-0.9.68-r1.ebuild 1256 BLAKE2B 859ca10c35695d9ca39109aef4966d029dc6f0f5c307453db26070fc57ab6d7d6a4d9ba16fa09bf5a80aa299b9a1698a0481b940d4b2f4e01aa0e22165f9468c SHA512 504463d6caf3edc4a594356fd7092cbe800da452c8d21fffd29d159a58f048b1f82581d189bcd80373e782de282ee7154fd83945dcd207cffad1aaf4b308e6d7
 EBUILD libmicrohttpd-0.9.72.ebuild 1292 BLAKE2B a4afc0c39b260ca28eefa81f54661d2ecfc77711aa318a1d3d99603a5fdba2364ad1917623e97cc32d052205cd62fa2243a17cdac192f0f3b17d28e16e8c7108 SHA512 d48f9b68ed4f2b9fd9a8e2104e844c365e2dc7de5abd638f62b6ba5966d17bb2077dfa338a49ccd201ddcd491a8b27c8b7420b700ecf3ecb4637d6b8234e75de
-EBUILD libmicrohttpd-0.9.73.ebuild 1420 BLAKE2B bde7e4c74524afcadb4668af2992940a1bc6f446008dc21b900528b4f6556cdd4638a6e8714d8bf8f62104df447abf7173be305dfce7844af34c4cb281251cd5 SHA512 42e304e035a14100b41f4e148dda31deafe5f354c80a5d078ca3b872fb84c2aa8ee31fcf637d803ee0f7142bbf215e0033ca780b55b0d94745c0da58df8ee48c
+EBUILD libmicrohttpd-0.9.73.ebuild 1419 BLAKE2B 8933009f87e45ab7c778bc047b62ef0112956db9d6e2f99d56491af39bbf1924a8bc2a8ff3555f22335b0aa04de1ae43ada3c8b1f69a1cfe4f314e3c74bd5fb0 SHA512 db5a749c1d20501bf6afc7a5093fb0b62d5b72f3c769779c0ba6a79a3fcc24a2404b68f89873c09db78385fb8ab8230b627cce3fc82ba7a3df4622d388def1ad
 MISC metadata.xml 631 BLAKE2B 84912d97f425f6adf4c70ce77df6cfc7c232d193206a28e41c6fc2ef7e4beea8bef738e5fa8f6fbf379cf2e3a5ed7750c85d0be8156a924e330e65891fb519c8 SHA512 d5ac18342550f72840cebf86c8f99b4f042e2abfd42fe26643264706679fa09b10c67b3174d41fcfd786aad5665e0c130da9a9876869a113d24493ced5334dc3
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
index 0523ecb53367..689aaa6c4df6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -16,7 +16,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
 
 LICENSE="LGPL-2.1+"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+epoll ssl static-libs test thread-names"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index b136f5741c26..1d7618e51707 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,3 +1,3 @@
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.4.ebuild 767 BLAKE2B 93d5e003dabe1820d9d45d43c38f8311169813fcc4e453a4b01ba8ad619c165602818df542a23d568534c0794f41e1b7a143f00584e353f85eddd181d49141ab SHA512 12076722d6fbb531a7661ed4be7a024ed762bd213660c1e5f21c1335482de0ad0c6676a7817b06a1f898ff50f4119ac4ba01bcbb4efada362a9c9238700228f5
+EBUILD libmnl-1.0.4.ebuild 766 BLAKE2B a1730cacf941cff28c7b74f314eccf91e7168668a5e180a7fa4902a56a7ec7166dbdfb439bcd0346e4f6c7a21b17e487feb9fd213389d242edb1073988180f08 SHA512 63579c53896d2ab2e6647b696487ad3c877f5b4b8c3ecb11b07d83dc638e1f551b5c3a274e68ac9326df465f4fe0b87c30e736924f2cc6276c949b3bdb6113ec
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 2f7f8486b0a5..0e9c2adbd8c3 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index af07c170d13c..90410a98cbb6 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,6 +1,4 @@
-DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
 DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
-EBUILD libnftnl-1.1.9-r1.ebuild 1169 BLAKE2B eb1eb29dcb96d5c42e57bf176a667427fd48fdfea3492f8f615f358c8fa326804f74c486267be8c53275017000a37821658057ae963950e12844a0cd49de13d4 SHA512 2f3253209e51693ef8b16526fb0cdbff7654fcaa35fae13012f43c3e60728271f211350e0cb579797cb31da938b170c4dce0f026bfb4806b9bc7bdb5aed64456
 EBUILD libnftnl-1.2.0-r1.ebuild 1358 BLAKE2B 8bec388f4c9b7b8317a45731f931b9a13df4dc37e952b5ea37d27def9bd61c7c47d212e27c945bd942b61a8f0cab4b07065d25ddc59bdabeff1bb4ca550c9709 SHA512 22e5dbce5186f0ef931811f356c7d429bd3c49eacce001f1c62d48548aad9ff86297e81428bae01e69249174161f3ef9131c4eefd054fc78e060aef44b9d401e
 EBUILD libnftnl-9999.ebuild 1365 BLAKE2B a9a51f3646bc178f7e3968ecdd037aa271114d60f52a13f6b6dde6c8cf23fbdc1ebc418bf25f243ceaf09b3bed49aab46735be73324148c3bf9794970d1a6867 SHA512 e710777258e088cca0b02aa2138525eca626b98392e26376196aaa80c82b67bda1e4152f4cff94e61256a45c248f0e7ed43f1233fad858a328cab8744da6814b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild
deleted file mode 100644
index 6b04d75ee354..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-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_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/libnice/Manifest b/net-libs/libnice/Manifest
index 6b11fade5911..57322e09df9c 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,3 +1,3 @@
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
-EBUILD libnice-0.1.15.ebuild 1525 BLAKE2B 42103c33903d394e10a91216d165a7f918f4cabf09260e16b8493f609008aab0ddc059529f1a1c12a76a37bce0944648f6652d0ca7b2f5cf3952ae5345b0ba0e SHA512 ab583376f8ef51d5e4aaf35208292789c6825ae00a2f4491d12ae05ae77ffaef6e134f204f7d12101b6b23a3cbf54fffc9330d070bc6ea0b1b8ab0c1263e4151
+EBUILD libnice-0.1.15.ebuild 1532 BLAKE2B 30fb32dd731198a8b5b4d14e2dd08ae38af762d215a6d26658bdfc8753c60d1f46efb6ff587c91bf23cd6496f2b862b054e37fe3abf040bf3bef9707d14c9f8a SHA512 8f2b522cb92b1c8be8c413886329acdd8847fb358f222ec79eaf2a07980f1608459ae99211b6be2ceabbc6c1c891013f5710912114a7cd5cbab2b58ec26c6769
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index 54444f474e5d..c56824219a0d 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+gnutls +introspection +upnp"
 
 RDEPEND="
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 9fb26fc816ac..e9971b8e0483 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -13,5 +13,5 @@ DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
 EBUILD libsrtp-1.6.0-r1.ebuild 2337 BLAKE2B 52f337ea0bf805f22faa49c822d13fd93101ea021d5a69dafe48fa94cecb99d897c57674d5948558b9a4f7c052f0eb64f1a46899f91ee9223d86ff35ecc80ad4 SHA512 24b38fea4642f344faaa1f9722909b51f8c9c373fa2c231956309eefea81b938c19e55e7aaa1f4971a26f14130c2bce5d6631551d2bd7c976f17641e707b544b
 EBUILD libsrtp-2.2.0.ebuild 1808 BLAKE2B 1fb3991cfc010b0610d2e4c5bb4d68374ee8110197e07a50575dbca4ec921daac6181aa91dcdd5022114add234e1b0ad323dd777284a8d609711aa75f29da237 SHA512 7311aea94bdd39e0a5c19e384f88babed4f20dbf46635bebe6c9807c258460f7da88989e7c2b341308c9677e4b955807241cc789d59b07eaff2e01cd754d1daf
-EBUILD libsrtp-2.3.0-r1.ebuild 1957 BLAKE2B 00275bf7fe7e1e5ec3f42928fcd643adfbe3d0cdd025c73571df898a8e1a01672504dbe6befec8173e12ea9ebb2954265fa5ae89d50fbf737656d92fb40abfb0 SHA512 501f794dfc0e0bf5210dabbf879fc9de908af8bc722f5d8378346e12fb2c9d711e4a3aaa0d6645354bee05382da2f8d31a1795be340aa74882b600fc33fe4081
+EBUILD libsrtp-2.3.0-r1.ebuild 1964 BLAKE2B 190d974f229d348ce03631032c70858e898c28804a7a752e52d755d265c9ae8f443d64a86f54cc01e7be56dc1934462b9f7c64169cc07cb7728f09c5bf217daa SHA512 fa3d3a4d34a7c542df04aaa0a87de790044ca8e735ef6096c035fcca29faae12136b7dffcfca995e0b11ff6f51919987b921a5c88765618a6228e08bcad7991a
 MISC metadata.xml 731 BLAKE2B a35a1b2b8183065b81e12c6083d9fb8b96d0f5e972a06c903546c5dc6c29fb2e99f031357c25d0ac654fc436630744f041901c4203261dfe0924055b920364a2 SHA512 5cbda78175e4ad9713877fe4aa2113683261cf61983e9d545a1da4877cf8544dd09d8f86b3d251a418adea82827d5d04dd46cf06373e65e1fc1a526314df2bed
diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
index 8574abfaf18b..47b538b3851e 100644
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos"
 IUSE="debug doc nss openssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 8560e887e30f..0f3f6d3a70d8 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,7 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.9.5.ebuild 3117 BLAKE2B b05b2f0718376bcdd086cac5ea7301eed6ba29831a2219c3cfff77765476554b16867d83a7974ad03c480485c2f8b7551a4bdb18c6487011b1a62f9000063d44 SHA512 4daf780178f7293affb803614ca71f7c952fadc0cd838c33db41118bba3da15d5f8fbe8d4ce1c4085096a542957e45099ce9f895c41fbebe8ffb2ae56702eab2
-EBUILD libssh-0.9.6.ebuild 3119 BLAKE2B 43d36c5f999607eeb9a2128cbce4ffe921a3caa837da89a6ea35ed124949270e49274f96e4cf7eb6551d0bb5409653072234f9f9c5bca34cc36bf8f50b9336ce SHA512 0661da5327527ac63ce352e91a11ba1e8a0281de51add14bb2f70faf53a1e5ecddc3badab9daa9fd1b148d9d7e3abdb9ecb735e023d9727d6989348ebbe7b5fa
+EBUILD libssh-0.9.6.ebuild 3117 BLAKE2B b05b2f0718376bcdd086cac5ea7301eed6ba29831a2219c3cfff77765476554b16867d83a7974ad03c480485c2f8b7551a4bdb18c6487011b1a62f9000063d44 SHA512 4daf780178f7293affb803614ca71f7c952fadc0cd838c33db41118bba3da15d5f8fbe8d4ce1c4085096a542957e45099ce9f895c41fbebe8ffb2ae56702eab2
 EBUILD libssh-9999.ebuild 3117 BLAKE2B 98eb87a2073ee4a86a2f339d5c37fa89dbb16e1ff6d7548b5ba6e4b051ba24180742d6c90747498c3939236c0fdbfa3d9de9ea28e077a35cfd41aa1dfcc29e47 SHA512 6a300f9e1695c444657fcd2fd19f25cc2d8ee6451076c0e039107c602f056bf23b2b3e8478ddacc5d8416dc2d4a7e383a3ff6afd858b2f4b4d337a8d235f4bf7
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
deleted file mode 100644
index 627887023589..000000000000
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ /dev/null
@@ -1,118 +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
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-			-i tests/unittests/CMakeLists.txt || die
-	fi
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_STATIC_LIB="$(usex static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild
index 529b8e10d48c..627887023589 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 3ec8e677cca6..c21bbbd816bb 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,5 @@
-DIST libwebsockets-4.2.0.tar.gz 14550541 BLAKE2B 9471d19b15decfee4407a596cb3f127534e12ac6bf49c81b04120a379ff8a8e1c7767e9a7e586ad69d5af23e869914c749da771f8db6431ac09718b971d261e0 SHA512 e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369
 DIST libwebsockets-4.2.1.tar.gz 14557242 BLAKE2B 07d5a7278a3f0518f8d8c1a20c6ad08d7125c276d1b0236649abe961879e3985319ce03d6800f7312f63d2a92dd96d341783257695a91864a2ee93116a5a108f SHA512 b8b03a9f099079aace448eeee6690bee519c23ba14e0b186e1813bfdb9b915462a07a5f52bdb81949021bf631d99bda2661704814575f559b5a91c70cbb2ec30
 DIST libwebsockets-4.2.2.tar.gz 14589100 BLAKE2B 371bae4790e92aa4f48e51b40fbe2e4efc3b885e07740db14c96146eb857616fd3f7a1b6c83c11fded2791b1db59cb1f6761bc4eebaee918ada7e9bcf4be52d0 SHA512 52d9b4511fc484781108a3036f870905d4427fcbab02f3e84ee38f534ae7d1979c2cc3eec0719f4609226d4aae788a79fe7d99a8506537bbcf8fc3d9b8a7b478
-EBUILD libwebsockets-4.2.0.ebuild 2302 BLAKE2B ccd6d0d167e36590d377144b1d35d2ff3cdd20c10b78616992fd39583a24bac5159732764e0395022bdc1d9977000e66047aa4bfd5a06f30322273396753dd61 SHA512 f97e085f9d3092a4f4ac24325ff92cf852681b0955a08724005d349f949a5ff21a41c803d7e427f18c6bc2d21f7fe7d2ca90bd662dfdfb52ef00fa0e80772bdf
-EBUILD libwebsockets-4.2.1.ebuild 2347 BLAKE2B 1b83c0b6a73b718ca87266fb658c986162867efdbc045b1c257d1b93509c87c43ec76bb09dee905a8605690db1318bf0b47536483e5df53647932838985025da SHA512 95b80b7a073d9d17d46bf9633609b61c8987cdf401b61277a747b40bffa0a99bafbcafd1b580c9cefe679456c4d31256f846bfe426a39c64fc866d651659faee
+EBUILD libwebsockets-4.2.1.ebuild 2346 BLAKE2B 7e0f277a5e9d8bcc6dc9f6377341eb00e4dc6d0dd566e374bb1d4eaac0d0c422f03a00d72cc7cf722d2fdab44fa0d5aa3fb3d83b8646404f6d23e25095d25ab5 SHA512 2dbdbf89687faf2aab61532a31a7a955bc66f19987447f02ebd9e778e1a2a235db5b26e4aa6d2b5a7e9f43ec514c3eb3be7386cfb52126b5a2dc0b1cde79e4c7
 EBUILD libwebsockets-4.2.2.ebuild 2351 BLAKE2B 8d3ab6bfd878f0d6f2adc024cf55259d11ef8937e3b4442a2390341b78865f5f68605008c309358cf48281739fa11bc0c3d209f55058e15ca858d57e10ea888b SHA512 2af4352af03055910abb539b45f5810d469f9035ec712d6abfbfdc59eec8eaba0d922319a69ca66d195031db587fe80e1a62cb451cedb5dc9ec367763568b3ec
 MISC metadata.xml 1702 BLAKE2B fe3cdfb0f81d88cfbb120e616fa6ce9c33c47a7f4232d0eb965ff595e585765870ed509093f9b7d688419c3b20bc54bbcab75a5abf1d9301682a8223ca376b74 SHA512 82de669fe0936c5e4f0fe7c6753a5efce2b8acf6eeffbdc3f1be3f948fd300cdbb1f6a8f5f02f1b0f6b9dcf6137176f6216b31f3ace21d169c15818f1e44a08e
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
deleted file mode 100644
index 763d47c6109a..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
+++ /dev/null
@@ -1,81 +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_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.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
index 3d502dae7f36..e0fef87bc3b6 100644
--- a/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/18" # libwebsockets.so.18
-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/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index d53b86734d28..c98b0e6fd7bb 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -4,8 +4,8 @@ DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421a
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
 EBUILD mbedtls-2.16.10.ebuild 2436 BLAKE2B 0d76524a1be47d488c732ba0a3d4ea76a5eeb915e0f83575ae498fffc5629f2b86e399e3f00ed5418fe14ca2204febcf4a23d2e9a3a5338630b9f67bc027e8cf SHA512 d54f04f7988457506fc2abe03fb8e97b6abb7555c72bc852917e33aa6ece7b291c96cb6dabd5806cd19d5407806279981e660a1ff371b37b94535d7ddfdd99cc
-EBUILD mbedtls-2.16.11.ebuild 2436 BLAKE2B 40ee40b4570fd6f9fbf80be84e522d9047e9a4817bdd829ac94ffa7c25469437cba1085217c2aa13a48f1410556c46be385ba78f6f7c9ffd4db649d8c0a086fb SHA512 e67c5d841dbf5d79cec3d7dc5c86483e610bd714452065928f2fbd8e8b7241bd2605a7c632aa21f2737cd26d349441c8a168187c656007f90b4bd9f3e9e35a29
+EBUILD mbedtls-2.16.11.ebuild 2435 BLAKE2B 8389041b06224e6244c8031c8bad2f49cad98026e1105464fd41995afcf267ec6dea95a483b40b1d379fb641399b9cc8bf396f499c7b223e37de6e21e4f3e842 SHA512 1fe3727c58052c3fa007a5e4d1966c6921d2f41e8491b7a0c5f4423e726468bdf5e37067297a4325103e13c45e1d21d855c760134743b1aac66c81b5f92649da
 EBUILD mbedtls-2.26.0.ebuild 2502 BLAKE2B 6f7f727b0466a0d091596f5c187222b095a21fa61d6b70073db7014f17539440781f70e763bf17c5451e832db6795d3289528f1cb9cec53450da120a5b5ffb0b SHA512 ffed411ce59d0476563af7393dd9733d0b44eebc7e232cc6f88b2788af4a98c7511dafb1238874fa941df57ec3de7acede0459353103973ec0ddb03274053c41
-EBUILD mbedtls-2.27.0-r1.ebuild 2504 BLAKE2B 13cad4203c46a81a46b1dc789b8780e015ada9f844341df52f751415329d7a2b62f51c3eb7a26fe936abcbd489f74f52502f8e9d00c4cf267a45852bbc48f2b6 SHA512 cd431878cf167be8f4fd89138e78411f1c9f47382bb47e4fe3993e1545682b0424063606aa4021004227fa62fdaa5f65a9b4ad3dfeed4fb0832dcf3d8f416ebf
+EBUILD mbedtls-2.27.0-r1.ebuild 2503 BLAKE2B ae8f22b9aa45cf427fc35c6c9e8664c8fb661e34a98885ecd7f5388cdeb13b6564c7714df56e6157d56b923cbc8276eeec8030d3cd2c3d50c2ee92d625ad5e96 SHA512 39e9c8221f9cfdb5709a8ad725ae551c73f42ee4e94136e244bf6d1aa0695d4b10859c6f2ca3562b66b821e5af17c69d4f8629389415c1a0a53e423d71b509ba
 EBUILD mbedtls-3.0.0.ebuild 2303 BLAKE2B fc3b11e2295fc79a2368e26c0ef0fa3a05de3e8187be3ee23a8e6ad8375ae0553559d29701bc887130928f057b99fae64bc3b897814636f134d42dbfd87a7b66 SHA512 d54986230f6e43923ef4bbf35d85bc80f65af4542e6f15f7894af0bb505778ed7cacd27a5cda4697868b43473a7572bec69fea9a8f63f73427e2a35641fce3c1
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
index cf7426c2eae3..3aaf46463bbe 100644
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
index 7a114b0708bd..7681b2953ece 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index a3bec6d984fa..05fd51de11f7 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -2,5 +2,5 @@ AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c8
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 965 BLAKE2B 153cb5df52305410c7104607117f6f54981e9cbc1cf27f70e21ac36b34c40a3a2433c62db25f6b3aa61cf9dc3606716d99067a971e7f47e07d223b1a9affb18b SHA512 c3e8440ce476933dc4acda6a5f3253157d004bb61901052b7d2011ecdd945861bf4a97e0f3ba99867753a7aabf07e42cce10fd7bd361b805fb17ac75025ea370
+EBUILD meanwhile-1.0.2-r1.ebuild 972 BLAKE2B 9ddea964c4b0b531fc74b9b869c81ec8fa6095154cd3f2d15f43c947c563bdd99590467c95be3825fa2c453827b5aac0dc1b1a3a6717030bba2b8af44305f584 SHA512 8a84387062c3ac4a19d6d6a0491f5cf0da5cd8d27ad4b4f32b1ca9bd879e82625dd9408c6a28311e974ebb43fd4e2488194445ed54ec302090abc46e810031ed
 MISC metadata.xml 246 BLAKE2B a740e9a1a3e17c2fa628a8e04b07077f2495eda755cbd903ea5934b0409f05f7297ddc90aa9693b9d7f1b7b3bbf3f2070f5e266cfbe230cf07d71749ba54df95 SHA512 9131560c103b0fbf21dae354b0a00ac68bee1b326a3e38b3c18fa7396b4369c4c29a0e550344cb219fd48c94b2d1c21b185a329c992096c0693ea2bf24aa31b2
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index ef7794fa912b..6cc8c1ac51fa 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc debug"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c1189e657004..0bb3425c4db6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -15,13 +15,15 @@ DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb
 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-v16.6.2.tar.xz 33713996 BLAKE2B a4974da7004779179bd3bb0f99bb703f789a89c3ffcf194e83ed4ad07b005cc4ff23dd16f69ed1fee5f2d142e9cd813acb9687021a8cf1a64475093928b4e107 SHA512 978fd8204f7512a42256b0b50d674280c418595970a1327f3197fcde1f8787816c243611c24cada8c979352d77452393481600b96e66c72c294bcd04cf33f45f
 EBUILD nodejs-12.22.1-r1.ebuild 6422 BLAKE2B 94ebdc2679e45c13e6423866b7f133fe908aa1158a4a14fd66a1e1eec1616006492fbc27461c3fac5058f2a2fd8d5effbdf1048270397d2ee2eba0898d4784ee SHA512 4639c682aa866f175c3834501db26881e60d2aeccb7c986f571961d96d94cffcf1872a4369a136c16d69fb6271082ad32fac4a51e62327a84fead401e62a446c
 EBUILD nodejs-12.22.3-r1.ebuild 7038 BLAKE2B 0e6083e2db08da69df4568091be662f8ef66e11aae85210a7b581185f586a0381e849e9cef7db3c3a0698b6f9a0daf7ac4fbfd9b473b73f08db559613a072ce5 SHA512 e7eef757ab711e43cc7bc988c29da7b88730bbf9f339624c1fa092ab313d5762fd597f1399b127efbe97bfecdf40e39bc24ecc960ec83e274556177e4184588d
-EBUILD nodejs-12.22.5-r1.ebuild 7139 BLAKE2B 799386c24e9a9e6374d27467a24004ba7b75822b7dd8b98ebff460788bcd992d11f0d40b1733dd9586881bebd71a442c77ff5a3ada8eeb4d4ae180d39186746c SHA512 afc5134414c3633f71c023914dbb94feabb58c1f3145d0475f628302fea9104910c31e73d34de596a30f594413780bbe072ad17432fbecb9649751295a751d53
+EBUILD nodejs-12.22.5-r1.ebuild 7135 BLAKE2B 1d83560697f1b18c5df3030b9f3160d05cc0164cc1d1e05bfac4300538f35ad0c75f9b58049f75dddee651a9e8ff46a13996d829b5cf90111592c010e3c447fb SHA512 415964c4aca0b2546755c5f3aaaa8f840ec3092e7346794233fc1a60b23bcb5697085877868d65d36da70672177a5316e48dd053d171457c8d30d7bf2737c6de
 EBUILD nodejs-14.16.1-r1.ebuild 6119 BLAKE2B 41ba4ef9e92d29879c15307a37b716366522aeba83e42e147c9cfd0040c4c679d6567d9317185581cb00b3fd50a9b7a5463a9e837c020388c7c2f1b436b60d26 SHA512 da0fa713cc03fbb30261524eb99e342d622f8b081d6265680ae444109e7ff9593302b294fc4a1f59cb6fe24bf4b2a88211dcfe0cda9c0970b138eb9eae9bd336
 EBUILD nodejs-14.17.3-r1.ebuild 7032 BLAKE2B 65facf1b4dcbb3b158020702fcad525dd936fefea3e64112a5325a84a9c120fb47a3b4fd7b08a6a8c9645d043df0c306941208fcbab7a6a6f097c75decbb0f85 SHA512 3b13c0559bb723705b5e6392119e36c0ff8cc91aa397a42b30000000ce6b997377b142b46ab817fccdef3d1a1052f2dcf399d3c2e88946b01dd717275d9d1640
-EBUILD nodejs-14.17.5-r1.ebuild 7178 BLAKE2B e53fa59e142c9c4e7764466ad3ef783298841c5007009ca3c767f8370a39a3e715b1604b35f5b3dc79094f35ba2eb57d587f48b3097dd1792fa386e44a3ddfec SHA512 9e428c7d7c87bb1dd72c11e0c36ddb2d4c4bfe892fd57179ef0b28e82386f49f4f5ff32d20565beeceb852cb021c69c4f3d3343de2589a23644aa0c8844f9d0b
+EBUILD nodejs-14.17.5-r1.ebuild 7174 BLAKE2B ade6eebc522024960fb6ffad54ac0035f52692e3a6ea5b9a685f6164e53a81ee8eb8f115377b7e459f50eaea101f419bfc038b183784fe2877fd83e9e960da95 SHA512 c0bff9a4bbb32bbd2e832bf1b30966f7c0433a34ad3cdb83d874bcd7fdcedfda85618c50321336eac7a53f939a2ce12c944cc208c47b44ed8f1d22ffd5b8835b
+EBUILD nodejs-14.17.6.ebuild 7178 BLAKE2B e53fa59e142c9c4e7764466ad3ef783298841c5007009ca3c767f8370a39a3e715b1604b35f5b3dc79094f35ba2eb57d587f48b3097dd1792fa386e44a3ddfec SHA512 9e428c7d7c87bb1dd72c11e0c36ddb2d4c4bfe892fd57179ef0b28e82386f49f4f5ff32d20565beeceb852cb021c69c4f3d3343de2589a23644aa0c8844f9d0b
 EBUILD nodejs-16.6.2-r1.ebuild 6604 BLAKE2B 6998b4499705dbdaba2a2a14545fcb5c9ead195811419516f7fbaa0f686bd11f0b7448a526442fb2c892f886722b04c95150ae2626f44263ece10af51787447e SHA512 867da8350e320a2ab214e0c23e65b5c1b513ebfdce55d93f5309fdb8410ef870af9ccbb5cf17a1e6fcd8f086bc37217f7bb5bddfe517cc53bf762f04583cb88e
 EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
 MISC metadata.xml 821 BLAKE2B 960884e07436d0c59691c49505dd89f486165dad1b6f013820a12186df25d3f9a2a3a7bace0a382126a67bb51314350166e2eb907bddce4a8ff49d95c7af5f0a SHA512 88d9bd1cd3f6bb90e5d861dffcc8f5edb3582c61d4f3d407a76bb808b9a9b59ce72ce903d57b291b8585e72cf3ab91700272ec507131fca7ef32951613be3227
diff --git a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild b/net-libs/nodejs/nodejs-12.22.5-r1.ebuild
index ec373926c7ba..5c12aa1a8690 100644
--- a/net-libs/nodejs/nodejs-12.22.5-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.5-r1.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 ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild b/net-libs/nodejs/nodejs-14.17.5-r1.ebuild
index db0eeada2103..07bb48eee028 100644
--- a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.5-r1.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 ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-14.17.6.ebuild b/net-libs/nodejs/nodejs-14.17.6.ebuild
new file mode 100644
index 000000000000..db0eeada2103
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.17.6.ebuild
@@ -0,0 +1,243 @@
+# 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 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index a060537f7c50..e6dd54cfe2fb 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -255,6 +255,7 @@ EBUILD quiche-0.6.0.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5
 EBUILD quiche-0.7.0.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
 EBUILD quiche-0.8.0.ebuild 4382 BLAKE2B 19ee870e1c820181ef5387a45b0f30d3d09c00ac4b86081f9d36caf924151766403df2cf56725a1b0c8e5313f3f8b555788b03b620d612f8002a48681ce95caa SHA512 b4af57d07c4a61a53b3dd94e74aac1c57bd5466bcedcdcb848dbfdb9d00aed1750042c39199e66c48cfef2577a19d430aa669878352badb3966d500473fee7bd
 EBUILD quiche-0.8.1.ebuild 4382 BLAKE2B 19ee870e1c820181ef5387a45b0f30d3d09c00ac4b86081f9d36caf924151766403df2cf56725a1b0c8e5313f3f8b555788b03b620d612f8002a48681ce95caa SHA512 b4af57d07c4a61a53b3dd94e74aac1c57bd5466bcedcdcb848dbfdb9d00aed1750042c39199e66c48cfef2577a19d430aa669878352badb3966d500473fee7bd
+EBUILD quiche-0.9.0-r1.ebuild 4385 BLAKE2B 1c130db59001681420c487d090436dcdc195010c27f1ad9a1cab4abdcbcf37a2d8aae42a28ef9df5aa984b6ddb445c5b6b3b880caee86f77a4014a7fe33f233b SHA512 42624f53406d711dfe664d9aabffa36dc997f0ddc7b18aa5b77802633fa4b92c9bd76ba0ef767c2d6851b78adf8df9a1626e4b24fed1bd13a332102f9c12e847
 EBUILD quiche-0.9.0.ebuild 4382 BLAKE2B 3a141bc2feec3f91f285bd147d45caf69b9918b39000585a190bd5aa004717f67ace69bb06af6ff969eb4d630af0dafd6f12b59783c7a40f9bf8a45a6c5c63d2 SHA512 9dfa1b5aa63d91b353879a9e291024bf5132f462e0b4c2e8b4b97c99691a07c77df4791f325f4c705f4e469ed6bec6be3e1a634e5fdeeb5c51c2cceaf0349b9e
-EBUILD quiche-9999.ebuild 4382 BLAKE2B 3a141bc2feec3f91f285bd147d45caf69b9918b39000585a190bd5aa004717f67ace69bb06af6ff969eb4d630af0dafd6f12b59783c7a40f9bf8a45a6c5c63d2 SHA512 9dfa1b5aa63d91b353879a9e291024bf5132f462e0b4c2e8b4b97c99691a07c77df4791f325f4c705f4e469ed6bec6be3e1a634e5fdeeb5c51c2cceaf0349b9e
+EBUILD quiche-9999.ebuild 4385 BLAKE2B 1c130db59001681420c487d090436dcdc195010c27f1ad9a1cab4abdcbcf37a2d8aae42a28ef9df5aa984b6ddb445c5b6b3b880caee86f77a4014a7fe33f233b SHA512 42624f53406d711dfe664d9aabffa36dc997f0ddc7b18aa5b77802633fa4b92c9bd76ba0ef767c2d6851b78adf8df9a1626e4b24fed1bd13a332102f9c12e847
 MISC metadata.xml 330 BLAKE2B e12c1bf76513869cc73d66a8961ad15bf1776b21d83c772d7478f0c383fa7b4fa7e64558514c922f8c358c78d165899fb5a051281e78d90a330769bf52d32673 SHA512 b41d3bd1bccdce6aaf16d55cef25b2b5232068bfc9c633edf8cf23f95a06dd99de59e2353c700d3ad46085d4e5ec220960bec91fcac674b92200f342d7eb6d29
diff --git a/net-libs/quiche/quiche-0.9.0-r1.ebuild b/net-libs/quiche/quiche-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e3b15c8690e5
--- /dev/null
+++ b/net-libs/quiche/quiche-0.9.0-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.57.0
+bitflags-1.2.1
+boring-sys-1.1.1
+bstr-0.2.12
+bumpalo-3.7.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.68
+cexpr-0.4.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.2.0
+clap-2.33.3
+cmake-0.1.45
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.13.0
+darling_core-0.13.0
+darling_macro-0.13.0
+env_logger-0.8.3
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.9.1
+hermit-abi-0.1.18
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+js-sys-0.3.51
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.95
+libloading-0.7.0
+libm-0.2.1
+log-0.4.14
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.4.0
+memoffset-0.5.3
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-5.1.2
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.6.2
+once_cell-1.7.2
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.27
+qlog-0.4.0
+quote-1.0.9
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.5.4
+regex-automata-0.1.9
+regex-syntax-0.6.25
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.5
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+serde_with-1.9.2
+serde_with_macros-1.4.2
+shlex-0.1.1
+slab-0.4.3
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.72
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.2
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.1
+wasm-bindgen-0.2.74
+wasm-bindgen-backend-0.2.74
+wasm-bindgen-macro-0.2.74
+wasm-bindgen-macro-support-0.2.74
+wasm-bindgen-shared-0.2.74
+wasm-bindgen-webidl-0.2.74
+web-sys-0.3.51
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+BUILD_DIR="${WORKDIR}/${P}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index d2759feb7f7f..e3b15c8690e5 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 ws2_32-sys-0.2.1
 "
 
-inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -172,6 +172,7 @@ DEPEND=""
 RDEPEND=""
 
 CMAKE_USE_DIR="${S}/deps/boringssl"
+BUILD_DIR="${WORKDIR}/${P}"
 
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
@@ -185,7 +186,7 @@ src_unpack() {
 
 src_prepare() {
 	default
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	multilib_copy_sources
 }
 
@@ -195,11 +196,11 @@ multilib_src_configure() {
 		-DOPENSSL_NO_ASM=ON
 		-DBUILD_SHARED_LIBS=OFF
 	)
-	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
 }
 
 multilib_src_compile() {
-	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
 	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
 }
 
@@ -215,5 +216,4 @@ multilib_src_install() {
 	dolib.so "target/$(rust_abi)/release/libquiche.so"
 	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
 	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
-
 }
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 16c90faf1808..9b3eee87fc6d 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 1454 BLAKE2B 702a7464ee718d8d01d43db053607e3446c657edc9da809371e94e825e407600e2bea0ca76adc70998174ffbd97ed1c89c849212df51830cad1085586139d8c0 SHA512 836c50e0375357868eecf57ab46933fa975888c34cf362528651f0149e0f9f1ccb88538b845db7b0622a0766551d33e8ecc300d4d073474fd39d019453e1e448
+EBUILD zeromq-4.3.4-r1.ebuild 1460 BLAKE2B e410de28a77238db473402987be9933734ac53f546e31563b6d0a71f36077f2a3c412d821f592fa6e2e1dd25c4bd41f5b7b6e8161cc6a30ef330bf318c8dbea1 SHA512 14f6acb5f89ba1b37949eb43b84598bbdbe9c024ec294524e090f91e186a25c09eee1f33e2464dce9e41fdbfaba81952e35448ebc3be61a1a2b555c193c77e57
 MISC metadata.xml 1624 BLAKE2B 7b976e279cfe109beb64a36ac3469bdbbad43efc7100f1d8d4322b0cab0ddb6921fe8457cec260e36b6830c6e8b4b070dc49c30cffa6597895d4fb87a3927b06 SHA512 9b970662649051cc83c5d2e483a344f377eeca2f0fa7bea7200af26fa35aa6cf88ac64875ed87e92a64cd06269fc09c449b45a3d388a58ce24ec02b29326c4cf
diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index b3eb74931084..e2cfe7b05891 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 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@redcorelinux.org>	2021-09-10 04:21:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
commit	677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree	6c418a1546fff5becab5d8b9ed6803323e7f316e /net-libs
parent	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)