gentoo resync : 05.03.2021

27 files changed, 107 insertions, 196 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4574df24233f..44cdaa651fd4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index e7c688f8adf9..51c83d5a8f1f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,3 @@
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r10.ebuild 8198 BLAKE2B d7f6270741630a4ef21fb922b01e16116266c8178b2968046bdb00e959617a0b91cd7d99a1ee82d3bf12bcc967f1294d6bbecfada558cce375b3200eefa5c420 SHA512 5571c51566a9ca8bbd93d65ce589cb494e8caffa29c96f5ccb92e5a0a9598ad6d5847394f3ba6552b409c7472bda10dd37807937ffb603c277cd98b666e2a1be
+EBUILD efl-1.25.1-r10.ebuild 8191 BLAKE2B 9a217e079ef634df822d42bc9106986c395978bee7a3deff60f7a5f5564f9c7e6c31b07a46ae70142a01a3cb16e840d0fdfe3ac6f5be01a02dd31fa52f76ecc5 SHA512 9c8efce650ab2c9ff5e2c12663a5929c4d4863b6630c9bda7ff9733519f45aad69d865a8007e5d53821eb92f12153420dfd3cdde723c351a14cc0bbb9aeba3d7
 MISC metadata.xml 1888 BLAKE2B 4c689687387fb09a2387587bc32e5cb4f09b94264fb1b594d8dc0c1c214eaeb6cf5f39110ea3dde72acdcf328da25bfcd2756dc85c8b060ad64aa321b8dc8a23 SHA512 40289f8c6e10786c8c9d5069b775c7db5695910a33593e706d3ed0f623bdb8b6149161a25ad55deedd479fbc214dac174d6b99151e5167272fa464f5115eece1
diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index d2c0c756ed57..f02f9f63e12f 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -68,7 +68,7 @@ RDEPEND="${LUA_DEPS}
 		x11-libs/libXScrnSaver
 		wayland? ( x11-libs/libxkbcommon[X] )
 	)
-	avif? ( ~media-libs/libavif-0.8.1 )
+	avif? ( media-libs/libavif )
 	connman? ( net-misc/connman )
 	drm? (
 		dev-libs/libinput
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 848d7800b825..d6c22b5f577f 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,5 +1,3 @@
-AUX ell-0.35-add-missing-include-in-dhcp-server.patch 586 BLAKE2B 487fc9d8079adaff7fcb63a34bdc4f5733474c5e39772a1b37638759372aab4996c650ed63fcc7a3f90717076e2d82d75c88320c153d4bc4f740c31a7beda464 SHA512 fcaa34bcf98f440d3aabc05349c5dbd515117f626dded93fe8a77060cc51c9a70e255fa49100b2fde9812c8d1cfb60f1059946285feb5d9ce84854c722fec482
-AUX ell-0.35-add-rawmemchr-to-missing-h.patch 1195 BLAKE2B 2ab70a003b79f10f755ef3c2fa289d913d31387f49aa4e1b6d5bf9c538229801ed2869f877b91ea277f845c196ed04d8bf23a424f5fa08fe78f53ec2f17160b0 SHA512 f1c3c37930892b421ee5e495b80db5deef0d34f860b3c98543a2e230aaffed57129bdf834a18c82b3c31aeb63f1081a9845f70ed243dcd6457c2da621b1168f3
 DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c
 DIST ell-0.38.tar.xz 520744 BLAKE2B 24d552ed1bdd55c78aef7d427c40cb391ddedf8f06e77ddd188509a9eca71135b9fe282377bec1a225cb617c7a8bcc4efe6da6eb1dd86596e03ed6ba790b9619 SHA512 e482df8d810b866479c97a096efb8d2badb903bb7fda35ee3bbbaa65652c63f8058188a5ab9f477f835f6a5789a7c5d2eb7db2d9e30493ecd75bd7e71017b6c2
 EBUILD ell-0.36.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
diff --git a/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch b/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch
deleted file mode 100644
index 788985ccd6fd..000000000000
--- a/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
-Date: Mon, 30 Nov 2020 18:40:33 -0300
-Subject: ell: add missing include in dhcp-server.
-
----
- ell/dhcp-server.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
-index c983ed4..144e83e 100644
---- a/ell/dhcp-server.c
-+++ b/ell/dhcp-server.c
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <linux/types.h>
- #include <net/ethernet.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
--- 
-cgit 1.2.3-1.el7
-
diff --git a/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch b/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch
deleted file mode 100644
index 2008b27d56ad..000000000000
--- a/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denkenz@gmail.com>
-Date: Mon, 30 Nov 2020 13:00:11 -0600
-Subject: build: Add rawmemchr to missing.h
-
-For those systems (i.e. musl) that do not support this
----
- configure.ac  |  1 +
- ell/missing.h | 10 ++++++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1e5ead9..f34add1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
- ])
- 
- AC_CHECK_FUNCS(explicit_bzero)
-+AC_CHECK_FUNCS(rawmemchr)
- 
- AC_CHECK_FUNC(signalfd, dummy=yes,
- 			AC_MSG_ERROR(signalfd support is required))
-diff --git a/ell/missing.h b/ell/missing.h
-index 6b9b0fd..2a3e647 100644
---- a/ell/missing.h
-+++ b/ell/missing.h
-@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n)
- #ifndef SO_BINDTOIFINDEX
- #define SO_BINDTOIFINDEX 62
- #endif
-+
-+#ifndef HAVE_RAWMEMCHR
-+static inline void *rawmemchr(const void *s, int c)
-+{
-+_Pragma("GCC diagnostic push")
-+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
-+	return memchr(s, c, (size_t) -1);
-+_Pragma("GCC diagnostic pop")
-+}
-+#endif
--- 
-cgit 1.2.3-1.el7
-
diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index da5578767857..f2b50d357c4a 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1,5 +1,5 @@
 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
 DIST freexl-1.0.6.tar.gz 941179 BLAKE2B e0b04e66c56d3a2805eed3f86442269843a2ccf7133669b9506a1812562396f2b5bbc04e29c9f829d9df6e627fa31b87fccc5407275ffb205ff498bd47bc4b89 SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
 EBUILD freexl-1.0.5.ebuild 557 BLAKE2B 3d5a55d682d5571d0d499f8adbadc082049a09febd5b8c75d56029cfa0442355c3515de9cc5faa8f05dab612c0c201857be76cfe486dbc18f7ad75d654d53591 SHA512 796a1b5a51abb07e46d52427f470c44d89affec59c1d7473f65d30abf844f1edb18038cf7e5842bb9b5ecd50102c9ac97678ea707086e054251c9045a1ffa98e
-EBUILD freexl-1.0.6.ebuild 559 BLAKE2B d62952a068c7f43c2028547e5740305d01bfacdbcf4bfc7f32d77f4eb9d14d9417201eb0f89dd55f82d34d5d67d2e0cc27e59bc9843b19bda8b1b0cba285ed4b SHA512 2ecc8dc4a0d9754e53cbee2d123ad6292b992e7d80033a7d9c9750fe6263814d317482862b12db14097c2bb959e76fb09eeb352bc4d66e104301d28686a70e45
+EBUILD freexl-1.0.6.ebuild 558 BLAKE2B e5fb2c5129a387a79c9a750c492134698282e931f41b3ab24b90d9895efe792a15c36a1f72a697a6c08f8c8c8fd53db8d5d714595e43e08913c756a5af47a98e SHA512 0e6cd9e54057710fa2e2b70417a70b65b04d327c3c7235347438176e329d730a193071906d0a79abee42119abe058a06ee627154c77f2540b77577a3128387c5
 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/dev-libs/freexl/freexl-1.0.6.ebuild b/dev-libs/freexl/freexl-1.0.6.ebuild
index 5075b861502b..182c95af76bd 100644
--- a/dev-libs/freexl/freexl-1.0.6.ebuild
+++ b/dev-libs/freexl/freexl-1.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 
 DEPEND="virtual/libiconv"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index b3c4bf9a262b..168b1118dd95 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -5,6 +5,6 @@ DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
 EBUILD geoip-1.6.10.ebuild 1261 BLAKE2B 6a766b7dcfc177a88f2a35c419f3eb0b49c48db5359d3383f05126bf0b63673f64626ecd8bf76155d5e8bb5739711767320318286af4a940ffe07fcab0409f86 SHA512 662603f6fe45fe8d6330ee8e323d66e6673a7f6f9aa7580def3c7b8f725c0bbc4f9e2d7c6742099590f9dd5d08f5e0bc6417a4c7b0383b0ff6dae7a646c829e6
 EBUILD geoip-1.6.11.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
-EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
+EBUILD geoip-1.6.12.ebuild 1263 BLAKE2B 76ac0091a65899acb462c2fb4d91a0dd2d2fc4d1f32626de961747235ef269e56faf9be5d70b9634db3154aaea9a0d60a2c1d6d7f81c50041681f2579a8d1de9 SHA512 7292b05bb0c767200e2939d946fa5933e5652f2ed48c6dbe6afb044bb98919732de5ef7b969cebb6324c76ce640b79c4258d03ac2239836fd5c603cd5869899a
 EBUILD geoip-1.6.9-r1.ebuild 1262 BLAKE2B 3c943ad84847dd2d49e9448c67858329a5e4a00ace289f7184d8ea9ae7086451482f92f31147940e7bbb386e55a23a1b12397653fe9e52b921007277a8eb6bd3 SHA512 fac580a443ee56aa9ac35d27e6a257da0d0bcab2fd46e6d76e22ce66d46b887c4ad7ab64513ea8f0f5490328ed52230439d18399d1b3c7283adf92def939a921
 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index 3c6fe0eb74cc..0f47ddd8a68a 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.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
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 370d822ca642..9e4e9f4084e3 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,3 +1,3 @@
 DIST gom-0.4.tar.xz 102744 BLAKE2B 8116ac388a56e85effbb37c3d5ea5036f6de2f4ad7ee8fe119bd058e1ac3e293eab612a739cdba7467202bc9e258f7cd65b1f116e146577d3a103fc03afba37f SHA512 d847928ce09c53a3f64777c313cb843052e5e001873f29d3f7acf02772cadf0e4b133fb0137aa0463b4ff95dd54810bde87062d8e396ff4fc6d142ba59c8e9c8
-EBUILD gom-0.4.ebuild 1437 BLAKE2B 7dfecdf4fa955ac7bf12ba7b9cfae305728cb4aeb0f478f9d1eacf1d7e5db17d4c7e5203a8d2a4e492338b42e7772743ce63ce66d7e5cb9f0551917856c3abaa SHA512 8146c427cbd1f9d3d48de91e59ee81d4ae2b9a1fc54ab1d746ae0accf3813b60ce4e2d07b3a0ba33e76bef2f7e952dfbc55810d3ad4c2e41475682731f83f105
+EBUILD gom-0.4.ebuild 1436 BLAKE2B 4d67f96b5073f62386ef08c68faadf17968af6738ab56efa4975c80b4f0d3ca2d493b587326d45d66ff043787b083f63ac95411daec86e4527f4216dec8aa348 SHA512 2d7199dccabd8192faad41bad00e6587630fbe2be2972c58000f5a348b389b24d32150b377a385e20622bc008b468103c6bd4dbbb218d5d6293d6d7b6036b2dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild
index 1635f38218d4..3bcf4b239602 100644
--- a/dev-libs/gom/gom-0.4.ebuild
+++ b/dev-libs/gom/gom-0.4.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 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection python test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/gtx/Manifest b/dev-libs/gtx/Manifest
index 9c2f50b9dde6..f9f3f368f553 100644
--- a/dev-libs/gtx/Manifest
+++ b/dev-libs/gtx/Manifest
@@ -2,6 +2,5 @@ AUX gtx-0.2.2-debug.patch 824 BLAKE2B 99491b667059303ecfa3ca8af8a1a5af4f7801f22d
 AUX gtx-0.2.2-docdir.patch 354 BLAKE2B 2ce7f2ccbdfeebb21481113f84ed6ab840b13cc0b0ad01b38f073c3283dd746f3553a3bbdac5be6eae8458aec2b2cb50f47bb48e1b565022f2325efc18cac756 SHA512 3107bd3cc76fcdf008cf3a0f0a11c2d3761ba164158f7768f597d6f79a60c7cab8a420b6a7c41a7c5e2f0d42811531fb5be769ceceaba7e9fc2c0e4d70c5c522
 AUX gtx-0.2.2-glib.h.patch 277 BLAKE2B 3adec98810b92eaf65df3f421da3f3b3897e4754af8e8aa5881b5f7f66141031a560af7fe594415a32ad63dee54e59e3f5c20f64d09003c4c894860182fde336 SHA512 fb8581fee93122b2163472bb4c873ede049d42e00882633943c96e9aeb74fece1a1b8e2ef16d107eb765ecccf29aea250fc0948cd21cfe17b33e191c1699daba
 DIST gtx-0.2.2.tar.gz 306024 BLAKE2B 861e5e729edc376b104906dbefe7f79e018a61dac3fefa2b260a869324b9ad88f002c64bb753d06cff93d58102c8f35e052ff18129c5c97da45f0abff6d78718 SHA512 737e21c66388f520c9d6812f3478e583940e9558646b4f3281306e3a946d4fb87719a48c1ac5fb1e38e9e465dfd1f82dea90badb3b321c0ee6b1dd105a9329cb
-EBUILD gtx-0.2.2-r1.ebuild 862 BLAKE2B b7d0f3516172d8ff6c2a56c4b1371dddc3b8c36045d237e84f0f06f65c96b42d24018e3f1c3760cc5955962976d65ea988d4d1c1635c3b1bffa737d88a06d557 SHA512 df91c3bf83780fe4e513e16129e173d3dc63d50af1da43cf23809c3752dc9c3e0a9c384ce666eaab58bd992602461a40dfc88806aae71b91db5ddff56273ef2e
-EBUILD gtx-0.2.2.ebuild 761 BLAKE2B 0bac23a908010ee7be21b19d0415f221c4dacd3a0935d499591cc347c4904deb0624e58a5e60e4c33302d3fda606bdcf83a9073c6d9df23d136cbae1f5057b51 SHA512 a5d181b46f89e4fd8ca76065ed1fa4fd5a3f0c0578af3fa201afc0aea9dea5f595f95b464ff5ab9bb035596dcdde2a1249e1d55b60ea3fd20bd3a503182a3f70
+EBUILD gtx-0.2.2-r1.ebuild 860 BLAKE2B a517b212acab6fd8f70a7b44dee0c42b7e02ddb2b79e1e665bf86b76c24f1ce097741daeb00c036d6f7ab1e54514f0f33aad769eb7b7e62e539828eccf8901b6 SHA512 39ff4abd277bbaad96b10e81a28aef5998d925948a69e308942cff76f4290eea9d05bd0d0f8f2ce865a82561568f0dbbe9635be1ed17c01354cff0a801a7e3c3
 MISC metadata.xml 556 BLAKE2B bc74ab5b4ce6c4387207158870c59db0c0ff24b83409c4dc84aa27096630ac21b56b81789436c76eaddeff9e9cd1ce7feaa9914cf800873cf2e181848c92c67a SHA512 b57d6e9203c1833935e561c5479d7dddd88ac5514aee2d1c95304ec3b60ee85f743916b19f23f4a3633d64823151bd4dd256da73db12ad5a6bad670df16a6808
diff --git a/dev-libs/gtx/gtx-0.2.2-r1.ebuild b/dev-libs/gtx/gtx-0.2.2-r1.ebuild
index 7354843939d9..492d15006d16 100644
--- a/dev-libs/gtx/gtx-0.2.2-r1.ebuild
+++ b/dev-libs/gtx/gtx-0.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/gtx/trunk/${PV}/+download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/dev-libs/gtx/gtx-0.2.2.ebuild b/dev-libs/gtx/gtx-0.2.2.ebuild
deleted file mode 100644
index cee2d664b5c9..000000000000
--- a/dev-libs/gtx/gtx-0.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-DESCRIPTION="Small collection of functions intended to enhance the GLib testing framework"
-HOMEPAGE="https://launchpad.net/gtx"
-SRC_URI="https://launchpad.net/gtx/trunk/${PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc static-libs"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-debug.patch
-	"${FILESDIR}"/${P}-glib.h.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index dc80bbb7e893..a130b3451847 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c5109159
 AUX 3.36.1-autoskip-network-test.patch 1062 BLAKE2B ae819a4e2f3db2a20c516a15b6f8ceeb33c4149a8010c8821aac925b0e81ffb43b5d02de09affdec2b1abc70bf432b2804c9e55d1b261360be17fa95f20d0e74 SHA512 de6f0f0727c0fb21aa7eea652084b7d7b2c526044e69a8a4b6ccaf813d4bc2162726c87224d25cc9a5773aeba76c57b4a2e1bacf9476dc4ea789aacd06d789bc
 AUX 3.36.1-tests-locale.patch 1825 BLAKE2B df10a2db35720cfcb8b8c67f73573067cdd420a11276fee75f399e47e4b68e3d054d94587e68f7cffcf8de3267351bbdcd61879d5470532f8430a52c33b28ee4 SHA512 0918cd2b8fc9265e974e8315671698aa0e8f3442a30d4f545ef35cf64347a85e93500fc414c17afb6fa89f8eec8d9c1e19b90d2327fca6b6ca426b95719dcf33
 DIST libgweather-3.36.1.tar.xz 2702144 BLAKE2B bd867461b64ef81607695ae1a3796d2b096129a9a60721c5fcb20d8c35859c0b76a985e9393c23b311f7c0fdec3e691618eab83a826b483c427287906d575251 SHA512 6c7090b0b6dfac61e73a398d34329cd706080a007694ceb3d47700b4f444982f8ca989dd6dfaefe85b79ffd5af9c423be4bf1bd8491ac0ba6bd15c150d97b26d
-EBUILD libgweather-3.36.1.ebuild 1864 BLAKE2B 5a2ec73581ed8dd92f933357af78da1a986fc1a957661023ea1a18cc6618034211d8d94287bd5621bef6ffd9d66ce3cebc7a1c127d9b1fb2af2c6dc3a5cc3e13 SHA512 235f133a6209d6cd446aa2d75fb992c41c4ebe633eec76df62973e2ea379456ebc460c54696bfa3fda1eaa0d51d08fefa9460d4a2cb87c7e6048fdd8d843da5f
+EBUILD libgweather-3.36.1.ebuild 1863 BLAKE2B 1a8f0e6a498fa583744e3b22441a379d3e17d4315eb7342a18213a94e6c358d25af4bdebe3ee2819aa30af942d65b2ecaf3eb5fd0a05f4c1404fb39936b0f5fb SHA512 111e19e7e7773c353205efe69575f64068b7fbf3ef575aa2d72f18713b42e8ae19c7a9c4652ca11b63964bcdd54c7f76267ee5ec821c5b709ce9807c5e1cfd64
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.36.1.ebuild b/dev-libs/libgweather/libgweather-3.36.1.ebuild
index c89adaa7e6a7..78a29db1ef23 100644
--- a/dev-libs/libgweather/libgweather-3.36.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.36.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
@@ -15,7 +15,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 06b6ad669a62..5a9b1fd9b9fe 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,7 +1,9 @@
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
 DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2
 DIST libpqxx-7.3.0.tar.gz 694012 BLAKE2B 35770599fcb3131081e08c18d96b753cc6d412c6ea8fddf5617df7da2035cf8ee3a031b7c14d592e0c9560e1e1074e633734337113ed0b3943e519aa44806307 SHA512 897af8e1c0ab12df745116e5387d3c31fb8800b6c599f49413ddcc67df7968fb1922c96896c818ce3f34d9649fb6c1d2ea59784f8765fb765481b156be44eaa2
+DIST libpqxx-7.4.1.tar.gz 702581 BLAKE2B 9190b62eaf4cee188e32611acfc938a4111e5ea510df50e424ebd3b6c73fe91dfc8fecd5f889dc2af95756f04c87a410a136cd4b4d6d1f276ce2e5fc26906df3 SHA512 a30a9f5ca87944922c9a3bd92d53392855ac3b2760cb7c21411caf364e443c25d1b2d4b4022e60ff7b30bc530fc3223ab3983325217d47fd7d71375c165c8c21
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 662d4833d5d5edb7052e4fb2f04023d87a725a0f5de6f73ee89cbf03dd851a2ab4559cf978ab1740b066dada6b8a82045f1fb4865fa4a865c3d25baf05c3f854 SHA512 b7057ea86ae93a82f1c817094363524988fddaff362796601b57a195869618cce7e8e8c962785ba1777f1c9f7be2339f40d6d36bbb58daa2e0e757a4d72104d5
 EBUILD libpqxx-7.2.1.ebuild 2025 BLAKE2B 0d4de7f5a85e29a439ed5d0cfe5b272b3167f7c552fe646f8a1fa4ea4d370cd8ecb3d8ba78eb7f00ce54346ee9e56ffda7c48e971a2bfc27e5faa171642f15b7 SHA512 1f428b0fcac2cd2738c679daf0c26b83e06e72bbcd78a6801588340c0de53819aa7ecb57eafe329c67b2f87f024092c4cc391157cb198a71f0c81ca6e89f4fab
 EBUILD libpqxx-7.3.0.ebuild 2029 BLAKE2B 1c83bf036b0c58c3c50f39ac9b689bbe46e3bd3c4ba8000c9b305e1554418c0844ebcd99667900b38755a15ba35a803fad2b02e68e3c43eddc5aae4fea045863 SHA512 300ddb6b6a23bed8f663e5862b704ba3fe8b51cfaee1314112f7af21376d0cbd0fd512932b3054d2c37180eed130594c2f0da0dbb73ac8e990fc611b2e253e1a
+EBUILD libpqxx-7.4.1.ebuild 2029 BLAKE2B 6a3beb1eee4e93d7ca7677a8a7830568c86ec0dcef18e28b69c079669395507d2bc9906da93404bcc8396b73364013abf09386157503729107fdf58d34475883 SHA512 6b7c2fba6e8c059d3f112e625c5ff250230147b71547e82a11acd0f5624e3e267eefbe529d2c049990de20b2c142d8e65868b7f19ab705e19e3b68a22ac47c81
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.4.1.ebuild b/dev-libs/libpqxx/libpqxx-7.4.1.ebuild
new file mode 100644
index 000000000000..991fb39e97c7
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-7.4.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
+SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+	)
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT}/etc/libpqxx_test_env"
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			cd "${S}/test" || die
+			emake check
+		else
+			eerror "Is the server running?"
+			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}
+
+src_install () {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 13cdf39d6fdc..15cd827bfc98 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -9,5 +9,5 @@ DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6
 EBUILD libutf8proc-2.2.0_p1-r1.ebuild 763 BLAKE2B 099b8bc2f67ac32c5c4df88ac68c641b1fc51185b4e13df6c38ad32a4fc9fd23c850affcb64143d93bf6caa589a8d4aa7ee1ce0b77cd899a4b9ca4335369d75a SHA512 f26ef903568f966e6e28021f38376a3588d43f7103695d5b2c1eff1602e55a14954c0a4ebfa404e3e4fc3066c4ac69ce81e6aca81ff6e180174c22675f545f41
 EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
-EBUILD libutf8proc-2.6.1.ebuild 1288 BLAKE2B a020d281475836d53b25611599999745447491662f0328ec3cdd7996c3cc389385356706c6577a7f301182e84f6920c190b7a9f6fead5a29525a0af75e2387d9 SHA512 9d103ebba81e9d837b288d10d8a6f0e56f1201aeba8bc0bffa5b558a3e888a483aeb4253f0640fdbc019a6a7408321467dcb7831a343831c451e77637296296d
+EBUILD libutf8proc-2.6.1.ebuild 1350 BLAKE2B d411ecb5af1fb6ef10e845b2e57e5846170f2ccdffe46632d2769a8ff65381f0873b77cc84a0b61dbd5f4cb18339328c4281f16be60ecef2f44c3e8f8858ed00 SHA512 d781e74cdca494921035c552e49531e71ab378f6846fd977fee2a71a75f3e6e01fb0355647ed79de211e9fc6d10cad0ab1d669e0d809eb32c09b65807b21986c
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
index 323f38181fb6..c3a247d61225 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-inherit toolchain-funcs
+inherit ruby-single toolchain-funcs
 
 DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
 HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
@@ -16,7 +17,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cyg
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( =app-i18n/unicode-data-13.0* )"
+BDEPEND="test? (
+		=app-i18n/unicode-data-13.0*
+		${RUBY_DEPS}
+	)"
 S="${WORKDIR}/${P#lib}"
 
 src_prepare() {
diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
index 67d08d54031a..b83015aa20ce 100644
--- a/dev-libs/qtcompress/Manifest
+++ b/dev-libs/qtcompress/Manifest
@@ -2,5 +2,5 @@ AUX qtcompress-0_p20180513-nogui.patch 271 BLAKE2B 707ece6707c14e01119f7e31e07b6
 AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99e64b7c7aa92997a903dc011547d79efef0c457b56b955c037ee73726238c75931dd25e13561a4744c8ca6cfa423bc076c2282881f SHA512 c99e0aacdf9e485f915d911b55e1824046345364c89e6a4fbc172687bd604b4eeff20bde22975ea5c65c103efda3c9af7e907b9599b6acdfad095fec9501670b
 AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
 DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
-EBUILD qtcompress-0_p20180513.ebuild 1456 BLAKE2B dfb3032b2d8a6862fba0db4c0cb8e4a2f3368fc93512a1c03d470f7f684dffcf69584f3f32b33ea6cd115d20ccb7c94a1eb9edfe9e0d9eda27c5d93ae773b58e SHA512 5595ffba5db197ad4267accbdd6677a9e6173903e2202be28304b9da2afec1071c5be844465c30ca951c1c6459b9a4ad65c5391b049271472c2c195513157b21
+EBUILD qtcompress-0_p20180513.ebuild 1455 BLAKE2B e63771fbd81699b65e92e5673706947ec572524c21bf510402c52e3c79bf05629a654445ae571909ae14d058d3eac18ec665b7432aaec5020df49dc6415f7ef4 SHA512 70935bc6543f1a794f9fa29fdc7669dce62d88657757505026a37ab8183aa5279ea2221c4b1d76fc6b8c5763c4cb6c7bba0b21c6442bff2b904eca9e4cc0602b
 MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
index 58e66c1c3c30..59471ae05533 100644
--- a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/qtcompress-${MY_COMMIT}"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
 SLOT="0/5.11.0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index c657b47a6bfd..cc093e17a905 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,6 +3,6 @@ DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a9
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
-EBUILD spdlog-1.8.2.ebuild 942 BLAKE2B 212a53fc12941ea0c6038e5adf5cdcade14a026b23fc74b0845686a3bf53b284dfeeea742b5e5c61793592db6241d920c3ac5d210f880ab52331c986b2ea2815 SHA512 8cf5e21c6f1219251ab90b607965b5c657caa7c8104344933516886906f2b0313399dc87d9c26b1f9e9b46a564b85594230b65e581e41a41e0bc53f62137d2f9
+EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.8.2.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild
index e1e3064adff2..f1f85aae2ff3 100644
--- a/dev-libs/spdlog/spdlog-1.8.2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.8.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 0a2e19fd143d..71ba130556ee 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -2,5 +2,4 @@ AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfb
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
 EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B 4cc2ebfe928190fcd7191e233cdc2bd7e04b7f331bb39ec08cb6f84aa7733755727eb176337265d60a1b290da1ad3719b2f4ee2e221de83a6f6987564adb0275 SHA512 e8e2f38a7ad930a5566f9d89e9da998676dfba5f466f44b6cf9463cf43ee315c0dceb04629317c6eb93fc9346a10bae11aff70cc3ccbcf9b01372eeb515c1e28
-EBUILD tomsfastmath-0.13.1.ebuild 1671 BLAKE2B d385ecfa9f3e970fffe7a01e3725a8fb6079c854cdf9ae1a8801510321ab720fb6a3a44bbb8ad554d85bbe469389c12cdbe40ca7531ed8c88a130faa4e92a4cc SHA512 6020bf9929d9054ebae1db1a0223b31760e5c0d2638dd59ca077e5b1275b4ed1bb53f6adcb9fb32bbcae8a60b676613e84dbc978aa78564ed93f507812465f94
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
deleted file mode 100644
index 708ecd1d02aa..000000000000
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast public domain large integer arithmetic library"
-HOMEPAGE="https://www.libtom.net/TomsFastMath/
-	https://github.com/libtom/tomsfastmath"
-SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz"
-
-LICENSE="Unlicense"
-# Current SONAME is 1
-# Please bump when the ABI changes upstream
-# Helpful site:
-# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-BDEPEND="sys-devel/libtool"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-fix.patch"
-)
-
-_emake() {
-	# Standard boilerplate
-	# Upstream use homebrewed makefiles
-	# Best to use same args for all, for consistency,
-	# in case behaviour changes (v possible).
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${ED}" \
-		LIBPATH="/usr/$(get_libdir)" \
-		IGNORE_SPEED=1 \
-		"$@"
-}
-
-src_compile() {
-	_emake -f makefile.shared
-}
-
-src_test() {
-	_emake test_standalone stest rsatest
-
-	# We choose to be verbose during the test process
-	# because the output is quite repetitive with no
-	# clear demarcation b/t tests
-	local tests=( "test" "stest" "rsatest" )
-
-	local test
-	for test in "${tests[@]}"; do
-		einfo "Running test (${test})"
-		./${test} || die "Test (${test}) failed"
-		einfo "Completed test (${test})"
-	done
-}
-
-src_install() {
-	_emake -f makefile.shared install
-
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -delete || die
-	# Same for static libs
-	find "${ED}" -name "*.a" -delete || die
-}