gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /net-libs
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
113 files changed, 1082 insertions, 2053 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6d709504535c..9074bfede821 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index b16a42648e75..662412c41f13 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,7 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
+AUX gnutls-3.7.0-ignore-duplicate-certificates.patch 11218 BLAKE2B 2d2b03b17dd482e11c4d51e8947459f0543f6f053be4175bd324b3395af31b77fd689613842abd147ae2cfe6ad4f0abf3f9dd80dec69685b36097828a0008dfc SHA512 65e0a4660caee99ca2d129227061a165fa7a0f5aee085a1ab5e4bf4939549e268d2988d601bc3a719c64e19597fd45bb19b3e6f721ac7ba290249c67e345096b
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
 EBUILD gnutls-3.6.15.ebuild 4303 BLAKE2B c4aa9aed6ba8b99aaae8c3541d087afe299e37beaf78167876535b49aa9f7bc5ef624d5b04d4124df074ae08c63dccdb543e4bcdf9347cf6c4ac86938d60c62e SHA512 61a3ff29bd0821b07a7792b0d5d1520eb1abadc87119b8ba1cdc30980c299e47e40637cee61621607d860f7b66a38cc17714938995e7c477d1a85fd4b5b4e001
-EBUILD gnutls-3.7.0.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5
+EBUILD gnutls-3.7.0-r1.ebuild 4308 BLAKE2B c72d05e3119bf539a2f5058ba2d917c28f05700d20a7e5773ad8ef3d3bcffb1ec5603e5238d42aef2e2ecf8d7d8755cdef181ded939cb683a93e2ae416506f16 SHA512 35e6036471eb50cea51e52614dc169972d8cba4da7e36b6f0e9c357e3c9d54e7cab828c84fd86ad6d960ad8807d3d599acb1c1109cbe29cfb3ccc351610633a3
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch b/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
new file mode 100644
index 000000000000..b0143818b46b
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
@@ -0,0 +1,403 @@
+From 09b40be6e0e0a59ba4bd764067eb353241043a70 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Mon, 28 Dec 2020 12:14:13 +0100
+Subject: [PATCH] gnutls_x509_trust_list_verify_crt2: ignore duplicate
+ certificates
+
+The commit ebb19db9165fed30d73c83bab1b1b8740c132dfd caused a
+regression, where duplicate certificates in a certificate chain are no
+longer ignored but treated as a non-contiguous segment and that
+results in calling the issuer callback, or a verification failure.
+
+This adds a mechanism to record certificates already seen in the
+chain, and skip them while still allow the caller to inject missing
+certificates.
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+Co-authored-by: Andreas Metzler <ametzler@debian.org>
+---
+ lib/x509/common.c          |   8 ++
+ lib/x509/verify-high.c     | 157 +++++++++++++++++++++++++++++++------
+ tests/missingissuer.c      |   2 +
+ tests/test-chains-issuer.h | 101 +++++++++++++++++++++++-
+ 4 files changed, 245 insertions(+), 23 deletions(-)
+
+diff --git a/lib/x509/common.c b/lib/x509/common.c
+index 3301aaad0c..10c8db53c0 100644
+--- a/lib/x509/common.c
++++ b/lib/x509/common.c
+@@ -1758,6 +1758,14 @@ unsigned int _gnutls_sort_clist(gnutls_x509_crt_t *clist,
+ 	 * increasing DEFAULT_MAX_VERIFY_DEPTH.
+ 	 */
+ 	for (i = 0; i < clist_size; i++) {
++		/* Self-signed certificate found in the chain; skip it
++		 * as it should only appear in the trusted set.
++		 */
++		if (gnutls_x509_crt_check_issuer(clist[i], clist[i])) {
++			_gnutls_cert_log("self-signed cert found", clist[i]);
++			continue;
++		}
++
+ 		for (j = 1; j < clist_size; j++) {
+ 			if (i == j)
+ 				continue;
+diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
+index 588e7ee0dc..9a16e6b42a 100644
+--- a/lib/x509/verify-high.c
++++ b/lib/x509/verify-high.c
+@@ -67,6 +67,80 @@ struct gnutls_x509_trust_list_iter {
+ 
+ #define DEFAULT_SIZE 127
+ 
++struct cert_set_node_st {
++	gnutls_x509_crt_t *certs;
++	unsigned int size;
++};
++
++struct cert_set_st {
++	struct cert_set_node_st *node;
++	unsigned int size;
++};
++
++static int
++cert_set_init(struct cert_set_st *set, unsigned int size)
++{
++	memset(set, 0, sizeof(*set));
++
++	set->size = size;
++	set->node = gnutls_calloc(size, sizeof(*set->node));
++	if (!set->node) {
++		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
++	}
++
++	return 0;
++}
++
++static void
++cert_set_deinit(struct cert_set_st *set)
++{
++	size_t i;
++
++	for (i = 0; i < set->size; i++) {
++		gnutls_free(set->node[i].certs);
++	}
++
++	gnutls_free(set->node);
++}
++
++static bool
++cert_set_contains(struct cert_set_st *set, const gnutls_x509_crt_t cert)
++{
++	size_t hash, i;
++
++	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
++	hash %= set->size;
++
++	for (i = 0; i < set->node[hash].size; i++) {
++		if (unlikely(gnutls_x509_crt_equals(set->node[hash].certs[i], cert))) {
++			return true;
++		}
++	}
++
++	return false;
++}
++
++static int
++cert_set_add(struct cert_set_st *set, const gnutls_x509_crt_t cert)
++{
++	size_t hash;
++
++	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
++	hash %= set->size;
++
++	set->node[hash].certs =
++		gnutls_realloc_fast(set->node[hash].certs,
++				    (set->node[hash].size + 1) *
++				    sizeof(*set->node[hash].certs));
++	if (!set->node[hash].certs) {
++		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
++	}
++	set->node[hash].certs[set->node[hash].size] = cert;
++	set->node[hash].size++;
++
++	return 0;
++}
++
+ /**
+  * gnutls_x509_trust_list_init:
+  * @list: A pointer to the type to be initialized
+@@ -1328,6 +1402,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	unsigned have_set_name = 0;
+ 	unsigned saved_output;
+ 	gnutls_datum_t ip = {NULL, 0};
++	struct cert_set_st cert_set = { NULL, 0 };
+ 
+ 	if (cert_list == NULL || cert_list_size < 1)
+ 		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+@@ -1376,36 +1451,68 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	memcpy(sorted, cert_list, cert_list_size * sizeof(gnutls_x509_crt_t));
+ 	cert_list = sorted;
+ 
++	ret = cert_set_init(&cert_set, DEFAULT_MAX_VERIFY_DEPTH);
++	if (ret < 0) {
++		return ret;
++	}
++
+ 	for (i = 0; i < cert_list_size &&
+-		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; i++) {
+-		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
+-			unsigned int sorted_size;
++		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; ) {
++		unsigned int sorted_size = 1;
++		unsigned int j;
++		gnutls_x509_crt_t issuer;
+ 
++		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
+ 			sorted_size = _gnutls_sort_clist(&cert_list[i],
+ 							 cert_list_size - i);
+-			i += sorted_size - 1;
+ 		}
+ 
+-		if (i == cert_list_size - 1) {
+-			gnutls_x509_crt_t issuer;
+-
+-			/* If it is the last certificate and its issuer is
+-			 * known, don't need to run issuer callback. */
+-			if (_gnutls_trust_list_get_issuer(list,
+-							  cert_list[i],
+-							  &issuer,
+-							  0) == 0) {
++		/* Remove duplicates. Start with index 1, as the first element
++		 * may be re-checked after issuer retrieval. */
++		for (j = 1; j < sorted_size; j++) {
++			if (cert_set_contains(&cert_set, cert_list[i + j])) {
++				if (i + j < cert_list_size - 1) {
++					memmove(&cert_list[i + j],
++						&cert_list[i + j + 1],
++						sizeof(cert_list[i]));
++				}
++				cert_list_size--;
+ 				break;
+ 			}
+-		} else if (gnutls_x509_crt_check_issuer(cert_list[i],
+-							cert_list[i + 1])) {
+-			/* There is no gap between this and the next
+-			 * certificate. */
++		}
++		/* Found a duplicate, try again with the same index. */
++		if (j < sorted_size) {
++			continue;
++		}
++
++		/* Record the certificates seen. */
++		for (j = 0; j < sorted_size; j++, i++) {
++			ret = cert_set_add(&cert_set, cert_list[i]);
++			if (ret < 0) {
++				goto cleanup;
++			}
++		}
++
++		/* If the issuer of the certificate is known, no need
++		 * for further processing. */
++		if (_gnutls_trust_list_get_issuer(list,
++						  cert_list[i - 1],
++						  &issuer,
++						  0) == 0) {
++			cert_list_size = i;
++			break;
++		}
++
++		/* If there is no gap between this and the next certificate,
++		 * proceed with the next certificate. */
++		if (i < cert_list_size &&
++		    gnutls_x509_crt_check_issuer(cert_list[i - 1],
++						 cert_list[i])) {
+ 			continue;
+ 		}
+ 
+ 		ret = retrieve_issuers(list,
+-				       cert_list[i],
++				       cert_list[i - 1],
+ 				       &retrieved[retrieved_size],
+ 				       DEFAULT_MAX_VERIFY_DEPTH -
+ 				       MAX(retrieved_size,
+@@ -1413,15 +1520,20 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 		if (ret < 0) {
+ 			break;
+ 		} else if (ret > 0) {
+-			memmove(&cert_list[i + 1 + ret],
+-				&cert_list[i + 1],
+-				(cert_list_size - i - 1) *
++			assert((unsigned int)ret <=
++			       DEFAULT_MAX_VERIFY_DEPTH - cert_list_size);
++			memmove(&cert_list[i + ret],
++				&cert_list[i],
++				(cert_list_size - i) *
+ 				sizeof(gnutls_x509_crt_t));
+-			memcpy(&cert_list[i + 1],
++			memcpy(&cert_list[i],
+ 			       &retrieved[retrieved_size],
+ 			       ret * sizeof(gnutls_x509_crt_t));
+ 			retrieved_size += ret;
+ 			cert_list_size += ret;
++
++			/* Start again from the end of the previous segment. */
++			i--;
+ 		}
+ 	}
+ 
+@@ -1581,6 +1693,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	for (i = 0; i < retrieved_size; i++) {
+ 		gnutls_x509_crt_deinit(retrieved[i]);
+ 	}
++	cert_set_deinit(&cert_set);
+ 	return ret;
+ }
+ 
+diff --git a/tests/missingissuer.c b/tests/missingissuer.c
+index f21e2b6b0c..226d095929 100644
+--- a/tests/missingissuer.c
++++ b/tests/missingissuer.c
+@@ -145,6 +145,8 @@ void doit(void)
+ 		printf("[%d]: Chain '%s'...\n", (int)i, chains[i].name);
+ 
+ 		for (j = 0; chains[i].chain[j]; j++) {
++			assert(j < MAX_CHAIN);
++
+ 			if (debug > 2)
+ 				printf("\tAdding certificate %d...", (int)j);
+ 
+diff --git a/tests/test-chains-issuer.h b/tests/test-chains-issuer.h
+index 543e2d71fb..bf1e65c956 100644
+--- a/tests/test-chains-issuer.h
++++ b/tests/test-chains-issuer.h
+@@ -24,7 +24,7 @@
+ #ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
+ #define GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
+ 
+-#define MAX_CHAIN 6
++#define MAX_CHAIN 15
+ 
+ #define SERVER_CERT "-----BEGIN CERTIFICATE-----\n"			\
+ 	"MIIDATCCAbmgAwIBAgIUQdvdegP8JFszFHLfV4+lrEdafzAwPQYJKoZIhvcNAQEK\n" \
+@@ -338,11 +338,102 @@ static const char *missing_middle_unrelated_extra_insert[] = {
+ 	NULL,
+ };
+ 
++static const char *missing_middle_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_2,
++	CA_CERT_2,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_middle_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_last_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_3,
++	CA_CERT_3,
++	CA_CERT_2,
++	CA_CERT_2,
++	NULL,
++};
++
++static const char *missing_last_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_3,
++	CA_CERT_3,
++	NULL,
++};
++
++static const char *missing_skip_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_3,
++	CA_CERT_3,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_skip_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_3,
++	CA_CERT_3,
++	NULL,
++};
++
+ static const char *missing_ca[] = {
+ 	CA_CERT_0,
+ 	NULL,
+ };
+ 
++static const char *middle_single_duplicate_ca[] = {
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_0,
++	CA_CERT_4,
++	CA_CERT_0,
++	CA_CERT_2,
++	CA_CERT_0,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_middle_single_duplicate_ca_unrelated_insert[] = {
++	CA_CERT_0,
++	NULL,
++};
++
+ static struct chains {
+ 	const char *name;
+ 	const char **chain;
+@@ -377,6 +468,14 @@ static struct chains {
+ 	{ "skip multiple unsorted", missing_skip_multiple_unsorted, missing_skip_multiple_insert, missing_ca, 0, 0 },
+ 	{ "unrelated", missing_middle_single, missing_middle_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
+ 	{ "unrelated extra", missing_middle_single, missing_middle_unrelated_extra_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate", missing_middle_single_duplicate, missing_middle_single_insert, missing_ca, 0, 0 },
++	{ "middle multiple duplicate", missing_middle_multiple_duplicate, missing_middle_multiple_insert, missing_ca, 0, 0 },
++	{ "last single duplicate", missing_last_single_duplicate, missing_last_single_insert, missing_ca, 0, 0 },
++	{ "last multiple duplicate", missing_last_multiple_duplicate, missing_last_multiple_insert, missing_ca, 0, 0 },
++	{ "skip single duplicate", missing_skip_single_duplicate, missing_skip_single_insert, missing_ca, 0, 0 },
++	{ "skip multiple duplicate", missing_skip_multiple_duplicate, missing_skip_multiple_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate ca", middle_single_duplicate_ca, missing_middle_single_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate ca - insert unrelated", middle_single_duplicate_ca, missing_middle_single_duplicate_ca_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
+ 	{ NULL, NULL, NULL, NULL },
+ };
+ 
+-- 
+GitLab
+
diff --git a/net-libs/gnutls/gnutls-3.7.0.ebuild b/net-libs/gnutls/gnutls-3.7.0-r1.ebuild
index ece149c18554..643a1c4d8ad5 100644
--- a/net-libs/gnutls/gnutls-3.7.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.0-r1.ebuild
@@ -54,6 +54,8 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=( "${FILESDIR}"/${P}-ignore-duplicate-certificates.patch )
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index 6410a00314ed..2a04eb187a61 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1,5 +1,4 @@
-AUX 7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch 1209 BLAKE2B 198818f6d54bbd9a987df795f06ec6a9a1fe0776b37fc27ad0aae4a2d31bd0e261af1d266aaf18add8585b8446806ef6d59964d90bfd08b440e49e3f5e8149b4 SHA512 4cf240a0d8cd195614ad188262a1b482c9f57647d72b3daf4a1717a03afb5ac58cd639e77ef6b861deaed81d29e60a599196456f673a7c1eb6fa8b51b2430656
-DIST libad9361-iio-0.1.tar.gz 27495 BLAKE2B d46873d69c494835e028ba1de7d17d48e5ed6bf1a73e96cf958dcfe44142cd39a9df3b00d61d3d3b8934bcb59fff3bd33c82f5c11de65f332185fe0e8c296f54 SHA512 64df3d4ce5e1c10fb44b6e39c11bac119ef77f2cc5b9785023b22670ca4905a1afd13c6923b3056f957789a911a3cae3cb7208770e1a112d849e7e3d2feb2fdc
-EBUILD libad9361-iio-0.1-r2.ebuild 835 BLAKE2B 281b7e1218f91df7d18d3e69f5385edca3605f36e8baa24b7f891d1ea701222218ac4bbe19fc69b582e5a5b4bf0e0073a3bcb5a995b95f1fa1c1184cb04b3cf9 SHA512 93db38b065b7f0514025018ebe7b0cb510589bebb614501f28bf8f52bcacde1c3114f05b6e9cde8012ed5db0191d8ac194a809fce67b9cadc5ef1b8f75fbc47c
-EBUILD libad9361-iio-9999.ebuild 766 BLAKE2B b655d0cd7f57330c88a779aef4c4ba0de15465873158d3abc3e8d44370547a3e94b78da7b15d963ae2ed0c2a19e86042dd979d234be820ee86ace7135437f72c SHA512 5fb9ffdbb97c09ed253000dcec15615d2a05536a21d6121ef9792db7eba10af792238b1bbd8644a5eecabd44f23fc9ceccf2b9443230eee64b12ed7bc81ca26f
+DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c
+EBUILD libad9361-iio-0.2.ebuild 819 BLAKE2B 44f462e8370973c1b815982283c272a1c46ef6a5bbd7c6e7eea20af219bf7e3893519825ddd19993bdbf5dc4f160bf23187c4cd81dd3e85d955c5f6369fdb5a1 SHA512 d6aa9a469260bf74e53ba27e3ec1217cc98bc5889edb876a1fee132804e0b9edbc8d6507f2f42e296b374215c6855f79eff4ee2c6690b6420cf3caea637f3d6e
+EBUILD libad9361-iio-9999.ebuild 819 BLAKE2B 44f462e8370973c1b815982283c272a1c46ef6a5bbd7c6e7eea20af219bf7e3893519825ddd19993bdbf5dc4f160bf23187c4cd81dd3e85d955c5f6369fdb5a1 SHA512 d6aa9a469260bf74e53ba27e3ec1217cc98bc5889edb876a1fee132804e0b9edbc8d6507f2f42e296b374215c6855f79eff4ee2c6690b6420cf3caea637f3d6e
 MISC metadata.xml 441 BLAKE2B 56143244ca58d80b2857f231c5313690c35cd686f152dcaaa9d9982f8692895555d19bad1cd222b91154b1a567607b80c9412d6d378a87c8580a80bab8794b7c SHA512 53ed722fc50caaa21746b65f7fd1fbff34a296cac7ecc49ad1a0dde04e17e09385985db1a1cfb2651333733516fb30bc32d9c26351f2df24f06c93d05ff758c5
diff --git a/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
deleted file mode 100644
index 6b1668f0a0e5..000000000000
--- a/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7206bb2a9b655be3bdb66c6cf03aa504817ed240 Mon Sep 17 00:00:00 2001
-From: Lars-Peter Clausen <lars@metafoo.de>
-Date: Tue, 14 Aug 2018 09:48:59 +0200
-Subject: [PATCH] Fix building outside git repository
-
-Currently when building the project on a machine that has git installed,
-but the source is not inside a git repository cmake fails with the
-following error.
-
-	CMake Error at CMakeLists.txt:35 (if):
-	  if given arguments:
-
-		"STREQUAL" "/home/lars/libad9361-iio"
-
-This is due to LIBAD9361_GIT_REPO variable being empty. In order to handle
-empty variables in CMake in a string comparison they need to be
-encapsulated in quotes.
-
-Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7af5444..8d04ba0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ if (GIT_FOUND)
- 		OUTPUT_STRIP_TRAILING_WHITESPACE
- 	)
- 
--if (${LIBAD9361_GIT_REPO} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-+if ("${LIBAD9361_GIT_REPO}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
- 		execute_process(
- 			COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
- 			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
index 37d23a9fda02..630cb27fb6e9 100644
--- a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
 HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
@@ -21,8 +21,8 @@ RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" CMakeLists.txt || die
-	eapply "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
-	cmake-utils_src_prepare
+	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
+		-e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
+	cmake_src_prepare
 	eapply_user
 }
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 111a395c2a8b..630cb27fb6e9 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
 HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
@@ -21,7 +21,8 @@ RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" CMakeLists.txt || die
-	cmake-utils_src_prepare
+	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
+		-e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
+	cmake_src_prepare
 	eapply_user
 }
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
new file mode 100644
index 000000000000..cb4e9c601f9a
--- /dev/null
+++ b/net-libs/libaxc/Manifest
@@ -0,0 +1,4 @@
+AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b84a5cedc4a807992191766d51a5f5b672123a07e876972feba4753cd102851b9dbcbd15957bf11b5f794473f5a3bbdbe SHA512 b9567f60b37a4c2cc658a7215bdd864409f2b3626c28648547a9fe6bdaeebbc5f414cb5ca6e5a78dfd9d24b7b81a38bd358bd83887a56adb9ceed5049df6c187
+DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
+EBUILD libaxc-0.3.4-r2.ebuild 1255 BLAKE2B bd856104834c30ecd9ddfcc8d73cd6823cd0722efd8604b5a3bce2ca26296f2b0e12ae2178a5071fe34341652f95a6c395479ff4ee21098256fe7fde0c331a8e SHA512 95fad7584a2269517195bfa720080b7ffa101196444b5e3894b11c2a0bce8beab93be275999dcb2ec388d4930ed3901ab01046e4b79e3d7a6c4398314d6f7119
+MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch b/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch
new file mode 100644
index 000000000000..94850adb9a0a
--- /dev/null
+++ b/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch
@@ -0,0 +1,25 @@
+From b9a79499a8638fb58394088af1b3e419c52f0562 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2021 20:16:34 +0100
+Subject: [PATCH] Add missing symlinks libaxc.so.$(VER_MAJ) and libaxc.so
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index b79a3f8..b882cbb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -125,6 +125,8 @@ install: $(BDIR)
+ 	install -d $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
+ 	install -m 644 $(BDIR)/libaxc.a  $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.a
+ 	install -m 644 $(BDIR)/libaxc.so $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so.$(VERSION)
++	ln -s libaxc.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so.$(VER_MAJ)
++	ln -s libaxc.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so
+ 	install -m 644 $(BDIR)/libaxc.pc $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
+ 	install -d $(DESTDIR)/$(PREFIX)/include/axc/
+ 	install -m 644 $(SDIR)/axc.h $(DESTDIR)/$(PREFIX)/include/axc/
+-- 
+2.30.1
+
diff --git a/net-libs/libaxc/libaxc-0.3.4-r2.ebuild b/net-libs/libaxc/libaxc-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..d85e8cf5de82
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.4-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	net-libs/libsignal-protocol-c
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cmocka )
+	"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-so-symlinks.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rm -R lib || die  # unbundle libsignal-protocol-c
+	default
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${D}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${D}/usr/${libdir}/libaxc.a" || die
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-libs/libaxc/metadata.xml b/net-libs/libaxc/metadata.xml
new file mode 100644
index 000000000000..ab886b7f0382
--- /dev/null
+++ b/net-libs/libaxc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index e8183fc7c0e0..ffe5b8979eee 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,9 +1,3 @@
-DIST libblkmaker-0.3.2.tgz 17893 BLAKE2B 390ed56c7d77b904ec52d52cfa9dfff4e5c01c1662e0f5a5f17f92eb7b3d79619bd6ee64cfa28bbff5750db7cbc31d1cd5662b11a86ef63882063ddcb72cfb6b SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf
-DIST libblkmaker-0.4.3-github.tgz 13712 BLAKE2B 4c93b8a74d25b5833371e2db78062f35c726b6ac89b8b22420a61d15a1d37cf0784b001e7061da4274ed34691021d5e92a27ce04260621cfdac6b4c7c49ce69f SHA512 a8686fc0cd757a214e24476c2fc8bac4511e6522ba977134150c0084dd2a3d7620f3378f4c454dcefb675840b71597f37d5b696a74ad0251b5d3921082c23285
-DIST libblkmaker-0.5.3-github.tgz 14161 BLAKE2B c8da4f7e3e2811cc88a03537ceb2e145ba3bb796520f4330d190e5935c13b73769cba73612d321f5c63b636bbd821e334b5a72ab893bd765edbcf49ce374f789 SHA512 57edcd583879d6abea716b6817a99dc345485392d149ddc6bb2ff9bac76d22f84cd960dc0746852e7c944a10b85d26c57fb107eac79680f77829c9bbc03c202d
 DIST libblkmaker-0.6.0-github.tgz 28907 BLAKE2B 31b64604040a514ae844564d19e884932fbaa0640d0491cda5ec9e922b0714c89e8810f1da3d0057625633555ea486c15e20f2a32d8528a6795be52e692d4e4f SHA512 3e9028c7c4664491274c241020d507ba6d736b9e9048562434d27d92f6cdd58ec167fae060bc355ee6a7f010a6a8a6ccff1660ecfc616c705c5deb3ed95c5e69
-EBUILD libblkmaker-0.3.2.ebuild 539 BLAKE2B f82f0c021d3a6dcd6ecc7cd777c26d51a7dfc712a0e96b27caaae7d144379ce0050e84d91a55dcc35d32de8206eff3b65e99b711c5728711445ba1333276f2c6 SHA512 422a503f2b0d561f06d690f66803dbd6fae22d7413d3d08730e7e640ee266dba9dc5748a23ea254e221194e3882d879610129c144028e1d90e9a1923a2fb5c89
-EBUILD libblkmaker-0.4.3.ebuild 514 BLAKE2B b33abfa6b7cebd3af366855219d01ad6ab281e4bb4ba557c428d988594136f0a4f6c24296648e5a2ef51a55bb5b5b9ab03e5a7a2ead6b8686376eddc419de9d2 SHA512 60099192c78c29f4972d7dad77ddbf2452c4089df11a802a6fd1dd7531e4da4895f7218567bd7d15b950efef0db82160088a8de1a6afb6eb747324282045d615
-EBUILD libblkmaker-0.5.3.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
-EBUILD libblkmaker-0.6.0.ebuild 691 BLAKE2B 701e1dedffd93d5677a0c9142cae9610137bd839e5e051225401e38e11420fe85642fa21042756bdaa63bad4848fd821072900299e723986564f1c91861954e6 SHA512 cb3d664c783778bd1bc2c70732ec7f798153ddf97eece60d2e823bb541a3642ce565a0db504d01e144797e4b20f488b0418d996effe3ef504208fff8b57d0a68
+EBUILD libblkmaker-0.6.0.ebuild 689 BLAKE2B 3f5e0fcb1a85738a7bd13af19c0ae11fe56f549c41aab5806fed8995e24c1609916dcb58f4224b818fb347d7ee71eb52cd6b4e7455d5119ca6f4bfd4668bbc73 SHA512 c3acceed12b5d8bfc9d845829c7d1a306a6d6f1075db4d275900e9d559629f2425c4ebbd2ff3787ec3a331980bd5239aed7c80d7960591c5ba5a90ad98e4d571
 MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab
diff --git a/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
deleted file mode 100644
index 457a41a3c292..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://gitorious.org/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-S="${WORKDIR}/bitcoin-libblkmaker/"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.4.3.ebuild b/net-libs/libblkmaker/libblkmaker-0.4.3.ebuild
deleted file mode 100644
index 66a33ff27fe8..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.3.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.3.ebuild
deleted file mode 100644
index 653b6ed32c21..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.5.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-	dev-libs/libbase58
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
index 3a9c7429f916..8ceb40dd5dc9 100644
--- a/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
+++ b/net-libs/libblkmaker/libblkmaker-0.6.0.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 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index 0c14070ef52f..c54f554c7ee7 100644
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,3 +1,5 @@
 DIST libecap-1.0.0.tar.gz 343468 BLAKE2B 5a5a12365289daaee8b324016f42b6b56f5bf5b1f7893ae052517c8c20a792a798ebb31f4038c121b1c6eefd9d375562014050572e0285e3a9b91bbfb9989fa8 SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452
-EBUILD libecap-1.0.0.ebuild 621 BLAKE2B d980d65e98ca2d69f0edebaac58e0eabf0cb92919bb29d4aff22abcf76b1d9ef9b9fb9db0803af8df7025d02251e2eddb5b4882fad0dc5ae5f6268b60144b1f0 SHA512 c53bf5b018f0f8525b194a6e99f41297a2ed9e987172ce5be3437b064e89668638027505692a763e3e52b4426ae018e78275ad0f9eeb0124ef377e7087fc801e
-MISC metadata.xml 415 BLAKE2B 20ae025b9259513bd01b05a6c2e52b905faecf97883367c4fed63970ef8a983ed93609ffce93e803c3cb9634d2a45ea0cb7daa7f9eb48ded8cb59e5d17565a0a SHA512 7f74e14bff83c5a8ccee44aac553502cb71e55e8d2da98967e8bba2fa44643be2508dbf0b8e47f6e3abb6e554cfc03f3ae53238f06987357dc7c3ea103aac394
+DIST libecap-1.0.1.tar.gz 339799 BLAKE2B 6971391d0bde588f6bfb11704d343494eaf81fd1ac5e9c8c6d9f32ae0b03ed41aaf03c41cab1365ffefa8e032b65f72417af395c26d89af69c30d327252246b7 SHA512 0054ad11b3f558d7c623060a69207a1b8e679803cabdf1a2bce4b04335d71c016eec770fc9d2cbf3d0a93502c255cb528305f9f8e6df4e095fcb980667045919
+EBUILD libecap-1.0.0.ebuild 756 BLAKE2B 4251965072777a9b3aaf292ceae8b232a44095925f68d3fac83950930d3f98c6f9aa520a91c4b02867728d25e0c8956894e47b9eb523af8d8be06d447182786b SHA512 73685fe75de863494f2a30b00283d39a92e55f48f0476a4e0f3b15a47a2f92147d95d4eddf1a5781ede19d4cca57177cf5101541a97626ecd7ca02cb4dca91ec
+EBUILD libecap-1.0.1.ebuild 789 BLAKE2B 735eea7cfea04d356234d982e2353506141b019fecd5e03007ff0416d942d0cccb3c4f4ca2b94a3455dd37bdab3afff9b71baa5cb5b7b7b22cb862f93d2d7dd8 SHA512 005c81729ceb229c879b97b0dfa86bd16560c9ed527227025e25673da70582519b14b2c290d38b08eb26fa55939cc45f20f8adcbb4b165b2297904cde45bca98
+MISC metadata.xml 529 BLAKE2B 5084671496dca729715835548ad5d0ea16b2312014bdd0d3368a62bc9140ae72481cff611a701bf329631af8b024fa3830f9af23661aa401720658a4784ec8b6 SHA512 8c369afceeaea9d63c93dd890f32fe606a69942536c3d9798395eefcdfbc06e027fc40c50a899b7014696f5a5897afbf8feaf674317db10449d30c83b63de470
diff --git a/net-libs/libecap/libecap-1.0.0.ebuild b/net-libs/libecap/libecap-1.0.0.ebuild
index 9b5ee739941d..224da59d982a 100644
--- a/net-libs/libecap/libecap-1.0.0.ebuild
+++ b/net-libs/libecap/libecap-1.0.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools-utils eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="API for implementing ICAP content analysis and adaptation"
-HOMEPAGE="http://www.e-cap.org/"
+HOMEPAGE="https://www.e-cap.org/"
 SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
 
 RDEPEND="!net-libs/libecap:0
 	!net-libs/libecap:0.2"
@@ -24,4 +23,13 @@ src_prepare() {
 
 	# Respect AR. (bug #457734)
 	tc-export AR
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Horrific autotools failure in generated config.h w/o Bash
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf
 }
diff --git a/net-libs/libecap/libecap-1.0.1.ebuild b/net-libs/libecap/libecap-1.0.1.ebuild
new file mode 100644
index 000000000000..24efca086b5d
--- /dev/null
+++ b/net-libs/libecap/libecap-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="API for implementing ICAP content analysis and adaptation"
+HOMEPAGE="https://www.e-cap.org/"
+SRC_URI="https://www.e-cap.org/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="!net-libs/libecap:0
+	!net-libs/libecap:0.2"
+
+DOCS=( CREDITS NOTICE README change.log )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Horrific autotools failure in generated config.h w/o Bash
+	ac_cv_path_AR="$(tc-getAR)" CONFIG_SHELL="${EPREFIX}/bin/bash" econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libecap/metadata.xml b/net-libs/libecap/metadata.xml
index 0987c1f2bb30..d27c3cfc109f 100644
--- a/net-libs/libecap/metadata.xml
+++ b/net-libs/libecap/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>eras@gentoo.org</email></maintainer>
-<longdescription>eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module</longdescription>
+	<maintainer type="person">
+		<email>eras@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server,
+		to outsource content analysis and adaptation to a loadable module.
+	</longdescription>
+	<upstream>
+		<changelog>https://www.e-cap.org/archive/libecap_change.log</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libflowmanager/Manifest b/net-libs/libflowmanager/Manifest
index e6d7bf8e0165..98189417d03c 100644
--- a/net-libs/libflowmanager/Manifest
+++ b/net-libs/libflowmanager/Manifest
@@ -1,4 +1,4 @@
 AUX libflowmanager-3.0.0-stdint_h.patch 196 BLAKE2B e429f7bc1c7cc3cee39715473a9a909dbe026b39e2cf9a0771ee8cf5ecaf2a370b009eb5a894a3b83607a48065f943e85cb9bb55a6e6d1c4d44c82b33bd4480a SHA512 8ad5151076f2086e6bc66f80d4523432aa90998543998f2f54d22a157fca15072879e6191142caed2ced03eae16fa099aa329aefee7154c1ab7e929ca6ae94e2
 DIST libflowmanager-3.0.0.tar.gz 405501 BLAKE2B bccc7b4bd83038e0f4016fcedcf7f8a808cd2e13f02bdb2e012cda5e2eea3a9cdc59df68e53a335a18004adc90f9308ca08be11ecf0f12429466d9671424c6d9 SHA512 7f6eebb996c50ffa7f2882e0448c95b88cbef433fbc40928a6d111a86c3006ef80cc71b4cb5e73dbe13753410cd88bfcfd32616a0969e417e5a832684b5f0aca
-EBUILD libflowmanager-3.0.0-r1.ebuild 633 BLAKE2B 50cf96530e497094008611ddaa4637c450b8e534fb3368e2ab0fae085026efc25f1e96b8fc81b6d723db6fe9a3ec14ea0e5c605aebf9ce694f0514de147074e2 SHA512 d8ab0e2eda02116f5c21f265f87e9514e24a0e2ce281b8aa89a4ef1706208faea7f64f3caead76307820d01b4ff56de9ddf355bb1cea5dafae3de92d3e8dd708
+EBUILD libflowmanager-3.0.0-r1.ebuild 591 BLAKE2B 85cab82e05f6685f1c9a4819c28e4e30be4705f809329fc9d53b315770eeb6d173161fb92163274d5c0b739838b9d11b8fe739c26460bd1932a2c48f1c31140a SHA512 fc37022d2a6b87931411cf9acd5470009aa44cdb1f41fe650d71aa2c1fa8bcc928b00a01a02fc57d239ce05ac03c484cffaad7ed2913d37501565dbbd11c5d37
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
index f1337c58b2d1..9891a9aa4448 100644
--- a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
+++ b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="A library that measures and reports on packet flows"
 HOMEPAGE="https://research.wand.net.nz/software/libflowmanager.php"
@@ -11,24 +10,20 @@ SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	>=net-libs/libtrace-3.0.6
-"
-RDEPEND="
-	${DEPEND}
-"
+
+DEPEND=">=net-libs/libtrace-3.0.6"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.0-stdint_h.patch
 )
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 1345fa31d90f..def862ca126b 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,6 +1,6 @@
 AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1066 BLAKE2B 145511248de34d518797f37a88525409caef8e9db7576266608fa70ed524e133c17cd35a4df354fa4df714c714affb3f62b812be2f2450fe9da6d3679b104756 SHA512 a79988bf79bb4e1fa4bd3d41cf1e922ddf11134c255aa5b7b750c7d93c5e11ca0f6071c2de692cb119c804839b3b722ad5597756814825ab56b31ad313b37516
-EBUILD libgadu-1.12.2-r1.ebuild 1174 BLAKE2B 91701542fc2da10d0f2edfac28585eca79c6e410b2df68863d703f8b4c4d3173e25c67c57f77720ee763ed083b49d2afcc24f6d47c3a51b3c35770fd6421985b SHA512 799e5a6ec731501e4a6aa12a608861f0fec8d9c66f2f4f4cdc7c3069c40584cd99fa8d1e9c93935ed9ac972f4023f2216fef528e20e8d4f74ba71e3fe2353b95
+EBUILD libgadu-1.11.4.ebuild 1059 BLAKE2B 5b15b69094220a19f8da329e839c05e4a52aac8d2ba0609580c2361c7016dc42552af3b48a3da9ea46cd138140202262006c3c1fb471b6d3a10535d1a569ca7b SHA512 754495fcea55eb89db427f48c016d52c9cb457c94bb4022f13089e4820cce8cdf29006afcc0654eb8318ae647b6349bbf28ed075ffbe733f15a7e2017678d3ca
+EBUILD libgadu-1.12.2-r1.ebuild 1174 BLAKE2B aa27f9b5f99a7929b096957bd56f8eb8700a39eae302e1dbeb215651fc9d106839573117d47da4d834530a9bcee7c145e6cda3723192371c428b4088f585f5c3 SHA512 7e4d8ca258f47ef40e58b0443267338fe1e5ccde20bb61f5fc880a5e2b5190680fa8ebf88e344c1648667d6c8a919d3e11664956472a3c07809ac01c8462b7a2
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 889a044752bf..7f3392a75a41 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
 HOMEPAGE="http://toxygen.net/libgadu/"
@@ -17,7 +15,7 @@ RESTRICT="test"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE="doc ssl static-libs threads"
+IUSE="doc ssl threads"
 
 COMMON_DEPEND="
 	sys-libs/zlib
@@ -26,26 +24,28 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 "
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
+RDEPEND="${COMMON_DEPEND}"
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
+		--disable-static
+		--disable-tests
 		--without-openssl
-		$(use_with threads pthread)
 		$(use_with ssl gnutls)
+		$(use_with threads pthread)
 	)
-
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
+	use doc && local HTML_DOCS=( docs/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index d7aa78fb95d8..c0f284e5af43 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 8b276c502ed8..2fbad79323c4 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -3,5 +3,5 @@ DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
 EBUILD libhubbub-0.3.6-r2.ebuild 1211 BLAKE2B b91a089735f061c872faf590e871073a2f6f8f2f25d9e1f12a33b61028137f32a6061b57258de0aa1927f644fa30e248edc1dcadaafc2aac52e51c18bca9be37 SHA512 3c810114105825733ae3f7a7bcc653ab42ec47d76988c431fd2710e838514ccdf96c061d5c7d976fc049fe223e229b244542bee70ce6b0708613397332fccf7b
 EBUILD libhubbub-0.3.6.ebuild 1171 BLAKE2B 4a56c42796cd81760dfe6e8086ba2a1f565af9902a52eca1be7456fde5e720da53c70c4e454e724bba285deedc25d58237c3824b78c1bc44ca6e93fef433cab1 SHA512 07d33b4f90767e16a5342a9921d1f14cc23f903f36d72891a6ee2c6f8ceb5932f7f5e9ef2da02ddf78dc6d56c5a2857509bb8e95b108a76542928d87ba57e047
-EBUILD libhubbub-0.3.7.ebuild 1208 BLAKE2B c48cc796652253a48b7390254f471b4fb8ae05c95b1ca754e5b9770fb9fd2d311e051f88929ee1a52900a692a84488085b97bb78ea9aa72a87c5b68f9b2de792 SHA512 2b3ebdea54b6ef2449937f207aad90bd7f7dc89a85f51a67e801292fdd9b62d48f65848a1136398884c560ab8a8fb5d90217ac51ac0ad3c6ce699f50279f8b22
+EBUILD libhubbub-0.3.7.ebuild 1206 BLAKE2B 011dd18bc170c5ca6a0cefc55143873edb274460a2744ae87b486e73bad11e2703ad963bf50e895bcbbfc5abbe43103261a0dd9dbeae4faa8bb758bd1ff46977 SHA512 b638f25b1057d6d645e8f54b7d3d57e122039aaca2cc271245b659cfb97b6625acc44d81816229f3ab7858129266911fa2d74b9cddf23638a4e1ad4e04348604
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index f1d11a3aa918..f5f01b8ad5f4 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
index 5f9bcb07c100..e8cb372a261b 100644
--- a/net-libs/libiio/Manifest
+++ b/net-libs/libiio/Manifest
@@ -1,4 +1,4 @@
-DIST libiio-0.15.tar.gz 192704 BLAKE2B 7eeaad1535f69ca11fe3f716ac70a161f98d24513fe910cb34ca11a0b63c07f5b5321447c96c247cc9a76ed838d806fa9f160e87fd10f1aeac5025edfa16b8f6 SHA512 7e3ca1a8b97486f20baf38afecfd26c626bed1fef535d88020d11eb4e49fc1226390c6383799222f6811c13b8b7e5cc77fb899c776c150a9d1c2024bf8ab338b
-EBUILD libiio-0.15-r1.ebuild 652 BLAKE2B 3d929f2dea2d165e78d4b637ea73465a6dbe948bade0d4fc20d7f3a45f335434cd8d8aa3b093b65d05124b58811cae680ffd450d0f13affbcf2bdb11eccb919d SHA512 2f2cea2caa9e061134ae6a9b04fd0ddae80f9b824dd5e09cfd28bba0d9f14fc26e47475b590166472bfad650afadf469645896b862c32c13050beb5b94b3ce7e
-EBUILD libiio-9999.ebuild 652 BLAKE2B 3d929f2dea2d165e78d4b637ea73465a6dbe948bade0d4fc20d7f3a45f335434cd8d8aa3b093b65d05124b58811cae680ffd450d0f13affbcf2bdb11eccb919d SHA512 2f2cea2caa9e061134ae6a9b04fd0ddae80f9b824dd5e09cfd28bba0d9f14fc26e47475b590166472bfad650afadf469645896b862c32c13050beb5b94b3ce7e
+DIST libiio-0.21.tar.gz 446893 BLAKE2B 02b6af8e78ab95fa68b146808c58dd012846837646bb0e7e60af890c0e867ed9bb798596e6ff773d6da9efa2750859d23a0f83d874510273ef1d1db8f9424bcb SHA512 5bbacd6a1141654f4825f00c1c2b27223e6cc324c80d7bcbb49e29997a83d585e45c0c52331ca10ee881c2f340b535984c3d667b61d8377a77e5c0f5cb1d2dc0
+EBUILD libiio-0.21.ebuild 646 BLAKE2B f0aab4ca851902093054483125caa8eb716837fa79068db1d161bb0c25452b31cb87b1309481c485bdb33796b24894a62985e6a2a44d950927304fe61a7bb63a SHA512 b5e15bcacc13feea24df1b35f288eb44a204c707ba321faac6a7ce13173e7e792a69c3698e3e941996e50c845cfcaa432dd76f407a4c5b093def967122c7d829
+EBUILD libiio-9999.ebuild 646 BLAKE2B f0aab4ca851902093054483125caa8eb716837fa79068db1d161bb0c25452b31cb87b1309481c485bdb33796b24894a62985e6a2a44d950927304fe61a7bb63a SHA512 b5e15bcacc13feea24df1b35f288eb44a204c707ba321faac6a7ce13173e7e792a69c3698e3e941996e50c845cfcaa432dd76f407a4c5b093def967122c7d829
 MISC metadata.xml 506 BLAKE2B a3be5b15b8043c7e52b3a3ed6a01dab5731286ba3266285426ef8c56bd1124fbf8a2b3083cad85094ff5d0ac0f06a6127ccbfcdc89502d909797deacb14aabb9 SHA512 c408630124499db22c21e2f2911fb7dd023f1e704b895c770c2510a08f7b3516cc83aa8d50a6e6aa2c0365ca7e91064a1cb664ce80e1ba153d68a381182264ba
diff --git a/net-libs/libiio/libiio-0.15-r1.ebuild b/net-libs/libiio/libiio-0.21.ebuild
index b1bd4983707f..66f1603cbe68 100644
--- a/net-libs/libiio/libiio-0.15-r1.ebuild
+++ b/net-libs/libiio/libiio-0.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library for interfacing with IIO devices"
 HOMEPAGE="https://github.com/analogdevicesinc/libiio"
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
index b1bd4983707f..66f1603cbe68 100644
--- a/net-libs/libiio/libiio-9999.ebuild
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library for interfacing with IIO devices"
 HOMEPAGE="https://github.com/analogdevicesinc/libiio"
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 4eeca63ebcc0..b9569ca37deb 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -2,6 +2,6 @@ DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B d569562f6203d2ec131f7082063305e07a0c92807e81ae3641f1a8f61a9bdd0051803cd1b30eaa5a9bfd5f31ff06bc5b68831913c2526469c2393fbc4971f929 SHA512 77a66921f7aba5b1badc9739ff8de3356654be97f2ad1cd9af8313945d55e3de4df4b08830cad5d8110591713414eea340ee2b53567da11933dbccf26bb4605d
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B 74b223ce0740e21fe17db734888fc5fc77f9727cf618e315c8a207ffc7ddd782bf3d6d70d526b0eba92545069466a9d2f44ec175923c8fe20558032d7f9f8f80 SHA512 ebc1ec97a28cc7e8f3729e574a241c74c22ae260c8a9dcea61a0bf2f9a00197aae588931b5c99f354d4321c0b71a1ae222dc939b702d385d7934ce4943e75765
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 974 BLAKE2B 9611f3e60d003c259632df0b0ca2ed3f650d4e6b4dce86496463d14ca0ca27e72e6dd91e0e3e9517c2b12af9ee9ec16154868692feab38f28269295f749d2b12 SHA512 bebf993b3b9198f3bb30572e00fb65237ea7a45c0ab2f8e77f8ac1f4c003c61f502346017a377be90ea8eca8a3202ab05fc5311375ba6c8576e0ed71b8fd796f
 EBUILD libnetfilter_conntrack-1.0.8.ebuild 981 BLAKE2B 998db28a854065c2084713fbb5263a249f878f77c6da7396ab4cd199fff1afc8e21ee68d5e2d7a4ca2bdc1ecdbe19919e8fa3eefb3b8f944e153e893be0226eb SHA512 2cc5d3cf9a016cc269e824b543c56e707253b2389b2e634d23a19003efb5f16ea1917d5d1e44205e5c459d2f9337723b130153d052701086d29a19477a21874d
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index 73da27792f89..91126c80f7a1 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index c6c0a06d9f66..a4baab4300c0 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,5 +1,5 @@
 AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
-EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 765 BLAKE2B cf85b6675bd7f8bb6274587787073beb1e70ea7db14ee8ef76cb9070b1db0a5bb484289c22c255847df27e7d24cff6d8044ee8f2b6985668cf43611b7eb19024 SHA512 230a52abc9917748b59d8cc38ecba74f05f11aeb230c4165e8935c187c13d897ae7ae623539e52f09e67150d3f1e3749881e4f69f63153e31ad365cc0bbe75e6
+EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 723 BLAKE2B 0c7b78883a009a68a1eaea96c991fb18b371e9f80d80d7fdd55bfd96649c621430621d3f49da6e6b1863d0c2f7070fe7cf5e9d67d0ea2f601fbca69b3767f98b SHA512 f881d11fae80929d77e36b0f7c010b69f337b27851940e16b38bed71fef65b55bf37cad66e7934c03038fdf25ee56a397d050e48ce96d6da2f2bc82f36dc16be
 EBUILD libnetfilter_cthelper-1.0.0.ebuild 696 BLAKE2B 1cfd0e0de588a1df5d40102d5087f3bf6f5da1724fcdaba0ae214d01b59f5db3cb950980b1dd530cb03e81256461a07e0ab2cbca1cf9c129e67f1d05f920fc91 SHA512 3bc0b831094a1e697b2bfdd0e2a73bf56af180f08d8b26f869cfcc35a8378849d9e9d51b516ad85665c0941a43bfe2fe36b092abbd9d969899828b0055f4b358
 MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index 8107d628adaa..0944f98dc881 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit linux-info autotools-utils
+inherit autotools linux-info
 
-DESCRIPTION="userspace library that provides the programming interface to the user-space helper infrastructure"
+DESCRIPTION="Userspace library for interface to user-space helper for conntrack"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-clang-export.patch
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 9113390f96bd..defabdcb70ee 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,5 +1,5 @@
 AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
-EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 765 BLAKE2B bf865b336ce61e5471d34592fd37eaab5bc83dfaadc231637115a6b9a33c8d83fa2e3c0b5e8f8dc9c61689db6f819a833d7ef890a36f0e6a7c4104d522b2ace9 SHA512 e782ec61b8c9b06fd4d6e9519d001fd93ec5fe93590248fc41766d7c3af2aa5e4c6ff78404d68322ad247e0289e68efbc9d81e9f67efa52b4e56e3857af7e29d
+EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 739 BLAKE2B 494af453d9c1dc4b06b043e69b799a4c97d48f788fc773fa3306d43939f169f3159a96b0f41136c4b6569b718896096052a6624c1baaf3198886f39bbc75770a SHA512 1be436abe7291d175a92536172a08688451123d19a6ab58838124dbe157d05c2f802b0a6e96b1eb52264feb8a78e965c4ef39a8653eaf0914a11aa16fa3cb478
 EBUILD libnetfilter_cttimeout-1.0.0.ebuild 696 BLAKE2B 90a092baf8a420e25e1990efe907d6784a10fdb55ef8fc829d4ad6aee4e481836e54457b258b15dd4c59d3e06d4be8bf3fee5b78655a8f260832f9cf0869ad0c SHA512 692273ef5e2345fa751382d39e4f9d6e2b58d980fb1ccafc4882ae0e8883fa1af4c017ffb6a9dd91154da0b044eb55730269ac48a64400778261cf4dc4dc164e
 MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index d897dbebf23d..3d368f94b73a 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit linux-info autotools-utils
+inherit autotools linux-info
 
-DESCRIPTION="netlink interface to the connection tracking timeout infrastructure in the kernel packet filter"
+DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-clang-export.patch
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
new file mode 100644
index 000000000000..f16699730037
--- /dev/null
+++ b/net-libs/libomemo/Manifest
@@ -0,0 +1,4 @@
+AUX libomemo-0.7.1-so-symlinks.patch 1055 BLAKE2B 9dac207e32fb339f52e25571eb3381f2486f5427857dd238f619a841b01db34c9b79708119724af7d2aad2fe5f285925e3be174350f934b166dd3a4794585052 SHA512 d7bf4c51fde4de7e478e44cbc63b8f90f2d6fc357d66ac5d8e8999f03e411257a392284944164d5dfa5388a191c1aba11b8d551c611403a026f1ed0dacdfbca6
+DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
+EBUILD libomemo-0.7.1-r2.ebuild 1086 BLAKE2B e043afbd7347e7feaeb3c868a1f6543b8666df8923a7cedbf186b50ee6099ceebc2f8952ac8b98620fd6b80e5894496129f2b6b8158b1c1bc8ff483b7c2c83d5 SHA512 ee743c91e7d90005c04804b6daada3d37ba8cec19d498eefd3feda0d721277e26dd4123a8ed4a0a4fbde8b884cf50533bffdd07d4c357bb4831c690285008ad4
+MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch b/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch
new file mode 100644
index 000000000000..69f174a75ecf
--- /dev/null
+++ b/net-libs/libomemo/files/libomemo-0.7.1-so-symlinks.patch
@@ -0,0 +1,25 @@
+From 3911dc9d496f61b774d091bd1f2394d458abe8d7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2021 20:51:01 +0100
+Subject: [PATCH] Add missing symlinks libomemo.so.$(VER_MAJ) and libomemo.so
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index e7b9ea6..289d2ec 100644
+--- a/Makefile
++++ b/Makefile
+@@ -108,6 +108,8 @@ install: $(BDIR)
+ 	install -d $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
+ 	install -m 644 $(BDIR)/libomemo-conversations.a  $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.a
+ 	install -m 644 $(BDIR)/libomemo.so $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so.$(VERSION)
++	ln -s libomemo.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so.$(VER_MAJ)
++	ln -s libomemo.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libomemo.so
+ 	install -m 644 $(BDIR)/libomemo.pc $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
+ 	install -d $(DESTDIR)/$(PREFIX)/include/libomemo/
+ 	install -m 644 $(SDIR)/libomemo_crypto.h $(DESTDIR)/$(PREFIX)/include/libomemo/
+-- 
+2.30.1
+
diff --git a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..2350a7e5f4dd
--- /dev/null
+++ b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
+HOMEPAGE="https://github.com/gkdr/libomemo"
+SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	dev-libs/mxml
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cmocka )
+	"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-so-symlinks.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${D}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${D}/usr/${libdir}/pkgconfig/libomemo.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${D}/usr/${libdir}/libomemo.a" || die
+	fi
+}
diff --git a/net-libs/libomemo/metadata.xml b/net-libs/libomemo/metadata.xml
new file mode 100644
index 000000000000..ab886b7f0382
--- /dev/null
+++ b/net-libs/libomemo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
index 3b3da2dc2960..68ed237ac037 100644
--- a/net-libs/libosmo-dsp/Manifest
+++ b/net-libs/libosmo-dsp/Manifest
@@ -1,4 +1,4 @@
-DIST libosmo-dsp-0.3.tar.xz 106792 BLAKE2B 8ba4c06abda550383ff349d11456890062da606f553c4b0eccc3e8b5d70c4a31ec2dd82ec90ff0ef29284ef13702d3d949720b218e7374cbe7553492faeee719 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5
-EBUILD libosmo-dsp-0.3.ebuild 811 BLAKE2B 6c73d2336c7bdf51d7c886b80ad8788107357e74311aad858f90e4cef0ec09014217bcc07391902655499f85a076e0f643f23dbc96a3b8aebf6b94c4d07602f6 SHA512 7d0ba59d2b53cd6aa6131180557d35feabeefda0c7128ce2652f9c57e8a5fab16358e7b1c7c9f72b2c9441e8d3089c37b29c42a75047544b621a4d093ada3447
+DIST libosmo-dsp-0.4.0.tar.gz 43664 BLAKE2B 10f1718868971492cc93bc13b8a0648ee8c15bbbdc06119b9783851fdfb9959f52cbefabf23ec18b03d961b8a3f7ae81a936008ae71e5001606ba24b78de4ac0 SHA512 364a4ac3fca3e10216057d647ae1ea77550f3d4d3707978c457f363dae66ec252e8eb60dc53db5f45f85bcdda26d54b13d56b60eb8eb3133479d21482ccf96da
+EBUILD libosmo-dsp-0.4.0.ebuild 811 BLAKE2B 00e09e10c28384615d2821067acb831e087c9f1f2ad9eccc881da4f88d0f627b7f5757867107066bd16d5df3b023e64a0d539d2f723cd19c70c66fa43437f336 SHA512 1ad43f8e798f668cf55c8fffea069ba4d067a1ca160b8c19f8ae62c7d9f27db9900823951630ad56ff334824268a282b85ff8f120938eedf55e2e5dce2261978
 EBUILD libosmo-dsp-9999.ebuild 811 BLAKE2B 6c73d2336c7bdf51d7c886b80ad8788107357e74311aad858f90e4cef0ec09014217bcc07391902655499f85a076e0f643f23dbc96a3b8aebf6b94c4d07602f6 SHA512 7d0ba59d2b53cd6aa6131180557d35feabeefda0c7128ce2652f9c57e8a5fab16358e7b1c7c9f72b2c9441e8d3089c37b29c42a75047544b621a4d093ada3447
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
index 6d74de097a23..17146e52489b 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.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 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index f6b0ed8c1b2c..3c7be38422cd 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -2,8 +2,6 @@ AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb12
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3507 BLAKE2B ed5cd354a5a8b0c5d17c43dbce2f494273b75b842d8952269ce95839a5798a05cc745d1cd800fc4cef5964bb8e14b3607846a23fdbcff0db01045ddc81f3af35 SHA512 30aae07b6c42c20cf76b095fccf4177d35c4f4c99dea82ae8f97cb680f29ceaadc4aa1393f83a3eaee8706670f94b544bdec3cd48c43f9ce28a2777a1dd9053b
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
-DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
 DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.16-r1.ebuild 2547 BLAKE2B d4b60bb6f82bbea5bc8fa93c58800e4ff96053c9440e4b515b42664fbb7b556cac52869b9c2455c55caa41e94192ff30e88a3be9e9516335b20b147b79398196 SHA512 7896b08565b3fb6f36ab7039f98ee5ad11fadda51fbde1aa64faa177a61d22fcfcace208c675d5c9961c573d088323d47de7c07fb4cd297bac4fbd232ab884bd
-EBUILD libproxy-0.4.17.ebuild 2558 BLAKE2B 54cb229a6f3743f41052910ed52b90e8ede7fe35db0125f05a7c24d3dbb3810afb20eb5c1de591d13cbf24d865d181abc59b66dd68b5371517216112a0eed5df SHA512 7256609c6e1f1bc69e37a7eee23fed6fd257d2471e76e83a137e97d7d8d0774cdb55d2cfeb9a987576fe655b491ac6713454dd04430ed25706712913d8d5e421
+EBUILD libproxy-0.4.17.ebuild 2555 BLAKE2B 916164c55b0c6f3309a0b7da8424573471a516859ceb8102d6bd3e623498fd6de4d159bc2190a6805519413f650eb9f1c3a01837a3ebce38839888721e26ec55 SHA512 8f4ea4ce77da46d937e7218d4f329db3e51a1bab26a2c63b94beb69c7e2ee2d3a15f9b02039b0d8ae9c2e621ec44c739af033bb040d497d321d453c3a7024883
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.16-r1.ebuild b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
deleted file mode 100644
index 8ed586d917b7..000000000000
--- a/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic mono-env
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://github.com/libproxy/libproxy"
-SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="gnome kde mono networkmanager spidermonkey test webkit"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	spidermonkey? ( dev-lang/spidermonkey:68 )
-	webkit? ( net-libs/webkit-gtk:4 )
-"
-RDEPEND="${DEPEND}
-	kde? ( kde-frameworks/kconfig:5 )
-"
-# avoid dependency loop, bug #467696
-PDEPEND="networkmanager? ( net-misc/networkmanager )"
-
-PATCHES=(
-	# get-pac-test freezes when run by the ebuild, succeeds when building
-	# manually; virtualx.eclass doesn't help :(
-	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
-
-	# https://github.com/libproxy/libproxy/issues/27
-	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
-
-	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
-	# https://github.com/libproxy/libproxy/issues/28
-	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DWITH_NATUS=OFF
-		-DWITH_PYTHON2=OFF
-		# WITH_VALA just copies the .vapi file over and needs no deps,
-		# hence always enable it unconditionally
-		-DWITH_VALA=ON
-		-DWITH_WEBKIT=OFF
-		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
-		-DWITH_GNOME3=$(usex gnome)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
-		-DWITH_NM=$(usex networkmanager)
-		-DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
-		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
-		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
-	)
-	cmake_src_configure
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_install_all() {
-	doman "${FILESDIR}"/proxy.1
-}
diff --git a/net-libs/libproxy/libproxy-0.4.17.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild
index c85655ee2052..05856b011b36 100644
--- a/net-libs/libproxy/libproxy-0.4.17.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 9601892a844f..aa59d3e9c28b 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -2,4 +2,4 @@ DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
 EBUILD libpsl-0.21.0.ebuild 1477 BLAKE2B 0f7d248494463a3c1c646eb3a6d547b197fb908ebfa358a7380a6242aa742efcf89dca21c6542227bcd8cb8d5930121e52ce5fdaff92488b69a1a2d209253e59 SHA512 6fcb6db787a0cd285c7528044ad89579de9501fcfe1b2c76587f8993830851626e425254645140665b8877672e9b806771f0a170465e92a0faef80f1c3b2a7c6
 EBUILD libpsl-0.21.1.ebuild 1487 BLAKE2B 0dc61f37275faf7cdeac5d472c5c264deba831b54fe41b1b0b7b07620cae859f2ee12cce7e97c5ddf67dbc36726537502b33a0002d99539bcb5fd04e0e531ff7 SHA512 aedbe164ec50c96e2df5c65006436ee704c4e7d31dc99687ab64b5af1c02c8b35682146d9a6334a00dae5a7b4eaa3f8a77f8249cd0250eeaa1eac290d8699c12
-MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
+MISC metadata.xml 343 BLAKE2B d19e87c4ba9e09228a0fa952aa84158e3af40a273fa6397c46398c5ec2af03b21265e16f93083847e5cce2518d560ae85bea0c55993333e1c7875a06391e95af SHA512 9aba846b595571dbc7087579243f4c41aef47f25e64289a3798b047a6e49b1e2bb0a823b7b92c22b9d9dea776bc5f5bb8117ed5ab49f4269fba8066caa8ca09a
diff --git a/net-libs/libpsl/metadata.xml b/net-libs/libpsl/metadata.xml
index 93c95ae3fa86..bb8c636defa9 100644
--- a/net-libs/libpsl/metadata.xml
+++ b/net-libs/libpsl/metadata.xml
@@ -8,7 +8,4 @@
   <upstream>
     <remote-id type="github">rockdaboot/libpsl</remote-id>
   </upstream>
-  <use>
-    <flag name="man">Build man-pages</flag>
-  </use>
 </pkgmetadata>
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index c9ecae4d5f7a..b94b59c94887 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,8 +1,7 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
-AUX libquotient-0.6.3-use-after-free.patch 3310 BLAKE2B b76cedab7211b24c152fe33fe326e6b9ca487f33a4a15ea51aea73a6e1753967a107a6a23fca85bb3c1f450221d5241d7dd76b3b5fb0ca3daaee9d52dca77feb SHA512 91df36b149e3595e68a4743e88a921bc6fcb4fdd7a0506bae6fdf3d48e1c21a8fddf815999f9f650372a9782c91ec9ec41bb7e83cb5f18b8555684b0e53d5c23
-DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
 DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce SHA512 6f505a697b6bd123004faaaae4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce
-EBUILD libquotient-0.6.3.ebuild 907 BLAKE2B 0dda7e3e5ddec21ce6c3e445f020208e293cbbdd180ad18d49116e962da27adabefdcd7a02811a47f851b115f0deb37b9b03df0ed5ad12090cecbc7cbf7c0c90 SHA512 2f97f71e4769fada4336381ca3a568b1119152d8575fea8fea6fb854cf27c1d669757a3c0a835769219249d16d1375bba846ccc3f8469de483d261c19f5a2b9c
+DIST libquotient-0.6.5.tar.gz 560003 BLAKE2B b23437c3ef204da731723946e372685cb492ee5feab3f71f5770a27c1fa2d2810676ed2c9dbdb95499055e05a3589db92c75190471ba4dc14f3aaea8f2282216 SHA512 9079de0eec103f15cb7092319546b8be213b460ab172444e4f2f2b10d06db85485fda48546b3291db9014fddd8b22542119d6bbeb69bee1f2a208ac87990c3e4
 EBUILD libquotient-0.6.4.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
+EBUILD libquotient-0.6.5.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch b/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
deleted file mode 100644
index 12046a102121..000000000000
--- a/net-libs/libquotient/files/libquotient-0.6.3-use-after-free.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From f286ef4c5b3c71510d6ef15e8cc12cada84f3682 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 27 Dec 2020 21:24:06 +0100
-Subject: [PATCH] Fix use-after-free of QNetworkReply in BaseJob
-
-Usually QNetworkAccessManager expects the user to delete the replies, but when the QNetworkAccessManager itself is deleted it deletes all pending replies (https://code.woboq.org/qt5/qtbase/src/network/access/qnetworkaccessmanager.cpp.html#529).
-
-This can lead to use-after-free crashes when d->reply is accessed. By putting the reply into a QPointer the exiting if(d->reply) checks can work properly.
-
-(cherry picked from commit 9d854e778d8d6ef8e03e1ea74fe958675b24fd45)
----
- lib/jobs/basejob.cpp | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
-index 3fa1cd94..2ac942f5 100644
---- a/lib/jobs/basejob.cpp
-+++ b/lib/jobs/basejob.cpp
-@@ -24,6 +24,7 @@
- #include <QtCore/QTimer>
- #include <QtCore/QStringBuilder>
- #include <QtCore/QMetaEnum>
-+#include <QtCore/QPointer>
- #include <QtNetwork/QNetworkAccessManager>
- #include <QtNetwork/QNetworkReply>
- #include <QtNetwork/QNetworkRequest>
-@@ -76,15 +77,6 @@ QDebug BaseJob::Status::dumpToLog(QDebug dbg) const
-     return dbg << ": " << message;
- }
- 
--struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
--    static inline void cleanup(QNetworkReply* reply)
--    {
--        if (reply && reply->isRunning())
--            reply->abort();
--        QScopedPointerDeleteLater::cleanup(reply);
--    }
--};
--
- template <typename... Ts>
- constexpr auto make_array(Ts&&... items)
- {
-@@ -112,6 +104,16 @@ class BaseJob::Private {
-         retryTimer.setSingleShot(true);
-     }
- 
-+    ~Private()
-+    {
-+        if (reply) {
-+            if (reply->isRunning()) {
-+                reply->abort();
-+            }
-+            delete reply;
-+        }
-+    }
-+
-     void sendRequest();
-     /*! \brief Parse the response byte array into JSON
-      *
-@@ -140,7 +142,10 @@ class BaseJob::Private {
- 
-     QByteArrayList expectedKeys;
- 
--    QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
-+    // When the QNetworkAccessManager is destroyed it destroys all pending replies.
-+    // Using QPointer allows us to know when that happend.
-+    QPointer<QNetworkReply> reply;
-+
-     Status status = Unprepared;
-     QByteArray rawResponse;
-     /// Contains a null document in case of non-JSON body (for a successful
-@@ -315,16 +320,16 @@ void BaseJob::Private::sendRequest()
- 
-     switch (verb) {
-     case HttpVerb::Get:
--        reply.reset(connection->nam()->get(req));
-+        reply = connection->nam()->get(req);
-         break;
-     case HttpVerb::Post:
--        reply.reset(connection->nam()->post(req, requestData.source()));
-+        reply = connection->nam()->post(req, requestData.source());
-         break;
-     case HttpVerb::Put:
--        reply.reset(connection->nam()->put(req, requestData.source()));
-+        reply = connection->nam()->put(req, requestData.source());
-         break;
-     case HttpVerb::Delete:
--        reply.reset(connection->nam()->sendCustomRequest(req, "DELETE", requestData.source()));
-+        reply = connection->nam()->sendCustomRequest(req, "DELETE", requestData.source());
-         break;
-     }
- }
diff --git a/net-libs/libquotient/libquotient-0.6.3.ebuild b/net-libs/libquotient/libquotient-0.6.5.ebuild
index 9ab95317dc78..0474fff2b604 100644
--- a/net-libs/libquotient/libquotient-0.6.3.ebuild
+++ b/net-libs/libquotient/libquotient-0.6.5.ebuild
@@ -24,10 +24,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-use-after-free.patch # 0.6.x branch
 	# downstream patches
-	"${FILESDIR}"/${P}-no-android.patch
-	"${FILESDIR}"/${P}-no-tests.patch
+	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
+	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
 )
 
 src_configure() {
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 465c729ee879..34ba6fa0ac83 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -3,4 +3,4 @@ DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf
 EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
 EBUILD libsignal-protocol-c-2.3.3.ebuild 346 BLAKE2B cfa3bb04e96f7fb558250e8c97da2dfcc5d066370aefd966e734303531e9527a8772365cfd593f904547f5d16ca98268f537fb14f45032fcf677f5fb4817dd3b SHA512 e1153a01732b51c103d8efc23ca49c2bc2292ed64d7d9fe04e8c65819a211a6f35f42e7b4ea971a503a5cc85c6803d45c2a828e266052ff6bbdc2df6d186c57a
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
-MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
+MISC metadata.xml 740 BLAKE2B f0179790b4d118bc0a9369431074708efb99d161d97d3e98ed2f252139953bfb834a2dae63143c9a9e62c83f95f3fe8892459376ccef707bde55268b4d62922d SHA512 6f0f82197130b9146ee4df23f88ee94881770f068b7e254612742eaee6c8bf175e1f154c5d1479ea52f962bbf1e79fa0ae1a29163b40e07462eb73294d1b5f9b
diff --git a/net-libs/libsignal-protocol-c/metadata.xml b/net-libs/libsignal-protocol-c/metadata.xml
index 5a4e8024ed94..3dab7e8a5702 100644
--- a/net-libs/libsignal-protocol-c/metadata.xml
+++ b/net-libs/libsignal-protocol-c/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>william@optmzr.se</email>
+		<email>william@wstrm.dev</email>
 		<name>William Wennerström</name>
 	</maintainer>
 	<upstream>
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index fc5560b904b8..a5328c850cd9 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,15 +2,9 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
-DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
-DIST libtrace-4.0.11_p1.tar.gz 1855693 BLAKE2B 9135b03258005587ef2e2b51c6e8c87bb2fb4963489b1ce5933c46100d708fa32978fc5b449ffde11fc6c27706afd36a82428cc55f0555a864ffad636f9c991d SHA512 b3cab7d24efe4503358f2265957170b0857f52c4ea2bac0d5424fe3b9565ead51795596ce28410e15741d89e3ba1db3c22046557a3e5b21af8c1b6f8ed9cd585
-DIST libtrace-4.0.12_p1.tar.gz 1865404 BLAKE2B 3b628cc8264fd76bd513a56de9aaa1e0458b10271532853964b8cd1979d73925d48e7255589087e36f98d45809e71bc8dba972e48af9cc26285987327a4bd5f9 SHA512 b2253ba37b6c5d6f6d0efe1ac5c02b67b382e294e291abdb92c697e1a26cbe75b5f54a44bc7e07b1a0c8cb5efc36a3cc3fb48a9d79a090d6732692dbd268b8f8
-DIST libtrace-4.0.13_p1.tar.gz 1867583 BLAKE2B 5f6526a19255a2e8fccc345ae7682a44709325eb031352234358be08b963339fffaa7f4324ef738cf19bac941bcb7b1e748caaf51a2defd937c5684616a7efa0 SHA512 23f9a55b3185ede5a5d345dd12cda3eb2b77b1e76c46e210ad847b3e70c22de5c9eccf5a34b8b9305d35ed22e6b68fe7003dc699a28968f7b30895f0341cb4b9
 DIST libtrace-4.0.14_p1.tar.gz 1891628 BLAKE2B 5c30d48b34ab98fc53419a1ec7a205ec9dd97f7d162c1ea6ffcb30246ed1dde16332936d9ea3dafa32dc7a0eb991c3b384690e5f95f3646a85456d8ff28db70a SHA512 ac9031d168656c22a6113938c91b297d78a67a03d0809443345e1501f63c68812298af2760b34ce5bfa69e8d0968185bd3b6eabb838a94130ebad22bd2ecc488
-EBUILD libtrace-4.0.10_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
-EBUILD libtrace-4.0.11_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
-EBUILD libtrace-4.0.12_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
-EBUILD libtrace-4.0.13_p1.ebuild 1455 BLAKE2B d1c7326ad7d64233a467a9cc67b9b8574f129516ffd49351fcb1599ee1d157f684f39a9f31bf083180d6235747197e813509c8b88bc9f1b3e83e5bd2332d6196 SHA512 359083f3763ad856abcd374f444d79e674cb1e8ca9195e24fcba6a57fdc27a7521045ef4fa27b5d4f3bca147abbc7a4950a7ba0d88710b6b9db5c889e6ef4555
+DIST libtrace-4.0.15_p1.tar.gz 1891845 BLAKE2B 08faf395f5fdda21829b89a9276649b297d2266ef10d2162b588b39d4d8d2da1306c74bb180d63b92f4422bb157fb451d34cd8167f0bff42322776e3b1ee0e7c SHA512 82f18b03e824f3ac89330854c3659244106ab5323f5e7a43ec7d2280f6ad3d427a906708688469b3f5aa479d11fef99a4bbecea585b81c916029132375582a4e
 EBUILD libtrace-4.0.14_p1.ebuild 1455 BLAKE2B d1c7326ad7d64233a467a9cc67b9b8574f129516ffd49351fcb1599ee1d157f684f39a9f31bf083180d6235747197e813509c8b88bc9f1b3e83e5bd2332d6196 SHA512 359083f3763ad856abcd374f444d79e674cb1e8ca9195e24fcba6a57fdc27a7521045ef4fa27b5d4f3bca147abbc7a4950a7ba0d88710b6b9db5c889e6ef4555
-EBUILD libtrace-99999.ebuild 1422 BLAKE2B bf1e1d0ff2bd0c9cd8932ba643152f47b1f3a402f528ea0cd822a02b8e7bde6d500296b569fc4a9b16590c21b277b0a2f30323471f6ab0e7f6ea40ee9f5026b3 SHA512 7a61a58ea0a678f56a1e79da53673b257a1f2bea232ddc3b359756996b888f1b1a48763ed9e312ab6c62176c1976e0ce72918a34428e40e1ec398e9d17be54cc
-MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
+EBUILD libtrace-4.0.15_p1.ebuild 1496 BLAKE2B 88e72d28f4b35dda288f0149ca2c889fc3c3608f2d35b033e1594ca0a46911ab1397a4634548f3e8ed2cdc89ead8e592f648a6e33c3876a19e45e3cbaf67e441 SHA512 7458355a9c04d27d4f048a20be606e7c480de502aa71c006b15ceb2790a618b642212ea488471d710b30e4daea530322256921afc573f2eb4b7ee028742dff75
+EBUILD libtrace-9999.ebuild 1421 BLAKE2B 5b1c43c2134531f0da96b1c3c190d5fb5bf9edf89d7b93ad3899b6d50d40623e785198a084c211752aa8252231b3ee5440b1cfd0a3fd54be754ba9eb3a3666f0 SHA512 6a72d1a716c1df9c62581a587bd1881f2c90e221439b195687dc6f0e103f632be365e74582db50e3aef2ac044b23f6e05d895e3c0e6fe46c6d01542f97766148
+MISC metadata.xml 524 BLAKE2B c858b58b91d8a9eaf6a9f421fc5f0cae0b449dc1a6faf817fc497348338ac2f1987660d754fbdb7d16d527ae292a3b42860e6b23f0b08f239f37d2e12ba13968 SHA512 b96b4e9453825d981235e571827231a80e3d969cd8497ef054bc0f9170f1c5b8554ca3340b454c2fe61cdafde325769870cfc7b2211149fee76ddc57e6e5e285
diff --git a/net-libs/libtrace/libtrace-4.0.10_p1.ebuild b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
deleted file mode 100644
index 68a537141188..000000000000
--- a/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
+++ /dev/null
@@ -1,67 +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 and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r docs/doxygen/html
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libtrace/libtrace-4.0.11_p1.ebuild b/net-libs/libtrace/libtrace-4.0.11_p1.ebuild
deleted file mode 100644
index 68a537141188..000000000000
--- a/net-libs/libtrace/libtrace-4.0.11_p1.ebuild
+++ /dev/null
@@ -1,67 +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 and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r docs/doxygen/html
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libtrace/libtrace-4.0.12_p1.ebuild b/net-libs/libtrace/libtrace-4.0.12_p1.ebuild
deleted file mode 100644
index 68a537141188..000000000000
--- a/net-libs/libtrace/libtrace-4.0.12_p1.ebuild
+++ /dev/null
@@ -1,67 +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 and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/libyaml
-	dev-libs/openssl:0=
-	net-libs/wandio
-	ncurses? ( sys-libs/ncurses:0= )
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
-)
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Comment out FILE_PATTERNS definition (bug #706230)
-	if has_version ~app-doc/doxygen-1.8.16; then
-		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
-	fi
-	# Update doxygen configuration
-	doxygen -u docs/libtrace.doxygen.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r docs/doxygen/html
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libtrace/libtrace-4.0.13_p1.ebuild b/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
index 9cd5b1a63f43..4f14188b0ead 100644
--- a/net-libs/libtrace/libtrace-4.0.13_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.15_p1.ebuild
@@ -1,18 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
 SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
+IUSE="doc ncurses numa"
 
+BDEPEND="
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
 RDEPEND="
 	>=net-libs/libpcap-0.8
 	dev-libs/libyaml
@@ -21,40 +30,36 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	numa? ( sys-process/numactl )
 "
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
 )
-S=${WORKDIR}/${P/_p/-}
 
 src_prepare() {
 	default
 
+	mv configure.{in,ac} || die
+
 	eautoreconf
 
 	# Comment out FILE_PATTERNS definition (bug #706230)
 	if has_version ~app-doc/doxygen-1.8.16; then
 		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
 	fi
+
 	# Update doxygen configuration
 	doxygen -u docs/libtrace.doxygen.in || die
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with ncurses) \
 		$(use_with numa) \
+		--disable-static \
 		--with-man \
 		--without-dpdk
 }
@@ -62,7 +67,10 @@ src_configure() {
 src_install() {
 	default
 
-	use doc && dodoc -r docs/doxygen/html
+	if use doc ; then
+		docinto html
+		dodoc -r docs/doxygen/html
+	fi
 
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-9999.ebuild
index 68144574adea..08a6c74711ba 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-9999.ebuild
@@ -1,19 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+S="${WORKDIR}/${P/_beta/}"
 EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace"
 EGIT_SUBMODULES=()
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc ncurses numa static-libs"
+IUSE="doc ncurses numa"
 
+BDEPEND="
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
 RDEPEND="
 	>=net-libs/libpcap-0.8
 	dev-libs/libyaml
@@ -22,21 +30,14 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	numa? ( sys-process/numactl )
 "
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
 )
-S=${WORKDIR}/${P/_beta/}
 
 src_prepare() {
 	default
@@ -47,22 +48,26 @@ src_prepare() {
 	if has_version ~app-doc/doxygen-1.8.16; then
 		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
 	fi
+
 	# Update doxygen configuration
 	doxygen -u docs/libtrace.doxygen.in || die
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with ncurses) \
 		$(use_with numa) \
+		--disable-static \
 		--with-man
 }
 
 src_install() {
 	default
 
-	use doc && dodoc -r docs/doxygen/html
+	if use doc ; then
+		docinto html
+		dodoc -r docs/doxygen/html
+	fi
 
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
index 77a8e80f47df..b71b13bfc8d5 100644
--- a/net-libs/libtrace/metadata.xml
+++ b/net-libs/libtrace/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name='numa'>Use <pkg>sys-process/numactl</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="numa">Use <pkg>sys-process/numactl</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LibtraceTeam/libtrace</remote-id>
+		<changelog>https://github.com/LibtraceTeam/libtrace/wiki/ChangeLog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 1bb9f2f75253..676f00a0632b 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,3 @@
-DIST libyang-1.0.184.tar.gz 1659420 BLAKE2B 55b54e5440fb08437a91df2c218e4add37740c0416b26e9ac3b5949a4a5ba25ded8c4c7668e0bf20c8ffcfbae95f7c4699673998285ce37c17604f121429fd4f SHA512 bb1c396b6048d848ea844cc462f1ee9f14b0dad848c7618ec0f9bd239d28db8a94f94550c5439ca07e01824a910a748ec6be699c58150b34072c2f9b76acd95c
 DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
-EBUILD libyang-1.0.184.ebuild 748 BLAKE2B 33a1f74218705ee63ed281a2d120b4432e696311cfa13d6e99825a69d48996d733cf67c9d932f8107a43953ca8ac3b876b7c1a8c57bc409f14e4edc828314016 SHA512 f911a66e42c932b023bb214acedd94e4b0a95b580adeab0a22819d5d21b465df112d4bd70a99d6d0ace495a841efe3e1f52f92beaeb40bd78287b7f7b7c6951b
-EBUILD libyang-1.0.215.ebuild 899 BLAKE2B 0a2cfbebf99da7a3b18bfe38d3c9f337f957f7e2d1ba57aa801970d748f8cbb09c602ca51f3dfc0ddf6f21dd37ccec541d81a904b9ad972b626d8a364e909a56 SHA512 4b4a9aec82429bb62e5410bcd1462b5bea46752627c8935d5b8061781af896811034ad0671cc157825eaf3677aef936d7d492c777382915a0a0682f6405fbd40
+EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
 MISC metadata.xml 326 BLAKE2B 45b056740b8b584e8b4e559a006238f1ffab67c325b7a23916bd642d3e9fee1503e165dc3477aa7b51ad1555e8e2c4e1c74b7d1b868b22c6ea96e286f4787a11 SHA512 00e03ea5ff75266886efc60fb13079cd2c0983ab0707f2002c44e7e3cbb984778f5d6341838ad7fb7ae1679fcacabfc949b9d733a4a88bc2ecb503352afe2eed
diff --git a/net-libs/libyang/libyang-1.0.184.ebuild b/net-libs/libyang/libyang-1.0.184.ebuild
deleted file mode 100644
index 011024b81a68..000000000000
--- a/net-libs/libyang/libyang-1.0.184.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-RDEPEND="dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LYD_PRIV=yes
-		-DGEN_LANGUAGE_BINDINGS=no
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r "${S}"/doc/*
-}
diff --git a/net-libs/libyang/libyang-1.0.215.ebuild b/net-libs/libyang/libyang-1.0.215.ebuild
index c98a1b7dd4b5..4d3674d9b3ad 100644
--- a/net-libs/libyang/libyang-1.0.215.ebuild
+++ b/net-libs/libyang/libyang-1.0.215.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc test"
 
diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest
index c82046cf7377..53d87288c1f0 100644
--- a/net-libs/liquid-dsp/Manifest
+++ b/net-libs/liquid-dsp/Manifest
@@ -1,6 +1,4 @@
-DIST liquid-dsp-1.3.0.tar.gz 1036160 BLAKE2B fab2cecfdb3e494c5bb25d273be3dbb44904b1c1ef419eb166bdfa33b29a03aa72cb1c1d8b2bbb8ed87a505fa2b68b53cb300f41a51fdb01ac2cb5e309fec5ad SHA512 d69df2c15ea56cd84be9f77383b9914daa52e89e1136aa84fd14dff7690e98c4e29bb5c4e570cac5ef826b884b8fa382e5d806a711d22b6d5c4ddf5b93a0026b
-DIST liquid-dsp-1.3.1.tar.gz 1047182 BLAKE2B e110ac2838209b97420b4884d9df3a3477e548c09f2d3962b025e6e1415ac7077cfb81f16005f90bc01c039514ede9a53e53d969037f7b86c2475e2833f0e32c SHA512 6da76030fc346e3fadfe70e72be14d1f2ff198d3e9bb5ffb5f4d9b89945686d2474d3bb4911a2b923aad22feabebf2744d47afbffabab87737fe46a24af68917
-EBUILD liquid-dsp-1.3.0.ebuild 1030 BLAKE2B b4cb25177dc97b2f744cbdc0ae4282fbb617fccdc8dd72b5ee01abdd294b6b571bb4cd5b0d51c26fbe0c9c05b02c6bb7d22eb64e11cfa2231d02b7a264bd08f0 SHA512 11fb619a04cc8981c0f333259bfa925edb67ba7c4b455ab42719cf717ec0e8e50be42c7dc2152518124b2e6542a19874b79b732dd2d828a34dbef503d9fd9e72
-EBUILD liquid-dsp-1.3.1.ebuild 1030 BLAKE2B ced5dc51acef1131682b236e14147ccc482064e33628bd9a795af937526eb5ff4a0865c374ce9ea68a65af669ea2dda64317d86aad1fa38a225d2e9f6f052586 SHA512 64210abdf7df13fc5791e0d7d1859bd4d07c3f364e9863df8761cbb9448b53bed7b3f58b632898182abd0d4f456afedbb6d4da1cdc7f979d2b1d701927959f3d
-EBUILD liquid-dsp-9999.ebuild 1030 BLAKE2B ced5dc51acef1131682b236e14147ccc482064e33628bd9a795af937526eb5ff4a0865c374ce9ea68a65af669ea2dda64317d86aad1fa38a225d2e9f6f052586 SHA512 64210abdf7df13fc5791e0d7d1859bd4d07c3f364e9863df8761cbb9448b53bed7b3f58b632898182abd0d4f456afedbb6d4da1cdc7f979d2b1d701927959f3d
+DIST liquid-dsp-1.3.2.tar.gz 1119114 BLAKE2B 4530f3929b97f04cf2e02283af0b0482a7e19783f73cd60b02aeadb26df9f7d33a43847496858b6178526abef34fc5121e94bde38df3796bbdf7149251a29e25 SHA512 1af317512f56078a79396fd3c7a0135c97ef63fd187d52db1b62ddabca683a37fa6b358adafd76d81c3cb06c54f9c7c8fd66f8bb86c0bfebec9e9ef1441ca5d2
+EBUILD liquid-dsp-1.3.2.ebuild 1030 BLAKE2B 729fbcfb0b60e6cb1be154bf7f2917c126a583d279ae6c37357d33fed4b983088389d3fda8fe28f74f0087b7251332bbed2acf1a6fd04078d8910d1138a300a2 SHA512 67003de4fb88633dfb031e032a164a3ad5a2b26a5d04a0da506aad275c4819f7418ef83dbb55ef3cd7410db493df6d79c10bf42b558b2620a2efc22ed13b3de1
+EBUILD liquid-dsp-9999.ebuild 1030 BLAKE2B 729fbcfb0b60e6cb1be154bf7f2917c126a583d279ae6c37357d33fed4b983088389d3fda8fe28f74f0087b7251332bbed2acf1a6fd04078d8910d1138a300a2 SHA512 67003de4fb88633dfb031e032a164a3ad5a2b26a5d04a0da506aad275c4819f7418ef83dbb55ef3cd7410db493df6d79c10bf42b558b2620a2efc22ed13b3de1
 MISC metadata.xml 416 BLAKE2B 6f961dd0d9e7e9ee5b6b65eff224e6a73cb7b4ac13432a239da0e28e76e73b49f428d2203294aba8c9568b2b384222a75aed92f046c537d55af738b76dfe29ad SHA512 7dee49689a60f0b24a9435987f3752f53c36c84187e19850bcbe5e2d14b1fd7bf52c3d8de83f91f3e25b3984bbbde9a08150b24d6b62552602ef145821bc95fe
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
deleted file mode 100644
index e80478ff6e9b..000000000000
--- a/net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib
-
-DESCRIPTION="digital signal processing library for software-defined radios"
-HOMEPAGE="https://liquidsdr.org"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jgaeddert/liquid-dsp.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="static-libs"
-
-DEPEND="sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	#without this rather odd looking bit, it installs libraries into /usr/usr/$(get_libdir)
-	#what is super special is that if exec-prefix is unset, libdir is lib64...
-	#but if exec-prefix is default then libdir ends up as /usr/lib64 in makefile...
-	econf --exec-prefix="" --libdir="/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-	! use static-libs && rm "${ED}"/usr/"$(get_libdir)"/libliquid.a
-}
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
index 8a6ed71d86ee..a8e81740c38f 100644
--- a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools multilib
 
diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
index 8a6ed71d86ee..a8e81740c38f 100644
--- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools multilib
 
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a566435013a1..af36ff3bda0e 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -5,5 +5,5 @@ DIST mbedtls-2.25.0.tar.gz 3994272 BLAKE2B 27a326ba08c341ed47ce280401a4b73606138
 EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
 EBUILD mbedtls-2.16.9.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
 EBUILD mbedtls-2.24.0.ebuild 2558 BLAKE2B 3c800e117bdf590f4b2b36ed8cfe1100bdd3e5a7f30f1c0b75d8a87df0564b9d48ac54a4004a9aa106ddac89e1d0d38889d1a12f15cdfe8dd73044431bfbeb80 SHA512 efd6824356a5fc621fcf8b6f7c0937721fe8c044a5c49bbf965ee09f339aa0cbe8b38efa2cf65e87ba7d6f8f89188a45a6df95a8a08abfe024a55ce879b87ad7
-EBUILD mbedtls-2.25.0.ebuild 2560 BLAKE2B d47d85c76c961a00a1be01d2a54f2a082fd99dfed3d9d486925f3e194dd7ce1c6c44a7fdd13e581ab567cf18e9e45da6f234fc0966eb638ac0026120f5299036 SHA512 873e9e6ecf89d34922a749788e57d5df19846f13190d483aded50482e9f743892cde05f9a318548c950d1f1a1d84bb50a54856d57f4a780874d1b9490f2aeae4
+EBUILD mbedtls-2.25.0.ebuild 2558 BLAKE2B 036a5b0e4b5e8d6058d8ce94ec66ece78eab2795e0cf6a0d9404dec7cae625fb33caa92e28084511f36b16715faa0a31454f9a26a7a634cd5b3a63c97180f491 SHA512 181843ea26633f5b89764d58954218766f93acd521659f941e5a473ed68a01cd6a1d69b6a28706cadbecb57030ff675bfd6a8fb284fe4aa133b4eb48348fe23f
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.25.0.ebuild b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
index 6324e1d678d5..18d14d0312f2 100644
--- a/net-libs/mbedtls/mbedtls-2.25.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 417bb7e79f8a..c0ae231a1552 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,7 @@
-DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
-DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
 DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
 DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
-EBUILD miniupnpc-2.2.0.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
-EBUILD miniupnpc-2.2.1.ebuild 1532 BLAKE2B f2addd212049fc794f7d63e9d77ccf703bb1943662d475eb5bfd5c3fb9ef29327400d1628ff33eb5e2f280294668dfae6e5a1a6468f5605edf8f702820818376 SHA512 3635df1e464624500593db7ddcbd9744027b4867e17cdb930b36f142f610e5e5c6c6294786bbd57c1792f51a38bb676467f65b3d4d55f0e83cdd925b211b4aa8
+DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
+DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
+EBUILD miniupnpc-2.2.1.ebuild 1523 BLAKE2B ea2dd919c4f75f297f19821ea9c1a4c473961aa78252fe3bd715ebf55d2272f95ad49de13a3a525bccfa8f5dd4e12f1ae76ce486957ce2b394335cda9b846fd8 SHA512 44d76f3bbaa507b7a8b61a50ae9d712c34c8cf8a7087523cf025827a4133660bbb2c6c79e58869642884fb27b81295abc75cacb60dea9fef735a0fc30c837c12
+EBUILD miniupnpc-2.2.2.ebuild 1532 BLAKE2B 396ca93467257de798b1dc3a7b1a4b689e7c7f51ba8a69e55a4ba5e9569ae6305b49c6436bf5e3d3fe243563c0926aaa865a24c2b416ed2b0fec9755695e8725 SHA512 62bb629dd461c08340a98de6f86b58de34c1d940214666379ff3fae38c3ee301e610ad848347d283f7e40473f629fb6f319c4ccb9e83ae8fa54217011a499502
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
index 9e79fd0ac53e..69cd49ce7d3b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.1.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
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
index 939ae17cc4ef..a899a8dd2a1d 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.2.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
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 7964e01919d9..bf7d8ad8697a 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -5,5 +5,5 @@ DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c64994
 EBUILD neon-0.30.2.ebuild 3354 BLAKE2B cc9d94b47c23ff1612104fde3d051a0abb132fa64f2cd852597fcdfbb025020048aeabed8d0571614e0b3cb814d60cb85164bcc0bd2caa41041352f04d459b93 SHA512 e17afc025985d23c8e65252f6ba35702b4dfa4ee8adbaf7192a90e87ba15e07d845876f0e0634f7af74824480684a678f807ce63ca04ad6841c2c9a42fd984e7
 EBUILD neon-0.31.0.ebuild 3362 BLAKE2B c1d88e0046239bdec90bccb959c5240107eb61fd1d2c04875e1e4e23cd6926eb4c41bf8312af8a89595e93419a8c3e408743541b2e5eab3d311e0c529e1460de SHA512 3aa4ba6cb571497b5a88b1d624a93debcd422a6c3c4c8767e176d624c013889123f94981af6b54461177af986798eaf4a15daf20eb2c5ed0b4ae1514888ac581
 EBUILD neon-0.31.1.ebuild 3369 BLAKE2B f1dcee1fed98319650d35b30a2e4cfe7c72cfaaffebcf2b6a277603f46b9575e72d125535f04fcb17becdb3e88e0ef7c9649ba1080094cdd3d6e2f0cc89f4ece SHA512 a62d04500dc88899125b4320613e9608614fb8afb75fe95f98f1a06a4a7b869a0965daa1c959a2779f8b7a5acc0ddacfc551d5e7093462eca9b5b8474bcd9d4e
-EBUILD neon-0.31.2.ebuild 3363 BLAKE2B 7d898b351560f9a7e31caef14ba09bb25391d24dbd9ba8cd56925f0961765220313fa6463d25dc6b80e56eade3978bb3c1a3974dfbe3bba0a8220b1f2d764676 SHA512 0193c0ef69400eccf44f25dddfcde3e81440a1a1f52a1efb50f89271e15f12b4b19cee45e9955fd0263f1f07bf02114f7fcc818e3688905e171ccf2c13b9d5e7
+EBUILD neon-0.31.2.ebuild 3362 BLAKE2B 25b14a7dc2fab86fc0b0ceddb80e5495c42433b114206eed3c061e26d928736c75fbf86ff504cffc33aa71e6fc92855f86725f6c18a2430daa38713510a9e8c7 SHA512 7a797c9def0282b1bb59355a6d8104f596ed000e18e6e5f4be60c227fb958a953eb889cfb958862f1dfa1e3ad2a5f36ca71b812151d5d70dfaa6f1fb2213e8c6
 MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
index f4bdd2f905db..0cfe9882b5e3 100644
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ b/net-libs/neon/neon-0.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 7826bf716770..2fad44b64b75 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,13 +5,11 @@ AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v12.20.1.tar.xz 23641412 BLAKE2B 1c1d828a46c7d3ba3a8995d65902f20ff4d3e3c992a90e4cd0d0e985d5537a8251a1b789cac106caccca9050e5e74ca2e15b27100f715ef453d194fa07271a7a SHA512 a8948cfa64cc5222a975294a6403c1fb0c2443552ad739a049f7e50beed542c22e0004a456f1a225af847cfd06fcb4101d8f70e3f932750e74be86b14402af4d
-DIST node-v14.15.4.tar.xz 33296076 BLAKE2B a707dc15bdb670cdb239560d9b7a10541b793cad2339d02dafac2974df38dbe57d141b60d934f8b91cd65961f3a2df4ce92bcccf8b4359c7041f5f5531f1b704 SHA512 0d497a5d51de52412d09dd0fbcb936dbf0cba810f84d598be8f02c876d55f614e00c1ea0b25a00838e7b9f9c73a7882e3de0e9507d1c6ee45270a62d3438ab41
-DIST node-v15.6.0.tar.xz 33419420 BLAKE2B 10385dc89fef6a7399ce76c54e5237f39b367dda1fdbbc546020580abda9def22649faf76a04a260846c97f142b87d08f49f02c06e198421799d406420282a95 SHA512 911ff2cdaece8b57c2537bd3bc42988756ec616b6f187ad9e4b37355d3d741b78a87b7d0069faadc837a66f5fd5a729b4e52034b213fd8a63bd71572b5a9e2ec
-DIST node-v15.8.0.tar.xz 33196416 BLAKE2B 14c8567715e6fd341d473550174e564ea535c180007eefe971d7e6871ffdbf7e499c5bec5c6cc5b79e3bbe2c364ab3863199edfda5908d5fc4e0dcfd6898f725 SHA512 59a0a15d108de7a42c3d64e0b6d61c5aded95bcb1b2cfb19352aa508e984b9f744229de2e1b3a9a8f2b1269f214c02ea295298c896b5bb71a4136cf2f13bf542
-EBUILD nodejs-12.20.1.ebuild 6349 BLAKE2B 0556fd493a5a4bf077732cb4e34b77d9a2185cd7d3a24ffc0d0147e9e79bcbe7cfed96f8e3c24e95097dc044e3e5c62ed03b4f75ea8d33bbdb9c5f0f144ccdc3 SHA512 307990866c37a22b9d09e21333e19778a39bc44ca8714da8f4730869b90ad90cdecf9131a08ada444ab897e3ef02ab1f3d2e4c117a4dae452a5c89eb41873d12
-EBUILD nodejs-14.15.4.ebuild 6046 BLAKE2B 33b0f4ceee6472129bebeb1db5d9f2f73028e5695eec5f92a877f63b1a33e41f80c8d119774dd0f002032e3a28debdc2a2040109165b9c39bd2a716925a38d4a SHA512 1c598f9699aaa8750455aa38717f005e3ff2284a8cc801a56e4a789c96f298503d7db9ff258c526dfcb0b4986c9f60a900671e25e35b999bd4a71325bed70e4e
-EBUILD nodejs-15.6.0.ebuild 5676 BLAKE2B aee7588049a09db4823eca4588623562e7b0f812f41f03681be5372579ed8eab9bdc38ce2c353e40de9c7fa6da05068be289d6319c1757b1cbfbb361b71c8d02 SHA512 9bbab3ef03347a9530079d12c221ce785770349f155e056a8ea39eba42c48f9cce2ab1315fd8ca9532f0cee354c2192c5072cc29cfb43bd77229f80a205d74f7
-EBUILD nodejs-15.8.0.ebuild 5676 BLAKE2B aee7588049a09db4823eca4588623562e7b0f812f41f03681be5372579ed8eab9bdc38ce2c353e40de9c7fa6da05068be289d6319c1757b1cbfbb361b71c8d02 SHA512 9bbab3ef03347a9530079d12c221ce785770349f155e056a8ea39eba42c48f9cce2ab1315fd8ca9532f0cee354c2192c5072cc29cfb43bd77229f80a205d74f7
+DIST node-v12.21.0.tar.xz 23650552 BLAKE2B 532eef3e77d78aa1b6f30ebdc1dee88ed95280c86e44db525ce369cb1c2d9707a30a1a4ec2d8e699f7c1a14ada036fc4d62d0f0c7fa017e72768662768bbbf18 SHA512 48df48a12657e3a2366cd80a1a7040365b7a90053676230f1f93f253a1fcdafc5bc1df5b5ec5c13f616277b5feb7e7653cd145ab9c23222bf7702d7cd1fa74eb
+DIST node-v14.16.0.tar.xz 33301140 BLAKE2B faf380e8f02ea2e6084601fece1e9d3119aeabcebc844fd22a79c18e27cf54f0cd470971cc5a86277a226e59950f511e1173828565bdda1c1f06c52b144cba6f SHA512 ac6f7408df35e2bae8bcad3f461d8e260a2762c77f78d737b0339a592724ff1a98ba171a95e44366e731accfb3208e7cfd6d3edd0f646ddc26a01cfbdbbb655b
+DIST node-v15.10.0.tar.xz 33246956 BLAKE2B 2227063a352ed090aa92616f1d4651c840db8f22646cfbb8ad54aa568c6ce5ff1d608f98092a680df052849d50c25407e6e2ea51dda8b47591fd5cf58c972a3f SHA512 0d00cef7a2b665f15fae5321f7b9670866cf299855235806809b11b8b17017278be8b58c1252355b36525d704b41340c668f90f364192bdf7a22183b4809a939
+EBUILD nodejs-12.21.0.ebuild 6349 BLAKE2B 0556fd493a5a4bf077732cb4e34b77d9a2185cd7d3a24ffc0d0147e9e79bcbe7cfed96f8e3c24e95097dc044e3e5c62ed03b4f75ea8d33bbdb9c5f0f144ccdc3 SHA512 307990866c37a22b9d09e21333e19778a39bc44ca8714da8f4730869b90ad90cdecf9131a08ada444ab897e3ef02ab1f3d2e4c117a4dae452a5c89eb41873d12
+EBUILD nodejs-14.16.0.ebuild 6046 BLAKE2B 33b0f4ceee6472129bebeb1db5d9f2f73028e5695eec5f92a877f63b1a33e41f80c8d119774dd0f002032e3a28debdc2a2040109165b9c39bd2a716925a38d4a SHA512 1c598f9699aaa8750455aa38717f005e3ff2284a8cc801a56e4a789c96f298503d7db9ff258c526dfcb0b4986c9f60a900671e25e35b999bd4a71325bed70e4e
+EBUILD nodejs-15.10.0.ebuild 5676 BLAKE2B aee7588049a09db4823eca4588623562e7b0f812f41f03681be5372579ed8eab9bdc38ce2c353e40de9c7fa6da05068be289d6319c1757b1cbfbb361b71c8d02 SHA512 9bbab3ef03347a9530079d12c221ce785770349f155e056a8ea39eba42c48f9cce2ab1315fd8ca9532f0cee354c2192c5072cc29cfb43bd77229f80a205d74f7
 EBUILD nodejs-99999999.ebuild 5809 BLAKE2B 8ff1c06c12edfcf886ffb8287b928fdaef23164b3e2e03105dd84ea333d66355ff5e4c2a1937bea6408c55137116852d25319af71427e99f5b717bf1fbd41d4e SHA512 c8be45e22445f3f6d4bcab870b029b6dc441a27b9e99f107e1a6a8d2a0eb037b7509063056c3bba03696574d319e35a437654f65e069f182ff607fd76faed11b
 MISC metadata.xml 940 BLAKE2B c1a7dbc678f50529afe12abaa96e87bd065d1bdb88e6ca4d7d58373b282a5d6c6920e43623ce71bc83affb54cc323e6d24df8841dce8001e1cb598dd96b0d4a4 SHA512 87c823b94b22026cbf333671f6d28928de66c5aee29fbe0d9773c4c35415ffc3f7e31559530cfda4f4f2a0a9dcb4964e0c3304c002182c4c17de785e842c0fee
diff --git a/net-libs/nodejs/nodejs-12.20.1.ebuild b/net-libs/nodejs/nodejs-12.21.0.ebuild
index 9ad28a2d5fd1..9ad28a2d5fd1 100644
--- a/net-libs/nodejs/nodejs-12.20.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.21.0.ebuild
diff --git a/net-libs/nodejs/nodejs-14.15.4.ebuild b/net-libs/nodejs/nodejs-14.16.0.ebuild
index b80ad78525a0..b80ad78525a0 100644
--- a/net-libs/nodejs/nodejs-14.15.4.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.0.ebuild
diff --git a/net-libs/nodejs/nodejs-15.6.0.ebuild b/net-libs/nodejs/nodejs-15.10.0.ebuild
index 4228e1c6eee2..4228e1c6eee2 100644
--- a/net-libs/nodejs/nodejs-15.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-15.10.0.ebuild
diff --git a/net-libs/nodejs/nodejs-15.8.0.ebuild b/net-libs/nodejs/nodejs-15.8.0.ebuild
deleted file mode 100644
index 4228e1c6eee2..000000000000
--- a/net-libs/nodejs/nodejs-15.8.0.ebuild
+++ /dev/null
@@ -1,202 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
-RESTRICT="test"
-
-RDEPEND=">=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-)
-
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 2dab50ab4b29..0d5b57b90fb0 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -5,7 +5,7 @@ AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
-EBUILD pjproject-2.10.ebuild 3160 BLAKE2B ba4287eea40422c70c79be32f557387752c5596b5692eaa48fa365d0da21134b867a2b89cdf814cf7451def9e2facd3abcf74e3b66d27515865fff7defd71c5d SHA512 36999752f4aff2d0a6a1203abc49951ef181817c7a98bffc84a9c803809264f2cb271be7db2e9b9bfe7472d8600b23d6893f4417400ded25c63cd8de5154c4e6
+EBUILD pjproject-2.10.ebuild 3159 BLAKE2B 5ece2e1494f3c116db79c04c687cee76c629d91784f8056c7056edc9989fded215464b59e4f4a93ed57433708715820ea4c475c1bcf6922134cb04b81e88ee4c SHA512 81d0eae10cff044d40fbdc2d7caa41d121ded8c7a1b29e8ab4698a724b9a73366442eb3652c7a234dd5cea65e43a8c2636ad862d8f1dc1493786489ee994570a
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
 EBUILD pjproject-2.9-r2.ebuild 3139 BLAKE2B a99817e6681eb3afdef894148d8f864839c92042219d7c4c7ecee832b77de2f59c0f2c2412f1508e2572ed1b0d665d304386bd9e99ee7de9e4cd34c7a085ec88 SHA512 ca61e9530f5a5ce630aa31b1d077236a9fb565bb9c70ab0171f3663a2ad7a2813e967c1581e07b0f18945587c34da061aae6504e390b2b472c9e58775b913621
 MISC metadata.xml 1348 BLAKE2B ddf0fa47ffb1701bf95f3d51d04acecfdc16980a810f5af577d9cc8a31ebed5516a95e7fa6257a0c35af7fddd391da51aefa461561e48c13af4e143e7e4d2b84 SHA512 0fd1c947edacc7a5cbf615d2afb8830d7e223a493a26b18814f9bdabf7216bf2737350f7b6ba69589852df5ee409256b60dd0e8c93f81eb696d5e2d94504d535
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10.ebuild
index 4e8d2fd29afd..f2e015618ea8 100644
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic toolchain-funcs
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/rtrlib/Manifest b/net-libs/rtrlib/Manifest
index 056a19aded22..b55c6105cc16 100644
--- a/net-libs/rtrlib/Manifest
+++ b/net-libs/rtrlib/Manifest
@@ -1,3 +1,3 @@
 DIST rtrlib-0.7.0.tar.gz 260699 BLAKE2B ea8b70b1ca1fb7cacc2943228e398e16f61de6264702f87e6bc5dc011dbb77e760a4e317f109e13b882efd9c080847e6e86c9c47afdc4518db5de210621181fc SHA512 e1c78ce92d066308c1c4fbb6575c2f0dc0f6840c16be90e27bd0da184cab7d0fa4dd1cff3677eda5f1720184756e02765e5abd267b0da0d183082721fee2ffd8
-EBUILD rtrlib-0.7.0.ebuild 1072 BLAKE2B 1b5ff11623be9521282b9f075f151400e5c14e24c9ddaaee065f5d753c34d033265efe05a108ea3a6e8db9603ffb7a741cf4909112c022f9b6a0e556efcee7ed SHA512 461c2058f53564c70bdec8e59344140ab0b5fe990e60a55f62927a99c2fa503c0c33096fbfc3d84ce3bcbc1dcbbf9d362554314d89b5a936d9265e9dbd20f193
+EBUILD rtrlib-0.7.0.ebuild 1070 BLAKE2B 547b87ec1ccba62a9973e123955f8e5f054d1f23d68cb260489f3e2b941354ce240785595eb91f44ba096771d7e473f5cdbee97cb622edf539eae70366f4348d SHA512 4a7ace0206c5a1828a12e6ee79a331fcdeffe9a20c0d292e40b64ee04bb6bd256fcae87b305d49f8dc9c461cd11c9513651d2a0d708f64d46d028bdb090b580a
 MISC metadata.xml 314 BLAKE2B 2c542346560c4c3fb2aac071c7b1e86c77c44bf84e2bb0cf0adc494befe7287193c9188d74cdca9a6a13b28e19a892750877fccc36b8416cabfb37cb99b7e01c SHA512 d6847c79918cf25ec8e8071f1a1653c207834441a146e600b64609ce533694885ebea1bf3d1d73f3b71606d94924d3249197a5ad4b4086985b45e2653fc7f9ef
diff --git a/net-libs/rtrlib/rtrlib-0.7.0.ebuild b/net-libs/rtrlib/rtrlib-0.7.0.ebuild
index 69bccb03cd4b..dfb7e34b6aa2 100644
--- a/net-libs/rtrlib/rtrlib-0.7.0.ebuild
+++ b/net-libs/rtrlib/rtrlib-0.7.0.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="https://github.com/rtrlib/rtrlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc ssh"
 
diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index c17c3f88aa28..671bbf878097 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -3,6 +3,5 @@ AUX signon-ui-0.15_p20171022-drop-fno-rtti.patch 758 BLAKE2B 6487c7b5e6365deebc3
 AUX signon-ui-0.15_p20171022-fix-username-field-reading.patch 4338 BLAKE2B ef44759dde1e1f393ce6a6e6a30528049ef1ce480ae9721f006dd4a37ebfc0c0a36937472fcc74731072229894c1a280c2b50e92e059d000d1de5e91435d8fc3 SHA512 2414ffaacb13224bd4edb4beec1cb6c8e576401d2a3b3677b5aaa9140eeea99077c37fcb0115c2400987722d23f822844d3f4cc901adbc85be6d4e098072d28d
 AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a75d2dc011d84a476f0cd1b80c72a54dbb9d06a6d151f9940bbdbcb20494a2ad388aa0590b2148cf0d5d2e455d50425d0292bbeda7e41de366172227e SHA512 e21aafb1cb79033619dc50ee41a81efe8e02be7ce71382ab532beb48d720a514bb7d4abe588c117685b4b643865c4a11eb304a8e0107104393de08afa1d162f7
 DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60
-EBUILD signon-ui-0.15_p20171022-r1.ebuild 1156 BLAKE2B 99eaf1f58be04393fb9986f610e62d69f95d79cc72190ee8f83341e663dc23fa756f2a6c8430ccc7ee72a9bbb395ea8a3c031c11bea5b1ae0b6264dd5b0e1a3b SHA512 d05c2c115a1c3484afca2a81d97c716e2860b896fb8e92cf4aa115ac6750749c5509781097ae2bbbb2c46c2cea63f769a2ca94f0a0e79c5dd2f21ee26e43106e
-EBUILD signon-ui-0.15_p20171022.ebuild 1165 BLAKE2B 732d8910aa71a29bbe660f349182d550dc40b315f0b8275e6b430c9348b6a9dba84ffadd133fce014b54975f4b909f0267d346458d7419c09808ed909ee9ff79 SHA512 3c5749bb6224881b2ecaaed13d47bfa12442051de91f6b4dd7ae049aff31de51f312fa7814b56762997914e3e2461a5e34936cc925ac57e102bc98c8ea47735b
+EBUILD signon-ui-0.15_p20171022-r1.ebuild 1155 BLAKE2B 5bdb53e1d8d4c39780921053e2722bc2fc0e494dad1fe945cde8451f12f26fb11644764c9c75f7fb9f55ec7bdcfe14173d624743465962b936795614f28f0dbe SHA512 3675dcebf4d56f2e24d070361f3fcd85b11e73490ede9fa72621d2d50fc0894302ea812858ddd5938ed797f1712ab64601b8519a19ef1761d027097595cd4081
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild
index d7fd9c95698f..4a868b3f52df 100644
--- a/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMI
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-qt/qttest:5 )"
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
deleted file mode 100644
index e909bb787db9..000000000000
--- a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=4368bb77d9d1abc2978af514225ba4a42c29a646
-inherit qmake-utils
-
-DESCRIPTION="Online accounts signon UI"
-HOMEPAGE="https://gitlab.com/accounts-sso/signon-ui"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-qt/qttest:5 )"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwebengine:5
-	dev-qt/qtwidgets:5
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/libproxy
-	x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtwebchannel:5
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-webengine-cachedir-path.patch"
-	"${FILESDIR}/${P}-fix-username-field-reading.patch"
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e '/^SUBDIRS.*/,+1d' tests/tests.pro || die "couldn't disable tests"
-	fi
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index df4a11c7e2f5..3a1cfea073dd 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,4 +1,6 @@
 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 632 BLAKE2B 913b90abd9f99de679caf590c64a61866dd351fe6bbb1effaff1bdb4157c51c9f7fd12ce0a57e23cf8b07213530f9394ef8a19a5661fa7bf646b40c42f04eb11 SHA512 a5476d275581e52b3daf91d8b45bb4ea65dd0b933db6296eeeed470a8955343d9e6755989a70a1718f45fba2cf4099f15c520c35875163fb72319d4dfdf85c4f
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
new file mode 100644
index 000000000000..b714f672e700
--- /dev/null
+++ b/net-libs/socket_wrapper/socket_wrapper-1.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
+
+CMAKE_ECLASS=cmake
+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 )"
+
+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 706dd4eb858b..fdc1c7053565 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,6 +2,6 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 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 1129 BLAKE2B 2d88cd71cafed4700385d5e005fd5a208e5650e055d74dbf7674ffb756f574083d8b4b3fb6b89bd69669191cd197f3d81e2707779c6a8778a7e85d28ac4e1fac SHA512 7ad947fe6b1731d15846b2125f4db4e3e5cb7476ff495bad14ef7dace90bc38dd85be9dec2bfaed8464e6fbc883d8aa8651e42e10800a29dc5f49f425bf6498d
-EBUILD srt-1.4.2.ebuild 1130 BLAKE2B 98df774bb3c52b1b389ed40713b5d2fc1b1183a7f2bdfb796cb2b8d5ccc1c56d0122385b8466ded50e7b05c1825cbcbeaffdeade26c04942ec8bf1e558121973 SHA512 d595643f86595150d13bf73b4f1ca056d03ac189c7d9a0a22979616e174e4f01f320ae0b98a4bc7da88259f61e6fc552a2b3e413e17a0fe813bc697dfcbbd722
-EBUILD srt-9999.ebuild 1222 BLAKE2B 2ab0060f8730f8b606e88b08e8723cc0c57467fc298aa466ebcff819ebe98f58dbdec9f3beede0434f632813d38a2b2c0e8a9a045127eeb8426f603144e819a1 SHA512 6b466ea8df60c562881147faf664ef3d8e021029f3db85051a139702df51d8c829814d52c47645d69731ffdde0a3e9413df9b68c4076f559555837342ce3c5c0
+EBUILD srt-1.4.2.ebuild 1143 BLAKE2B 10676410009626a4f49c86248ee85f24b452ac704dd487b2e66375bfb2c3c2f1fc4e71dda9a3b5abc45507f45c1508c8fd70e83139bcb24e53e28acbaa2eeb41 SHA512 e3a6b3fddcff484aeb9f90d9a2c35ec9a8d45ac455ba9ce2be15db821f26aac77fecaea77a6f8c6040408f2b842fca09f71edf23352f956c6dc5594740cff0df
+EBUILD srt-9999.ebuild 1235 BLAKE2B 76139b25b0f16965974f4bfdd47f8eb46692293f924e90054f410ee6e878599217bf9f4eb0ebef513aef45a1ce02dee333ab3a43bd2634677496742d151dd771 SHA512 c7ecfa10f7871f5bda5d054411786ba864b7f331be142d7f37a6e3782bd23997775a6e4291fe06cff74dc9b9ccea91c7e59ce33eaa19abe8653b4e7cb076c7f4
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index 262ecbb7e3d5..35ef265603dd 100644
--- a/net-libs/srt/srt-1.4.2.ebuild
+++ b/net-libs/srt/srt-1.4.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
@@ -37,7 +38,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
 }
 
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index a75247ff1f8d..80a73bd9e543 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
@@ -41,7 +42,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
 }
 
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 6d846a9e20cd..585a4cf889d6 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,13 +1,3 @@
-DIST wandio-1.0.5.tar.gz 385535 BLAKE2B a7911ab14ff9911ef19bf35b6e50d3f2e6dd0fa06f5689b6c353cc5ff2ee93175d7e758657f79fd35e7aff29fb1a4b4c343c30ab1e00a118ec3056ba9129cd60 SHA512 3bf2b4362355bb3db047ea12055b96cc6fdd759b4efbd9cf1caf05133ae9e7e1fab5f4a7e5eadda45d7c1b4dcf9aba1cf3a4c04bc23694934aa8aa67ec31e480
-DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932d488cf2c9d0fda2fe54e971b8e93b5768a487328afc2079add7f269cd8f0203314b06eb3d256f8739828c6fb SHA512 8ee4149439411e8ca784a434766c5c35144fb49c7166c2f135cf47625011815e2b27af5b61d75d6a4f9e64ab1091ce1cfd4ef114e34b57e0c53029be45f9369c
-DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
-DIST wandio-4.2.0.tar.gz 410273 BLAKE2B f133e783f6f47a6d55058684b4965d02816a0fe835bcce274292287492e53007ebfce3b447d6ac9f58d8d4626ba20b7b6a7e5e6ac3cc054ef49d70c843c0216f SHA512 befbca1479b32cca909c6125e54be0a061d1fecfc01d9bca7cbd54f86564d39a02714805c7583d9b50896bb553a197e0f86fd10d4424782f5e9798a0cb440923
-DIST wandio-4.2.1.tar.gz 15417543 BLAKE2B 704ed3846cda3755ad305bdb84febed75ba1f044d0380465041cab9f44dc16c1a7fc8bb5a8d4292d5f6c12d6783af45d93bdce70228afc5438bbe7d6f5714491 SHA512 eab9180e477f63e37b11d090b772037fc319554495e6f3656da66e34dcde25f47566e87b71255645d9bb5aaaff721f0dceace4d880cdca491c05a9de6852553b
 DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
-EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
-EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
-EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
-EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
-EBUILD wandio-4.2.1.ebuild 939 BLAKE2B 5b655173042829fb5466eef3fb5517758e84674243b6f0c0bc3a4df8d183b251df5a8ec10f61f8f3050d6bd81dabab36f8733fda4ad3e8452c7e5fbfe48c8cb5 SHA512 428e577429bb6a3fdbcd569d003ad27828b384163097e2d1cd0a7f0e3e3dd5826529915b78c322be4d7e14b6b5aa2e8ed5b8bae709100c3478e2d46cb9b78870
-EBUILD wandio-4.2.3_p1-r1.ebuild 1037 BLAKE2B 635c179b9a94ab256124bb8a74322bd5eddb71d9147630248167c075ed104175ab24d46ac5be1ae0e1a34fd0020f7fef4aa6be4eee0ed90613167dd06bdeca8f SHA512 4ed8ff8a8e3259d85c4fecfbb8f9bd85881d845c35ef2f11249aa69f7d41e231836f18e66e78615a3166a38345637b0c063cece2468dac42a75954cf56f19e05
-MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
+EBUILD wandio-4.2.3_p1-r1.ebuild 1075 BLAKE2B c2b0086b33f6e43826cfba1520bbae67b5b67dc34fb46c2e2d9c08d883d5365d74eea3e113a528bed9285885a97c366f13a624699a45c1c3fdf45fa5e2fa8cd5 SHA512 b3d777a31fab7bf88b76e8823fdaa3771cfd2387119421752ce0d12d0d6f9e6fb0fe99e45628372efde653f2bde962479e2b4f89d33657d547ee264b63a8d651
+MISC metadata.xml 412 BLAKE2B 4173e01b1d35f1c4a53e624d99366572037eda88e016900378ff680dec75600085efd3222423be0318bf320b683d4467df9e127f6c1d7e208110c903732da2c3 SHA512 af4359b086d6192c51a8d4acd3036b0b2d0b0a719a183a80d48aabc5b3965769e82084fe5c5fc82e3c87435c8d3df92976a44c2392655dcaff38ae1c86607e69
diff --git a/net-libs/wandio/metadata.xml b/net-libs/wandio/metadata.xml
index 5cf4e8226272..05148eb557aa 100644
--- a/net-libs/wandio/metadata.xml
+++ b/net-libs/wandio/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
-<use>
-<flag name='http'>Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="http">Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wanduow/wandio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/wandio/wandio-1.0.5.ebuild b/net-libs/wandio/wandio-1.0.5.ebuild
deleted file mode 100644
index 069c3be4975f..000000000000
--- a/net-libs/wandio/wandio-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.0.0.ebuild b/net-libs/wandio/wandio-4.0.0.ebuild
deleted file mode 100644
index 069c3be4975f..000000000000
--- a/net-libs/wandio/wandio-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.1.2.ebuild b/net-libs/wandio/wandio-4.1.2.ebuild
deleted file mode 100644
index 3e738af7ca8a..000000000000
--- a/net-libs/wandio/wandio-4.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.2.0.ebuild b/net-libs/wandio/wandio-4.2.0.ebuild
deleted file mode 100644
index 7a923dc15cc2..000000000000
--- a/net-libs/wandio/wandio-4.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.2.1.ebuild b/net-libs/wandio/wandio-4.2.1.ebuild
deleted file mode 100644
index 97dc53cce125..000000000000
--- a/net-libs/wandio/wandio-4.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="C library for simple and efficient file IO"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://github.com/wanduow/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( app-arch/lzop )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
-
-src_test() {
-	pushd test || die
-	sh do-basic-tests.sh
-}
diff --git a/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
index e0d614fcb241..4eef4248a4d6 100644
--- a/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
+++ b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="C library for simple and efficient file IO"
 HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
 SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-3"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs test zlib"
+IUSE="bzip2 http lzma lzo test zlib"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lzma lzo )"
 
 RDEPEND="
 	!<net-libs/libtrace-4
@@ -26,7 +29,6 @@ DEPEND="
 	${RDEPEND}
 	test? ( app-arch/lzop )
 "
-S=${WORKDIR}/${P/_p/-}
 
 src_prepare() {
 	default
@@ -35,7 +37,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with bzip2) \
 		$(use_with http) \
 		$(use_with lzma) \
@@ -43,12 +45,12 @@ src_configure() {
 		$(use_with zlib)
 }
 
+src_test() {
+	pushd test || die
+	${CONFIG_SHELL}/bin/bash do-basic-tests.sh || die
+}
+
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 }
-
-src_test() {
-	pushd test || die
-	sh do-basic-tests.sh
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b1a33fdd20a9..d3f1e8e2eeb6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,11 +2,7 @@ AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b0
 AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693dccf644a1f86b9c57cda2ee8d6999830ad0bad13456aadf32c6789dafe7531b53f63644d5214b275159c3fce103b262a950461 SHA512 93cbbf092d9953c176bdcfc384e83ec276af35aa9c7645088a56d5c18934712d93aeee7e4c6111e1eb816b54d290ae6b23030683f81bde0f91c3ba3ff440f85b
 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.30.3-icu68.patch 8277 BLAKE2B 7bb5a2d15a1006b7248a6a6fbde0a2e71df1aa4c02046e9c91fcb44ba218fc2e6d6655d53f478eeef3a3d77f4bfe35728155c524332841c2692ac165af48524a SHA512 02000d2759a599596946912e45978334eba0827c691ab4dfd313a7cd5fd71e148a59fd4cf61d9bf9a102a1a5922da5b4e473f03f46930f9e7dd6dcc36dc7dc95
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
-DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
-DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
-EBUILD webkit-gtk-2.30.3.ebuild 9208 BLAKE2B ca7501115f8d743047285cc25b616b0aeef3b39d8b8a9990a0ebb1d19ef2986a5140e95c03e673f90f14ebdef6af2aa4c5139143220f9402c1a1a23583a0c241 SHA512 db0613dce9ded6aeec0397a6dbbb49929da3c58b3a0b6b5618d3a275c153be0daed627cfa056f81a317a5bfe23a90d4113f663e3681d10624dce17e3eefe23b9
-EBUILD webkit-gtk-2.30.4-r1.ebuild 9256 BLAKE2B 3a6cf14bf499da6de0ed92fc60ec9b83d47226c0659cf419382dc3713d97c4a3bbe81dd62a06795742616689f80096bd3da1180463a5f4a36520280301449200 SHA512 9b74c702b11e0d0853bf54f661e23c7fe61aee2243e201f9364587caa8fc6cb5a4603cb24b0fa9f14604fa2b23f5079a3884f6c336b09e0f6a4c88948b3a4e5d
-EBUILD webkit-gtk-2.30.4.ebuild 9090 BLAKE2B b97ee857ba6cbd2ed71184d23e9b33b1ec79306866b75c33c253c46bbf7194287fb36dbb05a0a61747a1186408e8ae01f30a4023b32ff7f4826155fb7f94b2dd SHA512 4f19953415b014d480d648728cc0dddf1f1fa0719f9d9049c38c5c572bc2d8cc272cfd9e8f2b2156e33f8d3833ad311e78ccd0da4752f47a49b007dd74626d9e
+DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
+EBUILD webkit-gtk-2.30.5.ebuild 9253 BLAKE2B 945c97bc92ac3009bd7e5b8fdbc176175fa238ad58d75b9f661f6ef8b8dbf47a48fe83d26918449ba915a15756f11f7f432841d046fe176fe0d42b1483bc7192 SHA512 091fb0254633926e3408ae67339da70964f336b56242205f9b94b8511fb5c790a7c536fa42ff4ddedaf4c664a1146288ea92878a61fb4729077a5c0432e3a006
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/files/2.30.3-icu68.patch b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
deleted file mode 100644
index 33116feea75d..000000000000
--- a/net-libs/webkit-gtk/files/2.30.3-icu68.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From a5f1691b5b885dd228018740803075e7b6059e4b Mon Sep 17 00:00:00 2001
-From: "stephan.szabo@sony.com"
- <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 3 Nov 2020 20:06:15 +0000
-Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and
- TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
-
-Reviewed by Don Olmstead.
-
-Source/WebCore:
-
-* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
-
-Source/WebKit:
-
-* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
-
-Source/WTF:
-
-Replace uses of FALSE and TRUE with false and true.
-
-* wtf/text/icu/UTextProvider.h:
-* wtf/text/icu/UTextProviderLatin1.cpp:
-* wtf/text/icu/UTextProviderUTF16.cpp:
-
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WTF/wtf/text/icu/UTextProvider.h            |  8 ++++----
- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp    | 14 +++++++-------
- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp     |  4 ++--
- Source/WebCore/platform/text/TextCodecICU.cpp      |  2 +-
- .../DrawingAreaProxyCoordinatedGraphics.cpp        |  2 +-
- 6 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
-index c8f28d6ed3da..3c6fbeab6a5c 100644
---- a/Source/WTF/wtf/text/icu/UTextProvider.h
-+++ b/Source/WTF/wtf/text/icu/UTextProvider.h
-@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
-diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-index 0a646b7f390d..49980f95ba79 100644
---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-index 69c8d091bd62..9c3fa709200a 100644
---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
-@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
-index 19b41eb7125f..2f7d1930b8d7 100644
---- a/Source/WebCore/platform/text/TextCodecICU.cpp
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const
-     UErrorCode error = U_ZERO_ERROR;
-     m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
-     if (m_converter)
--        ucnv_setFallback(m_converter.get(), TRUE);
-+        ucnv_setFallback(m_converter.get(), true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
-diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-index 61e3f6050d7f..5a51b9ec1d68 100644
---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
- int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
- {
-     monitor->didDraw();
--    return FALSE;
-+    return false;
- }
- 
- void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
deleted file mode 100644
index deb50c4fc1e9..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python3_{7..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils 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 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.32.0:= )
-	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
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${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 )
-"
-#	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}"/${PV}-icu68.patch
-	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}"/${PV}-fix-noGL-build.patch
-	cmake-utils_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 --host-root "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-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-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-utils_use_find_package egl EGL)
-		$(cmake-utils_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="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-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
-
-	WK_USE_CCACHE=NO cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_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.30.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
deleted file mode 100644
index 279338eb2ccc..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-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 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.32.0:= )
-	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_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="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-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
-
-	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.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index 688b73479769..b62e32197a1e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.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"
 
@@ -61,7 +61,7 @@ RDEPEND="
 	>=dev-libs/libxslt-1.1.7
 	media-libs/woff2
 	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
 	gstreamer? (
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 058683a15451..20415daebe15 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -2,8 +2,10 @@ DIST xrootd-ceph-4.12.4.tar.gz 81253 BLAKE2B 0b3d0e347e02b6948550c44487e0edb1c65
 DIST xrootd-ceph-4.12.5.tar.gz 81838 BLAKE2B a61a814741abd04723755122606eef4544769d5cbe3828977617384a8eaddcfae4591f1ac2515020f300feff5cb11b7af362c15719313085e0f76b5157ab862c SHA512 db0fe7f8713ddf91ce200b364d460206ecf2a08153fb561a99e0780db84ad9d716f9f9fbc3994258e9269fce08d16326c4473bdae200c644cbf4d3bd1144a6eb
 DIST xrootd-ceph-5.0.2.tar.gz 81255 BLAKE2B 529d2c361cc7660cdbb481cdbae1fbf4cd706f29df868c645775b96efa7efaaecd9ea8b7d915c15b5ff78ad1395bb8271a3f1c1105ea0b42dced77efa33acaa7 SHA512 9f8de694a9a864ee0a963bb47c603d2cd3a77b4e13efacdd7f35674016358ce3b0a3fc5850098a29774749f54fa82db12c0e56b55d814873c124d9e19c7c23c5
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
+DIST xrootd-ceph-5.1.0.tar.gz 81939 BLAKE2B 607fe5d31369c88402d7ed993fde3f058f873defe97900f2b7909a3630f6927efeb98c08acd31be68ec7d6b997464f6d3cea5da5d08a3e84570ff670861a50f8 SHA512 cc05a00684bde5ee9adfe61f261393a177d21569f4570d41fbaf65d1276dbc18829d1b532ec10df93a1a60d25fb2de54078b4bf1cb30ab383d4af92178147ee1
 EBUILD xrootd-ceph-4.12.4.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
 EBUILD xrootd-ceph-4.12.5.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
 EBUILD xrootd-ceph-5.0.2.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
 EBUILD xrootd-ceph-5.0.3.ebuild 954 BLAKE2B 565b9a4620ff0000655371303456753cd5f55cc37915f52f1a89db7c41d63a2fc372ab0f3774b7078cc170e877d1700d2f1f92643d8ee7b14989f0cf7fe509fa SHA512 f0885ec159300aa1fd2da04a611105097cecb4511847ab917e7da111ee304f20db7a02115c365203103e41a3129460030dd038359e5a98e54d7f8cb8497a80d5
+EBUILD xrootd-ceph-5.1.0.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.1.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.1.0.ebuild
new file mode 100644
index 000000000000..bdacb70cc802
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.1.0.ebuild
@@ -0,0 +1,36 @@
+# 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)
+		# As of 5.0.3 the default plug-in version is still 4.
+		-DPLUGIN_VERSION=$(ver_cut 1)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index e0b37b44ee8d..fec6581aa375 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -9,8 +9,10 @@ DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1d
 DIST xrootd-4.12.5.tar.gz 2580794 BLAKE2B 217abb8ad332b3eb0cbe2289f4fa7c31abce7c3122ef8d23f409a3a03b7691f0e8a1939a42c831774e6902bf0f3242a2583bbf010478a66f5a2e634008799c5b SHA512 c252866ccdc4465c9ffe3f5cb4bb83a2a70e775db5ff3a55bcd8ac70c72d280ea41fb31501f30550d8ac61b6d474ce602e0ee8a02485f1f2722617aeb25aff0d
 DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
+DIST xrootd-5.1.0.tar.gz 2862622 BLAKE2B cb166adcd60b263f7fbed22033fe362ed5b32b7a05c76ff2d8a5ab25d730673d0c5d22bc41816083c84c3f14832cca34d801738594c7b58dcebbea9882a7df37 SHA512 f9bb293433e16b86d3395f29cf23f10a4a5447b367aa762219559278b3f75402892be85e0ca914762bfe892ad0dcc05bcfc64ac1ad0316c5855586141b537bad
 EBUILD xrootd-4.12.4.ebuild 2599 BLAKE2B 0d7738d90d0a3e987a3446214d26ac004eca3a3e851d690a7a56b1dae8567f7373b434da4f17b27e762e712ce4598747d55e6393d25fdf711ca965759e205cdf SHA512 fea5a69dfc85aac6130a3aa025110fdeb84719c39c1c658327a5addf68d5fc615cfb3335384099aadd4ca91ad98bd4c032b29af36881dcb17e2d1e5c57e35d6b
 EBUILD xrootd-4.12.5.ebuild 2601 BLAKE2B a116866859144f8364f726079cc0796e8551200727d8d7909398b6648bb5b207eb8dc798b56ec9837cbe708c3417281766021c8affc8b5dcc382de3a399a4fef SHA512 457ba1720da5aa9804e4ea10a39e1ca976dacb9860b7c3e132248a3ff994622f1eed38a30a2190fc3156746442527e96df32e7820977e8a295c069de42446b41
 EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
-EBUILD xrootd-5.0.3.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
+EBUILD xrootd-5.0.3.ebuild 2640 BLAKE2B 2e1d1a44d9369f4a3f6100803782f12acd567ab8350fa14a77f31bcb87b9567e5700a673e1a8cf0e33fd089517625676ff9e0c708a54d2b6916f90694537225c SHA512 f1cbfc6f4d45375b595e408a353925e8602dbd537a234e48a0a3740385723da356ebce2e886972035f939685cc27df4b5fd1905416c55e04d70943d48f416e55
+EBUILD xrootd-5.1.0.ebuild 2641 BLAKE2B 667907d947a41fc82698201b7cc7d22ec1cd3263670d9208ea65a0670e7224e38c8daf6a2715f8641e4756cca702f4ca925f26c5320afe9b1200f1b54739bc17 SHA512 7694c5f863ed39a248284836fcdd44b9bcde6aca22dbfa1ff7a9c8cee7edd7cbb1186e4e5bc6ab4e2999da0602c009854c25253002f7122192699b3d766903e4
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-5.0.3.ebuild b/net-libs/xrootd/xrootd-5.0.3.ebuild
index b96f560be940..e675df9e658e 100644
--- a/net-libs/xrootd/xrootd-5.0.3.ebuild
+++ b/net-libs/xrootd/xrootd-5.0.3.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
@@ -15,7 +15,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd/xrootd-5.1.0.ebuild b/net-libs/xrootd/xrootd-5.1.0.ebuild
new file mode 100644
index 000000000000..1aeb46c6bf10
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.1.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..9} )
+
+# 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
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index cc6e49cc1b94..b88de7a9ff28 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
-EBUILD zeromq-4.3.3.ebuild 1423 BLAKE2B a47babf7ee873b3d5365d3ab45b6f6e6f13192dfb58f839deee0733559b17600dba002629156f19516b4fe3802a45292f0ecc7fa15eda45cf2563e406be1685e SHA512 13586b401955d4dd783f7a7f67d168e2522b7d01c9dd16d577c042e61b3390f66489ee514e0151d0176456c33926165c61d24116e131a7e3b289b053b5d1294e
-EBUILD zeromq-4.3.4.ebuild 1430 BLAKE2B 07c4e86fddb2c04b52f2699dd1df0a32c6a3360ea7197fc3dd1721028e8d2fca1f4a210bd7166c51cadf26208ed89bf39335b8d3f08d8afb18f6cf1189d60339 SHA512 90fccb7313cefa3aa99d1149260a421cc3476dec4b08f3b61d9695116f29e435d6b057a6fcd45a9e49c429b29522b8e9975353b802abdbee48f5ef3c791d2889
-MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
+EBUILD zeromq-4.3.3-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21
+EBUILD zeromq-4.3.4-r1.ebuild 1454 BLAKE2B acf7b942a644f9a4f7422427a1d682545b0b95da0fab1bddf500d56c915d7412675c20e37c98181cfdd7c7ac19f474fcacd025302c8a71b77edfe35cdc1b4a4e SHA512 47aa6d638a425fc4957819c02c4eef956402d13d841d90f8be25059c8e0398d9cc82dece4229df990d161a1b8ccd492df16af0c3bbbc6c58548aecac2a969c41
+MISC metadata.xml 1624 BLAKE2B 7b976e279cfe109beb64a36ac3469bdbbad43efc7100f1d8d4322b0cab0ddb6921fe8457cec260e36b6830c6e8b4b070dc49c30cffa6597895d4fb87a3927b06 SHA512 9b970662649051cc83c5d2e483a344f377eeca2f0fa7bea7200af26fa35aa6cf88ac64875ed87e92a64cd06269fc09c449b45a3d388a58ce24ec02b29326c4cf
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 8d747a412580..e46f5a985b5c 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -32,6 +32,10 @@
 			Build draft API, which may change at any time without any notice, and
 			is therefore not recommended for normal use.
 		</flag>
+		<flag name="libbsd">
+			Use strlcpy() from <pkg>dev-libs/libbsd</pkg> instead of internal
+			implementation.
+		</flag>
 		<flag name="pgm">
 			Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
 			multicast transport of data over IP networks.
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
index 54387064008c..da4a09e97c25 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
@@ -12,13 +12,13 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	sodium? ( dev-libs/libsodium:= )
-	pgm? ( ~net-libs/openpgm-5.2.122 )"
+	libbsd? ( dev-libs/libbsd:= )
+	sodium? ( dev-libs/libsodium:= )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -38,11 +38,12 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
+		--without-pgm
 		$(use_enable drafts)
+		$(use_enable libbsd)
 		$(use_enable static-libs static)
 		$(use_enable unwind libunwind)
 		$(use_with sodium libsodium)
-		$(use_with pgm)
 		$(use_with doc docs)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/net-libs/zeromq/zeromq-4.3.4.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index 21302e285a65..9a32f20db6b1 100644
--- a/net-libs/zeromq/zeromq-4.3.4.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -12,13 +12,13 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	sodium? ( dev-libs/libsodium:= )
-	pgm? ( ~net-libs/openpgm-5.2.122 )"
+	libbsd? ( dev-libs/libbsd:= )
+	sodium? ( dev-libs/libsodium:= )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -38,11 +38,12 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
+		--without-pgm
 		$(use_enable drafts)
+		$(use_enable libbsd)
 		$(use_enable static-libs static)
 		$(use_enable unwind libunwind)
 		$(use_with sodium libsodium)
-		$(use_with pgm)
 		$(use_with doc docs)
 	)
 	econf "${myeconfargs[@]}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /net-libs
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)