gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
238 files changed, 2948 insertions, 3466 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index de86cdba55e6..8e0334a05a04 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
index d02cfc6044fd..6af686afd31f 100644
--- a/net-libs/NativeThread/Manifest
+++ b/net-libs/NativeThread/Manifest
@@ -1,4 +1,4 @@
 AUX NativeThread-0_pre20190914-javah.patch 625 BLAKE2B af0d85e2b477e40c396313e779034c5bed20b42db50a936c473ad4cf15402ed7033c21db5435a44c8d6da67908121408bb18f062d2c321a0ee02cdbb7acb4460 SHA512 51bfb693850da086a118e4bb34da36856be13556bdf15f5374bb4df758e7479fe7988d36c02d8058eac40bbd59daec506fbb08cba270fb942c554b449c6f11af
 DIST NativeThread-0_pre20190914.tar.bz2 3163 BLAKE2B b16aa3ceb3ea18ea13962e53d68fa2eac1854b9141055de251eedf0c9a2cc284e68f3f2601f49d1ac1d7fcef9fc502bf1877161fdb43b1b941a3b9983829e4a9 SHA512 ff0902b874c72f0e15f35374d0a409271ba236343cf24bc708bc7a72677a9a582013bfb7a1e8fdd2aabb741bb5dc04dc901ff4c09841a85324194644d40c58e6
-EBUILD NativeThread-0_pre20190914-r1.ebuild 701 BLAKE2B 8c117e7943927b29a3ed6ce5bae28780e10c05cfea789578e0a5e4a37c8005dc426521423988cf035ab2aa9e1faddaa8ccdb5d39ef276d3f9071179c0ca0039b SHA512 d92a5337928cc60894c31b111759dc22e825895aec0e3932213c63c2483a922ffd0389d97902ad44b313446d01ed6f281a64f2c09d7591b62d381d4e557b85eb
+EBUILD NativeThread-0_pre20190914-r1.ebuild 706 BLAKE2B 8bf89952f76a2fa6794153f5757b93c31d5087ea55b3cb0109acecdaf58dce7b6ee0d01f01924c643999ed67e688cc7767beb87e581e76291d3472dd067aee54 SHA512 48f8bc5f49af068171e8d8c7c8da1de772a4608248f108d40f8d1131245266ff901e4490b581ba1b81b0f338eefabb8a4f86b6597282006ab774c34470859b6d
 MISC metadata.xml 257 BLAKE2B 1855912d4ff784d04c925a67130a53838386bd4c491e5c5cf4f218c2a79b538cd9d0d2c79c124832707abeeeee027d6d7a93f1d057e3262e1890084453e2b9af SHA512 dfb4a09792ec2d2b185d1131473c28493b9a3e28aa41f5cbc91354c793c3cc11c763886115037257651f3d6689436396840b2d252a311f318901c94dccec4b9d
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
index b1073f7e8a3f..dd4f4037f848 100644
--- a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
+++ b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 CDEPEND="
 	dev-java/jna:4
diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 1abf483b6495..168da047ba21 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,4 +1,4 @@
 AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r1.ebuild 964 BLAKE2B fad65f0e8b4db9fa4d8d8421be22cf54c6de970f9c857a30f6b95005958d6ccf40afd47720405048f37314cdb86cdc59b8e40e167b606d35ca77d0dfd2e003b2 SHA512 813075ed4eece5e181c007f7747a52f417a557bb3a9e7b499490c91605b6922714e29830325b822f0b87a0578c920332ef8015681940815a2bd4b7f0287a8ca1
+EBUILD accounts-qml-0.7-r1.ebuild 971 BLAKE2B 25c8e54d5a5bdf0d24ffd4fbd2663bef48d57e1d5bc44f3834aa9de5eca7e86bb49f838dc6ced1278ea8707513564fa32d4d1a41e12467d849481a0c7395953f SHA512 65adb21f20fe7f72e6985f8d5ce57fa913591c23b6a13fa225b47b72ea9093126af556c3cce29ac305de6b9a7fd4fe6ddbe902cc7f7291c5f59ee4fc863f6301
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index f00fa00de713..2e93ec2c43fd 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index 71c3ddaed2f2..9aed30c1580b 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
 DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b
-EBUILD accounts-qt-1.16.ebuild 1119 BLAKE2B 2bbbf245669412be2494faddf8882272e7522e1861cf9f4682b29de0dc82eeefcad786391bf9afcd161f565d84e4224e0d1af04b37fe65b63a5eb853caf1b411 SHA512 73dab79bc104c7f02c20788654ab1b0de2f789b9951b320be5ed30a2975c8253abbccde32d0544a4e1c1c4de980db95396423d41d829f536dc6bdad5e1042267
+EBUILD accounts-qt-1.16.ebuild 1126 BLAKE2B e6023be926a518f7fcb421d872b263f3ac43c43168760d59d3fbf6c971dbe8329460761b87066daab4064dc812fde0263771aad0e5b9c0193297c30a133482f3 SHA512 291f18e993420b0a909c21a9db92ff1274e109f2c6b04e3a1e24955aa9653da6297ef410925d340aaabbdd3c032b8e615e40df4d23d260f265ba2a50e7017130
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/accounts-qt/accounts-qt-1.16.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
index c9337927d70c..8f7734ee51e9 100644
--- a/net-libs/accounts-qt/accounts-qt-1.16.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 # dbus problems
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a6a3f8e6a7ab..6f8438bce22b 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,3 @@
-DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
 DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
-EBUILD glib-networking-2.70.1.ebuild 1983 BLAKE2B dea87eb33410d28f6929d8b84babee64927c526afbe96f16e9d004389ee7527b8a2d773485c6077b1597b9df627beca6e3e722634ce42a2ecc9a87539d9ff2b1 SHA512 6767aad2c2bdf36daff61daeaa5f7c23a94af2c977e1d55e0191b00bc99fc857a2d5ac3e1b47d231f512671bad143047c39709c9e534982faaf4f1628e32a72a
-EBUILD glib-networking-2.72.0-r1.ebuild 2004 BLAKE2B 2db675d3a69088fed74b8d9d01af665c44ad6adc335146982c3c9d3f15deb3aa765a618ed40549cbd66f6890a00927ea8308cb7ab1a82515c43a747a1e4c1f7c SHA512 c03377913e9cf75ca45f8ad648316812477a217a8d089f6fc62fad451bd65462b1eccaa6d17a3eec15fbb3b386c3e4ece1053afb405f5c2432d23e8b08149fec
+EBUILD glib-networking-2.72.0-r1.ebuild 2004 BLAKE2B 7940597d2b326c67ce959273b033da365eb5f46825e837b02104947ec7557cd578b7b38605c495ed9fb89f8f0f827a64638a8f48846ae66965b61fb1dee9e470 SHA512 afdd73225c34ee65730ef93815a45de4787c8d42fab4212d4f24612c5935a43dd4980e421a6563efdd02b8089c737b507b43eaad30c98ef787b15a41a58401ec
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.70.1.ebuild b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
deleted file mode 100644
index 6c14700027ed..000000000000
--- a/net-libs/glib-networking/glib-networking-2.70.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/gnutls[pkcs11] )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-src_prepare() {
-	xdg_src_prepare
-
-	if ! use test ; then
-		# Don't build tests unconditionally
-		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
-		# It may become a real runtime dependency in future
-		# Please check!
-		# bug #777462
-		sed -i "/^subdir('tls\/tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgnutls=enabled
-		-Dopenssl=disabled
-		$(meson_feature libproxy)
-		$(meson_feature gnome gnome_proxy)
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
index 845eea9072fe..d5891f0bed16 100644
--- a/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index ee928655eef4..d2b94110bde8 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,7 +1,10 @@
 AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-bashism-configure.patch 529 BLAKE2B eef0f671386ae33a81c0ae667330a9432cdf1351c5d71d07dd244f9e21d3da7f7c4d4cf9ef748d039ba2845bb2b7b4784b759c3ceacf0faa7fad0b1de95d3753 SHA512 6c9aea8282d30637cdc3f9cb01ee7d1b0578ded4316129ec141e8b6207ae12c0b4b123f8a5ac73a24a23375c70345e9fd95e30690ada2d3175a6113a387637f6
+AUX gloox-1.0.24-fix-gcc12-time.patch 483 BLAKE2B 96149086b679aa2be6bee8a854b14e50e618334dad26a22c6c20deb507e6f5fa695e7baf87f226be767eecd36a3d8bee5f9eb523a201bad12a5eb92fc78fec9f SHA512 0d54a8956a46d34de1efeb26b42662db095059d87e39e177560753f1971f3816442ac884a6699cab05ba0ee12bfac2395d812d46b471cd01b91aff1d05c72877
 AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 AUX gloox-1.0.24-pthread-link.patch 566 BLAKE2B 50437d74410f7f6992b3d2a191fe51ebb0346dfe0d36d2d8aa77404e132a9ced7bff3b680fb11ec697a8d4fab5c9f74c15cfd5322a0d6b84ea56afd371e1d936 SHA512 c1f1c0e52bc765c263e31b0c533ccae78184c418720b74541555b52e12c5283d691330f912aeed143e871313bfb6b3f725ee4258cfce6e5a3bc3f561ff9299a3
 AUX gloox-1.0.24-slibtool.patch 503 BLAKE2B c760faea8d4aaa9adb3d70494b55a0a327456f8976f8c017dd3326cde93147f126d9e53390e9b47c0555ae9a8a7bd0259cff8b0e86b4f845aef99222bf3c001e SHA512 bede6b41aa5695de8d7caff391eda0c75a2fbeffd0d3bc2a8e0cb943123283fca7519d4406c3d5f5db1585976dd84d2023554c7f5a42c74683fb38336d1f3904
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
+EBUILD gloox-1.0.24-r1.ebuild 1459 BLAKE2B 87776f7fba6cf508b46b5489dc5a98375b0e81553e51e14227e046fa038c5fa2de5c8c14a0985234b79134d91da8d326b56c73e39b1a616e6851519ceecd5129 SHA512 dfc20149ab7c496e6a644727913102142a744e3629cd8a5033d78ed5cdd4a566f78cd3d9a8d0cc4337776d14f4d837b9c9684a63e551b118aa4c39b2bd087bdb
 EBUILD gloox-1.0.24.ebuild 1356 BLAKE2B f715cda112cf9a07be23d75f8a67c650c8ff181dae24c69143e2cfa033d575933657d46e4a119ed66b3a3396329f3d1dfe9f2ee58a0c905978963a17113f9004 SHA512 ae0b80b556a8aba9d1c75964b5ca5e23c7f6110d6cd289a8d0e53c1c41dadeb0b3b42778b0dc40a14ca4913e6626642df670b89792f9eb8a974bb813af9731d4
 MISC metadata.xml 254 BLAKE2B 6df9f9f117e6404d21549d2fcf1c42687a10067493455f5fae06939105c6907689c41ae0eb2adabadf662c22c40c0755624bbb3ea042794f9f197024ff3554ec SHA512 2f0148fc50acb99e01438869f0e7792a9d6b7b9591371d882592c372a4eeebff00c9410829006093ccb73fd00fefc0db4b7521975d41d86481aaa111e69e9711
diff --git a/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
new file mode 100644
index 000000000000..a9e09f113bcc
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ if test -z "`${CC} check_atomicbuiltins.c -o check_atomicbuiltins 2>&1`" ; then
+ 	HAVE_GCC_ATOMIC_BUILTINS=yes
+ 	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, [Define to 1 if GCC atomic builtins are available])
+ 	AC_MSG_RESULT([yes])
+-	if test $cross_compiling == "yes"; then
++	if test $cross_compiling = "yes"; then
+ 		# Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
+ 		#  unless -lgcc and -lgcc_s are explicitly included.
+ 		# (Errors like
diff --git a/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
new file mode 100644
index 000000000000..dc0c4cd1aced
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/852182
+--- a/src/tests/tag/tag_perf.cpp
++++ b/src/tests/tag/tag_perf.cpp
+@@ -20,6 +20,7 @@ using namespace gloox;
+ #include <cstdlib>
+ #include <string>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #include <sys/time.h>
+ 
+--- a/src/tests/zlib/zlib_perf.cpp
++++ b/src/tests/zlib/zlib_perf.cpp
+@@ -24,6 +24,7 @@ using namespace gloox;
+ #include <string>
+ #include <sys/time.h>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #ifdef HAVE_ZLIB
+ 
diff --git a/net-libs/gloox/gloox-1.0.24-r1.ebuild b/net-libs/gloox/gloox-1.0.24-r1.ebuild
new file mode 100644
index 000000000000..4cef23c79743
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
+	"${FILESDIR}/${PN}-1.0.24-pthread-link.patch"
+	"${FILESDIR}/${PN}-1.0.24-bashism-configure.patch"
+	"${FILESDIR}/${PN}-1.0.24-fix-gcc12-time.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Examples are not installed anyway, so - why should we build them?
+	local myeconfargs=(
+		--without-examples
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index eeed4ab152d7..1ac2058925d3 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
 DIST gnome-online-accounts-3.44.0.tar.xz 859564 BLAKE2B 6131094df19d5f282491bd19a97f6e0248b10a5c4db19962a6804523101fb86d6bed7523b46cef91328e0f3c7b6496068594de0689ab1fcb63fd8fb80eece49c SHA512 e70a83b557b816dc7eb22bcd1e4a263044a16c981dfa945a529250ea76e743c9cc73f2ecd4f3006d28a4f3161c7a15dba8bd1416b413c28f4d86d0192755e809
-EBUILD gnome-online-accounts-3.40.1.ebuild 2121 BLAKE2B 3fb1d323c8897a2ca8ceb11e976b7a4a801dcb2d4e7f6c8b6f0155aadaef8efa3c912c948c85911a58ba1471b45fec60ecfbe9fb987050a01f355447b3a8c6c7 SHA512 a3a5aff663fa2c12bd615be67442b9b87b7bc3858f1d7fb5352e6ced75e75b1e2d51c27b1e2a9fe3a73cb210066d5a77fc44103f3e98f2c9cae8fab6716da29c
-EBUILD gnome-online-accounts-3.44.0.ebuild 2092 BLAKE2B 6b7450f2fd792d69b8f5edfa687d9c5df3420616cd9f8fa34b0fa9729b2c142d759518b41686083d1e105c16124ccf57661ca76d2ad11341368dcdbed3d00d71 SHA512 68558763f7670f6d632f7ba223ae73cb9a2e22e77631ca3102bad3dd09d0c1972bac43f2c7da942d74b1f413f650d43ff3828ff72b584750188464b93001e7b2
+EBUILD gnome-online-accounts-3.44.0.ebuild 2089 BLAKE2B 38bb7a0c89c92f4c0ef00b0cb4d935219c59c7b8ccd1681d5140f685a5cb93c1ece18ce0f1a2dec39220797b348ac255a0d70aaf7aa20aeac3096e949e622aa4 SHA512 68e5a9f935256c35dc3bf6c8cc66e0866e850a9125653faa78c1ced29f616096b0809118f7d0b0e72958c8f25a61a84ba32c430c93c9e38fa85317c8f5dfe833
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
deleted file mode 100644
index 1bb0801290c0..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.26.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5
-	)
-"
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-
-	# CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
-	# Can be removed in future.
-	CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable kerberos fedora) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
index 433f793133ef..dbe8f1387ab6 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 19a6a4e6fb8e..5bef814448dc 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,4 @@
-AUX gnutls-3.7.4-configure-compression.patch 2329 BLAKE2B f013a14ec2c7aba5cb44e2701a6b38dbb4d74cacd2cf11170309a46ca3ae293856fe0e24d94482f07a0c7eb944597af1a99874143703f4fbf513d86be6ed4a54 SHA512 4ddca96da259f79032538bcd673bd4b59c23737c227b245974423ee12a91969c2c9151432b43302378e5b136cf00891e52f6f8806494d0da51a512569706f732
-DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
-DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077
-DIST gnutls-3.7.4.tar.xz 6131772 BLAKE2B 1c44528952275f48e4e458558c4e03c5b90dfb267482d6815f6c836f9530abb486a23ae5ea70ba2db7e272eee8e2066b259374f02a9bb9e714487466fd5994c9 SHA512 38b488ca1223d9aa8fc25756df08db6f29aaf76fb5816fdeaa14bd89fb431a2e1c495fefc64094f726337d5b89e198146ec7dc22e9a1bca6841a9d881b0d99e6
-DIST gnutls-3.7.4.tar.xz.sig 685 BLAKE2B ad485450abb916a229984f8f0d74fe7c46a0a87627f9d739f8121dccf36f4ca454007178f2a4e9bd5fffa2813363481bf80eaeee40f86e1b9c23b1f25dff7b4c SHA512 74b8badd67e215313583bd25c7b639207860af45d6f5cbcb81f1aaf46dacf0992b6d06876979594688e13dac5b8b27ba39935626374b4ddaa3e48118bbc2e7de
-EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
-EBUILD gnutls-3.7.3-r1.ebuild 3965 BLAKE2B 48d0af29dac2cee589c5f9d4eaf26d6d893ba22b5d728f2607bf3ed8e6b1fc599770bc2f80769a3ea2157506ce45544736f0a39311101f8d70e5df5ba6415aac SHA512 e0f44b598b79ef25fa738dc2b1f68cec1fe88475f4704bea9a838a4c5ca7d19f58ceb67e979eaf3a506e7d5695a6aa21dd73179c613b13e64798784b48c66d9e
-EBUILD gnutls-3.7.4.ebuild 5040 BLAKE2B 11aedfc4a6fc9e51c2521e42a78ac54adb52a4d95d4d3f0620de82194e03c56f23e8959f1bcc63fd2973892bf5e91e5c04ab64cb89fe734b23ffd163c09bdf34 SHA512 481416e643c536d1febbc29294cad4f6eb0f098469c6086fb1006e98d29cb74b61ef7aa409e9414a7befcea8f9630828c52ee4ab77a5d72355eff791201240c6
+DIST gnutls-3.7.6.tar.xz 6338276 BLAKE2B 9f3cce8dfc0b88f2c42d1d2633417dac649a265407b620b6d15967e5210debb99d287ef31d2b9dc37a527ac1e5b9db4c240b98a63293078fbd2e26ac694bf3d3 SHA512 f872339df80ec31d292821ff00eaafbe50e0bd4cdbb86e21e4f78541cd0a26d843596d5e69c91de4db8ce7d027fc639ae6462b57d89fb116162ae63c5a97486a
+DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd19d6f794a1c3e0f8c3c1232a8a1b91269ca7252a5662782183b11ca393c31efe3f88171a526884400fd0534528 SHA512 c969da9a938b9d29a70cea3b00cce337f9a4c4304aae7f501ef6263894f81a420395ddbe1b005f35dff2e900d3fac75e288f10bbfde0ebea034f7e257bb16d0e
+EBUILD gnutls-3.7.6.ebuild 4767 BLAKE2B 06efaab9ed7e1fac0b84daf3c4c2574ec727e4dc4c3a8a1285db286d5e47e094f5ce22f57753362b9565bfd0b75a63cddffc7257127aeab6663bd75cbf4917e2 SHA512 2e882b0a30a000abbe1297ef1d48239ee59c7a97782d085418d39fa7ebab33fb2035e12aa555da57ce251399b0289ed8c3555b849e5b0e0ddbbb85bf597691bd
 MISC metadata.xml 1369 BLAKE2B 586c5d851b4188a27db257e76ac6676e4f90b932e719f12be0d02c891cd943108a1747cfb572c56bad2489b8dbbe40c5ca6aa72d704e3d4445dad7419e0944ff SHA512 4bc3e4f0e896f75ef489922c9e3d7e43e485fa3b8498c5fe393c28f88c3754b116d5bdb152163cc987c28e168a3b5b9a7213990053e4ba9c80686f71aa655fc5
diff --git a/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch b/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch
deleted file mode 100644
index edd688d9b58a..000000000000
--- a/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://gitlab.com/gnutls/gnutls/-/merge_requests/1557
-
-From: Sam James <sam@gentoo.org>
-Date: Fri, 18 Mar 2022 05:40:28 +0000
-Subject: [PATCH 1/2] configure.ac: fix brotli/zstd configure argument name
-
-The old `./configure` arguments for brotli and zstd respectively
-were inconsistent with the `./configure --help` output.
-
-Old: --without-libbrotli --without-libzstd (also --with-*)
-New: --without-brotli --without-zstd (also --with-*)
-
-Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1342
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1010,7 +1010,7 @@ if test x$ac_zlib != xno; then
- fi
- AC_SUBST(LIBZ_PC)
- 
--AC_ARG_WITH(libbrotli,
-+AC_ARG_WITH(brotli,
- 	    AS_HELP_STRING([--without-brotli], [disable brotli compression support]),
- 	    ac_brotli=$withval, ac_brotli=yes)
- AC_MSG_CHECKING([whether to include brotli compression support])
-@@ -1033,7 +1033,7 @@ else
- fi
- AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no")
- 
--AC_ARG_WITH(libzstd,
-+AC_ARG_WITH(zstd,
- 	    AS_HELP_STRING([--without-zstd], [disable zstd compression support]),
- 	    ac_zstd=$withval, ac_zstd=yes)
- AC_MSG_CHECKING([whether to include zstd compression support])
-GitLab
-
-From: Sam James <sam@gentoo.org>
-Date: Fri, 18 Mar 2022 05:51:29 +0000
-Subject: [PATCH 2/2] configure.ac: fix zstd detection
-
-Fixes typo in zstd detection.
-
-None of the used autoconf macros will define `has_zstd_h` so
-configure will (AFAICT) always fail to find zstd, even if it succeeded
-via pkg-config moments before.
-
-Drop it and rely solely on pkg-config as that's the only search
-we're actually doing.
-
-Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1343
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1040,7 +1040,7 @@ AC_MSG_CHECKING([whether to include zstd compression support])
- if test x$ac_zstd != xno; then
-     AC_MSG_RESULT(yes)
-     PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no])
--    if test "${with_libzstd}" = "yes" && test "${has_zstd_h}" = "yes"; then
-+    if test "${with_libzstd}" = "yes"; then
- 	AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.])
- 	if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
- 	    GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd"
-GitLab
diff --git a/net-libs/gnutls/gnutls-3.7.2.ebuild b/net-libs/gnutls/gnutls-3.7.2.ebuild
deleted file mode 100644
index 5448b73bad2e..000000000000
--- a/net-libs/gnutls/gnutls-3.7.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-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"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.7.3-r1.ebuild b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
deleted file mode 100644
index 3781157905b2..000000000000
--- a/net-libs/gnutls/gnutls-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-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 ~loong ~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="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.7.4.ebuild b/net-libs/gnutls/gnutls-3.7.6.ebuild
index 6eaf9997a965..15710987c244 100644
--- a/net-libs/gnutls/gnutls-3.7.4.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
-inherit autotools multilib-minimal verify-sig
+inherit libtool multilib-minimal verify-sig
 
 DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
 HOMEPAGE="https://www.gnutls.org/"
@@ -12,10 +12,8 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-# Drop keywords while figuring out what to do (if anything) about USE=cxx ABI break
-# https://gitlab.com/gnutls/gnutls/-/commit/f746f7d4be0070395834bef8e7f7b6f9c8d3158b
-#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"
+SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
@@ -56,10 +54,6 @@ DOCS=( README.md doc/certtool.cfg )
 
 HTML_DOCS=()
 
-PATCHES=(
-	"${FILESDIR}"/${P}-configure-compression.patch
-)
-
 pkg_setup() {
 	# bug #520818
 	export TZ=UTC
@@ -78,16 +72,7 @@ src_prepare() {
 	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
 
 	# Use sane .so versioning on FreeBSD.
-	#elibtoolize
-
-	# Need eautoreconf for:
-	# 1) gtk-doc macro fix
-	#    (once fixed, we can drop unconditional gtk-doc-am BDEPEND too)
-	#    see https://gitlab.com/gnutls/gnutls/-/issues/1341
-	#
-	# 2) configure fixes for brotli, zstd
-	#    see https://gitlab.com/gnutls/gnutls/-/issues/1343
-	eautoreconf
+	elibtoolize
 }
 
 multilib_src_configure() {
@@ -110,6 +95,11 @@ multilib_src_configure() {
 	# Cygwin as does not understand these asm files at all
 	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
 
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
 	local myeconfargs=(
 		$(multilib_native_enable manpages)
 		$(multilib_native_use_enable doc gtk-doc)
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index e0266a9d485b..c7710cdbe1dc 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -4,4 +4,4 @@ DIST gsoap_2.8.106.zip 32740371 BLAKE2B b4904290ec5d8ebfc326bfd8d2c99e68c88cc9a0
 DIST gsoap_2.8.114.zip 34599617 BLAKE2B fe68b057fa288b033f068be33e3f8871af8daf812d77a2fc87399f6750a4a8e23cb323dade3385c9b2147b2cde46980e9c52d393eff6eb16fa52cdbcc7a62537 SHA512 205d38a36c56780fd34bad8ea56525a04d4dc5b58af55676783c78d6eecf47dd0e9c86b0106f68127cfb2f45cb94f6ac9ebe353d1c6687e9faa13badb4a9690a
 EBUILD gsoap-2.8.106.ebuild 1567 BLAKE2B 2634d2fa26e1b4d1f6334d6a27b0d4145d95f987e0393f9d5cdb5baa57261b1e1491d270fffd99c0f3f738d81ec553a139346675471f841fa44dfbc13d9487ed SHA512 d6fe8c7a44e8fa0fbed0a11e442746d06664755e37ad35bae6774fd4ce989aa64706fd83ea173f399eb91028d0ac96949402e09c8fb964db15092a50e82d8246
 EBUILD gsoap-2.8.114.ebuild 1569 BLAKE2B 7e7b8d3180e43758f1db0da18456245a1a4cab160fcd12246c23325800f9ee1e8bf543b074bbed6fbd713837fc117e201e02d8072a12cda29ec00b44c5fb98cb SHA512 8e451afb8313291f37c5a657edcc6b1b15d35af6f1ae2a7d1645eddd5d04d7974facc47eb5e4a38d12f88eb79a1700587fc6a3589489acf5018c45816bb722b7
-MISC metadata.xml 338 BLAKE2B c0b8c91d239ef2bf42a1c952fefb0c881b05e7a09e26f66d373bdf528a3947b638172ae6ef5d5346b2b7eae32f119edb576f14d95725342fcc5ade6ce34e7a45 SHA512 446f9a8989694cf8da612c936821ec595524c1bbb57f473e2097e77707b6ac20de4c2ef91930191ac503c367ce9c78b2a26b9913cef70c0ba68c5c4a6ca86bc3
+MISC metadata.xml 249 BLAKE2B 6fef7c508be7fb79b2efbecf4acf23f37b519350ff2302604047ee5b6fbd6f82e590199edaece99dbe6d6546c5158e54a40fab8e372b739f9431849ce82baf3a SHA512 1b646829358569b7654b1f94f1aad14941f1a9f748408d149bf4a8af1c608952fcda3d9edbedc4298d85c0e86e2c469e72813fa237acbb2eb15da712bd0123ee
diff --git a/net-libs/gsoap/metadata.xml b/net-libs/gsoap/metadata.xml
index 99ade5f91e73..494cd044b980 100644
--- a/net-libs/gsoap/metadata.xml
+++ b/net-libs/gsoap/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">gsoap2</remote-id>
   </upstream>
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 0c444b69ea32..95273bd41d8d 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,3 @@
 DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
-EBUILD gssdp-1.4.0.1.ebuild 1557 BLAKE2B c0c5017dad13848794e5bf315ca49247e0a4f21466b9060db725c0c70757fdc0d2c35271d592dccf3f2693f08dfc46e14ef3b0ab51b238190b3e2c1b58ba5d4d SHA512 1d66eba2d4da1417dd94a0c194f312ad3749c070333d3a19d113b4c9bbafe4cc169fd33f1f4f228d1bd553e7af648fe41cf6720e16bae7c89287fbe52e1ca9cc
+EBUILD gssdp-1.4.0.1.ebuild 1564 BLAKE2B 9c8ee9713318d5f7999ad7dcab16b57a8e13a5902a10a3a79f75c391bbdc81c72ac60f93c7495136903d487f3667cd0d43615793e5a854a10af0b815a0992271 SHA512 ae40c74510b40291473899f956a101af41fe39ec6ad42c1719e609e1a7c768dfe6e644c35f4776e2fc3c129a8dd55d95f6464f469841d796b0697695670031ea
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gssdp/gssdp-1.4.0.1.ebuild b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
index e3a621c091c8..bc61bc667050 100644
--- a/net-libs/gssdp/gssdp-1.4.0.1.ebuild
+++ b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2+"
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection gtk vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 0d27200f13b5..6a01a3ee3363 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-av-0.14.0.tar.xz 93128 BLAKE2B d66ba820aabf82be37a8c19a64adbacc863b495cb6a68849ee236cbe6956cc94fc992a3d4f351d165efaa8257ece2f3173dd845d2a9313bc9ff1a97a178d9632 SHA512 b357b5413d3e01e4ecaf9dbdf5f5f15555506aed662154d03c6232f0c82c4a49543deddf34350a204d467c1a33fed04e406500fd51d6e412d32ac909e974e041
+DIST gupnp-av-0.14.1.tar.xz 93484 BLAKE2B 5e4c070bc7f0dd1a1b67f58fb178ee575df5f9f3920c8c40f8975ac79c61f707df39a243d4783ff79f691dd42553c3a6eb89715be79bb7683910785afdd83b19 SHA512 b17b38c32fe068b0b74a7ee357be5f3a0df3320fd04338b5f6b04231c601d6cc57d2770c6e6ca42ded5e1be28a6b2746d16417eb322889ffe6a975ec58205655
 EBUILD gupnp-av-0.14.0.ebuild 989 BLAKE2B 95274b93e3f47e9f1ddeb54ff208b828d31da1b6ae780059b28f16da3aa0371e6d1f654b294e09bd8c91f4d7dd479a9fa8183fc38a424efe907164afa8408eaa SHA512 7fdb7e56122486f998636f1816759b4dac9f587e8ffeebd1d1665704d7edd263c0ecfa13e091e5ed31606106b0913fbaaff2e487278972095a3e55c91170f6eb
+EBUILD gupnp-av-0.14.1.ebuild 991 BLAKE2B 5cd14768262d4d0d96a29fd4c14d442903b5bdb9d839af6aa41ec79b21dde83153c122f30bcce7042f09713cb90363a1bb5b97b81d22e8f14e8f3790c0294d74 SHA512 9e0c576f36e5e6012c2dc55c847564b23e418d6d11e5ece7ac00417f8984f19b2ff993feef22668118fdf4f79b35fef2b97d9ad50509b068eea6acbb77ad0f94
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild
new file mode 100644
index 000000000000..4c2317e33e7a
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.14.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-av"
+
+LICENSE="LGPL-2"
+SLOT="0/3" # subslot: soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=net-libs/libsoup-2.28.2:2.4[introspection?]
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use introspection vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 109e4188ebb2..d2e76b647645 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
-EBUILD gupnp-1.4.3.ebuild 2096 BLAKE2B 12cab960634fe310af01836717651fdddea344565c696264fadfbfbde4ecdc70861dcb19c9346a236edecb8c41b66f4d55c4ad289cbadcd9658c00ab154f6ee4 SHA512 e4eaecf687166bffa05367f8bbbfce0cf2eee6b4f0701886c2b91bfae9b6ab8be76f9f680bf43ab469a95e058514c2760c4f9ac6d200d58d34e31584fd065e02
+EBUILD gupnp-1.4.3.ebuild 2103 BLAKE2B 49a5f1bb6fa96c4ce8db7e6a4143a68088d62294c8a29c6db7dc7e8bc765d18af4d42539dbb6bf1eb8b87178ad050b68bb5994912218772498d1e1888068f840 SHA512 93e8c9a7eee44d6c6e661de340069a979c87ab329ea03fd157e3e912b382448d90f27e56fda2466301280b51fec5339f1fe8708ff3d86ce91b9c5f5cc5c3729e
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp/gupnp-1.4.3.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild
index c1d291ef2e7b..3eedfc589df6 100644
--- a/net-libs/gupnp/gupnp-1.4.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="connman gtk-doc +introspection networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 126ebb4bd019..c2913902d2e9 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,3 +1,3 @@
 DIST kdav2-0.3.0.tar.xz 48764 BLAKE2B 0e904f41cbe7b88667ed2dee5e23815fc9cf5fddf77493bb6c947703e001a215b2b47c302cf1570002d273ca06d9dd219a3c488c85609e4f7a3da7aa4f57412f SHA512 19060bdd28720b5477ced627d441411b7f594a025bb574196d011b946074ac472819b1673028e082f76f01d3038d3ee4acb438223a3aa6a657a5b8cddd1026d6
 EBUILD kdav2-0.3.0.ebuild 740 BLAKE2B 0556987ae4ef25e3cdfdf3545d5c70969ff7e94e21b05ee9f1da4f321ac41077d27b92d2508b47191c8699aa207ed78dc867285247f1db18fd9b3f447ff127c0 SHA512 108788be59a08e959928d77443df0382d48ace9fc84792922c66581946fb01a820ef06d984cdabf217818801e1bc3fe36c5d5db61f7cc503c174bebbdf0d29f6
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+MISC metadata.xml 236 BLAKE2B 219db736f77611984b5f2e1279f05575460ed974eee871808e2416e919104f563db1b29146c8dc34d8acac54edadbe5da16ca957c969c28922676e13bfb6c36b SHA512 09114b2f38ebda6f06b8c48887dfd47a4d632110afd7904ddbca9af0c7c402634415c765b49a6231dbec01f05c78210adef4f81f28138b56217dfa55d854dc63
diff --git a/net-libs/kdav2/metadata.xml b/net-libs/kdav2/metadata.xml
index d925f2439758..3e9f700a5e18 100644
--- a/net-libs/kdav2/metadata.xml
+++ b/net-libs/kdav2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
diff --git a/net-libs/kimap2/Manifest b/net-libs/kimap2/Manifest
index 79e4c3535472..3541a24254b3 100644
--- a/net-libs/kimap2/Manifest
+++ b/net-libs/kimap2/Manifest
@@ -1,3 +1,3 @@
 DIST kimap2-0.3.0.tar.xz 91948 BLAKE2B 95bc03eb7a5d99525a897327e6e12d46bc5fecbcfb521ad91645db8b531a1cd3f7e3125b6ceee412f6e2a53bed9b75e4993f6267722d23976f50fd711481b631 SHA512 a351fbd8a2c532a963d488c64fc497d05be3521fb2ddf2d942a9c2ebc6a76068f509c283c6335dee03c9ff1a6df294fa69b2033874d33dc6a860b70e1d4e973a
 EBUILD kimap2-0.3.0.ebuild 559 BLAKE2B c57e60e89198b40d389c837d74685516e11c91aaef87bfb8262ab57ed9835cad7bd4d83a9976dedfe880388a8e53b960903f4e0814ba272d1e7cbc9605e9d4b4 SHA512 eaeb838ff2b630939db2ee2da8fbbc2225bfa2630f761e0cebc404bb5c859f4a2679d7b476c60c7aa258ea6e1643b235569d9d46d1943627df6e9072dee3861f
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+MISC metadata.xml 236 BLAKE2B 219db736f77611984b5f2e1279f05575460ed974eee871808e2416e919104f563db1b29146c8dc34d8acac54edadbe5da16ca957c969c28922676e13bfb6c36b SHA512 09114b2f38ebda6f06b8c48887dfd47a4d632110afd7904ddbca9af0c7c402634415c765b49a6231dbec01f05c78210adef4f81f28138b56217dfa55d854dc63
diff --git a/net-libs/kimap2/metadata.xml b/net-libs/kimap2/metadata.xml
index d925f2439758..3e9f700a5e18 100644
--- a/net-libs/kimap2/metadata.xml
+++ b/net-libs/kimap2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index b965ab3fb8bf..1aacb3ad0144 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -7,5 +7,5 @@ EBUILD ldns-1.7.1-r5.ebuild 2620 BLAKE2B ca6fa8dcf5a55d539a2f042927bf4cd81f2910e
 EBUILD ldns-1.7.1-r6.ebuild 2346 BLAKE2B f2cb1c5c173c7afdd32307bd6fe4e774df43e5e2fba7db42a701b832bd3ffcabfb0ccd442513b0f8584fc172ee892a04afa5ea924a2767733c5c4d279d22e3ae SHA512 37e1e0c0fbefff0d2a3f4d390d104c17af34f435cd088fa62c95891c593e8fb821d46239029e10bbf5f1999873eccbf3979559dab58ed1638c79ab695065bf71
 EBUILD ldns-1.8.0-r1.ebuild 3140 BLAKE2B 788383f8d69e253a2eee594b6ff10b415bc682f156fac8f8154c26f50e0d7565d7411f3627f5167ceafb1a9c503e1e8a2076cb99288f2ca3b450ab0d831fa2c5 SHA512 7e7b880bd4694d761eab57a401f5473fd1494bca85702163c9b0a57e4da8b6356396d2e0ef5d50e10d65264a312ae2ee5a1b974b23a6ab8a514212a67bccead0
 EBUILD ldns-1.8.0-r4.ebuild 2974 BLAKE2B f1c39fe7d10583d32b4662057c2f3fe0b3244b6d4ee76073b4944a704cd54cef07c08f22380d7a4fb48234e8bcdede7274d3f5e596151b19acbbf3676b88d175 SHA512 b1b21710cfbbfb3f000ad6462db9230855dc8ff640d4a8e3e3bd5e32cdfc1381719cf11447d15d4b2fe899cdedf10627c92fe01dcf8b3e062067c70e8fe4a45c
-EBUILD ldns-1.8.1.ebuild 1837 BLAKE2B 4d8c7d86d95479ba3f2809a7e905fadb3668565e6b3686d7a322ee1a249148e5a5ceac39d0b9ef347477fd73ba65b81a994aa83a8bb308cc12ad533c6f58d403 SHA512 d18b9eda5c78267acdca5d0cf75fbf1beae47c0324027403418f6aff11c15584d3be90d324614ea163805c34cf81910869535d2d54530afd5e6bb278fb3c8ed9
+EBUILD ldns-1.8.1.ebuild 1844 BLAKE2B c8b2825b1eecbfefe9eb1d58a4641574f1628970f8881d41283441c31d5945fab9f5fc7cd51e81554fea750ec6db4d6d3404fc0ee51b4d8ec2b4d8834f09d423 SHA512 e71679d86831bd55b51d39fa170c9eb36ec98cc83d0a1f2432984ded0ca5d6d66d3052e56b9dc97495ae2fdd230b742037ea9f080e40b6dc64a47e255e749ea5
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.8.1.ebuild b/net-libs/ldns/ldns-1.8.1.ebuild
index 7bab0c91d804..d274002ab985 100644
--- a/net-libs/ldns/ldns-1.8.1.ebuild
+++ b/net-libs/ldns/ldns-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples python static-libs"
 
 REQUIRED_USE="
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 10e9384cee62..00fa0023b8ae 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,4 +1,4 @@
 AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfabfb83e3c7fbb3f54f117a1548275e8f974d43c92aeaadbae6c22d909127aa4a8c47e806a26f19e6ae598f30c5f34e3e2b48b3a7ff8be SHA512 4a483a915fc72efa42c10947cc399f30f2825a8f2bd59d88afec5da9cb29346572ba80c316ca4de4b21132e8ad34e031cdd735cb3ed0767d51780a15ac086fd7
 DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
-EBUILD libaccounts-glib-1.25-r2.ebuild 1370 BLAKE2B 1aa13db9197aebec1c15158ac11d17abd893aa0eca1c03dd3c742e6547de03a5298aeedd690ec11546a10adb6dd2f6111921a50133e030a2b33744046042236e SHA512 1ba2f62f40e1f257ad90fb61c5ed6c87ba15b8c7c8b21496ffa7c84a43b3ef095c59ce0102f143eb671858b4d4c392f69cd39ecbe7ddb331fda1acde445b32cb
+EBUILD libaccounts-glib-1.25-r2.ebuild 1377 BLAKE2B 6f92032e8467af5353c292bab1f033c5330f3596d2796027383ee2cd8fb14ae4438b62a15983f6d507948b5ef4a745ee32fa6112d40481a1329f9d14a57d46f5 SHA512 56636736f9e04190e2ffd57f2f442ca4ee1b12c3b6c9e39b5e4af44bc609344aafbc10ce6b7b724520d12050a0ec8275bbae37086c3ac3e83e9e7ec921aca9ab
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
index 4f6b141b2508..5d6c6cb80b40 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index b02a34b9c59f..13b3c65712cf 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1,4 +1,8 @@
+AUX libad9361-iio-0.2-cmake-gnuinstalldirs.patch 1815 BLAKE2B b6836af3ce9f1bf3d8eae92ff42cf38e11227fe02af032246c3f3344e92a2399175a6e0f1faf09e2e2124615fbc95283a5817aba7aad4d7b3dc500f01750bf37 SHA512 546e2d0e71ff6c0fc201a3ef41fb0d63e728da72fc89c5a92a0a5bf17cd8f7fb63bb094ebd82573d4ac26abd484857bd5d998a6e220a3ab8e0775304c20b1971
+AUX libad9361-iio-0.2-fix-lld-tests.patch 2089 BLAKE2B fb462846e61b94e9b1a0aaa444c24fbdec12c12d19761dac402b70914ed7b88ed0821015d2d9bf6a6eef8b860b40642727649597f74af2a4d6a4cb18b5ffd8fc SHA512 6d79873358441229e024b99c722138bd76f8a228d5aad79432c212be88b6bfc3e662fa63ccce355ac4ea1e732f20d3c51ded1fbf51785f68e57eea6668ef32b1
+AUX libad9361-iio-0.2-libdir-pkgconfig.patch 513 BLAKE2B 77291cea5d1dfa99646673881b5c7acf248928103476605946aa4decc09bc87aaf210378bea2846cd1ab1b8717ed54baa8c1028c0223b53a28b86a06021fe2e2 SHA512 9d161de025db149ad27b6e6ce6b9b1a7b4f4c6293b3936a2f8bb004bcdc70e88680d781c76e882cd2d1b2afcecd0b3624e45e8864f2b45bb19b20bc3f80dacb1
 DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c
+EBUILD libad9361-iio-0.2-r1.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410
 EBUILD libad9361-iio-0.2.ebuild 826 BLAKE2B 832a9a9aced0c02089ef6394db31edddee0a70e0f384012c668e63926a0e4b9f197f6376c62ee45f1600d582daaa433860050530bf3fa06069ec14e917dbeedc SHA512 60b37610799f64713e44eacd6e2f459cdbe5af370404c4525b72859c62c88e3fbd79ec7e0226fb9980bd3705af2cc07901da233e8bd5109364bb9613607a3620
-EBUILD libad9361-iio-9999.ebuild 819 BLAKE2B 44f462e8370973c1b815982283c272a1c46ef6a5bbd7c6e7eea20af219bf7e3893519825ddd19993bdbf5dc4f160bf23187c4cd81dd3e85d955c5f6369fdb5a1 SHA512 d6aa9a469260bf74e53ba27e3ec1217cc98bc5889edb876a1fee132804e0b9edbc8d6507f2f42e296b374215c6855f79eff4ee2c6690b6420cf3caea637f3d6e
+EBUILD libad9361-iio-9999.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410
 MISC metadata.xml 442 BLAKE2B 4aaee897fc8e0ec7c1081c20bcee1470aaeebd3f14252177861cbaff053a29c4b4b6a5476015252d8a75e8dd191d45e3c3c6f0cd6a08f41d3374831f3c392ac0 SHA512 b8e19d2f3382733f2756c406a7f08635956973c32cd8ec400bed18445dffb51d0595c09040de74bf907d32f6119976326b4ba914d29e74e65a9bc7eb1d3016cc
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..5a69010eb184
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,8 @@
+ cmake_minimum_required(VERSION 2.8.7)
+ project(ad9361 C)
+ 
++include(GNUInstallDirs)
++
+ set(LIBAD9361_VERSION_MAJOR 0)
+ set(LIBAD9361_VERSION_MINOR 2)
+ set(VERSION ${LIBAD9361_VERSION_MAJOR}.${LIBAD9361_VERSION_MINOR})
+@@ -59,10 +61,6 @@ endif()
+ 
+ add_definitions(-D_POSIX_C_SOURCE=199309L -DLIBAD9361_EXPORTS=1)
+ 
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+-	CACHE PATH "Installation directory for libraries")
+-mark_as_advanced(INSTALL_LIB_DIR)
+-
+ find_library(LIBIIO_LIBRARIES iio)
+ find_path(LIBIIO_INCLUDEDIR iio.h)
+ 
+@@ -98,21 +96,17 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i
+ 
+ set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc)
+ configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY)
+-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
++install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ if(NOT SKIP_INSTALL_ALL)
+ 	install(TARGETS ad9361
+-		ARCHIVE DESTINATION lib
+-		LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+-		RUNTIME DESTINATION bin
+-		FRAMEWORK DESTINATION lib
+-		PUBLIC_HEADER DESTINATION include)
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++		FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ endif()
+ 
+-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)")
+-include(GNUInstallDirs)
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc")
+-
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+ 	option(WITH_DOC "Generate documentation with Doxygen" ON)
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
new file mode 100644
index 000000000000..00ef9e0a6869
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/831322
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,17 +1,29 @@
+ add_executable(FilterDesignerTest filter_designer_test.c)
+-target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerTest
+          COMMAND FilterDesignerTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(GenerateRatesTest gen_rates_test.c)
+-target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME GenerateRatesTest
+          COMMAND GenerateRatesTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(FilterDesignerHardwareTest filter_designer_hw.c)
+-target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerHardwareTest
+          COMMAND FilterDesignerHardwareTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -27,7 +39,11 @@ add_test(NAME FMComms5SyncTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(AutoRateTest auto_rate_test_hw.c)
+-target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME AutoRateTest
+          COMMAND AutoRateTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
new file mode 100644
index 000000000000..a23205e44da9
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
@@ -0,0 +1,14 @@
+--- a/libad9361.pc.cmakein
++++ b/libad9361.pc.cmakein
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
+-sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
+-includedir=@CMAKE_INSTALL_PREFIX@/include
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++sharedlibdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: libad9361
+ Description: Device specific library for AD936X transceivers
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
new file mode 100644
index 000000000000..596e74764626
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 630cb27fb6e9..596e74764626 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit cmake
 
-DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
 HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -20,9 +21,8 @@ SLOT="0/${PV}"
 RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
-		-e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
-	cmake_src_prepare
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index f7fe806629e0..30c75a454ff7 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1244 BLAKE2B 57cabd757d9a3c96bdfdff27a80ba26500fac8bd516b5c0af15377c874692b4b92a71d1dbd0cfd1d5c7b5025d81e1230613eda8d84ed1620c4f23bec0dc7d166 SHA512 d9f67a3413c17467a35a9466984b65207e3492c543432acd791556766353ccdb4a7b21bda0671154e6d9c0a968ff72a91b07635f24174ecfde10bca78875fe8c
+EBUILD libasyncns-0.8-r4.ebuild 1251 BLAKE2B 288400463a0c75b8940d745a66436d5c1aa98ab807116994fb3927858ff833ae493f55760e888684b9cd0d43ec1f4f81832f1fa5c9f5fb9ffc4c6e08052f0e75 SHA512 11df392e6354c818c979ed91ddee889f01f40baafa64ec44f6e30526bbe0db380cfb4fe8f147a08be5a3e643f3ccff43feea73fcf1cb7fea9c7e7469ab9c21df
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index c77f4ac25de3..93a117c9f3a5 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index c6e32dae076a..38d5a69ef779 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,3 +1,5 @@
 DIST libdmapsharing-2.9.39.tar.gz 757492 BLAKE2B e9f47d793be05845d1afb6eb4a785cbd131ceac1e3146bdfb5c6914f584df2fb8db10b829447a6ac084e7a9e0576202485019b1e724cc033f11163fb1bb21b95 SHA512 7003b947e1982735b647c1fa8e7e80e05322acf4ed4b5c1c28708da00a0bfe3eecac01bc2ddf59966e7db045f14fc78e749a2859d7e909bcea41164939f15b4a
+DIST libdmapsharing-2.9.41.tar.gz 765880 BLAKE2B d64245ef6ffefb7a3f8b6c994e385427afe9b1aa22882da3f2fad82457fda6c48bea61314c6f4b8e82888284e98f4202338582dab2fd412c5e5cc96d7ff5f145 SHA512 304ba87428a39d2b9fd6d4cdc196f59e1aaf2ce3bb15f30acc2c9ca51ec8f86c9b499cf46cf938231e3088808475daba4fc55c44bcbef693be1b500dae4ab028
 EBUILD libdmapsharing-2.9.39.ebuild 1257 BLAKE2B 2418e6f216b1a5f74b9fb9bb254caf5531823384c0e26202faf9e73d1bb1386e744c6a26b1fdb3d56512d00f33c53f52e0070307c6ad5ae0bee3054cdb36a248 SHA512 b01affd992121e26e62fa288ec9bfb76e643ede5edcd3830d5c5d72d14d4e21ab938a33193ee45fa6e35960cfbef96f99f6e061d91a82e81a8e797e4b71ff597
+EBUILD libdmapsharing-2.9.41.ebuild 1252 BLAKE2B d56c8bf5d22bea4328952021e4c7b5914bb042e773868ad98cf940b4ca33b92f932425d2c46bfc84776c0bc31c6cf68cc17b9c2fded7fcea8ab8ec21596d2d49 SHA512 857491732664ad95de6dadd235c80828fb376b6332b918ea07ed4665d320c3faeed54421768f0b670570fef740d693dc2bd646b67b5c3f90b738ac221a68a933
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild
new file mode 100644
index 000000000000..d287c63b0e2a
--- /dev/null
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME2_EAUTORECONF=yes
+inherit gnome2
+
+DESCRIPTION="A library that implements the DMAP family of protocols"
+HOMEPAGE="https://www.flyn.org/projects/libdmapsharing/"
+SRC_URI="https://www.flyn.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="3.0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection test"
+RESTRICT="!test? ( test )"
+
+# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
+# Doesn't seem to be used for anything...
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	x11-libs/gdk-pixbuf:2
+	>=net-dns/avahi-0.6[dbus]
+	>=net-libs/libsoup-2.48.0:2.4
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( >=dev-libs/check-0.9.4 )
+"
+
+src_prepare() {
+	# Remove useless CFLAGS alteration in configure
+	sed -e 's/CFLAGS -O2/CFLAGS/' -i configure.ac || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-mdns=avahi \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index ac5706f5cf95..6889e9a5e437 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -4,4 +4,4 @@ AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f3
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
 EBUILD libetpan-1.9.4-r1.ebuild 2181 BLAKE2B 2bc6319caafff8b9d976fff913c80c3bc8495e4f5936d6033e511de0cae78897a848dadc6fdef0014c8c54c4c65ebc8fff6072f1cbaaf089ee522249cbd54d81 SHA512 52f798514786f2314355c71cc6f77b3304553ef4bb55c69b628290f664f8f14ffed3428fd6b9b3da68dc863259601c71765dbeb6f0856fbb9802a33786184fea
-MISC metadata.xml 829 BLAKE2B 24ff53ddef21ae8441fe99cabff9dae940b72baefbebadb0138a2e36222272ff72d7dadfc38bfc9e9acf212e80359e4f3892447475a8969fb6aee4ce42ef2b1f SHA512 8f4b30e3e3c713ed44b25a7718f67decebce5ed748c0e19791e8e44fda07c0eef9793dbcb8b8fcd300849ac662fd2badc810e06be191026aeb2cb4aaba579554
+MISC metadata.xml 745 BLAKE2B 7feddb37f434171fe784fe6c07f8fcc4b59acd79ec9d4f13f8156263f434a0335d5780258e2d6d59c5bdb7c6d2e608ad252e729159735040e03dd7ed8aaa3ed6 SHA512 0ee77ead26dc00ee97d5752728f3ea582557a28eae8530f74e085190ae15f3c70354e0fe1db656cc1f3e47338af62eedf3bbf9879d676e56045c2075ba1719e9
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index fdfd55893142..d2f539456b7b 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		libEtPan ! is a mail purpose library. It will be used for low-level mail
 		handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 7a3bfc14c725..3506dbf3c296 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,3 +1,3 @@
 DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
-EBUILD libgsasl-1.10.0.ebuild 1542 BLAKE2B 05ca34684a9d38f7451ed4a7fad7ca731915f3cf3f2c1836eca48bd7e32cf775cdd738ef68823246305f243f3e491ca1f551d59d1979e429ed0aa05fd4428509 SHA512 9df192affe6833f7d98d12b53aded21b0de5d83dc555fe801778bb09773e602cf236449b967f4a62115781346b3a55887ac23c56f8c628817053b9a73fa9a8ee
-MISC metadata.xml 367 BLAKE2B 2671afa7284c71275e28604a85754361b21cd4eb96eeb7c65b3cdaee7c6d0aef2ac9016db50f612d303e6236f33a11d97e1d2323ed375d6f006a1d01fedb2b6c SHA512 e638857d98badbdb8c31130746fcc8e39342f38b0d8223de10713fe0669cf3450d74b6a42b697de198987391dad4e98a53cc93bdd04383b25a6d8aa3f5782e4a
+EBUILD libgsasl-1.10.0.ebuild 1549 BLAKE2B 12ca3e5de01dabd1b630411cceefc81f9834ef5bbe0ee6e8e6cfd916c1a78ee59a2a70678933a014f91c65c486cff0c7570c624fa810f1de08c16b90ae96df0d SHA512 76184e5f040d349d5b3ff7556d580a2adbb81715bed65594811b047a4021a355914088840709746ee4b46d6e5e3e37227a5bf248ad48548e57118527b0d327cd
+MISC metadata.xml 447 BLAKE2B 7dd025c8c2eaaa468d06e228018d0524a1ad28d4b17ef6a4eb4bdae073418a2d219ea8d47c6907e0ea558af0604673f343dc0e9f3b1a9db5c69497fe676bf004 SHA512 fff114b6ddcbdd94e7509952a878ca2475e9cc5e639bb6ed8ef59a966d086f6174f43246cebd4eab9822b1e318a1c1b901339b678f4c412b640660fd6a3a0f1e
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index c397cf421f6f..957217656098 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index 393099923ac8..61f36c9df892 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-<use>
-	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
-	<flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
-</use>
+	<use>
+		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
+		<flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">gsasl/gsasl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index c43d01ea7d6e..137609d8e108 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.12.3.tar.xz 605960 BLAKE2B a4c0d7d1942647a759cd3890cb675ee6ccddf3b875836f91b1006f51230b15f0b55bdffd8b79f6c96af8f30f611cf6d8cd5a7677a39a8aedb17d3c0705f19186 SHA512 04ff8cfa6a945eeb36d88972e530371b011ba664eb742436ffbb5a09c10ae25053fc3553d6d80b9d68f65a9deee65595b0554bd3ab0f2b71414c621ddd28d2d1
-DIST libktorrent-22.04.0.tar.xz 606420 BLAKE2B d3881af8444acb53bd772f8cdf6e1856d47a08fd7e052a1de362512a01681b4fef68e23dad196e31d797a03a788484ea0dfbcbafb7148adb779b59b47c73637c SHA512 8447f1eb3e6ab860888f815d7f07394fa8adead298a3be1e15cda1d007de072dc1baafd7b60cab1df5ac46eb6f3215ead9ef74579ffc42473835afff46336b04
+DIST libktorrent-22.04.2.tar.xz 606372 BLAKE2B 71e9b2dc92fc22d7124e2bbbad6853ac00e8b85d2c4de1d34a3af68c348cc044ecec5fc8a350dee75917475522dc0b6c85465174dae4c17d3400b0bb8f64bfa4 SHA512 b5ef82b2d2c9235e0760fff0c4b30339abb076f47c75bee85379d247c4b0d0fffd7d194b90ba4594d4ac6461d8045570f0bcf56dd484527338afd94a6ea2eeda
 EBUILD libktorrent-21.12.3.ebuild 1451 BLAKE2B 0147ae58939ebbdf6d9952fbd79b89977ec7f76d2c9e9e6036d88e257bad8828edede38284d55137da8a2d1e69bd8310d848453fab57698adaa6249e2e25bd06 SHA512 71827239b8a51d2123878ef0f46b17cba45739435fda8b3bde2f9ee005beb64a99242fabc6971eebd043540995820d9e2ee10dca420ad4e19245cf09e921fefa
-EBUILD libktorrent-22.04.0.ebuild 1454 BLAKE2B 22f5a38cd6bc53c28347474f79fc89382754fb4fa09628dc2469c8f7ec696cbbbff6272ad40f9e865db88e4c1aa137898da2e3b5a03b7dd4138cb24ec2352eda SHA512 fbc7f8c9bf534b0a801f72e0a54124dcb05d3bcab026bd1e29e30d99f2b5196d1fcad08f4596d459f1ec51c80109bf211464eba10b2ec3479848d1983e687e35
+EBUILD libktorrent-22.04.2.ebuild 1454 BLAKE2B 6f6cbcbba558ae94965045e0544eefef5b10597de6e5520eafe67e23ce2ecd9957aa4e84c0234a625975ea7af40909fbb15f4a05ea1b8dc86782e509cb68d902 SHA512 ad234512b5edce0ba5df4de838d92210819fed38cd7ab2c96e05bf871eba4167ece64897f42a136860d8b61431a24a17e35629a45acc343a03c8f70bced43294
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-22.04.0.ebuild b/net-libs/libktorrent/libktorrent-22.04.2.ebuild
index 1ca10872f690..4adfd65b596f 100644
--- a/net-libs/libktorrent/libktorrent-22.04.0.ebuild
+++ b/net-libs/libktorrent/libktorrent-22.04.2.ebuild
@@ -7,7 +7,7 @@ ECM_TEST="forceoptional"
 KDE_GEAR="true"
 KDE_ORG_CATEGORY="network"
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 77be5e409dda..a418ecea8916 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,3 @@
-DIST libmbim-1.26.2.tar.xz 561096 BLAKE2B 11e5339b63dbaca8fb6d31ce2afaf4897774aa4b531cfbb09bb400f64ab975495093b711d0a836feff86e3d9fc72ae2b85ab5cd84fab3d266e0fecf1129125d0 SHA512 7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844
 DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
-EBUILD libmbim-1.26.2.ebuild 811 BLAKE2B 9b19aa6ba3b08db780e51d7316610ff348bc7616601a07a19ba3d7842604d09eb3cf660778cdb8ab93dd192dcf936369ea410acfd813b748582e0ef56e57b74a SHA512 668d3805890a6a154c30adaf8f73ea2ba96d102b287c2bb4a9dbbfcc64ea295827ea7b7c245dd900c8c912d082254d89ee2cbe3936184e499801aa06ba572403
-EBUILD libmbim-1.26.4.ebuild 817 BLAKE2B 21f18e6a91da709445a1841a85196de99d8385a4247d750153885a4a78325d0907c11bd38e6574c04a15dfd5b9a992e8da63fda96b9f76aa1de6d5e51a53505b SHA512 b432287e87ff02129f353618805919788625c23c49c8b2aa326130adbcfd8d6a1a53e394f2ba4533a31dc076f59a74b0b7cd1dbb68fac1f6b78adfa8f28a7ae4
+EBUILD libmbim-1.26.4.ebuild 818 BLAKE2B 36654d0d921c455e8a86662e313518b6eaa8574ca109f2eb3e91f156015fc9bb6a2b92450fdeddbf87aed766c3ff01684621b24a77c2b7f6937b92c5b759ff79 SHA512 c2e2e9bcf2fde430e01151a0166f7661347318ea7e38e7394300b3d8e592b9f47ffc5071b8624acc53a99f90ed6279a024823afe64e38855366c212b2111f724
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libmbim/libmbim-1.26.2.ebuild b/net-libs/libmbim/libmbim-1.26.2.ebuild
deleted file mode 100644
index c45f611c94b0..000000000000
--- a/net-libs/libmbim/libmbim-1.26.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1
-
-DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
-SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
-RDEPEND=">=dev-libs/glib-2.56:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--disable-Werror \
-		--disable-static \
-		--disable-gtk-doc
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libmbim/libmbim-1.26.4.ebuild b/net-libs/libmbim/libmbim-1.26.4.ebuild
index 81724693c402..17b564ba9032 100644
--- a/net-libs/libmbim/libmbim-1.26.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-libs/glib-2.56:2"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 97e31123069b..5634ae98051d 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -8,5 +8,5 @@ EBUILD libmicrohttpd-0.9.68-r1.ebuild 1276 BLAKE2B 054bf890fc417e7cfae6ae5fd76f7
 EBUILD libmicrohttpd-0.9.72.ebuild 1312 BLAKE2B 789ae7820d0f18794673d6215119b33af8f769de2b48b8ed361f8ecc0faf210689e14a11ca2c60c45d4858a4247afce6e131c068bc1acf139e17a4a366172789 SHA512 4506663bfe461066d74be3e4ba3dffa2e50074a0ed4d1c8f722907ccb613a6a369ad83dc41758bb0631d143e8e963a103300b719f2fb3e93bbdb544cb3e96272
 EBUILD libmicrohttpd-0.9.73.ebuild 1439 BLAKE2B e4c43d565e2827e14c0698ced8ee6cf55f8cf9a1a64005881d4f8dba32cfee051d91751c7ebee2cbe6179fabfd548daa586d48aa8490125d5f3555ad999fdfd2 SHA512 295e483b95e2a0a16922c9ca4155092f0c3d950805fe091dbf779ed20236621fb100f9979b549ea75883de74ee8a7ec3ac121676beddc5ec8b143bb076753a58
 EBUILD libmicrohttpd-0.9.74.ebuild 1399 BLAKE2B c65c16dc88fb965625e895cb9a650d71dd4809103b7204174233827a808a2a27b935574d4dd11b636867b2c34869e4758bdb9b46fad2dc3b0d34e769b048caa0 SHA512 413885fd40f7ab597d3faa5ae853403c841d8150319f353d68a63497cb28a7566bfb8dd90598064172df27b75d43d7aee7a1a05d7ca2a1a65d443b27aa0062ec
-EBUILD libmicrohttpd-0.9.75.ebuild 1406 BLAKE2B a54196dd33c708323ba0b36eb6ffc9a0a51a969ea7e97647678bef0c0ace6e2c4be02e92c32c72bda11676a5bd6cd2f1f37ae2955f88af964653f87567a3f6d3 SHA512 fee6f25cc0bbd053882684d62979af12ad01f2b38faa3e7da473c7e5f2da1fe554258b0b402a8327902d5ed8d0d1fdd5e340dde4dd72047cc0b6915412646502
+EBUILD libmicrohttpd-0.9.75.ebuild 1411 BLAKE2B ee867e5d108874d8d44ba62bca12eaaee6fa7834e3d8d0274fcfc250678602de2bc9844ab5a8f301ef2c686392640bdb7c412a31ca6a0aa33bd08b9574d1bb50 SHA512 a980fe6ddd8f3d60ebfecbfc60777a53ccbfd3114e95d810c4fd447e0cf4f54b8f21c3cfc843e200823706c7d46e6bdccf7d3d5311d4818d9b5303c6b253c999
 MISC metadata.xml 632 BLAKE2B 1944894dc81e31fc69c406a905d6f2670c62d55938b53da47d98ba4b64795226230671c0ca7188653807def9b182191c817a7cbf5cdcbb07ef2c42fb68e61ab3 SHA512 43ebbf10601c286197dda1f2361f80fc2c2a9525dfbfcfd5870810dc7428143fde1fd9966097a64c2ee1ae792deca17864efdb4cb5a57e57e94cc86dda9cb318
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index 44dad816e537..56141caaf078 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+epoll ssl static-libs test +thread-names"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 7a4b9ec9fa61..09968fc6a9c7 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,3 @@
 DIST libndp-1.8.tar.gz 364669 BLAKE2B 29fa41b40300b273d50aed4f1fe4a1c552023aa83d6f4b1bd6033cd0a41618b453bd1ec7ac5223fe7c123649f389587e89e635cb988b392f1af04cc1d6b79002 SHA512 bce17095f01eb9df6601a2ff0597b0373f4b0005b1edac8c085e4c9d54f9cd18f08faf1604624e0e0992be66fa6f22a71106af46bc73c9e326663c7cf0c5a7fd
-EBUILD libndp-1.8.ebuild 538 BLAKE2B dd48b0c2ab5a08329e60310294f28ad1d810fa8a692b9e48e5b5a0cbf222e66a21c8337b19fd506503004a17e6b4fedf9c3abe5d773ac0a538e3e97eb999cd56 SHA512 21ac76992b3a78a54e09c9f51d832583ab6c7763523a6d4b7d95704e58de71940997fda963ba6391af752244ccab713c0030470bf16e064bf53ed421fa83867b
+EBUILD libndp-1.8.ebuild 545 BLAKE2B e4a9c2071e075f8837207bb83e0706d61071600e34c69a894d182ff7b89bb5439c5e4336febba72193b37a34b728ede1d858994b79034ae60ffb6044f3f1f19e SHA512 49fac5e543097cc246444383ceef36f1279dc0a33f3045157a12ee51b59acd6dbfcb289fb44fd9f8b95bc136657ada016439a6abba7909143ced09c459f2a7e2
 MISC metadata.xml 329 BLAKE2B c2390ffefa9ab62db386760ee346590a20bbeed5367a523b7ae730bb97cfd1f59927e8e250c9ba4efc45658f31e3598c6eb9d6e486ba59e3577f5e0fccb3a97f SHA512 b7f4ed76985e2c7d1befc6ec664b14fc9559ec0ab2c5817bcf19adde284decd1c0dd96fce540e0ea5aa56e980d46a1c7f6a764abcbebf3522ed7663f41cdc9b2
diff --git a/net-libs/libndp/libndp-1.8.ebuild b/net-libs/libndp/libndp-1.8.ebuild
index 332edd106a89..3cb65ea54823 100644
--- a/net-libs/libndp/libndp-1.8.ebuild
+++ b/net-libs/libndp/libndp-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index e869f4dd0ed6..5a9e275e7321 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,3 +1,5 @@
+DIST libnetconf2-2.1.11.tar.gz 302413 BLAKE2B c5a1316b61c1d36a57d65bb556f9f3c72dcc4e614f12ea8178cc84e28b1139173ecc951cbddf63d60c58cd4e7b6477ecd719bf9aa375ab73ad32f1c82dd3a59e SHA512 fad29d5f3c486bf4f56a9065ef447886b7ffef7c33cdc109e7702ed343ae9fe31b49d40fa3e85f07e92c4aa713d6b11b5afabfa4756cc487dd184f0653fc6d56
 DIST libnetconf2-2.1.7.tar.gz 302011 BLAKE2B b83faebb8d04d9ecaa0bc3aa1fed1bc3b94388d1a6dbc8d3e8c2ff2bb73dc57a460eaf9cc7bf2d07a8e09ef612826417990d8c70bab9c58f9cb71b53766b035b SHA512 fd46a3c31a062324e6c9f2d66006ba8cd852ccb389bf8749d1d0d085b880409e1e373d1d1f2d79c1d88f5eaa72d56195889c07863d0eab1607da89484e21b86f
+EBUILD libnetconf2-2.1.11.ebuild 899 BLAKE2B 71e421249cde80f2e0e7894380b79657d17e392e65375c6b0e405c001ebedd91caf06ede41b7ba2a651ee1222042b5d560b0d05b843f1e6fb2ead8fc48bb78b6 SHA512 0dffcd5a2134c7955b90b3d6f1447fa9502d33d3b20615ab15210b2dc286e53eecb36a4e553990df02095b1030cf686e04027ff4bf1e8ee4be175b88389e295f
 EBUILD libnetconf2-2.1.7.ebuild 899 BLAKE2B cf01499bf3d24a41dc06bda655a31ec2a31b1c0197006284eac60778e4fd380100ef0688d6cfa050ca0cbac85429b7a4f52e36259350e168ef85a83fe92202d2 SHA512 13952d8764b3ed0b316ca5e7f5b0358eddd829132d33f4a0bf6cfed804e29551345afe280b24f902e26702105126fc7e0c441176f14d2681fce937abb5fb9b48
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.1.11.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.11.ebuild
new file mode 100644
index 000000000000..f7a63172c6a5
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-2.1.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C library for building NETCONF servers and clients"
+HOMEPAGE="https://github.com/CESNET/libnetconf2"
+SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	>=net-libs/libyang-2.0.194
+	net-libs/libssh:0=[server]
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 72a8bd1cadb0..a7d709699f7d 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,5 +1,10 @@
+AUX libnftnl-1.2.1-missing-export-set_elem.patch 640 BLAKE2B 6b5a1470c2e8175a1ed9667f7dc8dba09f074b57d20b3b5baff27f3cc3cc08014070744022b004573255c29f8124b6a0bc5a2d569fdf955c1e566a7646ead773 SHA512 afe61d68f2348c9ad02386a452611cb38b88eaf32cbbe565efc0cc929d73db89541b3675301773bd195e09c1834c006b22be92d1c7e923aeb2095d8db78ea54a
 DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
 DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
+DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
+DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
+DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
-EBUILD libnftnl-9999.ebuild 1590 BLAKE2B 502b1b6702d73793e6dee2b0607612b1a0327af63b4bfc8ab83c28253bd3b2519a9d3c124b853f0fb13f59e6cb04bbd189293599ca8269324d47a83996b7f7d2 SHA512 57def640d0b9414b41fd856c76d5b70bad55ca17b0712fb619cb0741283ce29c702dc8a95a4f5df5f8a5a8b3fcbb4c84288663e56556138d6082f080e80f9169
+EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
+EBUILD libnftnl-9999.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
new file mode 100644
index 000000000000..0ff574ddc48a
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
@@ -0,0 +1,21 @@
+https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9
+
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Wed, 18 May 2022 23:54:03 +0200
+Subject: set_elem: missing export symbol
+
+nftnl_set_elem_nlmsg_build_payload() is already available through .map
+file and headers, add missing EXPORT_SYMBOL.
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+--- a/src/set_elem.c
++++ b/src/set_elem.c
+@@ -300,6 +300,7 @@ err:
+ 	return NULL;
+ }
+ 
++EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload);
+ void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh,
+ 				      struct nftnl_set_elem *e)
+ {
+cgit v1.2.3
diff --git a/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1515dc6be1b4
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-clang-fortify-source.patch.xz
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+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}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-clang-fortify-source.patch
+)
+
+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_unpack() {
+	# Drop this phase definition once fortify source patch is in next release
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+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/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index 215d4c569086..49e48df43765 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -3,33 +3,36 @@
 
 EAPI=7
 
-inherit autotools linux-info usr-ldscript verify-sig
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
 else
 	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
 		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 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"
+BDEPEND+=" virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-export-set_elem.patch
+)
+
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"
@@ -41,6 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
 }
 
@@ -48,12 +52,15 @@ 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
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 543e6533ff66..ce3443f88f00 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,7 +1,5 @@
-DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
-EBUILD libnice-0.1.15.ebuild 1532 BLAKE2B 30fb32dd731198a8b5b4d14e2dd08ae38af762d215a6d26658bdfc8753c60d1f46efb6ff587c91bf23cd6496f2b862b054e37fe3abf040bf3bef9707d14c9f8a SHA512 8f2b522cb92b1c8be8c413886329acdd8847fb358f222ec79eaf2a07980f1608459ae99211b6be2ceabbc6c1c891013f5710912114a7cd5cbab2b58ec26c6769
-EBUILD libnice-0.1.18.ebuild 1332 BLAKE2B 7b6dd88c449f922950bfba065bc57134be60cfe24a244ede5d5ba3670c6e2be73dd6672abc5e9c34d039ea89b5f1a28b35140ef974435c016e778c644ea259e2 SHA512 5ad68565e121b0dc176f477aeacea793cd7794b4e2303d3f7111e6e6409b0c4f821b9a84d17ae60ec55e1ace32de25b53bc933ac45b233a8d9febdb1b85fff0e
+EBUILD libnice-0.1.18.ebuild 1325 BLAKE2B bf5d9de8fe2bc263d2c2126e23e7ab158d44657901a34dd0775a169b2f44b439afd5fdcebb2abbfb1b16ae56cac13849fea51b13954a2026de09b30b3077cfb5 SHA512 79af9f4f494b2cca4bfadeeee6a87ff588128dc479851bf37280d8d2cc414dab52d1e78a849c855e92c815f5d270a42b42657a0c60f9712b31ac1a956f1ac9f0
 EBUILD libnice-0.1.19.ebuild 1356 BLAKE2B d7372ff64d7a29f7e4315977e6ce1d1846d14cc210cb443fccbd92814b290c5b37b8d4774eb5a078247228d7bc9f1286abde68baf102c82c66585330d53d2efa SHA512 eb1f43fc7ec009b379f368328e0e99681c6fc37894159d4ac784d1466c27ad891bdc2cf3d80737accd6fcacb7c22caca1b4cd8960ef834e97109533d3034b329
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
deleted file mode 100644
index c56824219a0d..000000000000
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal xdg
-
-DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
-HOMEPAGE="https://nice.freedesktop.org/wiki/"
-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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+gnutls +introspection +upnp"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-	gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
-	!gnutls? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-compile-warnings=yes \
-		--disable-static \
-		--disable-static-plugins \
-		--without-gstreamer \
-		--without-gstreamer-0.10 \
-		--with-crypto-library=$(usex gnutls gnutls openssl) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable upnp gupnp)
-
-	if multilib_is_native_abi; then
-		ln -s {"${S}"/,}docs/reference/libnice/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
diff --git a/net-libs/libnice/libnice-0.1.18.ebuild b/net-libs/libnice/libnice-0.1.18.ebuild
index 331cc388a3b3..7dcd67787313 100644
--- a/net-libs/libnice/libnice-0.1.18.ebuild
+++ b/net-libs/libnice/libnice-0.1.18.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 ~riscv ~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/libnipper/Manifest b/net-libs/libnipper/Manifest
index 3866f1fc67a4..a264069725ab 100644
--- a/net-libs/libnipper/Manifest
+++ b/net-libs/libnipper/Manifest
@@ -1,6 +1,9 @@
+AUX libnipper-0.12.6-gcc12-time.patch 316 BLAKE2B 8398f94e9545f93056ead1aee25e2842325754024f70cb067c1d99f44da88eec30f02a8d9f6892e8d44dbd06fec2f14fc31a7346a1d5d4f485b1bd6445603527 SHA512 5804199fe39df688a9971e0e429ea41f0c9118aec0791965d6ea99f86cb3d45adfd437630a099af1c5bb749a179a75e2fe16d6de80096ea49b973d92cec22b28
 AUX libnipper-0.12.6-gcc47.patch 272 BLAKE2B 4849ed6671881029fb0963c09cfa0b9e9f0e738e714672ad6e17241a354e0f0067e42f01ac04defc62c681ea77183dc98ca7b77e864941fa48c6542ccc500d06 SHA512 fa6e326a97d5d6e72fc04fc2aebf6fb56be0c3683b5d1a02fcb907a944d2b3cb41d91a750c69c69a73e0fbec670d288b16bfcf718a3ec43a1689dbfb67411edf
 AUX libnipper-0.12.6-glibc-2.10.patch 418 BLAKE2B f981208efc23c3eb37aef0ee75a6e0740867b2a732e2bf2776cbedeafbaec0bd23e1692b2d5e4cf335f74b4fd03146ca12a67f94a3261f905d42e9c204f6a48d SHA512 0111563759771a4fbb9464c41cb66358a8a12c461709b3cb5638663b6d39ea594aa4402eb488080992a173ad1d639790c6632ca5e8f0c85ce60af5c6e1fc54ea
 AUX libnipper-0.12.6-multilib-strict.patch 523 BLAKE2B c59c2e2a9b3a09be2a17bb7d6839a03bdde7981a4bed0c761809ab9e024dc764cbc7bf7e61bd47a56669e3355980aa67c2eb479e8793da8fca44a4cbf06dad20 SHA512 4290a1b5afdf3215d25d1eb173a0dca421f209335cbe413aa3f051df31c132e85dcafaec89eee52709ece258aba37b507cc4499369e9ad403aa7ecb2b7ba04a6
+AUX libnipper-0.12.6-wformat-security.patch 467 BLAKE2B 1b254d11470f49db592190946752e935149c17d8dc5e1859db30d1175db0b08058f164707701a79d7b8f62557bf9f37d261db392ca697eaf7d13d0c95ac1e7f0 SHA512 73f32a285ad3e3071a3b8596538ceff2f56453dc8e4bfea086a6db6d592f270d9a302593ee231ac86f88baef0f2cd2ec52828704d987d498d5d5c64fb3d62546
 DIST libnipper-0.12.6.tgz 444578 BLAKE2B 66a9d9158a132a447e5acfb2da51618c2be09f51a8bea3b47bb953a8734e5be5666a6d330e20ec9b5ad6455ac98fbc651a673dd4c47045f916cc3894ff40f5c2 SHA512 eb6eabce06a71463f8dad59a2aca13583e9ae8113b6997a7946b9bbafe54cd0668189c915f917ffcb7ffe3b5dc6dbbf7d37874ec226e5bd8cdd3c8999f9e10b0
 EBUILD libnipper-0.12.6-r1.ebuild 451 BLAKE2B 2950029c9076b196c54d29842f7d56655fc7b38ae0eb04fb768f2e7586f71c9f5f46dc30223db5de5896df90b64cfe34921eb687849c0f370c758f5854a4fe61 SHA512 396b52619b331747de0105615b060520b7777968abed0bed2e13836827e78531d5b3dd59596cf5c90c20b0a6ef6977e9ddd21ea7b6b0b930a39a0f1f9ee0fd8a
+EBUILD libnipper-0.12.6-r2.ebuild 531 BLAKE2B d486a14da0c920ef84fe2da8f0c91674fdd3f2560e1cbcdbcce1aec02f9f84401efc4fd3c921d68f6135ac74c025319be86c3f93aa3cde8c10b8ea7ab666a3a7 SHA512 e156e9a2932e6e857ba14e57e402b04ce36858ce2c3cf7e86bd3905974db4457d2d94113d9a5ca23820a31ae8d7ddf98c02d589dc092ee463099cb1578655fa3
 MISC metadata.xml 244 BLAKE2B 38ffb6f9295d8117c9ae13bf37fb4c5dfd57ffcaa0e2fed5557e69757b81feb119a74b620c6ce789ddba42e7d7e4e99d4868d299ff652e23abd3189943bdd687 SHA512 ab6444f29b3bbe2e6f4449d96acb0d2d2ad7d15e54a40744cd237c1ef1f1d5b5b291d16c0cde225d4842fb251adecc622cbec095d7fd619e9e338fb68a1cda9e
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch
new file mode 100644
index 000000000000..b07c640a37d1
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851666
+--- a/report/report-text.cpp
++++ b/report/report-text.cpp
+@@ -34,6 +34,7 @@
+ #include "../device/general/general.h"
+ #include "report.h"
+ 
++#include <ctime>
+ 
+ int Report::writeText(const char *theText, Device::paragraphStruct *paragraph, bool expandAbbreviations, bool hideMarkup)
+ {
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch
new file mode 100644
index 000000000000..d2bf917a9c59
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch
@@ -0,0 +1,11 @@
+--- a/report/report-table.cpp
++++ b/report/report-table.cpp
+@@ -359,7 +359,7 @@ int Report::writeTable(Device::paragraphStruct *paragraph)
+ 				else if (config->reportFormat == Config::XML)
+ 					fprintf(outFile, ">");
+ 				if (cellPointer->cellData.empty())
+-					fprintf(outFile, config->emptyTableCell);
++					fprintf(outFile, "%s", config->emptyTableCell);
+ 				else
+ 					errorCode = writeText(cellPointer->cellData.c_str(), paragraph);
+ 				if (errorCode != 0)
diff --git a/net-libs/libnipper/libnipper-0.12.6-r2.ebuild b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild
new file mode 100644
index 000000000000..2fe749ff81af
--- /dev/null
+++ b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A router configuration security analysis library"
+HOMEPAGE="http://nipper.titania.co.uk/"
+SRC_URI="mirror://sourceforge/nipper/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc-2.10.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-multilib-strict.patch"
+	"${FILESDIR}/${P}-gcc12-time.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 0c2facfef9c5..7429c9d8b08e 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,7 +1,5 @@
-DIST libnma-1.8.34.tar.xz 1342040 BLAKE2B e81004cf97832bdd010869fd7a801ceda42b96a70a0bd0aa50f821f7e3c361716f8075ec8ae82a224b6f617ee9b3f177239a53dd9eb982dd49da409d97671fd9 SHA512 aca1e24a852072e65d1fba910613981373bb7bb7869b2e44abc9e41c527d234273f034215d62889a265aa3327ad2cce0cea7368b025df97dab12bff098310aaf
-DIST libnma-1.8.36.tar.xz 1368748 BLAKE2B b60f3d383e5a55a766be8f8df71eb710d68b388c5ec0b946789856504327f6a8093943cc7b58dba992883099a899f3f55c70e5275d495610e79cef8e3e97d1b8 SHA512 c3f675d773d1be9006c01c3149751c8da1d5d08467be6d9aa921da3d867fdc9e8b26c7e6c9bd46a6cfd38a7eb721f8bcc209b43d9789a0b55c6029e11ca0fd22
 DIST libnma-1.8.38.tar.xz 1347004 BLAKE2B 108fc7d0a01ca72c84a738f831d442d82990f7b82301de3a47d8331af1e080a33c10806fb75830463fbfb8a4a1f556cdf5272ee52dbc4616ea3dbca1959cd128 SHA512 0421c598ccb6e3659f182b596eec76ffd695e51c11fd11b8325c2d08cb259536d7e74c11bbaac3ccb841016a0bc69a87f1c682b934a9eb569a74116e677eba63
-EBUILD libnma-1.8.34.ebuild 1635 BLAKE2B cede76686b07adc20c43c8234dfb123e4243205425689466317de7765c18d2d2469ac5526bfeee49c7d8ac8fd733af5220ceb876ee6242086d921563cabf2358 SHA512 7f41e954b1c1c55ff2f6f67f4d7c6b22fa73d844e79fde990e0f9cf7d011b3ac480b2d18b1c8a3c0633860e632ddc9cfafaa36b6c9ac19a39dea6deeb12b27b3
-EBUILD libnma-1.8.36.ebuild 1657 BLAKE2B aa3ae34299b238b9be5e03af99dfb56c83eee3026ce2e9974025ecaf889c802f18ae3e604730253189d848e02192a393300f481e691d32d4b729b8fe11a4164f SHA512 d1949a2708d82a59321fb018ecb803ec6c44633da90e7d0824965f0faf7d1b0d3a479f297428eac7d35631b1014d16131579a9b502abbf81a9807bbf75157525
-EBUILD libnma-1.8.38.ebuild 1675 BLAKE2B f686e3b3b498424a50a5defe652b6ea24778e9d0f93e2b2e81cdad4aaa5a29bcef6e2f4047cfdfcf8a8313196b4a754595b9a6a24a4b8ddbd4637ea9f2618a75 SHA512 e5ee4d169d9553b31c82319933af5eb10e4ddaa9c7eb7d02940adc3c61c12134d030367e31aaf7c2967f912a5a80cd6043232c7b24845fba3e1e7e7b7b4f5b26
+DIST libnma-1.8.40.tar.xz 1350560 BLAKE2B 9c5124a1dcaa801c7d0135ef64dedccd098988fdd199938e2409e80bee86df71bf368cada113dceae4046a5c2c5fe954aa9fc0c19519721a4e8ec7b8f7ea8d44 SHA512 28f4704f97941308f43b27a309fd14050e8ac7e0c6665cada3cc08a759e140f043a80b21ccfe02ce348f8490cad8107b4fe27026dbaafed46ec1c7c46824e3b8
+EBUILD libnma-1.8.38.ebuild 1676 BLAKE2B 4d25b6609021722dc209259e3414444f3419a94153e42c1decebb7cf3e9e5ca0d0103150ed6da3b1b2f3039dc4ecb3fd4e3a682b374b239718836d13813e03d7 SHA512 68e5d459f420a05512b69cc722c1a69e9f65e31ad10d8081fe635250a452e42c6febfcf9826741a3c67464e7e7241d452bd9084b43951423df08adf4f6a121bc
+EBUILD libnma-1.8.40.ebuild 1682 BLAKE2B 5f2d2a76d3a776776cf254135180bd8ae493f74163dcde431cdc5d89da0722bf364392b8597e105326ddca5318378b3e086b5c8e33d0abcdbe3b6ba9c1a3f074 SHA512 434dd3138a59e226de5c97e3de69b5738d87f9f6d52752a19bd5331aea3b8bbd3aeda8680065bb9756c7ac139880387e891643da009393679208cf7877eb9869
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.34.ebuild b/net-libs/libnma/libnma-1.8.34.ebuild
deleted file mode 100644
index 5cfe6178ffac..000000000000
--- a/net-libs/libnma/libnma-1.8.34.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	app-text/iso-codes
-	net-misc/mobile-broadband-provider-info
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	>=net-misc/networkmanager-1.7[introspection?]
-	pkcs11? ( >=app-crypt/gcr-3.14:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend)
-		net-misc/networkmanager[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibnma_gtk4=false
-		$(meson_use pkcs11 gcr)
-		-Dmore_asserts=0
-		-Diso_codes=true
-		-Dmobile_broadband_provider_info=true
-		-Dld_gc=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-libs/libnma/libnma-1.8.38.ebuild b/net-libs/libnma/libnma-1.8.38.ebuild
index e73a3922181c..0809254e3bec 100644
--- a/net-libs/libnma/libnma-1.8.38.ebuild
+++ b/net-libs/libnma/libnma-1.8.38.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=gui-libs/gtk-4.0:4
diff --git a/net-libs/libnma/libnma-1.8.36.ebuild b/net-libs/libnma/libnma-1.8.40.ebuild
index 024459425f6e..76713c40ed01 100644
--- a/net-libs/libnma/libnma-1.8.36.ebuild
+++ b/net-libs/libnma/libnma-1.8.40.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=gui-libs/gtk-4.0:4
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 6e5c7e9937c1..a575fc2dcffa 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,6 +1,5 @@
-DIST libnpupnp-4.1.5.tar.gz 545672 BLAKE2B 75f3236cd18324ffa35215f152ef2b84d81b4bc81b9c73488e7274ecb5d76918f0ef328edcf089d81202e92f4fa3922bfe46d6eb3e9a1bbd065858bf6e5cff60 SHA512 a7b2f620c846f2127220a062eab76f2c06b3eee4503d9f4922d7d6342feea19381be1486bf1cb033c44275f83ab90be3f8f2c09f0ec6f0af7367c314023c889e
 DIST libnpupnp-4.2.1.tar.gz 544987 BLAKE2B dee3b5ffb0a3005c1ac9a262df61c8823f59cb0e1b204776ff4f7a465b5caf226a6149315af0862b397607bd07783c2f876fd143090cc92174e081d9a4dbd585 SHA512 89c83bf05e64684432698b36a2152b4b35e8cffd7e4ef12046289533bc54f014ab0275190e98e79338efe8ebee03d6e7e20a032d1d293b2eb01bf5e0f9e6154f
-EBUILD libnpupnp-4.1.5-r1.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
-EBUILD libnpupnp-4.1.5.ebuild 719 BLAKE2B 415ea177563e017e1a6e72f2c1454a82026a1fd6e5cd4faeb90ee22c7bafc6ce003cd25047eb0e73b41c8130663c917f512176a4c21189ebe27da34ca2f9e53f SHA512 2526b70fb5f9598987493ece325c757050221ebda0f432550b485cafcdd808b2a7dd4286e9d1b27f4d0430c46b9362c89dbc8ac2eeec9ebd95e3b21b8c05e8c7
-EBUILD libnpupnp-4.2.1.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
+DIST libnpupnp-4.2.2.tar.gz 544198 BLAKE2B 450b3bf3f3ef2027bf50ad339c74b20dc4f075aac5c1b2419954bd558f114ca1dd973f5c14962b046cd6e57a0256586070aab7639b7da080452406d8a0fd24bc SHA512 22262e3dcb42f8c5ceb3df6296682ba993c4f86a810aaa63c7a6b5ec277c525d3d666a58840fb40833096e4f69916d309ca549bf67a137f200a236b1f71ec1f8
+EBUILD libnpupnp-4.2.1.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
+EBUILD libnpupnp-4.2.2.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.5.ebuild
deleted file mode 100644
index 12dfef202a9e..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.1.5.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.2.1.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
index e43e9d04e31f..19af384d8482 100644
--- a/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
@@ -11,7 +11,7 @@ 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/libnpupnp/libnpupnp-4.1.5-r1.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
index e43e9d04e31f..e43e9d04e31f 100644
--- a/net-libs/libnpupnp/libnpupnp-4.1.5-r1.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 264a9556fb1f..d023cdb742b4 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -3,5 +3,5 @@ DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620d
 DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784
 EBUILD libnsl-0-r1.ebuild 565 BLAKE2B f1227ef218ff7edb1c5f299fd31d12d4b91467991a5c3036227284accf455bc7524a58f352b13f591396a0535877e5b49d6cf301aaec4da3a8f5124b23b99a74 SHA512 ea2b7ced6307d96991b3a05ba7152b6817c10f21712e14d4e7b389bd0728d3482894e4f0de604ebb381edc091870fd05369d4046df786b64661ec75da8e7dc56
 EBUILD libnsl-1.3.0-r2.ebuild 947 BLAKE2B 490faf6aec16d8c70d880da369b9251590013081f0ea66d97f35205b624c72ec3b33616cb83bc68eb710150c51e42f230183dd85582d75f747756f23f0f72a57 SHA512 3b0846f669028294648d603bf32aca1d2916b9a16ee7e8965f86ebd712a8f29b3731af2242a61aaafa5b0592063b7f3fad85484be546f467ea075fa7bb34ba9a
-EBUILD libnsl-2.0.0-r1.ebuild 1243 BLAKE2B 6ff2d0a324928fe6cf7d0f7119ee5cee70da3a3fd221f2126ff78a8794e6fa1e97f5389e899b61179a6d5e0003099c6009869793943d7d40ab285548563c18bf SHA512 b77830136c7c028483d49fcbaf934ac96b583d707917256225627c5dc1c5bc89b931c450b2406ca34db53aa3f2f99a3bed5d010db961d01d3f9a9d07c5a03ad0
+EBUILD libnsl-2.0.0-r1.ebuild 1235 BLAKE2B 2d43425808e79ae1f163adc5f725bba42d14a4ca5f66847eda759b8f81880523c26957c46326a9f9a4ef717298574f259a703dc68ba3358cf0a4e10a47165a2e SHA512 6704ed03f53815206c546a790f06556b852241b0ef3b23f01f58d57ff5a3250924e52ea60b491f48a632fc20e8583c60376981fa11f551b4f138cad7890e73f8
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
index 01b37a843834..8e1a8de95539 100644
--- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 # changes.
 SLOT="0/3"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 4848501eb42c..6be66bb2dac8 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
-EBUILD libntlm-1.6.ebuild 556 BLAKE2B d05268ed6137b125442b542c78c975833b8f713b39cfc62ea6df28e0267a5a02a3ceb028c18734809a4d4a93a4246a052976ca4485a65af6b2346ca232e278e0 SHA512 7adfa09345eed782b9e44eb51d84d7c6a9d9efd16bf7c5296e35fb51fc73004d93728fadaf8af5d660aa73277f31ae6917c4ef680fdc816679c5099330185e8d
+EBUILD libntlm-1.6.ebuild 563 BLAKE2B 345c966194b8df6a400e9424f1af32dbc59b9e81174e408e541db8d306bc45e91a0ac1fef7f1d709d5bad7d56271262e09ff56b89f15ae5925069b366115beb1 SHA512 d28191eebfd9189609dfdac2046888065dd0acea25f80ba30eeb4a2afc84f38a4777bf6558f3da492e6efdd427e324a0c1e22a101b99bf574a426f96d238f941
 MISC metadata.xml 562 BLAKE2B 5180f4ab64f8b1c8f0691f634bb1ddb805cd559697f5a72f3d278975171c3008599b76e5bfcaf398e8acf1a95b890324ba19053f513858de715f136b272fca0e SHA512 d92a2416bd021c2c7c5ef1614eca883b59c5f7b026d6372f4827d486c32e4f4c5de3654d6743a7218457d6476a1be5a9ebb682e85240bda22ddfeb205a448cd2
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index 9bb9c39d844f..97b84d0fde39 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index 191da9dfbf2e..2cbd1b8afa6d 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -4,5 +4,5 @@ AUX liboping-1.10.0-no-werror.patch 240 BLAKE2B dc51e4dbaa3259d9e751d00be4d61f63
 AUX liboping-1.10.0-report-right-error-msg-when-select-fails.patch 963 BLAKE2B 94ae49152a81164aeb73a3498a9c2a1b2c901b578387cd8c4a376e0f2583d63aded21d9d22552d5804b332faaf9770c961e7e9f2a7312406aed3de68c5afddfc SHA512 506e28def5b7337fd6f883041ee4b69b1bfd4151b30fce5dc330d4d08fed4333c951e5a58791b5fe5d5f65a2126a4268e7bd902715bfdb663f54814cdaa13348
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-EBUILD liboping-1.10.0-r2.ebuild 1526 BLAKE2B 05c422500db66c6d53df79859c471e89e730b36c70104a32b545b560f65b56a89b90ffa1760599f5a01083713eea5720cffdd12fee6b827e5ee5737f4e56d04e SHA512 efe4669ef6abff4ce9be0b4f93139e73c288a2b5514994a05a518bdfb08925bc26d359cc29ba68d4dc9310f7b3122605b8907858ee92961d7f8621d3f47ccbf4
-MISC metadata.xml 718 BLAKE2B b2c0eadf62fc6e49319699398ff14e15addecec059fa1f2a1d708aa3544fdee3b2cc1daa2236b788a3c39517412c3610846d2f6509f502d1b122b3d17c6c1159 SHA512 5c68fa08a0cabca00c59b34650d4759ae067a7585af70b822ddc76855bedf6058326dc9065d4029890f03801686b918a771e93024847f1e237b46ef1cd20d69d
+EBUILD liboping-1.10.0-r3.ebuild 1614 BLAKE2B 76154c9f714caca72ea287ca3231bc1936e5060f37a531bf29611fb6f0135aee6bc2f32bcef04a2f6fdee918448b0136499687a194440de0af1bf6b0fd861f34 SHA512 955ee474651729a1f3620cdca9018462bd3aa9d33abe9d5552062d74eb2454bc7b5f1082a468f5e096df6f82dcf74d4d04015b9a11156cc6091520e951adfca0
+MISC metadata.xml 717 BLAKE2B 2d93cbf6b91421a2671b13beebdfed97c450118e25cbf68c182ba879e07a2c23c34d2c08d594b8eca0e2b90f1a23ec046f4e91773b879319566aec34a69bce6a SHA512 123c59bd06dd253b166e3d76c4cde31a7cc4d49efba6fe2ef1e96d3757eeb24caf5e46217a63bda4cc5308f5b2dd723317c7e292ce8edd42a11b9b1d204ac72c
diff --git a/net-libs/liboping/liboping-1.10.0-r2.ebuild b/net-libs/liboping/liboping-1.10.0-r3.ebuild
index dfa32d0b9ef4..80266390c95f 100644
--- a/net-libs/liboping/liboping-1.10.0-r2.ebuild
+++ b/net-libs/liboping/liboping-1.10.0-r3.ebuild
@@ -1,63 +1,68 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools fcaps perl-module
 
 DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
-HOMEPAGE="https://noping.cc/"
+HOMEPAGE="
+	https://noping.cc/
+	https://github.com/octo/liboping
+"
 SRC_URI="https://noping.cc/files/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/0.3"
-KEYWORDS="~alpha amd64 arm x86"
+KEYWORDS="~alpha amd64 arm ~arm64 x86"
 IUSE="+filecaps ncurses perl"
 
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-no-werror.patch
+	"${FILESDIR}/${PN}-1.10.0-no-werror.patch"
 	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
-	"${FILESDIR}"/${P}-gcc8-fix.patch
-	"${FILESDIR}"/${P}-do-not-quit-when-ping_send-fail.patch
-	"${FILESDIR}"/${P}-report-right-error-msg-when-select-fails.patch
+	"${FILESDIR}/${PN}-1.10.0-gcc8-fix.patch"
+	"${FILESDIR}/${PN}-1.10.0-do-not-quit-when-ping_send-fail.patch"
+	"${FILESDIR}/${PN}-1.10.0-report-right-error-msg-when-select-fails.patch"
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
+	myeconfargs=(
 		$(use_with ncurses)
+		$(use_with perl perl-bindings INSTALLDIRS=vendor)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
 	if use perl; then
-		pushd bindings/perl >/dev/null || die
+		pushd bindings/perl || die
 		perl-module_src_test
-		popd >/dev/null || die
+		popd || die
 	fi
 }
 
 src_install() {
 	default
-
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	if use filecaps; then
 		local _caps_str="CAP_NET_RAW"
-		_files=( "${EROOT%/}/usr/bin/oping")
+		_files=( "${EROOT}/usr/bin/oping")
 
 		if use ncurses; then
-			_files+=( "${EROOT%/}/usr/bin/noping")
+			_files+=( "${EROOT}/usr/bin/noping")
 		fi
 
 		fcaps "${_caps_str}" "${_files[@]}"
diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
index 2a895499c86d..2b599b99ab89 100644
--- a/net-libs/liboping/metadata.xml
+++ b/net-libs/liboping/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<slots>
 		<subslots>Reflect major ABI version (=upstream's LIBOPING_CURRENT value) of liboping.so.</subslots>
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index e8bced45f010..81b11e0cac31 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,4 +1,4 @@
 AUX libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch 285 BLAKE2B c83895dc849645ae83bf2f5e5a7c63fd5d94071af6859744551be298d2de7708d6818aadecfc1d83e6fb93c14cad23d2d3e5f1650067fbf29e4cb43aab8101ad SHA512 d1d59c884ec96ab258aeb9d41ce39949aec97de85859c4fc376b5afdc225495a0f7266b4214140f5f6cc4e0acd1a63a376f070a4393460d36e72934a8398e06f
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 710 BLAKE2B b6e8672f3539597e5461f00cc3d15f63b7dd8808ac716766544541d3bf7277a0bde904d7e6296c073f9814953c10b8525b5b2128b514774aeac9397fe77f7c93 SHA512 8f2cb3ccbd9072d5369199520f32881b8ad8bc79f7d4b99a43dfadaadf3989c30ea7d2c5e5a3bd19195155502c691105a8b33078a25db96a88b4e107354c85fd
+EBUILD libotr-4.1.1.ebuild 717 BLAKE2B 75762cdfe280dc0087751d4e3cabfd0e5c8ac82d482d78be3a136ad336d044ffd11898cea7eb483d214044a54859d441903915840b3053f4d072be06975bbb69 SHA512 6465b3332da987b672284d08e68cc2c2d28bfa74e2e9f024ab5400b4c5140fe888cb04b5a71f524a197e9773027984333fd0012f6de83f49e15d138df00d7c14
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index aae1bbc9b0c9..bc5fc8199758 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 762a0204c0e4..b6c20434a13f 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -2,7 +2,11 @@ AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb12
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3555 BLAKE2B 3df682dcacb157a1913d53a3358da5c4200de894270d38df4aa29997979b5e284e0207eed53db9c39ea85a528a037c832c44eb7167e433781d862b75ad0d47bf SHA512 a83dde4a161c96e2c059c88e5ae54d20f9348d583d43c94c5dbc5cb53887d75c845937a43f6597544a82c4162bba2ae8ed433ec6229504ddedf33ce146585683
 AUX libproxy-0.4.17-mozjs.patch 760 BLAKE2B df245777cd3b9a1d4c6ea30a691b64fde5fdb5dfd52246ed1356041a036e0c883c0f2388b86f56d892e67697a1e3a8fdde050a26480bb1e3962a77e599fa3e7f SHA512 54f1371bf74531d427114aa6d194f2ed2c9ec6288f14315b4adfa50a0d7722e948429f949b647fdf49cf47fb53c05bf3d45070d261330a83c4eb15b58e8309db
+AUX libproxy-0.4.18-Fix-building-without-duktape.patch 1006 BLAKE2B b6b8a704a61e59bca27946b55967a6b413a219811b632b7486c94d66e5d48c78baefbba2a8f12b44b3c926b2009fa4f6a82d0e74a79d5b0b9b2ba82cc327ee44 SHA512 f77d0223c3afabf9e64e09adf64de119edbd6a93458a070b2bca60e4efc58785c45cc1c09114d2edd4e8d9d1567dd96b14ee51748266b9eefc82e5ceafabd8c3
+AUX libproxy-0.4.18-avoid-nm-build-dep.patch 3592 BLAKE2B 7f7f8af5aebbfb176b405db4c666e894b3adf879ba186f3f08a7b82508d67227905cd1fb31af761c8c0d24e362bfe84341243c2ce5fb6c1ea11dead16f6c9e0c SHA512 64a1823b1710ce3be1019ea077b5ce9e1b0f1ff97b8e940bb4187613af797d198ffcd1f66f21399b23a3a0b1133b7fc71ac80c86ff67bd1d9735abcfb5bcb61a
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.17-r1.ebuild 2642 BLAKE2B 952fe62637e6c5af5ca2cc1ecbecd66f021241874d5fb833a7d2da26c66b9a0723071eff46345fbba6c1cb54bb7eaa5fb3d2ac1b63dbeab1ff055d76c85bcaa0 SHA512 a515b773a896a365af5a57c837b32c9c746b1e9cd0f408841c0f461dc2f7b04e08e66f55a87a1ba24708c23fa56c235bd87101e26a74ab3a5fc63bcf77e71d2f
-MISC metadata.xml 692 BLAKE2B e196c11c6fa73bb33410d3eed6a526de85b6d15c56b28b648a32928175ebbceb6cfcca7879dfb23335281a6ace24d571c3726954601d11232ce6a967793318fc SHA512 5d986af4a2e3b887654da557b3466f0b7e3b98a66bbfe7029e24fcd17c4e10d044afd8386e99d0aabe221b79961c68de4c0a8632e4827ac94f6e2da04bd15d07
+DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
+EBUILD libproxy-0.4.17-r1.ebuild 2649 BLAKE2B d7e25db2b99d310671292f10e9b1cfe196d500d9a14d600ae067433a05c737b91aea1d382e705674015b35b250e5bf21506a3646c6a1ac3640e8f78a4cebd875 SHA512 161cde54e8ff01918a7d75d23e7f6088b124ca367ebaf02ee13ab61654b22654b0b6148b53c4357f1d4cd74bdac909e7ac3986b745a2b2fdf217ba99d2560c1c
+EBUILD libproxy-0.4.18.ebuild 2653 BLAKE2B 3550ea47a0a39d7d5e8430904a61c7e493bb16f548236bf51a9757b48cdae676387a589a73df072ac98a48d8e2149d87c2c30a8577b6e384ad345ae83153e7b2 SHA512 608294f098d08fa95258c3569baad16916b2bf179cfa3a32de57d305143485cd8c976240750b794ae3da7d49385c01418973db8caae30ab6f5f9777205fdfb68
+MISC metadata.xml 770 BLAKE2B ae78ea34cf603f837bcb20532febb873d54c9f0e96867c82a2ab095fa94e8c1a1b64d83c6e4f29fbe26c5a21cc3d04b722add5fb88ab74a781ad15fc50f300ee SHA512 90c1cf64ad650e58e172832383a8ceaf396274610d65e0486f9fc19534dda1e5a4356b18139dc62483d7df46769143acd4ccfc35ebe0d18e64dc8a71bd5e5789
diff --git a/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
new file mode 100644
index 000000000000..dd834687553a
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
@@ -0,0 +1,33 @@
+https://github.com/libproxy/libproxy/pull/180
+
+From 54a08b73f4a9bc43356dd50fe91942b4270bfe10 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 21 Jun 2022 00:08:57 -0400
+Subject: [PATCH] Fix building without duktape
+
+Otherwise configuring fails with
+
+CMake Error at libproxy/cmake/modules.cmk:26 (math):
+  math cannot parse the expression: "0+0+0+": syntax error, unexpected end of
+  file (6).
+Call Stack (most recent call first):
+  libproxy/CMakeLists.txt:14 (include)
+---
+ libproxy/cmake/modules/pacrunner_duktape.cmk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk
+index e7918a8..a468125 100644
+--- a/libproxy/cmake/modules/pacrunner_duktape.cmk
++++ b/libproxy/cmake/modules/pacrunner_duktape.cmk
+@@ -17,5 +17,7 @@ else()
+       link_directories(${DUKTAPE_LIBRARIES})
+       link_libraries(duktape)
+     endif()
++  else()
++    set(DUKTAPE_FOUND 0)
+   endif()
+ endif()
+-- 
+2.35.1
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..d62eac9af879
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
@@ -0,0 +1,90 @@
+From f0ae8a0022a18fb26dff0ace0608d1916c68d179 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+
+* asturm@gentoo.org: Rebased on top of 0.4.15
+  also revert 423801295921ab1ec0d98565fcbc2635088d45da
+* sam@gentoo.org: Rebased on top of 0.4.16
+  (same revert included)
+* mattst88@gentoo.org: Rebased on top of 0.4.18
+  (same revert included)
+---
+ libproxy/cmake/modules.cmk                    |  6 ++---
+ .../cmake/modules/network_networkmanager.cmk  |  5 +---
+ libproxy/modules/network_networkmanager.cpp   | 23 ++++++++++++++-----
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
+index 6eaaa01..0afce2f 100644
+--- a/libproxy/cmake/modules.cmk
++++ b/libproxy/cmake/modules.cmk
+@@ -43,10 +43,10 @@ px_module(config_w32reg            "${WIN32}"        1)
+ px_module(ignore_domain            1                 1)
+ px_module(ignore_hostname          1                 1)
+ px_module(ignore_ip                1                 1)
+-if(NM_FOUND OR NMold_FOUND)
++if(NM_FOUND)
+   set(NM_BUILD 1)
+-endif(NM_FOUND OR NMold_FOUND)
+-px_module(network_networkmanager   "${NM_BUILD}"     0       ${NM_LIBRARIES}${NMold_LIBRARIES})
++endif(NM_FOUND)
++px_module(network_networkmanager   "${NM_BUILD}"     0       ${NM_LIBRARIES})
+ px_module(pacrunner_mozjs          "${MOZJS_FOUND}"  ${BIPR} ${MOZJS_LIBRARIES})
+ px_module(pacrunner_natus          "${NATUS_FOUND}"  ${BIPR} ${NATUS_LIBRARIES})
+ px_module(pacrunner_webkit         "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
+diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
+index 6ef6ead..2586bbd 100644
+--- a/libproxy/cmake/modules/network_networkmanager.cmk
++++ b/libproxy/cmake/modules/network_networkmanager.cmk
+@@ -1,6 +1,3 @@
+ if (NOT WIN32 AND NOT APPLE)
+-  px_check_modules(NM libnm dbus-1)
+-  if (NOT NM_FOUND)
+-    px_check_modules(NMold NetworkManager dbus-1)
+-  endif (NOT NM_FOUND)
++  px_check_modules(NM dbus-1)
+ endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 546a8ee..317f1ab 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,13 +23,24 @@
+ using namespace libproxy;
+ 
+ #include <dbus/dbus.h>
+-#include <NetworkManager.h>
+ 
+-// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
+-// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
+-#ifndef NM_STATE_CONNECTED
+-  #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+-#endif
++/*
++ * copy-pasted from NetworkManager-1.26.0's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
++#define NM_DBUS_INTERFACE                      "org.freedesktop.NetworkManager"
++typedef enum {
++	NM_STATE_UNKNOWN          = 0,
++	NM_STATE_ASLEEP           = 10,
++	NM_STATE_DISCONNECTED     = 20,
++	NM_STATE_DISCONNECTING    = 30,
++	NM_STATE_CONNECTING       = 40,
++	NM_STATE_CONNECTED_LOCAL  = 50,
++	NM_STATE_CONNECTED_SITE   = 60,
++	NM_STATE_CONNECTED_GLOBAL = 70,
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+ 
+ class networkmanager_network_extension : public network_extension {
+ public:
+-- 
+2.35.1
+
diff --git a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
index 0f5687d4a18a..5d69bcee8d45 100644
--- a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libproxy/libproxy-0.4.18.ebuild b/net-libs/libproxy/libproxy-0.4.18.ebuild
new file mode 100644
index 000000000000..0e6a926aebd0
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.18.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="duktape gnome kde mono networkmanager spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	duktape? ( dev-lang/duktape )
+	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+	spidermonkey? ( dev-lang/spidermonkey:68 )
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+	# https://github.com/libproxy/libproxy/issues/27
+	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	# https://github.com/libproxy/libproxy/issues/28
+	"${FILESDIR}/${PN}-0.4.18-avoid-nm-build-dep.patch"
+
+	"${FILESDIR}/${PN}-0.4.18-Fix-building-without-duktape.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+
+		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+		-DWITH_GNOME2=OFF
+		-DWITH_GNOME3=$(usex gnome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+		-DWITH_NM=$(usex networkmanager)
+		-DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
+		-DWITH_PYTHON2=OFF
+		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+		# WITH_VALA just copies the .vapi file over and needs no deps,
+		# hence always enable it unconditionally
+		-DWITH_VALA=ON
+		-DWITH_WEBKIT=$(multilib_is_native_abi && usex webkit || echo OFF)
+		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+		-DWITH_DUKTAPE=$(multilib_is_native_abi && usex duktape || echo OFF)
+
+		-DWITH_NATUS=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+	doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index d443844f9a64..c93e411e331d 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="duktape">Use <pkg>dev-lang/duktape</pkg> for PAC parsing</flag>
 		<flag name="gnome">Enable support for reading proxy settings from GNOME</flag>
 		<flag name="kde">Enable support for reading proxy settings from KDE</flag>
 		<flag name="spidermonkey">Use libmozjs from <pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 0d4f6e6542c2..056fb87cf67a 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
 EBUILD libpsl-0.21.0.ebuild 1482 BLAKE2B 5b31899b18c634047d32b55d82fe2e0f7c78318492aef52af159bbd4db5c1a7a8fa505cf2fe0f28d4b4d2dc53b4e24cac4b90f09b873c0606b00140efdb31cc2 SHA512 e514bd98166aa2be3a15a92392346e0552f6ce380dfcff131a757cde1e53f010911fe9786bd9ee718093a81ddd77e3094bca45bedf1e2fb7cb1da446a38f1d4f
-EBUILD libpsl-0.21.1.ebuild 1503 BLAKE2B 07c8f2e680fe3d5c45531dccdcdc3b91a372a558fbf46a78989c9133153b6a516e4293ba2913deb20d59a9660e3abcad7b13faf935f48279682fa82951b0dbc8 SHA512 07ffa35ea9ffb7ece7bdfd01e32564350bc0e2d771331e21a256d0ac10fc70308f83d59001b18a456e9767984fcd6dec499fd174c8c8dd865945ba78399326db
-MISC metadata.xml 344 BLAKE2B 3c8f92722db6f51476a4317fbfd47614782d3f999232df6c777a722195204ecb4b805b45789a54475a9f4941c7ea0c003599b2aa99b0cfce6423d77ebba24cff SHA512 5ee4a6da960951ec9ce6b22ee9f9fc2c3182d5775434fe9268ea712312032cb60d8f512ad45ec8170b868db8636c734dabaaec26fdacea15b85ff6534bb0485d
+EBUILD libpsl-0.21.1.ebuild 1510 BLAKE2B 4718b48fc1e3094d5b45831483810a441ddf11c15fde853c8005319d3518421342c8b7757190cf597fcc820b960a88d8dfb4b558e3dc9f877cf518bb5631a8e9 SHA512 af4b7475011a5a751988ec55e01a0fe76923dafb407788aa7785fc6d5a199d04c5c60eda1a5fce4b5afbbee92fffbf2ac83ce46df6741a8ba08bff89867291ba
+MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index a64f5cc0f2d7..7c98113b4afa 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libpsl/metadata.xml b/net-libs/libpsl/metadata.xml
index 25a0031c8911..1d3589a229a9 100644
--- a/net-libs/libpsl/metadata.xml
+++ b/net-libs/libpsl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">rockdaboot/libpsl</remote-id>
   </upstream>
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 041f2ebb71f5..d8670b0bfcfd 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
-DIST libqmi-1.30.4.tar.xz 1241912 BLAKE2B 561a2d4afd1b65955176490337e4f2335b0468010f0af546ea6026441224fa2713c2e7ed6aab958cb2657755247b75529d390155ef0bfc3aabba738755d28f23 SHA512 969c3e3fc8086c38e9192070eca155f5309947cdd1cfc9b883c27d80c6af2d069098a59e193bf1786260ab4fe4d05375555b5081dd173a88b33d84d409fa4a59
 DIST libqmi-1.30.6.tar.xz 1242612 BLAKE2B 318af914b595f0442f7929be53c128dcd111e12913814bb52e683fff814b7aa00a32d40f8eae367db469a7adef6c146fb692d5908951cec4337f21e9a266a400 SHA512 6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76
-EBUILD libqmi-1.30.4.ebuild 1235 BLAKE2B 5ae87c213329b62ef4524cfa6467c51a293b47adbfa63c8029ba8644addd9c5fafd2e7cc51912ca92cb0cbe0ddbf605a73e5bcabdf992b24bff99c072aa8bcfa SHA512 3706265a9818b428d44a5e1cce48c43f51d847bc33ca846897520426988f3a72150ac797f3b8a50bd7af3d1ed1365160017c6ee05c37a86bdca1367e0caf6032
-EBUILD libqmi-1.30.6.ebuild 1241 BLAKE2B a2e3bfc7855a42feb1b87628b652155ad54853aba4cad2468043fc2faa54b5e405aee9424836e989ff7d405fd79d3367a046ea0cf6bd6503f440c06515c31e8f SHA512 a31f54dfb3558cc2988aa7352866baa9006b665d4cb388998fe96e45121c96f824811e04f1c8a908e37c365e328206b5d17fdb06e031d25070c1b0118f45045e
-EBUILD libqmi-9999.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
-MISC metadata.xml 425 BLAKE2B 95b85fd54d9a2f9836025d60e76d9d51d39f7ff9c08c571b134326bdd69fccdae3f7483b3f3e178bc03939f90a3fafcbf2bc98876b64726172d2bf3b25ce3c01 SHA512 626784480b99bfc5c55ada209c4ee6a8e8891583a34c9f45c1f3ffe3a01b465444e352c3a508b24611a05ea7c4e49c5dbb6157a18d3ac8f478c05871b6ef0040
+DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
+EBUILD libqmi-1.30.6.ebuild 1242 BLAKE2B d4caeb7134774ebaf08147c555c1781a198f4923ddc28acfb0e0ba790050644ec86172b51a21c707800882135ce42fb9dd939bfae9a190f901e0b54d22883381 SHA512 e947b68dcb01bcedec37ede4d6dff4b0d79db06c192b5c0ba2b3f35d567a66ed6eca6cef84b0ea6ad0f79bba8c64dbdeaf80056b92cea4f4f661f6ad86927a5b
+EBUILD libqmi-1.30.8.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+EBUILD libqmi-9999.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+MISC metadata.xml 491 BLAKE2B cbc6db0da5ce117f66475c8a20f1449f6bbb99f1717ac85d29285f6acb2ff7ecadeab7bc7dfa6aa1b5fa9c1a1f79ac5f4074a880cb5f90888f350c2979bb311d SHA512 cf7f4a7084246db2d968cd81a0b79d0f9e389977989912067c1b142e6dc25a9b1c1e6b0caf6038682a38a8d0273c0cfb087286ca5d92b117317d6e99c2858d1a
diff --git a/net-libs/libqmi/libqmi-1.30.6.ebuild b/net-libs/libqmi/libqmi-1.30.6.ebuild
index a73bf3b1aab6..52026ee5e14c 100644
--- a/net-libs/libqmi/libqmi-1.30.6.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.6.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libqmi/libqmi-1.30.4.ebuild b/net-libs/libqmi/libqmi-1.30.8.ebuild
index 26eef8f4e6fb..56d9060d775c 100644
--- a/net-libs/libqmi/libqmi-1.30.4.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.8.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
@@ -16,11 +16,13 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freed
 
 LICENSE="LGPL-2"
 SLOT="0/5.8"	# soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
+IUSE="gtk-doc +mbim +qrtr"
 
 RDEPEND=">=dev-libs/glib-2.56
 	>=dev-libs/libgudev-232
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -36,7 +38,7 @@ src_configure() {
 	local myconf=(
 		--disable-Werror
 		--disable-static
-		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable qrtr)
 		$(use_enable mbim mbim-qmux)
 		$(use_enable gtk-doc)
 	)
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 299b20265bf5..56d9060d775c 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
@@ -16,11 +16,13 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freed
 
 LICENSE="LGPL-2"
 SLOT="0/5.8"	# soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
+IUSE="gtk-doc +mbim +qrtr"
 
 RDEPEND=">=dev-libs/glib-2.56
 	>=dev-libs/libgudev-232
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -36,7 +38,7 @@ src_configure() {
 	local myconf=(
 		--disable-Werror
 		--disable-static
-		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable qrtr)
 		$(use_enable mbim mbim-qmux)
 		$(use_enable gtk-doc)
 	)
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index ada015f36a2b..2ac8814ecd1a 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -10,5 +10,6 @@
 	</slots>
 	<use>
 		<flag name="mbim">Support QMI over Mobile Broadband Interface Model (MBIM)</flag>
+		<flag name="qrtr">Support QMI over IPC Router bus (QRTR)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/libqrtr-glib/Manifest b/net-libs/libqrtr-glib/Manifest
new file mode 100644
index 000000000000..5737640f274f
--- /dev/null
+++ b/net-libs/libqrtr-glib/Manifest
@@ -0,0 +1,3 @@
+DIST libqrtr-glib-1.2.2.tar.bz2 26398 BLAKE2B e52cab3e4ac85c53a51782d7d6b3658060282f2e75e1ce2ff2e0c52dfb3343f5ba43c03f58c25eed73c2bc16254672a828318daae00bd2900ffda9ff23b38d27 SHA512 b21df1685c2474c1124e6f6bf12c552a06a28986284fde876210a3a6db8c19872a5458cae622bb22020ffd278167f52eba38d763ba633e783fa708863832bade
+EBUILD libqrtr-glib-1.2.2.ebuild 895 BLAKE2B dbccbd070596415ea07ddb58923d18e095ce054da7ffc8876523d75f814a56bd22518e4aab467508055925d4d56d1869d833e80c9da21ebddba0d5429d1a4362 SHA512 07cc6f2c1591858049306a41df9cf1755881492f3032a365024b9bf371c5b1990baa5cc74e22570559641b2f04da8197cdaa58bd1ae9049a601d167a0088346f
+MISC metadata.xml 327 BLAKE2B 1bc75a5f4160e28aa0824fb73a8a7ca267c66a371ad768101a5ab4654d4b02a82607be5ba20a2039bc0842932a43e2c77b9e350d509705457cc2921e9a30d49e SHA512 f11b8ad6e0ce009aeae86dafd556578f6dd2ebec9bbd71367c6c534880461de0bba4cc9f7cc69a77f521b9102f5629201ebccc87511a00aa1a2ab80057448c47
diff --git a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
new file mode 100644
index 000000000000..e361d5ff82be
--- /dev/null
+++ b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/${PN}/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="Qualcomm IPC Router protocol helper library"
+HOMEPAGE="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
+
+LICENSE="LGPL-2"
+SLOT="0/0"	# soname of libqrtr-glib.so
+IUSE="gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	dev-libs/gobject-introspection
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dintrospection=true
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libqrtr-glib/metadata.xml b/net-libs/libqrtr-glib/metadata.xml
new file mode 100644
index 000000000000..84eb279f41da
--- /dev/null
+++ b/net-libs/libqrtr-glib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<slots>
+		<subslots>libqrtr-glib.so soname version</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 879ee34018de..12dbe97ced39 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,5 +1,5 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
 DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa
-EBUILD libquotient-0.6.11-r1.ebuild 877 BLAKE2B dd7486235556da406819e89dc4e00f2b1249ab15f13d4c200f4759f746afa0f3cf29919bbc159b68c2df164cfc6b5e80a8c6c8f47b79a3eb6a29ae7c8e07a9a0 SHA512 a07ac11f3ac4c7cd01b3a988b81bc6b247ca08edd7976c291a05c68033b3b050498715da44f60688bdbadf8c58b83deb926604c82efb27ea2f96956e62668970
+EBUILD libquotient-0.6.11-r1.ebuild 884 BLAKE2B 0981774edca56b1d36903fb93f6e7e07cd2a0a2588b3be94cfec0e5c08dbad1a5ec698712b4e9eebb667688e196e654f9203201ae94e8b452cda61d6e21df37e SHA512 8cf90f54efed70cd3244c6dddc5a057032a595133467d8f7872035156f931a4b55fed51adb407e81afd2552a6522fb4d297b1988e305a92c1d06493954cc1281
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
index 1f6f903b7c65..6e9390a92391 100644
--- a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
+++ b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libQuotient-${PV}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index d281765978db..b34dd0202941 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1,4 +1,5 @@
-AUX librouteros-1.1.2-remove-Werror.patch 229 BLAKE2B c1a10b121c1bd835fc97aa864af5fae7350c8c4af77ca475f7ad4a8bdf1368410fcfc7cdcdacb65ebd1e51cd6f60bdde1b0ddb054f12927e4809edede74e0091 SHA512 e46dfec5344978595de438ed210a238c9380db4b74c26d31f55bbaac75d694ddece70a60196071ebc821fa6363ec52356d39892408cf5675c29aa3a239fcc58f
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
-EBUILD librouteros-1.1.2.ebuild 648 BLAKE2B e1a786e84787c9a6088b329705db0e3f5cac8f6c6df4655212b8a3ad52cbeeab743e9e45de3135473ff5dc47435b52e94902178675fcf589ee4f73c02c403539 SHA512 0fd3017e5510aa77db1b710c1e3e54c75e135e2bbbd9d4d7f5f536151d39dd29e1b6f07d589acb88f6e0dd476dbb4aea628b67ebd70a98451bfc601d918f32a6
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+DIST librouteros-1.1.3.tar.gz 20319 BLAKE2B d7527508e671c38ba12edd924300d53b10763bf3769378df3f988a4242ab8c4604d71d6afa55e963477a04b18a6e2afdae0123072d0876b793b022857bfacf30 SHA512 ff477efdf206a7c6f062af8b8d5636b16fa9a9c5a73e49fb78df9de38346063af5bf43a2057bc0b910350c1554e9a4915c6ee5b91b3822ee5e664db8754a8126
+EBUILD librouteros-1.1.2-r1.ebuild 644 BLAKE2B 6cb498f77fa947b51b5ec75b5eb6d421b083af8fa8c51cc3079e16fbbdf5f30412d1bbf8d908e9bb249ad5f055b43bcd3a93616c451004b07f88b938902dc087 SHA512 8000872e6a64261455bde47ef3b1b9f148303c4146880393a8adeb6af5298d8a5e4c913f8d637cc548d79fbc30e0ed640550ce1589016c0920e6ae3d5d470932
+EBUILD librouteros-1.1.3.ebuild 622 BLAKE2B 37e4a763c9fea730249deee173fc00b036b3b3934664f44e8377a4d4e6cd1cbde51a7d982c373b9fd72defcc223ad58fc478ddeebd0dbbba7141ce46ce449df9 SHA512 e5dd7ce4609a579895642ee766e6d17c640385099bd6310ea9ecff3471540c60f5580872efae38d1d76de2d5bd5bb46247efbdbd9485a084cda09650a110053e
+MISC metadata.xml 396 BLAKE2B 8bab8343ff6cc62802bf49db8fdb3fd5ad19cb150ec0f0f781bbd9685a007380e94b49df15504c823f2c82b54154a6a37efcb2de21d3632c7ee285085710ae8a SHA512 a7ad3defc8df5eb2a2412fbf07174d4d10f1e7ec7806c32b0773e573006fa4a689b276c488694c07969f404ca25c7c9fcf9fc25f9730050e82d819c38acf2882
diff --git a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
deleted file mode 100644
index b3f005a4be3a..000000000000
--- a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- if BUILD_WITH_DEBUG
- AM_CFLAGS += -Wextra -g -O0
- endif
diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2-r1.ebuild
index a6be5fce2804..cfa37b501172 100644
--- a/net-libs/librouteros/librouteros-1.1.2.ebuild
+++ b/net-libs/librouteros/librouteros-1.1.2-r1.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
-HOMEPAGE="http://verplant.org/librouteros/"
-SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
+HOMEPAGE="https://verplant.org/librouteros/"
+SRC_URI="https://verplant.org/librouteros/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch )
-
 src_prepare() {
 	default
+	sed -e 's/-Werror//g' -i src/Makefile.am || die
 	eautoreconf
 }
 
@@ -30,7 +29,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/net-libs/librouteros/librouteros-1.1.3.ebuild b/net-libs/librouteros/librouteros-1.1.3.ebuild
new file mode 100644
index 000000000000..663f240b6072
--- /dev/null
+++ b/net-libs/librouteros/librouteros-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
+HOMEPAGE="https://octo.github.io/librouteros/"
+SRC_URI="https://github.com/octo/${PN}/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//g' -i src/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
index 85e4ed814fa2..a3b996f6ac77 100644
--- a/net-libs/librouteros/metadata.xml
+++ b/net-libs/librouteros/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/octo/librouteros/issues</bugs-to>
+		<remote-id type="github">octo/librouteros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 0f7e78dcb8e7..971751843caf 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,5 +1,5 @@
 DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae
 DIST libslirp-4.7.0.tar.gz 143251 BLAKE2B f3e1c3a31f09462d79ca6c663a05bde02b075090f3a5f7bc69fef3c72b8517c11a123ad7b46f4b2855cbc9a7a5dbde8d1cb2d5e3e2a9d7eedbe570c200f8bcc6 SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f
 EBUILD libslirp-4.6.1.ebuild 830 BLAKE2B bdb2a15d9a711af1959b631fba2d12eaef2db1b2bbac57aafea1456aa4354f9fea0c6c4fe4bb183a531b93297bea186f0e1d86cec1b2f6e3b4e03282181b4d4a SHA512 1bce8595b6888746833a47909c9b4a7a8c3d60e0c99d78a36c778c01c1db39b55d9566f2feb461d27aa2dec58dd10e433aa48b52cd83c72c76a92438b3863f62
-EBUILD libslirp-4.7.0.ebuild 834 BLAKE2B 626b69a1980800059e6a438946cb43cd44992fdbdd07f5adea877b302fc1eb0187879ad32538640f5d9b0a6353616513b884890217f9b66dffab47f5a8f81e4f SHA512 1ce850cc2afbdf9346c20cb93edb89e62bc4574e909f41fba0a33e6bf8ecb54d6e9a2a2607a0d99be026d403a6e6aeb6a89947e8f310ffb68c515dd4f968825a
+EBUILD libslirp-4.7.0.ebuild 841 BLAKE2B f6fbecf8fe06c5f38c6ca4d62642608217291e2e53397a74b0064d1478018fff4bc92e5ecdd9c8aebbeaf7d3ee1c6cc77642e4ea6d157d75638a47073aadbfa5 SHA512 e86a3e613f0b9c03433d157e815b0fafcc32fd77fb4ae44d597b4a9df11bc4c65a0b4c6a21aeab8f54cebec4178c94f7f132d880ad7e5834f9f7e4869fcf4060
 MISC metadata.xml 347 BLAKE2B 5437bd93b104cc9c49978c86236b2068a8f0bf0e4639f0a022c96b9a7a9db9d3ad338ed753b89381bb94b72c59a67aadcd7bc94f8dd0a9cc752b550384b165bc SHA512 7dace6c54156cf3d129452917ff3e73b86737ec71aade2e201008050978613179afaa3030ccc97a1619d431bc5c26a233a0036c1322e3108556feeada84cd380
diff --git a/net-libs/libslirp/libslirp-4.7.0.ebuild b/net-libs/libslirp/libslirp-4.7.0.ebuild
index 8af6b877d67a..7f4caff4570f 100644
--- a/net-libs/libslirp/libslirp-4.7.0.ebuild
+++ b/net-libs/libslirp/libslirp-4.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="~amd64 ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A TCP-IP emulator used to provide virtual networking services"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 49a2d12afbda..060aab164302 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,10 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
-DIST libsoup-3.0.4.tar.xz 1523336 BLAKE2B 5df12a2bafdd36905fd2122b1123ce630ffad93de5965eb2f3e47f85f3bc3169e8c005e245ee9ba72433fc735d7b24b304bac55b800bce59506961976a57f634 SHA512 4e6c226dfd8dd3fb2568affdbf88b8f0ad52903198c1dfc808c4cba1c0479442581953b5fb83166a3a198fb861618b62f165a4544b5daaed094bbeeff94a48ff
-DIST libsoup-3.0.5.tar.xz 1528824 BLAKE2B 952b72e81d61d4aca2a5c035bafa37deb3ddd26a35a285aa2c09731b60b675a9f90bc185abd4787c16e8e9fb1007ae633a6f91c6e58df9eddb04249b503adc13 SHA512 38d1ba57bcd390385950cf79cfe6781d9ad59e5f75f2c080adac976f2fcfa020cbada1e63fedd780b1efe33a53fb7563b73fd38f011c462d92a90988e4fed9b8
 DIST libsoup-3.0.6.tar.xz 1527232 BLAKE2B 28a2aec2323686af692bfcee3126c76b8506c7721b81bd3beb276b488ec6c26498e4b1396ea6d3537cf00a203cbca2798ea414c4d2227f9c520660fc61459804 SHA512 4de84b3c251b6fe75903b1cd2647ac22055f799382a186efe6f45d3f75bf6c82040f0aaceb40d0019769cf1c0295511eb0afbbc7236e93b168ed70c2ae975a89
-EBUILD libsoup-2.74.2.ebuild 2935 BLAKE2B ce060804ba36afb692f75c623715caa3c982c8aff3d31a4c11a5bbe5465da06065f890711ba63c2f3abf90bf339c2c7f15ec89805223a6f43abd157a34231826 SHA512 b1c738b2e82764f3733952b4f6adee85e3c7b86e6107b9f66435042443ff77f3bdff89757604e870684227aa660d1203c3efafa8877e92fde2c3e0e125792886
-EBUILD libsoup-3.0.4.ebuild 2915 BLAKE2B a6746efa0607805d0297627c659d7c9205572a8f38962812a009e638c5f320ebed9ea04cf517734739ef9031627182b394a7b50f9a86c5b3d5316e0ab24374ed SHA512 ce89efaa580533a32c5fec7f992455491af0f49b9118a3980791751979d02722163182b0fa62f183e94fd42d19697ac591c94d1508bd0bc0a2ffa6565473aa08
-EBUILD libsoup-3.0.5.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
+EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
 EBUILD libsoup-3.0.6.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-2.74.2.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index c8a8e7e509d1..7cb4a1169afb 100644
--- a/net-libs/libsoup/libsoup-2.74.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-3.0.4.ebuild b/net-libs/libsoup/libsoup-3.0.4.ebuild
deleted file mode 100644
index e6bf69b822a0..000000000000
--- a/net-libs/libsoup/libsoup-3.0.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-
-IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
-	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	sys-libs/zlib
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But unnecessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-		$(meson_feature test pkcs11_tests)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-3.0.5.ebuild b/net-libs/libsoup/libsoup-3.0.5.ebuild
deleted file mode 100644
index 84e2cca340d9..000000000000
--- a/net-libs/libsoup/libsoup-3.0.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-
-IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
-	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	sys-libs/zlib
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-)
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But unnecessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-		$(meson_feature test pkcs11_tests)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 48b49b7fb25a..b3457bb24b8d 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.9.6.ebuild 3116 BLAKE2B 6a0077250fd03f4599604d3dd3b3dcdcbba74fca404d4433c0f6e01a68ad8773b72b670f2dedff280b0fee3e5935638f67c555561b02d8efe3aba988452f7fff SHA512 c3c2b7244162ef759a81556c38149188bfb698859e78296c1ccbf0e32f0067410610165e0979bc8cc19f394a899ed598246e6da1c0cb026b997fefe0e5fba792
-EBUILD libssh-9999.ebuild 3117 BLAKE2B 98eb87a2073ee4a86a2f339d5c37fa89dbb16e1ff6d7548b5ba6e4b051ba24180742d6c90747498c3939236c0fdbfa3d9de9ea28e077a35cfd41aa1dfcc29e47 SHA512 6a300f9e1695c444657fcd2fd19f25cc2d8ee6451076c0e039107c602f056bf23b2b3e8478ddacc5d8416dc2d4a7e383a3ff6afd858b2f4b4d337a8d235f4bf7
+EBUILD libssh-0.9.6.ebuild 3268 BLAKE2B cf682fa14d16310b5de085d57e20cf5a74ff68a1b3887dba0773ed416e739e10ff4efff53fde167e3024116b897a5b5c97a5bf99948dbc43b4c2237fc65999af SHA512 51d4f7d99b7fb75baa1e25aa0b0cbfd30caca50cbf6d98b72b9fc89b720e1b35e7ca476db03455774ef7d3ba3cf892fd86a3a72e2cb88b235c4f46566038dff6
+EBUILD libssh-9999.ebuild 3276 BLAKE2B 5439954e434a465894c111b7db969e0c033f8cbd6f03e326a114c69be42b4aae74665c0c1df2eeb6a078c37a70bbea2195353a6a68984f471a3f838f6bfabc9c SHA512 617e665aecd2a116626f28d56bab4cf498d1ffa17c9eed5587f073c9d734b130058d6afc661902a1ae87820b5d66f434197d7a15e22a045839464aba88eaf027
 MISC metadata.xml 629 BLAKE2B 7e39c205fc187646d471362dd85d59f3d7988a151eec3b758c6d830ff0b0f472f4d49e38d9bfe9c99b504b52d7db1db384c9286cc41d9627fdf9a5f3c1989aab SHA512 02a38b6ec328a0b638ea94745e97a2e0f3bdf767044124b3136a6425120fbfcd377ae2b0d78a22c62569dbd8e90d795c47ce3ede81f5acbf8ba26582f36c45e2
diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild
index 3aeecf20fd7c..5283a50c1f61 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
@@ -39,7 +39,9 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+	test? (
+		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+		elibc_musl? ( sys-libs/argp-standalone ) )
 "
 
 DOCS=( AUTHORS README ChangeLog )
@@ -66,6 +68,11 @@ src_prepare() {
 
 	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
 		-i ConfigureChecks.cmake || die
+
+	if use test && use elibc_musl; then
+		sed -e "/SOLARIS/d" \
+			-i tests/CMakeLists.txt || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index ba3c105ee10e..7b1299b71476 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
@@ -39,7 +39,9 @@ RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+	test? (
+		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+		elibc_musl? ( sys-libs/argp-standalone ) )
 "
 
 DOCS=( AUTHORS README ChangeLog )
@@ -66,6 +68,11 @@ src_prepare() {
 
 	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
 		-i ConfigureChecks.cmake || die
+
+	if use test && use elibc_musl; then
+		sed -e "/SOLARIS/d" \
+			-i tests/CMakeLists.txt || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 4f769ec59bda..f2f68e859ace 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,4 +1,4 @@
 DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.3.2.ebuild 1485 BLAKE2B 28e00986cbcda4dac6bc13bf2abd93eb99743e1724bb69ca1805f895d226b18bd1dfd51ad5f8692b954155d39dbe76b278769e12604569727483e63679d36b83 SHA512 68305b7e73eb48f07dfbc0f7a13a7748e84488002c5f3c08cc7fa0bd108ef67965a61fa4330e91cdb2d18cf3ecd2a630b81ef7d101541ee2fe22a87938594545
+EBUILD libtirpc-1.3.2.ebuild 1505 BLAKE2B 4401d8de52c71bf6be066b36a3d27c308bb0fd1b7ee8d027fc5a1e8c26183b86412f001275274377ff60ec207a16ca2815daf19f0fb4a186d9be343bd5157d61 SHA512 c1d0c9d720ce1eddecc1e6b32be3f2b95d6b70338c377440bca6cf578a8eb49bb8bd4eb8dd1051e518166900a05fe6a90cc459a056ab96ed1e2a6f8f5d07a282
 MISC metadata.xml 405 BLAKE2B 3006391cb2dac9927f450164f2705d31c35172560ddb436edb76f6c56efc2915a63d57e5be8835801b3b4bbe77526cdaf681b49c4fa43285549b7f0707af4814 SHA512 63489cba710ba40c334508406bf10c28ddc2133cd3eab86afde1670e3d4bb126d0e77abb45c99fd7b6abd438a9e7cc5a10b6742563be51601c7945c87419c928
diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
index 1db380303e0b..8b1e3780df4b 100644
--- a/net-libs/libtirpc/libtirpc-1.3.2.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 0967b9a83f44..0d5f81094562 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,18 +1,3 @@
-AUX libtorrent-rasterbar-2.0.4-asio-ssl-error.patch 878 BLAKE2B d9f82601d9600991f7f361c347690cd944316515fb48f4adcd9b721cbc02ffbece050a57597e35e6f525f717435938e15dd19cc9649fc07daaef553f76a910d4 SHA512 523a6c3a878e5ea73356dabf29818c9e3e6f123f408759a0f60998cbfc61fdd6baf96047a72702d5c8592d25554d2f2ee17618b7fc32720b22b3a0708fbc0ab6
-AUX libtorrent-rasterbar-2.0.4-boost-1.76.patch 2557 BLAKE2B db450f88f5eaa17533cb1c0eadf292ef4d4efb5f0ec6093ecd2f3bcd2ddb45460a8bab55e8b440644e97955ae4cd4ee8b1b4977564011cc2c27d90a444df92b7 SHA512 d5f56fb9d2ce8d0807a85b69ab4a0060f96a498159ba76acd7c2f72f9808ac2bb161d263a2ee3bfc07376d2d1c8252ab7646c38fc5935676204c790b7766f653
-AUX libtorrent-rasterbar-2.0.4-boost-1.77.patch 1972 BLAKE2B 31b91cc9ec963fc94fdab61e2fa0f7b0e55f2fea1d2f84bbe2cda409863ec0d0248b4fdb2e85b049165a46ad77cf8e2fffbcd634d01b58549372d9a3045b8890 SHA512 78cca1965d2cabc384051e3c9555d49e5137f025b0211120bd5abdf90897af200f87c95526ff9dc919356f6794ea04ce973dfcb774e7b5d1cd20ebf34e80f89a
-AUX libtorrent-rasterbar-2.0.4-python-symbols.patch 910 BLAKE2B 9467f84b6edb168173ff4745649d8d930ddb6524d2b0aca1aafb7287f4fb0fae05edfa43244526e7f3ef116fe85e8547b9e515140d5754fa4cb19d6c89f02785 SHA512 c72324290bdf675aa211b40ffac3a83bdf77e9cda94e0a9cfea41264be815addc6432464cd7223d962a346a2fc3cd1b2c59968aaa067e98a755ef9c25834bf71
-AUX libtorrent-rasterbar-2.0.5-boost-1.78.patch 2885 BLAKE2B 59e3dfae99d493258332b7af5e3eccd4401fc2ed7a7bd98639db5ddc8e27c6332189640046a9eb60adb0c9b3ca35dea13016ad0aa270dcbcec02111e675a3695 SHA512 fadb078a4726ec2ed0cc97787a71b0ec19f4be951d2e2358c5d3807d4f48c7f2eae9742cefc2999c997ff9b5e7b726c07043e19fab7980750658565e047902a8
-DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322
-DIST libtorrent-rasterbar-1.2.15.tar.gz 4163049 BLAKE2B 282d6cf19897706f96d68c75df3c1f5f004df38c07ca2fcaa760f0004512dc8759ea47d4e0c96ff4d8ac2d23569a05507c5dd0667d83c702e14825a0d9ffcd0e SHA512 c409c53ec9c299a05b51ab61d7df1209803cbd6070f0a014dd6fb42c30f6f5230ea90848330f901c61816bc70901e618409acacc95bb0e5acb7f81211d001fa2
-DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11be84860cfb0e9224901a6052d9acb80edbd9f9e6eeb2e621e30e75fac4c4db64c71573b7c7f91761e74b9c5781ef8d1a202aef06cd92e3edb15d9f810 SHA512 f3afc4e0857838a44fa3671d657b5f669194c504d07d8f72ca5ddc060786127e3d6ad4ae9efa39e9f02fbe396f4785a1755dd1fd9607c1cef31aa60574b3511e
-DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1
-DIST libtorrent-rasterbar-2.0.5.tar.gz 4407260 BLAKE2B 71c64879be103326fe438ba6b11b672fb0d631ed0de4eb23c2595f3596b522693594ded9f8733c7827dd668e285cb5099cad78bcd437ec184837eafbd39b356f SHA512 be5b812135dada957e565085b5bdda06827c8427f78a4468ef263e1a1e33d3a0bbba7ac27235f0d17ae6087d54311281e3b1975eef81cda514acc8329862dc04
 DIST libtorrent-rasterbar-2.0.6.tar.gz 4431174 BLAKE2B 4951a102b68a5a7ba9a98d771ca638e8438b2aeaa95f5d7bf616542c7a02d28e184ee1bf5b7a55cd91a068cd2d4e9756c479e4ddb5eabe89d8aa833d70aa7502 SHA512 4a5d710706040ef6193967dbb13998cb0ddebe7e95c3bf8aec0812876027c68c32b001fd3f07cd4ff1b819660a8d46ae8c7077e72caf92572288a51cdec7daea
-EBUILD libtorrent-rasterbar-1.2.14-r1.ebuild 2588 BLAKE2B 481eb4d68ffde21e9839f04b1102348923087540e50172d5c612aeced221f76e1b99d44b72fd81a7772ce74989c33928957d77c579f996e5de492769f16b54f1 SHA512 642425ba009fe39ad2c7bd87daf1bdd45020b4b69de99e4ab5031c09dd1f24518c41c74281d6cbda32b24684c60134ee66496dd8674ac221796e8e625b1ae529
-EBUILD libtorrent-rasterbar-1.2.15-r1.ebuild 1728 BLAKE2B 438d294bf4874966b9fd0edbf61de4fd0801a0d8fd191a405c6dc932fd9a726954216bc13f26829947ed61ae236f29fd6bdcf3443b63fbf3efb7bb006339bcf7 SHA512 a848b4a29623c89ef485defed3ae6a310400c58b1a3b17a4091d347c6ebff7837fe35d9eeed72cfaf3dbb13daa100f14263a0299e4178a48dfe3783df68d6028
-EBUILD libtorrent-rasterbar-2.0.4-r4.ebuild 2267 BLAKE2B 4bdb1808b6ede39a38591d1cf65ba9c4a2311ec3b588cbab6baf2b5db78771eef2bb430829a0d42f27ddecf2e787121fc9ffce3cadf25a75b034515c1ba8bdd4 SHA512 739451f9e602217319e5487c7fd5abc1f846a3bca186d28ebc42cee68a8bf0582d1b6c2497d51dc5ddcdd609df4a158fbd49404cb79b9d3f6ed68ebefb40f158
-EBUILD libtorrent-rasterbar-2.0.5-r1.ebuild 1937 BLAKE2B e0a286c3fc5ac40afe37f0d3abcee859c9c8f501c2d8fb7d95870890e333cde3b023e60094b666fd6ea3cae98ea290c416b073bda17d2cd5cc200755f08c0ea1 SHA512 38540eaaac6e50bebf427034b97a0ef68def045887afcfdb8d74ffb0ed1dee16d0c267965cf39562fa6ef867c887c99d016ebbad0afb4cf72dac152ea037b61a
-EBUILD libtorrent-rasterbar-2.0.5.ebuild 1900 BLAKE2B feff92efd3d7275eff8326267d939f07d162faedeb495ba7c9013b21e6e6538a83ecde6860ecbebc28c9f28f33f227788014f5f6cc55d8e9b9ffa831981c73ee SHA512 998da1f5a71d98ee8190adf6483371bfd3943c2da5f5577843111e9a70aacba3aeb612e568e80abdc2d050ea76a240c8f344bc4843dc7c7004362a6267e2d8a0
-EBUILD libtorrent-rasterbar-2.0.6.ebuild 1852 BLAKE2B eef159dbf0edb79344f020fb3b2538080b9292a2edb72debbd8332c30f23d7ce0c0a31d964d9de903abf3cd5671d6285269f1c884efb49c2ffd431efa4041c93 SHA512 cf82aeb4f9ccf827652ec1a7aed81d431efdf0d792567c7cf37f8f9162eb52e83868c3f721e47a09f43e6acc8c49e15bdf84a615b7957322e7bc48be48f8f073
+EBUILD libtorrent-rasterbar-2.0.6.ebuild 1850 BLAKE2B 2b4fe24bef99ac335a888f653d4d2402e0cfeb919704931186354bb37fd29898b795672759e2811fc9035d7973d59b6fd9fce722aabe2f64bf458c7a1b799bb7 SHA512 28ce23d78b2f0bf91b4be1c21433971e47c1805feec0b9f0dd28eab906d30ee00495e1fa601e14fc291b89874bf16ab0afa29d57ea4e924b178720f264174e9f
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch
deleted file mode 100644
index 5c4e90ff852d..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/arvidn/libtorrent/pull/6547
-
-From 61ebb3317b1f8a63fcf4d018a21dac6818ea21cf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 31 Oct 2021 09:16:46 +0000
-Subject: [PATCH] Add missing include for get_ssl_category
-
-error::get_ssl_category is defined in boost/asio/ssl/error.hpp, so
-include it when we're building with SSL support.
-
-Bug: https://bugs.gentoo.org/820836
-
----
- bindings/python/src/error_code.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bindings/python/src/error_code.cpp b/bindings/python/src/error_code.cpp
-index 2fc5f42..b947119 100644
---- a/bindings/python/src/error_code.cpp
-+++ b/bindings/python/src/error_code.cpp
-@@ -49,6 +49,7 @@ namespace boost
- 
- #include <boost/asio/error.hpp>
- #if TORRENT_USE_SSL
-+#include <boost/asio/ssl/error.hpp>
- #include <libtorrent/ssl.hpp>
- #endif
- #if TORRENT_USE_I2P
--- 
-2.33.1
-
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
deleted file mode 100644
index a3cdd811e2a3..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://github.com/paullouisageneau/boost-asio-gnutls/commit/895105972e5a9318d572b147c1872f64d23e2a8e
-https://bugs.gentoo.org/820836
-https://github.com/arvidn/libtorrent/pull/6546
-
-From 895105972e5a9318d572b147c1872f64d23e2a8e Mon Sep 17 00:00:00 2001
-From: Shantanu Singh <shsi@microsoft.com>
-Date: Fri, 18 Sep 2020 14:01:39 -0700
-Subject: [PATCH] Use fully qualified std::placeholders to prevent conflicts
- with boost::placeholders
-
---- a/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
-+++ b/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
-@@ -244,8 +244,7 @@ template <typename NextLayer> class stream : public stream_base
-             return;
-         }
- 
--        using namespace std::placeholders;
--        m_impl->read_handler = std::bind(callable, _1, _2);
-+        m_impl->read_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
-         m_impl->bytes_read = 0;
-         m_impl->async_schedule();
-         return callable.get_completion_result();
-@@ -293,8 +292,7 @@ template <typename NextLayer> class stream : public stream_base
-             return;
-         }
- 
--        using namespace std::placeholders;
--        m_impl->write_handler = std::bind(callable, _1, _2);
-+        m_impl->write_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
-         m_impl->bytes_written = 0;
-         m_impl->async_schedule();
-         return callable.get_completion_result();
-@@ -568,8 +566,6 @@ template <typename NextLayer> class stream : public stream_base
- 
-         void async_schedule()
-         {
--            using namespace std::placeholders;
--
-             if (!parent) return;
-             auto& next_layer = parent->m_next_layer;
- 
-@@ -581,14 +577,14 @@ template <typename NextLayer> class stream : public stream_base
-                 else
-                     next_layer.async_wait(
-                         next_layer_type::wait_read,
--                        std::bind(&impl::handle_read, this->shared_from_this(), _1));
-+                        std::bind(&impl::handle_read, this->shared_from_this(), std::placeholders::_1));
-             }
- 
-             // Start a write operation if GnuTLS wants one
-             if (want_write() && !std::exchange(is_writing, true))
-             {
-                 next_layer.async_wait(next_layer_type::wait_write,
--                        std::bind(&impl::handle_write, this->shared_from_this(), _1));
-+                        std::bind(&impl::handle_write, this->shared_from_this(), std::placeholders::_1));
-             }
-         }
- 
-
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch
deleted file mode 100644
index b39f62614b2a..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/arvidn/libtorrent/pull/6412
-https://github.com/arvidn/libtorrent/issues/6405
-https://bugs.gentoo.org/808084
-
-From 906cedddedbdf9d98ecf2bd19340f7f17869b968 Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Thu, 19 Aug 2021 11:54:13 +0200
-Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux)
-
----
- include/libtorrent/aux_/allocating_handler.hpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
-index 9d826d11a1..b24349850e 100644
---- a/include/libtorrent/aux_/allocating_handler.hpp
-+++ b/include/libtorrent/aux_/allocating_handler.hpp
-@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux {
- 	constexpr std::size_t fuzzer_write_cost = 0;
- 	constexpr std::size_t fuzzer_read_cost = 0;
- #endif
--	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152;
--	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152;
--	constexpr std::size_t udp_handler_max_size = tracking + 144;
--	constexpr std::size_t utp_handler_max_size = tracking + 168;
-+	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
-+	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
-+	constexpr std::size_t udp_handler_max_size = tracking + 160;
-+	constexpr std::size_t utp_handler_max_size = tracking + 184;
- 	constexpr std::size_t abort_handler_max_size = tracking + 72;
- 	constexpr std::size_t submit_handler_max_size = tracking + 72;
- 	constexpr std::size_t deferred_handler_max_size = tracking + 80;
--	constexpr std::size_t tick_handler_max_size = tracking + 112;
-+	constexpr std::size_t tick_handler_max_size = tracking + 128;
- #endif
- 
- 	enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
deleted file mode 100644
index 109a6490af23..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/arvidn/libtorrent/commit/f2eefd327f1ca89b053eb1e5f4ed229efe52e47f
-https://bugs.gentoo.org/820518
-
-From: Nick Korotysh <kolchaprogrammer@list.ru>
-Date: Fri, 25 Jun 2021 22:08:00 +0300
-Subject: [PATCH] added missed sources to Python bindings CMakeLists.txt
-
-fixes libtorrent loading module issues:
-libtorrent.cpython-39-x86_64-linux-gnu.so: undefined symbol: _Z16bind_sha256_hashv
---- a/bindings/python/CMakeLists.txt
-+++ b/bindings/python/CMakeLists.txt
-@@ -49,6 +49,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
- 	src/entry.cpp
- 	src/error_code.cpp
- 	src/fingerprint.cpp
-+	src/info_hash.cpp
- 	src/ip_filter.cpp
- 	src/magnet_uri.cpp
- 	src/module.cpp
-@@ -56,6 +57,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
- 	src/session.cpp
- 	src/session_settings.cpp
- 	src/sha1_hash.cpp
-+	src/sha256_hash.cpp
- 	src/string.cpp
- 	src/torrent_handle.cpp
- 	src/torrent_info.cpp
-
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
deleted file mode 100644
index 93e14963e366..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Sun, 12 Dec 2021 21:52:15 +0100
-Subject: [PATCH] update allocator sizes for boost-1.78
-
----
- include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
-index 726032e085c..7096dfd2e67 100644
---- a/include/libtorrent/aux_/allocating_handler.hpp
-+++ b/include/libtorrent/aux_/allocating_handler.hpp
-@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
- 	constexpr std::size_t openssl_write_cost = 0;
- #endif
- 
--	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
--	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
--	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
--	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
--	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
-+	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
-+	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
-+	constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
-+	constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
-+	constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
- 	constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
- 	constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
- 	constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
-@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
- #endif
- 	constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
- 	constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
--	constexpr std::size_t udp_handler_max_size = tracking + 160;
--	constexpr std::size_t utp_handler_max_size = tracking + 184;
-+	constexpr std::size_t udp_handler_max_size = tracking + 168;
-+	constexpr std::size_t utp_handler_max_size = tracking + 192;
- 	constexpr std::size_t abort_handler_max_size = tracking + 72;
- 	constexpr std::size_t submit_handler_max_size = tracking + 72;
- 	constexpr std::size_t deferred_handler_max_size = tracking + 80;
--	constexpr std::size_t tick_handler_max_size = tracking + 128;
-+	constexpr std::size_t tick_handler_max_size = tracking + 136;
- #endif
- 
- 	enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild
deleted file mode 100644
index 2ee9d2642511..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/libtorrent-${PV}"
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/libtool
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	mkdir -p "${S}"/build-aux || die
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${ESYSROOT}/usr"
-		# Needed because of bug #767835
-		--with-boost-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
deleted file mode 100644
index 94e0b8f3d964..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="+dht debug python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[threads(+)]
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost[python,${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-Dbuild_examples=OFF
-		-Ddht=$(usex dht ON OFF)
-		-Dencryption=$(usex ssl ON OFF)
-		-Dlogging=$(usex debug ON OFF)
-		-Dpython-bindings=$(usex python ON OFF)
-		-Dbuild_tests=$(usex test ON OFF)
-	)
-
-	# We need to drop the . from the Python version to satisfy Boost's
-	# FindBoost.cmake module, bug #793038.
-	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Needs running UPnP server
-		-E "test_upnp"
-	)
-
-	# Checked out Fedora's test workarounds for inspiration
-	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
deleted file mode 100644
index 4d585c2e540c..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_8,3_9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
-# Should be able to drop on next bump!
-SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ssl-tests-certs.patch.bz2 )"
-
-LICENSE="BSD"
-SLOT="0/2.0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="+dht debug gnutls python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[threads(+)]
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost[python,${PYTHON_USEDEP}]
-		')
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-boost-1.76.patch
-	"${FILESDIR}"/${P}-boost-1.77.patch
-	"${FILESDIR}"/${P}-python-symbols.patch
-	"${FILESDIR}"/${PN}-2.0.4-asio-ssl-error.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use test && eapply "${WORKDIR}"/${P}-ssl-tests-certs.patch
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DBUILD_SHARED_LIBS=ON
-		-Dbuild_examples=OFF
-		-Ddht=$(usex dht ON OFF)
-		-Dencryption=$(usex ssl ON OFF)
-		-Dgnutls=$(usex gnutls ON OFF)
-		-Dlogging=$(usex debug ON OFF)
-		-Dpython-bindings=$(usex python ON OFF)
-		-Dbuild_tests=$(usex test ON OFF)
-	)
-
-	# We need to drop the . from the Python version to satisfy Boost's
-	# FindBoost.cmake module, bug #793038.
-	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Needs running UPnP server
-		-E "test_upnp"
-	)
-
-	# Checked out Fedora's test workarounds for inspiration
-	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild
deleted file mode 100644
index f1f8aea0e527..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-# gnutls removed because totally broken with at least Python bindings: bug #830846
-# (they expect openssl?)
-IUSE="+dht debug python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[threads(+)]
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost[python,${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.78.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=17
-		-DBUILD_SHARED_LIBS=ON
-		-Dbuild_examples=OFF
-		-Ddht=$(usex dht ON OFF)
-		-Dencryption=$(usex ssl ON OFF)
-		-Dgnutls=OFF
-		-Dlogging=$(usex debug ON OFF)
-		-Dpython-bindings=$(usex python ON OFF)
-		-Dbuild_tests=$(usex test ON OFF)
-	)
-
-	# We need to drop the . from the Python version to satisfy Boost's
-	# FindBoost.cmake module, bug #793038.
-	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Needs running UPnP server
-		-E "test_upnp"
-	)
-
-	# Checked out Fedora's test workarounds for inspiration
-	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
deleted file mode 100644
index 03981e30ef77..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+dht debug gnutls python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[threads(+)]
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost[python,${PYTHON_USEDEP}]
-		')
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.78.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=17
-		-DBUILD_SHARED_LIBS=ON
-		-Dbuild_examples=OFF
-		-Ddht=$(usex dht ON OFF)
-		-Dencryption=$(usex ssl ON OFF)
-		-Dgnutls=$(usex gnutls ON OFF)
-		-Dlogging=$(usex debug ON OFF)
-		-Dpython-bindings=$(usex python ON OFF)
-		-Dbuild_tests=$(usex test ON OFF)
-	)
-
-	# We need to drop the . from the Python version to satisfy Boost's
-	# FindBoost.cmake module, bug #793038.
-	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Needs running UPnP server
-		-E "test_upnp"
-	)
-
-	# Checked out Fedora's test workarounds for inspiration
-	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
index f2ff6a9b6288..4bbf40a4c2ba 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+dht debug gnutls python ssl test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 7e5afcc69e23..8dc8bc82f8a2 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,4 +1,4 @@
 AUX libupnp-1.14.12-disable-network-tests.patch 416 BLAKE2B d1fea0b8e0abba960cd5296839977559bcc8081285f17de4a19e0d48557735bdee687f8d069976b3e97e5f0d5dde46063f1c8d83cd4df071bef439633d33b59c SHA512 e59e7695bad657b3e67efc3478f76ae2617732b22bbc7ea07b904260f0a73d7a57db83deedc58959f4335aba2c66c6bd0bf819051a7c4c8e412694883466d61b
 DIST libupnp-1.14.12.tar.gz 788299 BLAKE2B 721c10f9fa4ffc60743b4ebf8be566ea595931cb1f2a2448d8e3cecfc787abfb855cb16256eaaa10ce6a901cd5e5b3d14672610841b2a718d5dd003ccfd3c2f0 SHA512 aab17aa12f15d110bfab20cbcbae5f54926b6ca7a30bce10b9287cd39919a06a5e9f1493405e1d561c0d58ba46926f87009df891e4e4f37097df1c3c67635ca9
-EBUILD libupnp-1.14.12-r1.ebuild 1111 BLAKE2B 57ed54cef9d08cf59d5f1c66e48392fe0e9cfc6ef8f8900fc0c9a5f905e392fde0f23125622536b55804d8175ecc0b3238113c005fb46cc6ae12ea7840d96c84 SHA512 da11f5c300e685ee8bfa8abab8e71e876fe5b16d0e713658345e34bce7a0190690b611b9cb7e92a7325e0fa21b35e9285d5ff1e434d99ee33fd10aae8cda51f8
+EBUILD libupnp-1.14.12-r1.ebuild 1118 BLAKE2B eae174b59a69315e1f08070aa27e585f685ae25f1896901dc9c56492573558e9df6a28993b856ee4ec2b66c37ce92a8353aea764747bd5ca0001ed3152ff81ae SHA512 743b8eab3e7225fb42d15d2207ff3e98c0d47241e1ebe5bb38300ebbf11781229c287a94b30e718d958db7bfd4c4088480912c024a2a49a7537675b936064d7e
 MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
index fc9560d1abf1..b74eee98c312 100644
--- a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc +ipv6 +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index aae1f51a997c..c56b0e17d884 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,5 @@
 DIST libwebsockets-4.3.1.tar.gz 15607585 BLAKE2B 420343dd358e4ca45d0cadde7f0a6398dbd5043c4cd2c1a70f32dc9b5ef4cb222239971c4ce758ee156deac4d06bd18289a8e975a7f41508abfdcb05870994f6 SHA512 3cc2daadd7d2587ce946209a31741662d98367f0f9f77a1555497bef6fc6acc6cb97f5196d6ecef2d13828bb5613c60cccada03d9a01a5c970a9cfd25baeb0ae
+DIST libwebsockets-4.3.2.tar.gz 15616264 BLAKE2B 3b8657b79828102cbfba71ea789acd3b7aec7faaa6317974d182b3cb4b5091d8efcf1f184278f71674624a0f1968450ab056e1d91f9faf2c35c67c6c6f4cb695 SHA512 68d18574dea0563fa4f080c5d0d1cfe21a115bffdb17c6190f6741998f1e5db0739e252ef344ffe6fa4bd6781372456b240539471dd2aa900e43759e0f2d42ad
 EBUILD libwebsockets-4.3.1.ebuild 2302 BLAKE2B 57120058a60d6cf22d821e0527a17f443d82b98ab98708b6958327860a9f151bf33699712cafb97dee1a02620e66b62665abb5c78e872bb433e3fb3025d3f020 SHA512 6409af3d8398bd8032f5bf6ccc110ecf71c202ef4e9d6b9663bf441758da06e7a40977c922d1d9ed64fa2b6883ab23bb568129d4bf9aead8ae1249f52cb14999
+EBUILD libwebsockets-4.3.2.ebuild 2302 BLAKE2B 76dc737c442788280cb2c8f8ab87658cc9dd004fa1ef1832967f26ae1adb17a768ea1d5b862074a237b4ba218adcca5144867c6b40acc8b1ad40c9b2a02ec241 SHA512 cf34a2c3f050e1a6ac1c3d9ce71091bdf137038759f64ed907d38b152fe1c7266ca36b4bc74c9f06d95650d221dc26f58b99b9b0791a7ad9522f2e33d1319c9f
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.2.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.2.ebuild
new file mode 100644
index 000000000000..aa4726c64784
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.3.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/19" # libwebsockets.so.19
+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/libyang/Manifest b/net-libs/libyang/Manifest
index d082ab11e838..27ff49f84be6 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,3 @@
-DIST libyang-2.0.164.tar.gz 1120619 BLAKE2B 7b9fc93ae4c7d42c3d818a26448bf1f7fc8df21634668f46e14256d094997ef22f74ae5e8f46807692e1bab176dd14d9d3036712013bf83716f6069664a74436 SHA512 016e450110e968665195bec692ef1eca6889636de79bd873f74cddde6a58859ac1df4d1fb2bc3024ff05d82ff4c2b0f4eb8df06ddfd4b04d3a0c5f5fed44af65
-EBUILD libyang-2.0.164.ebuild 888 BLAKE2B 3b47ae02ebd607797c367101b983cb6eba4d74a0366e19c03fa829edba6a2ad60e4094e37da7fb5ea7986fc2d0de3b2c21f275e7bd449ba3b823c7474b48c59c SHA512 f584ba0ec8087956e970db2da7d93720323ba8efc7bb7935b7bdb36a057349a7ddd1269a630825e5af3bef1d0d8b18b1103e4b96604a213158a4974c8b6764e8
+DIST libyang-2.0.194.tar.gz 1150705 BLAKE2B aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 SHA512 33d043ff696fc59c1cf5265a463b85a17459086162a03c56b1894cc524b7325ded2e14a71fce55ee70d02ea1119eef523190708c5f7b22438ab8ffd014fccefb
+EBUILD libyang-2.0.194.ebuild 888 BLAKE2B 3b47ae02ebd607797c367101b983cb6eba4d74a0366e19c03fa829edba6a2ad60e4094e37da7fb5ea7986fc2d0de3b2c21f275e7bd449ba3b823c7474b48c59c SHA512 f584ba0ec8087956e970db2da7d93720323ba8efc7bb7935b7bdb36a057349a7ddd1269a630825e5af3bef1d0d8b18b1103e4b96604a213158a4974c8b6764e8
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.164.ebuild b/net-libs/libyang/libyang-2.0.194.ebuild
index 9ce1420009ab..9ce1420009ab 100644
--- a/net-libs/libyang/libyang-2.0.164.ebuild
+++ b/net-libs/libyang/libyang-2.0.194.ebuild
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 5bbbf7cf75cd..753fb3ce2c0e 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
+AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0ea6097527461c868b7133e1f1ab70c3aeb5c816b2297b8027db06fd9751e6ebf68e8bb560070e75987e72f7c3c60f61b7a6 SHA512 1e8d93c14d5b7f103782a15e007abd0e1223da60b98177d455ceb1a2c6fe5b7c3c22f2fe79da0b4dce54542ac6b3e8ec225d09a0b8bdf8742b07a14cd160b5dc
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
+EBUILD miniupnpc-2.2.3-r1.ebuild 1552 BLAKE2B e5bc7b99983f099719c7880101b973f77da957f42a529b3dfc2146439fe171df02f7611ba663bd3f61489025ce35ce4a572aa9a110608bee03a9ecb21eaea41a SHA512 21705b5d12e7d77a401a1c92e1e8fbdb2f60bbf7bf759a020bd6e521c2fbb2f9b797d6a73d56ec9deb2b3bc6b0fdd1cdd44aebad709403cbf66aaeb505db196d
 EBUILD miniupnpc-2.2.3.ebuild 1521 BLAKE2B 066d26958db1796f5566383fbaf99a1ff837c2d3267cb8062b3a09c222984876ab0d96ee6181860b6cecaec3dfdafac2596428e017217a79851a557059bffa63 SHA512 bface54f8a84857ab38898a9db0eec8f97063765a06e5d856d3c55de11b3eed3b2aff6473f5cc60dd0eb5f014e31fea5ceaab865c0a9678e09fbd534570848bb
-MISC metadata.xml 244 BLAKE2B a3306e4b6476e267c2dd1f4e24a57bcba54d6ac43270610af57976f19046bb17d1f9afdeadf07407c045b9c66afe1c5b631e0955ff1346e49151e604717dc1be SHA512 b2b16db336068dd5e6c40f2721e1b1e8a6626954196287bf409082db21ff804375fd740a76c5d2ee6b4ec13abf25dfa3f941944a7b25eb332b90a1da9c740868
+MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch
new file mode 100644
index 000000000000..fc578e5e6147
--- /dev/null
+++ b/net-libs/miniupnpc/files/miniupnpc-2.2.3-drop-which.patch
@@ -0,0 +1,38 @@
+Not upstream b/c already done in 2.3.0:
+https://github.com/miniupnp/miniupnp/commit/c88178650e2551226a88cbc87084014781f81184
+https://github.com/miniupnp/miniupnp/commit/d2f558f659da923144f591be418380a7ff8a8677
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION)
+ 
+ ifneq (, $(findstring darwin, $(OS)))
+ JARSUFFIX=mac
+-LIBTOOL ?= $(shell which libtool)
++LIBTOOL ?= $(shell command -v libtool)
+ endif
+ ifneq (, $(findstring linux, $(OS)))
+ JARSUFFIX=linux
+--- a/testminiwget.sh
++++ b/testminiwget.sh
+@@ -24,8 +24,8 @@ EXPECTEDFILE="${TMPD}/expectedfile"
+ DOWNLOADEDFILE="${TMPD}/downloadedfile"
+ PORT=
+ RET=0
+-IPCONFIG=$(which ifconfig)
+-IP=$(which ip)
++IPCONFIG=$(command -v ifconfig)
++IP=$(command -v ip)
+ if [ "$IP" ] ; then
+ 	if ! $IP addr | grep inet6 ; then
+ 		HAVE_IPV6=no
+--- a/updateminiupnpcstrings.sh
++++ b/updateminiupnpcstrings.sh
+@@ -26,7 +26,7 @@ if [ -f /etc/debian_version ]; then
+ 	OS_VERSION=`cat /etc/debian_version`
+ fi
+ # use lsb_release (Linux Standard Base) when available
+-LSB_RELEASE=`which lsb_release`
++LSB_RELEASE=`command -v lsb_release`
+ if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then
+ 	OS_NAME=`${LSB_RELEASE} -i -s`
+ 	OS_VERSION=`${LSB_RELEASE} -r -s`
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
index a3c057ba374d..c89549110c7c 100644
--- a/net-libs/miniupnpc/metadata.xml
+++ b/net-libs/miniupnpc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mgorny@gentoo.org</email>
-	<name>Michał Górny</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miniupnp/miniupnp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..90a944cd2301
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND=""
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release )
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-makefile.patch
+		"${FILESDIR}"/${P}-drop-which.patch
+	)
+	default
+
+	local exprs=(
+		# These bins are not installed, upnpc-static requires building static lib
+		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
+		# Prevent gzipping manpage.
+		-e '/gzip/d'
+		# Disable installing the static library
+		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
+		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
+	)
+	sed -i "${exprs[@]}" Makefile || die
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake build/upnpc-shared
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 8bb3485fc35f..1639278f98c3 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
-DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
-EBUILD nativebiginteger-0.9.50.ebuild 1597 BLAKE2B 513a3b204f66ddab99bc3c7e6b6e61b992fc1816816ca3405a3e69c73f98498f3cd859f8a9651080d50480d9e5c7007042603a764a850b2cc54c4a56eaf015d9 SHA512 4c744c1f5c8ae58c79ee3deed71332f9991fa22dd006b6935a0ee1f154d633f1066d9d03f462b4d746feb9f35d5b9f9f9221bff0f4e24ca2239feb5e52cb438d
+DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 EBUILD nativebiginteger-1.6.1.ebuild 1596 BLAKE2B 69828be2350938ec06717c982681d4d99da36961a25943b69dde4afe8b8b06c5a7e47f752f89eee38fd20ff04d951a7ffb319fb268df613d71fb3d80d95fabcc SHA512 1d926ce7ba2253d2bca168740611635731b3fd66e99badf0f65547e96b8c12bd59aa0c646d90f20aed2824167289215fc95c27c24445b825d6cd68add3c50416
+EBUILD nativebiginteger-1.7.0.ebuild 1597 BLAKE2B 1b3dd3640982cbbb8096f7b88e54e7933a556aba4b95ad1d621321fe7f1008f88bdf335b56ecaca5351bffdfc31b3cbb041ff262a26be005ac030edf9e20cf5f SHA512 5a702a8b301aeafeba55e891be13fe6b2ea697ecdfcc7821a419cb91fd3990fd12af05783fa56140478199bc186ad5148e36ebc2f980f3db1a86868a3f01ba42
 MISC metadata.xml 398 BLAKE2B fd781dc140f624c85f13ecb03585bbfa64da7e2c25dd8f390bfe08c1590c2ee9b2aabdc3b52d578c7de68c2fb9081d7bd88e5e25521b0bef93b45fb0d525311e SHA512 f61d95738d459dd3bb50eeec2017e7b744a903202fae14907dda8588bd92dedb58e386e3786663fa8d0df392c39eb4a61524b43c8c8e84266ef83b5c22fc847e
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild b/net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild
index efda38f2b606..802e94a86fa7 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit java-pkg-2 toolchain-funcs
 
 DESCRIPTION="jbigi library used by net-vpn/i2p"
 HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 288ce1c4508b..a568cfdb9ba2 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,5 +1,3 @@
-DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
 DIST neon-0.32.2.tar.gz 880651 BLAKE2B 3629eee38e10ada5e001bf0afb77c70814083bf553596fc150a6cf21f0b66cf4de28841b242f68faaeb44fa5e0ad260939102b015d2a543ef59012876256b364 SHA512 2580a3c8c3cf4aff2d399f72a721ccfb4e68434ef92da4af8103c126812d779b9fbe5cafbab512c79f4365bbb3d3eac61568748136470e86f7aa7b98b27053c8
-EBUILD neon-0.31.2.ebuild 2652 BLAKE2B e718aeeb582f1d0ea1fb0460dfdee36bb29241a22848ff5cbe4831a6ed9b8b909098583e228c3c2d9ba33199999b3d2a322ae58915d48a542bf4e0235031c31f SHA512 5107c9be940005e1bff5b20bdf878b96c0ee94817812139f5f7c3875020c64731eda7a22221b0519b769936143d868757849314ba48403e1140ab0402e69582f
 EBUILD neon-0.32.2.ebuild 2545 BLAKE2B 2bdaf5adc9eb2a2bbca5dac9343cacafc02a8bad0e4a46537abef40fd0b0f94f78973c6150dfe4c621c12de21d3eedcfb0a080e6351e88632cda9625806cca1a SHA512 3343166f5535c5c4d9b56e3b9958e5d49508f6435519e4a20a6364cb411464aee88cdb45c69bf18bc1de222902bf4adec04c45233c5cf6cdb2855f2f46746e3e
 MISC metadata.xml 1465 BLAKE2B cc9629974affeda497ea2825a4412182f9445f90ef04eb1337a456fad1b578a30d6b1135255b278cf795ffa9be7d78e810797fc7fd170606e52e48f7af5e02fc SHA512 ca250ba34c8c50c20d92a60b138e6548920f9fead9c5dda3a18928bd06203f6952c4a6a2a0eee846c3f7bcd48c79959c92af9a0fd1a5133273fdc09fcbb051f3
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
deleted file mode 100644
index 77dd704a1b7b..000000000000
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
-	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/neon-config
-)
-
-src_prepare() {
-	# Use CHOST-prefixed version of xml2-config for cross-compilation.
-	sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
-
-	# Fix compatibility with OpenSSL >=1.1.
-	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
-
-	eapply_user
-
-	AT_M4DIR="macros" eautoreconf
-
-	elibtoolize
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if has_version sys-libs/glibc; then
-		einfo "Enabling SSL library thread-safety using POSIX threads..."
-		myconf+=(--enable-threadsafe-ssl=posix)
-	fi
-
-	if use expat; then
-		myconf+=(--with-expat)
-	else
-		myconf+=(--with-libxml2)
-	fi
-
-	if use ssl; then
-		if use gnutls; then
-			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
-		else
-			myconf+=(--with-ssl=openssl)
-		fi
-	fi
-
-	econf \
-		--enable-shared \
-		$(use_with kerberos gssapi) \
-		$(use_with libproxy) \
-		$(use_enable nls) \
-		$(use_with pkcs11 pakchois) \
-		$(use_enable static-libs static) \
-		$(use_with zlib) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
-
-	if multilib_is_native_abi && use doc; then
-		(
-			docinto html
-			dodoc -r doc/html/*
-		)
-	fi
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
-
-	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
-}
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index 3b93eef43583..128bd311a9d1 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
-EBUILD net6-1.3.14-r2.ebuild 768 BLAKE2B 7123a310d87b430b01f935c44ceab6885a97a5b329af009d737bfec690bced5333677e1d06c98283a0d624e6e628b0b615b8001a0d132a98b113baaa65a0a69e SHA512 254b3c646c907fa43c7bee97a231ed33cbdb81d6a97cd0d50e54a6ac3a951e09589e178b2cdbbf4f17387e977bad6a3632a6e5b21e870b64bbcbc23fabb8aaa8
+EBUILD net6-1.3.14-r2.ebuild 795 BLAKE2B 251b2e41ecb4efc4b1a215522d090b8a7c298d5773b7e2bfa7feec89e3d754d167b3b4ba7790a58c55d3d81a7a9811a3b7cc9b95674f9f8933018612a03d8a77 SHA512 6b71c2212d7e22c34878ca51d00aa4aba51986a2b0a7a0c31e5083a1eecfa0b5299d30acdac0fe53e6dfeb4d8b47fff61fc96ce32d8e990a50715ee7c8b5f435
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild
index cb41c438fc5d..222b9f1cf536 100644
--- a/net-libs/net6/net6-1.3.14-r2.ebuild
+++ b/net-libs/net6/net6-1.3.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+HOMEPAGE="https://gobby.github.io/"
+SRC_URI="https://github.com/gobby/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 19ac11584bb1..3aa5529ad70d 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
-DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
 DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48
+DIST nghttp2-1.48.0.tar.xz 4112072 BLAKE2B a52dc1ef4c9658298acef5ad703bec1708e538ebe19584dd5fcfe39089777e105594a998c7db696ee54bc8f17d3086828c09e921d8714b7ad3efbf33d04aaca0 SHA512 77c22371290f77e8a538b9efea225d23567cc27cb60b71703cbcb057839b5f117cf50796aa82bf4518f22b38a5773e90a1c273eafff4b17c435ac5858bdf7c6f
 EBUILD nghttp2-1.45.1-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
-EBUILD nghttp2-1.46.0.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
-EBUILD nghttp2-1.47.0.ebuild 2033 BLAKE2B 0297639e79cc12bbed801326c356d9df5624e2a1f87790d664b11b33dc653fe91bfde16dfd764bfc7aaf99128f5761d2cf0628092a467344f1e161595a4761b9 SHA512 25de51ea35fc2031a92e4fcb80304a70525924faf94f380160bd8440b0f74ec267730c9cf50b529fe222165d78895a5022528cd9769e3e03e1521b816a0102a3
+EBUILD nghttp2-1.47.0.ebuild 2025 BLAKE2B 7c4dbcfe5083f983192851ff027a016ad9b4d03c645c8ae1ff752864dc818210d8defea0186a3f59141d9da5012cb97c0f729c9512592e6fb8c5fd56035a66be SHA512 ca9538daaa140b909ab39228b9f43033f787e0c8e5fe4533f00b0fe6da80327feabc05e8ce2f09770e8d6d5150c02e5790b6db5332c20e11ffe8abd5dc515df5
+EBUILD nghttp2-1.48.0.ebuild 2033 BLAKE2B 0297639e79cc12bbed801326c356d9df5624e2a1f87790d664b11b33dc653fe91bfde16dfd764bfc7aaf99128f5761d2cf0628092a467344f1e161595a4761b9 SHA512 25de51ea35fc2031a92e4fcb80304a70525924faf94f380160bd8440b0f74ec267730c9cf50b529fe222165d78895a5022528cd9769e3e03e1521b816a0102a3
 EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
-MISC metadata.xml 493 BLAKE2B daffa7d9a21815507215b560815358be5bdfb984eab2fdc28ae872ce2e7fb4f43339bed4b8426ecd7e09ac8c79a19b33427b8a4de68123bf127e88a3a178a6a2 SHA512 85224aae10478e7a6bb2442d595b0bb750503272f281ef4526d976a620316ef0fb5cc7d1d3ae88fd2da05faab1d67b7d93d1bdbc97195ae5bfdf182bd180cc15
+MISC metadata.xml 409 BLAKE2B 3776b71b2faa9874969486a9aa59b467b990ff5aa0d3ae1db4e1040d36caff429f1702d859641a1534175022c3536fada7f79c411702e29ee7186b1d459add41 SHA512 ae666b6ae5405a33231f4caff4e73ebd69b83d4d68bff0443a3cb3d5301bcf0837cc03b693c13e65562106eb4f17db47f03b7c2035803f779d23ba30bf6b0a5d
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index e79248991e89..e77d9ad83697 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
diff --git a/net-libs/nghttp2/nghttp2-1.47.0.ebuild b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
index 97b642d84a6d..cbcd334f43a6 100644
--- a/net-libs/nghttp2/nghttp2-1.47.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.46.0.ebuild b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
index 6d92e5272f14..97b642d84a6d 100644
--- a/net-libs/nghttp2/nghttp2-1.46.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index c2a42df68d93..d7e8f462587b 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -3,12 +3,16 @@ DIST ngtcp2-0.2.1.tar.xz 554280 BLAKE2B 243599cde08eeb5833d4836cfe3a1b1ea3b9cd33
 DIST ngtcp2-0.3.0.tar.xz 570876 BLAKE2B 645d09b2b33076d93bfffb79eba347cda5d0d782e1321138f436fe776808b3a51a0a2fc5599ecfe67b4db87b3e653b3e37293f746dabe7ae50cc32cd929c08f7 SHA512 3e37c269fba0261dc1514095104725064c078cc0dc66c0cfb8b536a8e3fe474888ca6a88b02c176689d94ddabf7acad14e1e8dea121da93f18bbe261169b0ee9
 DIST ngtcp2-0.3.1.tar.xz 566612 BLAKE2B 9b9b2e8a671e924bb13d41874c5f5a940fdde352b2f0ac60c41fbb9478bd03c070baecbe3e867ecce73e6671309a93b3696410ea3a965ea618349391e963ae0a SHA512 8c5beae1b257272212dcfaf9d8b56e728ba0b08e0c2f2f27d9f5049c8278a60bdcd97df140e5661793a65a936ce556f5afa55f05fd5b60c647d47dadc4a4cdc3
 DIST ngtcp2-0.4.0.tar.xz 573692 BLAKE2B 9eb428a19a7e6a42dc6344f7569dbb33cb083028c25c34c9bec0999a7f055d1ee1173ffae500ddcdca60e20d508b7b56f2489e9af03e10284611179b5098ce16 SHA512 5ce0933a6e53ce29a0d007f487aad11f068d9450ada10af6e5639c891a292977bf4bc57ccf0b5782b8e6e84292859faf3d409de49038b586c74205acc3a391ee
+DIST ngtcp2-0.5.0.tar.xz 570732 BLAKE2B 3e1e11a8e65afb6ff3e7c790545a889459ffaeccd2a93085634b55a2124143a96750b06e3bc494c5311664b9f35adb57784dc164756f7026dbca4a25c33acdf6 SHA512 bd30005126b11165741d2295252c5fe9ca82b1f1cebf9d0064b79f4bf7778b62e39e241063f80b5ad2d5fa859b5f799f938958cf8963d1b1c8477c2202c1ec71
+DIST ngtcp2-0.6.0.tar.xz 574400 BLAKE2B 51f6765af0275a0455ce8b8030bd0353322434058b55a49ec60858e79fa996e8ab62518571ac6ca9a093f6276930851f90338ff2fe8cc749f1f36b70759fa48e SHA512 f7d4530cf027b9d62996640191731240b4af11e8f96fd92220277006be95af781b0331caabfb3fc326a20c58f2aec50a56b21cfef767f9361a6ef11c9f555f53
 DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
 EBUILD ngtcp2-0.1.0.ebuild 985 BLAKE2B e83228de5823731072be11d4de5aa10e007d671d8bfd6eff5861c451ccc47f5709d4cbb155a69ed66e9adcbf7d19fc0a63b7fe13d59ab7a3898854215d46e654 SHA512 80965c2cd89c9bff4d7c430cabd5854fc12a2e3ac8f1e7400e980508bae649dae6f8d0ece7c6d2100b17b86509c4986aa3d7a3248587d25a634056be331513b5
 EBUILD ngtcp2-0.2.1.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 EBUILD ngtcp2-0.3.0.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 EBUILD ngtcp2-0.3.1.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 EBUILD ngtcp2-0.4.0.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
+EBUILD ngtcp2-0.5.0.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
+EBUILD ngtcp2-0.6.0.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 EBUILD ngtcp2-0_pre20190912.ebuild 1083 BLAKE2B 285f80c7ebf4cb3fa9ab7b74a39894f09ce0a54f89463082b2923858ed1b2c41fb6a35bf4cd0cce78e793acd28d8a46ae8d4e71c36a2ebdab76f57870129c717 SHA512 de01dfbf633ff6ee98407924c27ec4d655d3549305978faa4b22fbe5028bd08ea354489679decf12c75c2188559b8eab21e04166c42865a881c79a9fb807fe59
 EBUILD ngtcp2-9999.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild
new file mode 100644
index 000000000000..a828f15d1ad2
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.6.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.6.0.ebuild
new file mode 100644
index 000000000000..a828f15d1ad2
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 46a9215b491e..99c1fa071599 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,4 @@
-AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
-AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4
+AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461
 AUX nodejs-12.22.5-shared_c-ares_nameser_h.patch 15742 BLAKE2B e55d3aec80abffc81230ea46619d82d61fd2266ef62a96f39c47d7f9f5b6f61a4e978475c2e963214abdc45d5582d98c21e6be9f926f078108feb5f655b5c88a SHA512 080ede859262f5507a913b1f9995092ed075777e94c73c23ee74d74c739e9b2e6b4cc3afad189a333692f10485e7e3e12a15662286df2c946f73bdd6083baee8
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
@@ -7,16 +6,14 @@ AUX nodejs-14.19.0-global-npm-config.patch 914 BLAKE2B 015fd323cbdb3548f4858f988
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.0.0-paxmarking.patch 4343 BLAKE2B 92ddc9c5911b077eb0dcb42aeb8bc2486474d0294532cdee6ecf4c5141ce1953c15ac64432d3f527cf44d504dd8165fef35d458e713b4dea5b3ecc4288c5d5d2 SHA512 c60e389136e0876149f0c5945832195455f8c51f125ef006d40604d6306d990c1751bd36ef02db8a27596aa7d88b8bf94b90e640c0505b0d32dedef7831384f2
-AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-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.19.0.tar.xz 34486868 BLAKE2B 12e571a366c1d4b2475ef258e338f516bb81e9c08f7e6b7f951decbf371028cdcf32c72181d8504d0890496eaecce0d6b23437b8dad6c6e498d30bf6636bd1e7 SHA512 80573fa3a0882c1f2a40b991f187f49714748ca4c56c78133e2d2be0322f201816eb059a1a7d38ea8a925229c1b1324d0ffc28ff4002d0115bfae44fe87efe97
-DIST node-v16.14.2.tar.xz 34332624 BLAKE2B 756895f81ecabbacf30b1e513890d100192c367443a5d041cd3e383985acb6fae189213f44b7a533b43d1b759d5a2677a5ee787c72d3abdb480879d6d24cc95e SHA512 b97274f6e0d63f19e01497c43af36e6561f019e7b0b5b4f6ea19d0fbe2cb4d3c514c06f49e237d1e327936db03c3f437ae0d0b2f830a35f1b7c3a723fbe2a1be
-DIST node-v18.1.0.tar.xz 36841136 BLAKE2B 77cc028f61391c483cf9bdff09a2101790119257ceee5b6702347aee771c7ed9656458f482bceb89d9921a598b9e2134ef6c424e6c879934dce9bcc85fbb3552 SHA512 edaf830b90b74ff7e8d1098f7f09cff91dc60738bfc612f6847bd7ac283ca76453f624057f64ba3ddcc86804bfbd652eaf8eae1398118220fd54fbf9c0a0e49c
-EBUILD nodejs-14.17.5-r1.ebuild 7174 BLAKE2B ade6eebc522024960fb6ffad54ac0035f52692e3a6ea5b9a685f6164e53a81ee8eb8f115377b7e459f50eaea101f419bfc038b183784fe2877fd83e9e960da95 SHA512 c0bff9a4bbb32bbd2e832bf1b30966f7c0433a34ad3cdb83d874bcd7fdcedfda85618c50321336eac7a53f939a2ce12c944cc208c47b44ed8f1d22ffd5b8835b
-EBUILD nodejs-14.17.6.ebuild 7181 BLAKE2B 3f823bdb6a4f20f57fea27cd19f45ace7703314bdd8d87e427b47971d48fdaa49082ad9963a6f40209e445e9395467e45284d4df95a07a680b4db63cd291ffa6 SHA512 44c7f0d28ef45ae7fca65311a342cea9847feaf5a87563953b08e15aef726be40d33b2d11fa13a75b6d543406adfa9be5459a4bad6f3c61ced2c50de9b36634d
-EBUILD nodejs-14.19.0.ebuild 7062 BLAKE2B 67a3db383c6bf8d76a026e57ad78504e583e3843ac451ea90f74964e3c0289437e149d4f0e799981cb257140274504c0cf4a7fc99f5c47944fe594c8549fab5d SHA512 3ece626995a0bbf505f9728cfaf7c627861eeb76f08256716e624415c251cc667666ad195a8a0739d9eaccd5962ea97dc3f6c72e1fefc330312460cb007ca086
-EBUILD nodejs-16.14.2.ebuild 6580 BLAKE2B 0ade58c4914600577c5cfd7d8b0f16ee9972ed602b79c26f2166150065cea96e2f90e9261fa484c23c1849de788b9c9f99d9fe47121bd433f63ca3adf0bba122 SHA512 25c8db5082d757a543a5be552ad75e36ff0beccf71fc40f9a39685584f21480ef965babf53d88ed821fe505879b6a93ca918c5f686b20f2ece07a6067dbb685b
-EBUILD nodejs-18.1.0.ebuild 6582 BLAKE2B d6896dc2f3490e3235d6e23ce355322d836631cb67e360e83f6ac8a6eb93828b56e572449c8e27efed71b1426c82e08793252e4db4bc6139f66d0f17ecef0321 SHA512 e216bbe321d8f3370c18efed3e2b8d392018975b53155e60876bc8470b73254711fd86574e2532b789f3798d13bc484b8b07292b5fca0471945f07f60c6ae5f7
-EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f
+AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
+DIST node-v14.19.3.tar.xz 34483792 BLAKE2B 24b598b4c613ad63f8a2ffa15b2ad5663eef68e75842fac4ef988b43f8e6f9c1a242c9b352c411661dc7d1c9f6800426e12934fc4e7788061a8b9f918491a9b7 SHA512 0d03d9efee23664faf368a6ab42fa7d653033aebda1f2730c80692577825e31ff5522f1a940933245050a6f9af4ee64b6d65fc890e3d2ecfced327a909b63b6f
+DIST node-v16.15.1.tar.xz 34618208 BLAKE2B 6bba1dcc01cf18710e75b998d90b2b1f75476052c85e730a1309a6fecf2994530ce65b45e53ff0cee17bfe07728d4f3eb166f460337cc74f3c7975aee858a6cf SHA512 18c05876f0afe6fd402a11824d1987ddadcb103d3ac16d5b500371536a5d53632c9cbf651b6f4a8d69b69e8bda2575beb7b68675c67fd6cd53e205acfba11038
+DIST node-v18.3.0.tar.xz 36941104 BLAKE2B 947d38aa8637f01421fcf5261832b2fd3f53a5f38868fd03b6c9213c2ba3bdff214be12585a60c4cf88dd9390673e068eb08da07d7da28443a9c56cd024186fc SHA512 c793459c38d72d65d5caaa7fbab37269fe6031766609ab2fd7c921b205d314b1ddebc40738b292669bbbaf166a97328f64af7a0a1aaac111903a42cf98057afd
+DIST node-v18.4.0.tar.xz 37109064 BLAKE2B d222ad41eef88a2fed13b0591b8c24037f8425c1e788d6ed00e033e28fa88162de6fcf25d094188952a7866e2f488c1ea635a80162c8b01d42c31f1d56406137 SHA512 c00d90cf5cfa8cd5629ed0b7810c436c962e50bd78313789457fd4003900808a190769db9d41e9a22186c6d2cda232bd362d432089eb8990913f7786140e2813
+EBUILD nodejs-14.19.3.ebuild 6640 BLAKE2B a926d525e227ec2a8f09be3b5ca58807f711df9b19993f4c41360d84d51e28bb9f2297753026b8e8c8d93ceeb011dbd8336f03007de6f5fe5cd4f6c8620fc1fe SHA512 24dda7157f0b267da8e561e0283a6cf03699b470b82fc2df6d0094e8391ec79c971b6072620162744c1ca911a20335ec83d849614174fee6b3e21a6aa7985068
+EBUILD nodejs-16.15.1.ebuild 6254 BLAKE2B 98cc5726d97d0bd474c67ec3377cc96fbd99cc643ea538db1a7ab8dc2df01449ce9ad4439e6f9a9bb484be2a97eebfe5b50557f52ef0667b7bad6055867f1673 SHA512 b403db60b341c67594f8c171d5e001cca8b458b7ec0dbc64e026e550b4dc9440afcc81d8eda737e23437064b945cef75acdd72688bdafeeb522e02a6fd7bc349
+EBUILD nodejs-18.3.0.ebuild 6254 BLAKE2B f83d0866c7f969d725acae5ed100de85b2286804111c3d13799f22e4932eaf7b8501c0d7516ce5a817da83d3c74d109da966cb1352f037c7a6d73f63bab02d02 SHA512 889c74c867da24f73f8b67ff89f38a392323e39c23dffd86f7804508f0b8112400e940ee9af4dc9b0f78c78f6d2ca8a70553db9e29bf69fb3d56a35abd79651a
+EBUILD nodejs-18.4.0.ebuild 6259 BLAKE2B 2babcb0352dffd9cd8aee43da7b474139cabd8dc2c1edb18fdfda3843f92c226fba1d498f96e0d9e7f25c67016e7a7f923dbe3f1ea082b6150c7d860fdcf9aa2 SHA512 bd050889a11048ecac5db807e772e4fc897dcc28e4c37c7141e9f945caec41f890b1acc6d39f56d2db3880d5c72671280bed55eba03aaff3913c252c4e5753b1
+EBUILD nodejs-99999999.ebuild 6135 BLAKE2B dc0d8749313aeb1445ac553917527fd653927869cc0cbae3ac9cab5886d55796faff814ae2699beaf2f2b5b047a7193bd812932b1d2d7bd0cfd60f406a7195ae SHA512 3d0d4c9694154291c07c374de2acd61242f5a184aa550b3bb5ab1c6ce86d9feeb33187487c60a59ee91ec99bcaa5713efda531b2b009f31c89e2fe6fa432eba2
 MISC metadata.xml 822 BLAKE2B 159eb2a921f10115d8d42c4c7bce446984f020b096f238c107c3cbcc960775340bd68a5fa43f8b5580cccc226aaaab915ffc1604ef0b4ee15ccb8f84b969839e SHA512 ee4e6b8c56ef5987c849e571b98c9bd7695d47f1581c22671b165d80b9448aa0cf61120b87f34279710423bcfffdbf6d6b2ab48df4c8cc9bf2ff7fe318582007
diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
deleted file mode 100644
index 9c7fe6888fb8..000000000000
--- a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/deps/npm/lib/config/core.js
-+++ b/deps/npm/lib/config/core.js
-@@ -153,11 +153,12 @@
-     // Eg, `npm config get globalconfig --prefix ~/local` should
-     // return `~/local/etc/npmrc`
-     // annoying humans and their expectations!
--    if (conf.get('prefix')) {
--      var etc = path.resolve(conf.get('prefix'), 'etc')
--      defaults.globalconfig = path.resolve(etc, 'npmrc')
--      defaults.globalignorefile = path.resolve(etc, 'npmignore')
--    }
-+    // gentoo deviates wrt global config; store in /etc/npm
-+    var globalconfig = path.resolve('/etc', 'npm')
-+    mkdirp(globalconfig, function () {
-+      defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
-+      defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
-+    })
- 
-     conf.addFile(conf.get('globalconfig'), 'global')
- 
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
deleted file mode 100644
index eb56bb87d86d..000000000000
--- a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/deps/uvwasi/uvwasi.gyp
-+++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },
diff --git a/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch
new file mode 100644
index 000000000000..fd7ef431045e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-18.3.0-paxmarking.patch
@@ -0,0 +1,85 @@
+diff -urNp node-v15.8.0-orig/node.gyp node-v15.8.0-dwok/node.gyp
+--- node-v15.8.0-orig/node.gyp	2021-02-24 22:21:44.202911780 +0100
++++ node-v15.8.0-dwok/node.gyp	2021-02-24 22:25:34.298281739 +0100
+@@ -55,6 +55,7 @@
+       'deps/undici/undici.js',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       ['GENERATOR == "ninja"', {
+         'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
+@@ -331,10 +332,24 @@
+             }, {
+               'actions': [
+                 {
++                  'action_name': 'run_pax_mksnapshot',
++                  'inputs': [
++                    '<(node_mksnapshot_exec)',
++                  ],
++                  'outputs': [
++                    '<(node_mksnapshot_u_exec)',
++                  ],
++                  'action': [
++                    'bash',
++                    '-c',
++                    'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++                  ],
++                },
++                {
+                   'action_name': 'node_mksnapshot',
+                   'process_outputs_as_sources': 1,
+                   'inputs': [
+-                    '<(node_mksnapshot_exec)',
++                    '<(node_mksnapshot_u_exec)',
+                   ],
+                   'outputs': [
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+diff -urNp node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp
+--- node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp	2021-02-24 22:21:44.654910571 +0100
++++ node-v15.8.0-dwok/tools/v8_gypfiles/v8.gyp	2021-02-24 22:25:54.834224791 +0100
+@@ -9,6 +9,7 @@
+     'v8_vector_stores%': 0,
+     'v8_embed_script%': "",
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1413,7 +1414,7 @@
+       ],
+     },  # bytecode_builtins_list_generator
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': [
+         'v8_base_without_compiler',
+@@ -1432,6 +1433,27 @@
+           'toolsets': ['host'],
+         }],
+       ],
++    },  # mksnapshot_u
++    {
++      'target_name': 'mksnapshot',
++      'type': 'none',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'bash',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++          ],
++        },
++      ],
+     },  # mksnapshot
+     {
+       'target_name': 'torque',
diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
deleted file mode 100644
index 1b6eb9fb7fa1..000000000000
--- a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/node.gypi
-+++ b/node.gypi
-@@ -169,11 +169,15 @@
- 
-     [ 'node_shared_http_parser=="false"', {
-       'dependencies': [
--        'deps/http_parser/http_parser.gyp:http_parser',
--        'deps/llhttp/llhttp.gyp:llhttp'
-+        'deps/http_parser/http_parser.gyp:http_parser'
-       ],
-     } ],
- 
-+    [ '"true"', { 'dependencies': [
-+        'deps/llhttp/llhttp.gyp:llhttp'
-+      ],
-+    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
diff --git a/net-libs/nodejs/nodejs-14.17.6.ebuild b/net-libs/nodejs/nodejs-14.17.6.ebuild
deleted file mode 100644
index dc855697bb82..000000000000
--- a/net-libs/nodejs/nodejs-14.17.6.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# 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.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/nodejs/nodejs-14.19.0.ebuild b/net-libs/nodejs/nodejs-14.19.3.ebuild
index 20db05ccbc22..e86978056ae4 100644
--- a/net-libs/nodejs/nodejs-14.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.19.3.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
 
@@ -52,26 +52,12 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-	"${FILESDIR}"/${P}-global-npm-config.patch
+	"${FILESDIR}"/${PN}-14.19.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
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
diff --git a/net-libs/nodejs/nodejs-16.14.2.ebuild b/net-libs/nodejs/nodejs-16.15.1.ebuild
index d5a7de09fe13..26d1ffb649f4 100644
--- a/net-libs/nodejs/nodejs-16.14.2.ebuild
+++ b/net-libs/nodejs/nodejs-16.15.1.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
 
@@ -54,17 +54,6 @@ PATCHES=(
 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() {
diff --git a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild b/net-libs/nodejs/nodejs-18.3.0.ebuild
index 07bb48eee028..5ab2bfa29de9 100644
--- a/net-libs/nodejs/nodejs-14.17.5-r1.ebuild
+++ b/net-libs/nodejs/nodejs-18.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -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 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -37,10 +37,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=net-libs/nghttp2-1.41.0:=
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? (
-		>=dev-libs/openssl-1.1.1:0=
-		<dev-libs/openssl-3.0.0_beta1:0=
-	)"
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
@@ -50,30 +47,13 @@ BDEPEND="${PYTHON_DEPS}
 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
+	"${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
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
 }
 
 src_prepare() {
@@ -105,7 +85,7 @@ src_prepare() {
 	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 )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.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
@@ -153,6 +133,7 @@ src_configure() {
 		amd64) myarch="x64";;
 		arm) myarch="arm";;
 		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
 		ppc64) myarch="ppc64";;
 		x32) myarch="x32";;
 		x86) myarch="ia32";;
@@ -192,17 +173,12 @@ src_install() {
 	fi
 
 	if use npm; then
-		dodir /etc/npm
+		keepdir /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}/*
diff --git a/net-libs/nodejs/nodejs-18.1.0.ebuild b/net-libs/nodejs/nodejs-18.4.0.ebuild
index f546bf353cfc..ab8116548114 100644
--- a/net-libs/nodejs/nodejs-18.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.4.0.ebuild
@@ -54,17 +54,6 @@ PATCHES=(
 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() {
@@ -96,7 +85,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.0.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.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
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index d9745115c19f..577230345a35 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -19,11 +19,11 @@ 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 ~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"
+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 )
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0:=
+	>=net-dns/c-ares-1.17.2:=
 	>=net-libs/nghttp2-1.41.0:=
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
@@ -46,24 +46,9 @@ BDEPEND="${PYTHON_DEPS}
 	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch  # still needed as of 2021-06-04
-)
-
 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() {
@@ -95,7 +80,7 @@ src_prepare() {
 	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 )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.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
@@ -143,6 +128,7 @@ src_configure() {
 		amd64) myarch="x64";;
 		arm) myarch="arm";;
 		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
 		ppc64) myarch="ppc64";;
 		x32) myarch="x32";;
 		x86) myarch="ia32";;
@@ -217,10 +203,10 @@ src_install() {
 }
 
 src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
 	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+		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
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 4316d25665a9..20dde130b9ce 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,5 +1,3 @@
-DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf01968f5ab976627ab787e8d1bc2a57a8bb87f2ffcaf63b8e59c6ea41145ed9ccafc66d4ba420a15c9a78901 SHA512 913bc9f3208ddb667a7fab6e06585ba15ac3dd1979a15846f49114f54a270c2174a00afc3009d6158851aed779046743dd1ea704227122079164c07b394c01ad
 DIST ntirpc-4.0.tar.gz 388389 BLAKE2B b997430a119c900cfd8792af530d7baec629d7afa076838ca22b83631a461df2f267c6b786582bbefc98db870d054f37c9e9c0c3201f9a130f3f3806168043c1 SHA512 7bafad650bcebbf53a9958abdcacb8dfa9ac46c9798ac39e82c2ae3215b3e5b5a6b916bb95e3c70e7bc1a09b26a46b00bad236b2400538e9695b1c347f0672d9
-EBUILD ntirpc-3.4-r1.ebuild 738 BLAKE2B b984c6432dc4d15e8a762397b3dfd6ba2f3213e2b9233d86297644624302dd96fe709f1317f3cf4869e4800735882f42bd0dea107fd0589df8221b51d96885d1 SHA512 88d30e63cc0feb0ae67db51a1b05e43401a97c350b796f46bd41fc9928358849f3df02abaec4e526d001e1091dc540c850056e11386a2f3e68a59043821251ca
 EBUILD ntirpc-4.0-r1.ebuild 738 BLAKE2B b984c6432dc4d15e8a762397b3dfd6ba2f3213e2b9233d86297644624302dd96fe709f1317f3cf4869e4800735882f42bd0dea107fd0589df8221b51d96885d1 SHA512 88d30e63cc0feb0ae67db51a1b05e43401a97c350b796f46bd41fc9928358849f3df02abaec4e526d001e1091dc540c850056e11386a2f3e68a59043821251ca
 MISC metadata.xml 438 BLAKE2B fd74e8f98efc4037a229958d5b2887308a1bed529fc5586075d5eb4af6e2624d1fb2540735826b7b4c48d21167ecd2a351e5a4ac46b3cf6e0aa751a4036f29fb SHA512 b8ac2eaf12f97ce0aa35bedecf0446a9b59c9320dfbb1d12ee28fb678a399b88d5c78e4255f4b1c8ac84478feac904449b1393e7468137b87e9b2064b7abc170
diff --git a/net-libs/ntirpc/ntirpc-3.4-r1.ebuild b/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
deleted file mode 100644
index e7d899f9943f..000000000000
--- a/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
-HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gssapi rdma"
-
-# Since the GSS option only controls some extra files to be enabled,
-# there's nothing to list in the depend string for it.
-RDEPEND="
-	dev-libs/userspace-rcu:=
-	rdma? ( sys-cluster/rdma-core )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index 2f437dda9ddd..30dcf080e6d5 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,3 +1,7 @@
+AUX pacparser-1.4.0-build.patch 3666 BLAKE2B c21de20e715279741acd9659edfb0ef83bcd12dde597ab3f3d4e11ecf0eba4078cb982efc3b12d03f335e466249b6b2c02acf8355ddc6d84eace7906b53f67e8 SHA512 d6fdb9040557033b17bdd9a27c85d33bda7028e2f7774fde71899c1eb9268b3d80ba31f2fd5022d370ebd12ea3d6d3c236106cd44ac5818ee1a4f18d19462305
+AUX pacparser-1.4.0-pymod.patch 2328 BLAKE2B 50be6b3d7950d391edbab3b9ebf9ffb2c6ba3a7121b9cc9fb23da1af4f6e0891d653e0795b9b0153ca8911df8891f6fd872701d578deb3760724582d2d548925 SHA512 115fa4fdbd9a0ba612cccd8d796eefb1d467d4d4aab99b0ef880c7446ad9c1bfb023197d5e6fc86c8158f7be6d72bbb423572b204a2e5b2a41fd3e949db0f597
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
+DIST pacparser-1.4.0.tar.gz 902919 BLAKE2B da29b34654764b1569d9d37648e4ccb608142becaf34c65cdf37b2bd81aa073b1945d840fb50aa7cb986687bbdc086c862a05bc421adb08d44e1add637b712ed SHA512 9574068dc4da3db27ddc1242cf98d98ebc7515864789e95b700cd2ce1433a7cff84160f1507976488fab7529839cabe9cf2aa16ddbefc0c83009fa6c0d2ad6b3
 EBUILD pacparser-1.3.7-r1.ebuild 1723 BLAKE2B fade4e47f9adffe2a2ee3882cbca02c7bfd12fe4b97f3ccd194e0b28e4a86c9049b32b192fef76ef23614c560f034cb69e2e22d4a22983a994b4b646075f4740 SHA512 7317c7cf6cace28cca26881409a86da166cefbef71ae7aedd8e826aa969c274f29660fa2ad970e6b3293ddc970a91df56d1814874b7f10d6e074d6d0b95abed0
+EBUILD pacparser-1.4.0.ebuild 1643 BLAKE2B cc58174c61c4d30e90ec5bc614ab76d2cf185fc1b90fd8cc93b93300e8f20a4ce6781053d1bb63669b9bbf8bf2300297e085483e0e4541b88349794e173b8996 SHA512 483084be28b7924eb88befef5711fafc4f67e1c22e303447df3df631514ab6c979bcc8703f3280d3e1fe498f15028c36cf93dd841726d6fe8aa07417bdfc48fc
 MISC metadata.xml 1244 BLAKE2B 308285d031a2a74466840be80d4c3cd1fa26b6d06fcd4cd353a26475ea3f1cf637d14d9b087aaf30e22c385f59ad6c348c5be489579d8001a65db30736a63efe SHA512 128769f45fb50c349a6ca8261ce4fa97fba11f763d97351d811b7bf9b419cea76871344cd8c754652ebb915682b92f7615a4ebc62670a3cec5fe92b83bbf5b4e
diff --git a/net-libs/pacparser/files/pacparser-1.4.0-build.patch b/net-libs/pacparser/files/pacparser-1.4.0-build.patch
new file mode 100644
index 000000000000..2a8898579327
--- /dev/null
+++ b/net-libs/pacparser/files/pacparser-1.4.0-build.patch
@@ -0,0 +1,96 @@
+Upstream-PR: https://github.com/manugarg/pacparser/pull/136
+From 5d689be2e250242ef4022054f11bf00af339c149 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 13 May 2022 22:34:37 -0700
+Subject: [PATCH 1/2] build: Don't conflict with the user's CFLAGS
+
+This uses the variable MAINT_CFLAGS to set the project's flags so that
+the user can set CFLAGS as an environment variable or as an make
+argument without any conflicts.
+
+This can be problemtic with the build environment in some distros.
+---
+ src/Makefile | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 87f5c1b..3642241 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -60,14 +60,14 @@ ifeq ($(OS_ARCH),Darwin)
+ endif
+ 
+ PREFIX ?= /usr
+-CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
++MAINT_CFLAGS := -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
+ 
+ ifndef PYTHON
+   PYTHON = python
+ endif
+ 
+ # Spidermonkey library.
+-CFLAGS += -Ispidermonkey/js/src
++MAINT_CFLAGS += -Ispidermonkey/js/src
+ 
+ LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
+ PREFIX := $(DESTDIR)$(PREFIX)
+@@ -87,17 +87,17 @@ spidermonkey/libjs.a: spidermonkey/js/src
+ 	cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib
+ 
+ pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp
+-	$(CC) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
++	$(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
+ 	touch pymod/pacparser_o_buildstamp
+ 
+ $(LIBRARY): pacparser.o spidermonkey/libjs.a
+-	$(MKSHLIB) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm
++	$(MKSHLIB) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm
+ 
+ $(LIBRARY_LINK): $(LIBRARY)
+ 	ln -sf $(LIBRARY) $(LIBRARY_LINK)
+ 
+ pactester: pactester.c pacparser.h pacparser.o spidermonkey/libjs.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I.
++	$(CC) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I.
+ 
+ testpactester: pactester $(LIBRARY_LINK)
+ 	echo "Running tests for pactester."
+
+From ff86f230de5dd60935e1793077eb038fcbe1e515 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 13 May 2022 22:45:19 -0700
+Subject: [PATCH 2/2] build: Add DOC_PREFIX
+
+This can be useful for distro integration.
+---
+ src/Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 3642241..af10890 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -74,6 +74,7 @@ PREFIX := $(DESTDIR)$(PREFIX)
+ LIB_PREFIX = $(PREFIX)/lib
+ INC_PREFIX = $(PREFIX)/include
+ BIN_PREFIX = $(PREFIX)/bin
++DOC_PREFIX = $(PREFIX)/share/doc/pacparser
+ MAN_PREFIX = $(PREFIX)/share/man
+ 
+ .PHONY: clean pymod install-pymod
+@@ -119,11 +120,11 @@ install: all
+ 	install -d $(MAN_PREFIX)/man3/
+ 	(test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true
+ 	# install html docs
+-	install -d $(PREFIX)/share/doc/pacparser/html/
+-	(test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true
++	install -d $(DOC_PREFIX)/html/
++	(test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true
+ 	# install examples
+-	install -d $(PREFIX)/share/doc/pacparser/examples/
+-	(test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true
++	install -d $(DOC_PREFIX)/examples/
++	(test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true
+ 
+ # Targets to build python module
+ pymod: pacparser.o pacparser.h spidermonkey/libjs.a
diff --git a/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch b/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch
new file mode 100644
index 000000000000..203e34c838f1
--- /dev/null
+++ b/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch
@@ -0,0 +1,61 @@
+Upstream-PR: https://github.com/manugarg/pacparser/pull/137
+From 351b8f837ebbdf6e6fa4978a70287899436890eb Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 14 May 2022 01:46:25 -0700
+Subject: [PATCH] tests: Fix python path in runtests.py
+
+In Gentoo the runtests.py script fails when it fails to determine the
+pacparser path.
+
+This happens because 'py_ver' expands to '3.9' when the expected
+directory ends in '39'. This can be solved by replacing any periods in
+the string.
+
+python ../tests/runtests.py
+Traceback (most recent call last):
+  File "/tmp/pacparser/src/../tests/runtests.py", line 31, in runtests
+    pacparser_module_path = glob.glob(os.path.join(
+IndexError: list index out of range
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "/tmp/pacparser/src/../tests/runtests.py", line 81, in <module>
+    main()
+  File "/tmp/pacparser/src/../tests/runtests.py", line 78, in main
+    runtests(pacfile, testdata, tests_dir)
+  File "/tmp/pacparser/src/../tests/runtests.py", line 34, in runtests
+    raise Exception('Tests failed. Could not determine pacparser path.')
+Exception: Tests failed. Could not determine pacparser path.
+---
+ tests/runtests.py | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/tests/runtests.py b/tests/runtests.py
+index 9760300..a5377d1 100644
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -26,10 +26,20 @@
+ import sys
+ 
+ def runtests(pacfile, testdata, tests_dir):
+-  py_ver = '.'.join([str(x) for x in sys.version_info[0:2]])
++  ver = '.'.join([str(x) for x in sys.version_info[0:2]])
++  py_ver = [ver, ver.replace('.', '')]
+   try:
+-    pacparser_module_path = glob.glob(os.path.join(
+-      tests_dir, '..', 'src', 'pymod', 'build', 'lib*%s' % py_ver))[0]
++    module_path = glob.glob(os.path.join(
++      tests_dir, '..', 'src', 'pymod', 'build', 'lib*'))
++    module_found = False
++    for module in module_path:
++      for version in py_ver:
++        if module.endswith(version):
++          module_found = True
++          break
++      if module_found:
++        pacparser_module_path = module
++        break
+   except Exception:
+     raise Exception('Tests failed. Could not determine pacparser path.')
+   if 'DEBUG' in os.environ: print('Pacparser module path: %s' %
diff --git a/net-libs/pacparser/pacparser-1.4.0.ebuild b/net-libs/pacparser/pacparser-1.4.0.ebuild
new file mode 100644
index 000000000000..7dc296824bb6
--- /dev/null
+++ b/net-libs/pacparser/pacparser-1.4.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Library to parse proxy auto-config files"
+HOMEPAGE="http://pacparser.manugarg.com/"
+SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc python"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# spidermonkey-1.7.0 is bundled
+# tested unbundling with spidermonkey-1.8* and 1.7
+# and got many failures: unbundling not worth it.
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-pymod.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e '/CC = gcc/d' \
+		-i src/spidermonkey/js/src/config/Linux_All.mk || die
+
+	export NO_INTERNET=yes
+	export VERSION="${PV}"
+	tc-export CC AR RANLIB
+}
+
+src_compile() {
+	# Upstream parallel compilation bug, do that first to work around
+	emake -C src/spidermonkey
+	emake -C src
+	use python && python_foreach_impl emake -C src pymod
+}
+
+src_install() {
+	emake \
+		LIB_PREFIX="${ED}/usr/$(get_libdir)" \
+		DOC_PREFIX="${ED}/usr/share/doc/${PF}" \
+		BIN_PREFIX="${ED}"/usr/bin \
+		INC_PREFIX="${ED}"/usr/include \
+		MAN_PREFIX="${ED}"/usr/share/man \
+		-C src install
+	dodoc README.md
+
+	if use python; then
+		python_foreach_impl emake DESTDIR="${D}" -C src install-pymod
+		python_foreach_impl python_optimize
+	fi
+
+	if use doc; then
+		docompress -x /usr/share/doc/${PF}/{html,examples}
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/{html,examples} || die
+	fi
+}
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index a53e01afc25b..7f9423589d5e 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -2,5 +2,5 @@ AUX 2.5-meson-Allow-specifying-systemd-udev-directories.patch 2410 BLAKE2B c511c
 AUX 70-spice-webdavd.rules 159 BLAKE2B 712c2513f1322e4144229e31c4df83cec6780a57590c26cca76d5a1d2844a7ea6bd0696906abba5441023b44985e26cee578a4c21ec00b62b236fdc25de2a964 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc
 AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8dbb050d255cb87e1847f6672ab7121829d08c39ae0b028c2e7d8e375724a1b6e06e8e547291cf0188749b SHA512 df4e08bb5fec88bd7c0002e25c5ce348f538d49de9b74890c97a53516e8c3d0f60c87c77050c5357e73f5d33f1daaabb9007d7e35d4d34b15b105dc4ce273dfb
 DIST phodav-2.5.tar.xz 62992 BLAKE2B aca0141c20c727dd27af3760caf27ec0f7a4936c3c35dbdb60a8a15b5bd75ebd97dfef8bb96f50b266d7a0e53fb8c0e21416dea855ff107b362dba0e89283a64 SHA512 4b6cd6a40118bf9c042abcfc3e7cb593b620922aae4dd3daf77682bf9da2030a0958bc0206531d5950f85551ef8f5da21fb21c54b9bd5e56b880f54e0983bc01
-EBUILD phodav-2.5.ebuild 1278 BLAKE2B 9265fef868c2e9254897639854c2a6c3999e9186f492d95ba25a50605d43a15a7f2335c3bf09e291241d8e978bd5f62a710e7474056f6f7e55671a42b116b7d8 SHA512 a7884e84868a9a6d6416cdce43f3eee49ecc67fc88b947bce748bf4fa30d5ec0c68108aba14a3cfc47ed95597e5d6962522ae5b9b39ff236ceef97bfecaeca4b
+EBUILD phodav-2.5.ebuild 1342 BLAKE2B 672a11da1d3269bf2f9d8659ff6a8d1da315bfa1a24041864f925b344ec9ce33f826fc138daaf541ab880e75427662a248b43d13cebd6cf35082d70c8e6f3eb4 SHA512 8e106c1fcf1b48e09a19b070c4efefb1451721757401e6d2142d52625d65592cc70e8d85beb9dfca9c02539d8ee8e0f2572c500ccdbfc759c9a71a025c792cb8
 MISC metadata.xml 386 BLAKE2B 9efbb5b0f8cf55cfd7f3ec7fc504507ce39606738b7f76713d8a1840f6f9f8815571af74e0a83a0c9f0f7f58ba7a7f25b9fb92f8972936dfb208004c69a8631e SHA512 203cb3e2a102307f6ddd5a6cab91de58e4e58053f43951158239448cb18889a23d67e8f81255c53c313788779ef3f143965d7e3606dda92e4dd4857db67a0b63
diff --git a/net-libs/phodav/phodav-2.5.ebuild b/net-libs/phodav/phodav-2.5.ebuild
index 0a100ae0377c..0e03c1c68781 100644
--- a/net-libs/phodav/phodav-2.5.ebuild
+++ b/net-libs/phodav/phodav-2.5.ebuild
@@ -59,3 +59,11 @@ src_install() {
 		udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
 	fi
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 081fd73ff537..a4f7310abc92 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -2,9 +2,12 @@ AUX pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch 4724 BLAKE2B a098969c
 AUX pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch 1564 BLAKE2B 30f7af19ae18c071b62e31a6a049e4e67f7b391a65ab52ef8d5270ef504a4057b35679c580ba056c9b1b3e5813fde5ccc8ca863bead4f62156e39f8c2947e4d2 SHA512 9fb5b8961e7c69cf8a902eaa28cb2147faf8f0809467911454758b793832831240992a3c27ecb722a4ea066df909c0cf12b4b1bf139037f647828eb4cc16fee0
 AUX pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch 10321 BLAKE2B 6e69e2476439d2f6ca97cd94376d3ffe924840289abe49bf33ecc10c1b67d33457e4231a47851b1e749600f3d7b4a4980b1e5bada06bfc1df5334f6a51b0e8f1 SHA512 58faf870bae4ec94cfc78ca9397e476b7db26c69bb4de5dd6bdaa63f6a8cca95438a182661b485afb04872899c41a8f8ff72c5cfbad35c41cbdc5e9831813c4a
 AUX pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch 3929 BLAKE2B fc7e12b7e8e9ff35556aa153496c2f7decd13bc78493d8c6f24449f063fe9c76b1772f6dc2b6cfc279c9731cc08735b27cd990ac6c4648c18e7f08c2c9fc3810 SHA512 e230041cff87d97947ad8caeb80c4858b8a1d435251d79b281fc0035da04aab549d1d5dc085681d98410da7e37359bb2ed721d132b321cce9a7326e4ff52c40f
+AUX pjproject-2.12.1-CVE-2022-31031.patch 1408 BLAKE2B 7a541dc0e0e9508374084121a81e258a19d4e050232c47cc5be67b8115da0fffb96de6e17a311a53e137ed5313109b2ac9513ff85bb17f3ecf7e066160c9019f SHA512 c6bb01cb3a50399075b264be7fb5f20f58c269cf6a71082e76865eda6393d6f546ddf4e09367e354db90b5064ea9ffd61e1783ad988e222eaccb523d90cda16b
 AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
+DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa SHA512 9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
 EBUILD pjproject-2.10-r1.ebuild 3339 BLAKE2B 7bdb4fd1731d2a32750b73970f06c70188309227b727f50f13819e435adcb897f42bb9408c0ef5c151a12dd6954a01205740b11aea657cb53ead6112a9c9036a SHA512 6b7f60dd30b96d600197d4ed5d1d3002df152c0101c359c644a45787ed7112dc1667065d96ab8001ffa1f8c9de0e8d505be9040aca3cd188b7cb155fa0caeb54
 EBUILD pjproject-2.10-r2.ebuild 3423 BLAKE2B 0e58af6dfdd8428c17fb46a02e80b2d88a8bf63ce56ad7c436790871ef0926994ac8040650a2f3dbf08f7c3d39a1ad50dcae3e39f10e4fd75964b1c0ecfe927d SHA512 3f7113dadd6d693b44b98148bdd2f78a41a55c108511da2f2316275d7f613225b8c6bf01ae6a8feab273e07bbfa74da9ea4e2824629d129bdd5fd23680636702
+EBUILD pjproject-2.12.1.ebuild 3158 BLAKE2B a99c10f66f5b1a3575a7d162a8344afdb9c34ab36fe760aad584311a05905ef22e69c184709c1324fd5c84088ab81ccac18e71b716fb36731128561967a44d5e SHA512 297000bbea349b45c8639f1bbd726a37d9be262c3674190f65f817a0b43ff60d7054e43a19d61469ac865e6ebeae4ac26189be69aacdc32608a215da2689d763
 MISC metadata.xml 1379 BLAKE2B f3506d3ae96c52e71f9c1a9bf455134094b3d13152e5ef25cb8fada275aa5fc876f6fcb058bafe2cd12a0fcb4462929ea97e2ba4e98953eed75cbbd3f39497a6 SHA512 22fe7d0284fba79bb1f69d15f2ccbcab8b95cc2f4b9151d2b1721b85c760e22dcdbb511eff52263dcb331bef686ed88695b71d78b2d94beaed8429e11322994d
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
new file mode 100644
index 000000000000..637b7f374ffc
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
@@ -0,0 +1,41 @@
+From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001
+From: sauwming <ming@teluu.com>
+Date: Tue, 7 Jun 2022 12:00:13 +0800
+Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj
+
+---
+ pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c
+index 722519584..d0549176d 100644
+--- a/pjlib-util/src/pjlib-util/stun_simple.c
++++ b/pjlib-util/src/pjlib-util/stun_simple.c
+@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+ {
+     pj_uint16_t msg_type, msg_len;
+     char *p_attr;
++    int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr);
+ 
+     PJ_CHECK_STACK();
+ 
+@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+     msg->attr_count = 0;
+     p_attr = (char*)buf + sizeof(pjstun_msg_hdr);
+ 
+-    while (msg_len > 0) {
++    while (msg_len > 0 && msg->attr_count < attr_max_cnt) {
+ 	pjstun_attr_hdr **attr = &msg->attr[msg->attr_count];
+ 	pj_uint32_t len;
+ 	pj_uint16_t attr_type;
+@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+ 	p_attr += len;
+ 	++msg->attr_count;
+     }
++    if (msg->attr_count == attr_max_cnt) {
++	PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.",
++		   attr_max_cnt));
++    }
+ 
+     return PJ_SUCCESS;
+ }
diff --git a/net-libs/pjproject/pjproject-2.12.1.ebuild b/net-libs/pjproject/pjproject-2.12.1.ebuild
new file mode 100644
index 000000000000..e4b5b281a448
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.12.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+RDEPEND="net-libs/libsrtp:=
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( media-video/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( media-libs/libilbc )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.12.1-CVE-2022-31031.patch"
+)
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+_pj_enable() {
+	usex "$1" '' "--disable-${2:-$1}"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(_pj_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(_pj_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(_pj_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	LD="$(tc-getCC)" econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(_pj_enable alsa sound) \
+		$(_pj_enable amr opencore-amr) \
+		$(_pj_enable epoll) \
+		$(_pj_enable opus) \
+		$(_pj_enable portaudio ext-sound) \
+		$(_pj_enable resample libsamplerate) \
+		$(_pj_enable resample resample-dll) \
+		$(_pj_enable resample) \
+		$(_pj_enable silk) \
+		$(_pj_enable speex speex-aec) \
+		$(_pj_enable ssl) \
+		$(_pj_enable webrtc libwebrtc) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/ppp-defs/Manifest b/net-libs/ppp-defs/Manifest
new file mode 100644
index 000000000000..50fd16cfc869
--- /dev/null
+++ b/net-libs/ppp-defs/Manifest
@@ -0,0 +1,3 @@
+AUX ppp_defs.h 108 BLAKE2B 4261434d8985de8ee4c23b9ff2f551daad763d37107a59b37c69d35ecb56b4016c0232eda11e92a1b33f1e08785c3b21f72d1328712c4366c4a4aaec4badcc09 SHA512 cc3f6e2deabdfbf954b8652f28278a24781ac79b3542fde04cbb3924e25aad2e4c1a424b18b70f77b88bc3549ea7c98683ee63f07900386a54208274dd66bf8c
+EBUILD ppp-defs-0.ebuild 420 BLAKE2B b3938a036383a3b31c80003ad66e6983e0907ce8ae76787a7c95970b9f0c24772b72eeffc96a6af9338bb6f7adf0dfead2fa081d3689f49d93c2dc7956de4915 SHA512 082d93cd543b8365df0b7a33377a67864c744b07e48a2bd52f8a3c4f7a0e4e94bea2747ff033e6228e02b22f4179467756a891da0e0e5124f92c9abebb7af8f6
+MISC metadata.xml 217 BLAKE2B b827888fdd4e1572aade77387c9e6e702b7637e5fb50e47c163308d2e1609967e473611061373febf39543bd178c2b753ed43043b5d3e875e1dc30ddaa5db943 SHA512 a425ec31e1d9f15041755a5b4102c69b4500955ffe8872a6bc90b8ccb731693ee1c6a194928c0e042ffbaa8e09818d170baac66e1b2b5fc6940cf80a4356369e
diff --git a/net-libs/ppp-defs/files/ppp_defs.h b/net-libs/ppp-defs/files/ppp_defs.h
new file mode 100644
index 000000000000..c8be812168c1
--- /dev/null
+++ b/net-libs/ppp-defs/files/ppp_defs.h
@@ -0,0 +1,6 @@
+#ifndef _NET_PPP_DEFS_H
+#define _NET_PPP_DEFS_H 1
+
+#include <linux/ppp_defs.h>
+
+#endif /* net/ppp_defs.h */
diff --git a/net-libs/ppp-defs/metadata.xml b/net-libs/ppp-defs/metadata.xml
new file mode 100644
index 000000000000..6b00211d29ea
--- /dev/null
+++ b/net-libs/ppp-defs/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>musl@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/ppp-defs/ppp-defs-0.ebuild b/net-libs/ppp-defs/ppp-defs-0.ebuild
new file mode 100644
index 000000000000..f3f93b109e31
--- /dev/null
+++ b/net-libs/ppp-defs/ppp-defs-0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shim header for net/ppp_defs.h on musl"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Musl"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
+
+RDEPEND="!sys-libs/glibc"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/include/net
+	doins "${FILESDIR}/ppp_defs.h"
+}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 4515813a7b9c..4cc041b98016 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -3,14 +3,17 @@ DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
+DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8
 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST boring-2.0.0.crate 159332 BLAKE2B e51e299bd46c29c3572c8c1a3105cad5910de9528ccd82407ea578fa093762ffe0cc4915cd9e09c848651f3d9814253fcb612b82b9d72b259545f99dbd1a4c45 SHA512 162f3d5b066a7026a82027d2ec01946e3852b80926ec95e7e4395527fb33667b6a880dfa34a289e70e065472a0bba701a676b03ea160819b1ff4b12740037bfe
 DIST boring-sys-1.1.1.crate 3301658 BLAKE2B bbc064d2dc0b888e4427702fa15b9123a85f8aac045404ce70fef1d7994ac8d640f9155245c63b4b9489e9c4f7071a4585c62abe23351b8acf9a296a8b9841ae SHA512 23fbcf459c6b7e0023fd572b810de246d4e4e164ca0375b205deba1107a038c167364becaebac44856dd0f8057c72ea3b335fba820ddb8334b4faafb22b38e78
 DIST boring-sys-2.0.0.crate 3303655 BLAKE2B 4a71edcb9a4955f13740ea49d54cba8e3cbfc208c3f3c3baeeae0f0a106b58fc1fefca56e875f4a4e0b82d233686cff1e5f4fb527da6321ef2c5267b675165be SHA512 f742315e62ba84a93de67cf5ac40312f61e4c84b1b30b75ef51e5582de4e30fa7b3e6ec440ceda7e1efcd43053eaddf707148a27d09f52bb0b32fd9422b78159
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
@@ -22,6 +25,7 @@ DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5
 DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
 DIST cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
@@ -30,6 +34,7 @@ DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0
 DIST clang-sys-1.2.2.crate 37661 BLAKE2B cbf637171253aca4892270e28c54c43b01cd1d56311555bd6c5e6b142b5f42d561a2808e1ce0baee344d08a2fbc19be1712ca34bbc5b33356a845042ba0df5bd SHA512 7f1736bce5dbc644a4901a73926ea2f6a92a419a7399b6cb49bf8ffed6a3177e9327add6e68fdf6b9966f4b0b580b213555d6cefbe194ad7a4bee987adf555e5
 DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
 DIST clang-sys-1.3.1.crate 37840 BLAKE2B 4c925a684d66fddb5f3953fff6b96fa56b0b996eed227e17873ccd5555baf4ca77964a38ff279999533e7409e2b1d355c13470a6c461fb4b0e11807bc948dbe4 SHA512 aeea37957f7e9a7ecc862f56c6492b68b57217d1a893d3978f5d48d5ef9f80cefa8c52604d7201b9c96402d87ca43ba694890b0bc849d4d623f74ea009ce45bb
+DIST clang-sys-1.3.2.crate 37904 BLAKE2B f6000d5e9238c662c7c3f0f886de0916164bc115be7fd846640081a0506fb8d60db34ac62d8c83f6bd25a87eb598eac719f0f17a9a37180c72ec2362549483d1 SHA512 500cee4af6510741e5fe7b72d6e25a513072aff26a90ce9766a70cb5e266e7c76bb4178f15ad517a0dea0d1e2f61b8b5953a2639e8cb87525bf2bb62b64847f4
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
@@ -43,14 +48,21 @@ DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c1
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST darling-0.13.0.crate 19181 BLAKE2B 7880218ff592fb8e0790e7d39695424c7ef942f8f35ee8e06be914da7749b9be54a19bf9de6b5d2cb43e4c76f914fbf594282966099d1cb9ad54e01a01264be6 SHA512 89894f4004f102d2f889a1adbcc79bf3cb96fbe09e6e8bb4233df196367174b626bf5ecce53627a2ec8a6abb251bf027054d39b9b91d799a9d4c1e1c3da4cd96
 DIST darling-0.13.1.crate 20097 BLAKE2B cf72b572ee0672a3599d2154a7d42bfc71fb927640b7db80c8e93c9044fdb182b351a353788155776194a33a00def7951c572302555e1e5d03a119989876affd SHA512 0271198be875ee1a42d14e2f34b4d26bfc8cfc4cb86361f21c0bc079aceef4ad86bbcba919d7066abb891a87549404c432df53b0ec0e96fe293408b114c5ba99
+DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75
 DIST darling_core-0.13.0.crate 49969 BLAKE2B a8a26a6b272b00a06d17585edee07d8a3a5a5c7a7a84a389a0fb31b60f9526bf79d5e2e69625f9014cd286657507a268e4a2ff25230cdfaddacfc23a1af234f0 SHA512 b97ebc4cec09aaf1a3ff6773bf312c94889522ca21573271d459c51942c57b71e104993c1b723ad122edfe49c0d029ea27234f07daeb50b5cd36f007ab57bb39
 DIST darling_core-0.13.1.crate 50847 BLAKE2B d7117ecc836e3c56eac69e4e81d350b2d8fe88e72484bb5269eb34972062a84882de43651561cf2df5e82d68b22791656017b3eea3d9f79758d8e5ba4a84f5fe SHA512 67fd1bf5059c6b7ea1b2b17b6f7bcc1ea6a9f84f50182852b2b8b9601b8d43529918b373dacb9b2a7aa12fe6162a9412d1330ce6e9ab6a3e2171f6072d958711
+DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f
 DIST darling_macro-0.13.0.crate 1915 BLAKE2B 15572e0e3d8122d5dc02929decd93338082d9639d7c5c103aaa04da1620a941333ed35a7d8fdad94bdff6b11d412d31c4cd61e56a41bc0b3f9403d8eefdb7d76 SHA512 a8f96d3f84b1a121b3991b09e262dfacaf3023bcca1143a269ed6b9528c903db1ebb67b9858028e50cfa547c1f9644676ebc9c085d05219f9dca06b24354c9f6
 DIST darling_macro-0.13.1.crate 1910 BLAKE2B 3c40b45ee8ff5a5b7a6dd365c561025dbb66db4121dd732806c7ad9d691ac423c367e97693d90b9037626211c7b31939ed4360e107dff0b958f640916ba879ca SHA512 41b190019f1c02e664020dccf21b4248f85182d16b6d1a8eb0b82fb6da1cf871b07959fc2cc65620fec6d23b309c0d188603d35ff288165250fdc807780dc149
+DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
+DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
 DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
+DIST foreign-types-macros-0.2.2.crate 7636 BLAKE2B 43c882b82b03f5f2d59bdc4ccf85c11bd05e58da57115815cfbd433a43c523438078e8eef4e95631f1f4486292e010319ea0b00784a99468c2bbc0d47e8ca3e9 SHA512 b5ce7599bfa9342f7586dbc0c7124ad19d560afe75cfbd758eb17ebfe7ac8c7f8f5515c4b527df4e8bfe812a8ac9df1a921d40df6d0e6e371a0be3795a36da05
+DIST foreign-types-shared-0.3.1.crate 6006 BLAKE2B 27c26518e0de0a298df2996da4959727dcc6a21bb4efa6c28869a9affe7ee3b427d1bae25ed6928477d07959bd143d5d4fa27325f8f5a5cb0ddd3cdb9e5314df SHA512 c68da34b55230941d6655f6a52d5dcb8ee02149f25c25a5ef782402f9a18b33047905f28b70183a5f45b45977c011a5320cf7283b7901c76ede4d82082ca4c9e
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
@@ -64,39 +76,54 @@ DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc3799485
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
+DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
 DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST js-sys-0.3.56.crate 70520 BLAKE2B 3ea566b937221963b0aaa037b3b702e5d4143300a5463e8474cddeed0c82612b76711518b91b2bcb63f5bae4c11a207c0c1a33d23f9c8ebcf5b54ae1109fd1e4 SHA512 52c2020d2bc80173a2ba5c614ed07d86755e969f4d6b071b5857259cbfdd3eb5a62a5abadd42ebc0d673397ad18721e1ce55e177fef831ac13e15971373056da
+DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.102.crate 537138 BLAKE2B 2814792c4215555d5a33d4e3d21f2c78e1d9c87b3e1884d7fffa512aaed0737ed2329db6298fc074d477abfdc02f5bd30ec485f3fa7afe7d7a3e608453985c63 SHA512 cec681043b9c279e25ffbfdf2aeffe2a5fe057a8187fc2c986aca9a3fc900eac96ae3134632b124f1aaae4e5d2ecbc7122aeb40d94f83b5ec075769ede361643
 DIST libc-0.2.115.crate 565468 BLAKE2B b13d56f63d9da517d89ec97f8a4b20b6ad14637eda3241b08fd8bbd3244e7821fecdf81721e27653372ecb04f347769c742147c3c747f7cbe678ef78ca737b60 SHA512 885f31e148391d739015e22ca87737041ed4deea25f02e566c31a64a1534d27a29f711e24c2c6eb2614e9f930972220a3a5e20716d7a14a8603239ed21d0c410
 DIST libc-0.2.117.crate 566541 BLAKE2B a0ee103e6167ccf84cbaca9e41934ccaa1f4abcbaad9d7a4d4a8cccdc2f22ff36ccc46a16a295fed9c3113e1534df86a3d19eda9e0cb609bb75145acf8ca9a0a SHA512 1ff22201cad04f8a21674c25bd57e2c708738af7ff1d5677b513d728ecb99f4eec4b78e9685aa633518672de0d44d5dd2e727ee7b6b06c74718181565df3fa7f
+DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libc-0.2.95.crate 515341 BLAKE2B 5bbb10917433ac9b305e4eadd4626a31149ec46aaef91f7d360bea8b5956499c55066339ea63102e71976a3aa969744c871c0683eb137e3c8ad2f8d62570cea0 SHA512 40ba9908c202f3d40c1bd7d7bf516f3b236e7751020bad0007f185802fada64fc5e959b68a33aa1f59de76d5a649f62bcce7eea671fd420852e0bb902544ebbf
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
+DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
+DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
+DIST miow-0.4.0.crate 27567 BLAKE2B fbd395d3766c3874da8067dec37bfe40f3dd90c995af5139d2583aacb9d634cea73467b87b84af84c760cad89031c1d26670174b2c52e932ef6729d3fc98dfdd SHA512 fc974ec96a82c92492cafd15a5002c1c647841d607cc1726eb2b98645bb528a5d6adb086322d6fc1753326500ecceecb6cf26d721af26441de8ee23ef87be0f0
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043ba8233f1016417f91ecff64887c3bec1dd6bf4cc6b3b3803a2c19a44513f1affc635d8be6212bdc8ee47d SHA512 aacf14e84be17edced412e3d256734508426a8acb8352e83a5d9d4f26d640f60a881d8f70fbc6edf1843173af63ec05be7694fcd6c6287d871e40518e2ed04ee
+DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST octets-0.1.0.crate 5674 BLAKE2B 76d94597c93a5fe0be10a9bcf4f67e3ea620081a3e029cc3274704e42817296a54c1ac2e08ad19198768386be766dcc2b08969e284110f280db34a09d24bc107 SHA512 72fba6a7a055b9dcf45b39d0dc7e61d8ad62401a480faf2c71b1fd243b755bc1e732e6983bcea147e80d35b3eff6e4bb1e2ddd4d8b961c0846fb20875e5e62b2
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.11.0.crate 31121 BLAKE2B 02ff93cd8845bbc3f7741d0e05fee11df5e1c35961b505b2717e697b9c503891a89e15b2c71b76a66f5f239c5ee650f2ed6105b445a4f977578a4243b4dac96e SHA512 3769223beed1a7c8c5625e18dc000b3ab296c7c3af21bb6cb563ad9d130bbbcd447d420d0ec591e6366652727de11dc76dc8f7720110de50be7cbf177587cb15
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
@@ -107,25 +134,37 @@ DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST qlog-0.4.0.crate 23452 BLAKE2B 219053b98d09189415d45c6487356e565f6240c35508b84dc4b1a1d0d7aff0af8b02889805cc36930c600ec37bdc2941b52d9ca325c719497ee49e5bdbf3228f SHA512 d1ae8fc0ec99ca77946e89c3295183aec551e41f44e5c44178c0b60e997311a6fbce7a44eeafea757303f6f051c3fef08724c85b273dd11014d555f3c5761613
 DIST qlog-0.5.0.crate 18586 BLAKE2B 81a2c7650d019069a0ed101e27bfd0fe729fbbcb5c512b78bebecb85f85b7449bbd5c933524bb864a024dd70c632f92e2d4405448b9c92f3860e0fcf6d7d5a67 SHA512 f185edfab8e1499066eeee0fa35711f9a035a56d0d0a192ca8b964168152e3431f6f55c5b72df78d7af3aaa66ecfb8c897889939ce47570f5296e42df5c5febb
 DIST qlog-0.6.0.crate 21322 BLAKE2B 24e74c6ab14820423867dcfe85fbae8fe9912c942afcc4011972049782dfa0ec9f5d2fa55a07358b9bc4f86bdeb422b80e9aac20b2349ec62d19abbacbc05c9d SHA512 29e2945890fd3146af594293c8ad4803cd7a3cf2ddea2cdad62d7c4fe84abcae0875204b08a99bc53c0b0e3519a1634fd3c6eb99b50854655de1b30fb8ae0a34
+DIST qlog-0.7.0.crate 20584 BLAKE2B 122f4b5b669f1c658e408d48e4e4f5c9cb76a117ee361022c8b7da3d818e7821f352d6690d338ab702243c949ea710fd312257048fec80f927d0906673d99bfc SHA512 ed6435a38f77c6b9d13d35569395f1b50d04e85f2b2f8afa05ea875c6a0bdc24d160d1b5c04a5c8c1c975dd62ec201f19d1c512f3f98646d4f9db88738ba4361
 DIST quiche-0.10.0.crate 3604568 BLAKE2B b79bf113e21bfe613ef88a1279f0a6be2df5efa82db719a8407ff5db2f1f757a076326e1f243483e042000dfdee6bf81a649b51384a8f804f39016d388e14efe SHA512 94265a4245dd64e40e211a8e3dda356c0774971009afe0aa6c10c507d688535a3e54d318217de4b98de1b7828a5de921e6490003d55a77b7a4fd5b1316a262a3
 DIST quiche-0.11.0.crate 3608178 BLAKE2B 8a2d01733dc3094237be1371a9f6ad33ed27a40289c16c41febcd20ed1d091a2b68c7c2f43a034c7a2a7779a3060813bdaacee6a4bdc96f82d7b2a14db217876 SHA512 293e95302dc812f5be24ff5153ec979fc0fa802b374b734dd2fae152532ba0d7eaf91a192c86959e8fdd6ea5017303c4b72076f3bc2bc80ce6636285759aeb60
 DIST quiche-0.12.0.crate 3608965 BLAKE2B 9694a97eb276c4302ebf9b425e8aa35d44535d45233600e487d427cf922d7bae664120726c741d36074373e6eb7f16801ac6c192958513117922ddc11cadb165 SHA512 85c48e8f9da82ff58a0f6e06cd3ec2fdb50b51fc0e904fdef85340f29d8bd5d693f9fad3db04b0ad36ac1a014536778daef163ef1574cd33cf272c4be6b88184
+DIST quiche-0.13.0.crate 3613670 BLAKE2B 526d9ce4c04d61205dcb64a8b804640300cf455ef922405a13525b76921ae66c28ccacef574bcf67f3c88dbf1b6d417abc101568369a8803328442eeb395a25a SHA512 16dc9f9aa8536e2a9e27dde124f5e775ca227d117a7510f28cd97c98d0357960eefdae8ae80490285c662b6c63c486c30d8419008f96a90c5a12ad79ab665744
+DIST quiche-0.14.0.crate 3616806 BLAKE2B 7379c6aa83dafd8948820e4ed93409516daf13344ec70a8ec0049db03a1a584acbc635a5ea1c92885781a09fe4f2de1ba842fbeb493cfc9920b6d2c0ad2de8d0 SHA512 61f0d0beec39732cbb185807ae1c159fba1ea13ad5e168bbef9065b79ec6d0e6a06435894fd90bb4b7777ed84a3b620b4ae85cab07d0ce2e6dd214133d2b8ce9
 DIST quiche-0.9.0.crate 3536510 BLAKE2B 0051d349677f7a5b9c7560c8765c8eaa551ee2575a7234f01eab32878140cdf2ffedc5dd78abe3156ac554f7c4d0d078ba1ebaba93870a3445e63ccb2fb201eb SHA512 791945f5c15dfbf018f6329b7fb8e0b19912d1ed85b58e6490df5a72115a715f654ac57c5a5658877f5e7e4a5e365535b89172667c42a9425c5528973e157de8
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
+DIST regex-automata-0.2.0.crate 315947 BLAKE2B 0edb12b2cfbd4525e2d71edf8348587315b2355d4effc9d9a40c156b527ee99e54171ac476c2d83bf44035bd8b52a3ec4c1c1b59c58f56993a12fccb49967768 SHA512 9af74b3efaeb65a06fa1dbb848354c7a2a236821fbcdf842e7370834f92db25ce16137f62301a23ca2d809591daba721172f7823575978bce1e564f91d4fff98
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
+DIST rust_decimal-1.23.1.crate 113153 BLAKE2B 2ab370f5999aa5fe60bd3cdbaf9f7b4a4286090f5e047acf6075098a71cafe16b4740b3c30847833c91f31815868132f58825d1fa4b269c1e4ddf1be30e150e0 SHA512 1283af81b2641d393d6be6bde33bc71d8e6708e7da8e59718512047c9439fdef566232e6a806a1de6f3ce87c4d74cd91b1da538497fb8b93b7a110c237d2659b
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
+DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -135,18 +174,24 @@ DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
+DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
+DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
 DIST serde_json-1.0.78.crate 144364 BLAKE2B 840477a9eeedf75834f18435fc8d6d8b8b35cf45842b6f42158afbf2404293a31b80e07802ca3b7215d37335db0d1365709e5b1ec68c55d6a47317e732779e39 SHA512 cbef082fbf633b9eb40056c1d47576d0233087ac08f76fafc2ea3598ad730770365f46bd0afd1bec6e6cb16c7d66feec1b6d8b0f2ee46db69a10e4d5d76dbf01
+DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
 DIST serde_with-1.10.0.crate 75349 BLAKE2B 840944d399144e383ef5f974588de0f126cc27174409a498ab2e0f193ddfa757853256255990d4ec3048d1ee983af3dded203d905d7d08f182da4905e67d8afa SHA512 c3a27433b25eab8ea87716caed67b778fc4c6d7d721d95c466d545e19b2fe02d9496a9e927450b4a08703ab7857f7127968ffb3f4389080cd054a43d07bc8489
 DIST serde_with-1.11.0.crate 77644 BLAKE2B 89ff01959c54ec292fb76106228309324bc313d8447d30d54ac804741bc67ff9c67e61dffad7c98a616254b3b48096706513adacf78a419b6aa4cf9e27a36bec SHA512 c8faa3b14c90eae6daed16e03bc3e26137fae7a2fe0d1003ccdb1d036d25025f0422b06bb743b647997ea72410766a332f024d831e063cd1aa6375790287ae21
+DIST serde_with-1.13.0.crate 108768 BLAKE2B 62725ef3df86036e10607ba28aefd69acc07476c82e3cdf78240fab0d89f185c33beefd06170998f52cc7097a928c349735f8069d2b55240690641d22cc50a1a SHA512 7dbd5278e51167e08fb0a07c3aec7a90101042f088ad3b27bb15c4bb56481eb0e51d0283ae7f07fe8154c11b0bd7d44cbe8e4dcb8db1295a2d4f18ab7f82f1df
 DIST serde_with-1.9.2.crate 67712 BLAKE2B 1a297b422a0e783ea5da1485bea7c726f7b1b33be8e1ec13a14290a5a666343a50241c2ae4580d4c4bd00c37f9013391aeb2adf2231297d8c9f3e2b726a7f370 SHA512 832ccccb63eff2ceae77d317394fed71b7cdcf42078fb30dfdd63bdd0a294f88a1959aa62de8ddfe18d9f2f791227208500a8b8e6efa16f573b1ad0e54ed0a3d
 DIST serde_with_macros-1.4.2.crate 17752 BLAKE2B 2549b65d267be90e5dd3e64b38c2e220dcb156adf95f3816a98c2b729f4270dd7399e8527b77d0f6c9deea5b4d99d9b7fef52a2d7c5af9e382cf20b022157f2d SHA512 ef9191d94d0402b65eaec653fbaa91ecaf3fbf3c77279eaef121c2882e0b8ed3031c1f8d3e199c3af8b371fcda4f830f703bfe47635284c6520873ff3b5215b8
 DIST serde_with_macros-1.5.0.crate 20802 BLAKE2B aa80bd116dca4ff483ba8f1cb59c8126fec7e064cebcbefb3ee90527345974b8ba3eae2b0ea9d218e84f064e1762f65d414f60c04bf622fa0dceb5ed928e221d SHA512 878f9cce2131816bc40a3cf44dbf03ead30317b709cf12cbc9b59709ef781107e647df35ccbdf385205b63588d96d1e85df6dccf0e07fc42704058bd84e00454
 DIST serde_with_macros-1.5.1.crate 20879 BLAKE2B 98e59b3ec00a5d4e3372eacd56b324803cc16c16723a719868ff2f69d48c7922f6b83eaa0d715540c070b831bc5f6df416ac4fd672a78f6fa46cf6bb64e79f60 SHA512 5999031ec8973f9fa51ebb2920737d9ca043de87ec3ac475d98e0317edcbf673e1b48213edca8338cb80904366f8fd587fc94b1e571bcd773e85bfa21f67a9bd
+DIST serde_with_macros-1.5.2.crate 21426 BLAKE2B c20e198b3657516b30601dcc8d9a1eca54111644f42922ea18542c16ec8084a6b31bd318b1de9da3181ebe9050f58d119a95daea05b375d87ee68def69213bf4 SHA512 4619ce9f35b7659f5641eb3b3891910a7780c76911968b53cdae9fc6b03ca66643157707c67f6ac5d16f657d7f3332671430e828d111d7fc8968683523b93fba
+DIST sfv-0.9.2.crate 22477 BLAKE2B 6f508c0b54598eb47976cb0cb8d49d5d20528c28a4c0d4d9f1b2fa0decf1eefdba3b54911948ed72f4cc46990fd45bbaa5d6f30974c52e5f57eca2aeff73b9c5 SHA512 dcaef4cac955ee97e43d257463ea73ec84997efc9538548659b8a52993f249b40d83fabec73e0f4e562680ab275e35fe1ef0916806e6b47edccb35d993e07e0d
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
@@ -159,47 +204,60 @@ DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
+DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec-1.4.0.crate 42418 BLAKE2B a5a3c22a9a7e9b356d2cd7c74e27d59eaa8b7a0c7706ff0bffe4f173842d35f8233ea745653d1c76d52b71da4683db00eb0ff5c61a7c9498e2853ce8d0f696c5 SHA512 a77f1cc0cd73875a2e6bf18ab95ce97ddb15f4d1c1ece0b43e242e08bd853bae5a23ae976f4bc928205d2b24dabbf412cb74650c7665cc0c0f499cbcc21660fc
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
 DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
 DIST wasm-bindgen-0.2.79.crate 164276 BLAKE2B c3eeb98f9df18d52d7842886c187ea952923290725a0f90e1195152b54fa7859f0b05a618ee62c3f2eea36647c1299d4506f2cb5825cdddf823564882a93cd91 SHA512 30bbf75950c1f55560d88aa2ac37a00c55023974a73e59db575c16addad52c03eac401297be664f1f7bbd202dbba9f33c293ce063f4523082f5b2eec33ee2f85
+DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
 DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
 DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
 DIST wasm-bindgen-backend-0.2.79.crate 25776 BLAKE2B 4fe72230364c889e74134baff9c4d661e54da3b8612f6139baf0897deea218bce4b1ef47b13fb4314729bf37641f9a066cc94bf83c2c9ca9928ab05e4ee93280 SHA512 8463996051ff7af350d32a871ebca080c434ead1c47d6f4e7b39b406adfab249615cc84d775ab550ad2a23a9af6514ecf9538d0936c54a2e253109c962b198f8
+DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
 DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
 DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
 DIST wasm-bindgen-macro-0.2.79.crate 11806 BLAKE2B 8b06ecd90701e37810644d9a28cae3e9d18abe7aea7178dee92b373991a02e2d718b0546f8f90bef1e4c7ec2c0e00221dd6f8f4f796225197184f407b585dce4 SHA512 b4d6b7b70ad6b1b2017726032923965f1bd0431a1badac1d050ef2539815cf9b705f7668da57c1bee2b7ecdf403c7d1c753217d25b8acbd32cbdca110c69c99b
+DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
 DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
 DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
 DIST wasm-bindgen-macro-support-0.2.79.crate 17861 BLAKE2B 0368ed79c618949580a3aeee03853f0174399de2ca8e0f0aeae88c8b9d3cc61f86bd38481937ca3d7a1424d17586625ab581d2662045ffea4d9af0062d8404dd SHA512 a8b83cc222889b8d90801787c99a92c93383a8313f16d96949598e137e47cbd5690cedbe97cc610e7d72042462beb6562124a0fca6e2e777d4133ede376a9b99
+DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
 DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
 DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST wasm-bindgen-shared-0.2.79.crate 7204 BLAKE2B 726e4df99b50052a9eed71b94e3887f75bf611d08e50d22724863a2cb95a9ddab59c67c88cfed21fb1b09ff9f7f154cb3acd27cae71aafc0850d4ff19f61ba2b SHA512 f81088018534c91b542d5a9085509544ea47c3a1ac13291e9dc291c23bf1a912bc61cc64d94469ae5de3b98010270956f222a08e462332ccd0b450c8f198af74
+DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
 DIST wasm-bindgen-webidl-0.2.74.crate 35657 BLAKE2B 22e9fc1503833035213afcbec8402cd62c62f183ed51c970af883772b38ab24dc41c981edb6c1bfa0282ab6cd62270bc3e34437e68e768310a26a02513bb58cd SHA512 0b18a3638625a2d574a005d6d8a4acf05fa3d5d217a673c9a4276725fc96840c2a4775c29f6a2205a5a83524a50f440872263d7098767140c96e3eaa03e5f3f6
 DIST wasm-bindgen-webidl-0.2.75.crate 36412 BLAKE2B 28f31c6d56ebbcc3f6efa8ba81e9402b813d75a1626f10de4202083b5f77d5e05ff8db1ced914fb888f24b4e4cf69ea159d9421f0e7eee040aaf15df9bda060d SHA512 65e51312cdd3c8ffed9b1ced0809c6f46f55bb188ed6831fce528e49af2780b8b5fc19210fa3aab254baabc3bee5778e5aaded42ef0b59da1cdec3c0fb146d3b
 DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
 DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
 DIST web-sys-0.3.56.crate 666465 BLAKE2B 903a54a43cdb7d990ac3e01b3ab7bd9ad33a7877fca2873296d3df3d7e1fc47d2eac52296d37579cfa1055746a0d07d3aa3d909cd86f1524e7c1ba60af16a3b2 SHA512 00db771aff344a7c05ff0c6e3c7648646913ebf16a38eb83cdb4b9afaae3ea90215ba802fe8586e50e20ccb96af11b8dcf2f81b6a11f44e26a2b0f9978b7e641
+DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -207,10 +265,18 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.10.0.ebuild 4388 BLAKE2B 7723e5f6b1cd1a5f052dccbbecb9decfe241529162464c1eaf4533e0bf61aab0c745cdd29b5c0cde64f37105c2042b1ab8e880377bee7cd7f61b747e4890828e SHA512 da18092392eec34d21110f18f3dc075b31308f2bc87eef885d8d85a5a4de2f479d5991854e846626867a479d33465d4a5d76658d1d258c99fc119ff2bd2a21ee
 EBUILD quiche-0.11.0.ebuild 4525 BLAKE2B ba53f89b0e54312b7009e2efaba5defd9974a8720107193eb63b6aceedf79ac38c70e957321272d894d1b04ec71fd5f463cd7a41ee31c712157122120fc386cb SHA512 38554157f972a37a864a0ac39f3b6b23dc596b9fabd513995ad9d7ee8267f93938a3bee15a7d330db3337a9dc935ee4682ea74fc98a7a338ed3eab5a7bd34511
 EBUILD quiche-0.12.0.ebuild 4459 BLAKE2B 2e8b1284efe314e7bb78ba897ff31fa1943f8b83230447e5bd79ba3677d7c17df15416b67f1692a143bb15e07a8db1a91c6be7140de317771a10e91d5e7be7b8 SHA512 3e449cf3fbbef5ac984f9bba58d1820a5d2bb1d9c5b0550c19ef26286ae73fca19ef0d2f91682ee922d431c8465aec23bff98d5f8521155e0f7692c9558dcf50
+EBUILD quiche-0.13.0.ebuild 4793 BLAKE2B 335df2732faf3950c30f055797200f8790d001288d8e76c4c7efc7f4ae9ba5acdc7b15eca72c54bc2cae05080dc5710490bdc216c6a2a5ce8e812be0fe9ea862 SHA512 6c28e36d6dc745f170cbbb71c3bcc79659c96e9d56c531abda13d36d1a54ead026eac7c9c83612bde55dd2e2d23890cb8c4e9b680bf22ba4e7ab002f179d4ef2
+EBUILD quiche-0.14.0.ebuild 4813 BLAKE2B dc4626b68bf895f48089d35a8003f98ef6c5f6c3f4a6e9a70a17dfd434c89d5e9df0c46375f7563061f7d1ccf67b3e981fd3fff965fb4d9b611d64b2bf61ab14 SHA512 5962a4774278afcbb260d7c01755a5180d461134d46210e5abd6ed6dd412d07fdfb96a30d4da952635e811369d47288353f085e390afbb7b0b28966f87f463c1
 EBUILD quiche-0.9.0-r1.ebuild 4385 BLAKE2B 1c130db59001681420c487d090436dcdc195010c27f1ad9a1cab4abdcbcf37a2d8aae42a28ef9df5aa984b6ddb445c5b6b3b880caee86f77a4014a7fe33f233b SHA512 42624f53406d711dfe664d9aabffa36dc997f0ddc7b18aa5b77802633fa4b92c9bd76ba0ef767c2d6851b78adf8df9a1626e4b24fed1bd13a332102f9c12e847
-EBUILD quiche-9999.ebuild 4459 BLAKE2B 2e8b1284efe314e7bb78ba897ff31fa1943f8b83230447e5bd79ba3677d7c17df15416b67f1692a143bb15e07a8db1a91c6be7140de317771a10e91d5e7be7b8 SHA512 3e449cf3fbbef5ac984f9bba58d1820a5d2bb1d9c5b0550c19ef26286ae73fca19ef0d2f91682ee922d431c8465aec23bff98d5f8521155e0f7692c9558dcf50
+EBUILD quiche-9999.ebuild 4813 BLAKE2B dc4626b68bf895f48089d35a8003f98ef6c5f6c3f4a6e9a70a17dfd434c89d5e9df0c46375f7563061f7d1ccf67b3e981fd3fff965fb4d9b611d64b2bf61ab14 SHA512 5962a4774278afcbb260d7c01755a5180d461134d46210e5abd6ed6dd412d07fdfb96a30d4da952635e811369d47288353f085e390afbb7b0b28966f87f463c1
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/quiche-0.13.0.ebuild b/net-libs/quiche/quiche-0.13.0.ebuild
new file mode 100644
index 000000000000..6fb57fd07e3b
--- /dev/null
+++ b/net-libs/quiche/quiche-0.13.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.7.2
+atty-0.2.14
+autocfg-1.1.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.59.2
+bitflags-1.3.2
+boring-2.0.0
+boring-sys-2.0.0
+bstr-0.2.12
+bumpalo-3.9.1
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.73
+cexpr-0.6.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.3.1
+clap-2.33.3
+cmake-0.1.48
+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.4
+darling_core-0.13.4
+darling_macro-0.13.4
+data-encoding-2.3.2
+env_logger-0.8.4
+fnv-1.0.7
+foreign-types-0.5.0
+foreign-types-macros-0.2.2
+foreign-types-shared-0.3.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.11.2
+hermit-abi-0.1.19
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-1.0.2
+js-sys-0.3.57
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.125
+libloading-0.7.3
+libm-0.2.2
+log-0.4.17
+matches-0.1.9
+maybe-uninit-2.0.0
+memchr-2.5.0
+memoffset-0.5.3
+minimal-lexical-0.2.1
+mio-0.8.3
+miow-0.4.0
+net2-0.2.37
+nom-7.1.1
+num-traits-0.2.15
+num_cpus-1.12.0
+octets-0.1.0
+peeking_take_while-0.1.2
+indexmap-1.8.1
+once_cell-1.10.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.38
+qlog-0.6.0
+quote-1.0.18
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.5.5
+regex-automata-0.2.0
+regex-syntax-0.6.25
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.6
+rust_decimal-1.23.1
+ryu-1.0.10
+same-file-1.0.6
+scopeguard-1.1.0
+sfv-0.9.2
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.137
+serde_derive-1.0.137
+serde_json-1.0.81
+serde_with-1.13.0
+serde_with_macros-1.5.2
+shlex-1.1.0
+slab-0.4.5
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.94
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.6.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.8
+unicode-normalization-0.1.19
+unicode-width-0.1.9
+unicode-xid-0.1.0
+unicode-xid-0.2.3
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.1
+wasm-bindgen-0.2.80
+wasm-bindgen-backend-0.2.80
+wasm-bindgen-macro-0.2.80
+wasm-bindgen-macro-support-0.2.80
+wasm-bindgen-shared-0.2.80
+wasm-bindgen-webidl-0.2.75
+wasi-0.11.0+wasi-snapshot-preview1
+web-sys-0.3.57
+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
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+windows-sys-0.36.1
+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
+	CMAKE_USE_DIR="${S}/quiche/deps/boringssl"
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+	CMAKE_USE_DIR="${S}/deps/boringssl"
+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=( COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+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() {
+	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/$(rust_abi)/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/$(rust_abi)/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-0.14.0.ebuild b/net-libs/quiche/quiche-0.14.0.ebuild
new file mode 100644
index 000000000000..f2e066456bf4
--- /dev/null
+++ b/net-libs/quiche/quiche-0.14.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.7.2
+atty-0.2.14
+autocfg-1.1.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.59.2
+bitflags-1.3.2
+boring-2.0.0
+boring-sys-2.0.0
+bstr-0.2.12
+bumpalo-3.9.1
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.73
+cexpr-0.6.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.3.2
+clap-2.33.3
+cmake-0.1.48
+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.4
+darling_core-0.13.4
+darling_macro-0.13.4
+data-encoding-2.3.2
+env_logger-0.8.4
+fnv-1.0.7
+foreign-types-0.5.0
+foreign-types-macros-0.2.2
+foreign-types-shared-0.3.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.11.2
+hermit-abi-0.1.19
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-1.0.2
+js-sys-0.3.57
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.126
+libloading-0.7.3
+libm-0.2.2
+log-0.4.17
+matches-0.1.9
+maybe-uninit-2.0.0
+memchr-2.5.0
+memoffset-0.5.3
+minimal-lexical-0.2.1
+mio-0.8.3
+miow-0.4.0
+net2-0.2.37
+nom-7.1.1
+num-traits-0.2.15
+num_cpus-1.12.0
+octets-0.1.0
+peeking_take_while-0.1.2
+indexmap-1.8.1
+once_cell-1.11.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.39
+qlog-0.7.0
+quote-1.0.18
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.5.6
+regex-automata-0.2.0
+regex-syntax-0.6.26
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.6
+rust_decimal-1.23.1
+ryu-1.0.10
+same-file-1.0.6
+scopeguard-1.1.0
+sfv-0.9.2
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.137
+serde_derive-1.0.137
+serde_json-1.0.81
+serde_with-1.13.0
+serde_with_macros-1.5.2
+shlex-1.1.0
+slab-0.4.5
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.95
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.6.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.8
+unicode-ident-1.0.0
+unicode-normalization-0.1.19
+unicode-width-0.1.9
+unicode-xid-0.1.0
+unicode-xid-0.2.3
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.1
+wasm-bindgen-0.2.80
+wasm-bindgen-backend-0.2.80
+wasm-bindgen-macro-0.2.80
+wasm-bindgen-macro-support-0.2.80
+wasm-bindgen-shared-0.2.80
+wasm-bindgen-webidl-0.2.75
+wasi-0.11.0+wasi-snapshot-preview1
+web-sys-0.3.57
+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
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+windows-sys-0.36.1
+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
+	CMAKE_USE_DIR="${S}/quiche/deps/boringssl"
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+	CMAKE_USE_DIR="${S}/deps/boringssl"
+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=( COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+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() {
+	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/$(rust_abi)/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/$(rust_abi)/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 95504d377f49..f2e066456bf4 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CRATES="
 anyhow-1.0.26
 ansi_term-0.11.0
 aho-corasick-0.7.18
-arrayvec-0.4.11
+arrayvec-0.7.2
 atty-0.2.14
-autocfg-1.0.1
+autocfg-1.1.0
 backtrace-0.3.37
 backtrace-sys-0.1.31
 bindgen-0.59.2
 bitflags-1.3.2
+boring-2.0.0
 boring-sys-2.0.0
 bstr-0.2.12
 bumpalo-3.9.1
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.72
+cc-1.0.73
 cexpr-0.6.0
 cfg-if-0.1.10
 cfg-if-1.0.0
-clang-sys-1.3.1
+clang-sys-1.3.2
 clap-2.33.3
 cmake-0.1.48
 criterion-0.3.1
@@ -35,11 +36,15 @@ crossbeam-utils-0.7.2
 csv-1.1.3
 csv-core-0.1.10
 either-1.5.3
-darling-0.13.1
-darling_core-0.13.1
-darling_macro-0.13.1
+darling-0.13.4
+darling_core-0.13.4
+darling_macro-0.13.4
+data-encoding-2.3.2
 env_logger-0.8.4
 fnv-1.0.7
+foreign-types-0.5.0
+foreign-types-macros-0.2.2
+foreign-types-shared-0.3.1
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
 glob-0.3.0
@@ -50,83 +55,88 @@ ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-1.0.1
-js-sys-0.3.56
+itoa-1.0.2
+js-sys-0.3.57
 kernel32-sys-0.2.2
 lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.117
+libc-0.2.126
 libloading-0.7.3
-libm-0.2.1
-log-0.4.14
+libm-0.2.2
+log-0.4.17
 matches-0.1.9
 maybe-uninit-2.0.0
-memchr-2.4.1
+memchr-2.5.0
 memoffset-0.5.3
 minimal-lexical-0.2.1
-mio-0.6.23
-miow-0.2.2
+mio-0.8.3
+miow-0.4.0
 net2-0.2.37
-nom-7.1.0
-num-traits-0.2.11
+nom-7.1.1
+num-traits-0.2.15
 num_cpus-1.12.0
+octets-0.1.0
 peeking_take_while-0.1.2
-indexmap-1.8.0
-once_cell-1.9.0
+indexmap-1.8.1
+once_cell-1.11.0
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.36
-qlog-0.6.0
-quote-1.0.15
+proc-macro2-1.0.39
+qlog-0.7.0
+quote-1.0.18
 rayon-1.3.0
 rayon-core-1.7.0
-regex-1.5.4
-regex-automata-0.1.9
-regex-syntax-0.6.25
+regex-1.5.6
+regex-automata-0.2.0
+regex-syntax-0.6.26
 ring-0.16.20
 rustc_version-0.2.3
 rustc-hash-1.1.0
 rustversion-1.0.6
-ryu-1.0.9
+rust_decimal-1.23.1
+ryu-1.0.10
 same-file-1.0.6
 scopeguard-1.1.0
+sfv-0.9.2
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.136
-serde_derive-1.0.136
-serde_json-1.0.78
-serde_with-1.11.0
-serde_with_macros-1.5.1
+serde-1.0.137
+serde_derive-1.0.137
+serde_json-1.0.81
+serde_with-1.13.0
+serde_with_macros-1.5.2
 shlex-1.1.0
 slab-0.4.5
 smallvec-1.4.0
 spin-0.5.2
 strsim-0.8.0
 strsim-0.10.0
-syn-1.0.86
+syn-1.0.95
 termcolor-1.1.2
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-1.5.1
+tinyvec-1.6.0
 tinyvec_macros-0.1.0
-unicode-bidi-0.3.7
+unicode-bidi-0.3.8
+unicode-ident-1.0.0
 unicode-normalization-0.1.19
 unicode-width-0.1.9
 unicode-xid-0.1.0
-unicode-xid-0.2.2
+unicode-xid-0.2.3
 untrusted-0.7.1
 url-1.7.2
 vec_map-0.8.2
 version_check-0.9.4
 walkdir-2.3.1
-wasm-bindgen-0.2.79
-wasm-bindgen-backend-0.2.79
-wasm-bindgen-macro-0.2.79
-wasm-bindgen-macro-support-0.2.79
-wasm-bindgen-shared-0.2.79
+wasm-bindgen-0.2.80
+wasm-bindgen-backend-0.2.80
+wasm-bindgen-macro-0.2.80
+wasm-bindgen-macro-support-0.2.80
+wasm-bindgen-shared-0.2.80
 wasm-bindgen-webidl-0.2.75
-web-sys-0.3.56
+wasi-0.11.0+wasi-snapshot-preview1
+web-sys-0.3.57
 which-3.1.1
 winapi-0.2.8
 winapi-0.3.9
@@ -134,6 +144,12 @@ 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
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+windows-sys-0.36.1
 ws2_32-sys-0.2.1
 "
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index dc04c2d813a2..dd6978961eed 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1516 BLAKE2B c35afb9790f3339f2140800a23ba5718056291052d05b661f31130194768d13fe00ac48559e0b182ff747fb1c18f9df74c48c85269739b85ab1421f5dbe6e04f SHA512 95e9637d13305285e6d85c2262e2863a65b6324a39e40d569a90b626589150b39162ddffe4b9680dda41b9a3faa5119eb9c71aa7b571773337c3b859569dff6f
+EBUILD rest-0.8.1-r1.ebuild 1483 BLAKE2B fd647f2cc7b7e945644118a38d98035373188fc2839bda61e4ef72d484731be4179e48c7b043240b7e529597165ab29c38e06c18f1153cf2a2bc3b3a32998504 SHA512 d6035981ef8410bb5b593606d567b2ea4c837941e8b3ad32cb8cf7b283d4be055cdb4d0ad40a7e7b26aa464cbdff8c868cbf1aeadae4f17ba6a0ef4b9df20c6e
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1-r1.ebuild
index 1a871b83d473..9e3edc280976 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-GNOME2_LA_PUNT="yes"
+EAPI=8
 
 inherit gnome2 multilib-minimal virtualx
 
@@ -11,9 +10,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
 
 LICENSE="LGPL-2.1"
 SLOT="0.7"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
@@ -23,7 +22,8 @@ RDEPEND="
 	net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.40
@@ -36,7 +36,6 @@ multilib_src_configure() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=758166
 	ECONF_SOURCE="${S}" \
 	gnome2_src_configure \
-		--disable-static \
 		--disable-gcov \
 		--without-gnome \
 		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index dfb632068282..c245879f733f 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,4 @@
-DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a
 DIST rpcsvc-proto-1.4.3.tar.xz 167964 BLAKE2B dc15392fd68b76ffa92c08039076aed293834b047ebea4a418dc767ea13e3a04b19e5108ebda808dfa4356ca426db610847758d69b23cc66981eb4ea844eb218 SHA512 e46ba9ccdd6c520128bf3a154db90742f288a4d593b094a630141cdc5aeb834ffebf9b0eb6d5d0aad9faef3c445c75e2355cbc3e1382b50d29f4d2799441c6e9
 EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B d02a2aa983d5e6d8dd4820ff83620738db7b90232a13779b30c8d1d496a1e470438cef75a7b6c2022bcaa49e78cc78423160d04a2c753e79225c1103d47fd744 SHA512 8ac3092ffbeaf07868ae78ae28a490812cc2c2a8902de71c7701ff89107f97a42d6be5699285af02d8b0767315c2b5ca5951d2d44542065464d5ed951dd70538
-EBUILD rpcsvc-proto-1.4.2.ebuild 946 BLAKE2B 88eaf742a443c3bd611c9f66a54aeb428fee3901dbb879682acc5a5993eaaaf92f86de7e95372a704c1a4f24b9980ad0c7074aae789158d10c89b7e59f0c8d1c SHA512 6f7caaacddc31ad2c5010d3a444551407ffd38d6eca595a0afb05ae0f24eb13562212690f936522c7e377709ae92d45170c81377fc55d27d0e232e2df02d4a47
-EBUILD rpcsvc-proto-1.4.3.ebuild 911 BLAKE2B 269609af666f706b69e9e0c2765ab1b8e5a4bf5eff21f622205687806afb72d9d292595c6ae1f222b0f8023bcb5e92b5b1809629411a71d29064e4ed670f368e SHA512 80df4b0784c2413344c62844ec691468614b9682d63ddaba5536487db9105895d99ee9b627654e248252e3f94a7d2f6c2dba2f371d094f7c52a35c26d9e6831f
+EBUILD rpcsvc-proto-1.4.3.ebuild 918 BLAKE2B aa283b93c91a501d2a3d33132c297c7da09fe0a4f64ab96b75138c1035e7a739c0322f2534d45d85b4bcc7f24a0aef1cf0db171d1cc5087960b0a6e64863123e SHA512 c534448ed72ff1dc792ff450c030acc1d644ed32ad264b585f220bc42ebdf82fe4ff340e22a217c7fbbb5b0222d3530b382805b245dc5868dfe4966d527479d4
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
deleted file mode 100644
index 0d012345ff83..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-# sys-devel/gettext is only for libintl detection macros.
-DEPEND="sys-devel/gettext"
-RDEPEND="
-	!<sys-libs/glibc-2.26
-	virtual/libintl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Use ${CHOST}-cpp, not 'cpp': bug #718138
-	# Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E'
-	sed -i -s "s/CPP = \"cpp\";/CPP = \"${CHOST}-cpp\";/" rpcgen/rpc_main.c || die
-}
-
-src_install() {
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
-}
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
index 8e12ead6b244..01335e46d021 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/thkukuk/rpcsvc-proto/releases/download/v${PV}/${P}.t
 
 LICENSE="LGPL-2.1+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="!<sys-libs/glibc-2.26
 	virtual/libintl"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index cc3d42ece817..b86bed791d9f 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -6,6 +6,5 @@ AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.9-r2.ebuild 2017 BLAKE2B 58b1c8f3f47c1f481162b35dd5feeb207ef74dad4b42740e53872423fd1ec98d9915ed95a57178568654c1bcc57d9ea79119243dc8948e77325ba5e92b9d5f8d SHA512 97064317879b772e7de74b8779808be7242e25a5478bd33e2c9a3dcc942cef54bd744afd5fbb3e7d38b4a6cf594b77bdf830fc08d912b7a7bc0b79f4d4db16b5
-EBUILD serf-1.3.9-r3.ebuild 2139 BLAKE2B 83c56ebea322b1ad4c669236c1f6fc1cdeeaed85b2a00fc96fc6e16bbc31b310fcc185295d44fef27f653dcad3f3917ee4e358b431ed72b43ff71129b4fbdbc7 SHA512 d1ba55e08fd3d5221add2d567fde511a7b33dd93664fb719188dac58d38e88ead870e01efe768a2b465086a7d787a02251d7646b6aa86dd059776300b0f439cf
+EBUILD serf-1.3.9-r3.ebuild 2132 BLAKE2B 64f1167fac712834d7f2fcff076fa2840cd2e2f402cc0e692f8c669a973ec470117eaab5d1636bd5994227612be49981b3f04c883f1b3ba922e2359f63ffa346 SHA512 b721894617c110e27a0b12dd068e57daee948165ab156dd794908c619d21affc8f460bdff56881c536b6efdb8ffc83c5ecb5935f73952cab1e7d3b5d265054ce
 MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
deleted file mode 100644
index 873b3807ea7d..000000000000
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="https://serf.apache.org/"
-SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-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 ~x64-solaris"
-IUSE="kerberos"
-# Many test failures.
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-2.3.0"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.8-static-lib.patch
-	"${FILESDIR}"/${PN}-1.3.8-openssl.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3-check.patch
-)
-
-src_prepare() {
-	default
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die
-
-	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
-}
-
-src_compile() {
-	myesconsargs=(
-		BUILD_STATIC=no
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		# These config scripts are sent through a shell with an empty env
-		# which breaks the SYSROOT usage in them.  Set the vars inline to
-		# avoid that.
-		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
-		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		CC="$(tc-getCC)"
-		CPPFLAGS="${CPPFLAGS}"
-		CFLAGS="${CFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-	)
-
-	if use kerberos; then
-		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
-	fi
-
-	escons "${myesconsargs[@]}"
-}
-
-src_test() {
-	escons check
-}
-
-src_install() {
-	escons install --install-sandbox="${D}"
-}
diff --git a/net-libs/serf/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild
index adc74891f4d4..4851e027732c 100644
--- a/net-libs/serf/serf-1.3.9-r3.ebuild
+++ b/net-libs/serf/serf-1.3.9-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-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 ~x64-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 ~x64-solaris"
 IUSE="kerberos"
 # Many test failures.
 RESTRICT="test"
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index c2b2ce056c7b..e72c43495e7b 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -2,5 +2,5 @@ AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f017894741
 AUX signon-oauth2-0.25-cxxflags.patch 795 BLAKE2B 6dfd833830d7344f962fb97bde7c54f976be2c41988e90837225f3adfc0cc4b651aa670f35a95dc481ce651d10942a0d386e03f86dca117d4145928cda965111 SHA512 94dffe79441d5ea90acc29e1d457bdec2e762c18a169ae8873963ed612709d472ac55985ca21c41298557eda4e65879d70a595eda635df75a46c7bdea3ab675e
 AUX signon-oauth2-0.25-pkgconfig-libdir.patch 455 BLAKE2B 787c03ead028ff9e7980deb7eb4e2439864a1307e60dfa34b3e7c18d9f2b753016aa79208651624f10cebdfd89b672eb03097a8c7482389e7bb128bb16189e58 SHA512 b0589d51b4d5c7c51754752c7159e501620d782916fcea8aeb7d3eb8b33121372517be4babce48c90e5abd2e1fde9d3663deb66a8d2065e8cdbfedbf938b7a6d
 DIST signon-oauth2-0.25.tar.gz 41090 BLAKE2B d14cde073cf834427e337f94345b719ad1af38a285587f987f6ed42f96e8aecfcf63720e42b7f86f2018565c198e1f31b7b75da74c86db3e8a15680da70d3f9e SHA512 721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451
-EBUILD signon-oauth2-0.25.ebuild 1144 BLAKE2B 99777fe6a4e6c926cab2f8af8ff97a1c9f12ab1b3a97522405cc4e9f42b1fcb284bdc43e2850cf16953d1785c4991095611c8f8a3b85bf80d8736089fc94b40e SHA512 2c238319f3e2b720f4fb047af4917a36c5ed4a48d591166847875bccffba58541846c8947b5143d59899eb72eab1feadc9c3bb983d60ef355d807f3464b5e5ec
+EBUILD signon-oauth2-0.25.ebuild 1151 BLAKE2B 754e64ec51bdc35ffa5b5a65373ecf19ac79e080d2874127881ebb9d05bb2286861a5cd3d32b02214ac28fd011b954b1800c5437f3224511a39240cf4b922d70 SHA512 d5262a193c7ef6ac34e3c43c5b5260a668eb42045dbc62ee87ad87e02ba95e903e50803614dfa71e16f3c8c1ea836c9ceb649d1167d3257c470c2f1f3777b5cf
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
index 2af346f5d955..adb2b609e2f5 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index d9902241b853..465cbe892722 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,10 +1,6 @@
 AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c2118bb7d7babf8f253f168be73cf03934d00a875c99048b1985716d7c1f2ac3a2543bd988939e76631aff8e852a464b4589 SHA512 73ac6551d9c1bb37e331baad427d3770a913ab52833f3112f825a5a28647752f925a40c12bf72a79c0c9b93aacbaca5f357a21a48eae4f1f24341cfeb1ce5b57
 AUX signond-8.60-consistent-paths.patch 10627 BLAKE2B 853cc9816469c0b47c8ecab941c1ade09aa2567a6cbe99012da42d479d35d304eeb869700e4fc9f0623191735c1e445aa2046b904ef151cbc048dda00e3c7cd4 SHA512 3c285e57843d458fb30e21f607dc7edf3009d7bcf68c2641188b1ded4cd44d589541b754803a687adf92b2de11417bf3411c0cf2bfdcd6c7375e32bc1948edfe
-AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b7bc80e55d328d6301fa0040bf3750b33891d1e2ce42cab45622b9633fb93e29277889ce27fb54a98fb44bc022124a SHA512 25ef43ed61f8d422882e944600e2571108927920493558904c039a06af7091ec8fdcdcf030cb4e59ebf53d934aa67265d073084b3d280b204f24f74620e764b9
-AUX signond-8.60-drop-fno-rtti.patch 4558 BLAKE2B cd75d2a269b337b43286f9a76d189b4cdd91e4c312b7664de49a2b6e72d63eedd3776ef3fe2a659120556725c748cc5a66a16568d3f24726229ca6baef129fa6 SHA512 d7b3abc6f82fdccba7544176f483d26dfe15200a07d9a44aaf0c2a7b27f09a1bef3e8f6e1a59f7a529c21bf373741f541710d1c3cc958bbcb7e0bd58d45d868c
 AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
-DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72
-EBUILD signond-8.60-r2.ebuild 1801 BLAKE2B c819c6ad7dbe0242da49a20bb584f48558a76db6366e420999aa902cbfc490c884bf11b9b543e322494d141f9d6cdcc401f9349dda12c3c6294d7da74b7d3a35 SHA512 d83dc62835f6266e82895bc0702e7b74eb81e0a1f355d23b28fdc756f2bebb03e43a6c6aa486a3965dd11e4e4e6ff91e5b3a76d549cbafce6a10027a8b312fb1
-EBUILD signond-8.61.ebuild 1730 BLAKE2B 2d656218dd92d0f9c8ff05a13394f70978f44f664b2c9044c1061ba46b4c31fb092d00785734d6778b421bc4fdfeb4cfbd33eca60d40b10416a5fd44e44c3a40 SHA512 5203662b3fb1988e3243e44450a971d67513cebf3ede64cd1ce9b2d27bc6e244f430d220e97d4d22a0b29a7b5940a3e1963850c72724e4b5bd4e962f478e4bce
+EBUILD signond-8.61.ebuild 1737 BLAKE2B 877b77a084b695bf064229af3689093ce820ef169d4d8329ccf6297a17cdcd4a7b1c5d3dcfcdef4fec2d7689e2915850f4c99886ad60d168ad87687ffb2605f5 SHA512 f8950a9cfce04f4028c713d1d61b953daf269e89379f7dad66538a68ddb8e07fb6816bd87b38543f052ff78ab4306f8170d90a923afcce12764cf2b0e7089bc3
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch
deleted file mode 100644
index 8cfc79ac431e..000000000000
--- a/net-libs/signond/files/signond-8.60-crashfix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001
-From: Chris Adams <chris.adams@jollamobile.com>
-Date: Wed, 31 Jul 2019 12:45:14 +1000
-Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy()
-
-QObject::destroyed() should not be emitted manually, as that can
-cause unwanted side effects.
-
-Specifically, in this case, the
-QDBusConnectionPrivate::objectDestroyed() slot was invoked with
-invalidated object parameter (perhaps due to duplicate invocation)
-resulting in a warning in QObject::disconnect().
-
-Instead, ensure the object is unregistered from DBus immediately.
----
- src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++-
- src/signond/signondaemonadaptor.h   |  3 +++
- src/signond/signonidentity.cpp      | 13 ++++++++-----
- src/signond/signonidentity.h        |  1 +
- 4 files changed, 40 insertions(+), 6 deletions(-)
-
-diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp
-index 8b35e4bd..abd8fd3a 100644
---- a/src/signond/signondaemonadaptor.cpp
-+++ b/src/signond/signondaemonadaptor.cpp
-@@ -29,6 +29,13 @@
- 
- namespace SignonDaemonNS {
- 
-+struct RegisteredIdentity {
-+    RegisteredIdentity(const QDBusConnection &connection, QObject *identity)
-+        : conn(connection), ident(identity) {}
-+    QDBusConnection conn;
-+    QObject *ident = nullptr;
-+};
-+
- SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
-     QDBusAbstractAdaptor(parent),
-     m_parent(parent)
-@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
- 
- SignonDaemonAdaptor::~SignonDaemonAdaptor()
- {
-+    qDeleteAll(m_registeredIdentities);
- }
- 
- void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
-@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
-     Q_UNUSED(applicationContext);
- 
-     QObject *identity = m_parent->registerNewIdentity();
--    objectPath = registerObject(parentDBusContext().connection(), identity);
-+    QDBusConnection dbusConnection(parentDBusContext().connection());
-+    objectPath = registerObject(dbusConnection, identity);
-+    m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity));
-+    connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered()));
- 
-     SignonDisposable::destroyUnused();
- }
-@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id,
-     SignonDisposable::destroyUnused();
- }
- 
-+void SignonDaemonAdaptor::onIdentityUnregistered()
-+{
-+    QObject *ident = sender();
-+    if (!ident) {
-+        return;
-+    }
-+
-+    for (int i = 0; i < m_registeredIdentities.size(); ++i) {
-+        if (m_registeredIdentities[i]->ident == ident) {
-+            m_registeredIdentities[i]->conn.unregisterObject(ident->objectName());
-+            delete m_registeredIdentities.takeAt(i);
-+            return;
-+        }
-+    }
-+}
-+
- void SignonDaemonAdaptor::onIdentityAccessReplyFinished()
- {
-     SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender());
-diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h
-index db8d875f..1c20cac3 100644
---- a/src/signond/signondaemonadaptor.h
-+++ b/src/signond/signondaemonadaptor.h
-@@ -34,6 +34,7 @@
- namespace SignonDaemonNS {
- 
- typedef QList<QVariantMap> MapList;
-+class RegisteredIdentity;
- 
- class SignonDaemonAdaptor: public QDBusAbstractAdaptor
- {
-@@ -74,10 +75,12 @@ private:
-                                    QObject *object);
- 
- private Q_SLOTS:
-+    void onIdentityUnregistered();
-     void onIdentityAccessReplyFinished();
-     void onAuthSessionAccessReplyFinished();
- 
- private:
-+    QList<RegisteredIdentity*> m_registeredIdentities;
-     SignonDaemon *m_parent;
- }; //class SignonDaemonAdaptor
- 
-diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
-index ce1ecfb0..a143c223 100644
---- a/src/signond/signonidentity.cpp
-+++ b/src/signond/signonidentity.cpp
-@@ -84,7 +84,8 @@ private:
- SignonIdentity::SignonIdentity(quint32 id, int timeout,
-                                SignonDaemon *parent):
-     SignonDisposable(timeout, parent),
--    m_pInfo(NULL)
-+    m_pInfo(NULL),
-+    m_destroyed(false)
- {
-     m_id = id;
- 
-@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout,
- 
- SignonIdentity::~SignonIdentity()
- {
--    emit unregistered();
-+    if (!m_destroyed) {
-+        m_destroyed = true;
-+        Q_EMIT unregistered();
-+    }
- 
-     delete m_signonui;
-     delete m_pInfo;
-@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent)
- 
- void SignonIdentity::destroy()
- {
--    /* Emitting the destroyed signal makes QDBusConnection unregister the
--     * object */
--    Q_EMIT destroyed();
-+    m_destroyed = true;
-+    Q_EMIT unregistered();
-     deleteLater();
- }
- 
-diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h
-index 9ec9be4e..f6321f30 100644
---- a/src/signond/signonidentity.h
-+++ b/src/signond/signonidentity.h
-@@ -96,6 +96,7 @@ private:
-     quint32 m_id;
-     SignonUiAdaptor *m_signonui;
-     SignonIdentityInfo *m_pInfo;
-+    bool m_destroyed;
- }; //class SignonDaemon
- 
- } //namespace SignonDaemonNS
--- 
-2.26.2
-
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
deleted file mode 100644
index 175d88361c43..000000000000
--- a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 18 Jun 2020 10:22:04 +0200
-Subject: [PATCH] Don't use -fno-rtti
-
-QProcess uses typeid and crashes otherwise.
----
- common-project-config.pri                       | 2 --
- src/extensions/cryptsetup/cryptsetup.pro        | 1 -
- src/plugins/plugins.pri                         | 3 +--
- src/remotepluginprocess/remotepluginprocess.pro | 3 +--
- tests/extensions/extensions.pri                 | 3 +--
- tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +--
- tests/passwordplugintest/passwordplugintest.pro | 3 +--
- tests/signond-tests/signond-tests.pri           | 3 +--
- 8 files changed, 6 insertions(+), 15 deletions(-)
-
-diff --git a/common-project-config.pri b/common-project-config.pri
-index 606f70bb..abe6cf6d 100644
---- a/common-project-config.pri
-+++ b/common-project-config.pri
-@@ -13,8 +13,6 @@ RCC_DIR         = resources
- 
- # we don't like warnings...
- QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
--# Disable RTTI
--QMAKE_CXXFLAGS += -fno-rtti
- # Disable exceptions
- CONFIG += exceptions_off
- # Use C++11
-diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
-index f4b6e53b..5cc214e4 100644
---- a/src/extensions/cryptsetup/cryptsetup.pro
-+++ b/src/extensions/cryptsetup/cryptsetup.pro
-@@ -29,7 +29,6 @@ QT -= gui
- 
- QMAKE_CXXFLAGS += \
-     -fno-exceptions \
--    -fno-rtti \
-     -fvisibility=hidden
- 
- DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
-index 2c03e743..074896d5 100644
---- a/src/plugins/plugins.pri
-+++ b/src/plugins/plugins.pri
-@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins
- QMAKE_LIBDIR += \
-     $${TOP_BUILD_DIR}/lib/plugins
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- headers.path = $${INSTALL_PREFIX}/include/signon-plugins
- 
-diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro
-index 7c2ea007..36b4cbe0 100644
---- a/src/remotepluginprocess/remotepluginprocess.pro
-+++ b/src/remotepluginprocess/remotepluginprocess.pro
-@@ -40,8 +40,7 @@ LIBS += \
-     -lsignon-plugins-common \
-     -lsignon-plugins
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--                  -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- #DEFINES += QT_NO_CAST_TO_ASCII \
- #    QT_NO_CAST_FROM_ASCII
-diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri
-index 179cd28d..2fd75955 100644
---- a/tests/extensions/extensions.pri
-+++ b/tests/extensions/extensions.pri
-@@ -20,5 +20,4 @@ INCLUDEPATH += . \
-     $$TOP_SRC_DIR/lib/signond
- 
- QMAKE_CXXFLAGS += \
--    -fno-exceptions \
--    -fno-rtti
-+    -fno-exceptions
-diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-index 43f2d59f..ac87781d 100644
---- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-+++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-@@ -36,8 +36,7 @@ INCLUDEPATH += . \
-     $$TOP_SRC_DIR/src/plugins/test
- DEFINES += SSO_CI_TESTMANAGEMENT
- DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests"
-diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro
-index 6132921e..ce16fdcf 100644
---- a/tests/passwordplugintest/passwordplugintest.pro
-+++ b/tests/passwordplugintest/passwordplugintest.pro
-@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
-     $${TOP_SRC_DIR}/src/plugins \
-     $${TOP_SRC_DIR}/lib
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
-index 1bbd5a15..e95556ba 100644
---- a/tests/signond-tests/signond-tests.pri
-+++ b/tests/signond-tests/signond-tests.pri
-@@ -34,8 +34,7 @@ INCLUDEPATH += . \
-     $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
-     $${TOP_SRC_DIR}/lib \
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET"
--- 
-GitLab
-
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
deleted file mode 100644
index f9995daf5819..000000000000
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://gitlab.com/accounts-sso"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	net-libs/libproxy
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-# tests are brittle; they all pass when stars align, bug 727666
-RESTRICT="test !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-buildsystem.patch"
-	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-unused-dep.patch" # bug 727346
-	"${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes
-)
-
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-src_prepare() {
-	default
-
-	# install docs to correct location
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
-		-i doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
-		-i lib/plugins/doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
-		-i lib/SignOn/doc/doc.pri || die
-
-	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
-		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-
-	use test || sed -e '/^SUBDIRS/s/tests//' \
-		-i signon.pro || die "couldn't disable tests"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild
index 5c5deb815a67..6aa2f1b9ab30 100644
--- a/net-libs/signond/signond-8.61.ebuild
+++ b/net-libs/signond/signond-8.61.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 # tests are brittle; they all pass when stars align, bug 727666
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 9794fde7f254..7845a6ddc1dc 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,6 @@
+AUX 1.13.8-Fix-array-size.patch 1849 BLAKE2B 2d266e72f7ae03d02049d1328c7e8b814d061ca52a8da3ae4e467b6b9714c69e0498a6ce70b0db9be2792c11407ab0cae5ad7fc99b99406c28b02c9eecd7f902 SHA512 c9da814e223af25d2260f2a4c642a5bbc3ff07aa47371eafa520d18942a2795e3159a66fd6350a6ed93445aca30ff44cf7f7bdd5cc7f62708c1aab8dd13a8908
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
+DIST sofia-sip-1.13.8.tar.gz 2551359 BLAKE2B 505d3cdac29b00589f63782c296b68f36ba9247ef87bcbda7b2765c0079aa2313ac72c0062ada5ba29e07faa892a991722c53468756ce8ef4cd385b90afda564 SHA512 f857eb9cf25d3306476bc6d0bda786385529021d498cf0c2c779cdbae31295af4ed59a67fb0c882b09bac738623d273a94ebbda360c7a2b3d7da140852ccc6fa
 EBUILD sofia-sip-1.12.11.ebuild 767 BLAKE2B 17a614a54d0c98e778beca5771ee39cfe17f954a5d68f1515b90c1550200adf20db6db976cbc90bfed896859d13d2bfb34b24571bf46c6695b4a9e1ccc7ee286 SHA512 d509b066bf4ffca99f6c5e99e3405dbac8a06cf5473f56a265f70d38113fedf631aa6ce145901bee307aa1fdb439650ce98b7790fd3c29c9d72fea2c3496cbf9
+EBUILD sofia-sip-1.13.8.ebuild 932 BLAKE2B fe7f30db30231b729c1c8609e9a00bd59c5636a7c738c75877662e04d875191ff4301997be4235cb7f1f8fd10f6713403e4968c775d4018db7ee30f700a8e0d1 SHA512 52744c3e2eed29f2a1ac7a8ac5cf4919d3630db494de36ba6442871e9cbdd8087bcdea1c2904f9bea4dd5805a58b02158b9d676b168de9f9591646348a5d19a4
 MISC metadata.xml 333 BLAKE2B c1affd2a0937b16cc617e0e0fe2ecfdd7fd11608e5884a51bbdf9ed8b6fb1f5db4c677ce1ba2cde8c5257e45fb16562fc49417bf36af8cba7731884864cb97f1 SHA512 f0f6ede0eeae3ec1c4cb5b76ace17f7c43640c22175938a2205c6c47e56304d3068665a08b4b247d6ac6af10da72b918b5192f1bc54a5d67a2e772cf8a46b9ed
diff --git a/net-libs/sofia-sip/files/1.13.8-Fix-array-size.patch b/net-libs/sofia-sip/files/1.13.8-Fix-array-size.patch
new file mode 100644
index 000000000000..1473b18c61a5
--- /dev/null
+++ b/net-libs/sofia-sip/files/1.13.8-Fix-array-size.patch
@@ -0,0 +1,45 @@
+https://github.com/freeswitch/sofia-sip/pull/134
+
+From 17da7c45937cf0f66ca6a49a5661519443ebf8a7 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 1 Jun 2022 11:32:38 -0400
+Subject: [PATCH] Fix array size
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+check_sres_sip.c: In function ‘resolver_setup’:
+check_sres_sip.c:113:19: warning: array subscript 2 is above array bounds of ‘su_addrinfo_t[2]’ {aka ‘struct addrinfo[2]’} [-Warray-bounds]
+  113 |   hint_udp_tcp_tls[2].ai_protocol = TPPROTO_TLS;
+      |   ~~~~~~~~~~~~~~~~^~~
+check_sres_sip.c:69:22: note: while referencing ‘hint_udp_tcp_tls’
+   69 | static su_addrinfo_t hint_udp_tcp_tls[2];
+      |                      ^~~~~~~~~~~~~~~~
+check_sres_sip.c:114:19: warning: array subscript 2 is above array bounds of ‘su_addrinfo_t[2]’ {aka ‘struct addrinfo[2]’} [-Warray-bounds]
+  114 |   hint_udp_tcp_tls[2].ai_next = NULL;
+      |   ~~~~~~~~~~~~~~~~^~~
+check_sres_sip.c:69:22: note: while referencing ‘hint_udp_tcp_tls’
+   69 | static su_addrinfo_t hint_udp_tcp_tls[2];
+      |                      ^~~~~~~~~~~~~~~~
+
+Fixes: https://github.com/freeswitch/sofia-sip/issues/89
+---
+ libsofia-sip-ua/sresolv/check_sres_sip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsofia-sip-ua/sresolv/check_sres_sip.c b/libsofia-sip-ua/sresolv/check_sres_sip.c
+index ea392f0..e6c9642 100644
+--- a/libsofia-sip-ua/sresolv/check_sres_sip.c
++++ b/libsofia-sip-ua/sresolv/check_sres_sip.c
+@@ -66,7 +66,7 @@ struct context {
+ } x[1];
+ 
+ static su_addrinfo_t hint_udp_tcp[2];
+-static su_addrinfo_t hint_udp_tcp_tls[2];
++static su_addrinfo_t hint_udp_tcp_tls[3];
+ static su_addrinfo_t hint_udp_tcp_ip4[2];
+ static su_addrinfo_t hint_tls[1];
+ static su_addrinfo_t hint_tls_udp_tcp[1];
+-- 
+2.35.1
+
diff --git a/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild b/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild
new file mode 100644
index 000000000000..640a845a0cea
--- /dev/null
+++ b/net-libs/sofia-sip/sofia-sip-1.13.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="RFC3261 compliant SIP User-Agent library"
+HOMEPAGE="https://github.com/freeswitch/sofia-sip"
+SRC_URI="https://github.com/freeswitch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-array-size.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+	dodoc RELEASE
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b73024694ec3..fd38d887de03 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,9 +2,9 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
-DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
 DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a
-EBUILD tox-0.2.12-r1.ebuild 2905 BLAKE2B de657ca8b2815d0d165a41ea78026bd8f813aa4e601336db68f7123ffd52c0b97e9bd10c99591c3af9f27ec53974521ed3c37b90ee4509961a67bd667a7dd12c SHA512 0265c8c0ebdf18113f600f2d5ad8cb2d87965b3b43393502dba0acde2e587974981e077c69f18ad7303b1d419649ce814afa5102f2a9eb08d60ceb148a14d255
+DIST c-toxcore-0.2.18.tar.gz 653247 BLAKE2B c27da02753aede5056c42e5bf1949920fc30e98a23c058ab445c2fe345271e442885a3eeb011e8fde16d8fc8451376a015c5f821145785c75e7d0dda3a8b72eb SHA512 e9b0d73a2e0460290c8453a0a64fc91deed2e0cf87f945d0ba203b929f19a296571d7140f4df89b06f7e67f2b61894460ce4dd32ab9ecf6ea7d5b67538fadb23
 EBUILD tox-0.2.13.ebuild 2920 BLAKE2B 59bf6f61244b267d49a181359b3322186efe21217578b6561b41dcd798e50bc9104beb27dbd611485949a112a80ab11d774f4f17a18cdfb23f4ef106729383cc SHA512 8fdb59395d4ce07c6f2edbfc8a8672b021a0b32d62682ecc697e9e816be09d31587be9c41e9b5755aaab1570d9c7aa12d84e3ac6c7b68abdc0c1a099df35fb75
-EBUILD tox-9999.ebuild 2689 BLAKE2B 12827a3eaa9c54410ec4f3eefd12016e4fb8c4540cd94295c45e31b6dc6563edc866d81edff197347e155587c5dace9f5195ae33d6e7d0ac70e24a59f61e957d SHA512 0c362388a3157a103e5ef110fbd1e8e202a8e39140309529198c40cffd5a64bab163f19820f1da4c24340850421efc7216fdbffb0527e69f405581c8b0b67ad4
-MISC metadata.xml 901 BLAKE2B 5125123a0e27a8cda166ed3516d75fb0bb034d77e38f553ba96bdc58744d7cc1bffe58e0fa6d2467a2dcc0f5caf74a7a2c12697664065732d335f0b8bbb8bbad SHA512 7f76b178a4b0a25a3a0eadbe844c07cbaa2103cc4296674c37c3fb18ed626e3cfc7110b8ff4e04ed0f7a83b65a0dc19666074d71f87d0e7e75d84fb1aade3d16
+EBUILD tox-0.2.18.ebuild 3232 BLAKE2B 7d80c32b5c5a0240d7643f46ee29ab87a04aa6a08f798ce5d6c6a9a62ae9261b383412aac8938710562a180a522f2785aa455699b5cf14bdcf48b8ef319d98e9 SHA512 ed7899eafb63ecde109c8294f74668c31dbd92602c8f4f803b3bd4d8953f743028b01d168aaaf4052f99b9060607d856828ab63a93ee8f53fab15c3e3359533b
+EBUILD tox-9999.ebuild 3088 BLAKE2B 689337dbd95cf6b20186473cc642947763c4f8577c305df4aad55b6e74e6feb1cee7898a7d8651ea7e57491d85b3ff136c914c2c76bbce64db6059ecea3d7525 SHA512 8ed472219c205c7524ce1fca59948abe261de025713e5b2f1d90681f1411cc3c94bba5b096e1b164d59ae1a7b8eca9349b45d81189edbdc1c80240ab54691886
+MISC metadata.xml 985 BLAKE2B a77c49ccdcb1407dc40590f2fbcd4a932d1167dbaad973c878da09107def195cc9755c6d5f1a824cf22006543f1f6db3461d03e11ba7a21b3f321b6173c8aee8 SHA512 67eecd0db74c985cd97c840414ff6860a1d5a3ac9eaa00cd73c5c61e59831ff458a596251605af9515817f074d76eb342c12714409e7b31176d56e9ee311fc0c
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index fa963f9331e6..434e886648f5 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
+		<flag name="key-utils">Builds utilities to create custom keys and profiles</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>
 		<flag name="log-info">Log level: 3</flag>
diff --git a/net-libs/tox/tox-0.2.12-r1.ebuild b/net-libs/tox/tox-0.2.18.ebuild
index 62cb752a4e22..4296b1ad05d7 100644
--- a/net-libs/tox/tox-0.2.12-r1.ebuild
+++ b/net-libs/tox/tox-0.2.18.ebuild
@@ -1,67 +1,72 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd
 
-MY_P="c-toxcore-${PV}"
+MY_P=c-toxcore-${PV}
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+	dev-libs/msgpack
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
 	)
 	daemon? ( dev-libs/libconfig:= )"
-RDEPEND="
-	${DEPEND}
+
+RDEPEND="${DEPEND}
 	daemon? (
 		acct-group/tox
 		acct-user/tox
-	)"
+	)
+	key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	cmake_src_prepare
 
-	# Remove faulty tests
-	local testname=
-	for testname in lan_discovery save_compatibility; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	#Remove faulty tests
+	for testname in lan_discovery save_load; do
+		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DAUTOTEST=$(usex test ON OFF)
+		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
+		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
+		-DBUILD_MISC_TESTS=$(usex test ON OFF)
+		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
+		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av)
+		-DENABLE_STATIC=OFF
+		-DFULLY_STATIC=OFF
+		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6)
+			-DTEST_TIMEOUT_SECONDS=150
+			-DNON_HERMETIC_TESTS=OFF
+			-DUSE_IPV6=$(usex ipv6 ON OFF)
 		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index ba31cc1a5c28..ae60fff26c54 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test"
+IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
@@ -21,6 +21,7 @@ REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+	dev-libs/msgpack
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
@@ -31,14 +32,15 @@ RDEPEND="
 	daemon? (
 		acct-group/tox
 		acct-user/tox
-	)"
+	)
+	key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )"
 
 src_prepare() {
 	cmake_src_prepare
 
 	#remove faulty tests
-	for testname in lan_discovery save_compatibility set_status_message; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	for testname in lan_discovery save_load; do
+		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
 
@@ -46,15 +48,19 @@ src_configure() {
 	local mycmakeargs=(
 		-DAUTOTEST=$(usex test ON OFF)
 		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
+		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
 		-DBUILD_MISC_TESTS=$(usex test ON OFF)
 		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
 		-DMUST_BUILD_TOXAV=$(usex av ON OFF))
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=120
+			-DTEST_TIMEOUT_SECONDS=150
+			-DNON_HERMETIC_TESTS=OFF
 			-DUSE_IPV6=$(usex ipv6 ON OFF))
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
@@ -95,12 +101,13 @@ src_install() {
 
 pkg_postinst() {
 	if use dht-node; then
-		ewarn "There is currently an unresolved issuer with tox DHT"
-		ewarn "Bootstrap node that causes the program to be built"
-		ewarn "with a null libray reference. This causes an infinite"
-		ewarn "loop for certain revdep-rebuild commands. If you aren't"
-		ewarn "running a node, please consider disabling the dht node"
-		ewarn "use flag. For more information please refer to"
-		ewarn "https://github.com/toktok/c-toxcore/issues/1144"
+		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
+		ewarn "developers and is on their TODO list. For more information,"
+		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
+		ewarn ""
+		ewarn "There is currently an unresolved issuer with tox DHT Bootstrap node"
+		ewarn "that causes the program to be built with a null libray reference."
+		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
+		ewarn "If you aren't running a node, consider disabling the dht node use flag"
 	fi
 }
diff --git a/net-libs/toxext/Manifest b/net-libs/toxext/Manifest
index 4ced9d779e8b..a5e06ebef7c1 100644
--- a/net-libs/toxext/Manifest
+++ b/net-libs/toxext/Manifest
@@ -1,3 +1,3 @@
 DIST toxext-0.0.3.tar.gz 34759 BLAKE2B b33c06bd982888415637a5c823889c74090b7719a03f3e41667ed136e40f87876956f2cb5abb95a53fa1d6a03951fb1fd9f32b8bbe83b03f33fa6f87ab338f67 SHA512 34612e789fb928f9dc79181a61126e3f781ef134d3b5cad2b48c17f1fc3521f0fb6713b0e42e73a789e3eb9b1a566f2d4cbd38a9b26f8f9f6015890be045e4ed
-EBUILD toxext-0.0.3.ebuild 660 BLAKE2B feb310962247326e23f7ad313aac11c52b3c71ce249c1ae2d0a58cc2136a5e5baa57053b28e8b3e38572fe44e33f4d239ff63bf4f3a583a60301e9be3f6f73e7 SHA512 00ecd20d642eb9088f0b1b9c0bb76f8f5a3d6728ee4906f63c33afcbd8b672915b5fe42d65410910649549a5f4aa450304eabbb0c95e7344eb5b05971088bd9d
+EBUILD toxext-0.0.3.ebuild 660 BLAKE2B 90a8b8e621e679bf5dedcecc51c12654c9863ed58cb6738f71b94c5e66b081603d1e1b90cfb30298a1a18acf237bd91f93b89ef58b58032bcb4b4e8f83f24ecb SHA512 9afcc0ecc5b0485d521c271f13447ad12c5872c84184d6421c5b38df622e8238af23364abcfce65ad9e64e8f8dfc0cb185b3ec8f37544d37d00c8094eace6aab
 MISC metadata.xml 472 BLAKE2B 50a84fe144b80bae844a4aa6d6bfa653cafc0883bce40c14e742a73268df9de3709a0e5230fb88d101bde083d94e0311bc8ed3a0e897ff49be5283e7c85b3a63 SHA512 551fd66beb922eef58b866d3a8d5669dca11fcbb53c870f29516a6fae07f4893ed5a73e3d983dc360377f3dc4501e36d077d9bc0061bb93d621d84136e157105
diff --git a/net-libs/toxext/toxext-0.0.3.ebuild b/net-libs/toxext/toxext-0.0.3.ebuild
index 4e41feba68bf..ec77c5f446fc 100644
--- a/net-libs/toxext/toxext-0.0.3.ebuild
+++ b/net-libs/toxext/toxext-0.0.3.ebuild
@@ -23,7 +23,7 @@ src_prepare() {
 	sed -i 's/-Werror//' CMakeLists.txt || die
 	sed -i '/-fsanitize=/d' test/CMakeLists.txt || die
 
-	# Fix build with CLANG and LLD.
+	# Fix build with clang and lld.
 	# https://bugs.gentoo.org/831338
 	append-flags -fPIC
 }
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 64c451fc0dc9..768489970763 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
-EBUILD uhttpmock-0.5.3.ebuild 944 BLAKE2B ad586d1cef374333902eb02d236c9ef990eee852e3f0a5aa138ff890edd33c1a1a5d297c18281cd890b26358cfb5bcf0744477b0c30b3b44606870d763217ead SHA512 6014574a21f443a02268c51b3f8a8c580859a9483581a9f823b76446e85b33e2190abadf82b2d7947d4c6e3d8c5557846bec70b74859ed6434978bd79a0a05e0
+EBUILD uhttpmock-0.5.3.ebuild 951 BLAKE2B deebdde5fe5ea3bb4c52e702d7c31bc8b9ff4a02f8eb57c6fdd9e807b40703efb695db748857a5312e3a6c9709b3d29fb43995968f9548c4d2e3072deb8679e8 SHA512 0cef7db098128365115e38704fda13238d14d628873542945f5418de6d46bc68edc461c58b1ff5a6669d609716cbe458ff1b18169ac3ab9d7245d8f8a10908f1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
index 7526fe4fd04d..3b956e8a4bde 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index fb73ea67ae71..65323a42e5d9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,5 @@
-AUX 2.34.3-jumbo-fix.patch 2430 BLAKE2B 0896f652262284cee74bec5f84f9bf8a88884f8c4182cbbc72dc59de5778856807772ecc92b9eb75c40eb021b0732ef81435e8894b46c8c10d833474e8c077c6 SHA512 c131daff77815eda541a376dc8904cffe7a75d9eb00fdf07ae872072aaa09493c2d01ae94122a0e6f43bdd8c8ba9aceb01821fb56b803c1b5f894d0e08abad53
-AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79
-DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
-DIST webkitgtk-2.36.0.tar.xz 26900828 BLAKE2B d965c9a0f3ff03d55baba840af7fe0cb3288eaa982f1444aa14a499542d89766815954b9e62b5d39d9536074d59e42d1c0798c5e1d88974f070c239ef1d8eae5 SHA512 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
-EBUILD webkit-gtk-2.34.6.ebuild 8305 BLAKE2B 91dd8daf78dfb6c0e13ba15ae4d04d9f175f49e11527664a77e3873b158c1cc339439a650329e7586f95dce33851e33eef3057121e421475451ea02b6526dd9b SHA512 5ff2636f5b2da4da3b8923da85bd34317b2efa75586d7b40ee8644c81af6b1c57338209a22edf9194477d15307630ca92706385c60eeb72e6bfb9b048ee7fccb
-EBUILD webkit-gtk-2.36.0-r1.ebuild 7436 BLAKE2B 7b291dc8f2da2960aa656562835153a3f63112c7cc2dfec0bdb36b782d12ceed98b5a7bd1c1af7abab543dd315cc2c13bdab0190d75d4759f1508ced4d2929c8 SHA512 3972b6a536d91460372ab70b17391dbc2c404b3ecbd37147882734681a0065f146c9368ea79a73867027f15f46b3ddfaed4a9121612966284d31679f46276555
-EBUILD webkit-gtk-2.36.1.ebuild 7438 BLAKE2B 8ef44f37123bc75b72f4ebedbb8fe1697719343b0c4c4f783f960a068da6c7c1c34b5df6a26713031582466a8b03bb666323f095b77e89a9e336181d86d0fe75 SHA512 234c2f4205b898e2cf21a564676c99f5fd402f98732949e7203f6fe92cceb416e043f9a33e6dbeb9abf1f7547aa0030bd20162d259d72da843998331609aaafd
+DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
+EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac
+EBUILD webkit-gtk-2.36.3.ebuild 7410 BLAKE2B eb95c068b7c42dbb49d031be9a7bf6a8635d5126a0052b2215cbc4e6c44192ab754627b006dedd2d85a637749eba96f33366075b9af2a5322e460b88a955d846 SHA512 684c6085cb9dfe377e0870292b6c31461c1a4a733aceff2637ffbaec21479b7a71091d570940005f2daa2f1253dd4908200ce4486188fa4895a2402f9aaf8663
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
deleted file mode 100644
index 97c5c0c8e4b6..000000000000
--- a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001
-From: "philn@webkit.org"
- <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Sat, 11 Sep 2021 11:34:42 +0000
-Subject: [PATCH] [GLIB] MediaSession is not enabled
- https://bugs.webkit.org/show_bug.cgi?id=217991 <rdar://problem/70740119>
-
-leio: Extracted to include only the side-effect of fixing unity builds on
-some machine configurations.
-Thanks-To gen2dev
----
- Source/WebCore/platform/PlatformScreen.h            | 6 ++++++
- Source/WebCore/platform/graphics/ImageFrame.h       | 6 ++++++
- Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++++++
- 3 files changed, 18 insertions(+)
-
-diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
-index d3f12a6538b8..d47d193e8bee 100644
---- a/Source/WebCore/platform/PlatformScreen.h
-+++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen;
- typedef struct CGColorSpace *CGColorSpaceRef;
- #endif
- 
-+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- class DestinationColorSpace;
-diff --git a/Source/WebCore/platform/graphics/ImageFrame.h b/Source/WebCore/platform/graphics/ImageFrame.h
-index 9843aac40eb4..92e1d4486c5f 100644
---- a/Source/WebCore/platform/graphics/ImageFrame.h
-+++ b/Source/WebCore/platform/graphics/ImageFrame.h
-@@ -33,6 +33,12 @@
- #include "NativeImage.h"
- #include <wtf/Seconds.h>
- 
-+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- class ImageFrame {
-diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h
-index d990a3dc555f..5de271e52352 100644
---- a/Source/WebCore/platform/graphics/ImageOrientation.h
-+++ b/Source/WebCore/platform/graphics/ImageOrientation.h
-@@ -30,6 +30,12 @@
- #include "FloatSize.h"
- #include <wtf/EnumTraits.h>
- 
-+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- struct ImageOrientation {
--- 
-2.32.0
-
diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
deleted file mode 100644
index 74790d9f6cef..000000000000
--- a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001
-From: "don.olmstead@sony.com"
- <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Sun, 3 Oct 2021 23:00:17 +0000
-Subject: [PATCH] Non-unified build fixes, early October 2021 edition
- https://bugs.webkit.org/show_bug.cgi?id=231143
-
-Unreviewed non-unified build fixes.
----
-leio: Trimmed to what's relevant to webkitgtk-2.34 branch
-gyakovlev: removed TextTrackClient.h include addition
-
- Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++
- 1 files changed, 2 insertions(+)
-
-diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
-index 7f1012aa2a24..4c7c23995276 100644
---- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
-+++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
-@@ -44,6 +44,8 @@ class InjectedScriptManager;
- namespace WebCore {
- 
- class CanvasRenderingContext;
-+class Frame;
-+
- #if ENABLE(WEBGL)
- class InspectorShaderProgram;
- class WebGLProgram;
--- 
-2.32.0
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
deleted file mode 100644
index 6c420cdeac2f..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 913bbc5c3726..bb28e81e3161 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index d7f285d8177b..7cf7405ca3fc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
@@ -43,7 +43,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
+	media-libs/libjpeg-turbo:0=
 	>=net-libs/libsoup-2.54:2.4[introspection?]
 	>=dev-libs/libxml2-2.8.0:2
 	>=media-libs/libpng-1.4:0=
@@ -60,12 +60,12 @@ RDEPEND="
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
 	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
 		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
 		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
 	)
 
 	X? (
@@ -107,6 +107,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
@@ -120,8 +121,6 @@ BDEPEND="
 	virtual/perl-JSON-PP
 
 	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
 "
 #	test? (
 #		dev-python/pygobject:3[python_targets_python2_7]
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 428bd3e8c5c0..79fe224151e7 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,3 +1,4 @@
+AUX xdp-tools-1.2.3-no-werror.patch 2594 BLAKE2B cadf223f0076131efbe69ca8af10b79ace8179dec1deaee45cb38e31f2215fb2c550e7102a99774bb575b9dc329c584915f0cc77e9dc7033f5ec6c244af41e27 SHA512 b3ee7a8e545d88f095f3896ce06751e1e9c1e2270cb2921df74efc0db3191ba8ead526b7108338ba57a28cfc48a56e05ebd5ec7f9fe73f0e8e4112239568aee7
 DIST xdp-tools-1.2.3.tar.gz 252515 BLAKE2B 26c1bfd5b6c3457794801db64d020b8d6eb254661a0a44fa89dde6a1ff7c04dec1207d38a755029c8caaa955cabec70f196e37257f337cf484b8e3525261119e SHA512 588cda7010592f34ac600993ea528b76be4a8786c1b4e4599c92c5683a80848a11ae90db825f56b67adec60bd8c684bb4ced21dc1bc1b750cbd5d0704d67390d
-EBUILD xdp-tools-1.2.3.ebuild 1261 BLAKE2B 41ebbef1014c7730007c0765283cd8e34d66d75f99be846d762aada7045a5a72e23a0a02364eddd32f2d67b4baff54fdd97a70b585b3ced57cf3e3d91959bb1b SHA512 3cbbeae820d0cedfefc4c2b17f086dd86c55c39994606d6fe245c88e47eb6f9342474d3f0796db15b67d772e8734509cb900f202eb0cdcb618fecc040589294b
+EBUILD xdp-tools-1.2.3.ebuild 1317 BLAKE2B cd9f853de69c8dc4a6efdc154e2b89f8a6dccfe69db01879c8f5972fff03892dd833a270f4aba09c69bb6ae01dce1cb7d0107ee4ec0c7ad8a6a6096799368842 SHA512 173b2ee5a86b6e8ba5449356035c57bdca45c0003e39777f8b05ea630c58c2fe1d05bab4a63347882f24a3c4392cb70f8a3e54d1300008e98449fe0aa164d31e
 MISC metadata.xml 448 BLAKE2B 5e76000a49c2578dc872010907deab803bf25d58e5383b81f8953f3ac8549f017895c7afa39a2b8c3eb47efb66c5c322177032542cdffec41de733502da41ce4 SHA512 4010fb44ad655a9c58e3328623652d2f6c10aee934daeaaa2c5738c44b086cc2674e011e5de0b6e6a058c24131a16be679e971a692800458492cf3addbd761c2
diff --git a/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch b/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
new file mode 100644
index 000000000000..6d7d7fd955a3
--- /dev/null
+++ b/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/831339
+https://bugs.gentoo.org/846938
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,5 +1,5 @@
+ 
+-LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
++LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
+ 
+ LIB_DIR = .
+ include defines.mk
+--- a/lib/common.mk
++++ b/lib/common.mk
+@@ -113,7 +113,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
+ 	    -Wno-unused-value \
+ 	    -Wno-pointer-sign \
+ 	    -Wno-compare-distinct-pointer-types \
+-	    -Werror \
+ 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
+ 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
+ 
+--- a/lib/defines.mk
++++ b/lib/defines.mk
+@@ -39,7 +39,7 @@ endif
+ 
+ DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
++CFLAGS += -std=gnu11 -Wextra $(DEFINES)
+ BPF_CFLAGS += $(DEFINES)
+ 
+ CONFIGMK := $(LIB_DIR)/../config.mk
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -19,7 +19,7 @@ MAN_OBJ := ${MAN_PAGE:.3=.man}
+ MAN_FILES := $(MAN_PAGE)
+ TEST_DIR := tests
+ TEST_FILE := $(TEST_DIR)/test-libxdp.sh
+-TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall -Werror $(LDFLAGS)
++TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall $(LDFLAGS)
+ TEST_LDLIBS := $(LDLIBS)
+ 
+ SHARED_CFLAGS += -fPIC -DSHARED
+@@ -144,7 +144,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
+ 	    -Wno-unused-value \
+ 	    -Wno-pointer-sign \
+ 	    -Wno-compare-distinct-pointer-types \
+-	    -Werror \
+ 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
+ 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
+ 
+diff --git a/configure b/configure
+index 0a17eae..fd251b7 100755
+--- a/configure
++++ b/configure
+@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
+     return 0;
+ }
+ EOF
+-    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
++    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+     if [ "$?" -eq "0" ]; then
+         echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
+         echo "yes"
+@@ -254,7 +254,7 @@ int main(int argc, char **argv) {
+ }
+ EOF
+ 
+-        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
++        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+         if [ "$?" -eq "0" ]; then
+             echo "SYSTEM_LIBBPF:=y" >>$CONFIG
+             echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
index 0dd14f1dc39b..4077d16404d0 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
@@ -25,6 +25,10 @@ QA_PREBUILT="usr/lib/bpf/*.o"
 
 MAKEOPTS+=" V=1"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-no-werror.patch
+)
+
 src_configure() {
 	export PRODUCTION=1
 	export DYNAMIC_LIBXDP=1
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 2e381068f425..9424a6d4ddf2 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,8 +1,6 @@
 AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
-DIST xrootd-ceph-5.3.1.tar.gz 82029 BLAKE2B 1946da121e620c68ddafe448f049d4495ec5326cfc0286944cea41cb940ac8982ced939989efddb3879baa694c34f93f75f6e58c00b75c5d385da863daa15154 SHA512 bcf4fc341644e6c4d2c83b4bc913203187385964da3d00d019d69de0e0abd19915a5194713574bb1b8562e80edd3eeefb6fee1762e7c8595b14d13657c237861
-DIST xrootd-ceph-5.4.0.tar.gz 82031 BLAKE2B 5c964597d7b8de3a217c7df58e214d58e1bfdc980f74cfbc571343e7325d61804060e6374912f02a3f73e4df721c87e38860a023de4422b58878915a52aa04b1 SHA512 7b33fc194fe5245de78daa7829dd978c96b1eccd979610e26d60ed0c284e192413192b2b581e5a18de25d6f7f93737598d180b6d5419307156a6abdea44c4b27
+DIST xrootd-ceph-5.4.3.tar.gz 82057 BLAKE2B 3ca2a812e6a55d696c1336b28114e9d4ec46c18d764ab8966533e150bb7e3a040c58a957c73adfd4f79038b82ebafcc3b09eae2d7b06aba41e36ce94c36ac3fe SHA512 b1065cf55d3918eef5083ebd1737139a761a28e4cc41cd2b796e2a0157d7a86850e643cecd89aeef89419485397676ac7040df5a5e2e9f7405d26320dbe1c9e3
 EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
-EBUILD xrootd-ceph-5.3.1.ebuild 866 BLAKE2B a36c00db48baef5e8c6c3ae3fa6ae0d18b9e7bfe1fe4147043ed119b5c58cc644759d4e4efbcfa7f83afef6f3418c51414dc99973937b1e43181de73eb3af762 SHA512 00c2ea7a0891f71c9dd78ca4772f7bf473fce35ba89852ec3907e51985279acb459c191fee26532da0edde0e2e54880f969cdc96d01a7e72fa21c37904b7a840
-EBUILD xrootd-ceph-5.4.0.ebuild 922 BLAKE2B 48d47fbb6ec16ddd0fe68007cb086d9ae2511179e59af7d4e31305eab1079be36cfbd44c5ab11aa8ff064d9a1b504cf805dc24aed36cc69f1c5d83c8eaf551a3 SHA512 db5d1e4e5ef59181077dad5f649f3a0fcb35fb90f6a4e6f2c31daa409d102261f25a9ce69c6c18cf262d35839e8dc83ac6e3880251981646e369fb512945461c
+EBUILD xrootd-ceph-5.4.3.ebuild 931 BLAKE2B c9d33b0245a95f98c92e36863be5e1ff83e63afc0462250f4a5f5e2bf4fe5ec67968e11621ce29d2eb47f8dadc2b43eb4736a831da75e10d50bc1137926486a9 SHA512 0d4fd0aa576e1d8cc781ad173f2b2a824ba8bf7c838f8fce7575c383975f326495ccc0cc9b12f19791f8682980f363040df2d88035b24d77da4cdabb67594e21
 MISC metadata.xml 497 BLAKE2B 00adeee3406c60c439ddc3855a8e470837ef34c5e29b26641255df7833fb59f1f68e62316fdb359012683415291f8af9ea21d6be59547bae4d3aa02fa8179fb4 SHA512 81179966535b582a62bd4e758dd55839b8c3063f6a7666eb8720dabd78ce4a77c143c2afd0367031ba483088d4e5769e3e35e9b04fcd4f9f1844aac03f7c53c3
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild
deleted file mode 100644
index 01734365262d..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.4.3.ebuild
index 9267d0cbd7b8..67129ba3bde5 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
 HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xrootd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=net-libs/xrootd-5.0.0
+DEPEND="~net-libs/xrootd-${PV}
 	sys-cluster/ceph"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-util/cppunit )"
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index aaf957729766..4566db9332a3 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -2,12 +2,11 @@ AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e
 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30
 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
+AUX xrootd-5.4.3-no_automagic.patch 454 BLAKE2B 78fdb01301a342db1ea3685f5513f56449ed69af0e5ecf48545af7c8e2cb00f58b68660b812f64dcdc15df4d1bc303ef127fe85c0b9ea7ebc4a9518ab0d30c11 SHA512 7aa1e7d2f2a86e2222a4bf95ca344994d67bc25dbb3ffce27c36634dcecf8dd828a3072f04dd266014e7fd8cab8a06135959a8ee10f3003dcbaf43ac5658d3e5
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
-DIST xrootd-5.3.1.tar.gz 2957788 BLAKE2B 6669ce4811e6c65ef17f06ae219e19e1f12027f4f9b620ad447df53ac437b30ce6425dc783a0ac7e4557d18ab562c266ac2497d93e93a2058fe5bd4aa7bc1d42 SHA512 a65436fe649233bb28123d9529d496c11b4ff40ba5490cbcbb32ff5379e555cfd684fad350c784c80e70056bb5d2e9701a80543c7f4a8ceb11e935aea01800b3
-DIST xrootd-5.4.0.tar.gz 3225065 BLAKE2B cda6b14fae4c4c8d34367fa3ff448c02bf3ecda9c6bb4029d3a6b53370a57445ac25de77d5324dd4dab8c92cda77490efdbb862e4db6b926e19ad3363278f046 SHA512 59f93db433f0e88439d5edfffb75d7813bae253e50c390fe8c43ef924bc36f5f4a56db9b00a44013c60c4b4bd5a0accaff2a8ca793fe37e59dc77dd8ab8f6837
+DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
 EBUILD xrootd-5.0.3-r1.ebuild 2666 BLAKE2B 553cea29036e2bfc922ab6604f66d001acc838c800b478131f46a674406b3f6302a7c4439e162496507a13ff7b0ef7665abe37edfcf5eadeff96720a5a908592 SHA512 daa560edcd935fc8ae9c21013fc5c83257ffc1eace97f2bf9aa90666d615b5206c817462f5f5fef84573a6e86db23f71a66afb5443829bfa7495bca716a8b384
-EBUILD xrootd-5.3.1.ebuild 2669 BLAKE2B 8a2fb7476bad3e7c018572b25502f7764a894def158c1a242d1db43064010672d40922114bcfb5266ef3d04605265a409663bfdd6c7b7bd5a394df0a1fb3b5e3 SHA512 b9775cbd2d27aea34839255059023e5019f828c201953ce6d1bbd899c9eb35eaf0664d32ad3adc801682210eb4442186ce0ec0d240fdbb8686d6f631d4bc1602
-EBUILD xrootd-5.4.0.ebuild 2959 BLAKE2B 26f003fdf3caed2bdfa4308b9868f94b07c1352b2950324ee53c717274d20a761b8dbfff285b11743b4608e23c05778f5d332c4417bb859accda0d62e40a3c71 SHA512 1f73a0f22645206068ab8669108c6acff07475e5fdaae31bd741544889816a9de9c28a7764023a7e5733e05c278575e255dc0079edcb1435213abce6b0f169a7
-MISC metadata.xml 914 BLAKE2B fa0f01645c7e2fb128738a2439e1614e83c0a5fea40efa894ae3e9ba5ab302b419e03b2f10563e406caefcda6318661cd25aa3fbb8976039bf3d4e82fdd22141 SHA512 cd9046d8cb1f45f3c20a8ada0a85282f798dea1c431eafa516ae72351f27492757e59f623eb20b526569a415a31bf8749491681488f5db99622ce2f772b3dfef
+EBUILD xrootd-5.4.3.ebuild 3138 BLAKE2B 74fb850f61ca7371af660cdc26f41f7f7ae8447fc172781248065c7b0427aa4ecfe6412e4df6fede080c0bcc9a3937f7082723d3606011fd7fb010d3e254b3a9 SHA512 3c3590d68432769452ee34705b81a08deb56ae4d3c2813ef2095d1c4548bca97fc5af9f7acc09f020e7da8f3a20c611af2233a3ddde0414ba9f976ad7fdd4585
+MISC metadata.xml 1033 BLAKE2B fa55ef316f5229b73667fb7f220071793053ed09df89b171afb7db8d81e4c7b70cc2ef4b44468ce1a5fbb8483192fed0545910b98e3a9c7dc8d081a1d49597e3 SHA512 f19fa16717d3c76d11caab1b2c28dc756df1407f0e57d9a72be324c4083a59ef5df8fe53310e8ef4df1d31540b8fbcc8dd734b319baa51ef0c70cd3a479b65f9
diff --git a/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch b/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch
new file mode 100644
index 000000000000..d50ea40e1c49
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-no_automagic.patch
@@ -0,0 +1,24 @@
+--- a/cmake/XRootDFindLibs.cmake
++++ b/cmake/XRootDFindLibs.cmake
+@@ -25,15 +25,19 @@
+ 
+ find_package( TinyXml )
+ 
+-find_package( LibXml2 )
++if( ENABLE_LIBXML2 )
++find_package( LibXml2 REQUIRED )
+ if( LIBXML2_FOUND )
+   add_definitions( -DHAVE_XML2 )
+ endif()
++endif()
+ 
+-find_package( Systemd )
++if( ENABLE_SYSTEMD )
++find_package( Systemd REQUIRED )
+ if( SYSTEMD_FOUND )
+   add_definitions( -DHAVE_SYSTEMD )
+ endif()
++endif()
+ 
+ find_package( CURL )
+ 
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index a911c7c2e75c..a8b5e8a0921c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -16,6 +16,7 @@
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
+    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
     <flag name="server">Install xrootd server and related plug-ins</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.3.1.ebuild b/net-libs/xrootd/xrootd-5.3.1.ebuild
deleted file mode 100644
index a33ccf3fde4d..000000000000
--- a/net-libs/xrootd/xrootd-5.3.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( <dev-libs/openssl-3.0.0:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.4.0.ebuild b/net-libs/xrootd/xrootd-5.4.3.ebuild
index b13ed2e2e71d..a8edf6912fda 100644
--- a/net-libs/xrootd/xrootd-5.4.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
 # Upstream does not support the building of Python bindings
 # via CMake for more than one implementation at a time.
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit cmake python-single-r1
 
 DESCRIPTION="Extended ROOT remote file server"
@@ -16,18 +16,20 @@ SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline +server ssl systemd test"
+IUSE="doc examples fuse http kerberos +libxml2 python readline +server systemd test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
 	acct-user/xrootd
+	dev-libs/openssl:0=
 	sys-libs/zlib
 	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
+	fuse? ( sys-fs/fuse:0= )
+	http? ( net-misc/curl:= )
 	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2:2= )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( <dev-libs/openssl-3.0.0:0= )
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${CDEPEND}"
@@ -37,18 +39,22 @@ BDEPEND="
 		virtual/latex-base
 		python? ( dev-python/sphinx )
 	)
+	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
 	test? ( dev-util/cppunit )
 "
 RDEPEND="${CDEPEND}
 	dev-lang/perl
 "
 REQUIRED_USE="
-	http? ( kerberos ssl )
+	http? ( kerberos )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( server )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
@@ -60,17 +66,18 @@ pkg_setup() {
 	use python && python_setup
 }
 
-# FIXME: no systemd automagic!
 # FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
 		-DENABLE_FUSE=$(usex fuse)
 		-DENABLE_HTTP=$(usex http)
 		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
 		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VOMS=no
+		-DFORCE_ENABLED=yes
 		-DXRDCL_ONLY=$(usex server "no" "yes")
 	)
 	cmake_src_configure
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 3e479dd519de..7a72e494f6cc 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -2,4 +2,4 @@ DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c32
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 EBUILD zeromq-4.3.3-r1.ebuild 1434 BLAKE2B 2ef0bdd7421a2a831b6494b8b4e919f83a4451f2065c448afa780e1740b04b9e3d1fc083af3fcb988f343deb5b55dbb833e2f8e10861b4d19830fc5e987b7d48 SHA512 1e2c77d3150800989e0e32ee8026c7e7523be71f98eb6269e5e2b1963faaa9cb11b50a8f1a6b9ee6df2c0492c3ce3bdbeb7916528dd9af2590bc2df6a5a80bbc
 EBUILD zeromq-4.3.4-r1.ebuild 1452 BLAKE2B 1eab361693c8d623d956fe4e46e96bdb2b9abf72ec39ba9cd39adc27582aec984265cb4a59d2bb8d84f920987f1242f5f8d697eafe5a0225825193f7f7e917b7 SHA512 3f31b3517500a7a08a34711ba69275f06cb106baccb98136d07550dc8028e8bed74acb9fac57caa186cf718ad5f84f183ae346049dcab9c20725afc17fc07233
-MISC metadata.xml 1625 BLAKE2B e8c1e2a40f768db02b55dc045ef54863b8de6010345c78fd9ab42b95890e32aff0bb108d00191412f32aeb201bce16e803838b2b60c22d132f12b6f652129d3d SHA512 1cad56aa313c4f1c5791bc94a5df828b190252ea75c0e3ee39946b49d87d5906b3f1ae5006e03d2693517d31e9950f5d842a393ece44fd3e50024df81c386ba0
+MISC metadata.xml 1541 BLAKE2B eb0032809d47b0f6e7064c1bcc8acd746480e3d1e222aeb7dd5658b820462376a8982e0d5a46e7dadc22efa8caaaa51c93f7bd66a1d73bba42a43dd959223596 SHA512 f3f8a92816c09499a6111fb375f429091c834be52e21189a7685fe59a40761ebd4d0d9e23889a0fc36d23863b3bcf16c245b00fb3d1ae21c9d8143be90977231
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 1f419dc1559d..06a50dbf3eed 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>sustrik@fastmq.com</email>
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)