gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-libs
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
108 files changed, 949 insertions, 2328 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7a8e483b0f60..62adaef87e77 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 7f5af186a14b..a7f17c9405cd 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,7 +1,6 @@
 AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
-DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
-DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
 DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
-EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
+DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c
 EBUILD canlock-3.2.2.ebuild 1095 BLAKE2B 443bf0268fe3e64dc00ef605d2b0e79655fed89a51b8f3620606271f77b541195b69c8b3013356bcad09263af0fd39083df6f10d8355af00146ddc8f24be7694 SHA512 1507129d5a94ff1269e417e9cd4e7b83443b12cbfbdb14e9047be6d530e6341eea96b9603c6c34abf3e900deee5a0d11234ae27188a1a2b37db558eee3dc36c6
-MISC metadata.xml 431 BLAKE2B cd7cbf3191ed305dd69b9cb360da7f45d7e5e7656080328c8c152c0b1761e390d2657265bc83093758e3f6628a6a1570080d42b9e432e4b2a900a354448194fb SHA512 e6317ceb5e1fba639fa9c095e726267cfcda9284c0b075a66eca95991bc01a54e7d2891b238e00924127988be5280a6467ddb64fb386e959966d43b5a05f0542
+EBUILD canlock-3.3.0.ebuild 1136 BLAKE2B 143814ccf631e0145c75762e68efc1c165d79e70d697750ed14a756bb611cd72ea1b477623b7cb2fbc3959cd908e39011d32b5deb7b54c9e4f48800e954ab438 SHA512 7cf58b4919e83fa6051b92388bbbabf6b34fa7ef3da38b2b9c42405eca1f070c129ae902563cd0c68b35135fad0ff0960c72095cafd5e4440182b2cd783e2e25
+MISC metadata.xml 431 BLAKE2B 970ec8fdb542889d3df72c7520f3b9f1c1c46e75b9cecb85c383c1abaaff42bf5bba5eb3fd1601449355c248c88215420cd799a7c5d53f2f4c5cc22facf1b4e6 SHA512 b53c2d9d53d5b045018923898fe93c181e178f4184beec546919b5d9ce0ba9ae8807d11d26f6291457b75ac96793566a985ee1876c8900518f776ccdf6aa91ab
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
deleted file mode 100644
index d54ed58f3701..000000000000
--- a/net-libs/canlock/canlock-2b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="A library for creating and verifying Usenet cancel locks"
-HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="
-	mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P/-/}"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_P}-6.diff
-	"${FILESDIR}"/${P}-make.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dolib.so src/libcanlock.so.2.0.0
-	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
-	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-
-	doheader include/canlock.h
-
-	dodoc CHANGES README doc/HOWTO
-}
diff --git a/net-libs/canlock/canlock-3.3.0.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild
new file mode 100644
index 000000000000..5227e822e8c8
--- /dev/null
+++ b/net-libs/canlock/canlock-3.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A library for creating and verifying Usenet cancel locks"
+HOMEPAGE="https://micha.freeshell.org/libcanlock/"
+SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2"
+S="${WORKDIR}/lib${P}"
+
+LICENSE="BSD MIT"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="header-parser +legacy"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+DOCS=( ChangeLog{,_V{0..2}} README TODO doc/sec_review.txt )
+
+src_prepare() {
+	default
+
+	# shatest fails to build with slibtool
+	sed 's/shatest$(EXEEXT) //g' -i test/Makefile.in || die
+}
+
+src_configure() {
+	local econf_args=(
+		--enable-pc-files
+		$(use_enable header-parser hp)
+		$(use_enable legacy legacy-api)
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# keep old header location for compability with canlock v2
+	use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h
+
+	# required for =net-nntp/tin-2.6.0
+	dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc
+}
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 84c5f5b30769..74e1f5c9b3cb 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -9,8 +9,7 @@
 	</maintainer>
 </upstream>
 <use>
-	<flag name="legacy" restrict="&gt;=net-libs/canlock-3.0">
-		Enable or disable building legacy code (v2 compatible)
-	</flag>
+	<flag name="header-parser">Build article header parsers</flag>
+	<flag name="legacy">Build legacy API (v2 compatible)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index 819e820acc84..6bc6e22019a4 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,5 +1,3 @@
-DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e
 DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315
-EBUILD dleyna-connector-dbus-0.4.0.ebuild 543 BLAKE2B 5ef64cf0c83e989e9c2bf3ade98445568da30acfdb44d9b46e7a7d589550f0ffd181cf1ecdfbe649418637631d82438a770218c18f73102f64fcd809a1d778a4 SHA512 d17af0735d4f1b0590e637c4a9e6c411d3b86cebf4be631f46622a05cb6b22a2be00b07117469f1256b0884cf99a85ad0cc43a9486475b8d438889142baeea13
 EBUILD dleyna-connector-dbus-0.4.1.ebuild 543 BLAKE2B 5ef64cf0c83e989e9c2bf3ade98445568da30acfdb44d9b46e7a7d589550f0ffd181cf1ecdfbe649418637631d82438a770218c18f73102f64fcd809a1d778a4 SHA512 d17af0735d4f1b0590e637c4a9e6c411d3b86cebf4be631f46622a05cb6b22a2be00b07117469f1256b0884cf99a85ad0cc43a9486475b8d438889142baeea13
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild
deleted file mode 100644
index 4b30995f9e4a..000000000000
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://github.com/phako/dleyna-connector-dbus"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/dleyna-core-0.7.0:1.0=
-"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-1
-"
-BDEPEND="virtual/pkgconfig"
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index e403fceec03a..8dd2574273a0 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,5 +1,3 @@
-DIST dleyna-renderer-0.7.0.tar.gz 65982 BLAKE2B dc9acf5d3c39cfc8d7b84890b3fda2f4f4856276c1fb900f114a8f07f0459906d99ebe5f941d8953f5b3c635b6eaa5319300510037891aaf2079f88fd92618ec SHA512 6b1b222971780841c5080b769888a42beadaf7cd576f0d07741585e208876179d3cdde123cbd5a2e4129d2b9e0ba18a7edf7626dd8a0cb1d4a45b91340c3e9fe
 DIST dleyna-renderer-0.7.2.tar.gz 66365 BLAKE2B 6e033f4d93f14e855aeeabfa1d31fdf4db499b1a2773c55c2631cef1c5bad850e162926554203585e490ac24d9e23eb33028052b26dc4585540eff1ee93d334c SHA512 a36ee90c30c8dece0e7c65855d6b01f92840bd26380e3553a4b0df910b3f593eb9b4cb932ad084b30c36396e819cd6841c080fe49d7032052d3ce40498e978cb
-EBUILD dleyna-renderer-0.7.0.ebuild 708 BLAKE2B 139b3fa71e2a6ca04a2c4e55a1101cafb5e60da142b205a9c23e7aebae3577e74f498aa249c335209486d65e81208be7ec399d2f14e150e0adc2693995a0fbd2 SHA512 4a7fab3e512c0abfe48142bf8ce4d9b0dc5aecfd18769f9c5356e54c7a2cca0bfb50509c16d6ebfbb407564697ab66b6535d8b00afbfd36e0fddcaa591d480ce
-EBUILD dleyna-renderer-0.7.2.ebuild 709 BLAKE2B 4d61d6288e40f52c884a09aa91b95b9325faa97110f3b4d70e86d4bbbde4b50e564ce65f6ef7b17b2661925894077852bc16e59bfe84d7ecc4a035196c7ac39f SHA512 676b9650a49ebb996ebb8bab105b128dee6dd285256004fef2e9e7c3ade100947dcdd0c7cb7e0347cab0149fc4303084f748fad2452681ab96a596e8d1097576
+EBUILD dleyna-renderer-0.7.2.ebuild 708 BLAKE2B a067cf67e6680acd8e4a3a3155cbfd48f96855b7f514e7f8bef1057f18dbc343adbf95c14d4cc20dc41da51ee8444a38bb526c570d03ec8cc7205bae621d3040 SHA512 dcb79b1b93df868f36b6f4c845dd60fafad3e50a93f70e9f48c27b3e15e63fd4a6a48dd1097ff77c893e30a7a909bf05d8b8a0dd69331cd0bee370565f691600
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild
deleted file mode 100644
index 67bf52cbf42d..000000000000
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A library to discover and manipulate DLNA renderers"
-HOMEPAGE="https://github.com/phako/dleyna-renderer"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/gssdp-1.2.0:0=
-	>=net-libs/gupnp-1.2.0:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/dleyna-core-0.7.0:1.0=
-"
-RDEPEND="${DEPEND}
-	net-libs/dleyna-connector-dbus
-"
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
index 39bb50f0deb6..804a16ccd15c 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.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://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 DEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index b8cf5f8bf4b7..f552d08f2a64 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,10 +1,3 @@
-AUX glib-networking-2.70.0-time_t-32-bit.patch 1837 BLAKE2B dbe1ae6dc1e3ba4f0033a72a36cc37354cf47b09371e3d8d74513a7bf1b1b6a6470b9dc9c77d3454b4fae505ed7bde31ae5114111e2785a4bcada1303940e179 SHA512 97cbc0f75eb6a90ced37539b01f68cbadc0cefd186b6121aa32bfb772f85d7bec40a38322aea38019af248dcb0f9311a5c4d069ee80f56341a3c49547f2dd700
-DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
-DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
-DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
 DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
-EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
-EBUILD glib-networking-2.68.2.ebuild 1983 BLAKE2B 21b2aa19571376085bcb9138188a4b743b62f81bd164b800a79d0f13f80925c2471e53a70b0c29430c7e17c5f19ba27c2be1faf383f70f5e20cd1b0131258c65 SHA512 6326da990fb32f4d480bafad98c30255da69bceca9b30c44f958a90c189e4c9cfe144c0482160ebd13d3142c3d96bd3d47f75cfc76a88ca422592bf592a6cc22
-EBUILD glib-networking-2.70.0.ebuild 2043 BLAKE2B 3c953ae769632b8548c127589adcc65e076c2fe02991a9350eb808fc7f211b1a2da68dd3d6c0aedb8a7f208d0a0c22ad9ef074935960f624cb3b280dd7ff4d72 SHA512 eb8c01bbea519f28e3f9556c932bdca981a2d7618225f069809b8a3378f196b49a28ccce4efe05dd26fb59ca8c348227216d0f5da4ed72dfd191a184730e7f12
-EBUILD glib-networking-2.70.1.ebuild 1990 BLAKE2B ea40834d7f4c62b5b574614f09d13172c98d7b1583d43d31cf18dfd090c62cfb4de3b98b8f9d1c141c2bb4737be4b3d35d7484b518bfb5064092618878ae45c6 SHA512 07c97ce0f54b012fc3865685f55572209a4641dad84072a5044e8a76747a26f136494a106b0b8780508fccb7e1ea2092c912d494de763b907c37d6d792a91c61
+EBUILD glib-networking-2.70.1.ebuild 1983 BLAKE2B dea87eb33410d28f6929d8b84babee64927c526afbe96f16e9d004389ee7527b8a2d773485c6077b1597b9df627beca6e3e722634ce42a2ecc9a87539d9ff2b1 SHA512 6767aad2c2bdf36daff61daeaa5f7c23a94af2c977e1d55e0191b00bc99fc857a2d5ac3e1b47d231f512671bad143047c39709c9e534982faaf4f1628e32a72a
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch b/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
deleted file mode 100644
index fc9ccea13952..000000000000
--- a/net-libs/glib-networking/files/glib-networking-2.70.0-time_t-32-bit.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Workaround/fix test failure on 32-bit arches. Should be in release
-after 2.70.0.
-
-https://gitlab.gnome.org/GNOME/glib-networking/-/commit/4f8ca86a0e460794188c3355f0c7cc11fdbe4229.patch
-
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue, 21 Sep 2021 17:07:44 +0000
-Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t
-
---- a/tls/tests/certificate.c
-+++ b/tls/tests/certificate.c
-@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void)
-   g_object_unref (cert);
- }
- 
-+/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid
-+ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have
-+ * died out, or GNUTLS will rethink its approach to
-+ * https://gitlab.com/gnutls/gnutls/-/issues/370 */
-+#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603
-+
- static void
- test_certificate_not_valid_after (void)
- {
-@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void)
-   actual = g_tls_certificate_get_not_valid_after (cert);
-   g_assert_nonnull (actual);
-   actual_str = g_date_time_format_iso8601 (actual);
-+
-+#if SIZEOF_TIME_T <= 4
-+  if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX)
-+    g_test_incomplete ("not-valid-after date not representable on 32-bit");
-+  else
-+    g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#else
-   g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#endif
-+
-   g_free (actual_str);
-   g_date_time_unref (actual);
-   g_object_unref (cert);
---- a/tls/tests/meson.build
-+++ b/tls/tests/meson.build
-@@ -69,6 +69,7 @@ foreach backend: backends
-     test_cflags = cflags + [
-       '-DBACKEND="@0@"'.format(backend),
-       '-DBACKEND_IS_' + backend.to_upper(),
-+      '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include <time.h>')),
-     ]
- 
-     if backend == 'openssl'
-GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.68.1.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
deleted file mode 100644
index 566f954f9f9b..000000000000
--- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 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.67.0:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.6.5:=[${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.68.2.ebuild b/net-libs/glib-networking/glib-networking-2.68.2.ebuild
deleted file mode 100644
index 8c43ea3df5f3..000000000000
--- a/net-libs/glib-networking/glib-networking-2.68.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 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.67.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.70.0.ebuild b/net-libs/glib-networking/glib-networking-2.70.0.ebuild
deleted file mode 100644
index 8bdcf6b9b5c7..000000000000
--- a/net-libs/glib-networking/glib-networking-2.70.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-time_t-32-bit.patch
-)
-
-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.70.1.ebuild b/net-libs/glib-networking/glib-networking-2.70.1.ebuild
index 860454cb0242..6c14700027ed 100644
--- a/net-libs/glib-networking/glib-networking-2.70.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.70.1.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
@@ -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 ~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/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index ed27ec136a6b..9064647f772b 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.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
 DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
-EBUILD gnome-online-accounts-3.40.0.ebuild 2121 BLAKE2B 57476176b80434f237305a369d100d0fdc541321e273f9c38f6c30fad15faed17fb841ccf8feb2b63a9d040a8855c8d7778b5ad039cf2d4abd0edfd398f69e82 SHA512 1b3ddd0d712c6aedfe8a7f747aff1068c98952724624a3c06290d0544429dc6ec12a410094b21fbb529569697ec1d6fbba461c4c597074965ea1c2abe5e5ef63
-EBUILD gnome-online-accounts-3.40.1.ebuild 2124 BLAKE2B db5bcb09565828f88ea2c106366e0c4c3a986dc0663a0b2b7fcf9e1d5b1745a4e14d51db1666995c5393f8c14162aecb94ffef0ef028218cc6cf5472dc23d2d9 SHA512 92f278bb6b94aa18297dd57c791028e692ef42d99bed52a8851d1e1b4c1cd04dbb9de94e41803884a4aeded54041c2b42fa9fffe924ef1f5378e602cb2df5ce8
+EBUILD gnome-online-accounts-3.40.1.ebuild 2121 BLAKE2B 3fb1d323c8897a2ca8ceb11e976b7a4a801dcb2d4e7f6c8b6f0155aadaef8efa3c912c948c85911a58ba1471b45fec60ecfbe9fb987050a01f355447b3a8c6c7 SHA512 a3a5aff663fa2c12bd615be67442b9b87b7bc3858f1d7fb5352e6ced75e75b1e2d51c27b1e2a9fe3a73cb210066d5a77fc44103f3e98f2c9cae8fab6716da29c
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
deleted file mode 100644
index ed7cb68c8a1c..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 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.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
index fe36f7b72807..1bb0801290c0 100644
--- 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
@@ -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 @@ 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 030cc66abe05..5d8f1afd6919 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,5 @@
 DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
+DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077
 EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
+EBUILD gnutls-3.7.3.ebuild 3950 BLAKE2B 2a23f19c8de102103096c3744a64d2d9c8dcd7c13a530525ab1dfeeee539572cce4b8f7cec1d4075ad06078011bb84ccc29829fb70e1779cce0aa70a291e4cb0 SHA512 9787262af694cc8a61f0f27d7142ccf07c483b0aee1b9fc53e1bc6043741a9cc910ef5f6eb90cd54d76003fb9793da65c69fc4aad61778a561c7e0e38f7a1914
 MISC metadata.xml 1259 BLAKE2B c268a1e19fbfe5c046eb378ec704b078073df107f3b2df4f1dcc9b09697b7dcca635b86e22a0835f7c700ebd79acd5668aec4cd8fc82d9f235a514bea97eb31b SHA512 55d832a6a691eca628f00d62530b58265a9f17ae2a33de41379b0ca4286132e4e369fbaab655cedff1fde76f68dc0748919c729c07e3f6ecbf0496984a70c32d
diff --git a/net-libs/gnutls/gnutls-3.7.3.ebuild b/net-libs/gnutls/gnutls-3.7.3.ebuild
new file mode 100644
index 000000000000..e4b947e00983
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.3.ebuild
@@ -0,0 +1,127 @@
+# 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 ~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 )
+
+	# 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/gssdp/Manifest b/net-libs/gssdp/Manifest
index 091a8169f7ee..2242c8cc33f9 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,9 +1,3 @@
-DIST gssdp-1.2.3.tar.xz 62032 BLAKE2B 761a9e0df8289a595d882497bdda6d180f19328d0e97076446286e34e7735d1b1d07fc0299618955f7d92732d11d533a59cf4012f5167c4610c9856583f06770 SHA512 abce2473995a996b0adc74ced77cb2158cc997ed70edb0c25fbddd85fe9e6afc6bf7f996bbba7a6ed5268dfbe9207ae12f2e6989efe2e8e10cc25293df347e82
-DIST gssdp-1.3.0.tar.xz 1202916 BLAKE2B af771b4163c8671d1496cedabe5845eed0b12a8dd23aa226c61ca19ad1d83bca7d504ea36f9e8b09b5079373261043c121a8ac09a909f4430be0d5a5eaa995f1 SHA512 6004ee73898e5effb98dd78af116bf4b92735712f0237c57302ebbda82d77c1cfe182e0e6ef7a8c6defd7a66ac76531d0bff740d2a41cfba8ed365b88a539c85
-DIST gssdp-1.3.1.tar.xz 1141580 BLAKE2B 3d43c1cf9bb9e418ac831b09579e6940540e0ab2124d1f75989648e39b03aec612898340511b2c965573973531adbe8f489d33447a85aac761dcbe8906325abb SHA512 b253c5bd38956a02fe1f4cd77d7c868a573c1a7e25115137ae0753c7dfdebc38cd7a3c3fee1520c1c091c60283d556f646b5c715e56f013b2fe209c63a994b56
 DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
-EBUILD gssdp-1.2.3.ebuild 1245 BLAKE2B aea2f4019c721dffd34ba8075eb6a7468ea39537a89961cad9bc62bec14df3f9d433d29ab943c5932d5b8d6b33ad2467463aa5248d2700e0cd32821690a8311d SHA512 e265e54e13963bb27eedc65aa74d3733d6754417b48a94874eb2181db9e43238b02a98197638dd4589058117fe0fdbef6a05f52bf687c6955f0cb7e1c6dbd230
-EBUILD gssdp-1.3.0.ebuild 1512 BLAKE2B a2e895b117d895f3dd497ecf95a53a57939f4cfb6076d8e346346105fa12e16622c611a0fa3079a5f70b9802f4c965af683e742cfb2235049db9ff18131e0360 SHA512 cff03653eed4c1b2dde7d5244af720b716b2541a94572710dec7bce1934aa787c20a08efb4b383395a6058c20a243d24adc7cf1408a3d9a92365e213bd8423df
-EBUILD gssdp-1.3.1.ebuild 1519 BLAKE2B 72101953f3b4f4131e9d187c5cf1eaa77d2e7b02f6b4d2167214559ca4b2053b858fe8b94d600dc2ab9e3bf2cac8050fddee73e3d76aa3b5d5ed1f3493183647 SHA512 b351580132dce51e00188fc51639319be73f0adadcf6b1d9b6b4867fec05d18acca5c94d107c059c905aa1e406c477742a70fbfab3ef75723508d3b465dd425a
-EBUILD gssdp-1.4.0.1.ebuild 1519 BLAKE2B 72101953f3b4f4131e9d187c5cf1eaa77d2e7b02f6b4d2167214559ca4b2053b858fe8b94d600dc2ab9e3bf2cac8050fddee73e3d76aa3b5d5ed1f3493183647 SHA512 b351580132dce51e00188fc51639319be73f0adadcf6b1d9b6b4867fec05d18acca5c94d107c059c905aa1e406c477742a70fbfab3ef75723508d3b465dd425a
+EBUILD gssdp-1.4.0.1.ebuild 1515 BLAKE2B 6500ba1134f6f705be94c877095355f8a2749c55984fdd9ea12286860d07ec4c0f4000b6c58d78c356713b19fe4b29b2b1c565eba33bc31542b07f8792ccddb3 SHA512 bdd374ba81e40ffe0706b4a70cf0197a53496eabf3c9341d6d7959f487f84100b588c6407fd24c1dbed055af412d96f595343aea1806adbb65a8fb6f8d41236b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gssdp/gssdp-1.2.3.ebuild b/net-libs/gssdp/gssdp-1.2.3.ebuild
deleted file mode 100644
index 689c160c9ce0..000000000000
--- a/net-libs/gssdp/gssdp-1.2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( >=x11-libs/gtk+-3.12:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gssdp/gssdp-1.3.0.ebuild b/net-libs/gssdp/gssdp-1.3.0.ebuild
deleted file mode 100644
index a71c9b505b29..000000000000
--- a/net-libs/gssdp/gssdp-1.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( gui-libs/gtk:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc ; then
-		mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
-		rmdir "${ED}"/usr/share/doc/gssdp-1.2
-	fi
-}
diff --git a/net-libs/gssdp/gssdp-1.3.1.ebuild b/net-libs/gssdp/gssdp-1.3.1.ebuild
deleted file mode 100644
index c76385775f89..000000000000
--- a/net-libs/gssdp/gssdp-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +introspection gtk vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.54:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( gui-libs/gtk:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc ; then
-		mv "${ED}"/usr/share/doc/{gssdp-1.2/reference,${PF}/html} || die
-		rmdir "${ED}"/usr/share/doc/gssdp-1.2
-	fi
-}
diff --git a/net-libs/gssdp/gssdp-1.4.0.1.ebuild b/net-libs/gssdp/gssdp-1.4.0.1.ebuild
index c76385775f89..2f05db4fdfba 100644
--- a/net-libs/gssdp/gssdp-1.4.0.1.ebuild
+++ b/net-libs/gssdp/gssdp-1.4.0.1.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 @@ 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 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection gtk vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 4471a2f7f5d8..ed9cecb23de6 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,8 +1,3 @@
-AUX gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch 1692 BLAKE2B 6ac0db2a08ec541bb213099e19a67eb7d295b8439c0562032de964343b4c698e6dea3227b0e4fff1dbb5bd3bde715d1bc288ed70b7efe5972ad78407213bc331 SHA512 02c3294e7e94a7f0bc2223c59362351a7256a5934e8c2b9304d226be7d289f2759c9222c2d715364438669048178ad722bcff8c8f31049bd7fa0c1b9780361ce
-AUX gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 755 BLAKE2B 95934ecb04553fd3153a2d0b81e52a487f922b888868d395a423e28f2d94c1012f9cda4025d79e855e371161a191c6c7b9c6dd6fc8acd603f91286ef9492dac3 SHA512 060ba2f9a95ae6fa790b6481acc3d23b93220b733b1e2966e80c33a7a802dbdf84a55023da381efd037b23cb1ca698251fc6b3779debfe7bf21b9e5ce5c54d76
-AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 1052 BLAKE2B 8ba4a7c553bf2af5a4cb6fde0daaa990db67f6fc105d64b03c555f2a091063249dddf657d03907f4d63220dd26d42d10e9be01e766459399b1a7ce4b824e62ea SHA512 d288723785d143bd306b0ff85d25658709f22a75d5a294b43b3e45ef8a84f40bbd00017b84da776453097a218f642d337c2308ca965b0cde0a1a3e97f3b6bae3
-DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
 DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
-EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb
-EBUILD gtk-vnc-1.3.0.ebuild 1498 BLAKE2B 52b0044d5f482876c75ffa54ba9f8574410b4884ca4a1080774099d6e60c980720a63d847614e599e3ec9c5876fd5972aab712a3103b661ed40b413473d50489 SHA512 03a96ebfabf66ac4544250c425925880e92ad137218aa59d523d3e548f4e56522a2915cd724643e891721d55f0517913fc128956305cdae9e3c6550c80e0b49f
+EBUILD gtk-vnc-1.3.0.ebuild 1496 BLAKE2B adce8166d8ea3b5e421e0e38cd1b634d6bff08c1ac081b0f8198446d7615c1711cfecdd8e6322d7c22827d1289f3b8556fa6e453dad3ed967980169486585dff SHA512 0bd744d6a8c66bd0e74af7ed430a51c22b9d115a9c84c0ed6b327d23f1da4fab1d33a30632f336364a9427aaf39b557a1ed7dc88a8eeb3a713ffeffb03a0bdde
 MISC metadata.xml 398 BLAKE2B f3f6610cc4d7266437aaffb6278d79222d751634d79e275dc34547f95eaa826fc47a991b03cff5d7c9350314f876da54bb1322f6dd6e890e266a9e16b892b30c SHA512 953c1714f9dfaaf81e8dc27efa2758f5b0707dfe8594ef6fffa6da80aee0bfbd0c6d2c830d3459d4ba6bf36206ee55f4af5ee23f9f0845d1d1ee231cb8b8a352
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
deleted file mode 100644
index eba775dd3a52..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
-Date: Mon, 26 Apr 2021 17:38:13 +0200
-Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the required ucontext functions aren't found, switch to gthread
-coroutines instead of failing during the build.
-
-These functions are absent from the POSIX.1-2008.
-
-Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11
-
-Signed-off-by: Jakub Janků <jjanku@redhat.com>
----
- meson.build | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8052d43..e9829e6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -43,8 +43,20 @@ cc = meson.get_compiler('c')
- 
- coroutine = get_option('with-coroutine')
- 
-+uctx_args = []
-+if host_machine.system() == 'darwin'
-+  uctx_args += ['-D_XOPEN_SOURCE=600']
-+endif
-+has_ucontext = true
-+foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext']
-+  if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args)
-+    has_ucontext = false
-+    break
-+  endif
-+endforeach
-+
- if coroutine == 'auto'
--  if host_machine.system() == 'windows'
-+  if host_machine.system() == 'windows' or not has_ucontext
-     coroutine = 'gthread'
-   else
-     coroutine = 'ucontext'
-@@ -52,6 +64,9 @@ if coroutine == 'auto'
- endif
- 
- if coroutine == 'ucontext'
-+  if not has_ucontext
-+    error('ucontext requested, but not available')
-+  endif
-   conf_data.set('WITH_UCONTEXT', true)
- elif coroutine != 'gthread'
-   error('Unknown coroutine backend')
--- 
-2.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
deleted file mode 100644
index bd72b5727927..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15
-
-From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 5 Apr 2020 00:05:49 +0300
-Subject: [PATCH 3/3] meson: Find python explicitly to honor downstream python
- choice
-
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 5306fb9..247c597 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
-   'vncdisplaykeymap.c',
- ]
- 
--python = import('python').find_installation()
-+python = import('python').find_installation('python3')
- keymaps = [
-   'xorgevdev',
-   'xorgkbd',
--- 
-2.26.3
-
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
deleted file mode 100644
index fd305f777c5d..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14
-
-From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 28 Apr 2021 17:16:54 -0400
-Subject: [PATCH 2/3] meson: Fix configuration failure with
- -Dwith-vala=disabled
-
-Otherwise with_vala is not defined, and meson setup results in
-
-    src/meson.build:169:5: ERROR: Unknown variable "with_vala".
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e9829e6..777876c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection'))
- with_gir = gir.found()
- 
- vala_opt = get_option('with-vala')
-+with_vala = false
- if not vala_opt.disabled()
-   if not with_gir
-     if vala_opt.enabled()
-       error('Vala API requires GObject introspection (-Dintrospection=true)')
--    else
--      with_vala = false
-     endif
-   else
-     with_vala = add_languages('vala', required: vala_opt)
--- 
-2.26.3
-
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
deleted file mode 100644
index e879d2277a27..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org vala meson python-any-r1 xdg
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection pulseaudio sasl +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gdk-pixbuf-2.36.0:2
-	>=dev-libs/libgcrypt-1.8.0:0=
-	>=net-libs/gnutls-3.6.0:0=
-	>=sys-libs/zlib-1.2.11
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.27 )
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/cairo-1.15.0
-	>=x11-libs/libX11-1.6.5
-	pulseaudio? ( >=media-sound/pulseaudio-11.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-# perl for pod2man
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch
-	"${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
-	"${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature introspection)
-		$(meson_feature pulseaudio)
-		$(meson_feature sasl)
-		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
-		$(meson_feature vala with-vala)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
index 99885c444904..b2dee74c90ef 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index d51646a184a7..139fa902f26d 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,9 +1,5 @@
 DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
-DIST gupnp-av-0.13.0.tar.xz 91584 BLAKE2B 96f4a452f199d48c72cf65a7fa0ef6eb59488862f87a7bf7d1eaaa79289e89bab43718c4a4e94f1d6a71ddf65071c1c1b3aa49c180ba068928b1740bb7a3c8d1 SHA512 8ff5dcacaa5893290c263ba8be2613da6853e074e2afcbc3e111dbff8c9b9d7edbd3772341bc370a1db06b4ba815fd6071158f61a832e2e8f2a51d66d5d8f230
-DIST gupnp-av-0.13.1.tar.xz 93040 BLAKE2B 31901d8e15afdb789aa71cdc114e3472870526dd221ed18d503f43a9590235e5f2af896d87ac2747f8d9dac8b7f27f8b055bd0d5d18838add87162ae9c6289df SHA512 e99485d5d232227f57156cafdfb8a30dab135a0d88eb7d041e475d45e1ab4329d25c50f5528a4ba33e0ceb792fd1de3ec2b8ead597d5720fd0827bce42dcd312
 DIST gupnp-av-0.14.0.tar.xz 93128 BLAKE2B d66ba820aabf82be37a8c19a64adbacc863b495cb6a68849ee236cbe6956cc94fc992a3d4f351d165efaa8257ece2f3173dd845d2a9313bc9ff1a97a178d9632 SHA512 b357b5413d3e01e4ecaf9dbdf5f5f15555506aed662154d03c6232f0c82c4a49543deddf34350a204d467c1a33fed04e406500fd51d6e412d32ac909e974e041
 EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654
-EBUILD gupnp-av-0.13.0.ebuild 984 BLAKE2B 971c2197e5eea9e4d0bf0cd307f1926f18fee4f071274f88f99fe166347b02d5c132e7a6aa98936e7b6e8bfff51571223860982a2746e584df75e21389051577 SHA512 ac0935987ec127610ded324bfb14bde63ea2933fa21e65dd378e7837887c225fb355c8105aed673154f62ecc0ac147a66846c5a7beb8d2390e5da613b830d890
-EBUILD gupnp-av-0.13.1.ebuild 991 BLAKE2B 1c46b77563345a05be2e14d4e4ca0739a46a3b166907c136c0ca6691f92bbf3f1e5cfdeac57f27e705ffa900fb1e2fe2d751f7550f4e6dcde9918760e68ea964 SHA512 5ef3772bc405b69c0bed784cbb68cfdc3e31e7c1eba097b84712cb7c3592c5fe04b54525a3f759ae9e36358857e35020309cbbd93cf2c3096b568012194e5ba9
 EBUILD gupnp-av-0.14.0.ebuild 991 BLAKE2B 1c46b77563345a05be2e14d4e4ca0739a46a3b166907c136c0ca6691f92bbf3f1e5cfdeac57f27e705ffa900fb1e2fe2d751f7550f4e6dcde9918760e68ea964 SHA512 5ef3772bc405b69c0bed784cbb68cfdc3e31e7c1eba097b84712cb7c3592c5fe04b54525a3f759ae9e36358857e35020309cbbd93cf2c3096b568012194e5ba9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild b/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild
deleted file mode 100644
index d8baf6de158b..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~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-av/gupnp-av-0.13.1.ebuild b/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild
deleted file mode 100644
index 2d691e8af565..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.13.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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-igd/Manifest b/net-libs/gupnp-igd/Manifest
index b52f6a55bfb9..fea957b10b9b 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,3 @@
-AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
-DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
-EBUILD gupnp-igd-0.2.5-r10.ebuild 1437 BLAKE2B 878e30278be7c3c9048c099db41096d6699106e907136787f220e9c89e141d3c71e72982962798c51acdd436d1d48dd425c9d8de5da89b0223615b5cbda7c913 SHA512 f2cfb991cdb627ee24bebbe9fb6371319562823e90d4e29aaea53f10f146f0d67fa762f7e0f568afc8e766a19f7e9dd193fe47749d50c55e905e735a657dfe8c
-EBUILD gupnp-igd-1.2.0.ebuild 1141 BLAKE2B f3ce983d79138ba0a18c459409b68b0c35c0df3c98a2ffccd3645d515177c1a58cbf4d78b13406d176889fda651f3731698720c2f08bac750ef3ec3a6a9521b0 SHA512 1c117f5322386683c153c06e525b441deaed1b088bc011bce867ce27ef0207e2ad9a234a50053541924a2ea79d90a0bf018e1837c8bfcd8b93029fc6b0a15699
+EBUILD gupnp-igd-1.2.0.ebuild 1138 BLAKE2B a9d243fe6bfcc8ef3bbcd78b6c934693b376159d124893a26945cccb7db2b2570571d81472cef1beae470a14f81cd47a608fd9b9fbe501e2882817f54e14c9e3 SHA512 40ce670ee8ee71cd9af7b70868bfb31d1e278796930f86b5b828b8f338799b9dacdead1b620fbe4cc0e644a818e7767c63ce6b14ef32a1cf7bde7805c66ce7d9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
deleted file mode 100644
index c70bf6fea489..000000000000
--- a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 1 Dec 2018 21:33:21 +0100
-Subject: [PATCH] Swtich to new GUPnP API
-
----
- configure.ac                    | 2 +-
- gupnp-igd-1.0-uninstalled.pc.in | 2 +-
- gupnp-igd-1.0.pc.in             | 2 +-
- libgupnp-igd/Makefile.am        | 2 +-
- tests/gtest/gupnp-simple-igd.c  | 6 ++++--
- 5 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f03921f..aa7f0ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
- 
--PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0)
- 
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
-index 483956f..6db3bee 100644
---- a/gupnp-igd-1.0-uninstalled.pc.in
-+++ b/gupnp-igd-1.0-uninstalled.pc.in
-@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
- 
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: ${libdir}/libgupnp-av-1.0.la
- Cflags: -I${includedir}
-diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
-index 6660d63..aa74ed3 100644
---- a/gupnp-igd-1.0.pc.in
-+++ b/gupnp-igd-1.0.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: -L${libdir} -lgupnp-igd-1.0
- Cflags: -I${includedir}/gupnp-igd-1.0
-diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
-index fe020b5..e10d857 100644
---- a/libgupnp-igd/Makefile.am
-+++ b/libgupnp-igd/Makefile.am
-@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
- GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
- GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS)
- GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
--GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
-+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
- GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
- 
- if HAVE_INTROSPECTION
-diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
-index 9b32b2a..d051d13 100644
---- a/tests/gtest/gupnp-simple-igd.c
-+++ b/tests/gtest/gupnp-simple-igd.c
-@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
-   GUPnPDeviceInfo *subdev1;
-   GUPnPDeviceInfo *subdev2;
-   const gchar *xml_path = ".";
-+  GError *error = NULL;
- 
-   g_signal_connect (igd, "context-available",
-         G_CALLBACK (ignore_non_localhost), NULL);
- 
-   if (mainctx)
-     g_main_context_push_thread_default (mainctx);
--  context = gupnp_context_new (NULL, "lo", 0, NULL);
-+  context = gupnp_context_new ("lo", 0, NULL);
-   g_assert (context);
- 
-   if (g_getenv ("XML_PATH"))
-@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
-   gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
-   */
- 
--  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path);
-+  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error);
-   g_assert (dev);
-+  g_assert (error == NULL);
- 
-   subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
-       "urn:schemas-upnp-org:device:WANDevice:1");
--- 
-2.24.1
-
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
deleted file mode 100644
index 664a38dca04f..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome.org multilib-minimal xdg
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch # needs eautoreconf, https://gitlab.gnome.org/GNOME/gupnp-igd/merge_requests/1
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# python is old-style bindings; use introspection and pygobject instead
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-gtk-doc \
-		--disable-python \
-		$(multilib_native_use_enable introspection)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
index 7b036f45c5e2..1b9cd1ffa98f 100644
--- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 9052eb2c5f47..d466df6cf351 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,9 +1,5 @@
-DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
-DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477
-DIST gupnp-1.4.1.tar.xz 152964 BLAKE2B 1c59461f670731b5095e04f6dfb5a64ce5a2dde4f5c5c46c137475d88f9154c1c7a01a7be88d22c8d0a1193b4cda0227396769540311627706621681a8b69161 SHA512 c1aedcb03741e833fc17d3f799b7786a2df229e51feea0911e759f1fa4e92369799f358fef2bc03430728fba84bd188ac0c0aa08f359ee75f81cc20b90032763
 DIST gupnp-1.4.2.tar.xz 154636 BLAKE2B df0378493dec2b5576cb3130598e36d86dd1fce106b5486134691000ca87eeaa593806c82029b9fe35b40a5210db6026c6b28b16a44ed444934ec8e9ff858cf5 SHA512 c585f3e63e8735b82e84e3daa209dbe8d0709be79c7701a1f05ad61aa5201aee5d4e879facb1b164b274fe52add64cdbf657d32930d7cea1b6ee262f7c26b682
-EBUILD gupnp-1.2.7.ebuild 2052 BLAKE2B 0225c191c8d26d9a740a9d0ad214f8694bbfd7de3d056a9e5b0d5774b59a77864afb18d16a7f256ceb11788f004566497d981d1dd349c0ab36122962cda6f701 SHA512 72c03166a9484f774fe368ae9122d1e311ad0a6967518df3317db92e844a6489f7946d540a153a863beee3a60eae11cf68b501a53100f0dcf7fb594901f489f0
-EBUILD gupnp-1.3.1.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
-EBUILD gupnp-1.4.1.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
-EBUILD gupnp-1.4.2.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
+DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
+EBUILD gupnp-1.4.2.ebuild 2096 BLAKE2B 12cab960634fe310af01836717651fdddea344565c696264fadfbfbde4ecdc70861dcb19c9346a236edecb8c41b66f4d55c4ad289cbadcd9658c00ab154f6ee4 SHA512 e4eaecf687166bffa05367f8bbbfce0cf2eee6b4f0701886c2b91bfae9b6ab8be76f9f680bf43ab469a95e058514c2760c4f9ac6d200d58d34e31584fd065e02
+EBUILD gupnp-1.4.3.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp/gupnp-1.2.7.ebuild b/net-libs/gupnp/gupnp-1.2.7.ebuild
deleted file mode 100644
index 6a4c93934f80..000000000000
--- a/net-libs/gupnp/gupnp-1.2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman gtk-doc +introspection networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.2.3:0[vala]
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/gupnp/gupnp-1.4.1.ebuild b/net-libs/gupnp/gupnp-1.4.1.ebuild
deleted file mode 100644
index 21a2db719466..000000000000
--- a/net-libs/gupnp/gupnp-1.4.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="connman gtk-doc +introspection networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.3.0:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.3.0:0[vala]
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/gupnp/gupnp-1.4.2.ebuild b/net-libs/gupnp/gupnp-1.4.2.ebuild
index 21a2db719466..c1d291ef2e7b 100644
--- a/net-libs/gupnp/gupnp-1.4.2.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.2.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 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="connman gtk-doc +introspection networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/gupnp/gupnp-1.3.1.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild
index 21a2db719466..21a2db719466 100644
--- a/net-libs/gupnp/gupnp-1.3.1.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.ebuild
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index f844bcf62d50..e0fe522ac4f6 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -6,6 +6,6 @@ DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1
 EBUILD ldns-1.7.1-r5.ebuild 2618 BLAKE2B 45660918f86ea19a7d6fbec418c642bdea4e74114b35558f1a183baed4b5cbc17f3c7364c40d63d8b9c50d3158825811c11c124557b46e2e00185488199e40ad SHA512 c6b4a485068fdc10b459be1d88e22af98e0f6a140b20edcf3bae438fb22146fcad5f424f9876559210b7e0eded08334d89fd26ade4c3a705b1f741e217e27d29
 EBUILD ldns-1.7.1-r6.ebuild 2344 BLAKE2B 7167648ba5ab423819900cbe26825504a960d6ab034a104540438541600ee2f545dce128bf5b405edff09a119aa45aaa4fd9ab31051843f64eca8e8b6516b8a9 SHA512 2a36d0997fb7b1b8aef41d4766a43266fa913d18cbfd514e2ff548c2a9f99d6c78e3ee6e0056b044ef8d7b04d9709308d2bee55b2b5eb24dc5f12290ff18aff7
 EBUILD ldns-1.8.0-r1.ebuild 3138 BLAKE2B 898f2d979188e1abdd724117fded8cf5171d7a39b887c50e18519970b3d7bbbd5736aa13671ff4362422eaf11e08651f6b0596f54e94e0bf6167b6c0802cd6ff SHA512 08e1b24573f299eaa97e3f8eaf606bcf60b03d0dfcfb2a7bc9950b8435329e1668a70c93f62a38520d5ccfc9482ab4e5ed1bf89bed338a89e72c43ddbc24ba88
-EBUILD ldns-1.8.0-r4.ebuild 2973 BLAKE2B 9f8e2db3bc31be6eabed2afdefdf718d68601a0e113cbf9ea41fa48667ea0c4aa868aacccf24dd770aae6e3e72fd41c7b6ca183fd30f4e9daac9e527dbb92a2e SHA512 3b1744450a138f30a79eff6b4017bb4d29777d80f53fb1127ee9de70238a3ea3aa98d1f3697bf6e12caf7f70eea846e0707129a7d2ae3eab02204b4ddfbce4b0
+EBUILD ldns-1.8.0-r4.ebuild 2972 BLAKE2B 466fdae89a85c3bb79a7ca14bcba3717db28095b298504306b81cd9c8d9b341b0da927327f16267e670909c02396580b75fef91cadb242ae310d7419ebf8e92f SHA512 78b97dde6bfbf3fe1918a46a3eb85d553a126e48a842066da3e885d04af8e1f29aa66cd3f90686dd5de6ebc68d2927ab6e15d09ed0785a49c223952954230e04
 EBUILD ldns-1.8.1.ebuild 1835 BLAKE2B 734966617e515574565c19b1b8df8f7d1e073248808a35d0cdfacba99bcd74212aef1fb988ebd2e8721f8df6034d20e1ce67c3ba42627d9e281f4dba7dd2fa69 SHA512 e072ba6765eb7b22d1b7d9c848d1938e8ada4529fa5d115520ca0b725fea00e3f93f7effb8918d389bef9cae12b339e5637b73924d7ef5a593359001ee052b15
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.8.0-r4.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild
index 500135bc8667..7ea441885f27 100644
--- a/net-libs/ldns/ldns-1.8.0-r4.ebuild
+++ b/net-libs/ldns/ldns-1.8.0-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=8
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 examples gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 073920352e79..1f39f28752e6 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -2,7 +2,9 @@ AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b8
 DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
 DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694
 DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d
+DIST libaxc-0.3.7.tar.gz 41742 BLAKE2B e43220745cbf1e3f375c69218cc0c5bc944e2fbfd1ca2a79be38d8cac9206609f757b8afbf5d5a1411ad29cddbb8edf9cf67b570fe152d91e77e070ddbf4666f SHA512 e9982a54307ebc4fbecdd6482e0ccc9b1d5539047f455f66a4f25c067e2da8eba782163ccf0ad8aac8b11867da5d7efb309c403cdfed464e6865d3e03e09ea11
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
 EBUILD libaxc-0.3.6.ebuild 1498 BLAKE2B 895c99d15610ceaebfd12ea57b776e52a41dbd487615d5683eef5da36a7f40a15c44b40ad1b72dcd3de87f3aefcde5c45fafa92e985f2b4a1383f1332537212c SHA512 17ba494678d9a7f4f590c62f1dadfa67f6b46b3c1115fdb326afa5812c81da1dc7591a0354e15675bc77289b7d2d53f0a8bf923163601209703495a93dc4432e
+EBUILD libaxc-0.3.7.ebuild 1500 BLAKE2B 23a7dfeee0cc5647d98502906703e88f8ea1ef271e24dc26e74f4adc31a631f810ca7357682e074863b47b0fb2ad80dc7cf08ab51d2bd1d6a7ed3a08964add53 SHA512 bc701aa1347bbcb19020a604f4f33bcad2b0df6f1d4ac30bf19b30517c91ea4543596d6311fcd738673e7b9a009172d2d0e0ed069516081387e4858b7df5b786
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/net-libs/libaxc/libaxc-0.3.7.ebuild b/net-libs/libaxc/libaxc-0.3.7.ebuild
new file mode 100644
index 000000000000..564171853f90
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	net-libs/libsignal-protocol-c
+	"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+	"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rm -R lib || die  # unbundle libsignal-protocol-c
+	default
+}
+
+src_compile() {
+	local make_args=(
+		PREFIX=/usr
+
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+	)
+	emake "${make_args[@]}"
+}
+
+src_test() {
+	# TODO: Test failures seem to be ignored in the upstream Makefile?
+	# e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153
+	emake CC="$(tc-getCC)" test
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${ED}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${ED}/usr/${libdir}/libaxc.a" || die
+	fi
+}
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index a5c33af2ab96..e795a40b2122 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,5 +1,3 @@
-DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
 DIST gfbgraph-0.2.5.tar.xz 283632 BLAKE2B 7a229e098623613c3c758dd7d9d4802cf82a6b8c7f6c81ad8de2392597d13b6db9978ef1794321aa6915f9065dca030e58ef1569d64f956a7048846e996cea23 SHA512 c3a1168935272377c211d95e4efcb8ed56d129589bcaa6e0d7b5dff7ca916f0c63dc30eb1a903aea3de51cb109ae787e985bdd9485fb97cd1b5b6971bea01a1e
-EBUILD libgfbgraph-0.2.4.ebuild 1253 BLAKE2B 13b7673066d2759daba70e95ca4063825190bc82d739c5c5fc3a21b4fcb8d51825f69d81a97cf5daa35e0653cc5678fcb7352f0771e357f0bdcc88e1c32c30aa SHA512 b716d4248eab483e82c4bf05deae33345d5fd1dadd1fbc7f95c2d5c649135343d8261877c96b5fede2e8d7ea9c9ac720116e814f344f136953cababb2e381915
 EBUILD libgfbgraph-0.2.5.ebuild 1232 BLAKE2B 88b2349d74a8e4e760e86328ba37bf4b5af341121583d4d81b866d8e737b998ea05d6367abae17354e770f677ad16a1d01401dddac7929e4fc042a441b36d0f7 SHA512 a9a6d3bcc68f15219474c599c535a8e1be54e596bd723574b668ea4a8f8714ec87cb8b6977c04f0c7f88b92d7a2ef78381b78e9366497fcc1d3e6a49c47d9bfd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
deleted file mode 100644
index f3649d47e702..000000000000
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gfbgraph"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GObject library for Facebook Graph API"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="+introspection"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	net-libs/libsoup:2.4[introspection?]
-	net-libs/gnome-online-accounts
-	net-libs/rest:0.7[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/gtk-doc
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-# gtk-doc needed for autoreconf
-
-src_prepare() {
-	# Test requires a credentials.ini file.
-	# https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/7#note_802926
-	sed -i -e 's:TESTS = gtestutils:TESTS =:' tests/Makefile.am || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-	# Remove files installed in the wrong place
-	# Also, already done by portage
-	# https://bugzilla.gnome.org/show_bug.cgi?id=752581
-	rm -rf "${ED}"/usr/doc
-}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 47013cf9c3c9..f27fa05f0816 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,7 +1,3 @@
-DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
-DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
 DIST libmbim-1.26.2.tar.xz 561096 BLAKE2B 11e5339b63dbaca8fb6d31ce2afaf4897774aa4b531cfbb09bb400f64ab975495093b711d0a836feff86e3d9fc72ae2b85ab5cd84fab3d266e0fecf1129125d0 SHA512 7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844
-EBUILD libmbim-1.24.8.ebuild 889 BLAKE2B 4c377286bb2c5a5ca3e0b0937913329f01fa336e1f94e785d70b8ff93b785b4eaea1b8e72af50606c11a4867d31a9fbc0d587a2d254ea0feb6404765775a4f83 SHA512 622e5f13c75da85334d193b9da60033a6f3af3d58147cc4b8eb31597e93647bc81941a8f694fcfdd634df913625d33103c4ecd1a6375720779199503a47a4679
-EBUILD libmbim-1.26.0.ebuild 811 BLAKE2B 216c3f07fd9d6e69beb873be60b667e264ab1ed29ec7073d1191ff0e86dd3d4355801c6936ceac2cf851864ae364f74d60b862ecb7f61da1d7c2785ebe6c23e6 SHA512 36237cbab939734a660edb5d231190ee36f5e6e9aebc748edd9d3f98368d3109a2f3232bf84eb6361f810f09144518eda07012fd09fb56f0eb6e2b5a475cb632
-EBUILD libmbim-1.26.2.ebuild 817 BLAKE2B 8e154f2082e07dea8f46f8c49e1229540663ed49db47cb4284731ad53959e9fad8a20a0bfbdd2faed92465f9812180719456ac20c92b522b3fe6686da50b4e78 SHA512 d9eb1d4cde236039b9bb652e62072ec0177715b8e8589706d0f6687cb3e4ed75acbc8eb5cead898586c365d0096f5bb9dabd52a49a601a3f310ede8937cc7564
+EBUILD libmbim-1.26.2.ebuild 811 BLAKE2B 9b19aa6ba3b08db780e51d7316610ff348bc7616601a07a19ba3d7842604d09eb3cf660778cdb8ab93dd192dcf936369ea410acfd813b748582e0ef56e57b74a SHA512 668d3805890a6a154c30adaf8f73ea2ba96d102b287c2bb4a9dbbfcc64ea295827ea7b7c245dd900c8c912d082254d89ee2cbe3936184e499801aa06ba572403
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libmbim/libmbim-1.24.8.ebuild b/net-libs/libmbim/libmbim-1.24.8.ebuild
deleted file mode 100644
index 141c3f44d2fc..000000000000
--- a/net-libs/libmbim/libmbim-1.24.8.ebuild
+++ /dev/null
@@ -1,39 +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} )
-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 x86"
-IUSE="udev"
-
-RDEPEND=">=dev-libs/glib-2.48:2
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--disable-Werror \
-		--disable-static \
-		--disable-gtk-doc \
-		$(use_with udev)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.0.ebuild
deleted file mode 100644
index 1ff3ec9dae7a..000000000000
--- a/net-libs/libmbim/libmbim-1.26.0.ebuild
+++ /dev/null
@@ -1,35 +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} )
-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.2.ebuild b/net-libs/libmbim/libmbim-1.26.2.ebuild
index fc51435b2a20..c45f611c94b0 100644
--- a/net-libs/libmbim/libmbim-1.26.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.2.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 @@ 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 ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-libs/glib-2.56:2"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 65e97015c475..e5ef4fa4b970 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,5 +1,5 @@
-DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
 DIST libnma-1.8.32.tar.xz 1368492 BLAKE2B e91317259f79140803d5b99b23bafddebcb46a72b80c1fec912341aee377920ada3688864ede2aa3d492ef994de9b8f02e391fef98e0bbb61f296541338ad0cd SHA512 65244a8901322bc17d48c9cb809080790d5af0195b79becf0317da77b6c6a0fde3f8d3b752f5d7e59a5dba0970f4499077c5d9d6776912a72748290b8ac98e11
-EBUILD libnma-1.8.30.ebuild 1628 BLAKE2B 2e8672e2abfd63687691af77ae863e0f65b67ca842e0f8e1cbffcdae35d4359a2e6cbb4cfe01c703f8c00e7f2fa79b9c698c1671d54dd0dfeb638227ccc54f13 SHA512 618a21d3fb23ced580bda945d4c7ebf8a76bbc190483b2dc5c182df3b5fa60e47475ca5891768f15d185f9a615571ce985a8940f672366e162b1434205484150
+DIST libnma-1.8.34.tar.xz 1342040 BLAKE2B e81004cf97832bdd010869fd7a801ceda42b96a70a0bd0aa50f821f7e3c361716f8075ec8ae82a224b6f617ee9b3f177239a53dd9eb982dd49da409d97671fd9 SHA512 aca1e24a852072e65d1fba910613981373bb7bb7869b2e44abc9e41c527d234273f034215d62889a265aa3327ad2cce0cea7368b025df97dab12bff098310aaf
 EBUILD libnma-1.8.32.ebuild 1635 BLAKE2B fd9303968c9a11ebe42c78e3a7051551846a4fbbe8c008958dfea309a00f68df84e0087b254a8d6119e327af9b4345b39ba4f7857ca205e08c11bcc13896a6af SHA512 eb8e17dda8ea25810992607c873d6d32a79096767ae454b2c71d75f127e6057464f1a4d7143c33617a024ae2e7eefd7ba98891baa178092f5e29d541f0cdea73
+EBUILD libnma-1.8.34.ebuild 1640 BLAKE2B 50e22a9de30ef8d9e13f453ceddd1dfc8764e2678186ba34ce4877b7592b4c7099262002987012c69a913089292b47c775eace74ea7fd33ceb5f7768a9f6c429 SHA512 8c01885d515825aa1ed8b32ae852089a14ad0bd037ff7518e5ac855704cc8133bfcd948772714b200f7737d64719a7e1a65ce447d2044376a6652eafe8c723a2
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.34.ebuild
index 98ccac03799a..0942796ba7f6 100644
--- a/net-libs/libnma/libnma-1.8.30.ebuild
+++ b/net-libs/libnma/libnma-1.8.34.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,13 +13,13 @@ 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 ~sparc x86"
+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.10:3[introspection?]
+	>=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:= )
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index ea806d4426a4..b350e0871a00 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -2,5 +2,5 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae
 AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
-EBUILD liboauth-1.0.3-r1.ebuild 1523 BLAKE2B c9364ba77c2fe296b80c56b2a1ecc4dcb59848b260fb7963dbb1833d764615d8aa1b6001146650c3e7e8dfab0d26cf03aad06e974dcf39eae363ce7e986120f6 SHA512 47f77622aae3fab2dd0f45ac01084bc17f367ed9f7196f00a64cb12af3670a955da12b9f20b367e2e97afbd92dfeeba1cecd445f1d9f46313e5262a5d3e00eac
+EBUILD liboauth-1.0.3-r1.ebuild 1523 BLAKE2B 7c8bbddfa62e3413a79358caebc5acc2aab6201aaabc4df09ca9eb4c3bf544de452323fe16691ac7ae88e8fc0291ecacd5c1fa27de4d81afd37de898568c6464 SHA512 7ebe8606add68cee461725c13f167c1c6e9906a91786550909a9046d22ce0e878d614010858b9398fe0e8761cd017285d18b7aafccd01933cf643d946eee2511
 MISC metadata.xml 880 BLAKE2B 7d21173fe9d5aa67de1cd75f2055bd686ca7223ad58761cc79241e88e390696fa60abb32c845e51a827720d281963258b41661c0757ba28211b7a0f9055d8cad SHA512 09d4eff65caa5df8b6b60454726cbc0725527d823d337162b06d35476d54569b5e324e920a4c658dbb6c7d0db516e587903aeb6701f01206b7fb766081f11e92
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index db045636e130..f0475e3b43d8 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="C library implementing the OAuth secure authentication protocol"
-HOMEPAGE="http://liboauth.sourceforge.net/"
+HOMEPAGE="https://liboauth.sourceforge.io/"
 SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 25d5482b23a2..25ed283cf3e0 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 1480 BLAKE2B 1378cf3362cd30e1392df9f5034e0831721058464342f89430dc7136e781e0167f29e281a4bedce7d2b9ad8067908ae57f41abdd44f683b13821ffc2cd18ae72 SHA512 96b7fe20ec7cf9304695473b3218e1ce99283d4baf52b6799f488af6d2d4f78bde3234adc5e5ebdeb590fbba9377a810b647924bbc61bd7cafa396b148f45c8c
-EBUILD libpsl-0.21.1.ebuild 1501 BLAKE2B e807647e7be8242978b31a87a3beb95b9b5add66a73854e76ae51ceb096388cb0b82d0cb16d5964e94b6ad3878c78b36454cc769416e737de087d038f32718b6 SHA512 519670119db95c53e832fceeef0feb38eb80066e9b6015f1e5cf409bea8a42d1d8fe44e49908099c5a93b6c6b0d7e0c34d9c68e56c3972c0ad8e793fb4ea852a
+EBUILD libpsl-0.21.0.ebuild 1481 BLAKE2B b25bad445cd8b81f56a10867f57c9aea656099136191e959a11d89af9639948323b3008a4b70e63482188b35a0b9f003eb67f5724b74f645076fdb4a15ed92a5 SHA512 bf5d0b5d0318a349eba6570117390ad0dd054859ff74cbbcdc56c6588802d7c0de1b4ddada5eaca005f197defae2845d4e1b3fe19b32332b5f61ebbea0d8d08b
+EBUILD libpsl-0.21.1.ebuild 1502 BLAKE2B 0e118ce4df0bd8717d5fe18bc8057319edac0edc4029f7bbd8fa7a3f9ae2f88840c5430379a51c1958801002ca8e7588947bfd6a6f78a2ccd722b833fc0675f1 SHA512 8e766ca3a310fd8df15958a32513472ecb8ca12c365ce3480690f339667110c39f4e82f596fd6a7ba378cb951cb5d2dd889a3f6693aa620b1cac6be018c57dfa
 MISC metadata.xml 344 BLAKE2B 3c8f92722db6f51476a4317fbfd47614782d3f999232df6c777a722195204ecb4b805b45789a54475a9f4941c7ea0c003599b2aa99b0cfce6423d77ebba24cff SHA512 5ee4a6da960951ec9ce6b22ee9f9fc2c3182d5775434fe9268ea712312032cb60d8f512ad45ec8170b868db8636c734dabaaec26fdacea15b85ff6534bb0485d
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d07938849562..33ab42070c4a 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=( python3_{8..9} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index 379fbf8773d1..3af43132fb4f 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8,9})
+PYTHON_COMPAT=( python3_{8..9} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index ab97f362fbf5..7199d66c7d8d 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,8 +1,4 @@
-DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
-DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a8378e6d9fd44535ea54b409f7020d33f5b3bab08ce583452e11abcbf5af48cc3a24a5fd382c7a833c435327c91614 SHA512 e0cf97f1ebc27feb68033d19b8bc146c41d134782c3eeefb1dd3502b08e493d8c484835235a7877854c1a9c2524ed6cc31aa1b897b873d0662f494a771b2c98f
 DIST libqmi-1.30.2.tar.xz 1239408 BLAKE2B be762988dcb40cdc29a9024989de0da42d3246c970ee63caba4f3a722b52e478879c177097165e880a48a7151d01f8f30e82d5a769258bd7c9cba9a24b0157a2 SHA512 e34e9cb4b49df6eac555e6493cfc89aaf6f9be3fbfb0b19a5fb6b69c81768fda499a6438b1a4f39b84a350899721c6a04c4195985077ac35da0036794bc59367
-EBUILD libqmi-1.28.6.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
-EBUILD libqmi-1.30.0.ebuild 1241 BLAKE2B e818264c2841916c29d7a7f9744bdc5a49d383db9e7a4e632124f033b64b03c7d343b10c9f6955355dcbcce1b4f4420a180f5afd2318bdf0a4b6fad70be1a4cd SHA512 a1a56c72c1b7575a9c295e38f37a6e46673852468a3d63da2131088e342956209ecdc27eb9a26a2f5d26167dd30f2bf8789d334f705a48ff1468d45ef938a022
 EBUILD libqmi-1.30.2.ebuild 1235 BLAKE2B 4f8acb7d967224490b55404c5ebbbe68d644e2e8a1caf971cae2cf835cc93351aa4e508c46ce8e6f0cdd2f3f3f7cb76a98310dec8a95a44550891fe276bbacfb SHA512 3554eff7df272ab5815cdfbab6556ddda3f85e588a00b259916c36c00c5e69114ef2c41fce0cecdf520414fb1d8c26d15e13062af5938684a2e9d2af616c1131
 EBUILD libqmi-9999.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
 MISC metadata.xml 425 BLAKE2B 95b85fd54d9a2f9836025d60e76d9d51d39f7ff9c08c571b134326bdd69fccdae3f7483b3f3e178bc03939f90a3fafcbf2bc98876b64726172d2bf3b25ce3c01 SHA512 626784480b99bfc5c55ada209c4ee6a8e8891583a34c9f45c1f3ffe3a01b465444e352c3a508b24611a05ea7c4e49c5dbb6157a18d3ac8f478c05871b6ef0040
diff --git a/net-libs/libqmi/libqmi-1.28.6.ebuild b/net-libs/libqmi/libqmi-1.28.6.ebuild
deleted file mode 100644
index c62b2a064ccf..000000000000
--- a/net-libs/libqmi/libqmi-1.28.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
-
-LICENSE="LGPL-2"
-SLOT="0/5.7"	# soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
-
-RDEPEND=">=dev-libs/glib-2.48
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--disable-qrtr # libqrtr-glib not packaged
-		$(use_enable mbim mbim-qmux)
-		$(use_enable gtk-doc)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libqmi/libqmi-1.30.0.ebuild b/net-libs/libqmi/libqmi-1.30.0.ebuild
deleted file mode 100644
index c48a2bddbb43..000000000000
--- a/net-libs/libqmi/libqmi-1.30.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
-
-LICENSE="LGPL-2"
-SLOT="0/5.8"	# soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
-
-RDEPEND=">=dev-libs/glib-2.56
-	>=dev-libs/libgudev-232
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--disable-qrtr # libqrtr-glib not packaged
-		$(use_enable mbim mbim-qmux)
-		$(use_enable gtk-doc)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 9f1feebbb51e..25b342bf3978 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
-DIST libsoup-3.0.3.tar.xz 1525388 BLAKE2B cd515656647bfa9d0bc3b93ade90823803219f11b1ca9688e3b5e6ac62a0d12f72fd7bf9feb6059ced8885c22568768ae5511e270ddc72fe495f078ccecce5a4 SHA512 9ba6f7e9e2a975dff52e5b28b147cad707aa1596a67f45bb1b9feaccf130eca2cb0b80b7ebf0a424388ec4f0b5297578b51142f8b135cddc367ac59d00279094
-EBUILD libsoup-2.72.0-r1.ebuild 2935 BLAKE2B 4d611b5f77df37809765846aae89afe31af53b0d4dfb9b39e45e62dc9b91007442180b92c57e4cd57547d904ff3e6db9ab3ec5cebadbe54f10ba4dbd32ec70ec SHA512 b32dc99e460e040a6aa710d80363dd2fb5f462a36c1b7b79defda746456455e7b1cfce57f68a6bd6f7a940fb917e1ef5c1db1b538bde0637ce8cc0f7b20133c9
-EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-3.0.3.ebuild 2999 BLAKE2B 6f3950a2cab178a471e94dd3860b3df32ab0d3a5778f01a76bf2449e17f3e020a1f26b9b950f3a69d984350be71d3d64aab382d84f0196cef2172948d22c8c9c SHA512 a5768ec45fdf8dc0f8ebff7da98e93a87a22cc8224691b507d520b4b9fe4871a18a4537ca1b7e9c81995e1a8e96ccf02cc7840c96934fb741dde29e11e2f759c
+DIST libsoup-3.0.4.tar.xz 1523336 BLAKE2B 5df12a2bafdd36905fd2122b1123ce630ffad93de5965eb2f3e47f85f3bc3169e8c005e245ee9ba72433fc735d7b24b304bac55b800bce59506961976a57f634 SHA512 4e6c226dfd8dd3fb2568affdbf88b8f0ad52903198c1dfc808c4cba1c0479442581953b5fb83166a3a198fb861618b62f165a4544b5daaed094bbeeff94a48ff
+EBUILD libsoup-2.74.2.ebuild 2935 BLAKE2B ce060804ba36afb692f75c623715caa3c982c8aff3d31a4c11a5bbe5465da06065f890711ba63c2f3abf90bf339c2c7f15ec89805223a6f43abd157a34231826 SHA512 b1c738b2e82764f3733952b4f6adee85e3c7b86e6107b9f66435042443ff77f3bdff89757604e870684227aa660d1203c3efafa8877e92fde2c3e0e125792886
+EBUILD libsoup-3.0.4.ebuild 2915 BLAKE2B a6746efa0607805d0297627c659d7c9205572a8f38962812a009e638c5f320ebed9ea04cf517734739ef9031627182b394a7b50f9a86c5b3d5316e0ab24374ed SHA512 ce89efaa580533a32c5fec7f992455491af0f49b9118a3980791751979d02722163182b0fa62f183e94fd42d19697ac591c94d1508bd0bc0a2ffa6565473aa08
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild b/net-libs/libsoup/libsoup-2.72.0-r1.ebuild
deleted file mode 100644
index af1cd5f7bfd1..000000000000
--- a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-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="2.4"
-
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-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.58:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${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.38.2[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? (	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 necessary 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
-		-Dgnome=false
-		$(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_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-2.74.2.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index 5bf1131885f8..c8a8e7e509d1 100644
--- a/net-libs/libsoup/libsoup-2.74.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.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
@@ -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 ~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.3.ebuild b/net-libs/libsoup/libsoup-3.0.4.ebuild
index 4628b97f09f5..e6bf69b822a0 100644
--- a/net-libs/libsoup/libsoup-3.0.3.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.4.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
@@ -82,7 +82,6 @@ multilib_src_configure() {
 		$(meson_native_use_feature introspection)
 		$(meson_native_use_feature vala vapi)
 		$(meson_native_use_bool gtk-doc gtk_doc)
-		# TODO: Tests fail with network-sandbox or 32bit (upstream issue #236) for 2.99.9
 		$(meson_use test tests)
 		-Dinstalled_tests=false
 		$(meson_feature sysprof)
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 1ec2d65ffb68..48b49b7fb25a 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 3117 BLAKE2B b05b2f0718376bcdd086cac5ea7301eed6ba29831a2219c3cfff77765476554b16867d83a7974ad03c480485c2f8b7551a4bdb18c6487011b1a62f9000063d44 SHA512 4daf780178f7293affb803614ca71f7c952fadc0cd838c33db41118bba3da15d5f8fbe8d4ce1c4085096a542957e45099ce9f895c41fbebe8ffb2ae56702eab2
+EBUILD libssh-0.9.6.ebuild 3116 BLAKE2B 6a0077250fd03f4599604d3dd3b3dcdcbba74fca404d4433c0f6e01a68ad8773b72b670f2dedff280b0fee3e5935638f67c555561b02d8efe3aba988452f7fff SHA512 c3c2b7244162ef759a81556c38149188bfb698859e78296c1ccbf0e32f0067410610165e0979bc8cc19f394a899ed598246e6da1c0cb026b997fefe0e5fba792
 EBUILD libssh-9999.ebuild 3117 BLAKE2B 98eb87a2073ee4a86a2f339d5c37fa89dbb16e1ff6d7548b5ba6e4b051ba24180742d6c90747498c3939236c0fdbfa3d9de9ea28e077a35cfd41aa1dfcc29e47 SHA512 6a300f9e1695c444657fcd2fd19f25cc2d8ee6451076c0e039107c602f056bf23b2b3e8478ddacc5d8416dc2d4a7e383a3ff6afd858b2f4b4d337a8d235f4bf7
 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 627887023589..3aeecf20fd7c 100644
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ b/net-libs/libssh/libssh-0.9.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
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 43142096846f..a2dbe437432f 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -9,7 +9,7 @@ DIST libtorrent-rasterbar-2.0.4-ssl-tests-certs.patch.bz2 26530 BLAKE2B 0958f11b
 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
 EBUILD libtorrent-rasterbar-1.2.14-r1.ebuild 2588 BLAKE2B 481eb4d68ffde21e9839f04b1102348923087540e50172d5c612aeced221f76e1b99d44b72fd81a7772ce74989c33928957d77c579f996e5de492769f16b54f1 SHA512 642425ba009fe39ad2c7bd87daf1bdd45020b4b69de99e4ab5031c09dd1f24518c41c74281d6cbda32b24684c60134ee66496dd8674ac221796e8e625b1ae529
-EBUILD libtorrent-rasterbar-1.2.15-r1.ebuild 1725 BLAKE2B 64ba448ee625201de6b2def1f24dcb3f00e57c9d0d3036b609bcaacfee0ae2271c0dd590289a561c7e748864763c7725bf8e0d6f64bc251a1bcf59e0b45b2a68 SHA512 83616c412a0605e3a384c8c1d571eb82454df150c243bd0b754e10f2152c4c7517b7b202a2f2d4651ae24d16fc8668fada518a46fe3cdc3a8474ff4d0fcfec31
+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.ebuild 1902 BLAKE2B b9eaad2563cf46a5b0a507831bce1c177fd352ecd39a60b0b98b72eee07d36501c36c51976e2537d1d290060d0532cd48bccff25ade3902ce8c4baa3ae72b55b SHA512 3f94c46fdf4b31c0da778d1d3ddd21d99ff1194081808d9d8a2e872d5bda77113a36490b078f7ad3af219c48e6c0287eb6317f2d8d9405645510cf48ed23ff0c
+EBUILD libtorrent-rasterbar-2.0.5.ebuild 1901 BLAKE2B 0dfffc79287de220622d9a3e8cbe2c7e6687b3bb773aad850fe67f3a559ba5d23f047e0dd67e4452eefe9f21038daf6df4157c7e203b378fedc5800328b75a6c SHA512 a5b71ca8711f14942c03dda1694c25b04a5ea312031c00c4ad6fd138b2723d6b66cbfa9b1f66d05a2e75c2d4f785796ed82297e5199d8aa1d9eba5eee318c28f
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
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
index 459ca7926b07..94e0b8f3d964 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="+dht debug python ssl test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( 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
index 41475fb903a8..80b8f8086fd3 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.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/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ad6b7172fffb..7afb238f1f34 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,5 @@
 DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
+DIST libwebsockets-4.3.1.tar.gz 15607585 BLAKE2B 420343dd358e4ca45d0cadde7f0a6398dbd5043c4cd2c1a70f32dc9b5ef4cb222239971c4ce758ee156deac4d06bd18289a8e975a7f41508abfdcb05870994f6 SHA512 3cc2daadd7d2587ce946209a31741662d98367f0f9f77a1555497bef6fc6acc6cb97f5196d6ecef2d13828bb5613c60cccada03d9a01a5c970a9cfd25baeb0ae
 EBUILD libwebsockets-4.3.0.ebuild 2302 BLAKE2B 518b38be595d1e64deaf3c03fdd1d6f400edff952505a02e06d089a7408b6ff1f99430bcbc2311eed4cf3b29d3866e643838ef15cdcdd3d65fdf138e85b118f5 SHA512 195cfa3acb7e8e1cb7734fb54ce83908c5f983315a0675ef626e1bf50ce6bb771cfd5c91a0fef2bbb20d3ac17412dd677d5c39b55bbf75c0bd29a89ba438da11
+EBUILD libwebsockets-4.3.1.ebuild 2307 BLAKE2B ba68a6eb7d6e788016d609ea7fe7e5ba3f4c97e0785adcb1c67a795a499203d12917da52662524b744a41682ff72e0de3b5bf1b1c91d93daadd62b4713076917 SHA512 c2ecd7ff76040b3dd08c72ee54caa329ec4a02905543619ee4bdce3a41431f5113fea081337fa8a647bf58be1190797e7b819098db9a61059bab86798158d1bd
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
new file mode 100644
index 000000000000..5db0694c894d
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/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/libzapojit/Manifest b/net-libs/libzapojit/Manifest
index 98f625535ffd..c140a23941f7 100644
--- a/net-libs/libzapojit/Manifest
+++ b/net-libs/libzapojit/Manifest
@@ -1,3 +1,3 @@
 DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3
-EBUILD libzapojit-0.0.3.ebuild 834 BLAKE2B 535a0a1bf613f5a3daa98f75bab0a3100e42620010f1ecc631bd4e530451a061424d850586d336d710ebbf18f054fa6b77642214a8f1a6ef89b92ede5c8cf0de SHA512 146f22bd66efb1ba69bb3ce3a9afb3d13886c7600064f70ed73ea655d4e34a6c74757ff5ccd51539c7b74464e2734414231774cb7e80e16cd404e117cf74c8c8
+EBUILD libzapojit-0.0.3-r1.ebuild 805 BLAKE2B 1a5edc01cdd7fc2ab9cfc531243806081d675dec37e8c61df68af467a55e2b7ce96ccf570275bb9fa99fde6b4e5b8a7788383fed4bfed0e2800f5fa7316d5f02 SHA512 30aae44daba90f3c120cb13900a562cb1b6f5d99a0248b66d8a61c0f4108c36b97a1b9670fe7ac1c0932196067595d2226ed6c5e2165bf1cdfc00b2f7a6b4fef
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3-r1.ebuild
index d10dc3b24c72..fba7e8314bc6 100644
--- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild
+++ b/net-libs/libzapojit/libzapojit-0.0.3-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="5"
-GCONF_DEBUG="no"
+EAPI=8
 
 inherit gnome2
 
@@ -11,8 +10,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libzapojit"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+introspection"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
+IUSE="+introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
@@ -23,7 +22,8 @@ RDEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.35.0
 	sys-devel/gettext
@@ -34,6 +34,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
-		--disable-static \
 		$(use_enable introspection)
 }
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 701e99a2f4a2..0d74f24dd266 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,13 +1,5 @@
-DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
-DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
 DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
-DIST neon-0.32.1.tar.gz 880434 BLAKE2B 91b942cb0d7184f4da26d7d45e846a0f80aa834226e5ff0689df75650da79cbfad0854c718dbffdd31cc0f09f25458ea37ca39bb38071643a6a609ef6102b896 SHA512 a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977
 DIST neon-0.32.2.tar.gz 880651 BLAKE2B 3629eee38e10ada5e001bf0afb77c70814083bf553596fc150a6cf21f0b66cf4de28841b242f68faaeb44fa5e0ad260939102b015d2a543ef59012876256b364 SHA512 2580a3c8c3cf4aff2d399f72a721ccfb4e68434ef92da4af8103c126812d779b9fbe5cafbab512c79f4365bbb3d3eac61568748136470e86f7aa7b98b27053c8
-EBUILD neon-0.30.2.ebuild 2637 BLAKE2B ca7d46b167c16691eed84c4fa6f20a8b177b5f74a92be193a8f4d544aac3cc1a5f9efcd727029a96e3395fb7b59ae5cd86defee9de8f1282e5850164d34e1fa9 SHA512 6e39206178a702501252a5b651b6bc7b78027ea0964fb62d82cd3fff8c2328a469e649bb2b69930782c8d06f0a383989c81ac02de6ce239a6acc2cd73598e957
-EBUILD neon-0.31.0.ebuild 2645 BLAKE2B 1fa391bc79023f61977c500cc1dba20482332eaee623632e92c6556df3d256c4638ccaa642ff4561b4572aecfb92cb73c9ce27b77e212d56c923beeef15d04cb SHA512 353a070a4ef590388e29b91442fc30c6ec1be79289765d53afc190d4d89ccb26034b076cedde1bf27c492a43b534ecda7e584f918141bb510516a1d4860e8823
-EBUILD neon-0.31.1.ebuild 2652 BLAKE2B ce07b714de82accd30783ae03fd9243c41adbaf8470891f7a37301b5eafc5a885ee5beee4f2dffe2cad34c966306ba68a1e4b4a4d0b0ae76a107a7b74b8e6194 SHA512 7ac1d4a62ddde50d7406d90760aeccbe68ff4cd36a2933faddecaa20724c904c9d4a007810b56632a63e2fd7fc8aff014755c3019191f52ff44aa97d3bd1ad10
 EBUILD neon-0.31.2.ebuild 2652 BLAKE2B e718aeeb582f1d0ea1fb0460dfdee36bb29241a22848ff5cbe4831a6ed9b8b909098583e228c3c2d9ba33199999b3d2a322ae58915d48a542bf4e0235031c31f SHA512 5107c9be940005e1bff5b20bdf878b96c0ee94817812139f5f7c3875020c64731eda7a22221b0519b769936143d868757849314ba48403e1140ab0402e69582f
-EBUILD neon-0.32.1.ebuild 2717 BLAKE2B 3ed9eb1069ef0485205f74755902268a26fd2b7e475c8e27534bc82701193e7c573b77cc4f8272bd59685c8225c2863a810fb009fed100ef23de23bc56b9fe71 SHA512 7376c1fb7d34f0c9d983b3f1640a72f8fa15db2bd0657eced6a0b4aa56c044a61f80ea45b49ef9f1987d8f70d2118d13a9fd0e2b6118c9b5b11a6c339ec68958
-EBUILD neon-0.32.2.ebuild 2717 BLAKE2B 50b3a737198c4176ccf4ae722690c58777fdd4ffb43002214155050c7f29b3fdd92fec57b62e3d6bbe623c39f06e8934b6305bc7658410e00f20f94318744ed8 SHA512 b7bdc5b90305558fbb0acea64c08b2bf5b9529703bc0649a0fbbe3b7e1532f8c6647172a5b05e119de60eb72bda3e1cda1088a8ad45fc9f3d93698d10102bf47
-MISC metadata.xml 1413 BLAKE2B c90629adef6f151c3584782110a60c0f3dc5729faa222b347348ee24f20f137711fa2f075cea72629729be803fed5cbd562f96005717b6fc3fda52c32c471bbb SHA512 f06e7f2864d42a47b385d836c793652ae8699e495dc7d21d33277025c27af8f35ee674ce15109159c0cd4aa61cea9bfedbd14d7730d4cbd222432d69acdb6757
+EBUILD neon-0.32.2.ebuild 2552 BLAKE2B 2a9e938e9796095a42280e179a57d73aa4127b115d00f54fa42a299353bbf5bb0589cc8b975b12cb1f32d16effeab1172a5e7a0904a3d20fc5ac816ec0832253 SHA512 22283c7d3f04225cfdaefafbc0f1d5793346f2e63257753011431b85e95af515cd318e5cfe8191d952e145a9e78407fe46418907be04b6427cc85a20b69b62ed
+MISC metadata.xml 1465 BLAKE2B cc9629974affeda497ea2825a4412182f9445f90ef04eb1337a456fad1b578a30d6b1135255b278cf795ffa9be7d78e810797fc7fd170606e52e48f7af5e02fc SHA512 ca250ba34c8c50c20d92a60b138e6548920f9fead9c5dda3a18928bd06203f6952c4a6a2a0eee846c3f7bcd48c79959c92af9a0fd1a5133273fdc09fcbb051f3
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index f53db81ccb5b..5fd2d0a22b8e 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -3,10 +3,11 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<longdescription>
 		Neon is an HTTP and WebDAV client library for Unix systems, with a C
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
deleted file mode 100644
index 0579d7c523da..000000000000
--- a/net-libs/neon/neon-0.30.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="6"
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 THANKS TODO
-}
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
deleted file mode 100644
index adbc8e2dcc79..000000000000
--- a/net-libs/neon/neon-0.31.0.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="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
deleted file mode 100644
index a6ad1025fb55..000000000000
--- a/net-libs/neon/neon-0.31.1.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 ~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/neon/neon-0.32.1.ebuild b/net-libs/neon/neon-0.32.1.ebuild
deleted file mode 100644
index 92ef286a9128..000000000000
--- a/net-libs/neon/neon-0.32.1.ebuild
+++ /dev/null
@@ -1,109 +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}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	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/neon/neon-0.32.2.ebuild b/net-libs/neon/neon-0.32.2.ebuild
index b318674ec7f0..2759c3517627 100644
--- a/net-libs/neon/neon-0.32.2.ebuild
+++ b/net-libs/neon/neon-0.32.2.ebuild
@@ -1,21 +1,28 @@
 # Copyright 2001-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
+HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/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}] )
+IUSE="doc +expat gnutls kerberos libproxy nls pkcs11 ssl test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		ssl? (
+			dev-libs/openssl:0
+			pkcs11? ( dev-libs/nss )
+		)
+	)"
+DEPEND="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}] )
@@ -25,29 +32,24 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			app-misc/ca-certificates
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (
-			dev-libs/openssl: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}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 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"
+DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO )
 
-	# 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"
+src_prepare() {
+	if use gnutls; then
+		# Ignore failure of test pkcs11.
+		# https://github.com/notroj/neon/issues/72
+		sed -e "s/T(pkcs11)/T_XFAIL(pkcs11)/" -i test/ssl.c || die
+	fi
 
 	eapply_user
 
@@ -86,7 +88,6 @@ multilib_src_configure() {
 		$(use_with libproxy) \
 		$(use_enable nls) \
 		$(use_with pkcs11 pakchois) \
-		$(use_enable static-libs static) \
 		$(use_with zlib) \
 		"${myconf[@]}"
 }
@@ -95,15 +96,12 @@ 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/*
-		)
+		dodoc -r doc/html
 	fi
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
-	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+	einstalldocs
 }
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 40e3e34dce66..d94f5ead2d32 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,4 +1,6 @@
+DIST ngtcp2-0.1.0.tar.xz 540132 BLAKE2B df59b4632110f118e0ae27c709fee24be65216d5461ad73901fb7f7450afe17a255acda10473a39ac45a34c2810728c50e39dcde9a71c48eb843d5d628b70b8c SHA512 935c37fe08bb625b39d4355322df54cedc180584c46b7816a84b2715f777a49590cd0434ed062fabec55df1a2c5332e7edf6335bd071599b053d6f404ce260b8
 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_pre20190912.ebuild 1083 BLAKE2B 285f80c7ebf4cb3fa9ab7b74a39894f09ce0a54f89463082b2923858ed1b2c41fb6a35bf4cd0cce78e793acd28d8a46ae8d4e71c36a2ebdab76f57870129c717 SHA512 de01dfbf633ff6ee98407924c27ec4d655d3549305978faa4b22fbe5028bd08ea354489679decf12c75c2188559b8eab21e04166c42865a881c79a9fb807fe59
 EBUILD ngtcp2-9999.ebuild 985 BLAKE2B e17250a0c0c02ad53500ec3e73420e878530f37b6f5364a260da37ffa7f3fcaa2f45ca820971c2c71075e40247350efd3d57a55556a876810ef4c9100c34a3a3 SHA512 13dac2bda9f4eb281f50bdf008c095f6b3de6e5fa0772bc553993525259ddac9909ff15e7080b7ab1d0a7162e2569a6862a80bc2b0f761259e7a622f3c85aa25
 MISC metadata.xml 327 BLAKE2B 57c198cb15bb8a8982d7c93149b595e0fd03fb0b63cde2d49349dc3dcefa7873f310a4c6accf7089320c6a38376aef8bf6d98afe689d743c96636eebc53a2365 SHA512 580f5c33715cac0b138070349342d4d2e62c179e05aa1e66fc801001fa8dbb064d1291f8c38ff3b0e68cb392bc2f339c28afeab1d9a77d786497968fae2505a8
diff --git a/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild
new file mode 100644
index 000000000000..7e8e166f726a
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="ssl test"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 0c7807390320..4316d25665a9 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -2,4 +2,4 @@ DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf0
 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 428 BLAKE2B 18d449071b1cd5730c5ca97050f4c7c3f3354957598df3a71b2742793e14247843c640d7102f40d793b6b867a889da41aaae8a1c9c302732cbb5bf2be1d6a954 SHA512 a1e34d6248066744284ac224fa63983856fae50037b137f586ade1f7595c9129b88a9a092f3dd8dfc678066905fc92a4aeea11620bb450473d36933f93d1028e
+MISC metadata.xml 438 BLAKE2B fd74e8f98efc4037a229958d5b2887308a1bed529fc5586075d5eb4af6e2624d1fb2540735826b7b4c48d21167ecd2a351e5a4ac46b3cf6e0aa751a4036f29fb SHA512 b8ac2eaf12f97ce0aa35bedecf0446a9b59c9320dfbb1d12ee28fb678a399b88d5c78e4255f4b1c8ac84478feac904449b1393e7468137b87e9b2064b7abc170
diff --git a/net-libs/ntirpc/metadata.xml b/net-libs/ntirpc/metadata.xml
index 32ce65debaaa..39ab041d91ac 100644
--- a/net-libs/ntirpc/metadata.xml
+++ b/net-libs/ntirpc/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="gssapi">Include support for RPCSEC GSS</flag>
-	<flag name="rdma">Include support for RDMA RPC</flag>
-</use>
-<upstream>
-	<remote-id type="github">nfs-ganesha/ntirpc</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gssapi">Include support for RPCSEC GSS</flag>
+		<flag name="rdma">Include support for RDMA RPC</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">nfs-ganesha/ntirpc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 0b997c014820..98fe27f7b642 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -1,3 +1,4 @@
+AUX quiche-0.11.0-fix-pkg-config-output-path.patch 2266 BLAKE2B 6a9fbe9bb999401750d482589f5c3ab9174357c12a13c52e207be4f767a7b8bfbe2868e4ea1680394b49c959929188023eb9f5d6e9b998be9dbb74f17cbd06c6 SHA512 af36dc0638c0a7f388c70024430de5bc2670b6aa2c21f16188b886e7b3efcdf7cbd00e6cfd50f6d8f0a08a872b000cb5e815a1e3b9f93e26f9de29bd3cffc12e
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
@@ -7,23 +8,30 @@ DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91
 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-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
 DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
 DIST bumpalo-3.7.1.crate 78573 BLAKE2B 2bd6c041a703033e0214746c087f3f505853596ff37b5abc04323b45721346c66f6b867387adb000b3cad80eec3661afb008f75d7cdd4e7328e730ed36e926c8 SHA512 879bc0993d8ac18cc7af87276aaf7aa042bdaca338c8cc766d5a1822c5675c1852b97467da0f6d5f4721213e3781a195e143b73d21e02ce11600e13e147e943b
+DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 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 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
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0a04aeeed1475080755fb07853da63353343b0ad66d97588679f461c7f5e5f69b753372174799c52ee7fc3e7d0 SHA512 64577b5f82878ff465eee0bd5f154522640e9bae7e6d52c1c8b868412a2297ded69b104b85b7ca6b6031d6a6eef60579933cb6502bb7342af1f9aa593428a256
 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 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
 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
 DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39
 DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
@@ -33,8 +41,11 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 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_core-0.13.0.crate 49969 BLAKE2B a8a26a6b272b00a06d17585edee07d8a3a5a5c7a7a84a389a0fb31b60f9526bf79d5e2e69625f9014cd286657507a268e4a2ff25230cdfaddacfc23a1af234f0 SHA512 b97ebc4cec09aaf1a3ff6773bf312c94889522ca21573271d459c51942c57b71e104993c1b723ad122edfe49c0d029ea27234f07daeb50b5cd36f007ab57bb39
+DIST darling_core-0.13.1.crate 50847 BLAKE2B d7117ecc836e3c56eac69e4e81d350b2d8fe88e72484bb5269eb34972062a84882de43651561cf2df5e82d68b22791656017b3eea3d9f79758d8e5ba4a84f5fe SHA512 67fd1bf5059c6b7ea1b2b17b6f7bcc1ea6a9f84f50182852b2b8b9601b8d43529918b373dacb9b2a7aa12fe6162a9412d1330ce6e9ab6a3e2171f6072d958711
 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 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
@@ -51,18 +62,23 @@ DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786b
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 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 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 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 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.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 log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
@@ -71,24 +87,31 @@ DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d624
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 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 miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
 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 num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 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
 DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 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 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 quiche-0.10.0.crate 3604568 BLAKE2B b79bf113e21bfe613ef88a1279f0a6be2df5efa82db719a8407ff5db2f1f757a076326e1f243483e042000dfdee6bf81a649b51384a8f804f39016d388e14efe SHA512 94265a4245dd64e40e211a8e3dda356c0774971009afe0aa6c10c507d688535a3e54d318217de4b98de1b7828a5de921e6490003d55a77b7a4fd5b1316a262a3
+DIST quiche-0.11.0.crate 3608178 BLAKE2B 8a2d01733dc3094237be1371a9f6ad33ed27a40289c16c41febcd20ed1d091a2b68c7c2f43a034c7a2a7779a3060813bdaacee6a4bdc96f82d7b2a14db217876 SHA512 293e95302dc812f5be24ff5153ec979fc0fa802b374b734dd2fae152532ba0d7eaf91a192c86959e8fdd6ea5017303c4b72076f3bc2bc80ce6636285759aeb60
 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.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
@@ -99,38 +122,50 @@ DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea0
 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.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
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 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_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_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_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.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 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
 DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
+DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 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 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_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-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
@@ -140,20 +175,28 @@ DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa028
 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 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-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-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-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-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-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 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
@@ -163,6 +206,7 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 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.9.0-r1.ebuild 4385 BLAKE2B 1c130db59001681420c487d090436dcdc195010c27f1ad9a1cab4abdcbcf37a2d8aae42a28ef9df5aa984b6ddb445c5b6b3b880caee86f77a4014a7fe33f233b SHA512 42624f53406d711dfe664d9aabffa36dc997f0ddc7b18aa5b77802633fa4b92c9bd76ba0ef767c2d6851b78adf8df9a1626e4b24fed1bd13a332102f9c12e847
-EBUILD quiche-9999.ebuild 4388 BLAKE2B 7723e5f6b1cd1a5f052dccbbecb9decfe241529162464c1eaf4533e0bf61aab0c745cdd29b5c0cde64f37105c2042b1ab8e880377bee7cd7f61b747e4890828e SHA512 da18092392eec34d21110f18f3dc075b31308f2bc87eef885d8d85a5a4de2f479d5991854e846626867a479d33465d4a5d76658d1d258c99fc119ff2bd2a21ee
+EBUILD quiche-9999.ebuild 4459 BLAKE2B 6edbefd6b1f40e28b40d17b497d84587d71560906c6170182d2b88d7620519ce3b4e7242982328252b4e5a9f427212a8e98c5d3e2c4c7c0383a3239f2e4aa78b SHA512 0bcdcbc6a20a9eb241d1f667d1d15767cd5d03003bdc72ad5dc3e0e2a13aeeb60a10bf090b205bc5db9d193405029f21ec948a6ffeff56585d9339bfd132d1e4
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/files/quiche-0.11.0-fix-pkg-config-output-path.patch b/net-libs/quiche/files/quiche-0.11.0-fix-pkg-config-output-path.patch
new file mode 100644
index 000000000000..638d033b50a5
--- /dev/null
+++ b/net-libs/quiche/files/quiche-0.11.0-fix-pkg-config-output-path.patch
@@ -0,0 +1,65 @@
+From d2b14f02fbf6b8420abb4c77870d64df596fc0e9 Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Tue, 1 Feb 2022 11:36:54 +0000
+Subject: [PATCH] build: fix pkg-config output path
+
+When building the tarball from crates.io rather than from the git
+repository, the target directory for the pkg-config file doesn't exist.
+
+Note that when explicitly passing the --target option to cargo, this
+changes the output directory from "target/<profile>/quiche.pc" (e.g.
+"target/debug/quiche.pc") to "target/<target>/<profile>/quiche.pc" (e.g.
+"target/x86_64-unknown-linux-gnu/debug).
+
+Fixes #1142.
+---
+ quiche/src/build.rs | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/build.rs b/src/build.rs
+index ce299cd49..d1ef4f4ee 100644
+--- a/src/build.rs
++++ b/src/build.rs
+@@ -173,11 +173,10 @@ fn get_boringssl_cmake_config() -> cmake::Config {
+ fn write_pkg_config() {
+     use std::io::prelude::*;
+ 
+-    let profile = std::env::var("PROFILE").unwrap();
+     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+-    let target_dir = format!("{}/../target/{}", manifest_dir, profile);
++    let target_dir = target_dir_path();
+ 
+-    let out_path = std::path::Path::new(&target_dir).join("quiche.pc");
++    let out_path = target_dir.as_path().join("quiche.pc");
+     let mut out_file = std::fs::File::create(&out_path).unwrap();
+ 
+     let include_dir = format!("{}/include", manifest_dir);
+@@ -196,12 +195,27 @@ Version: {}
+ Libs: -Wl,-rpath,${{libdir}} -L${{libdir}} -lquiche
+ Cflags: -I${{includedir}}
+ ",
+-        include_dir, target_dir, version
++        include_dir,
++        target_dir.to_str().unwrap(),
++        version
+     );
+ 
+     out_file.write_all(output.as_bytes()).unwrap();
+ }
+ 
++fn target_dir_path() -> std::path::PathBuf {
++    let out_dir = std::env::var("OUT_DIR").unwrap();
++    let out_dir = std::path::Path::new(&out_dir);
++
++    for p in out_dir.ancestors() {
++        if p.ends_with("build") {
++            return p.parent().unwrap().to_path_buf();
++        }
++    }
++
++    unreachable!();
++}
++
+ fn main() {
+     if cfg!(feature = "boringssl-vendored") && !cfg!(feature = "boring-sys") {
+         let bssl_dir = std::env::var("QUICHE_BSSL_PATH").unwrap_or_else(|_| {
diff --git a/net-libs/quiche/quiche-0.11.0.ebuild b/net-libs/quiche/quiche-0.11.0.ebuild
new file mode 100644
index 000000000000..40caf91a4aa2
--- /dev/null
+++ b/net-libs/quiche/quiche-0.11.0.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.59.2
+bitflags-1.3.2
+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
+cexpr-0.6.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.3.0
+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.1
+darling_core-0.13.1
+darling_macro-0.13.1
+env_logger-0.8.4
+fnv-1.0.7
+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.1
+js-sys-0.3.56
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.115
+libloading-0.7.3
+libm-0.2.1
+log-0.4.14
+matches-0.1.9
+maybe-uninit-2.0.0
+memchr-2.4.1
+memoffset-0.5.3
+minimal-lexical-0.2.1
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-7.1.0
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.8.0
+once_cell-1.9.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
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.5.4
+regex-automata-0.1.9
+regex-syntax-0.6.25
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.6
+ryu-1.0.9
+same-file-1.0.6
+scopeguard-1.1.0
+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
+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
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-width-0.1.9
+unicode-xid-0.1.0
+unicode-xid-0.2.2
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.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-webidl-0.2.75
+web-sys-0.3.56
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+	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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-pkg-config-output-path.patch"
+)
+
+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 1af1e9043742..510c2a7fa793 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-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
@@ -12,20 +12,20 @@ atty-0.2.14
 autocfg-1.0.1
 backtrace-0.3.37
 backtrace-sys-0.1.31
-bindgen-0.57.0
+bindgen-0.59.2
 bitflags-1.3.2
-boring-sys-1.1.1
+boring-sys-2.0.0
 bstr-0.2.12
-bumpalo-3.7.1
+bumpalo-3.9.1
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.70
-cexpr-0.4.0
+cc-1.0.72
+cexpr-0.6.0
 cfg-if-0.1.10
 cfg-if-1.0.0
-clang-sys-1.2.2
+clang-sys-1.3.0
 clap-2.33.3
-cmake-0.1.45
+cmake-0.1.48
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -35,9 +35,9 @@ crossbeam-utils-0.7.2
 csv-1.1.3
 csv-core-0.1.10
 either-1.5.3
-darling-0.13.0
-darling_core-0.13.0
-darling_macro-0.13.0
+darling-0.13.1
+darling_core-0.13.1
+darling_macro-0.13.1
 env_logger-0.8.4
 fnv-1.0.7
 fuchsia-zircon-0.3.3
@@ -50,34 +50,35 @@ ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-0.4.8
-js-sys-0.3.55
+itoa-1.0.1
+js-sys-0.3.56
 kernel32-sys-0.2.2
 lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.102
-libloading-0.7.0
+libc-0.2.115
+libloading-0.7.3
 libm-0.2.1
 log-0.4.14
 matches-0.1.9
 maybe-uninit-2.0.0
 memchr-2.4.1
 memoffset-0.5.3
+minimal-lexical-0.2.1
 mio-0.6.23
 miow-0.2.2
 net2-0.2.37
-nom-5.1.2
+nom-7.1.0
 num-traits-0.2.11
 num_cpus-1.12.0
 peeking_take_while-0.1.2
-indexmap-1.7.0
-once_cell-1.8.0
+indexmap-1.8.0
+once_cell-1.9.0
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.29
-qlog-0.5.0
-quote-1.0.9
+proc-macro2-1.0.36
+qlog-0.6.0
+quote-1.0.15
 rayon-1.3.0
 rayon-core-1.7.0
 regex-1.5.4
@@ -86,30 +87,30 @@ regex-syntax-0.6.25
 ring-0.16.20
 rustc_version-0.2.3
 rustc-hash-1.1.0
-rustversion-1.0.5
-ryu-1.0.5
+rustversion-1.0.6
+ryu-1.0.9
 same-file-1.0.6
 scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.130
-serde_derive-1.0.130
-serde_json-1.0.68
-serde_with-1.10.0
-serde_with_macros-1.5.0
-shlex-0.1.1
-slab-0.4.4
+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
+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.76
+syn-1.0.86
 termcolor-1.1.2
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-1.4.0
+tinyvec-1.5.1
 tinyvec_macros-0.1.0
-unicode-bidi-0.3.6
+unicode-bidi-0.3.7
 unicode-normalization-0.1.19
 unicode-width-0.1.9
 unicode-xid-0.1.0
@@ -117,15 +118,15 @@ unicode-xid-0.2.2
 untrusted-0.7.1
 url-1.7.2
 vec_map-0.8.2
-version_check-0.9.3
+version_check-0.9.4
 walkdir-2.3.1
-wasm-bindgen-0.2.78
-wasm-bindgen-backend-0.2.78
-wasm-bindgen-macro-0.2.78
-wasm-bindgen-macro-support-0.2.78
-wasm-bindgen-shared-0.2.78
-wasm-bindgen-webidl-0.2.74
-web-sys-0.3.55
+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-webidl-0.2.75
+web-sys-0.3.56
 which-3.1.1
 winapi-0.2.8
 winapi-0.3.9
@@ -144,11 +145,13 @@ 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 )
@@ -162,7 +165,7 @@ LICENSE="|| ( Apache-2.0 Boost-1.0 )
 	openssl"
 SLOT="0/0"
 IUSE=""
-DOCS=( CODEOWNERS  COPYING README.md )
+DOCS=( COPYING README.md )
 
 BDEPEND="
 	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
@@ -171,7 +174,6 @@ BDEPEND="
 DEPEND=""
 RDEPEND=""
 
-CMAKE_USE_DIR="${S}/deps/boringssl"
 BUILD_DIR="${WORKDIR}/${P}"
 
 src_unpack() {
@@ -185,7 +187,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
 	cmake_src_prepare
 	multilib_copy_sources
 }
@@ -209,9 +210,9 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	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/release/quiche.pc
+	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
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 88705696b9a2..c2c64db9b712 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -4,5 +4,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 2014 BLAKE2B aa22ce26d181ccc59edbca02fec8b088b2d007e24486c4b8c6faee9e2f257ae004bc96c3fade209b47b5395ea12bd1945a0df3e4107105599f347d90736a7fc6 SHA512 03945716d34e57bbf18b892afd0357ff2ab6b80a346fb20f529679fe16d6eaf3748fa2b83c8533212463cd8dbd8f064feacce0e7c9406b7b2154a74b4116dd42
-MISC metadata.xml 360 BLAKE2B ae27ed2b7da27e4f375903df19c5a82e8fbdf2a4db8190f3e99157c8fe8fe54e181e45efef941aa9d16a413b8c95c0a42eea54d6e6272c02609b11e68bdf7739 SHA512 bbe65b8f140a7dfe870af1c97b8bc4a3f0b034a234f344fc4620965ebe66d9eea804806b43409a106ba905b29d74e8e7cdeff065a89f5beb751e7f70c1b54700
+EBUILD serf-1.3.9-r2.ebuild 2017 BLAKE2B 58b1c8f3f47c1f481162b35dd5feeb207ef74dad4b42740e53872423fd1ec98d9915ed95a57178568654c1bcc57d9ea79119243dc8948e77325ba5e92b9d5f8d SHA512 97064317879b772e7de74b8779808be7242e25a5478bd33e2c9a3dcc942cef54bd744afd5fbb3e7d38b4a6cf594b77bdf830fc08d912b7a7bc0b79f4d4db16b5
+MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index 9bb005e5c177..5480aa8168b5 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -3,9 +3,10 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index daf94ac8d992..873b3807ea7d 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
@@ -14,7 +14,8 @@ 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 static-libs"
+IUSE="kerberos"
+# Many test failures.
 RESTRICT="test"
 
 RDEPEND="dev-libs/apr:1=
@@ -25,7 +26,8 @@ RDEPEND="dev-libs/apr:1=
 DEPEND="${RDEPEND}
 	>=dev-util/scons-2.3.0"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+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
@@ -36,7 +38,7 @@ src_prepare() {
 	default
 
 	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+	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__
@@ -44,6 +46,7 @@ src_prepare() {
 
 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
@@ -51,7 +54,6 @@ src_compile() {
 		# avoid that.
 		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
 		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-		BUILD_STATIC=$(usex static-libs)
 		AR="$(tc-getAR)"
 		RANLIB="$(tc-getRANLIB)"
 		CC="$(tc-getCC)"
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index de94e8d657a7..866dd7032f88 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,5 +1,5 @@
 DIST stem-1.8.0.tar.gz 2853802 BLAKE2B a275a38e53c5a4a3771a30528fd5781c51370352dd384a77ce27b31f034bece6fef448d74008adb82d2d909104b7338b5168a1a343c799637f9e12d39028bd09 SHA512 aa2033567b79aef960f8321e4c6cbc28105c59d6513ff49a9f12509d8f97b1a2e8a3b04dc28abb07fad59b0f6ba66443b92bbefa0d08b26038bbaf24f7f2846d
 DIST stem-1.8.0_p20211118.tar.gz 2862928 BLAKE2B 0c284be96332e11c011eb69d4448fab5c33cc59e4107abad44d7bc1186629112ca8658aade28e486c0eed873524e18ed87edf5920520d5c8dd854b2fec7867ea SHA512 b8afb5d2203b19930e8c1eaa3cad331c0df8b8bcffe4b224b8bab549866f53a5f06001d2141a0a8b7becfa8b7c1281ef5d9584423c8ba25dc4198cfaf07d3a14
-EBUILD stem-1.8.0-r1.ebuild 1395 BLAKE2B 5e092a51d3b69ff6a5236d6ada3b9111d322bb4ded72ffdb48a75f0e76da7e8814a96efc3dc6f4dadd5861a964a6435c55e832d348e4f9ce8bee98acefcfee7b SHA512 81f4e627c46daff8a966cf1b99aff6bc474eb43e49baee81b9fd39d51a9d8d85251921245640ce44376bc79e7d422b49fb8bd2efd75d66d3f5ce5bf243851742
-EBUILD stem-1.8.0_p20211118.ebuild 1512 BLAKE2B b39dc1cc632dfe05a10025a40246be18d9adcc38ad3051ee55eb3e3d519cc48794e7a8cbc1c63749894028eae4701b9a53e5fa1f77002528830fa4bc0af16930 SHA512 432d3ca03560a0350e085a8eccca87a38af5e749f51e419fcf7663ed3316ed94374693706029d0f3f7684bbce7f1fc836cd0d3f0bca16a19eea0cf04cdc90131
+EBUILD stem-1.8.0-r1.ebuild 1396 BLAKE2B 23fb075bf4ce30f3ebb1ca1a6b5d3592a421e1d07714e196b88985467055749fd982746458a954f62ab154f5c7db8dda21dc087a82668d61973f5ab599c19d2d SHA512 bf60fa0304b7b4cdd98f9ea6b0196bb760b8a991e1ee9028f145aa190860173e4b8813e072cd24ec134dac85b8d5f37eb8f65558c8880cba01112d566dfdc024
+EBUILD stem-1.8.0_p20211118.ebuild 1511 BLAKE2B 3db0013e2f7ea29b88fa73c11fbd64111af387fba39bd46d07d6c742ca62e86ad3b0c1e0138f7100bedc32f232b38905da2ddf47c74fdde854ceac529fd3fe30 SHA512 6f61b2206770f5f3d861778adb6021e0eb7d78c5ff4e751fdeb8788a179374f9edc375e8797ed6f85993f86c97d411785cdca1d320ad11b66cb904ffa9e01190
 MISC metadata.xml 330 BLAKE2B f529c586660d4a2caa9966961f63ddfbaef18ea51a3f87140869f7b0042d195bf64af087ef13c441f9fd939c8c52d7ba74b3ceb6556b292c0c01afdb0c56b08f SHA512 022b4613382a49849600577afe970f45540c12e4b0eb8a6acc6c79cdb37c1635d890a11640319fca31531821b73338757212952e2ffef121ff4fe96f6f535233
diff --git a/net-libs/stem/stem-1.8.0-r1.ebuild b/net-libs/stem/stem-1.8.0-r1.ebuild
index 33afc5191683..5faf782e56e7 100644
--- a/net-libs/stem/stem-1.8.0-r1.ebuild
+++ b/net-libs/stem/stem-1.8.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{7,8,9} pypy3)
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/net-libs/stem/stem-1.8.0_p20211118.ebuild b/net-libs/stem/stem-1.8.0_p20211118.ebuild
index b4a053ab34d7..76aaf7a77c52 100644
--- a/net-libs/stem/stem-1.8.0_p20211118.ebuild
+++ b/net-libs/stem/stem-1.8.0_p20211118.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{7,8,9,10} pypy3)
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/net-libs/tox_extension_messages/Manifest b/net-libs/tox_extension_messages/Manifest
index 5752c6facf5b..f4321cca1c7f 100644
--- a/net-libs/tox_extension_messages/Manifest
+++ b/net-libs/tox_extension_messages/Manifest
@@ -1,3 +1,3 @@
-DIST tox_extension_messages-0.0.2.tar.gz 21822 BLAKE2B 23c4be3e001420db7ada0208174a667f213e43fc492bd09cc896eba6bd7e0d1fe929f6f4e191e5680901793df561421dd95ebb9804efc1d55bce98483321a077 SHA512 973dd569151fcabee2d31d793fd0a229f71edcddf7470f891b88f0a47e4fc4bc0f9daeb02d37918b5e44ad51e4b4241b8e4723ec9261710dd9a33b37b5e2e065
-EBUILD tox_extension_messages-0.0.2.ebuild 532 BLAKE2B fbea2a01704c7260411e299fda9d6b5a1aea28f2239be2e0f05f2d9fb14f538cb70f3662de0a51fe6f672159c6547436e0a2ec3257b991c75f0ff5abdfd94142 SHA512 189d729326f476d05f2e7ddb8df4974a6f26938b1b7994be42d9791dbc539e34eaf0d7566282abe9c66fd6ba39ff074577204a051e2d3a94648854843fdedf78
+DIST tox_extension_messages-0.0.3.tar.gz 21906 BLAKE2B db04941ce65cf33b6c65571cf7878178842241156342c32faaa6b3b086535eb38e11b8504a6f7b87593915552726d7674471e19c20a41d74d9ee751c40f9dba3 SHA512 71da6b1850d7775db9514ee1e13805e02ef4cae5399369f1e644180c5672c2d1faf7584cd939ea002d7315b36d16233a26697dbefe74bb476c70108db01ea2d9
+EBUILD tox_extension_messages-0.0.3.ebuild 537 BLAKE2B 39fb615c1932924e9bafda4017f9d61157df20433c32e030ab1c7e759bfe7ae67fb251e13321a40ef54261b5ef77c5f82bf219b847172a71262a8d8e4a5ad87e SHA512 016f3cf59841d965dd74e5419f6b495cc829ab9458a5bc31720a528ad55af6d61f370baf382d03d8f07611d2802c9bcb3f4860d75fcc663e2da5243c4aca1749
 MISC metadata.xml 488 BLAKE2B 29247b8ab8d6e88937d0fd2b7f8c4fa0f44cb61ebd70c749d7a32018eda2239e3b98d5402acb0857758164a4351d69e579f3ed8e95da3b3d2c0330ea625b5acb SHA512 7e3a44577f1cd467b027742ab830fa7cd7ed68a1e408665934792b14ac1483b39723c7cb7bf8828349fe43e0b749a2ca54b8db3108f84566159e5d625e9eddbe
diff --git a/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild b/net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild
index 42ade66e6989..ddbba22fc4b2 100644
--- a/net-libs/tox_extension_messages/tox_extension_messages-0.0.2.ebuild
+++ b/net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-libs/toxext/Manifest b/net-libs/toxext/Manifest
index 8d0f38993375..7cf177a62d0e 100644
--- a/net-libs/toxext/Manifest
+++ b/net-libs/toxext/Manifest
@@ -1,3 +1,3 @@
-DIST toxext-0.0.2.tar.gz 34178 BLAKE2B 477a8f70e5b11c2e9d03b8b10adf83f36b95f0c31661cc042d4ab74ee3b6bdc7ed86ab678d0901c0ec6a2466fa698e6423044663d8b6d3b137eee52c2256bc75 SHA512 2e8c326715e5730b0315dbb309d4f6a6965049203579cb500fcac5cf5bd1124f98a8e1ada68e9a65ee572981ae417cb32aa7e99932fedc393da43e2e42f7f6d3
-EBUILD toxext-0.0.2.ebuild 502 BLAKE2B 5da57b1819abde7a4671ea6e7b32111639bea27a61ee342fb47adc057d039fc4ef845133352caf0c98753b26a1717c752f6c97121a9e31126590d1ff88e9dead SHA512 b20cec3d44493a85b76f42eb9835aad7b81c7177cb975cb60f3eaa92daa20b751b9cd9030f5ace52538a08ed32f2dbf7db5cb7d24afcf2e8a18673a37902478f
+DIST toxext-0.0.3.tar.gz 34759 BLAKE2B b33c06bd982888415637a5c823889c74090b7719a03f3e41667ed136e40f87876956f2cb5abb95a53fa1d6a03951fb1fd9f32b8bbe83b03f33fa6f87ab338f67 SHA512 34612e789fb928f9dc79181a61126e3f781ef134d3b5cad2b48c17f1fc3521f0fb6713b0e42e73a789e3eb9b1a566f2d4cbd38a9b26f8f9f6015890be045e4ed
+EBUILD toxext-0.0.3.ebuild 559 BLAKE2B 998a48265a0848f4f9097f66e05c7403f80aaadbcf3f94fe753284dcb20144363141665b688c36c7d81eab66a96ae22993ab155559d82a995d58a1dc63a33f8f SHA512 3904705a28c0b5e8abbab98c43bf4474ba50159d79862719cf46aef694172c5e317c320106c3e6ce6e590d68f76057ca1aebefc591d0b4c96f8c4aade8de35dc
 MISC metadata.xml 472 BLAKE2B 50a84fe144b80bae844a4aa6d6bfa653cafc0883bce40c14e742a73268df9de3709a0e5230fb88d101bde083d94e0311bc8ed3a0e897ff49be5283e7c85b3a63 SHA512 551fd66beb922eef58b866d3a8d5669dca11fcbb53c870f29516a6fae07f4893ed5a73e3d983dc360377f3dc4501e36d077d9bc0061bb93d621d84136e157105
diff --git a/net-libs/toxext/toxext-0.0.2.ebuild b/net-libs/toxext/toxext-0.0.3.ebuild
index 356610149149..83c395524343 100644
--- a/net-libs/toxext/toxext-0.0.2.ebuild
+++ b/net-libs/toxext/toxext-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,4 +21,5 @@ src_prepare() {
 	cmake_src_prepare
 
 	sed -i 's/-Werror//' CMakeLists.txt || die
+	sed -i '/-fsanitize=/d' test/CMakeLists.txt || die
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5fe9028404a0..b5a17f79ef0b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,8 @@
-AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
 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
 AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee
-DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
-EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
-EBUILD webkit-gtk-2.34.3.ebuild 8340 BLAKE2B 20de943304b61764da5a55212e24fc912bf7cf532ca3b85c42fca83c9632005d5f76b9c7924838c8b709648b504b2f098b2e99b58e6f8b7543294b4b209227ab SHA512 59ce1fc154a8c29f00e2c4f63bb4d4efb8a96e4956095e32ace53ece576dbac19ff0033911a32d5166b11caa98ba67ea8d4266b1790e3cb2dcf4c25517e91bc1
+DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7
+EBUILD webkit-gtk-2.34.3.ebuild 8339 BLAKE2B 5a7b27e1a34844b1a46f0abd1803bffc1b5be1131ab8fd294e9e557495c42fd5c7d7d7d901a56df7705424d47a216488129ed2c5d8aa881699e6f471055b9235 SHA512 59a32b79bd5b2f6ab1e029e31ade9428e9103435f952dcfefffa24d8ea5ee4a6ca3343a48482c457656ce96e5ce69ce3550c34997e9317e8811996ed9b80d50d
+EBUILD webkit-gtk-2.34.4.ebuild 8343 BLAKE2B 0ddd8a20f2c1afba0b94fdf03dcc9887407bb754fc38b42f084a365405e965e59f7ba7a4cc83945ab63bff16a56cfef88616b32d2a06a4029f9f5e92ef877d0f SHA512 9c49d10b235e7aff352035df3b3b455284aab0085e1699075562734df2222d58559ac15c8738715ee39361e63877b07d102194417e8f2735ba97cb8538df7f7d
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
deleted file mode 100644
index 7feb2fac42c3..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-
----
- Source/WebCore/platform/graphics/GLContext.cpp             | 5 ++++-
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
-index b217988b990..1ba0eb8a482 100644
---- a/Source/WebCore/platform/graphics/GLContext.cpp
-+++ b/Source/WebCore/platform/graphics/GLContext.cpp
-@@ -28,6 +28,9 @@
- 
- #if USE(GLX)
- #include "GLContextGLX.h"
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
- #include "OpenGLShims.h"
- #endif
- 
-@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
- 
- static bool initializeOpenGLShimsIfNeeded()
- {
--#if USE(OPENGL_ES) || USE(LIBEPOXY)
-+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
-     return true;
- #else
-     static bool initialized = false;
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include <GL/glx.h>
--#include <WebCore/OpenGLShims.h>
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index a6cb56d76a50..940e11a2d115 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,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 ~sparc 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 wayland +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
index 50c1d19b401f..3d7f52870d16 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.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,14 +14,14 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+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 !opengl )
-	gstreamer? ( opengl? ( egl ) )
+	gles2-only? ( egl )
+	gstreamer? ( egl )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -35,10 +35,6 @@ RESTRICT="test"
 # 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)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
 # 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?]
@@ -47,7 +43,7 @@ RDEPEND="
 	>=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-60.2:=
+	>=dev-libs/icu-61.2:=
 	virtual/jpeg:0=
 	>=net-libs/libsoup-2.54:2.4[introspection?]
 	>=dev-libs/libxml2-2.8.0:2
@@ -66,8 +62,9 @@ RDEPEND="
 	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?,opengl?,X?]
+		>=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 )
 
@@ -81,15 +78,17 @@ RDEPEND="
 	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] )
-	opengl? ( virtual/opengl )
+	!gles2-only? ( virtual/opengl )
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
 	)
 
 	seccomp? (
@@ -101,7 +100,6 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:= )
 	gamepad? ( >=dev-libs/libmanette-0.2.4 )
 "
-unset wpe_depend
 DEPEND="${RDEPEND}"
 # paxctl needed for bug #407085
 # Need real bison, not yacc
@@ -148,16 +146,6 @@ pkg_pretend() {
 			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
 		fi
 	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
 }
 
 pkg_setup() {
@@ -169,7 +157,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
+	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
 }
@@ -194,14 +184,9 @@ src_configure() {
 	# 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 "-Wl,--no-keep-memory"
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
 	fi
 
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
@@ -216,64 +201,51 @@ src_configure() {
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
 
 	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		${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_GTKDOC=$(usex gtk-doc)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
 		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
 		-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_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SOUP2=ON
 		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-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
-		${ruby_interpreter}
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
 	)
 
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 98c0a249a330..3e479dd519de 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 EBUILD zeromq-4.3.3-r1.ebuild 1434 BLAKE2B 2ef0bdd7421a2a831b6494b8b4e919f83a4451f2065c448afa780e1740b04b9e3d1fc083af3fcb988f343deb5b55dbb833e2f8e10861b4d19830fc5e987b7d48 SHA512 1e2c77d3150800989e0e32ee8026c7e7523be71f98eb6269e5e2b1963faaa9cb11b50a8f1a6b9ee6df2c0492c3ce3bdbeb7916528dd9af2590bc2df6a5a80bbc
-EBUILD zeromq-4.3.4-r1.ebuild 1446 BLAKE2B 84364a1da2bfdd156c34a83679bcc76ece824e38f3023e2d42907f64c4ab852d7de6e38c1a8007983507bc98502290452f0cdbe80127f90c81b0dcb990ec8ea8 SHA512 c81f69c90a255c9536162774c465415d8133a7a7c03438bc285a0f1519e49816ce35295123cde08d668200d3a48db6e2723f6c804afa4542ae21818b4ffcc0bc
+EBUILD zeromq-4.3.4-r1.ebuild 1452 BLAKE2B 1eab361693c8d623d956fe4e46e96bdb2b9abf72ec39ba9cd39adc27582aec984265cb4a59d2bb8d84f920987f1242f5f8d697eafe5a0225825193f7f7e917b7 SHA512 3f31b3517500a7a08a34711ba69275f06cb106baccb98136d07550dc8028e8bed74acb9fac57caa186cf718ad5f84f183ae346049dcab9c20725afc17fc07233
 MISC metadata.xml 1625 BLAKE2B e8c1e2a40f768db02b55dc045ef54863b8de6010345c78fd9ab42b95890e32aff0bb108d00191412f32aeb201bce16e803838b2b60c22d132f12b6f652129d3d SHA512 1cad56aa313c4f1c5791bc94a5df828b190252ea75c0e3ee39946b49d87d5906b3f1ae5006e03d2693517d31e9950f5d842a393ece44fd3e50024df81c386ba0
diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index 2e385aa17e29..ebd0d6dff9df 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-libs
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)