gentoo resync : 13.11.2021

59 files changed, 373 insertions, 477 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5a205bd39b25..406dbc5536a9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 35e2bdb7b1a5..9337c6a0b323 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -3,5 +3,5 @@ DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b
 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
-EBUILD canlock-3.2.2.ebuild 1094 BLAKE2B 7985854245d18994bf0799d87da999cb3b9967142bf5c1eb6fb7df54090b672882c51f4753aa4ee97037f50dd314f2a83780ee53a6ffe7460b14d2b51a0e3921 SHA512 947e110d369b6f8000fae4d2e9e81ef03039ff1aeeb0ebdfb3b07d3ffe1b48b3ec50b73aee50f64e2fe8f66ea18332cf07d0dfeb7abaebb17fa4a3904542af55
+EBUILD canlock-3.2.2.ebuild 1099 BLAKE2B ca6099a7fbc1943119dd46d2501034d3bee1d845b55d9fe0ff10f9e8cbe0e56b0e7e088cb7138475dc9f6c9441e79590bad03939f341809a1095a8930b69c4c9 SHA512 72c93778a6f2f90c5fc857ef65eb7c8ec20d0642c1bbe1833608f4ed19a05762a25d582f2069a2b3e67273b369b55acc9096b10c7a059ef3b724e809fc0777d7
 MISC metadata.xml 431 BLAKE2B cd7cbf3191ed305dd69b9cb360da7f45d7e5e7656080328c8c152c0b1761e390d2657265bc83093758e3f6628a6a1570080d42b9e432e4b2a900a354448194fb SHA512 e6317ceb5e1fba639fa9c095e726267cfcda9284c0b075a66eca95991bc01a54e7d2891b238e00924127988be5280a6467ddb64fb386e959966d43b5a05f0542
diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.2.2.ebuild
index 4df5cb37ec2c..b073927e1e72 100644
--- a/net-libs/canlock/canlock-3.2.2.ebuild
+++ b/net-libs/canlock/canlock-3.2.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="BSD MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+legacy"
 
 BDEPEND="sys-devel/flex
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index 22875f60006a..819e820acc84 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,5 +1,5 @@
 DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e
 DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315
 EBUILD dleyna-connector-dbus-0.4.0.ebuild 543 BLAKE2B 5ef64cf0c83e989e9c2bf3ade98445568da30acfdb44d9b46e7a7d589550f0ffd181cf1ecdfbe649418637631d82438a770218c18f73102f64fcd809a1d778a4 SHA512 d17af0735d4f1b0590e637c4a9e6c411d3b86cebf4be631f46622a05cb6b22a2be00b07117469f1256b0884cf99a85ad0cc43a9486475b8d438889142baeea13
-EBUILD dleyna-connector-dbus-0.4.1.ebuild 544 BLAKE2B 4d9572d9c91860619a62a0607ce904ba8a7a875af9fea5b897632a880b6cab344cd871416edad4cd7842fe1959b3a6af96fd6881dfd3940d1895414dfb2e8938 SHA512 3f7b5edf72abd2c8e3ef19d1bf85b8051d1a98a5d73904e5ab194d7aa0c31e173f327fba434b7346d4fb68442e2e916b64e0b12d2a49dfc6d6f220e8a1f3700d
+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.1.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
index 6a0c548c7e2f..4b30995f9e4a 100644
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 1e7a57b247d5..22eb64960304 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,6 +2,6 @@ DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf3173
 DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
 DIST glib-networking-2.70.0.tar.xz 259808 BLAKE2B ebd423e9f93fc362cb6cece503de8f579c5c6de460e50f073107017ec0dc35cdd2f38fb780651dc7b68dd833500052c83bfba08e6c4b69c9aca1955f9aa7c7c2 SHA512 c9f8126e3466470ad8e1d588d56b843a4fa4738619a795e6772d95282c54a8356a916a3b0a0b6994606d8a6841ecb0637230f14575ed95ea68bff8f3f81aea71
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
-EBUILD glib-networking-2.68.2.ebuild 1987 BLAKE2B daf6ea0ed66c9b56138edbe6d2fdb418415e080b38b5949098b634392e863b53a5b9fd1cad2666d3f408f7af482b91bd75149d2f72618d90b128ed288e49093f SHA512 6633543f7382e82cdc063590231ebcc5f3b96a82a81903bfc313ee7360d40ce7ef79272ba77d284457ec6872c199fff33a84064516ee5c95825dfdfec5437dac
+EBUILD glib-networking-2.68.2.ebuild 1983 BLAKE2B 21b2aa19571376085bcb9138188a4b743b62f81bd164b800a79d0f13f80925c2471e53a70b0c29430c7e17c5f19ba27c2be1faf383f70f5e20cd1b0131258c65 SHA512 6326da990fb32f4d480bafad98c30255da69bceca9b30c44f958a90c189e4c9cfe144c0482160ebd13d3142c3d96bd3d47f75cfc76a88ca422592bf592a6cc22
 EBUILD glib-networking-2.70.0.ebuild 1990 BLAKE2B ea40834d7f4c62b5b574614f09d13172c98d7b1583d43d31cf18dfd090c62cfb4de3b98b8f9d1c141c2bb4737be4b3d35d7484b518bfb5064092618878ae45c6 SHA512 07c97ce0f54b012fc3865685f55572209a4641dad84072a5044e8a76747a26f136494a106b0b8780508fccb7e1ea2092c912d494de763b907c37d6d792a91c61
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.68.2.ebuild b/net-libs/glib-networking/glib-networking-2.68.2.ebuild
index 1e9f68b345dd..8c43ea3df5f3 100644
--- a/net-libs/glib-networking/glib-networking-2.68.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.68.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 134fcdde50be..8f2007ba7f2f 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
 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 1987 BLAKE2B 36a1b6e308d49be3265b5a455382f39b456cdb61fae02c446c5e11bc5cb827aa3cc5b528b033816453a32d4349bcfeaaabd054eb5d020d6172206ac7fb57a61f SHA512 48cc7f55915f515c2ce3ca4f0542115bb04e18afdfddea4c00b75936010e1c67d3dea4c304a5a6faa1ca184cb5f20d6132c0fe62f9f0bfdd13845bdae0d204e1
+EBUILD gnome-online-accounts-3.40.1.ebuild 1990 BLAKE2B f2004471d4e3833dd66cc76fb773dd920f21a337377974a36383255997721498d1b0947e44646c5cf41bc4bb8ef94daebe782dbcbebff7981c8c296783dbef1d SHA512 60d1f29ac679100fb7d542bc56772743b548145317e9f1849ae74e8af8415bdd0a85cfc12aeeb1bf44a91f77072da04c9893609c3d17177ac98b9cc181a3ca2f
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
new file mode 100644
index 000000000000..f012afee23f2
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
@@ -0,0 +1,80 @@
+# 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
+	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/iax/Manifest b/net-libs/iax/Manifest
deleted file mode 100644
index 04b54f80df4f..000000000000
--- a/net-libs/iax/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.2.2-debug.patch 684 BLAKE2B 6a3ef9e2fab7723bf4397f734753ae8d3abdc091b5df5fb0f1b6cb2066b8966acb3e95b756473d388a007e306e77413e3bd2e5e51bbd1458f0ffadee76b370eb SHA512 5d8299df8c5f73466ee7e9a8523793f787906717268bc991f2f02e63dbe8e592fee97fbee5f227d7e350e7091557bdbae8820f9367b7a1a7de43cff74503c0c9
-AUX 0.2.2-memset.patch 482 BLAKE2B 534d38f9553dcfed0da0eae77e517f4faf5a18546f357364fa5e3cbbfc512cc2f708bdb7dac05cfc1ecb4944512dbed0f4e8f99702807713b466b10ffd8f6812 SHA512 70f98b10b5899326d5480ea72e785038320b22ec3c7ff42015a716de425313c42b79184063ef7fbdf29c1164d0ecf316d2621685065a84fe7f305c7aab2d0a87
-AUX 0.2.2-sandbox.patch 753 BLAKE2B 1bf2433fd6258dbd778bc073b33e07bbae9aa70e33ae9663fa41f573564ed2b74092daaf11df5ac61d9ea491b5a718f8126e7b1017d68a61ab696518d9e25e2e SHA512 b6d726272c62ffdd2c6f8bdc484990ef8ab6a0b9bf4909c896d6d7e41f2df027b6eb37f0c077b39fa05f849e6d5c40a341af2239dc312285e6ef3d3084a1c5bf
-DIST iax-0.2.2.tar.gz 139379 BLAKE2B 6fd4ac85774851605162ad9845c1e847aae7c2e0504f06a302d223ec51d1963cbb1e309b98d5a41ef70e4bf3de88be60a65ad7e8c08e23d73096b43efa7a2a0c SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210
-EBUILD iax-0.2.2-r3.ebuild 619 BLAKE2B 40f95cabf62b3c058f115c7f0ab6ca8e1d4f26a3659b53bd1135ce3f13dd265693b9a7dfac4b6f16fba5a37f385914803ae9b0f715c2e0614fe9c2a6ecf16dfd SHA512 57af3aceea4e035e9a5375d0d3ebf3396ef0baf96d294485bcf9cbf51a73a01e655b1fb78cb7454e8535eb4c293d18a3a35f5e5313608fea59081d8d5b728cfa
-MISC metadata.xml 248 BLAKE2B 65cc35dc772bfe2e25053f3671eac685fbb0af9275fbebc527c5ee28a362d3f4ea1684a2091c5328b14d4c0352b38fbb91dd58fbd0fcdb01c1bc4b6881df4e58 SHA512 49eea9d6ae57cd103f6c829fa7c11a9f9054371c3feacd5f5ad329cf3022dd5fe08574759ef0c415e5e0ed939cf51db27569837346ec84d3e34cac239b8005a7
diff --git a/net-libs/iax/files/0.2.2-debug.patch b/net-libs/iax/files/0.2.2-debug.patch
deleted file mode 100644
index 68efdfdd237a..000000000000
--- a/net-libs/iax/files/0.2.2-debug.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr iax-0.2.2.ORIG/configure.in iax-0.2.2/configure.in
---- iax-0.2.2.ORIG/configure.in	2014-05-13 13:23:35.083867921 +0100
-+++ iax-0.2.2/configure.in	2014-05-13 13:24:25.879870451 +0100
-@@ -25,6 +25,8 @@
- fi
- 
- if test "$enable_extreme_debug" = yes ; then
-+	AC_DEFINE(DEBUG_SUPPORT)
-+	AC_DEFINE(DEBUG_DEFAULT)
- 	AC_DEFINE(EXTREME_DEBUG)
- fi
- 
-diff -uNr iax-0.2.2.ORIG/src/Makefile.am iax-0.2.2/src/Makefile.am
---- iax-0.2.2.ORIG/src/Makefile.am	2014-05-13 13:23:35.082867921 +0100
-+++ iax-0.2.2/src/Makefile.am	2014-05-13 13:24:32.439870777 +0100
-@@ -1,5 +1,4 @@
- CFLAGS += -g -Wall -Wstrict-prototypes -I .
--CFLAGS += -DDEBUG_SUPPORT -DDEBUG_DEFAULT 
- CFLAGS += $(UCFLAGS)
- 
- 
diff --git a/net-libs/iax/files/0.2.2-memset.patch b/net-libs/iax/files/0.2.2-memset.patch
deleted file mode 100644
index 08408eef98f7..000000000000
--- a/net-libs/iax/files/0.2.2-memset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr iax-0.2.2.ORIG/src/md5.c iax-0.2.2/src/md5.c
---- iax-0.2.2.ORIG/src/md5.c	2014-05-13 13:26:51.570877706 +0100
-+++ iax-0.2.2/src/md5.c	2014-05-13 13:27:08.567878553 +0100
-@@ -165,7 +165,7 @@
-     MD5Transform(ctx->buf, (uint32 *) ctx->in);
-     byteReverse((unsigned char *) ctx->buf, 4);
-     memcpy(digest, ctx->buf, 16);
--    memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
-+    memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
- }
- 
- #ifndef ASM_MD5
diff --git a/net-libs/iax/files/0.2.2-sandbox.patch b/net-libs/iax/files/0.2.2-sandbox.patch
deleted file mode 100644
index 2dc141a73b18..000000000000
--- a/net-libs/iax/files/0.2.2-sandbox.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr iax-0.2.2.ORIG/src/Makefile.am iax-0.2.2/src/Makefile.am
---- iax-0.2.2.ORIG/src/Makefile.am	2014-05-13 12:45:58.343755528 +0100
-+++ iax-0.2.2/src/Makefile.am	2014-05-13 12:46:30.044757107 +0100
-@@ -9,10 +9,9 @@
- EXTRA_DIST = md5.h frame.h iax-client.h iax.h
- 
- install:
--	mkdir -p $(includedir)/iax
--	install -m 644 md5.h $(includedir)/iax
--	install -m 644 frame.h $(includedir)/iax
--	install -m 644 iax.h $(includedir)/iax
--	install -m 644 iax-client.h $(includedir)/iax
--	/sbin/ldconfig
-+	mkdir -p $(DESTDIR)$(includedir)/iax
-+	install -m 644 md5.h $(DESTDIR)$(includedir)/iax
-+	install -m 644 frame.h $(DESTDIR)$(includedir)/iax
-+	install -m 644 iax.h $(DESTDIR)$(includedir)/iax
-+	install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax
- 
diff --git a/net-libs/iax/iax-0.2.2-r3.ebuild b/net-libs/iax/iax-0.2.2-r3.ebuild
deleted file mode 100644
index c8255c09a37f..000000000000
--- a/net-libs/iax/iax-0.2.2-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug snomhack"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-debug.patch"
-	"${FILESDIR}/${PV}-memset.patch"
-	"${FILESDIR}/${PV}-sandbox.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug extreme-debug) \
-		$(use_enable snomhack)
-}
diff --git a/net-libs/iax/metadata.xml b/net-libs/iax/metadata.xml
deleted file mode 100644
index 5d0406fe1093..000000000000
--- a/net-libs/iax/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="snomhack">Use slower memset for SNOM phoneem</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index 1fcbf3f6c1e9..2939bb170903 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,3 +1,5 @@
 DIST kdsoap-1.10.0.tar.gz 1399777 BLAKE2B d04393e34536eca43edb612339cfc40ff024849b74231d472f9936d86172d299f973e4140ae2bde363dca441e26016126db5f0782807c3d5598543ec4afcd737 SHA512 c0e0108f74e5d4075a71369f428862b7f3eb6a7b1968eea7a7b01f4536d999468a7af8013be722c02b303a0580e7cd649fe78c1588f837405ede4bb753fb56b7
+DIST kdsoap-2.0.0.tar.gz 2916527 BLAKE2B 7b9cf71b181b88180fb00cb2f0c2b84b5fd7d997531aa68957a84811959befd9c8909c8892d3b60d47a654916fa5b8841fa7b389a006a8ca6a2cdce98a433cfb SHA512 50305866595048e0ec6cd6dabba9e63a948f1e1263e7f03e9e3bc56f09a843bade944df95b5ff57d4fc3a62896e72f02b0d7b3d5cc2be2823da67001ca459428
 EBUILD kdsoap-1.10.0.ebuild 904 BLAKE2B d95f8dd776d6ffa3adb844c2930a147e91e8e83c11edce0310dbed7419b5ce3aeb188bc4c4a4935b15e1d18de8f975df4140dc58335154c654b6fc4fc72faccb SHA512 3e4ad0da6ecc4b092e74d5952b5092a1761aa11adcab837e490d5ee9c3086879a417fa73b0bcf7f1d2548fba97d53cd01802627a3f00b72dcc1af73fb48facba
+EBUILD kdsoap-2.0.0.ebuild 968 BLAKE2B fb05ba7f0bf3759f3b37697ab2dcbc844401a4034281bd20ef24e25a64b2927dc4ba14645988fd1fb44da56813993ecb69f48cffd4f776c2b83fa27b482e3dbb SHA512 da9ce6a77198f5cded52e487dbf3e29f9a59827fab9af063053e3cea881b94fb88974e5b5a08d5a7488079deaa4768923de25d0f6242053218046b371d1c0702
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/kdsoap/kdsoap-2.0.0.ebuild b/net-libs/kdsoap/kdsoap-2.0.0.ebuild
new file mode 100644
index 000000000000..5c37b52bcec6
--- /dev/null
+++ b/net-libs/kdsoap/kdsoap-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+else
+	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
+	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
+	inherit git-r3
+fi
+inherit cmake
+
+DESCRIPTION="Qt-based client-side and server-side SOAP component"
+HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
+
+LICENSE="GPL-3 AGPL-3"
+SLOT="0/2"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDSoap_DOCS=OFF
+		-DKDSoap_EXAMPLES=OFF # no install targets
+		-DKDSoap_STATIC=OFF
+		-DKDSoap_QT6=OFF
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index df04963cb225..37b8d0152f01 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,4 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r4.ebuild 2621 BLAKE2B 0585d412d07d38a2dd1744dbd539894c5a4e3d3391d5933464494420e1302cd7d935e39ae16d05bb12fcd9769cd2d1bd4ee15d2bf8e80132ab5ec95a83cd1b69 SHA512 26f81bb4f48a6c1f9f8ae7bf5fbcafc4fcddc1efbf14d34bfd0138cbb75449408731325bedc7179f093861e05696a518de3a7ad877cbf92c26110d3ed2a523d9
-EBUILD ldns-1.7.1-r5.ebuild 2619 BLAKE2B 1409064f86a26ec111c24cc6e77d719fb18ce522964f16710535f1b3ecc7afdadb2c2769dc836e2b13d74182282a88676513425159d4d14055190099f13ba258 SHA512 2da17642e790b55170b91ae4a199707b8a32586b5bc8da0dde2615082fb96d46cc767167571b19fa7098638370c0b769dd6307ae74486584753a580b5709c2f4
+EBUILD ldns-1.7.1-r5.ebuild 2618 BLAKE2B 45660918f86ea19a7d6fbec418c642bdea4e74114b35558f1a183baed4b5cbc17f3c7364c40d63d8b9c50d3158825811c11c124557b46e2e00185488199e40ad SHA512 c6b4a485068fdc10b459be1d88e22af98e0f6a140b20edcf3bae438fb22146fcad5f424f9876559210b7e0eded08334d89fd26ade4c3a705b1f741e217e27d29
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.7.1-r4.ebuild b/net-libs/ldns/ldns-1.7.1-r4.ebuild
deleted file mode 100644
index ba6d831e94aa..000000000000
--- a/net-libs/ldns/ldns-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit epatch multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ecdsa? (
-		>=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
-	)
-	ed25519? (
-		>=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
-	)
-	ed448? (
-		>=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
-	)
-	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0"; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable dane) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		--enable-sha2 \
-		--without-drill \
-		--without-examples \
-		${dane_ta_usage} \
-		--disable-rpath
-}
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	# remove non-existing dependency for target packaging/libldns.pc
-	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	find "${D}" -name '*.la' -delete || die
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild
index 222ef53fab5a..66e436d22ec3 100644
--- a/net-libs/ldns/ldns-1.7.1-r5.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost 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 0dd4a4197243..073920352e79 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -4,5 +4,5 @@ DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a
 DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
-EBUILD libaxc-0.3.6.ebuild 1343 BLAKE2B 7f02ed46dd870dfce8e6bf54d89aab586fea370583129ae203d1a3bacd51cbf0ef76994a25457ca0c8131180fd32758d07db1cbf6611d3726f52d56475399244 SHA512 b5371a8f15a8e034d506db0009b4d1daa9c8bc8d96b9a5e8002b638fa9e9a3c719781b7228672468c3044423f9fc6c3bbeabca246140b955219cde3974f1bf90
+EBUILD libaxc-0.3.6.ebuild 1498 BLAKE2B 895c99d15610ceaebfd12ea57b776e52a41dbd487615d5683eef5da36a7f40a15c44b40ad1b72dcd3de87f3aefcde5c45fafa92e985f2b4a1383f1332537212c SHA512 17ba494678d9a7f4f590c62f1dadfa67f6b46b3c1115fdb326afa5812c81da1dc7591a0354e15675bc77289b7d2d53f0a8bf923163601209703495a93dc4432e
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/net-libs/libaxc/libaxc-0.3.6.ebuild b/net-libs/libaxc/libaxc-0.3.6.ebuild
index 6fe97dd4c072..013ce8f510cb 100644
--- a/net-libs/libaxc/libaxc-0.3.6.ebuild
+++ b/net-libs/libaxc/libaxc-0.3.6.ebuild
@@ -23,9 +23,9 @@ RDEPEND="
 	"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	test? ( dev-util/cmocka )
 	"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${MY_P}
 RESTRICT="!test? ( test )"
@@ -48,24 +48,26 @@ src_compile() {
 	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#L154
+	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 "${D}"/usr/{lib,${libdir}} || die
+		mv "${ED}"/usr/{lib,${libdir}} || die
 		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
-				-i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+				-i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die
 	fi
 
 	einstalldocs
 
 	if ! use static-libs ; then
-		rm "${D}/usr/${libdir}/libaxc.a" || die
+		rm "${ED}/usr/${libdir}/libaxc.a" || die
 	fi
 }
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 0619708ae278..94d24ee8779e 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1,3 @@
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.4.1-r1.ebuild 1131 BLAKE2B 0853429474b39c874506f36a30530f688fd4a0dfce0a21779a0f60cedd6f0721758f1acdc336aab9bf8b66ad91472fbd2b1a81031ac72ccb5e2cd1dd6b24e798 SHA512 b630c353cd14c48a907f9cd4e5e603f13200c3483319619e7bca6895191b0fdd47aa4685ec41064e1745ff6ca91ec2b94687aab6fa05530dc7d7febbd9632b0d
+EBUILD libdom-0.4.1-r1.ebuild 1136 BLAKE2B d3d15c3e3b55b3fde3474695bcf16503ecb6389496340dec419442d722e2f87a4eb41d6f2b44a7e1e42fba8835417fe95d8c134bab582c886fbb96eb14264cf2 SHA512 42b739e8c2e72bc99844f77a74bdc3518265ddd726dc3a5e74bb3c5cda2b327233e5fb13d768e0087475d605dced0fa6240074860765bd39630bc6df5fcf76f5
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index bbe71b65dfb2..7cc2bb687a41 100644
--- a/net-libs/libdom/libdom-0.4.1-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index 9ad11093a08c..c0ff489fff12 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,3 +1,5 @@
 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 1227 BLAKE2B 3d3d90f151862104aa87ccaf829bcab8b3cac6185494f065aa2be3009113c40c47c0e2a0dd8e1d7256d0b770a0b811f9641b07ee57a48d0e037f4a876b4df5ee SHA512 b1d53b93e2908b0e7bb82b2f71d729a5fbd2c5e2ba191f189fa1a2465743f9c4a5a34a7ae94a3419021ae56a7e45dab338dc58a939e3fb1002a02ced3868ec15
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
new file mode 100644
index 000000000000..adc704afe62d
--- /dev/null
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
@@ -0,0 +1,53 @@
+# 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
+	# https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/10
+	rm -rf "${ED}"/usr/doc
+}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 959c3fcb440d..c79211140eb5 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
-DIST libktorrent-21.08.2.tar.xz 607048 BLAKE2B fe095e15c0b3bb522a9d7b22e03962051b2314696fc25744caa717af60ec0484f112f61213babd72d267420c6074b7c735dedae0d27f48a6ea5b41ed35e9b9b6 SHA512 84d3e59b381d7bbb4515ae4bc989110adf955603a9dbf0970ad47311a4e0c3dc4f20e52752e1d3a33374e46353149da88507014fc096f5643691485b55db3781
+DIST libktorrent-21.08.3.tar.xz 607028 BLAKE2B 1d0a1c2ddb406e709669bc0adb9812c510d8e02c9b325a9ad41d8523cf29bedbbf6d8209151fbc119412b239cf9a8b2907e34faf4c992f5f2f0bd10235f7cf2f SHA512 7c07b470b447497adf8faf0f17004d88130fb243682e28a34b6b86c1520e3cf09044401707f0014a229e589a93caf67efdc83f711580979e6e9603fa3892c5ec
 EBUILD libktorrent-21.04.3.ebuild 1437 BLAKE2B 066e9af041e881c1a4e45c69cff5e671eba2f96933dd1d3054f06895a3b662c18baee17407f77ce9136ff7551d50ada8a77b414046a2a9fc9ecb16141e30a883 SHA512 7c6ff4abd4bf4a2baaf131cf10c353f5a78355dd2930e61867341fd9bc5f48ad20f6122604f46f6df26ac83c595e6319f544135807aad5a1acdf5b350eddea09
-EBUILD libktorrent-21.08.2.ebuild 1454 BLAKE2B 53f3c39d69d59d343190475829e4ef5f83a01d2b3a11ac1cbcfb6039ebff664ac43fffcdd2a24051c18d43d9db538de1a7af1d07e967b88b7057224f745a9918 SHA512 7c28bf7a037cbf669c3cc299066bf4fb7966ce615ac0f1bf99afd5d8ff850ef30414ccf5bfae5fefd2f889e44427c0523598ca5d0ab7db7a027ba1d2cc4851a8
+EBUILD libktorrent-21.08.3.ebuild 1454 BLAKE2B 53f3c39d69d59d343190475829e4ef5f83a01d2b3a11ac1cbcfb6039ebff664ac43fffcdd2a24051c18d43d9db538de1a7af1d07e967b88b7057224f745a9918 SHA512 7c28bf7a037cbf669c3cc299066bf4fb7966ce615ac0f1bf99afd5d8ff850ef30414ccf5bfae5fefd2f889e44427c0523598ca5d0ab7db7a027ba1d2cc4851a8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-21.08.2.ebuild b/net-libs/libktorrent/libktorrent-21.08.3.ebuild
index 29b3a843561b..29b3a843561b 100644
--- a/net-libs/libktorrent/libktorrent-21.08.2.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.08.3.ebuild
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 16f04e301723..8f33268eb0cd 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
 DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
-EBUILD libmbim-1.24.8.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
-EBUILD libmbim-1.26.0.ebuild 742 BLAKE2B 7a83b515052c2d890c885bd7a30dd3b929bba25f48d2e4dc8822caa894a048b88e479ad263dcecc535aa10cfb0986a145c8e281f3197330ee89a4ddb425c6593 SHA512 4b0b2c4b3107a53cd61f28f8a8feee7595dc697e6dd6891d587132100dc42fdf1e7f32ba05a7785d5abf1c77f6bd5cc99f113d014e1b25f1997d9a93eb281e9f
+EBUILD libmbim-1.24.8.ebuild 889 BLAKE2B 4c377286bb2c5a5ca3e0b0937913329f01fa336e1f94e785d70b8ff93b785b4eaea1b8e72af50606c11a4867d31a9fbc0d587a2d254ea0feb6404765775a4f83 SHA512 622e5f13c75da85334d193b9da60033a6f3af3d58147cc4b8eb31597e93647bc81941a8f694fcfdd634df913625d33103c4ecd1a6375720779199503a47a4679
+EBUILD libmbim-1.26.0.ebuild 811 BLAKE2B 216c3f07fd9d6e69beb873be60b667e264ab1ed29ec7073d1191ff0e86dd3d4355801c6936ceac2cf851864ae364f74d60b862ecb7f61da1d7c2785ebe6c23e6 SHA512 36237cbab939734a660edb5d231190ee36f5e6e9aebc748edd9d3f98368d3109a2f3232bf84eb6361f810f09144518eda07012fd09fb56f0eb6e2b5a475cb632
 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
index bbdba255bb73..141c3f44d2fc 100644
--- a/net-libs/libmbim/libmbim-1.24.8.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.8.ebuild
@@ -3,6 +3,9 @@
 
 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"
@@ -16,6 +19,7 @@ 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
diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.0.ebuild
index c8ff42b974c7..1ff3ec9dae7a 100644
--- a/net-libs/libmbim/libmbim-1.26.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.0.ebuild
@@ -3,17 +3,21 @@
 
 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"
+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
 "
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index b629472730bb..1f6844814df9 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,5 +1,5 @@
-DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8
 DIST libnetconf2-2.0.19.tar.gz 300454 BLAKE2B 7ff97dcc964124f93631b2fe08f9f713deb698e7d591ca245f9638f32a19915ce6e8cf9e7170bcd6059369926044a705fc03ef18e28baba8eef1c8296bb52d8e SHA512 0e53d4803b8a5d3ff041b393487c71ca09878fa47cbe3ac4d1f26cf45f2ede80992964e339747435003c3bc61053f4b6297a29d6e2a5511ba6b4e93edb3ce136
-EBUILD libnetconf2-2.0.1-r1.ebuild 869 BLAKE2B 2f2150c03e6925592a92744d7628979d6467a7dce3f887cb23613dd365de45897e8a7507d0d11764e31bd40a0905899d6140fecef7da42cbbf8f0627f0780d5d SHA512 6391c8af3972977c6fc490aebeec6b138de89eedeff3e53f0afc7aaeb02cd1b0fae2a1d66592b99751674ef87d62022ca83a167de55d074ee975fe00b533a61b
-EBUILD libnetconf2-2.0.19.ebuild 896 BLAKE2B 4d719a32be4ff4f8b4409a606b43ebd846e7eb2205b95b941a280b37f6220d68a7df3d6ffbbb4f131cfd597bc2425573c8d39c92b92a096b9c12b96f2a0af2b5 SHA512 89346ed43e15f733035e9e94ed6a4f3bb04bfbef3da648a8f0a2f1e91428d1294c230e816b08b0423d48b54712844a81b85334064897c90d7e3d6f8d5c9535dd
+DIST libnetconf2-2.0.24.tar.gz 301111 BLAKE2B ffc4dffd797e4589a5892f3cf80d6a373808ee48c00e46a37ff02082c721c49b27aa06962e962698d3b443e08e9cba55b4205cc6e76958df325c6fc5a38fed22 SHA512 05cba691bc47e49abf747a36a6dcc978a4163fd155a90609315585201e4e4d20c9a30b683180f5cf03aac5b6a37933917e61a895067dd172b8de2142ec542dfc
+EBUILD libnetconf2-2.0.19.ebuild 894 BLAKE2B 2e0553f71ded70f135b41e30660e5598b1ddcc72f2e6840737e657cb879ad63ac7d00dbc53d5c6a190100d92b280a345eab173985f456d049600db8ae5eac047 SHA512 c4884bd12a3ef1e6ed348db538d08df3c28dd4573e42f82a6b42514cd0d7148c98344449deb4080ac887f333e42e5b2f1586923d6979cd8b296e4eec188f07a0
+EBUILD libnetconf2-2.0.24.ebuild 897 BLAKE2B fa005fddafe80431862a960dab2e39b4dd87c418be46a802655cb069d251f93fd8684a3d6d12f4284b017d503d9075fa70c7dd2e8445f2cf9d54a431b80840c9 SHA512 65295cf255efc9e539a7dbbc60485f2a8aa5a914451d59ba656ba430851193f72315ed04c6ea1e1538d48a1a2f46d69178260cfea7b088162f60ffa65d905527
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
index 1df1180684c1..d5a64fa35f35 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
index 8e82d2ac9428..831ee0c2cca4 100644
--- a/net-libs/libnetconf2/libnetconf2-2.0.1-r1.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.24.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,13 +11,13 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/openssl:0=
-	>=net-libs/libyang-2.0.0:=
+	>=net-libs/libyang-2.0.112:=
 	net-libs/libssh:0=[server]
 	virtual/libcrypt:="
 DEPEND="${RDEPEND}
@@ -28,7 +28,8 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_BUILD_TESTS=$(usex test)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
 	)
 
 	cmake_src_configure
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 3c0b6f903f4a..65e97015c475 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
-EBUILD libnma-1.8.32.ebuild 1638 BLAKE2B 66a65be1fc8dedcf3b706b390927c53ebee200a263578a321759fa63bc321101fc8a10cabcd08034964ea73e97d9a90f47b03db81d2dbeb0db9b8431ff7c6bb8 SHA512 3bd09abbac973a14e36c659ab1143b3649431fbcfc76f5eff67f813413827b0eade0f9c1f13688934061d652f7e7cb33365df4fbef478570f16d6d53f7d62f33
+EBUILD libnma-1.8.32.ebuild 1635 BLAKE2B fd9303968c9a11ebe42c78e3a7051551846a4fbbe8c008958dfea309a00f68df84e0087b254a8d6119e327af9b4345b39ba4f7857ca205e08c11bcc13896a6af SHA512 eb8e17dda8ea25810992607c873d6d32a79096767ae454b2c71d75f127e6057464f1a4d7143c33617a024ae2e7eefd7ba98891baa178092f5e29d541f0cdea73
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.32.ebuild b/net-libs/libnma/libnma-1.8.32.ebuild
index 31f1f06cd5fc..833172369816 100644
--- a/net-libs/libnma/libnma-1.8.32.ebuild
+++ b/net-libs/libnma/libnma-1.8.32.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	app-text/iso-codes
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 6bb6a4d23156..ab97f362fbf5 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -3,6 +3,6 @@ DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a837
 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 1239 BLAKE2B 0d5d98dd53f5960a7acaa39d1d58086e2c32195874822597e5186dc02556ea2c3f9eb4303d37e0961977d7216467a45e56689135b073ce62c6e1a2025ea3ecc7 SHA512 1e5d48a6a39d06c4eae3d331974a4eab66e8ab917a21d1c04e0c12ed5a5b795d8cce26a412338eea1b16bfa8b9cac739e69c38c17b1e5bafffe969d480495581
+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.30.2.ebuild b/net-libs/libqmi/libqmi-1.30.2.ebuild
index 1b3b91f83b20..4a0b1ecaf100 100644
--- a/net-libs/libqmi/libqmi-1.30.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.2.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index f845a7fed0a9..3ee65360c6dd 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,11 @@
+AUX 3.0.2-fix-leak.patch 797 BLAKE2B 9c4adbb52f79a84dd9e31c2473c502f55b0c33f10a8a18754bd36d83a3290b93bff918780bd7ff1ef70befb1f597736b4ca049d373a0b86d6ddaa800a7d7ab6e SHA512 b89195e2a886d0f0e8d324439f327bb9711294dce244c696313704fa9d2c6726063b9bc8f0239fde099106b97bbb0d7307ad6f5a004ce0c43ce3cea7ed0c3e6b
 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.0.tar.xz 1498224 BLAKE2B c03b817a7a7f708480581aad258e5e24c541c6c2f39e48c51597d67c729b3a0722ef094916ad841904a0cafc67f12ad20d05b74ac41aeb174cb79b49fdd0977e SHA512 d78374c31631d7d1fb30ceb7c6016ab970cb321b06191d3463f178ceea9dacd08c828b8f16f5a30c185489ebfbc93ff9da09ae4978be3e3ff11bf7ee95a2a9a6
-DIST libsoup-2.99.9.tar.xz 1514372 BLAKE2B c7c708e477e38fa03d19e3a35eb99a6183774275ed0e2c00a1c62c238ca932e62aa71713386010b36a3c7aac1c78ebc3555635a2e2db4c68406e25510432db62 SHA512 77fff5c4d72bd5acad5b9b4a312cc999b960d6eb7e4715cdd2571859a0ee888988fee12bd46684ca948993a2308f10def1141fe3e3137ac9cce68190222ee858
+DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B 6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641 SHA512 107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b
+DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
 EBUILD libsoup-2.72.0-r1.ebuild 2935 BLAKE2B 4d611b5f77df37809765846aae89afe31af53b0d4dfb9b39e45e62dc9b91007442180b92c57e4cd57547d904ff3e6db9ab3ec5cebadbe54f10ba4dbd32ec70ec SHA512 b32dc99e460e040a6aa710d80363dd2fb5f462a36c1b7b79defda746456455e7b1cfce57f68a6bd6f7a940fb917e1ef5c1db1b538bde0637ce8cc0f7b20133c9
 EBUILD libsoup-2.74.0.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-2.99.9.ebuild 2990 BLAKE2B 1b6649e1e2ae0a2e95ef95c49d3b95bbd6fa49dc3e3f6d9006c458115fd634bf5143de8f361251a5978df82822ec7476e86da547217b5c81a0b6fc086a07d493 SHA512 fd306261c940b352c8d08c7d8fc150efa343b86760a5807e9187dadc3628c9721fe738d60f66273c2bdc75472ba3053a87bdd23b1f17ed8f92805e4ec81333a4
+EBUILD libsoup-2.74.1.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
+EBUILD libsoup-3.0.2.ebuild 3035 BLAKE2B 76c45192ef31d286e1d6a788a9e6577894462e970b4efff699370766a3e0f033cff526ed00ab2d8a8816158c78e98c1605e86c82ade2bcfe561cf409c48facd4 SHA512 7e7e5b1ef8f5e0bac799000800c51b053db67eb4c2a045be5c5f358e4eb710b5fbdcedfea5a5c71021a124696e9e9b5f1829361049edc513b3b21d3be76d42e5
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch b/net-libs/libsoup/files/3.0.2-fix-leak.patch
new file mode 100644
index 000000000000..cad804a7a038
--- /dev/null
+++ b/net-libs/libsoup/files/3.0.2-fix-leak.patch
@@ -0,0 +1,24 @@
+From c7e251644c618ce5193881b2a16374ababc2ccf8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 11 Nov 2021 16:47:34 +0200
+Subject: [PATCH] connection: Fix memory leak in new_tls_connection
+
+---
+ libsoup/soup-connection.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
+index f2e35f47..38a91e46 100644
+--- a/libsoup/soup-connection.c
++++ b/libsoup/soup-connection.c
+@@ -585,6 +585,7 @@ new_tls_connection (SoupConnection    *conn,
+                                          "advertised-protocols", advertised_protocols->pdata,
+                                          NULL);
+ 
++        g_object_unref (tls_interaction);
+         g_ptr_array_unref (advertised_protocols);
+ 
+         if (!tls_connection)
+-- 
+2.32.0
+
diff --git a/net-libs/libsoup/libsoup-2.74.1.ebuild b/net-libs/libsoup/libsoup-2.74.1.ebuild
new file mode 100644
index 000000000000..5bf1131885f8
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.74.1.ebuild
@@ -0,0 +1,91 @@
+# 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.99.9.ebuild b/net-libs/libsoup/libsoup-3.0.2.ebuild
index 9c73bf6e9873..42bc6d7a2963 100644
--- a/net-libs/libsoup/libsoup-2.99.9.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
 
 inherit gnome.org meson-multilib vala xdg
 
@@ -19,10 +19,9 @@ REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
 	net-libs/nghttp2:=[${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}] )
@@ -42,7 +41,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
-	test? ( net-libs/gnutls[pkcs11] )
+	test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
 "
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -52,6 +51,7 @@ BDEPEND="
 #		net-libs/glib-networking[ssl])"
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-fix-leak.patch
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	"${FILESDIR}"/disable-apache-tests.patch
 )
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 8b00eca562f8..45c9ae27e507 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,6 +2,6 @@ AUX libupnp-1.14.12-disable-network-tests.patch 416 BLAKE2B d1fea0b8e0abba960cd5
 AUX libupnp-1.14.7-glibc-2.34.patch 1409 BLAKE2B 2734fcbcfb4414469cf80eb9846d5574ecd436cb2b3a3b6344926d630c0850b108cf2e758a6e285a7a685587a05c46cdd958b2ef8f277732f272022309ce6445 SHA512 69e9ecd32f5510fead3eebab1343c01a05c7f7c8dbc66c4a09884805d4b51309f5111aaec6f44f2a169deb990d6df9155ae93aef1de5e9e23986c9023daa8b58
 DIST libupnp-1.14.12.tar.gz 788299 BLAKE2B 721c10f9fa4ffc60743b4ebf8be566ea595931cb1f2a2448d8e3cecfc787abfb855cb16256eaaa10ce6a901cd5e5b3d14672610841b2a718d5dd003ccfd3c2f0 SHA512 aab17aa12f15d110bfab20cbcbae5f54926b6ca7a30bce10b9287cd39919a06a5e9f1493405e1d561c0d58ba46926f87009df891e4e4f37097df1c3c67635ca9
 DIST libupnp-1.14.7.tar.gz 785084 BLAKE2B 539388737dda0dd037cb50fbc1cca8bcdc43d1d706bdb7da19d1a184cfd61f3d585d9beef2a9c8c33f2cb2640a8479210ad6c358abd7193f304509df574e912c SHA512 92dd80d1bbaa64e6d3909c5bce73d0340fcd3a3c1d247a634bd48ec077ba0ce0b8224d1a670a66f6a8c591e31a54f15526071d62ae5460e85d582d7b6b67c674
-EBUILD libupnp-1.14.12-r1.ebuild 1118 BLAKE2B 25d08965916c376da7ab5db71847e3e2b56c3820c16c2ee2961b15e8ca86fe92f51ccb35b15f257437767aa023f08d620e38f5a974eb17e1d03852b67266457b SHA512 308a1c305a00da7e503c8a13876fa89a1986b2978285bd44443b8301d6e3796a7b2a7511baee5055f5413581a4d3247d05191720ea43823d9e570497f9eb7253
+EBUILD libupnp-1.14.12-r1.ebuild 1111 BLAKE2B 57ed54cef9d08cf59d5f1c66e48392fe0e9cfc6ef8f8900fc0c9a5f905e392fde0f23125622536b55804d8175ecc0b3238113c005fb46cc6ae12ea7840d96c84 SHA512 da11f5c300e685ee8bfa8abab8e71e876fe5b16d0e713658345e34bce7a0190690b611b9cb7e92a7325e0fa21b35e9285d5ff1e434d99ee33fd10aae8cda51f8
 EBUILD libupnp-1.14.7.ebuild 1147 BLAKE2B 5adda59b43d307387ceaebdb7b47c444d7a6b88d32871a3f020ad0f461665d0134602d1d5e7ac14cc0a8c7d2a4d2ad820b510765c9dea4e4261f96ab9cefeef0 SHA512 e62f7cea7a828a87a22aea7ce2003f71deb05aae3e49def0887f2d0052dfb57325f3d6c8da8ce329e8435780e8fe4a3e04a82cc9a36ee91e2ea4d2824033fbc5
 MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
index 5eac7976b3d5..fc9560d1abf1 100644
--- a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc +ipv6 +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index cbd3f1cfbd44..9bd24aeb7088 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST libwebsockets-4.2.2.tar.gz 14589100 BLAKE2B 371bae4790e92aa4f48e51b40fbe2e4efc3b885e07740db14c96146eb857616fd3f7a1b6c83c11fded2791b1db59cb1f6761bc4eebaee918ada7e9bcf4be52d0 SHA512 52d9b4511fc484781108a3036f870905d4427fcbab02f3e84ee38f534ae7d1979c2cc3eec0719f4609226d4aae788a79fe7d99a8506537bbcf8fc3d9b8a7b478
 DIST libwebsockets-4.3.0.tar.gz 15605272 BLAKE2B 6ea48fedf3755f55885f32bc289513182cf735472c161f15d720a76ddfa54e5e2c2d93a343f98d941d14b88f8ca8a13039922f8669b85562c5c0c4312f878b98 SHA512 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
 EBUILD libwebsockets-4.2.2.ebuild 2346 BLAKE2B 7e0f277a5e9d8bcc6dc9f6377341eb00e4dc6d0dd566e374bb1d4eaac0d0c422f03a00d72cc7cf722d2fdab44fa0d5aa3fb3d83b8646404f6d23e25095d25ab5 SHA512 2dbdbf89687faf2aab61532a31a7a955bc66f19987447f02ebd9e778e1a2a235db5b26e4aa6d2b5a7e9f43ec514c3eb3be7386cfb52126b5a2dc0b1cde79e4c7
-EBUILD libwebsockets-4.3.0.ebuild 2307 BLAKE2B 246c5d06dea98489500d605be92d94a0863f0441ebd7f12fb60d4a4365447b24169da230f5217901279a26580cc340bbfb66794d90204a177c77d9ef57a6ce1f SHA512 c9a1e99b753bf0807206473875126bcdd8275cc3727d2b3eca766256b2f7e0ba503b44f6ec5fbe7559c3325b9a1b1ea497758102a081b72b5df00af9800a237e
+EBUILD libwebsockets-4.3.0.ebuild 2303 BLAKE2B 9baf0748508a40ba4ddbf4c4fd668dbd39213ebbb16d3bc1c638d776a8994d6628f09ed8ea5547421d8672aaa9ae7ba746a8c2fe32635bb77895a90e6ef3dba1 SHA512 0c238c76c62ba26a8043b32b2ab9826fd017164ff8e8dd2befe9d2be61eae0386a86dba68162d5e95b6bcdd84ed9d13a4c34c447ef5222b67b6b64b377dbbe6a
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
index 5cbde19d38d8..4c2792012f7c 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 828812cae649..dd827ed83888 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
-DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
+DIST libyang-2.0.112.tar.gz 1075308 BLAKE2B 13c5dee1817f93ec24580d24cfc5d1c066de54dec3d1de60e6f7d67caad527b13e40864301d5e5086b3d92b8769e200674168dd874bc2c786bd5101ec3aa958f SHA512 5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db
 DIST libyang-2.0.97.tar.gz 1066042 BLAKE2B 24ad593b4d4db2c54bf083d3f3469b17de8734aded878d167e383a5e7edb964706a48707e2f0847c7cd4f613b6c1e298325710c4b074f4a3fa1102e22265d632 SHA512 f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389
-EBUILD libyang-2.0.7.ebuild 859 BLAKE2B f345194439667bb94805b8784dea62a468ca6088141d8bbd64ea6fe214f4356ea541bdbf312f0ecb0f4f91812d003f0da6c597cf19c6ceebbb335fe2c0fd78ed SHA512 53e452b5b181e503941a8b44f3fe8af29c58e8603090f821d953afac2cf4b6f6d7126b1f11a55a146bf2630ae5a611c7a9dcb90199b9d3f9c34d99762aec92f0
-EBUILD libyang-2.0.97.ebuild 885 BLAKE2B b366c7331f3fc531c9d2d7fe99628e47fa17db3af8d6d112aad846e19bfd727a3865d91b9795d967b836479a5d29a9ce0811fd738d61a71f42c881aa6f229cbd SHA512 9121a9a0df6739e383c0c3c98e9236b09eafa0b21c743e2864ddd8fb2bfa009df2b82cf9de56ee8143af3b81e9f9c2a0584f71137792db19ba9f6dcef09d0d27
+EBUILD libyang-2.0.112.ebuild 885 BLAKE2B b366c7331f3fc531c9d2d7fe99628e47fa17db3af8d6d112aad846e19bfd727a3865d91b9795d967b836479a5d29a9ce0811fd738d61a71f42c881aa6f229cbd SHA512 9121a9a0df6739e383c0c3c98e9236b09eafa0b21c743e2864ddd8fb2bfa009df2b82cf9de56ee8143af3b81e9f9c2a0584f71137792db19ba9f6dcef09d0d27
+EBUILD libyang-2.0.97.ebuild 883 BLAKE2B f26028913b1bb89fda2ca0567aea4e66cd89d4a0b77c4e17e9869fa0a11507ea97fa3834cacf5e8c8fac481e1d920ce91937488d3897f59d5252f53803d58db3 SHA512 286e32444fcc60b86871662b3adf6ce1a2a8fdbdeff899740badf190ccb11d7a0ff26339837b463dd7c9a27c86b7a4a35cd6632ba227e5f874d1ca91bbd57855
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.7.ebuild b/net-libs/libyang/libyang-2.0.112.ebuild
index 24249c2af8d6..f34f5a455181 100644
--- a/net-libs/libyang/libyang-2.0.7.ebuild
+++ b/net-libs/libyang/libyang-2.0.112.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -28,7 +28,8 @@ BDEPEND="
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DENABLE_BUILD_TESTS=$(usex test)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
 	)
 	cmake_src_configure
 }
diff --git a/net-libs/libyang/libyang-2.0.97.ebuild b/net-libs/libyang/libyang-2.0.97.ebuild
index f34f5a455181..2b0dd6643d25 100644
--- a/net-libs/libyang/libyang-2.0.97.ebuild
+++ b/net-libs/libyang/libyang-2.0.97.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 3a5b24a08033..d18becb51bff 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,11 +1,5 @@
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
-DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
-DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
-DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
-DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
-EBUILD miniupnpc-2.2.1.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
-EBUILD miniupnpc-2.2.2.ebuild 1531 BLAKE2B d96235e0df9e81ce6bd27acb4a5d392de6f24e4fad6ac294aff7f010210cb195bb45d250d1745500193fd6bf9e9a2eb017347f125e1af746379011e558e77f33 SHA512 75ee602e5778d5fb05d54bb5dc8c449b7c59bc55056ba2ba11474b40e4f3b8317de809a8e25280368314a24ea81d558762d25e3954cdb1fd30711b2a6193feee
-EBUILD miniupnpc-2.2.3.ebuild 1529 BLAKE2B dc0f5a32d653e800118ae23583303a3851954195fd77e30c397d26c865fa2f535bd0fec299bf8b294f901ba723cb4f05f559c089b7533020faed7a360b2dc776 SHA512 8289ba268fa3bbc859ede1bb06e0c23a6c222c70a021aa96e9fbd797f6d482496cde103b6194273b7767f38d97004a6441db52b926a2618453b5f2cd73e2b5eb
+EBUILD miniupnpc-2.2.3.ebuild 1528 BLAKE2B 885da6385fa578ff976659c3c349ec4bd27cfeb5f10389d89d2693546c364f7a532b9f171f73ef7bf3d5e161bca2d8a167b0ac9e13e2e456f6dfd7b371f55c77 SHA512 29ad46f9e9f844edff0b887e0614bb5ecdb7f8076ebd19982d38fc5983014c586c2424d7e37e4874826656f9fb8acaf18f528ad8e5410e6323aa7b33383d5043
 MISC metadata.xml 244 BLAKE2B a3306e4b6476e267c2dd1f4e24a57bcba54d6ac43270610af57976f19046bb17d1f9afdeadf07407c045b9c66afe1c5b631e0955ff1346e49151e604717dc1be SHA512 b2b16db336068dd5e6c40f2721e1b1e8a6626954196287bf409082db21ff804375fd740a76c5d2ee6b4ec13abf25dfa3f941944a7b25eb332b90a1da9c740868
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
deleted file mode 100644
index 7ac6dc55a8fa..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.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
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
deleted file mode 100644
index de6ed42db309..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.2.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
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
index cac4fcb9fda7..fc6f2fcdf34b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6 kernel_linux"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index ad484afee222..3e16a3f772d2 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,7 +1,5 @@
-DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
 DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
-EBUILD nghttp2-1.44.0-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
 EBUILD nghttp2-1.45.1-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
 EBUILD nghttp2-1.46.0.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
 EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
diff --git a/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild
deleted file mode 100644
index f79b1b5a91ea..000000000000
--- a/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index bb9b9224a9d6..befda2a0bc1d 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,5 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
 DIST rabbitmq-c-0.11.0.tar.gz 145638 BLAKE2B dce862d132d4bca010dbc284957f34a35d55407ea0eb4fb79369f699207c01cc7ed64c1bd58bea2d1178bd2c02176c3e93b66177fc975175b1da9ab9baaf661f SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de
 EBUILD rabbitmq-c-0.10.0.ebuild 1289 BLAKE2B b3e9bf9ca16e5f03ff24ce80695793909f891e83fae7c74a1bae7a66e71dbf9872a1d96deb430baceea8f11d1a4d4ad8fe2ddb468eb3dad5a9e09ef4d6aa7279 SHA512 8f1bb64aa8ebd3bc69824d320d5ac4270af2db79234955f7b43f2544a16ceb4173e8b2d220871329f146e936127e6915f98d8005bed4b5e36c23c85e2b1bccfe
-EBUILD rabbitmq-c-0.11.0.ebuild 1282 BLAKE2B a2cded15c3110dd5807df673e6d10147058bfd2303f3866e2cedd9e697ae618fefdf3cd09f86476399372340c588e2eec53624f3b0d173c2a9b7df28f5f470a1 SHA512 fd1ea43f4bd119216296de8c11dba6af1838e185e4d3852e0723263ebae421095d99839414a72dd1e81554d131ca3503f4119d54d4e9fde721db8b0235450291
+EBUILD rabbitmq-c-0.11.0.ebuild 1279 BLAKE2B 13130e9394954cb37248a24aaae7c0b3729c755134aab948b7af54be93295d25b5229f18204f7acfb95218d0fabeae575a2acaf9405c1dfa64e4842486e3afdf SHA512 3165f3c6799c47f00b3fe31e997794ddb7dc56dc164c2e37bd049f687eb241ca9fee6c4f3102d18023304355dcbf3106949e4eb76c60551908438426e0bf5024
 MISC metadata.xml 335 BLAKE2B b2cff371cbfbcd9eaeed0d85b658ab9df7fe669dec9e679f0155c31e794afb76a2592bc0a575eea231beeaac51cb5707c1ac0c593631f0e3e04cdb8a2e872a19 SHA512 68639ae3aed6e2846355f5690d7aa4d4af2d94078b489beb972b23eeef2e9bf62c99529c9580e6b88e857d47e82c4896e5e9fb7ed6ecf8f03135d8cd702d4f0c
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
index eb90f17d3365..af593238e7f0 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c2cbc89f4a9c..55f63fa6eef3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,5 +3,5 @@ AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
 EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
-EBUILD webkit-gtk-2.34.1.ebuild 8981 BLAKE2B 1675b065a06a888a23839e18ae2cca06241478d2164dbe52b787decec85fc1980fee3ab8312db4491ceab8ad5f4744ed393a837defa99bff7a0bca114db81203 SHA512 b767322caa7677129f049df13eb7d79fbf09cea3aecdcbd93561772289666865cb6b7ccf75a7c8e15038bc7759639ab552e68c92b372b0d49d8925b7bdefb972
+EBUILD webkit-gtk-2.34.1-r1.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
index 3f751dd11145..fec3dc003ca7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	dev-libs/hyphen
 	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
 	lcms? ( media-libs/lcms:2 )
 
 	egl? ( media-libs/mesa[egl(+)] )