gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /net-libs
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
94 files changed, 541 insertions, 1573 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3f1349b55e58..bbda7c62a4c9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 350b8e7362a1..53edb96d08f4 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -2,4 +2,4 @@ AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
 DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
 EBUILD daq-2.0.7.ebuild 2061 BLAKE2B 39f18f55b38251f708c04c4c0a918f866efeb280b49cafc988951918ead5362a10bc80b85a3f0e6b4e039fdf0241a52ceb7dadba577c24d4a4c4b5e110a83237 SHA512 95e4710ae49b99590150a0b820951823bc2adc540b7a5b30bf5590068bcb1a379abb6432383a442307098e97d2f72d4087d338a4228fd286105a186166b7d61d
-MISC metadata.xml 1314 BLAKE2B 167ce20e3e0130835e68309dedcbaac8313455fe7bdf680b00975ebec436d554c4c9d44c71e5b42b4af4b0aa7f7ea5eb7a0d1993c0ee37a0cd1d5267107cc9e1 SHA512 8eddd30b83bd5f03280d208ce11df9e388adb7df2fdb9420bc7fadf6956b85012e0ed6a5fdbace36c5c5f65ff8e711a749da2eb17bf585c6223cfef95218831b
+MISC metadata.xml 1206 BLAKE2B 04241993884e87f7fe35c75b3666bb375fb43890a5a4b938e4a6b485fb7a4a4a43a592d10cf3cf9c1a8aee71e52682c362a7cf33c39b489f38322bb93ea5aa2c SHA512 c5e3c2d136c82eab230e80886b424799c98c9165f04bffdb422359f986ca5ed98363edec6b9b0409ab964ef03a38d672b17cc2c2fa68e28fe7fc21ec59c0e3f2
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index eaf9ae2dbbb0..3058afafa8c3 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index c98745f753f8..eac446fc54bd 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,5 +1,3 @@
-DIST dleyna-connector-dbus-0.3.0.tar.gz 17306 BLAKE2B b019066f31d6e050b130164e9b3a9dd8e29317db1f93e85c257e1f6f6af7c3310d2fb685d99f12d6eaa00ba983e6e1e88b6d6ae2bf533b117bde16b6d36bde32 SHA512 f1edba6a835575daadb0cc544e0ce5e89bde278d2fbb6802211d3e064e478a3dcb88a2b6d6cbc6b2794a63daf64d33f50795ec67bcd8f00281dbcabcbdbc0468
 DIST dleyna-connector-dbus-0.4.0.tar.gz 15046 BLAKE2B 644d9f0703d4675e5173306deffb6b7f300e36b1472d3d31f78d3dac98fa682819b3002e902260e5fe307d1a3060142fb764d3e5e2297362b1a0f0fb154492d5 SHA512 03ad706291549db56c0ad3121a6ecc5f1ecacf0bfa34956a397f8b0682b57fd6f847b0dc73ac5e30684f0ffde38b7b717dcccb00a0498f89b3ccc31e196e279e
-EBUILD dleyna-connector-dbus-0.3.0.ebuild 637 BLAKE2B 0df025f36e2e539eab70fe9295ecacfaad743b4944359d49a85e32e17055bdfaeb15eda6aef63fcc706e5c6510850f142ad34b12832afe7c0873ce81c78dc3d5 SHA512 f190860df4b26ee67acf494256493de0fe71031b249624c627df4f27512c0de5f22cd4a21e78f3c8cc532cb5b627104b8349e9f174fc4f05eb8d47352ee95c36
-EBUILD dleyna-connector-dbus-0.4.0.ebuild 538 BLAKE2B 0b51b7b64fe0d05c1116acffd417b95bd314e3bbda158dee94393e9bf0c6ba87e50ce7b4bd89bd25a3337168f5e4b94decfc9ff61b82e135c00020ebd6d8e5d6 SHA512 69fb4d857025ac38dda216c6a4538fca77a1116260927d7c84e2371fbc1eb4438b9aa77f033f6ede46353c2f6d6c1e9a57b407309e4d5120bfbe376654e53c5c
+EBUILD dleyna-connector-dbus-0.4.0.ebuild 536 BLAKE2B 15b4506ec2e8baa18dd8c5c83dbbe0dfd42e5f2e554a39c13bc1e047805076131b7b029136a13391e6a8cd8e109563d78af4dad79e3f98a74f99f679b85bd755 SHA512 bd1531b0899ccb558370bde9796f6636d4931e8457461b5fc8dfa9cbd2b5a2de3a43a6917e69631d190089ddeb2b441955608c95b1b05a10e48c56bf1319ff7b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
deleted file mode 100644
index db2518f7e13c..000000000000
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/dleyna-core-0.2.1:1.0
-	>=sys-apps/dbus-1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
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
index 777d06bfd475..fc78d3efd998 100644
--- 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
@@ -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 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index fb672b34a225..ed777d1c16a4 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6.0-gupnp-1.2.patch 2499 BLAKE2B 70528c690f684bc14ee39c256fa315407628f9aa7303cfc5489bc6868cb774df440ede747f59e4a1f37fb322db0403132eff62f258855548b819a733c6c4db21 SHA512 b0bb51867e07068abdde71ba68d5a8a56fde832976496a8f93035b012f5c65417b7bd875566408d401803534943e80a9ac48275b4f025a59f39ecaea0393faf2
-DIST dleyna-core-0.6.0.tar.gz 30821 BLAKE2B f97ef825ef28efd58877487074c0146f8c8425b000537a2281ab44465829030ba9b837f95ad16b56044837a3e571a0ce54a8126ddafc2dda551dbf1d8b11a79e SHA512 cda3f3ee2bea860b06447ab79d8ca62a29c8d26215774c44adb05e57316b95acd4df6ee4ecdd731574b6da5b3aef1c08977a649288004a62a88af38a83157b57
 DIST dleyna-core-0.7.0.tar.gz 28354 BLAKE2B cfc21da2be908701ffe87f653ddbb3e8241f3842031987de9a0615ccc5dcd4f2180aaf9caaf981c6421d9cbfdc4cecb359998988f13f48ac5a5696bf56d7ae79 SHA512 02509d2fc386bc1d7f9295df7a12315a664a9dc4cced871da193dc79e15c3291ad4497cd18c655a7eb3e4d865a6448526c6abc1df2dc086cb7fc94f44c09b7f0
-EBUILD dleyna-core-0.6.0.ebuild 668 BLAKE2B b05d36f6c169d9fc68410241948844d1ea23be45009564e40b0ce88bc5b6455e97e9a290ec48c83ea95705bc4f3d5fe37f7fca706bbfd1f0b798a747bd14e4b8 SHA512 5d903a4aadee9e075903d75f0a4aba11beaced0ea7a5d03120fddc08b321175640785e5b0a6b3848cac1a81e26b5c0471ae17556b69df49f894eb4d6cc43e5dc
-EBUILD dleyna-core-0.7.0.ebuild 540 BLAKE2B 7c628c600a2b681240ede1223ea25c6137d06207599302191e7b2e3774b6ad3ed13894f691ad1d6616347a4e4bc361a5ce88e115083c6e6bad2344fa5c6d7b28 SHA512 19a3883f558eb31d0ec02acf9cac22d1db4a78941d655081a81b268817c183a481263b09e95da6a0698936cbcc1dbe23fbabdef0f0ae727a0bbcb3048f1103a7
+EBUILD dleyna-core-0.7.0.ebuild 538 BLAKE2B a84e6d7cb7a0c55427d018b643344113fc9eec3f7b4af40cafccc97819bdecea34c31eb09f25ee91674d9e9a9cda2a6ea8e7fa0bf2d46a70d503e7b2e6590858 SHA512 02c87c2c2c12dc50e089d11b3cfdc828daca28ad326fdedaa321d245040b70a51e5f764af6fae5ada942ad6fa6a1cd6702c243d5e93e6c83bee382de539643c4
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
deleted file mode 100644
index 14d487b56a91..000000000000
--- a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_3.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0/4"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/gupnp-1.2.0:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
index 119dfa74760a..d03a1e54e96f 100644
--- a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.7.0.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/5" # soname of libdleyna-core-1.0.so
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
deleted file mode 100644
index 71eef9f37b37..000000000000
--- a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sat, 16 Mar 2019 05:39:38 +0100
-Subject: [PATCH] Port to gupnp-1.2
-
-The latest version of gupnp breaks backwards compatibility. Fortunately,
-there are not many calls to gupnp functions in core, so we just needed
-to bump the dependencies.
-
-There is one deprecated gupnp_service_proxy_cancel_action call but
-I am not sure how to change it without breaking Dleyna API.
-Let's leave it for now.
----
- configure.ac                  | 2 +-
- dleyna-core-1.0.pc.in         | 2 +-
- libdleyna/core/main-loop.c    | 4 ----
- libdleyna/core/service-task.c | 1 +
- 4 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a96c84..9f769e2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,7 @@ PKG_PROG_PKG_CONFIG(0.16)
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
- PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
- PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.28])
--PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
-+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([stdlib.h string.h syslog.h])
-diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in
-index 966a8e1..52b718e 100644
---- a/dleyna-core-1.0.pc.in
-+++ b/dleyna-core-1.0.pc.in
-@@ -8,5 +8,5 @@ Name: @PACKAGE@
- Description: UPnP & DLNA core library
- Libs: -L${libdir} -ldleyna-core-1.0
- Cflags: -I${includedir}/dleyna-1.0
--Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0
-+Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2
- Version: @VERSION@
-diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
-index 3642a5b..9716b06 100644
---- a/libdleyna/core/main-loop.c
-+++ b/libdleyna/core/main-loop.c
-@@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server,
- {
- 	int retval = 1;
- 
--#if !GLIB_CHECK_VERSION(2, 35, 0)
--	g_type_init();
--#endif
--
- 	dleyna_log_init(server, control_point->get_version());
- 
- 	if (!prv_context_init(server, control_point))
-diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c
-index e0ca2df..fb113c3 100644
---- a/libdleyna/core/service-task.c
-+++ b/libdleyna/core/service-task.c
-@@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data)
- 
- 	if (task->p_action) {
- 		if (task->proxy)
-+			// TODO: switch to GCancellable
- 			gupnp_service_proxy_cancel_action(task->proxy,
- 							  task->p_action);
- 		task->p_action = NULL;
--- 
-2.20.1
-
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index 5d643e4265d5..5a5454436963 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,6 +1,3 @@
-DIST dleyna-renderer-0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd2fd1e284f2b234cb7f73026bcfbdf79843c78a5611b6c4d4d79380304dd64e8f4fe07f6f9e370cc8d82d029a SHA512 5eb8148a1416f6420167097b51eca77be432cfaa7f2d86a1d9255cbb41b99dda0338a01e433974b9bbbfa68e2ec6ca16a4c79523b2e184e1ffaf0f65dbc52fc1
-DIST dleyna-renderer-0.6.0.tar.gz 65566 BLAKE2B cfd2b5a08b2e5c6e15006e722c4878281bf7f4b6d8a9bd317ec5b27fc1568a2ca891af2ac2fc3c230f65e9920bd524b4fbaf43631192b079b2aea051783d2b8a SHA512 f4cb6c658bfaf620962eb6b84ab6b41be1bb8455ac1ff358db7fcf3db7f5c4e2130bb7b0e5201005c738e892aabf25b3cf2a3e1cc1f4a9ef9d834789b87c0183
 DIST dleyna-renderer-0.7.0.tar.gz 65982 BLAKE2B dc9acf5d3c39cfc8d7b84890b3fda2f4f4856276c1fb900f114a8f07f0459906d99ebe5f941d8953f5b3c635b6eaa5319300510037891aaf2079f88fd92618ec SHA512 6b1b222971780841c5080b769888a42beadaf7cd576f0d07741585e208876179d3cdde123cbd5a2e4129d2b9e0ba18a7edf7626dd8a0cb1d4a45b91340c3e9fe
-EBUILD dleyna-renderer-0.6.0.ebuild 919 BLAKE2B d41197d57e99b2459840a2b058c9af4f78930865f69e365e415fa20f0442b446f0e45008104846f8df6a531552a0bd8e229e85ac93f31b782b02268f831348c8 SHA512 34778c5a97e7e8a751d5dad2fec6719ae50ab7df65926f16ed39d3afceea976834f6119a7467b8dfed2f53d5bcd759063dacf3d9238f73f71120155ffd8ed4c0
-EBUILD dleyna-renderer-0.7.0.ebuild 702 BLAKE2B c4aa0914b2a13ddd4d768cd05fdf66852f1b492e370f1ce8d4662c6f6ab422799fdc6860e7f68c3737bd6c31c7534bccf72268709a36b646bf7d946ffd0757d0 SHA512 68ebe35eb49d030b4f9ce1c46e3b3d79367fefc617eec72035e1d481635bf7e04c87c334b37f04f8ec2b759eb551547de033267a806f633165199d5717f569b3
+EBUILD dleyna-renderer-0.7.0.ebuild 701 BLAKE2B 79a1fd6040792c80ee2e19b8052ec41eff89d917f4ec6d7709a7db2d4ce3f9e4595e8e0813cc2bd6f8467960da64c011533f7a4ca62148f4739ebbe065528aac SHA512 a0225a502414b5b4d7ec8951c64547861ffc8c2f436140192d969ad8ca51cce3f5e9f42498a376140fae05b69c9a30781e6ee7f5af663cebc76a9c0ef80caccd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
deleted file mode 100644
index 148878341d27..000000000000
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A library to discover and manipulate DLNA renderers"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/dleyna-renderer-0.6.0-gupnp-1.2.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=net-libs/dleyna-core-0.6.0
-	>=net-libs/gssdp-1.2.0:0=
-	>=net-libs/gupnp-1.2.0:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=net-libs/libsoup-2.28.2:2.4
-"
-RDEPEND="${DEPEND}
-	net-libs/dleyna-connector-dbus
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-gupnp-1.2.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild
index 9df2d13efa68..ac531e4f9e5b 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.7.0.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="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 1cbafee528d4..54b3fb30bb73 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,7 +1,3 @@
-DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
-DIST glib-networking-2.68.0.tar.xz 237992 BLAKE2B dab2b692c48366ba71325e1808d51a1d7614c29c21448f6d95388c262ec7c6d647489be933595d4e38151d1eef70385181d891d6613e6d1a0a2c95b3b0d764e9 SHA512 3961851d1c39352bc6cbacbc966a7ad075467ca17006eca432ea0646b660fed85951951aee72597a8a595420e6160fd91dca612c241a0505f4f0a67922ef1771
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
-EBUILD glib-networking-2.66.0.ebuild 1732 BLAKE2B 6cbfdd30ba6c617476e3f650c8d410526d85eb64733acd2c540d1d17582e07d8b614f0154a80123267e5765aac42ae8160b9e948522b9c6f464731401a427681 SHA512 24558ff4378c928f7fedf49da0b8274a91bedcf52baba3f44db4e085af2bf44b6d9fc0e552937fe36c1c593b4468daa1cec69729d32c63be4d0a29a5546c7ade
-EBUILD glib-networking-2.68.0.ebuild 2085 BLAKE2B dfc363273c029ee981e018b71ddb847f4b18a088c9b09cc2404c0c47acb6a0602babc12c14d4feb82b8dc8d6e61878d0eb24918dbd0a238972db6e7df84679c8 SHA512 b274ed487420d6fab68f65282e8d10b4f20ebf0689c39f685ca6de56938ac760316e108832db853d3ddde88dca3a8413e8cb9c916543d0577a1eba865ad51097
-EBUILD glib-networking-2.68.1.ebuild 2092 BLAKE2B 6ed18cff2b3cdb89c696311bea781a055afa51fdd4aab0ded17b3a5834d7dde6da54073097b383db60c8833336a3ef73665f0b510acf9eaf7552ad56029ff5ec SHA512 755449e980c4c2703afa47101fb8f164541f1a5451b6a71899d32f77a301dca0793f434e87e6a3018014c0480c2608379ef6df5b01425ba79eb12eba3804a329
+EBUILD glib-networking-2.68.1.ebuild 2085 BLAKE2B e4c8f9491a3883e1a4577734a1096bc22d31741df40be4f0e773b971e300204b6fe8c113ec9f2009054990e35c19336f624e02f584332d216c56dd8f4fdbc3f2 SHA512 806d24768659a64d609f5b2d1a61d75d5d56e1e1b6649bf204efc401cfc22b4062f1bdd2e221ef37f88a25e2c84cf08a3331ac116cec5215149bbe0defeab4c6
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
deleted file mode 100644
index 1fa9ad6c2836..000000000000
--- a/net-libs/glib-networking/glib-networking-2.66.0.ebuild
+++ /dev/null
@@ -1,73 +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-minimal 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.64.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}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-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_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-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.0.ebuild b/net-libs/glib-networking/glib-networking-2.68.0.ebuild
deleted file mode 100644
index 8c9ab087457f..000000000000
--- a/net-libs/glib-networking/glib-networking-2.68.0.ebuild
+++ /dev/null
@@ -1,88 +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-minimal 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 ~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_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-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.1.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
index 370996a7150b..da5cbc70b9ce 100644
--- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.68.1.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 a3d6ed756244..ba48dcc60aef 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-online-accounts-3.36.0.tar.xz 860472 BLAKE2B 921f2f5ed9ac3db07046507723d814fc41579aee76cd2437673cdc3612db1077627ab47586e719b56a5bce25afe75b8028477f69745791eeb774c82bf854863d SHA512 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81
-DIST gnome-online-accounts-3.38.1.tar.xz 861008 BLAKE2B c66f8e59fffc69b5ad570040959fc559f788e76ba8b6b2e289b9b985c10bbb238056de39dd4e4f078ada351d38a51ab6765b4070650c97bbabc3ac1abfc3b844 SHA512 3cf38aecde3c28d51d5185f0ff7facc41191a9b6d8168ec5a8509e0e983f688607591e37fde4c75b69c5c6e2b5ac54827192eca7f41c9b7fd3e5882ccac9b155
 DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
-EBUILD gnome-online-accounts-3.36.0.ebuild 2000 BLAKE2B 6fa042b85c7bdbe0f80a52dfd62473cf15829c2f95bf14fc94f003ea000d33991f52426c63149221722fc73ae0ed408927acaaf848c751e9814ab57cc7881b46 SHA512 d1b8d5c98688831f218f4076bcf7cace567f712e56cd0a9f30ecc8482f81bdc7b020708c31d6efb69509ae1631188ec798a2c652c4f6e1c9f488f0332082881a
-EBUILD gnome-online-accounts-3.38.1.ebuild 1983 BLAKE2B 7f825b9d5971aeaf8de192dadb313fbafaecc44b209d84bc83873c004ffa4f6f77f37d994eb37aa9130eca04c231e7fee17db50cec03f1cc6893cb36792d5371 SHA512 9fa839112f5ca826bc327f9ac8dd3d808eb68bd112441173eb238a88a44fe6353956c1394c78d9dc7b38aecd26940b338a2871d8fa430ac6d7bb0042de194d9b
-EBUILD gnome-online-accounts-3.40.0.ebuild 1983 BLAKE2B 7f825b9d5971aeaf8de192dadb313fbafaecc44b209d84bc83873c004ffa4f6f77f37d994eb37aa9130eca04c231e7fee17db50cec03f1cc6893cb36792d5371 SHA512 9fa839112f5ca826bc327f9ac8dd3d808eb68bd112441173eb238a88a44fe6353956c1394c78d9dc7b38aecd26940b338a2871d8fa430ac6d7bb0042de194d9b
+EBUILD gnome-online-accounts-3.40.0.ebuild 1980 BLAKE2B 6b31a1fd99e8dfd66ed4fe5ac94620893ab4ed188097ca345d9ae33553195e0e36522b32746bfee0cc666caddf97c15f8aaff894848d6c87d8a3a0a44f40a725 SHA512 5cb194eeb0168b19c67d9977832b285f4ecb438cf0549b6ddcb1dc5f16930ded4f80c3da83ef38ba337360cbd6ffc96ac7a2f355bdd323e9d70d74fb25c26d68
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
deleted file mode 100644
index 1e103dd3910e..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-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 ~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.12.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/gnome-online-accounts/gnome-online-accounts-3.38.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.38.1.ebuild
deleted file mode 100644
index 221ad9075e73..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.38.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
-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 ~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/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
index 221ad9075e73..ae77321e4b2e 100644
--- 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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~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 326ba2edea4f..e6934daa2a1d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,5 @@
-AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
-DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
-EBUILD gnutls-3.6.15.ebuild 4304 BLAKE2B ac36fdbe080003eee3519cbc05ac7b8bcd2013ca24e5269d37d841b5199df3c4140287505b98e45943b47304adb3cd5136d604ccbbf25fcf1fbec8ece24e5f18 SHA512 891490e57eb4aaf60877a060b24c2d783a6e85807456ff6856563d4c9fe30641b101ed67934ab9a5743f868d5e1e1552029ef079f712fd9a771bb1abb3d6876b
+DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
 EBUILD gnutls-3.7.1.ebuild 4232 BLAKE2B 35454524038a30fcc8d83f3bdc4b3f3773710c3a0e64881e4a29cefb205385b7693ac01ee24fd97e09a5941f1e2f67a91f0bbdf23cde404c88da80fe17c0c00c SHA512 31e764285b44dbb55d5aae1b070bec327a9544211ec89e74039220816b8140ee04d35e1d78b2118d89df4f141253695741366cb85dcdfa017ffb5b39ca6f0491
+EBUILD gnutls-3.7.2.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch b/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch
deleted file mode 100644
index dad6cec8d3df..000000000000
--- a/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/649396
-https://bugs.gentoo.org/711104
-
---- a/tests/dtls-client-with-seccomp.c
-+++ b/tests/dtls-client-with-seccomp.c
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#if defined(_WIN32) || !defined(HAVE_LIBSECCOMP)
-+#if 1
- 
- int main()
- {
---- a/tests/dtls-with-seccomp.c
-+++ b/tests/dtls-with-seccomp.c
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#if defined(_WIN32) || !defined(HAVE_LIBSECCOMP)
-+#if 1
- 
- int main()
- {
- 
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.7.2.ebuild
index b5557dc3ffcd..ece149c18554 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
 	tools? ( sys-devel/autogen:= )
 	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
@@ -54,8 +54,6 @@ DOCS=(
 
 HTML_DOCS=()
 
-PATCHES=( "${FILESDIR}"/${PN}-3.6.15-skip-dtls-seccomp-tests.patch )
-
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index c92657ac4e42..7a05239a7d53 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -2,7 +2,9 @@ AUX use-pkg-config-to-find-re2.patch 730 BLAKE2B fb37a761c6aaf2ff00f3e9a6b791c58
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
 DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
+DIST grpc-1.38.0.tar.gz 8296425 BLAKE2B 2a317dbb1ab79a508a301d84ac6aa858f62accf057453b1536900654376d1a1b19549bb1efa52c5f0916c08c3616e9d1cd2efb4f8143ea923633cfc4ed6e04fb SHA512 6ce37b4b87f08c227995f8c8a9649a3d9a4d8622458772f5f32552ff5b00b920a6e57ba7208c2e8f67eb2ee4f503378320866905863598d08e21b226aa0cd1c5
 EBUILD grpc-1.28.1-r1.ebuild 1589 BLAKE2B 8f45534c7e1f1ac0ac037a7a44279ba6919a15d0a4a1d587fad33e4d9ff12a3ace54488a9872d322fa0de22aa9ef934ee81ab17bdfa1edb76ea22e6e3ffb6be1 SHA512 de584b6dc05d75b1bca48adbbbbfb26a88e29287615dbdaa8e832eee097c1840763e1a71a119c49fd75e09209ed105d6edd250a739a93c4e5817cbc04d68d4bc
 EBUILD grpc-1.32.0.ebuild 1932 BLAKE2B b2c797c72c4e5c6da11a593ffc7a45d0d8b81ad24cbe3d778f813a676330e2620f5b12509fc94b4dc98af5e07bc24ff2cc0a76092e1a3416c968f2a82ceb06d9 SHA512 d895cb3981f6a0cf947e133aa0600c1e500a3d4a04899d13b3dcbe22f03dd7269b5530f13c8a2b15309e162bf828f980316ca9f9ee690a806c478e4a0c0a2cd0
 EBUILD grpc-1.37.1-r1.ebuild 2714 BLAKE2B ea8a876d73bfc8a29f9aa60a84ab510cb74fac1486ab526cfa1f9d9de8d5208b93fefc6f08c4d22d2e75adb62d26c1a2e1b3cebb24fc95701b3a315b669c1152 SHA512 ca2ba79a51ffa8130b71492ce04fd7edc0dd8cd8b05c084058eb2f3ef26c4d92f70ad2967d35a2ac9e47ccc662c64e06fbcb7c36b6c6a6649c76b41a888a639a
+EBUILD grpc-1.38.0.ebuild 2721 BLAKE2B 4dcec53ff6a112dc260d819238efd0550203d79c8d7f4639affb264262509a759f06749bc8382bf693d4dd2db28649daf1bce731b5fbeff0ec6cd205ff64921a SHA512 2828d48382a776216be8a0c41a52374b8d3dce5fa28a76d66e5a30415239e2905b22b3f9ef047486407878f62daad4ea98a6c7183b767825b68ad810213afa95
 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/grpc-1.38.0.ebuild b/net-libs/grpc/grpc-1.38.0.ebuild
new file mode 100644
index 000000000000..5a30754029f3
--- /dev/null
+++ b/net-libs/grpc/grpc-1.38.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/16.138"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20210324*:=
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist]
+	>=dev-libs/protobuf-3.15.8:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	soversion_check
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index ce386c45fa40..dfdf55a0759c 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
-DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b0de85c5b7151f0ffca93b50248a303dd040c2d7e9fb215a0edb0627fa3a8a16835b55d90459c623faaad62b SHA512 cb787264b5a1bcb4f547f7a9d7a5e4e712f91ecbb593f12b2c51aed0607abd6fbfd43e5c42e261eb853d09358685637e172c78e3e9a6059bccdeb1176e6e4ef7
-EBUILD gupnp-1.2.4.ebuild 2272 BLAKE2B b3d8499d60f38d78858feafcd577e5247a42a306e349c7f8651ac110fd463b6a8bf91798d844ac70168d3b4f6ca01e9b78d288b3ed2d3985e13560a82112940c SHA512 53d62e54e6d0380bd21f20b6c01ea8e043976c29f71635ffa4e40a3cc4264919f2e3147e674664e1ad16aa582847b0e51d0c0a311372e26d8042ffa3100fcf73
+DIST gupnp-1.2.6.tar.xz 142652 BLAKE2B 12f3fd59b6c8616dcbc32ab4feeeccde864af6da0593d0d51b8a9bab045c39b8e4540bc1470a0758f1a0979e647f9dae67bae544d1457e567264d7408d58e06f SHA512 317ff1f0ea1f03476596db6ce2f6c7c86b7c9962a7ddb00da9f487fe7f7bb70ccf8fe64e485583e4a988d90afdb41128730fef459f4ecb757ff2aef44dc4de9c
+EBUILD gupnp-1.2.6.ebuild 2272 BLAKE2B b3d8499d60f38d78858feafcd577e5247a42a306e349c7f8651ac110fd463b6a8bf91798d844ac70168d3b4f6ca01e9b78d288b3ed2d3985e13560a82112940c SHA512 53d62e54e6d0380bd21f20b6c01ea8e043976c29f71635ffa4e40a3cc4264919f2e3147e674664e1ad16aa582847b0e51d0c0a311372e26d8042ffa3100fcf73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.4.ebuild b/net-libs/gupnp/gupnp-1.2.6.ebuild
index 762f6fb77a4c..762f6fb77a4c 100644
--- a/net-libs/gupnp/gupnp-1.2.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.6.ebuild
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 1ed7647511db..08e92eeb9efe 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-msgs5_5.2.0.tar.gz 390042 BLAKE2B 733f57aaa91d6a34201e247c34ace74653ebc7e23df03f89a4a2ec76361e5ea0270f3b63d6452abb15b1380acacfe87294cbb9f0c01655707481300a34aa8408 SHA512 b1c6017da39c79ebdb2d76e960c6b60d0b82af7f5c09144a1f25c6e7b7b06ec5a7922e6d0bc08951baf0d4797d6ea061cea11b703238c954445d67762f2bc983
 DIST ignition-msgs5_5.3.0.tar.gz 390136 BLAKE2B 947336e79f54f384d8cdeefdc6be5cfe360c4ae9fc4e894cc08252e801343c4a9d507957df1ffb05a80e55ac24bddcd57f4e4e90d8e0b2f346bc55aa8f64c3c1 SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e
-EBUILD ignition-msgs-5.2.0.ebuild 727 BLAKE2B 2e4d124127e3d7af8a935788a2c5310c42aca5cb7fce7c2a3c0c0e9427cff2a7ea8ab3128245a4ddb2f2bcda934a619691ec8ddbf7f9fd6a79189b1d72a2a886 SHA512 8877dc70ac3f0650c521e2fe098625c9c5ef9fe3bdcf7960a840f913d21e630392e22df59590164f5675d036f9f729ad05fbfccad799fc70a26ccc0969f0064e
 EBUILD ignition-msgs-5.3.0.ebuild 721 BLAKE2B 22be3ba2cb7f504bc0428942a0f8df051b9b8ab158ac317a81ab5ebda45a441fd97e7846fb912bb8fcba493ed927f34a04b024643711db4e4eb2d5bb19af9ed8 SHA512 c63d570831eddf989495e8029599598025b6957d262b23f9081971bdaa1839f1201c0b6a94aff736dd1fd5ff624fd7330f743924f6791a9e6132f70d67673805
 MISC metadata.xml 342 BLAKE2B d175314e7d6f244988fdd056bc53c344b2323e23e9f0c05cc21ac9c68b1c4cb39e8dda8cd3c68a079d310e3cb4ca237bb1efecf8948cdc011214bc002b7163a4 SHA512 7f5b76e9bc064ccbba965b33adc11db5552957803791b0e427a9b0a177b146f2b3cc1eca92f6f4bd8b8554ff3ed7de4150a94cd9abb0500247670f3edfb1563a
diff --git a/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild
deleted file mode 100644
index d7d923a8efe9..000000000000
--- a/net-libs/ignition-msgs/ignition-msgs-5.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Protobuf messages and functions for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs https://github.com/ignitionrobotics/ign-msgs"
-SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/protobuf:=
-	sci-libs/ignition-math:6=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-util/ignition-cmake:2"
-BDEPEND="dev-util/ignition-cmake:2"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/ign-msgs-${PN}5_${PV}"
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 16b2d985095f..342c57b539ae 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r1.ebuild 2605 BLAKE2B ec52b3b1f3aec79772249009b4f252ef0cb15f60843a05922bac6d37083412916b744442c66a83cb0f74a6d933d8e85787e58a9c1dc8ece769960c1f0eae8f9a SHA512 0026d1b4f3314117a084b8b289c0c67690e5059242a3c22fa32fffeb7e24b0b19e6ab3fcb8f9959c51fc39d85501e50721c75d2fed3e82f25c469675a49b9728
+EBUILD ldns-1.7.1-r1.ebuild 2608 BLAKE2B 602866130ab62202cd8543d0488c9ce574fc64014bbeae405099d7d7b25faa9e87aeb328b0b9770e2e6825ff79f030a338ecc69b8f706b79463df16971be1c8e SHA512 086e756a194ef7fc27b5c6557977fffcf81fcf1391b45bcff06a9c8c1b6a6bcfa5eebcd91f4d963d9595c37688fbae387afe09dab6ecf9c7f1540c913c65a4a8
 EBUILD ldns-1.7.1-r2.ebuild 2619 BLAKE2B db380f6bf0cff98f854aa65341fb356f94a96140dff1a57914dae8a59135d24baf32bd4d5842db262c08c47b889a6650518eca9226fc7c477297f5c9b35fe2cd SHA512 3d1c99e62d814d1825be19469a5b7cdf17943c03022ae2842bbad979f26540eb43075e149e4f499e617dac04ae6f54dfd7a1b2c1f7acafe989c332f0d2b19fa2
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 95e2628a1d8e..046f31d91c8f 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
-inherit epatch ltprune multilib-minimal python-single-r1
+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/"
@@ -97,7 +97,7 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc Changelog README*
 
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 	use python && python_optimize
 
 	if use vim-syntax ; then
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 4a830a538f2d..ba7cd77e387e 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -3,5 +3,5 @@ DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
-EBUILD libbitcoinconsensus-0.21.0.ebuild 2348 BLAKE2B bb2b10dcdfc10b75fa5c296dc2a48beda24eeba534c1aa2770e01a7ae5ff0bcca9081e829927e38a09c654384cffe4c5d22c47ebd46f779b8efb3fb7f49a561c SHA512 b5784e4697bd3a26c5d9de4149f7fd98d508656bcba5145bdc25105c40e4d83fe679c5025124999881c18eb4382c4052b693cf061df6044014baa096226653cc
+EBUILD libbitcoinconsensus-0.21.0.ebuild 2346 BLAKE2B 8cc7e7119962ca3598ee292773e10f4f5cd1c6a2c4079f55866b346e8e458bfc4ce7d122454f62461b81f5468b286e354c5a2ee61a39d427e8fc684c09f39cdd SHA512 95f09e34f4ba134ae829a86bdd9d0b035b07aed4af6d1ad085b7fed6d95edc5b718f3523084391ff7af3c560717fe3d485664fe1394dd72c51855798a0eaf029
 MISC metadata.xml 709 BLAKE2B fb4b1d8a5dbfb4f5094769593ef4cc97724093edd64d961129cb324b8e8ff6b548eef622058d791d26bfbfcb520e5db0227702ca04c78f381bdaedffaf17d3cc SHA512 f7ec32085ec0cb4c59fe3bf4766705fc97699b27cc85d3ba84e5b4617c686e89ecc333cf2333857bf4b7e31f7463ab8fc4d553fe721522274e249bcdb3cacb24
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
index c2e993d373d3..7f080957ecf4 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm knots"
 
 DEPEND="
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index b91ca7fdc22f..47774bc84806 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,5 +1,3 @@
-DIST gfbgraph-0.2.3.tar.xz 270772 BLAKE2B 4e9e1d9ed5d0bc58d6b01f6d58d7d9dc8cddb28c09bc820927e242a7d6118aabc8e4d808050205cf2d516571c598a0dbc75e09588e64d53db1456d519d23b810 SHA512 4e03beb4172a591c7d1eb4cfac56009b0d25183168f73344d24ac47554334d1edf2c5087c523025cee5d565182a02dc7ef72adc66cff1e4ad53a1d0990d3afb8
 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
-EBUILD libgfbgraph-0.2.3-r1.ebuild 1006 BLAKE2B be3882ee37d967b20c803d07c0dcd051399671d8a469c7f672895a667f3e3dfc938c3489ad52b3ef3e6d673bfd7b01e678f1d994692904a679af85c37e246d92 SHA512 3dc3a0436f7c3801e362e087ffe745ab9f6de8f5b64147f9e37f4f26e62d09b4cd37a2d21623a5ecbfbe388d32b0c6037005a951aeb4ffaad6e15c5e6a3727f3
-EBUILD libgfbgraph-0.2.4.ebuild 1243 BLAKE2B 39b30bc1ad7f7cadcae0e486ff2194b84be4bd2bf5dbd5ca6d9afae2b543cf4c1c35dc26c9655cb68352aa74162474882aefc3d430d08caee7150a8f13135670 SHA512 54e129a0a37c3119a06a1b8652766695c266589e49d4c105c6f904e90ab708f622443a2dbbef02b0b35f5bc55168939f0574318554ddc3dbb56eddb7a8626e81
+EBUILD libgfbgraph-0.2.4.ebuild 1241 BLAKE2B 74f8e77d78a0079d658bf04be4c29e22e0a8f4f409b9e838f64d655efbd4eedb2f08ee59a10b8a94dc7638cbad472bbcd8145edfcdb7151f32a894bfba959de9 SHA512 f5905a0cbc4bf51b51f61264d42861491d95b16fa114e44dd22730ddd641ebc6522872ed28c2bfb32390a26a626dc3d5ca80c5b759f2bc5fb5012b8df4b8de7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
deleted file mode 100644
index e0b6639ad064..000000000000
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="gfbgraph"
-
-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 ~arm64 x86"
-IUSE="+introspection"
-
-RDEPEND="
-	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:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-# FIXME: most tests seem to fail
-RESTRICT="test"
-
-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/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
index 25eaeeb87edf..e73dd6ac9714 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+introspection"
 
 DEPEND="
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index b5d4b6f3b668..ce0eebc13708 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,3 @@
-DIST libmbim-1.24.4.tar.xz 512524 BLAKE2B 4f91d1fd4d993b3e28f7508f4fbc3d6f4467db1c27307a3c4bd006ad9cdb40800513641fabf37deb673f5926d7a0f0d4806e3bd62a3ad8825227631d35c67d5b SHA512 bb0b82c64213e5b382a807c5c4c36751138c343419dc6abf1605573c91620af1a6de45587eab7341265f950548924fa65fa4bfedba0659b2f9eb80fa23ae88bc
 DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
-EBUILD libmbim-1.24.4.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
-EBUILD libmbim-1.24.6.ebuild 822 BLAKE2B 0f7231820b6ac4497a1e70c1ae5ab473cb6b81022aa4e55e007899369115d59ac59fed6381da6024891700a1bed1d1fd26c45d021ae2d177ff4aecf5ed19a29b SHA512 e9882fd9e6fe5442924e87aa19ba803c5f4d808e8543a177114d471a1b734b64bff9db06d16ce83d414d46a6382bddc9ccee3ec3bc62de1226de345a76f448b1
+EBUILD libmbim-1.24.6.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.24.4.ebuild b/net-libs/libmbim/libmbim-1.24.4.ebuild
deleted file mode 100644
index bbdba255bb73..000000000000
--- a/net-libs/libmbim/libmbim-1.24.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="
-	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.24.6.ebuild b/net-libs/libmbim/libmbim-1.24.6.ebuild
index 322e88fb7990..bbdba255bb73 100644
--- a/net-libs/libmbim/libmbim-1.24.6.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.6.ebuild
@@ -9,7 +9,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 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/glib-2.48:2
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 62ba76a34b22..1fde46799fe0 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,5 +1,3 @@
-DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 DIST libndp-1.8.tar.gz 364669 BLAKE2B 29fa41b40300b273d50aed4f1fe4a1c552023aa83d6f4b1bd6033cd0a41618b453bd1ec7ac5223fe7c123649f389587e89e635cb988b392f1af04cc1d6b79002 SHA512 bce17095f01eb9df6601a2ff0597b0373f4b0005b1edac8c085e4c9d54f9cd18f08faf1604624e0e0992be66fa6f22a71106af46bc73c9e326663c7cf0c5a7fd
-EBUILD libndp-1.7.ebuild 531 BLAKE2B 81df5537eb9ab4324862b956ffbe2bb05d18256d6f045faa8414e6fdb4d6274cb3974e52e634c93ce90fb50190fd12b65e81e942ecaa91e5e5e5789576093ccd SHA512 42a9455b62bfca06a528bd06354d237db6271355c575e8fdfb418b136825d6f1bf2c764a59d8d7fcf81ca2238fe059cd34c1f6430a7cd3012f54a212814bc23c
-EBUILD libndp-1.8.ebuild 537 BLAKE2B 6e698f2dcfd6b62ea9b6b5f1993d2b0048552ff4ddd069d07411f774b56d8260ce2cf271e2d60892148e98db2745792dfe36b8b9b47198e47b392e2ba3766513 SHA512 1977eeb98cc017dd1c71ddaae05ec34cc97cad5860297b787dfda10e0962762ad99fe92657b889adb661dfc893230a7e44fdddd183d092146a2792a2de62c4e1
+EBUILD libndp-1.8.ebuild 531 BLAKE2B f667264d0b9be30387b18aafc764b47f06310130fee3c7d4d24837e8bcfabc02ae179b7271a7fb1f9e8e22fcce305d5ce346be373a3e0bbb5c704e965e520100 SHA512 290a11e613efdff47bce23f54a2c357adc24041c7b0da74609676ff8ae3dfac1264fa635790001588825629afa22dfece08d8cdddbdb5d5172b6f01d24032db5
 MISC metadata.xml 328 BLAKE2B daae7e3df86ad08016fd775c15491ac7d74f23b068d738ffc3ac73afe1be68567d488a007b49a2fe7c5c93b0fc06138838b3deede3b999728e9a597c3e7b0f9f SHA512 25b1bd4544967e35a6a9fe5f09992dd422f9f13203a81feca04db959bbc26bd1f1bb5b6be4642b97ae043c1998107fc54ab721778b2969c4652a90193eee4828
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
deleted file mode 100644
index d36cabf97b5e..000000000000
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Library for Neighbor Discovery Protocol"
-HOMEPAGE="http://libndp.org"
-SRC_URI="http://libndp.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--disable-static \
-		--enable-logging
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/libndp/libndp-1.8.ebuild b/net-libs/libndp/libndp-1.8.ebuild
index e187a4044197..032f284852b4 100644
--- a/net-libs/libndp/libndp-1.8.ebuild
+++ b/net-libs/libndp/libndp-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 55f487bc222c..95e5da5fdbc5 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,5 +1,5 @@
-DIST libnetconf2-1.1.36.tar.gz 294950 BLAKE2B 20eca2ba26353dff8636c48c06fe2dfc79603234c2def66a12dc7946050a81fb8d2a7c082aa6b6b3b1632eecba84e129739e659fd76a8c30bc500526e3ef48da SHA512 6a992a8d6e933661ba8f4de56f951e2fcdc1c8807d220528866afbdf0a5b6bafb6a99d78eb5cd8a7970519687a6121cb49517946a2beae5e496b80c2d95a34b2
 DIST libnetconf2-1.1.43.tar.gz 295502 BLAKE2B 49bd58d785a0b7b132c4503b0b8a823ff3578e6e1d30e0c0e4aecf6ebb6f769f465069ebbfce7fd090e64e0b798ab8977535c634f45e677cec00d7c73edaee20 SHA512 2aff10ef003d5ee1f72a3c01a0fd07f7a1ac3b1961c88a9616632255d7392d386e0acad97fc68b3f5f1a0b4804dcb0900afa625208ab0dd33cf03706f7a89f5d
-EBUILD libnetconf2-1.1.36.ebuild 843 BLAKE2B 9df9be4d65e1c09f8f190b2460815a33d9337f66807cd6a817dfb236f0ffd7752e962b840870539a8d1ac6bcdcfb3cd3e2de7f167873a225236188e59f04a871 SHA512 f53a4cedc5abf3451623fb8dbd8dd6ab5216b1e8a78d1d564361c28c38f14210b166e1552c3d43c7840bcb4f8cfa7d7f96335dd25319f6ab0c6b28c6df1715d1
-EBUILD libnetconf2-1.1.43.ebuild 853 BLAKE2B b57b0fcf601341f4b0f0e3705cffa2f94804f44616b570f41478df538414d230de2f9551eba8fe642d2e4182d7b9677c5990605fab1a6b91f0ee1307f736e03d SHA512 671b5c08558904431e084f2f953de248034905f34011f42a1d651dbbdaf16e9889654e230969fdf7227b694b68acd59e747df4b0cec95e855ad76324fdb751c0
+DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8
+EBUILD libnetconf2-1.1.43-r1.ebuild 879 BLAKE2B 5a8572372ad9624bfe9febd957147324e16dab068ec0769ada4dc7401ad79a35eeb7fc4fb4cd32214ad56181d31faad43e69611a2a4b20a1f01a51f94c1420f7 SHA512 247752a15849e0465a492abe70e7cb2af0c9a0d3eaad56b8f35c129f2811c728df590c7108a7cc6f73affba0fed67a512e8fee4b8f78b79c3964ae23e58c2708
+EBUILD libnetconf2-2.0.1.ebuild 851 BLAKE2B 89b4a2d10b2854f7de7d69c52b440ffca2838ac9aca2c14845a775411cf58376abb12e9dc654b77be427a8b1f44e7d8fc24514ef578f9d01d885fc0e1dffff0e SHA512 962fe890bab221aeb26ce205c3e588a39543edf7579b3347a87aeefe2220516a8b736a2ab37dfc181b96502bf6b44a3d4bd85f71f4c6ec1d07391ffabaa0c355
 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.43.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
index 95d4cfb62dab..cb95c3d21da7 100644
--- a/net-libs/libnetconf2/libnetconf2-1.1.43.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
@@ -11,13 +11,14 @@ 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-1.0.225:=
+	<net-libs/libyang-2.0.0:=
 	net-libs/libssh:0=[server]"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.36.ebuild b/net-libs/libnetconf2/libnetconf2-2.0.1.ebuild
index b56ba4d23efb..f0a8c42ffd2b 100644
--- a/net-libs/libnetconf2/libnetconf2-1.1.36.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.0.1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/openssl:0=
-	net-libs/libyang:=
+	>=net-libs/libyang-2.0.0:=
 	net-libs/libssh:0=[server]"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 5305ff28a40f..08b1a94848ab 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,4 +1,6 @@
 DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
+DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
 EBUILD libnftnl-1.1.9.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5
+EBUILD libnftnl-1.2.0.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460
 EBUILD libnftnl-9999.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.2.0.ebuild b/net-libs/libnftnl/libnftnl-1.2.0.ebuild
new file mode 100644
index 000000000000..434a775727d0
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 542c12b01680..0151e19871e0 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,5 +1,5 @@
 AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e56e07ab70dbdc7a6824cefd010edf99c6c0b8fdf9f00ffe5e0feffab01cecc6a96dc7444536371adac7157eaa SHA512 37457cae1ed15dbfc9d72bdd6701e20abb027da1e01e48a5202ac209654a014a0f7352701790a643aa7ff12b7be0abff998596a5e09afb6f1f76eb5458f600e2
 DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
 EBUILD libnsl-0-r1.ebuild 565 BLAKE2B f1227ef218ff7edb1c5f299fd31d12d4b91467991a5c3036227284accf455bc7524a58f352b13f591396a0535877e5b49d6cf301aaec4da3a8f5124b23b99a74 SHA512 ea2b7ced6307d96991b3a05ba7152b6817c10f21712e14d4e7b389bd0728d3482894e4f0de604ebb381edc091870fd05369d4046df786b64661ec75da8e7dc56
-EBUILD libnsl-1.3.0-r1.ebuild 918 BLAKE2B cf6a7013693ab93c28ae83f6dc196a69acf8c9caeac2fd50667e1e55a118900dc7f2ceda066c0a1c3e022f53f284588f2a27668035bd1349de63159e6e8ffd29 SHA512 081ace3e5f3b78b4a09e1245fe086dba122e3469c750bf0d513701a9ebe1959c6d1c4c04d0d2aea0b1596c36b9ef56ff915a891e073b90ad6675911e8a865b76
+EBUILD libnsl-1.3.0-r1.ebuild 945 BLAKE2B cf833d9938040e61fed9f64ccfd6d27446598b226ad8072bc354b9d7d64a97e4cb6d8dd65f8074ce035d3ef1069a9983b0e70639eef47956f2c129e8d8d7e0b2 SHA512 c3ac28c587dad6ed2313642daa6499a38a6a1926eaa792e8efd5bee69e7cfe1b4c30de4a8519408baf2a61da810567e8326494e825220d16bbff6140c2f1d274
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
index e16f5f60ba89..f17bbe4bec4d 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1+"
 # Stabilize together with glibc-2.26!
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="
 	>=net-libs/libtirpc-1.2.0[${MULTILIB_USEDEP}]
@@ -31,7 +31,7 @@ PATCHES=(
 multilib_src_configure() {
 	local myconf=(
 		--enable-shared
-		--disable-static
+		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE=${S} econf "${myconf[@]}"
 }
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 5b73c8c8a16d..17e5eb99ba92 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 1489 BLAKE2B a2f798bcd3e850cb024f611ba695c80e5823cb7aa20a09588ba6b2c9f9bf1bf3be525aae114d85d4c8302edfeba0b28d37769aa8c61d66a7403e326849696be5 SHA512 a8b32de4f4443a198e1519a6f023e6827af75579e8db7d14747c0912f8eb1058e3814da95fcaf2d63313118a05b71b17547aaa469186a696ff11250447984170
+EBUILD libpsl-0.21.1.ebuild 1495 BLAKE2B 77ad1de86e156f86b44240079289d0f309de7baf3c0cd66e373c7e34d51590927e28b044ab5559d42c7e3d909d217176cd125faf1026087782f2bf8eb498600b SHA512 561eb60d64565505b9b17eca40197cf11dd6f8bfa2302231d607caa7eb4e16f05c4ae5ca210e07ef45c440285d9cc91f368ebbcfb83d82f85a4c6e4b440675ea
 MISC metadata.xml 343 BLAKE2B d19e87c4ba9e09228a0fa952aa84158e3af40a273fa6397c46398c5ec2af03b21265e16f93083847e5cce2518d560ae85bea0c55993333e1c7875a06391e95af SHA512 9aba846b595571dbc7087579243f4c41aef47f25e64289a3798b047a6e49b1e2bb0a823b7b92c22b9d9dea776bc5f5bb8117ed5ab49f4269fba8066caa8ca09a
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index 2a840c6e4b23..434ee9a18380 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 198f83262ad0..191b50a16457 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,8 +1,4 @@
-DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba
-DIST libqmi-1.28.2.tar.xz 1165204 BLAKE2B 17f7462d84b74099a5ef4fa6f28e777a4587be0a7652b38c4ab5c0f50bbbbd0b8b293df22d7a8c470444df23fd405e3b176e8c449019787c5305fef13d0b27b2 SHA512 10d11b780aa381e93669aad2540c609bcd3f789302ed76d80b9845a24f84d8741b8c39287a2007ec80d8e0e517686023d08a7a677426c77f3b12ec172edc05e7
 DIST libqmi-1.28.4.tar.xz 1168088 BLAKE2B 828a8688a49a08f0848414b8e51c2ece4a0035ecdf449a5dc9e2cf3b6ecaf1525d5a1c29e329a584ec054f66b9a141d0ba3980b8affb34db3088ed2b5591a265 SHA512 dad3cd2740804d2ec6aa04f0f140d385c00d5a3854d75ccdf54ee6fa4f3cdfc02de5da21cd8b43d5a7c6b467b94b5001bc857fbab01aeedbdb51c0e3d9da9690
-EBUILD libqmi-1.26.6.ebuild 1146 BLAKE2B e2bb050d6c6ade7ee0e493ab39297082ab155e6d3361d95222252a3e05443daaa64d0aa07eabf938825297980252ae9de5ddd0420b69adb68f447bf81890982f SHA512 51c72da9ef8d66a75c84d375d9ce27948b3570a7559e2a44d35e7fb4b4ba4f8b4e852e594e975544eefe8f490516802ff4c3b83fa216e7f13a372ea361661084
-EBUILD libqmi-1.28.2.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
-EBUILD libqmi-1.28.4.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
+EBUILD libqmi-1.28.4.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
 EBUILD libqmi-9999.ebuild 1223 BLAKE2B 526c92280dd6838c08a7bc56d975a472bce40b04627cbf2a69402cee7a32fd11b2ca4a658a333b2215272226a380b93aedb8f58bd7669da931c037b4169b9059 SHA512 ec855e747177f058290f8b0375dec0d0e73bca68d8eba4a70203d0013d5a9938c121423c1bbdf23649e20a62c8e3a413627bbf5d555eee05a486cc0434c99205
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.26.6.ebuild b/net-libs/libqmi/libqmi-1.26.6.ebuild
deleted file mode 100644
index c54d74cda658..000000000000
--- a/net-libs/libqmi/libqmi-1.26.6.ebuild
+++ /dev/null
@@ -1,46 +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="doc +mbim"
-
-RDEPEND=">=dev-libs/glib-2.48
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-Werror \
-		--disable-static \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libqmi/libqmi-1.28.2.ebuild b/net-libs/libqmi/libqmi-1.28.2.ebuild
deleted file mode 100644
index ae2df1d55498..000000000000
--- a/net-libs/libqmi/libqmi-1.28.2.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.28.4.ebuild b/net-libs/libqmi/libqmi-1.28.4.ebuild
index ae2df1d55498..c62b2a064ccf 100644
--- a/net-libs/libqmi/libqmi-1.28.4.ebuild
+++ b/net-libs/libqmi/libqmi-1.28.4.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 ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 277cd7e0f1dd..f3c6f1a1c461 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,3 +1,5 @@
 DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
+DIST librsync-2.3.2.tar.gz 194461 BLAKE2B 72f55c3809c35ee4eff4af03776aed6acfc33cf6109ea8e7fc5cdb4c3919e8f69f156d17ace4443bbb520cbdbe5220df7b5059f00173298839cbb86e0df491c7 SHA512 77d826dbaf02061b759d876a6b537238bad40379a08e4494ebfd3e380b2eb921b7b060bc570330aeac9424ef1a9d521f449d559c9ffa3be24acdef4ad530fe90
 EBUILD librsync-2.3.1.ebuild 594 BLAKE2B 5df6a99d740e44862e52a48bee73080e33137b612cd01587f5721a94a6bf6561ed53f2966c9d5e22cd9c71f87f12e43004e39e80bbfd5ad3fb031782019f9abd SHA512 1e2c13dae7ff32a99b039e837548a505c50ddea1f1e8ff742fe6a0b10334c0a30dd9989658ee2d382c1befce6fd2bbc5d03eaf2dd92aff00d636a4b6e5917c70
+EBUILD librsync-2.3.2.ebuild 588 BLAKE2B 3a766705041dc7d33ec1d85249852ab13446c31f7110bc245135e26fac951c40f4febc69e847b1420cd5e29479397439b8bc24e0172936e97bc7399e740af040 SHA512 2985f766f40c4084bce9389ba0f960dd9ea0d17684e19d81b57727deea4283e22edf41f1f4b3aa9ba4c222d06b778b1a719062fde13b3b49df4fb0882bdf4376
 MISC metadata.xml 387 BLAKE2B ddd9f98cc4a0e9974d3a3dfc0ea802f6821e4dd2d86705a8541ca2a85d0185396d2a70b44588bde7761244ab3654036c22d06c21f4e3b3cb76a29a3898d22dc6 SHA512 0c4185c4f98435361d1ee075718f7a8a5b9945087b56294add0813c9b5e3a69d88ffe98bb52ac23529aa4ffc44068eafa26d6ef59759ae50d52962dc129b992c
diff --git a/net-libs/librsync/librsync-2.3.2.ebuild b/net-libs/librsync/librsync-2.3.2.ebuild
new file mode 100644
index 000000000000..ac6abbb3ceaf
--- /dev/null
+++ b/net-libs/librsync/librsync-2.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBB2=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 969d5f126d0d..ec26dd811e47 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,4 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
-EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B f169f2ba7739d75aa7fd76078727aefd623fd86f43c7e666a2b5c86fda169c54626623cb7d6abf33304b56a7012cf5b9a3b7ad2dbb136ca0db0e10a3c785277b SHA512 17c345485bd99b036af6487369afb7566576f8e2963c1e5fc7cb75003a0ade7206dfcf9ec969ec7df511d3288172af856a3d2d7e14836f55ab4a0cfb843d69fe
-EBUILD libsoup-2.72.0.ebuild 3118 BLAKE2B 4d00e99941c176401a5f218a60765e6c3ccd12415b081525f01afed555d5b13f757213118c1175645ffcaebd1a8332ce7deeabd93946e1a18765604489bef3fa SHA512 fb6bea7d90da5967aa97d0358463e6cf6d4dea4a0b4120eebfbe784e5defd603edcba3e6bcaab576030c70d34163742ef95c6532f3445781b29253ad30b4c02e
+EBUILD libsoup-2.72.0.ebuild 3117 BLAKE2B 791f9bef929a9e8db3ff589e1af16399b6b49f667c674d5018ea7b94604e0f6fa9c613d6d66dc8d8e78d7c13f584b739cce7b2311ed1eb212c2d4cd5f9bb2a7e SHA512 9452b210f1fa4219cecd26306dad30d6733dfbb360d93eb9bd808a52b384f63ed1b61ab3f9974919eed80d3dc11371ef8c78fadaa774bcf67abed99090a57a8d
 MISC metadata.xml 577 BLAKE2B ce68b60f9438bad0b1fb848dada28796f4c9a8f6ed119b29c26139bf7c146edb7e701f7565e425c27587a911e62bd1ed15cb6d120696ab1ac0f631f9f8145cc4 SHA512 a2937c0036d3decd995f8e83321b7b1e2bd9f6a5fe83ff7061dc1443ef5cfb4714d38c32689cd46065a7efbb5c8f120eed5ebfad650e7ccf4f1d98d9d45afb0d
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
deleted file mode 100644
index fb3e43069562..000000000000
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ /dev/null
@@ -1,100 +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-minimal 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 test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~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}]
-	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-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
-		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
-		-Dvapi=$(multilib_native_usex vala enabled disabled)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.72.0.ebuild b/net-libs/libsoup/libsoup-2.72.0.ebuild
index 2374db53ddcb..5baaf04a13d2 100644
--- a/net-libs/libsoup/libsoup-2.72.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.72.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index f5d4289015ee..9807f467aa18 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,9 +3,11 @@ DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb
 DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
+DIST libtorrent-rasterbar-2.0.3.tar.gz 4294340 BLAKE2B 6726be94ea070676a8774d8b16ea1bcfcc2d08bc260914ef5529b0b166d681744c79ab258d251da6d21f7a7f1fbf9b8605ed5e6c8cf26cf878c3c8de1d54dccd SHA512 37211ac165db8542f8c2a29e28f4685b050a825c14d1f6328a4a96c2af1bc1bbf00d9dba4bc81c192f9b57ff358d1b27eeb7df7cebca5a2f751e6fb2bce3d257
 EBUILD libtorrent-rasterbar-1.2.10.ebuild 2648 BLAKE2B ebd430e186bfa02841dbbc63b101fd852e75591d74d8c019d66ab55d348e0abf0f263c153d2a714c82f54867958b3ae014615b6bb3bce6e5d0ca77c450343ce6 SHA512 77398998ebd68636f3f6dfc94fdf983155a2ff750ed381e9557c4d3f442d438b015f6e497d9c325be5c663ac4984328ef28b55733557de96274772d5a4e68e4a
 EBUILD libtorrent-rasterbar-1.2.11.ebuild 2672 BLAKE2B 2a617324db740db57e61cf86e383f9e67baa8fdd7ff7fcc559cca2842c0cfe5c5e1e367a33109abf7c17be213e0c61c0805880983f264d1a492aae3474763439 SHA512 6563b6768d9f9bff05fb6ba16c349abc167438918912d0f9e93c6a9310bf97dae432d0c2a090179add6db02223c36355c8f2d9f76fd3a4fe09d52f541970a276
 EBUILD libtorrent-rasterbar-1.2.12.ebuild 2674 BLAKE2B f175a3330bcde99d77afd59f0f1816b66747bde676844648ea4aacf3e52114be948fe172877b8b8c2d0d74563bb6b38cfec79c5d246ea48bfef249895a4ec135 SHA512 639336c6e9cd5c261f724fdfe2d29dac43f5c2b9fdc042cd76bc82495af3610edf0335db11a5c882376cc250f993092ff7cde993f5e8ec43eea7df8377b0478a
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2437 BLAKE2B 7e76d208d4cf49fdb389f17eed2d807e1d850f09ec12a710256064ed96fb9c04a6d74f28a9cfa2827b2793e2925d8bc8073632991c90d5ad8e6a039587e62322 SHA512 3d92cd4365731334a988756a2b2925ef882a5ef83ed75b2309aac958f0d6549bdb5fe15b16a2f432755c105b34df9002c6221e58970971ffa8001f0a8d036388
 EBUILD libtorrent-rasterbar-1.2.9.ebuild 2648 BLAKE2B ebd430e186bfa02841dbbc63b101fd852e75591d74d8c019d66ab55d348e0abf0f263c153d2a714c82f54867958b3ae014615b6bb3bce6e5d0ca77c450343ce6 SHA512 77398998ebd68636f3f6dfc94fdf983155a2ff750ed381e9557c4d3f442d438b015f6e497d9c325be5c663ac4984328ef28b55733557de96274772d5a4e68e4a
+EBUILD libtorrent-rasterbar-2.0.3.ebuild 1287 BLAKE2B f72ec9986337dccc9f303c4500698e7a888e8b33b8ab7613e9a9aca211c4b6719e606ede88f6725709e8510e825ba1dd6178b2b22b6b991dc71bc07222846ff9 SHA512 f9be9759db7e2703bda4e2d3507ac10b9e8126bebb08de91d88d84a03a614eb21433fb19f4284137bbaf7c0985f208cf3c1d442532a9fc81de646dcfd48005c1
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3.ebuild
new file mode 100644
index 000000000000..fa7e0e64fa83
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug gnutls python ssl test"
+
+RESTRICT="!test? ( test ) test" # not yet fixed
+RDEPEND="dev-libs/boost:=[threads]"
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]')
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	${DEPEND}
+"
+
+pkg_setup() {
+	use python && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dgnutls=$(usex gnutls ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON}" )
+
+	cmake_src_configure
+}
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 73a2f4a23cc6..544b68bb13b5 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
-DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
-DIST libyang-1.0.225.tar.gz 1667054 BLAKE2B eb1bfd555d72aceba7da7ade1a55985caad9d3cc904c5504978c298ef9e08a6848c810d1b62b1fa7076a9f30638b6080a3546c07892d3e8980eb1db337dc4deb SHA512 3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
-EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
-EBUILD libyang-1.0.225.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308
-MISC metadata.xml 326 BLAKE2B e52c1d56ed6f14dee505e8db5bfede4cb326e8a98a50df576244e8f2ce44d964449acbf00ad9bcd27f22546e1a029cfdec22919edd887a2db9e10f471f322af5 SHA512 bb91dc41fa93fae47c0ad7fa99868284e61a3d24b261cb5feb44cdcd91255744de1d860b1b98374e8d4a8ed4e931c2298c28527709f3e8c5b4bb223484edc076
+DIST libyang-1.0.236.tar.gz 1669013 BLAKE2B c977c4abd2466e88519e91483d876bf0b9397b32bcca017eaa948d638a70d3275cdec36070bad8925c87e3a6756df924ed043a14ecb6d23de8b63992f8607e58 SHA512 7e8be96bc87ea5c906d90e09f4fbae0ed96718894d3fbc784172cdc68e9e2c034fc8a114bc1389fb74ef32dfb65e447acff24b82967af1530ffba94cd204e6e9
+DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
+EBUILD libyang-1.0.236.ebuild 988 BLAKE2B 5c426507aa166549c283169f65ac56136fa62857db55dad0d145d5a67c6ad99b9b6a34cf280063b0923c97441bf23625ab35449c14fb7375e27f32dad71c0d5f SHA512 cc300ada4d32f432a88da55eea518748774b7f7642738ac5e9c7b206c46ac0bcad2ae36a2c5af22655796a3ea3183360ca2e410655aa23d86a6849c06ca5125d
+EBUILD libyang-2.0.7.ebuild 861 BLAKE2B d0fd56392c038e0ea9a338fc5b6013c4871d0f463f60acdc6c09c86b3a41a01d6a750c57b8adad1ab305aa39aec4915472e2ea8873347f53230767a72bad8a9e SHA512 114e1c5c874d8c7fe74de3b0808f83c0e625a19e0b82059eda67a2d213208ec988d1f8c5d1e0cfb6bb5a58c90f21e7de0090803090bd8b47ff65bd3496d61340
+MISC metadata.xml 585 BLAKE2B b4ee06f08fd3f10d45796cb0b3bde13c0790c4883b3408f3c89f7b0812b49206b741556ad2b28772ff1b18a40ad517f988ff4301c1a4270d127ab6ba0632c752 SHA512 54ccc9ecd6b9981ce5544174a74c8d9d5517e8c56b7a28402cac8af3d854c7e41ab8e2a0ad5a0fbd4d6460f848ee9a31f64b6b74cc1b7a1333e2899ceae9ba6f
diff --git a/net-libs/libyang/libyang-1.0.225.ebuild b/net-libs/libyang/libyang-1.0.236.ebuild
index 463140a483d6..efde262106a0 100644
--- a/net-libs/libyang/libyang-1.0.225.ebuild
+++ b/net-libs/libyang/libyang-1.0.236.ebuild
@@ -6,13 +6,15 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
+MY_COMMIT="587a1e973ea6463e4dd3c935b6f97da909f8ac24"
 DESCRIPTION="YANG data modeling language library"
 HOMEPAGE="https://github.com/CESNET/libyang"
-SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/CESNET/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
diff --git a/net-libs/libyang/libyang-1.0.215.ebuild b/net-libs/libyang/libyang-2.0.7.ebuild
index 4d3674d9b3ad..6254659806fa 100644
--- a/net-libs/libyang/libyang-1.0.215.ebuild
+++ b/net-libs/libyang/libyang-2.0.7.ebuild
@@ -12,25 +12,23 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
 "
 
-RESTRICT="!test? ( test )"
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BUILD_TESTS=$(usex test)
-		-DENABLE_LYD_PRIV=yes
-		-DGEN_LANGUAGE_BINDINGS=no
 	)
 	cmake_src_configure
 }
@@ -42,5 +40,5 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	use doc && dodoc -r "${S}"/doc/*
+	use doc && dodoc -r doc/.
 }
diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml
index 7e90f003c441..7e80d8aa1297 100644
--- a/net-libs/libyang/metadata.xml
+++ b/net-libs/libyang/metadata.xml
@@ -5,6 +5,14 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">CESNET/libyang</remote-id>
 	</upstream>
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index c425a575097c..6d1dccbfeb4e 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,3 +1,3 @@
 DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4
-EBUILD ortp-0.23.0-r1.ebuild 1784 BLAKE2B 2be836e14b1de0d47b80c276e636679d830b14ad3a0c526ace58ac420bd0e6f0fe0096d8af79b4c1ce57308c3f4073a2a1f5d49775b0895769ce473f21d2b291 SHA512 2ef53e22d14cd50611304dd65866476876c67a62a186f60c2c8a700d4ebce703c69ad924ce931ab5201356957e329458434f9c9ffdfec52203cd10b954fec8f2
-MISC metadata.xml 362 BLAKE2B e561cbf846ef904afde531f0cdba64d3855a93766622d90a393e45f0d5ad3da533afac394ba031edbb4afa6ca8a4b95c101f76f2f96450edecaf617ea24dc996 SHA512 6a9fd13fe951f0cdd6574a83f53a0c21324fa9cf45c878e71fe1c6aefa6a52ca8e285f2d433d2bd62723241b59793c06d66e4e9f6f8be1530f8377de224a66c7
+EBUILD ortp-0.23.0-r1.ebuild 1789 BLAKE2B 03b5b5066243a45fcc155d6bc0fb9d7c6ba2083cc917e8785f8aa3eed8b9391b1a1a9d7d3397af412d0201ba114b4bb88941b7439201e604c88c0526e5a751ab SHA512 536f1810a52def31bfd59bbc1ad592f766554bb2b9e8e3804bc387919972e0d0ab7ec91740d13fdce01e22b5d4d837a9857ff5b31a4b11fb7746bff4d207dc87
+MISC metadata.xml 315 BLAKE2B 510d7118a2bd836632ed316a6ade88f2ba8ece33fcdbab519230b1e988ce34ecf6f44a437350155e12457f2b1c9cba034c774cb83919a9ce6e809b79b18515d6 SHA512 32a0ccb131f93590702d132a5fcd5ba0f4c7249df1dbe947ee613d877254b690a4ac9060f99e4c53a7f2df8f6de0752798ef7c9daf1b4a10d5da32eedc262a96
diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
index 6e703ab66664..747f570c5cb8 100644
--- a/net-libs/ortp/metadata.xml
+++ b/net-libs/ortp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
 	<use>
 		<flag name="ntp-timestamp">Turn on NTP timestamping on received packet</flag>
 		<flag name="srtp">Add support for Secure RTP</flag>
diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
index a251486bbcce..ce209560f3a4 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune
 
 DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
 HOMEPAGE="http://www.linphone.org/"
@@ -67,7 +66,7 @@ src_install() {
 
 	einstalldocs
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index 98c4b2a194cb..77166eccdceb 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -1,8 +1,6 @@
 AUX 2.5-meson-Allow-specifying-systemd-udev-directories.patch 2410 BLAKE2B c511c6fa826e0ddad009ae35876d310b9baab86bdf773d28aacf8c92fe69c930d0f4ddbc37e43cb40bef22319fb6ef5b2a8a1a199456c7fb5c918a9b7449c4a1 SHA512 1f800ece56e65dc309df47c66aef02499fddf707dcdc98031f528d2648776d70dcd7099cd784fbf4ca34352caecee7e1d5aba8b314580326b4c74a0c0ffcab6d
 AUX 70-spice-webdavd.rules 159 BLAKE2B 712c2513f1322e4144229e31c4df83cec6780a57590c26cca76d5a1d2844a7ea6bd0696906abba5441023b44985e26cee578a4c21ec00b62b236fdc25de2a964 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc
 AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8dbb050d255cb87e1847f6672ab7121829d08c39ae0b028c2e7d8e375724a1b6e06e8e547291cf0188749b SHA512 df4e08bb5fec88bd7c0002e25c5ce348f538d49de9b74890c97a53516e8c3d0f60c87c77050c5357e73f5d33f1daaabb9007d7e35d4d34b15b105dc4ce273dfb
-DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
 DIST phodav-2.5.tar.xz 62992 BLAKE2B aca0141c20c727dd27af3760caf27ec0f7a4936c3c35dbdb60a8a15b5bd75ebd97dfef8bb96f50b266d7a0e53fb8c0e21416dea855ff107b362dba0e89283a64 SHA512 4b6cd6a40118bf9c042abcfc3e7cb593b620922aae4dd3daf77682bf9da2030a0958bc0206531d5950f85551ef8f5da21fb21c54b9bd5e56b880f54e0983bc01
-EBUILD phodav-2.2.ebuild 1524 BLAKE2B b1200825d532fa4af5ab4066ff7d730b6fc8aeb82fceda1768e9f6a70632df85c2c5f5a41fe2426f5dc11f9636cc3b2bffee18e9d7532cf9140fc0cf1ec3bcfc SHA512 3a54cf590cb2814895d53446c3fa4bf95ad383895073f7717becf35a49f0ac8b119f345d613660d7888eac5c9fbb52cbb8905a1e65df46f39b2a229b243e0f62
-EBUILD phodav-2.5.ebuild 1224 BLAKE2B 0d8a611f1faca656fde841303b4b7f86c9fbb83d867452f787790c75f38bd9f88a3818549f90989447f6173059414f603caa8906546aec78abf02e77709cd6aa SHA512 95cf8188f1b2cf7e09ba6bd702d34070913cf599617d2ebb84f6d32dab7bbc6bfa0343a735b9b330e85c4470bc4a18238a5bee274927298ab6b86fb5ecc709fd
-MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
+EBUILD phodav-2.5.ebuild 1219 BLAKE2B f93962a926e022d7718eae9d25fdbddf0c24a781632cb0cda8e52a4f628cc0c239799a9bab84994be32142ac74623773e4aa07ce258f421d039653d4339f0ca5 SHA512 352e9282c48512e3489c0d3b6991f8652fc672d41a11c111e6493ab13f5276bf28409cf950db4f8e4b9214a7c1c0bffac4ed5d5fed5b5a85d16298ba08b557cb
+MISC metadata.xml 385 BLAKE2B 3774e6b008d03e6b85bfaab9102314fc304041d357ef7ab1b5f63fcc1245ce357efcb50ceae8c9d4095e8467a929a8e4d5b6be4ef3c5e516b2f16caa10b1f60e SHA512 524494af5a1320eb5408b1ba03e7158c2433be3089c255394a3ccacfd1c4a0e2ecd5da49b67d9e570e2cfbb9e5a752f0e1d4157da2b4901e3dd779ff4dd86de6
diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
index 60f44adfbc68..53c3a7d09c48 100644
--- a/net-libs/phodav/metadata.xml
+++ b/net-libs/phodav/metadata.xml
@@ -9,7 +9,4 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
-	<use>
-		<flag name="spice">Install the spice-webdavd guest agent</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
deleted file mode 100644
index 4ccb85882334..000000000000
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd udev
-
-DESCRIPTION="WebDav server implementation using libsoup"
-HOMEPAGE="https://wiki.gnome.org/phodav"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="spice systemd zeroconf"
-
-# It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they
-# were merged, it conflicts and crashes. Ensure glib versions from >2.51 are used, so it
-# doesn't break badly when phodav-2.2 is upgraded to before glib to 2.52
-RDEPEND="
-	>=dev-libs/glib-2.51:2
-	>=net-libs/libsoup-2.48:2.4
-	dev-libs/libxml2
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--program-suffix=-${SLOT} \
-		$(use_with zeroconf avahi) \
-		--with-udevdir=$(get_udevdir) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-	if ! use zeroconf ; then
-		sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use spice ; then
-		if ! use systemd ; then
-			newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
-			udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
-			rm -r "${D}$(systemd_get_systemunitdir)" || die
-		fi
-	else
-		rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_systemunitdir)} || die
-	fi
-}
diff --git a/net-libs/phodav/phodav-2.5.ebuild b/net-libs/phodav/phodav-2.5.ebuild
index 884a5f1534ba..c0d530ca02be 100644
--- a/net-libs/phodav/phodav-2.5.ebuild
+++ b/net-libs/phodav/phodav-2.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="gtk-doc systemd zeroconf"
 
 RDEPEND="
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 4e846277a223..cf3945b1e780 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,6 @@
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
+DIST qxmpp-1.4.0.tar.gz 313356 BLAKE2B a3a5c5cf3b16c319a6eddb3808f22af946040945eb8e66a641fe3117217b04eaf4e2b88dab8fa9cd2a3034d54884e1fa3563b0e775660645a5bdd6045469f9a5 SHA512 5a0cb72899314e47846b8b47340738df20a8d198c2db8cfe38c2cc31615166e9d86c6aaf6931be16078b2f9decca2d767497ad32e1d6dd0f6af888406c33fee9
 EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
+EBUILD qxmpp-1.4.0.ebuild 1135 BLAKE2B 3513ece69adb5466412f02a982422f32098088974e68decedde0c88aae688613fd3d17fded4ef931aaa13725c372eac8c69a7032efe5876328c47da7b65c5d86 SHA512 fa834560ef669a2c0cf7e5dc2eb51c58b406ac18739a0d598d646a976eb91dbd8b0f1d0c0e677ecb4622da664d99110e0d42750c2c406ccc4c6ba17b07600697
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 740 BLAKE2B 1e3768ea74d58751d412023ca0b03a30b56f3e8e9182ab2529235f14fc6c78ce8883734f1b8453ae8c747f97a6a9437d3ebe49a815f3f18faded699592639323 SHA512 deaf8ea5ecb7bbe774b73838bf3a2aed915c0a1b7ba0bc128e1cab50e6bcc51afda3a6b056ea70dc51fd25ac0bddd3ad98939df5e0ab6b35be5f19969e51960b
diff --git a/net-libs/qxmpp/qxmpp-1.4.0.ebuild b/net-libs/qxmpp/qxmpp-1.4.0.ebuild
new file mode 100644
index 000000000000..74b3aa3678f9
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gstreamer test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	gstreamer? ( media-libs/gstreamer )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	# requires network connection, bug #623708
+	sed \
+		-e "/qxmppiceconnection/d" \
+		-e "/qxmppserver/d" \
+		-e "/qxmpptransfermanager/d" \
+		-i tests/CMakeLists.txt \
+		|| die "failed to drop certain network tests"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_INTERNAL_TESTS=$(usex test)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index c26f2b1166cf..8d38a5e9856e 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,6 +1,3 @@
-AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098c534f9df19ca9b44b98f9f539fa2b1aa5cd9fa0af8054387bfa19f5960200cd15d213d7c96f14c715d5479d SHA512 1b3358e7a5da2a3fc896aacd62adc70e803aa441465f1fa560745f90a48f8c46dff3fa594285fe0bf24008e572be3f20449f5de10087ea1527fbd392c0a4af31
-DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
 DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
-EBUILD socket_wrapper-1.2.3.ebuild 654 BLAKE2B bb26492c7be4e1bf50190fdc4bb4114ed4ed22613076f90e6500fe568ff1b1363e4b84f9b72e746728eeab3115ef9f224f5d583b789ff5437404dec5dab4dd70 SHA512 68604ee3717a131e17eb8e8f165b8b05b950e9b41c4cc2a19471d4a6fc1784cc9170f292613fdf97b76832b8a785ce00ab8cccc94991d28931d3df0e023b7c77
 EBUILD socket_wrapper-1.3.2.ebuild 625 BLAKE2B 2f21dabcf5cb5cdfb83dee1d0bd1087fd8ab16d4877cd895af32489adb0952c30cd2294b2eaebb4cafd5775a7c66eba6fa0d567085195d5878a54f8115a698dd SHA512 c8ea9e7258d40daa04ea539592e63a7b991d31a11490e4650658fe119d4c3e3ffe664fc99090515ae9b3d4c09243aeed31288af75558cbf19aba011b8ca50546
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch b/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch
deleted file mode 100644
index 49aca70becdf..000000000000
--- a/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a70e32fa9d60adde861618c91618a3be80f07c22 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 7 May 2020 23:28:50 -0400
-Subject: [PATCH] tests: do not truncate pid to 16 bits
-
-On Linux, pid_t is a 32-bit type, and the kernel permits pids up to 22
-bits in length.
-
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- tests/torture.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/tests/torture.c b/tests/torture.c
-index e55ebcf..8524138 100644
---- a/tests/torture.c
-+++ b/tests/torture.c
-@@ -255,8 +255,7 @@ void torture_teardown_socket_dir(void **state)
- void torture_teardown_echo_srv(void **state)
- {
- 	struct torture_state *s = *state;
--	char buf[8] = {0};
--	long int tmp;
-+	char buf[11] = {0};
- 	ssize_t rc;
- 	pid_t pid;
- 	int fd;
-@@ -277,13 +276,12 @@ void torture_teardown_echo_srv(void **state)
- 
- 	buf[sizeof(buf) - 1] = '\0';
- 
--	tmp = strtol(buf, NULL, 10);
--	if (tmp == 0 || tmp > 0xFFFF || errno == ERANGE) {
-+	errno = 0;
-+	pid = strtol(buf, NULL, 10);
-+	if (pid == 0 || errno != 0) {
- 		goto done;
- 	}
- 
--	pid = (pid_t)(tmp & 0xFFFF);
--
- 	for (count = 0; count < 10; count++) {
- 		/* Make sure the daemon goes away! */
- 		kill(pid, SIGTERM);
--- 
-2.26.2
-
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
deleted file mode 100644
index 29a7bc245040..000000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-HOMEPAGE="https://cwrap.org/socket_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( >=dev-util/cmocka-1.1.0 )"
-
-PATCHES=(
-	"${FILESDIR}"/1.2.4-tests-pid.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test ON OFF)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 6252ff76ea57..dec8511b122e 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,8 +1,6 @@
 AUX srt-1.4.2-cxx-include-gcc11.patch 577 BLAKE2B 152d5faa123816088d7d49220c27400d8dfac5cd2234f4f290b48e21b54d78a5ce4f7bd92abdb5ef9c7bdf959fb249b3ff483ae88681fbe6115c657fd8cfd159 SHA512 95d0d67f7dc42621832037f94ee8eddb46ccd56c813cbdc87a43b59b8bb8827b20269d59fed46a8a1f348b7979ed7e39986d71c923ca5f1eab90d02af410d1a6
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
-DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe
-EBUILD srt-1.4.1-r1.ebuild 1048 BLAKE2B 5a975b1bd7558d44ab22a241eb2a77e7afbb3056d3db5b3239b025334678fda68bab539c9bc0ddfd08ad918a10fe23361728f8a651b407306dccd762cb409a32 SHA512 e108397cb685914a93644878df8523f80e254e2dee8d8269a614c6b098aab2a60c0d5df0a2350394b28104a25219caa28709c9080b3db81850e7456958d4442b
 EBUILD srt-1.4.2.ebuild 1105 BLAKE2B c2b7597509470db7a5d51d5c420ba5e4fb1d6c412fe8cc28b28d8f231d81ddb2dfc984766bb41fe46f2f99e5979ebd0aabb6a35ec6fb1ca9cc60e9bc703e638b SHA512 5ea2b7ea7b000b3d6324a8255d0df89f8b5cc769319580db4d570e711f0f6c8d9c5598dc9759cf9e931060c1009f5fc35b7a8f17b9b1fda25cd2af52ca109c3c
 EBUILD srt-9999.ebuild 1154 BLAKE2B ae9be19f6f30adc4b52d2c313644b7780b20dd8343ee0b8ef859ce93742b93581148b6664ca5793a6aa0f49c9e9669fdd418cf2cdb995dbee8346693183cb389 SHA512 a1b1604c405278952a709c50d74eb6c32a3182b26a0849c9101647f7b06bed4926ca8de68233dea454714af0a3de6494c5f8198bc11c38ef27a4d2e9cbf386e4
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.4.1-r1.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild
deleted file mode 100644
index 4392bba27262..000000000000
--- a/net-libs/srt/srt-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
-HOMEPAGE="https://github.com/Haivision/srt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="gnutls"
-
-DEPEND="
-	gnutls? (
-		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
-	)
-	!gnutls? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC=OFF
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 4122aa3915ef..943a1a354bc0 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
-EBUILD uhttpmock-0.5.3.ebuild 939 BLAKE2B b88e545dce95af60aa2eae828e0f1b0953381f346e132fced8331b00c1edc1b46bbae51463b13b735bef018b315fc85b8a76efb74b0f203e13a44b25d05abe4e SHA512 492b85c14dc6b94e8d55d732dcf268183b39fb754fb96dfb7ae1e8dd3192d2dd4e0679583affd71fc93d57a017f899f5bfbd8c53653883cf11d7d407299f4066
+EBUILD uhttpmock-0.5.3.ebuild 936 BLAKE2B b7445597e80f9cb22ea11ecf6672e0a82b2e23b55beb4ac77d652473b82125568aa45baf35a7d387939fcf3aff44b78942279da282bf64aef828f46580b62ed0 SHA512 c8ab0ef9d838d1b6a52b12826e52d0acb288cb83a902131492e3d4e5e75f495b85dcef88f1e1145a7d7916c8b9b0d6002ad88c74ade1825efbc5ce27a6819e25
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
index cca319670b85..a1d0cd4dc51d 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3970ce914046..dde09b448e98 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,11 +1,5 @@
-AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b02e7d9e82cc7e06b7126e36d9c060f2342b57985bc7a5d1fa52c4d2203cdf7164a87af60ad9872bc6d12b7e14b435 SHA512 51da3680d873e7ee435a4a4bf0d23171a4ecf80fc3ea5ce60c71a55db2cf090754a4ed0c0a5297995f3729928d31541bab9528695c557c0c309338a7a75439b6
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
-AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
-AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827bd39afe3c0f6a615c7ac9ff36b74d9a4ed34b7d91ff9400fd5acaa4d9321c22662d8625a7510a2c6ae411d6bd4c593 SHA512 15cc427a6db3fb32f1951d1dbb39b5d869601be916179d17dec244e80cda16814598271667e2cee75d367e596c470bb8c837abc7651e65ab19305c9b9fbf0002
 AUX 2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch 1893 BLAKE2B be04d827fee9d17d64230c485add8dd21be6f8c9787c0407973774fd2ced724c00c688476c47bddaccaed3b59dab53dfc4de11f2b96139fe2a74b68cf57eae50 SHA512 3eaff22c9002fde1567331ede3196c733c34986932212954270bb59a5c776d6e4709ee8e366cdcdaeb67e36cd7757d01f4cce84ce4e2d6a1eca3c6ab3fa98f66
-AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
-DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
-EBUILD webkit-gtk-2.30.6.ebuild 9253 BLAKE2B 6329515f2f5d078f3e1ecbbd0a421d0ec7eb6453823b531671f55ea2db37a167e06f2d218724274e7344151a8ec2cdb9e17c1b0690a8a4f7bc326a5603e92f61 SHA512 c2e89802288ce9298bc73b82f59ceaf08692cf9eff5a36177d44c0b96d7bded2dca90342b599c16c7a7bb4813deadbd29d0fd83ed60d162b1055d574ad6b2856
-EBUILD webkit-gtk-2.32.1.ebuild 9224 BLAKE2B 77078575ce00bebd07aefcae7eac74a8eacaf69f0f4b896612261be08b771e48c168dd1744e9aa36824f885a83fa294cdb973f17aae91c58231cb90a76539459 SHA512 fa497e9ede9f440fc32c897521f9d1e945b6451ec704ecf0ce1601e64aecccd6eab1ec0144dc6b5aa990c3f4e9f8f7b37b3232be6409a5c133d1aa0974711474
+EBUILD webkit-gtk-2.32.1.ebuild 9219 BLAKE2B f1a1b08374d123ba0d97361dd81fa6fa7d6dd22e8ad02d5cc37b315dadd505d013541c803b30fc3c93d6126934fa9199761305c8ba12eb955947f99ce187b1e4 SHA512 b51d1de9a62f612080bfc7bc470715e3faa4725d5774527c775be399b9811103e0d263b43016b150f19f5d76b6e20db465c8d42abd7466eaab1af67c48b2f911
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
deleted file mode 100644
index da9f1d3f56a1..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 12 May 2020 15:28:45 +0300
-Subject: [PATCH] Try to fix an apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function ‘WTF::RefPtr<WebKit::InjectedBundleNodeHandle>
-WebKit::InjectedBundleHitTestResult::urlElementHandle() const’:
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to
-‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’
-   57 |     return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement());
-      |                                                                              ^
-In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29
----
- .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp    | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-index df8e55df1f0..26f045bd3fc 100644
---- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-@@ -32,6 +32,7 @@
- #include "WebImage.h"
- #include <WebCore/BitmapImage.h>
- #include <WebCore/Document.h>
-+#include <WebCore/Element.h>
- #include <WebCore/Frame.h>
- #include <WebCore/FrameLoader.h>
- #include <WebCore/FrameView.h>
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
deleted file mode 100644
index d7bc379d2b15..000000000000
--- a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 11 Jul 2020 15:28:05 +0300
-Subject: [PATCH] Try to fix another apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from here
-/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
-   79 |  static_assert(sizeof(_Tp)>0,
-      |                ^~~~~~~~~~~
----
- Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-index 55d9e34df61..12a7a83cc61 100644
---- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-+++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-@@ -19,6 +19,7 @@
- 
- #pragma once
- 
-+#include "ImageBuffer.h"
- #include "RenderSVGResourceContainer.h"
- #include "SVGClipPathElement.h"
- #include "SVGUnitTypes.h"
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
deleted file mode 100644
index 5e9f42677314..000000000000
--- a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 27 Nov 2020 22:47:30 +0200
-Subject: [PATCH] [X11] Fix build with disabled OpenGL
-
-The added PlatformDisplayX11::visual() method requires symbols from
-X11/Xutil.h, which wasn't added as an explicit include with only
-EGL headers indirectly pulled it in with standard build options.
----
- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-index 8fe3d3e92c88..2b2805446aad 100644
---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-@@ -30,6 +30,7 @@
- 
- #if PLATFORM(X11)
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
- #include <X11/extensions/Xcomposite.h>
- #if PLATFORM(GTK)
- #include <X11/extensions/Xdamage.h>
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
deleted file mode 100644
index 9c277e719d89..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-08-26 17:55:46.000000000 +0300
-+++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2019-11-04 23:33:44.146933810 +0300
-@@ -31,6 +31,7 @@ 
- #include "WebKitWaylandServerProtocol.h"
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <WebCore/GLContext.h>
- #include <WebCore/PlatformDisplayWayland.h>
- #include <WebCore/Region.h>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
deleted file mode 100644
index 5c70c3a07d25..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ /dev/null
@@ -1,300 +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} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~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"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-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?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	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() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
-	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-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=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# 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)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-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_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-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)
-		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-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}
-	)
-
-	# 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
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
index eb00847845d7..9594f2f217a5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.1.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 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~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"
 
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 78d0f8dd5298..aaad202d51d2 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,5 +1,7 @@
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
 DIST xrootd-ceph-5.1.1.tar.gz 81981 BLAKE2B 6f0ddfd2e20c0127223d3d41e614fbefefb8e1ce20ae9a805fc0d01d7c442f0b9b9323ba1761a9b5a160f63bfe1c823384f84c160eb98d316bddc3c1affe2b6c SHA512 fede94cbe614b6c7dced07d1bbe8661706c0e0c98c77cab0a777b62cb7b1a0790ce597bb6764b36b6d2cba9884f23f6d37d54adb5b11cb6d20e32b95a2877ef3
+DIST xrootd-ceph-5.2.0.tar.gz 82017 BLAKE2B 604c2c9eae857f05160b3cd853591283c5aebdec2345a810d2454f34bc22768db15f973ca9f672e6522297f939586ca8e996222487e2c1733205159521bf4996 SHA512 fdfe71c9bd087d216c2c4536b130cf90a392032ac8d0ad294b8ee7358449cbdf779f0f5d5aca02062cc04f510678bc6171f3dd29ad1f7aa207617aa3dfbd6f54
 EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
 EBUILD xrootd-ceph-5.1.1.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
+EBUILD xrootd-ceph-5.2.0.ebuild 866 BLAKE2B 4940f24e57982d9e0c1f19f3e7d9a9a5ef31e57b7a76f4a6d4830b5028dd018617c0296566781c490839994d5ef51d9c4eca627199051322f78e240f507d0368 SHA512 224ca2782fc5776fad99d4bfcd657e919dcf2f7b8edbcb1acca6d7fe02d5f592daa62c67ef0e7ad5e0fdd9aeb0f9b259e37442fd7b93ae7e70236e77ec91426b
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild
new file mode 100644
index 000000000000..a9f500fa3351
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=net-libs/xrootd-5.0.0
+	sys-cluster/ceph"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/cppunit )"
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdCephTests\.so"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 37ceac7ba624..da58ea2a7573 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -6,6 +6,8 @@ AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
 DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f
+DIST xrootd-5.2.0.tar.gz 2935040 BLAKE2B 1aa58ea188faef3e3691e77b08529d14e0bf04c18127b8b8ae6a7154700af67b1d900b64cf4f505b90963e2925e32935d4bcf9d1d913ba0973713b5c69301dd2 SHA512 cfd41d2e678ad339677abb62f329828de368ea5af9c9103722b75bcbb0812a2f1695986ca953651e2418fc839d7a50072635b806c9292aeaff702e269bbc11da
 EBUILD xrootd-5.0.3.ebuild 2639 BLAKE2B 53277652dfe77b32d5dbeb98f1aea19900f68ae5de1f700191dc08d324e4cfbb068883d9ce2f6bb517389279b6eb884997c4df40d0c9bbecf32a51ee559bd3f6 SHA512 a60b4f76c8e052dc37d58f507704d8013cc8f170b4f24555055b0e0761ec2a6b0bdfd24432de468c4211dade85fa5674a2afd04b601c52980c3648c54bc06e36
 EBUILD xrootd-5.1.1.ebuild 2641 BLAKE2B 667907d947a41fc82698201b7cc7d22ec1cd3263670d9208ea65a0670e7224e38c8daf6a2715f8641e4756cca702f4ca925f26c5320afe9b1200f1b54739bc17 SHA512 7694c5f863ed39a248284836fcdd44b9bcde6aca22dbfa1ff7a9c8cee7edd7cbb1186e4e5bc6ab4e2999da0602c009854c25253002f7122192699b3d766903e4
+EBUILD xrootd-5.2.0.ebuild 2642 BLAKE2B 388822260154b77240858457cd65b6255be70d577d4352aaf8de458d538a38fc61e9caa9a095a08699d3835756f721730264b1f31f0d354b938de08a2aa33915 SHA512 884b84a2412ead649c63d23d06c0a6d5693e8b14cd96d1655e4e137bbffbda9f40eb7755fb16c42e05bb210e9052b8f1c5965f7ad18675eee3b3f3a4a4a02c57
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-5.2.0.ebuild b/net-libs/xrootd/xrootd-5.2.0.ebuild
new file mode 100644
index 000000000000..e5ab9108cfae
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+# Upstream does not support the building of Python bindings
+# via CMake for more than one implementation at a time.
+inherit cmake python-single-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline ssl test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		python? ( dev-python/sphinx )
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdClTests\.so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /net-libs
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)