gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
784 files changed, 6609 insertions, 8220 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d9626a8ca5ac..5da88fe7a2ef 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 5b44bed99e78..143e3f8642e3 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -4,7 +4,7 @@ AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
-EBUILD OpenNI-1.5.7.10-r1.ebuild 2498 BLAKE2B 524576e390587ee8c7a051fa78fb6806b0be1c51ccd1e5e8fc2063ff9632d34e96ce8984aac5e691a83d714f05ad06ff0d69bfb810218acd354acd9bb5ff1294 SHA512 881211b35d60046b2eb1594865a85f4e6070af649d04f10b16ee86cb2531bba4fa5cc295d573fe54520e9569a24d13c3e6f7d74e3d1dc53d93480fe30aabffa0
-EBUILD OpenNI-1.5.7.10.ebuild 2460 BLAKE2B cb3cfb1ef28422273209d13442ddf071f8704c10dc5f5f7fe52b6587587572dbd18c22cc80a1a99e4c8fc6e8abae1e0587277852284a846d0b1c1e83370ac4a5 SHA512 d4a442961664d0e1577189cb4d80bf75ca07fbf6ee3a4f599fc13be5513e3014c300d56da4bbe79ce09bfb857f8ed5461fada2658e603958d3c5beaa3a7a3acd
-EBUILD OpenNI-9999.ebuild 2470 BLAKE2B fbbb6d29dbfafbb2fa95256914522a3042141079c7f8eadeeef63a1bb2612366b39ee21610e28d1f71c71808da49dae448746843f54d3e9ce9269b2c4fda0840 SHA512 ea64a6708fc796d7adad7fbe4f132647e280b1afe6768aa6b5a5c59376314ffc8280677d337c73593887f375cb9149dce104e58b5559364c54c62647d116d066
+EBUILD OpenNI-1.5.7.10-r1.ebuild 2498 BLAKE2B e02e60c1ffbb570d3b80fcddf5c973b87e0b3f3f4332ef55525a5108383fc655d247498634c1166ed137cab55f912f88e6c30281fa9b066c1b2266eb795d5ed8 SHA512 23019f8d71dcb79281f55532fc289e417f2bcedbdeffb46c08903f3d71e26f3c9b827bbf8f76dce516aa2c10d4267e6e70589a38ca1aa03a2a29aa05222d4ea6
+EBUILD OpenNI-1.5.7.10.ebuild 2460 BLAKE2B abaf9888f2191717f146984b27517338d45f3656c171e2be549286feb2f2f85a8e5289300e710fd26b886c5ae633355690367eb86e0c3381e8980ecd1c784302 SHA512 eb4299719bc83e44623ba51baed265cfc8a52037879843255789e7d0ce79223bd29a4ce57650d4e3d3b4ef620ac1656d0cbe20cba4b66884e67175622696bb1f
+EBUILD OpenNI-9999.ebuild 2470 BLAKE2B 074759ce736dde5fddd9d42953d9a5c67f1eb814379791c9696eb91758b7dee29147c40038e03aaf6ce8979c73a904d4f0829fba85f8f478db6826b33fd72666 SHA512 2e509bc7e0abeba476563d81f85c3973081214d3a8f28ea03fb443895ee17da4de1264625fb89e170ee11c51c39b9330fba89725ad9c4669f14b34ed5f7242d8
 MISC metadata.xml 337 BLAKE2B cd1617fea5ee8e8c5a39708ca2fe56342ac9bc77d7bd6a82ee1c2a3a81b16d5af8e4e90d916164fc9e998d523cfac65bdf5ea03e80e6e3f64c00a35bee310186 SHA512 31029665f81cf415898ab97a48804b3ddd5efae31f7800348a7b96dfd3a7faf1d4ae3275f039a8397040c6a3c83868252671ce1dcd35b6f1135d221b325ba5b8
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
index da575a346132..9f94c92b6ba7 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
+inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
index b8c8b9916996..a936bb62b674 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
+inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index c25f316b655b..aef879f68ea5 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
+inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest
index 0423adf4895b..0b69b59d2d7e 100644
--- a/dev-libs/OpenNI2/Manifest
+++ b/dev-libs/OpenNI2/Manifest
@@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e
 AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc
 AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be
 DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
-EBUILD OpenNI2-2.2_beta2.ebuild 2467 BLAKE2B 423da72f842b6339a040ca9926b9c2fc88168b113e24f699f2d1aad193d3616973286bcfd39bfa8a7dcb11beac3d0727a66f84ffcfa8cab68197f372a3498fdc SHA512 7bb1fe06b12856a9f5b02e05c1265293c1b2d76a8847d20ba4dc6b674997f93697af1eda983b3040cb38dc1044fb7c500c59b8ae0dc38b9d85312300a05df468
-EBUILD OpenNI2-9999.ebuild 2408 BLAKE2B e4d0c8e4cb8aaa514bb43b38a83d73da1fe345fe3366410049721c969f12bd37432bebc4c423ac6940efae9749af018c9dc70594a2da2a6e649f875681cb9b90 SHA512 7b5545ce7b267f9499c058fdc6214700f20b7a2024b2b55f19b4cd38d17a695c3ed16a7e5896b4403e754ace51075347aa207cd0f64fdc133d904ed015186f99
+EBUILD OpenNI2-2.2_beta2.ebuild 2467 BLAKE2B e35c984cefcaffb793902ceae3a459ce10e60994e149869b7de46bcbcddf396154ffcebc322e68d1ed46e06731f41fc7088234d18f94846482c351198223b3ec SHA512 dc1b394b9628ff536adfeff3837ab036c4e34e8531ee7a5d2407558c403d014d216b81dee0b32f79acbff8c116cd92013961943594963e2a6a4e98b6c75b4e38
+EBUILD OpenNI2-9999.ebuild 2408 BLAKE2B c283d2936dee2ad41ba640bb7241888cc9ddc21e20c02b09b537b4d87b354a85fe36ec64783c761a96a17cc238e2375a092ddbdf1b097d38eff1e04304f64d7a SHA512 ca1a2a7a5654767261e2a3e7b833b69034b959419b8f5d838ce0cc4deba40d3c5c7c93d0eb330b3067350e9ccd712c4877cc586c5916ac0a8ffc9322a7471911
 MISC metadata.xml 341 BLAKE2B 5cf0f39369a82aea80badc678a0766aa9f9d2d2fef2108fa27bca9f7233d443371298334b356ba6253edba043d941a0ce821e23f5c1a119cddcedd8e79b1c9b7 SHA512 414b64e60046dc1628494ab50ae5f4c5594b9fe71daf7cdc844428200e6122bc471e27f982fa4eaaed6db6f93fb53312118a35dd52e01c576e8597f3e21b23c8
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
index 84eacb9fa589..2edb89b3f146 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/occipital/openni2"
 fi
 
-inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
+inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
index 7754345b7f20..13ff01010ca9 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/occipital/openni2"
 fi
 
-inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
+inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
deleted file mode 100644
index 989cdc68a90f..000000000000
--- a/dev-libs/OpenSRF/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX OpenSRF-2.1.1-buildfix.patch 3436 BLAKE2B 9aff428ea42562bddbbc59f063d2902e55ee1c5f14fbb0a49b801840d8fc8ac02f703e8d4f95139bd90a54c689e1cd4fa9d5a4b23e9e56b8f16dbf4c6ad622db SHA512 5db2d704a3d539c1c57ee3b5d4e0965f60c23134c68746ab84655d698388e10b7d611dff0e25db4c633fce462816c4d76afae9d74acdee5a95baeb99528e2b5b
-DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306
-EBUILD OpenSRF-2.1.1.ebuild 3573 BLAKE2B 151d209296f20f8a52836677ffbcfced0f9670d7d27fabddb4b18c97261912ff993fcc02e15f31474d573068ceead2b6146479f145dc8eadbd335889d2a0e0f1 SHA512 4d2091743b631f21108ddf154ab84edefb9a7fbdffbe1e5a5eaa6c21cf7400a88c2d8874301644e18d0e0b58284c883868a5e698c7d1238371826e57168504b7
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
deleted file mode 100644
index ed235d5aab1e..000000000000
--- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib flag-o-matic apache-module autotools perl-module
-
-DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
-HOMEPAGE="https://open-ils.org/"
-MY_PN="opensrf" # upstream lowercased the tarball in 2.x
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://open-ils.org/downloads/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postgres +sqlite"
-DEPEND=">=www-servers/apache-2.2.9
-		>=dev-db/libdbi-drivers-0.8.2
-		>=dev-db/libdbi-0.8.2
-		net-im/ejabberd
-		dev-libs/libmemcached
-		dev-perl/Cache-Memcached
-		dev-perl/Class-DBI-AbstractSearch
-		sqlite? ( dev-perl/DBD-SQLite )
-		postgres? ( dev-perl/DBD-Pg )
-		virtual/perl-Digest-MD5
-		dev-perl/JSON-XS
-		dev-perl/Net-Server
-		dev-perl/UNIVERSAL-require
-		dev-perl/Unix-Syslog
-		dev-perl/XML-LibXML
-		"
-
-S="${WORKDIR}/${MY_P}"
-PERL_S="${S}/src/perl"
-
-APXS2_S="${S}/src/gateway/.libs/"
-APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so"
-#APACHE2_MOD_CONF="42_${PN}"
-#APACHE2_MOD_DEFINE="FOO"
-#DOCFILES="docs/*.html"
-need_apache2_2
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	perl_set_version
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.1-buildfix.patch
-	eautoreconf
-}
-
-#src_compile() {
-#	LIBXML2_CFLAGS=$(xml2-config --cflags)
-#	LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}"
-#	LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}"
-#	APR_HEADERS=$(apr-1-config --includedir)
-#	APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR)
-#	sed -i \
-#		-e '/^export PREFIX=/s,/.*,/usr,' \
-#		-e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \
-#		-e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \
-#		-e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \
-#		-e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \
-#		-e '/^export ETCDIR=/s,/.*,/etc,' \
-#		-e '/^export SOCK=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export PID=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export LOG=/s,/.*,/var/log,' \
-#		-e '/^export TMP=/s,/.*,/tmp,' \
-#		-e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \
-#		-e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \
-#		-e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
-#		-e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
-#		install.conf
-#	emake verbose
-#}
-src_configure() {
-	APXS2_INSTALL="-i" \
-	econf \
-		--with-apxs=/usr/sbin/apxs2 \
-		--sysconfdir=/etc/opensrf \
-		--localstatedir=/var
-
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed"
-}
-
-src_compile() {
-	emake
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	einfo "Doing src_install"
-	#emake install-verbose DESTDIR="${D}"
-	emake install DESTDIR="${D}" APXS2_INSTALL="-i"
-	apache-module_src_install || die "apache-module_src_install failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
-	cd "${S}"
-
-	# Docs
-	dodoc README doc/*
-}
-
-src_test() {
-	emake check
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
-}
-
-pkg_config() {
-	:
-	#JABBER_SERVER=${JABBER_SERVER:=localhost}
-	#JABBER_PORT=${JABBER_PORT:=5222}
-	#PASSWORD=${PASSWORD:=osrf}
-	#einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
-	#einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
-	#cd "${ROOT}"/usr/share/doc/${PF}/examples
-	#for user in osrf router ; do
-	#	perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
-	#		|| die "Failed to add $user user to server"
-	#done
-}
diff --git a/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
deleted file mode 100644
index 767a478b53a8..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-2.1.1-buildfix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Upstream uses DESTDIR, but then tries to hard-install the apache config
-modules, as well as not allowing other arguments to Build.PL easily.
-
-Split apache modules to be built during compile phase, and allow control of
-apxs2 install mode (for Gentoo, pass APXS2_INSTALL=-i).
-
-For the Build.PL problem, just disable it entirely here, and use the Gentoo
-build functions to call Build.PL instead 
-(presently does --installdirs=vendor --libdoc= --destdir="${D}" --create_packlist=0).
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar opensrf-2.1.1.orig/src/gateway/Makefile.am opensrf-2.1.1/src/gateway/Makefile.am
---- opensrf-2.1.1.orig/src/gateway/Makefile.am	2012-11-06 17:39:46.000000000 +0000
-+++ opensrf-2.1.1/src/gateway/Makefile.am	2012-11-12 21:56:52.108564157 +0000
-@@ -17,20 +17,23 @@
- AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
- AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
- AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR`
-+APXS2_INSTALL = -i -a
- 
- DISTCLEANFILES = Makefile.in Makefile
- 
--install-exec-local: 
--	d=`$(APXS2) -q SYSCONFDIR` && \
--		if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
--		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
--		>> $${d}/httpd.conf; \
--	fi
-+all:
- 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
- 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
-+
-+install-exec-local:
-+#	d=`$(APXS2) -q SYSCONFDIR` && \
-+#		if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
-+#		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-+#		>> $${d}/httpd.conf; \
-+#	fi
- 	$(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
--	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_json_gateway.la
--	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_http_translator.la
-+	$(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_json_gateway.la
-+	$(APXS2) $(APXS2_INSTALL) -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_http_translator.la
- 
- clean-local:
- 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
-diff -Nuar opensrf-2.1.1.orig/configure.ac opensrf-2.1.1/configure.ac
---- opensrf-2.1.1.orig/configure.ac	2012-11-06 17:39:46.000000000 +0000
-+++ opensrf-2.1.1/configure.ac	2012-11-12 22:04:38.673403306 +0000
-@@ -352,7 +352,6 @@
- 			 src/gateway/Makefile
- 			 src/jserver/Makefile
- 			 src/libopensrf/Makefile
--			 src/perl/Makefile
- 			 src/ports/strn_compat/Makefile
- 			 src/python/opensrf.py
- 			 src/router/Makefile
-diff -Nuar opensrf-2.1.1.orig/src/Makefile.am opensrf-2.1.1/src/Makefile.am
---- opensrf-2.1.1.orig/src/Makefile.am	2012-11-06 17:39:46.000000000 +0000
-+++ opensrf-2.1.1/src/Makefile.am	2012-11-12 22:04:35.580149012 +0000
-@@ -40,7 +40,7 @@
- endif
- 
- if BUILDCORE
--MAYBE_CORE = libopensrf c-apps router srfsh gateway perl
-+MAYBE_CORE = libopensrf c-apps router srfsh gateway
- if BUILDPYTHON
- dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl @top_srcdir@/src/python/opensrf.py @top_srcdir@/src/python/srfsh.py
- else
diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
index 37e46e3cb80c..f914cc23f71f 100644
--- a/dev-libs/antlr-c/Manifest
+++ b/dev-libs/antlr-c/Manifest
@@ -1,4 +1,4 @@
-AUX 3.5-cflags.patch 632 BLAKE2B 34051800ce235fb8b913abd1b3c01f2364d73a7103d380cecc861d2b89eacaefe65a6038199799c3974789e6d4cb17aae43c74a3276c299a95dbd3406a6e8ed8 SHA512 8f68bc1d56de08d144ca6dc29c530a6d89347aed58d497a7f5525d5375086cbce1c4365e4ac917ef92eaae9471c6031d38df98244dbb426620073f697c8fbf68
+AUX 3.5-cflags.patch 423 BLAKE2B 1605eb4dbc47bdd9f54699a0fe0f0bdc54d419b68d4a99be11c55a654d3167422560e4edbdd59515b65f52d9a7785b103baa9e1e6742be8f9c40eb1985c6cf5e SHA512 fbabfd7db5d373646b873a5b56c6153b39c5287518ced27c4857aa91947998cfe009db143995d8fe93750068f615092edb647ea2a2ededa7a7997e6c741fb638
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-EBUILD antlr-c-3.5.2-r1.ebuild 1387 BLAKE2B 57c75124fc536bb156a4638a7a74f41482803db897e5be36fdc4dc612b0a5c19cf9fdf811a1f6f5150abb443146c6903a7be53a9bd852ecc15f5396ba64f63a0 SHA512 48afd4378769bd1ddf00bab876912b1fcca17d49ecd6526cbf28d7757ad6379d27de398fff56a8798032771e6140978ef0f4c3ebd33bec78ced96c03db5c6fce
+EBUILD antlr-c-3.5.2-r1.ebuild 1346 BLAKE2B 0f5514635fddb6cdc833b4e904b846f9a308f0af23bc7fc99deeefcb29cc4a742e9fbc9ac1fef1b23b5174c0755120c834eeeff5659ed2a8d546a029b0ed7fdb SHA512 744d8bf6a9ef64cc197f48369d76f4fb05a57ff25b421d42b0e5e4c6961bdd8b9b4ee4ba3885744a0e6a202a104a8f4ac34675bbb1dc6e6b5532afb0a0708c5a
 MISC metadata.xml 336 BLAKE2B 980e56da4035d18792f5f65654223bdfa1bca764c18677a1e4cb6ee7da3e2f59a09944c0c6bfd63045f0c2855ed353d0cc2bd68a3cefced82ec9f3d82f478401 SHA512 4d1c32d4948359f596c0b006237cf7ee33d662c1730c4c68b9b4786fb46d762e3e4b1c89f9ca5ad99cc727c9be96c2a0f0ad92e5ceb990e71fcfd8b37ec257aa
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
index b073fe008480..e0b7a34e56fa 100644
--- a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
+++ b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils autotools multilib-minimal
+inherit autotools multilib-minimal
 
 MY_PN="${PN%-c}"
 DESCRIPTION="The ANTLR3 C Runtime"
 HOMEPAGE="https://www.antlr3.org/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug debugger doc static-libs"
+IUSE="debug debugger doc"
 
-DEPEND="doc? ( app-doc/doxygen[dot] )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
-S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
 PATCHES=( "${FILESDIR}/3.5-cflags.patch" )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/antlr3config.h )
 DOCS=( AUTHORS ChangeLog NEWS README )
@@ -32,9 +32,9 @@ src_prepare() {
 multilib_src_configure() {
 	local econfargs=(
 		--enable-shared
+		--disable-static
 		$(use_enable debug debuginfo)
 		$(use_enable debugger antlrdebug)
-		$(use_enable static-libs static)
 	)
 
 	case "${ABI}" in
@@ -58,6 +58,8 @@ src_compile() {
 
 src_install() {
 	use doc && HTML_DOCS=( "${S}/api/" )
+
 	multilib-minimal_src_install
-	find "${D}" -name '*.la' -delete || die
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/antlr-c/files/3.5-cflags.patch b/dev-libs/antlr-c/files/3.5-cflags.patch
index 854513311827..a2e91397b2e6 100644
--- a/dev-libs/antlr-c/files/3.5-cflags.patch
+++ b/dev-libs/antlr-c/files/3.5-cflags.patch
@@ -1,6 +1,5 @@
-diff -ur libantlr3c-3.3-SNAPSHOT.old//configure.ac libantlr3c-3.3-SNAPSHOT/configure.ac
---- libantlr3c-3.3-SNAPSHOT.old//configure.ac	2011-04-03 10:40:51.277000042 +0300
-+++ libantlr3c-3.3-SNAPSHOT/configure.ac	2011-04-03 10:41:22.092000042 +0300
+--- a/configure.ac
++++ b/configure.ac
 @@ -134,8 +134,8 @@
   ;;
  esac
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 3ec914b79ca8..0b07a6c4b3bf 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,8 +1,3 @@
-AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20f262cbc486d57f6a1669da225386f92ac452ab0120e5095b097543430814827e74af5f9b2a7fdbdb8811f66c6b5be27d45e5 SHA512 4be4f2904ce35f29806432c04cd6c0c23783da1ebd66fb3f091c10a04749f93ceb4d49cdf6963c1f13343dd901a97446b57d39861d7251318feb03625644c59f
-DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
-DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
-EBUILD appstream-glib-0.7.16.ebuild 1690 BLAKE2B 14c53fb11352fdde910a5a41e28d232f970c33e8482a65865ba17fb690bf41507af0755264c5ed7fbf088f0b70768bb96727f6fec8e2e660fc9e41346eae1c1f SHA512 6a115a6ee1aae8ce819ac2fe7fadf26a666562abc25ed9ce54a2bde0b8eeb873e268daf6928c710fb9f93fe3103264d28deac805cf486700aaaff48afbefe0e0
-EBUILD appstream-glib-0.7.17.ebuild 1628 BLAKE2B 16e2d0be5ce07f59ec468572c2461e7479522c0d24e3cda5133e3b46b27efdd617337b06e7a1aee50d300f450b6d7f125d0f8aac19e4d17dae4416027fb690c0 SHA512 9f150460886683029006a6b59838d3dbd39277ef6c27ea78c704f3538b7986dffb4c65d62fa613fb86a8265231e9cdf01e2a614efb047040ce4f2704e02f2e91
-EBUILD appstream-glib-0.7.18.ebuild 1645 BLAKE2B 4b92d43e175fc8b33f591786a8d907e3488f7e0cdb5d16e97d2f1f276370b79f53a93eac21f98c7afc250fbbcb9408449bad7b7df2616bb16d9c2cd1edf1b69d SHA512 f2cd996406ccb0d5131547b24f63766a77a828fd28247672f2fb522da0743e59f4cb06729acdc2738e95fb43abe45119d69a5d3cc0922c2840b0eb0e0eeca788
+EBUILD appstream-glib-0.7.18.ebuild 1640 BLAKE2B 101fca7e60896763113d9b7e3362be8d335876ea146b86b200a82cd8948c106090f2ccba69d1252b59c31fefea4294fd547eafc2b0c12c08358ae69a67b7b589 SHA512 01cbf464ca6bdb013671e1abd93e282777636f790999d7cbc9f2f0779b9288ace8b1b2a28ab844e18705d98cc1f22307612ff107692fedb8d022edd09a03b89c
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
deleted file mode 100644
index f7bb3107cfd5..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.45.8:2
-	sys-apps/util-linux
-	app-arch/libarchive
-	>=net-libs/libsoup-2.51.92:2.4
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? ( x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2 )
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-# ${PN} superseeds appdata-tools
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-tests-run-in-2020.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
deleted file mode 100644
index f0dacd30fe6e..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0:2
-	sys-apps/util-linux
-	app-arch/libarchive
-	>=net-libs/libsoup-2.51.92:2.4
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? ( x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2 )
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-# ${PN} superseeds appdata-tools
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
index 5b6a19bd40c0..b92481c75413 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch b/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
deleted file mode 100644
index 40ffe3edb6d1..000000000000
--- a/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 953c8e529d7291e60a95e580967ed79ce2c9ccf0 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 6 Jan 2020 11:04:56 +0000
-Subject: [PATCH] trivial: Fix CI by moving 'future' back a bit
-
-2020 seemed like such a long time in the future all those years ago...
----
- data/tests/broken.appdata.xml       | 2 +-
- libappstream-glib/as-app-validate.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml
-index f7a5386e..cf80f5b4 100644
---- a/data/tests/broken.appdata.xml
-+++ b/data/tests/broken.appdata.xml
-@@ -40,7 +40,7 @@
-         <p>This is a duplicate release on the same day!</p>
-       </description>
-     </release>
--    <release date="2020-01-01" version="0.6.2">
-+    <release date="2050-01-01" version="0.6.2">
-       <description>
-         <p>This is a release in the future!</p>
-       </description>
-diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
-index c1103ace..f50e4e41 100644
---- a/libappstream-glib/as-app-validate.c
-+++ b/libappstream-glib/as-app-validate.c
-@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app,
- 				     AS_PROBLEM_KIND_ATTRIBUTE_MISSING,
- 				     "<release> has no timestamp");
- 	}
--	if (timestamp > 20120101 && timestamp < 20251231) {
-+	if (timestamp > 20120101 && timestamp < 20351231) {
- 		ai_app_validate_add (helper,
- 				     AS_PROBLEM_KIND_ATTRIBUTE_INVALID,
- 				     "<release> timestamp should be a UNIX time");
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 67db936e6242..04c4615cfdb6 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,7 +9,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r4.ebuild 4345 BLAKE2B 3feec303f43241e70bf6f8b54b3166de08d9faf60e50efc684289e83556c91750023b333ebafd2395276cce3bb78f67ed56765664f5eba8dd35e3b9eb0a1315a SHA512 1d0049ff0aaa648819ca363e220a72919b75dfe771c10e216046c9e219abb2075624c8a48e861cdd7e7f564f50326aa9853afb7d14d2906e04c43e098b46228e
-EBUILD apr-1.6.5-r1.ebuild 4292 BLAKE2B 066987f4de62748193a8a0c80721240e5204f75d42fde2ab45e849f07bb1cfcd6fb146dd4a97b3ac036f136bffa23da0b6d0b963182fd55905436c6ae4f6db8a SHA512 f54aa3c2a822470aa95c2d4ef2c0e96988ac3ee5e674c60fc6e0fb012cb9a6de3e9fe695c2a6f53cacfd36809cfb09e75a5d49633b9f054b8274c6ae38814173
-EBUILD apr-1.7.0-r1.ebuild 4255 BLAKE2B 4271e3c59c77b9743a12caa74bbc1f99aff6a2eebc1c92bd727f502a022aa567283ed33f58d3d030dd383665567c48ca3009f2a8a38b1ba145015be9fca7d975 SHA512 b7786b17df6130b2ee272126e40117c6d3532836e3ac24329559082b814a5723337ec84f38b57cb6b7e8e996949956e284dca6adaf08bc8d32c3a809a5216144
+EBUILD apr-1.6.3-r4.ebuild 4338 BLAKE2B ec32f95fff93150e04cebaa5bcbd633d334d5d5ac7a5e2c10e3684a4f1ae98e475cc494fd98026140a91b5da9c87aed9a1d3e89d0a0ef87418ce6b8202f04382 SHA512 fc2aad45662c2c11027eaff187902e21d829c4ee2dc6bc4e0beaa5c38cc4b17307ae61b2cb3f9374fea677f4f7d1f567242ada9cbcb69110c84d2de7104138b3
+EBUILD apr-1.6.5-r1.ebuild 4284 BLAKE2B 2ee4ce76ca5174c396cf44c7b27084024e1d27fee9177194825655d3820c4dd2aa803fc0652708797740c125454f2dcc6d473826d29a83a055be1ff9bd864d89 SHA512 08331bdfe11afa4f0abd76ba0f2b11105855adf917faae84eb57725ee72008f4f9fd93a2fb7985c56aed588750b5e7012dbe1af7e62d336dfbb42dc0aa631326
+EBUILD apr-1.7.0-r1.ebuild 4247 BLAKE2B c4d7369bfe7624c58d8843d64325ae77cf576680f2fcf18bbd5ee0b7dcc913c2f47c7113e7ff90e891c9eb5d26d70fc2544fb4e97768b2a909e66b75ba971f5c SHA512 27fe9b3f53a991a80487fd6a34440e30db0d91cb56b4a0f859a7132ce25baffe68235e6d4543a2004fa546fd6d84d9b2f40958f138056e18ef1685909b9519d8
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index b3c7995ee263..ab6c44d80524 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools libtool multilib toolchain-funcs
+inherit autotools libtool toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
@@ -138,7 +138,7 @@ src_test() {
 src_install() {
 	default
 
-	# Prallel install breaks since apr-1.5.1
+	# Parallel install breaks since apr-1.5.1
 	#make -j1 DESTDIR="${D}" install || die
 
 	if ! use static-libs; then
diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 23248704ea90..6c6e45c005e6 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools libtool multilib toolchain-funcs
+inherit autotools libtool toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/"
@@ -137,7 +137,7 @@ src_test() {
 src_install() {
 	default
 
-	# Prallel install breaks since apr-1.5.1
+	# Parallel install breaks since apr-1.5.1
 	#make -j1 DESTDIR="${D}" install || die
 
 	if ! use static-libs; then
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index f4a3aa30f6b1..59a34b5aa71d 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib toolchain-funcs
+inherit autotools libtool toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 1abdaa09ce11..242ece4f87ae 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 669 BLAKE2B b9396c7e5c2c94ba5a905081d209482e72eb37a43014a3ed0000991addd48773cd2eb99e37620757f3d8c97afb28518ed9080ec402c3239bd3d78487973ffeb5 SHA512 6489a2ef8d74685e08992d7ad99e63907399a189040015fb857e2addea57acec7027204d84d6ce4e7e6aaf44d4bda6f45646910a5ac50dbb0b4a59d699e8765a
+EBUILD atf-0.21-r2.ebuild 670 BLAKE2B 6baf882cafc989aae2c4503cb2e855dd45b9ada7f5cdeceec4f91446194d487e9f806e354818743ff203e80346dfc9567101ca20964039272eb4046df560c4a6 SHA512 698234808d7024ac60ba5e1731e498d434d4c0d6aefd297a6507bb924bb3634e775f2387fdc8bda14ac6a34c05ce6a8e59991f9d393a7856c1a0583bb0f8121a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 8d9f4fa2bb97..5376ddf5e0a5 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index a75399cc1149..b56849842c12 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,3 @@
-DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
-EBUILD atk-2.34.1.ebuild 1125 BLAKE2B 433157526bfa3d261f89d612a62effbcd40ff38c5342827884777cceccf687ba6fb3611c6d42a0027944f523055d6b341d56d94430f033bc8cd2767a66d3d592 SHA512 08f9ba896ac7c57c14ed42416832ddaccc8d0580fc1da719f697f15b93757d3dedcfd59ed3c9e02d9ace15b46f0840c7464c67ab2c736da516dbcfb6dbcefe3a
-EBUILD atk-2.36.0.ebuild 1125 BLAKE2B 433157526bfa3d261f89d612a62effbcd40ff38c5342827884777cceccf687ba6fb3611c6d42a0027944f523055d6b341d56d94430f033bc8cd2767a66d3d592 SHA512 08f9ba896ac7c57c14ed42416832ddaccc8d0580fc1da719f697f15b93757d3dedcfd59ed3c9e02d9ace15b46f0840c7464c67ab2c736da516dbcfb6dbcefe3a
+EBUILD atk-2.36.0.ebuild 1126 BLAKE2B e5ab4a729004e3c017d84796dc76efe1ee5e6129b57e7c3b5ccadfce043e91b3775f53ba2ad02286d543da2fe742be1130a074b7afbaa96e27b4bb066a65eb51 SHA512 11f6106f7abc65e9e37a6a6a2807b05a0b1bfce50ba0c3b3a63be4937fea21cf44a7f83861fcb6ca0f5d775df7f23dea1e3f20ab509dc8e490be355142888c29
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
deleted file mode 100644
index 85ea16e0c695..000000000000
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson multilib-minimal xdg
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-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 ~x86-winnt"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index 85ea16e0c695..9f1c1f60cd2f 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/aws-c-cal/Manifest b/dev-libs/aws-c-cal/Manifest
index a33b9f41302f..53dd178d331d 100644
--- a/dev-libs/aws-c-cal/Manifest
+++ b/dev-libs/aws-c-cal/Manifest
@@ -1,4 +1,5 @@
+AUX aws-c-cal-0.4.5-add_libz_for_static.patch 362 BLAKE2B 29ad22a54ac0e3749ea3cadb3403d1d807a99539cf5a51b7f3d983c5a63e0a0ea29f563408a845a8723a1cf6547d00447a13a838bcbde1145f678cf37a9ea7e8 SHA512 626044d01a78e5ed0dbd1bc850408b6ef9a01c5ba86e1451e73cfcb2d9510e938fb120dd4bc711ee4883ca523134fc0bb32d443d03f1429427364c14952cc353
 AUX aws-c-cal-0.4.5-cmake-prefix.patch 535 BLAKE2B cc5a1e62b082eb7ab377e0cd5c5ff8b4a5d03e6346b1f3dbd7cddbc012a979f9d1f122e7b1d4bd6ef0c488f1f574881544cce1e1aba7104773791807ffc8a21c SHA512 439fb27f0332cd87cb93c7b2cefa2f1c15476b70e75142fcf5873f9791193d2ff193b8e74a9d5bcbf98aef36654541951830cc2a595b092fdf54a14c1abe7143
 DIST aws-c-cal-0.4.5.tar.gz 51956 BLAKE2B 8e758cf4ba362efb3721c4b25f8264e3859eb0882d5bd1dc65a1ad7fa6ac5deb80872b214f39f389ad2c4cae620cb3d6535f39e8e6cbd63bceeb6b1ad7fd5bd1 SHA512 b6feb72e607bf9bbd927dda21a6d7e7f99771c5078fad778aa2d858aa86b251726a3797b61ad2d927a5293dad10b8ec97192ed60db652ebf8c664923c2484b6f
-EBUILD aws-c-cal-0.4.5.ebuild 781 BLAKE2B 3a8f2c2a36f1a9cd074b2b28d7379d7c1035b6b58e04ab589180cb728249f1d42f0f1f250d42d6c230664c2dfccb214c9135334b4ec74efa906e8224e990dffa SHA512 158b882bb67fe50fcc40dfde7f95d41379b8df5125b847e1da8d0e1540c9a5dcc001eb854175a2dc85a37d1d01936ff4c0fcb934c8d4386140ff7e992a914962
+EBUILD aws-c-cal-0.4.5.ebuild 797 BLAKE2B b883272a723c2b89e67aa427f0b83399a5264cb2fbf78b2a4bc9060db12e6d79b9099df29da1a9ab1151cf1d1f5a212a607365949cb217ee731e523c55999c95 SHA512 823044acb911797e835cc891e7a99def5686ef19194fb69a80253ab4114406c32af6915bba0365e8e807c668f4879ac75d31c460ffba4309ac032389146944c3
 MISC metadata.xml 395 BLAKE2B 37b634fd59971e5e551280f9fca50f9b5a38b87f4fb0f1460ff3dd68ca858d80d5033630d1826cdf6f2dd7eac03422d81cca0abc58b057b2cfa1bf3d1437979a SHA512 498484f9a669cd21f6ae7e97b677618c745beed5ae28c78547a2c402869c444b2eba458c6516bca0fd06dee28eea39fb34a5c3a655b9fccc055a8bad078dd7cd
diff --git a/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
index 407a8f3334d2..7dd18890b23a 100644
--- a/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
+++ b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.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
@@ -16,19 +16,14 @@ IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	|| (
-		>dev-util/cmake-3.19.1
-		<dev-util/cmake-3.19.0
-	)
-"
-
 DEPEND="
 	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+	>=dev-libs/openssl-1.1.1:=[static-libs=]
 "
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake-prefix.patch
+	"${FILESDIR}"/${P}-add_libz_for_static.patch
 )
 
 src_configure() {
diff --git a/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-add_libz_for_static.patch b/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-add_libz_for_static.patch
new file mode 100644
index 000000000000..d5a8aec12451
--- /dev/null
+++ b/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-add_libz_for_static.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt	2021-03-26 08:23:16.460538851 +0100
++++ b/CMakeLists.txt	2021-03-26 08:25:31.408531072 +0100
+@@ -81,6 +81,9 @@
+         find_package(LibCrypto REQUIRED)
+         set(PLATFORM_LIBS LibCrypto::Crypto dl)
+     endif()
++    if (NOT BUILD_SHARED_LIBS)
++        set(PLATFORM_LIBS ${PLATFORM_LIBS} z)
++    endif()
+ endif()
+ 
+ file(GLOB CAL_HEADERS
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index c27ac8d3f6e1..3e3c823dc0a2 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,4 +1,7 @@
 AUX aws-c-common-0.4.57-remove-Werror-CFLAG.patch 424 BLAKE2B 211f9b23c979b6c6d867d66a8a6c5ab023229f4fd90affd147c319ba5baeb5cf90cb1aeb8c42066b5de698ed5fa6a7513645e24b61ead58e5c6dda8b45f3c8ce SHA512 39264f91b5ce4ac506d771a97b7403503009f5d6616d8e0ad440574cffa1c18e1f6970fee75f712ec2e514d54885d37e9f157ac1160575af0883a6e56ad0b0c5
+AUX aws-c-common-0.5.2-remove-Werror-CFLAG.patch 472 BLAKE2B 0d5dfecf80c0d41050cacbc01eb7c30d9a0eed1172b9012b97150fdc64bfb34f4f806845cfabfdcf6ad2f6597023911ab912fd72bb7b9d9587e37a358c0002b1 SHA512 3cd6fbcf2eae4246b404c51d03b4802c6ddb5a0681988d79bf91e80c516388b445295ace182a60c3e29b81670eb920f5b7da6f9dcd6d9ed3c46e9a862105ab17
 DIST aws-c-common-0.4.62.tar.gz 411263 BLAKE2B b9eb8eab8fceb949adcb96bc98987c318dcc70dae2cb8ecdcdf36c306be97158a64208c4bcc2452c83f03708cd7fb5401639558bc9bea946234f4b6b4c8eaec1 SHA512 7f31d739a3376404016bd509b40656d7620bddfb77a7f988306f2dcb2b03a03387855d845c2b9f63194d0bf2182a8d96392dba6c2bf847eaeb008115561d73ba
+DIST aws-c-common-0.5.2.tar.gz 422185 BLAKE2B e2058d523f9739b2d28db6ff26e00326977853a1ccc2468c36ba021619b0e9223e8a5584c06a29b511607741d208ac803023c1e6c17df10cd46227274d885978 SHA512 3e3b639f0387ba0e4ea62a35e57b7f0697a5f829bbffe6758d2e43db45543528615298281b045275c582a8cce9f0f6a36a06b231460ce4e2cc42ac01d7a0e952
 EBUILD aws-c-common-0.4.62.ebuild 693 BLAKE2B f9c6aa405d361433a0d0595d619685e3000e67c9331b9e25c515f9f6ce5d818574f30c67d7dea9f21dfa44de6b73a81634a955d75efa6c19014764df26a4ced6 SHA512 94b7bd1ef8907bb4e39a0632c7db42a1df0e8dfcfd4c96467ce919d7a40049a63be4b413f3ab3e5e387136ea5c0177b08023d7e7d1db4a52f6c7fc6fde5c9f6c
+EBUILD aws-c-common-0.5.2.ebuild 613 BLAKE2B 28870a4c73c3b3d6f14fd08400dd459cc0bce12531da82d1226a4054e18ee21dfcbd3bbba2deb3fa7aa70658f0cc2dd007d0004ef07114f851162f67231d40d6 SHA512 642112664c88452cff2c9da6c650a2911cce2f7b1188ea03c2b9d46b48c75dc8624b166e6f85cc375824ce1be7d514d76d0e562438622c370826803e81026fb4
 MISC metadata.xml 562 BLAKE2B 139d3dcb4f55353f8eead871c99eb19af005cf23c8dad97b98d8fffe91cc540f9dde9401c1c1d924aba94caf20199804acf5d28d1fae4acfc145d722683d0c18 SHA512 5eb8b9e0f93b699a263b392b0959644874b886e960b23cf677cf4df208a2b650c630fbbeefb537099f050bf0dca73a5846b90a36be2a1ee4c450f03e4a236631
diff --git a/dev-libs/aws-c-common/aws-c-common-0.5.2.ebuild b/dev-libs/aws-c-common/aws-c-common-0.5.2.ebuild
new file mode 100644
index 000000000000..1427f5278f1e
--- /dev/null
+++ b/dev-libs/aws-c-common/aws-c-common-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Core c99 package for AWS SDK for C"
+HOMEPAGE="https://github.com/awslabs/aws-c-common"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-Werror-CFLAG.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-common/files/aws-c-common-0.5.2-remove-Werror-CFLAG.patch b/dev-libs/aws-c-common/files/aws-c-common-0.5.2-remove-Werror-CFLAG.patch
new file mode 100644
index 000000000000..888205f88d61
--- /dev/null
+++ b/dev-libs/aws-c-common/files/aws-c-common-0.5.2-remove-Werror-CFLAG.patch
@@ -0,0 +1,11 @@
+--- a/cmake/AwsCFlags.cmake	2021-03-11 07:42:36.325962577 +0100
++++ b/cmake/AwsCFlags.cmake	2021-03-11 07:42:46.174962928 +0100
+@@ -53,7 +53,7 @@
+         list(APPEND AWS_C_FLAGS "${_FLAGS}")
+ 
+     else()
+-        list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes -fno-omit-frame-pointer)
++        list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes -fno-omit-frame-pointer)
+ 
+         if(NOT SET_PROPERTIES_NO_WEXTRA)
+             list(APPEND AWS_C_FLAGS -Wextra)
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 7bfce63b3ae6..497fdf3500d2 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,6 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
 DIST aws-c-event-stream-0.2.5.tar.gz 61949 BLAKE2B baebd87a916fb8440db56afa2b97bd02229d70e00b55c40a17a2f467ad683422a6c6747aa698adce5272a03ced3fe6957d8cc62040d8080d3ed95409d8182851 SHA512 1421d608d8a5cfa5ec5df3bd905aab9ce9abc913461569a99b895c8415e50305aca0be3595bd4f3ed74cb52cc0e342354d211531066fdde60e14dd60e5629239
+DIST aws-c-event-stream-0.2.7.tar.gz 63942 BLAKE2B 751199efa1889861b647ca2f59f4a323961aedb9184d8c1293ff8a32096bb6e22de43eb2afbe9eb433f43e07ef8be251c815cfd897eb81cf2041e5f7be230ead SHA512 3ecc9fd80cd37d87df34948a7d7ca344a7b5ff2298e5ecc568d945830f8f8cd88721e0d2c4d11dee06af87e14b9ff13c8f13b8abfee74826ae72c8a280109440
 EBUILD aws-c-event-stream-0.2.5-r1.ebuild 1174 BLAKE2B d1813d2370c9599f5993a8a58620c8ff54f8c2eb8002071cbef77f089a845bb480348ff93e6e6e7feff790e78c795df320afae69c2f691788599f3d7ec5186f1 SHA512 f85b498448cb87d87bb4898f3c3218fd2d40a8ad46d21e80600c1c09319dda0c4944a84f0f18942297d3dfdac0b2da9d1d1965b89aec2c510d0e9f2466d2ca1d
+EBUILD aws-c-event-stream-0.2.7.ebuild 1101 BLAKE2B d3664088da4f06b2a33063618b8103fbc05634e8473c206aa3f5d84a6cd60bf4980b308a13731154f028a9a717112508a497472952c0767a9cc8ea5154dcb588 SHA512 6da822f7e508cb1bc0530079ed24fbe53020831c4212d5d96da4e08f07f64e923b208bbc999a195759d003e1304a3790c2bdc52d02a39c08dce78e467d69ef00
 MISC metadata.xml 395 BLAKE2B 37b634fd59971e5e551280f9fca50f9b5a38b87f4fb0f1460ff3dd68ca858d80d5033630d1826cdf6f2dd7eac03422d81cca0abc58b057b2cfa1bf3d1437979a SHA512 498484f9a669cd21f6ae7e97b677618c745beed5ae28c78547a2c402869c444b2eba458c6516bca0fd06dee28eea39fb34a5c3a655b9fccc055a8bad078dd7cd
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.7.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.7.ebuild
new file mode 100644
index 000000000000..557f3a34b074
--- /dev/null
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C99 implementation of the vnd.amazon.eventstream content-type"
+HOMEPAGE="https://github.com/awslabs/aws-c-event-stream"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
+	>=dev-libs/aws-c-io-0.9.2:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.1.3-add_missing_cmake_install_prefix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use test; then
+		# (#760585) Due to network sandboxing of portage, internet connectivity
+		# tests will always fail. If you need a USE flag, because you want/need
+		# to perform these tests manually, please open a bug report for it.
+		mycmakeargs+=(
+			-DENABLE_NET_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-io/Manifest b/dev-libs/aws-c-io/Manifest
index 3eb778d383b0..c4e3c3897760 100644
--- a/dev-libs/aws-c-io/Manifest
+++ b/dev-libs/aws-c-io/Manifest
@@ -1,4 +1,6 @@
 AUX aws-c-io-0.7.0-cmake-prefix.patch 536 BLAKE2B 7e4220bfea17be839ea3e9c1ea16ed2e375d8fb2d4e5eb1dbd551fd395332e0ba8865b02fdb10c542b5b54ce2e3a4c488bb2792fa1ec52f53d541db84ca985e1 SHA512 786c8fa9eb8233d39aec9f4335b55eb80ad0ccd6ea52e762b8ab4a5740f1fe2d13b3bafcbb17da6f876896c6d65da4c2153e9247e00b7b9797ef49bd54fc31ca
 DIST aws-c-io-0.7.0.tar.gz 561762 BLAKE2B ffe8ac5de9fd5f57e7bc18e1d956f28567413d34ec23a7d0869065718039b1ab56aeae82fd8e24bf77f7393df2c1140308195cd8a4c6ff06cbc7843ae62d76c8 SHA512 b858a5a14cfea86c39f96963c4238ca0f90339befcbd6480e6353719d9846079764f8b42fbdc0cec2f99223bfe1c07fa2a014543fa3fe8a6357440e3cd1007f5
+DIST aws-c-io-0.9.2.tar.gz 586055 BLAKE2B 88c1ac516e29af88062f01f5e2e4718964b25d651922b4b54d82b5cef2a7fd997ee31c7b435933fe284b6ed1f80a310fc75d684c3d7969dba1d2fae4902a157c SHA512 09480b2a06ddd8078234c1058223bc04001d3c54d30bb62a150ab4a2776c7a0c805662560d3b086dad047f22a22e97706be44ac8c5b88e2f9d4bb366c68b9fcb
 EBUILD aws-c-io-0.7.0-r1.ebuild 1145 BLAKE2B 3b0338cfeac8a556888a98841a5fdce1a2e827661ae2f0d44a5a94dbee971482ad7a9f56616c842a4aebab7e7e5f27bd86c37378d0eea8e617c91aa679fac07b SHA512 b87cb9b99b63eed7e401057764a54bdb63dab7cf9cc4adcae2094ff2a75333e38ac58d883c14ca66982887aa61e7328c5d49a9291a168f827ef0a697e625b8eb
+EBUILD aws-c-io-0.9.2.ebuild 1079 BLAKE2B d8203d2a699f0205296a549466c52faa136c88646598a45983b7335d8dbf760f35eab39b47abb20e97dd964f08cf68e53bddb0c81b48feceb7a0d4af101aeaa1 SHA512 f596fc38ee499c646a551805adf1fe9145aca75c52111aa2db77c1c0a5867ea6c59b0df9c65a2f197234a5d9dd1eaffd7ea0ab9b21ba46536b0a2f2af4dcc0aa
 MISC metadata.xml 1080 BLAKE2B a5e977045a08c0df3193f640c81b99a8267ac47473abe83260b847f440e9aa53cea83970776dd8f1662baabc8dd9d660ba4ec6b598484ddda44c7b278baa3972 SHA512 9402db0d4165dc3a2414574a9097c95e4618da2508b1b4e4d5189dc3e031986a435e2ab0e43f70ead54a2c678f8a8439827c0e5582d47058dbaf4ca0477a9f51
diff --git a/dev-libs/aws-c-io/aws-c-io-0.9.2.ebuild b/dev-libs/aws-c-io/aws-c-io-0.9.2.ebuild
new file mode 100644
index 000000000000..c36b3f45da8b
--- /dev/null
+++ b/dev-libs/aws-c-io/aws-c-io-0.9.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="AWS SDK for C module, handles IO and TLS work for application protocols"
+HOMEPAGE="https://github.com/awslabs/aws-c-io"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/aws-c-cal-0.4.5:=[static-libs=]
+	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
+	>=dev-libs/s2n-0.10.21:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-cmake-prefix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use test; then
+		# (#759802) Due to network sandboxing of portage, internet connectivity
+		# tests will always fail. If you need a USE flag, because you want/need
+		# to perform these tests manually, please open a bug report for it.
+		mycmakeargs+=(
+			-DENABLE_NET_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 2c81f51e05c3..260cf264a887 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,4 +1,5 @@
 AUX aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch 1782 BLAKE2B c5434d3cc5ca2329ec67fd403741a2fcfdeee27b1c0450e077b1cb8a4c924b867f155034fd5581d7c1147ddbc3922e6b26686c167649b939d0b3938b93d351ae SHA512 69d99680e1a7a1c43a9e4fd04884a8d11542c931a95896faf59a35df1e669bfb3dcf8b8217dc263567d1b1036ffdacaa889982306bc1a404fe93722a110f948d
+AUX aws-sdk-cpp-1.8.160-disable_http_testing.patch 692 BLAKE2B a4c8af84357958b34f0f597e005d2906c62cfbdccf818275ee95e09140c6d79d720000737cd900a5ba81058f2ef0ceb45c091e3e6e76c385fb5757a75c5985bb SHA512 8e2604a83de3eb083da49ada6d692d8debf5288dd9b7846578d26158cc0ca1699329d3aac9fed73ef1e4a0d3caab264324acb26e7219948856ae40be7d4e8065
 AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
 AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
 AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
@@ -15,5 +16,7 @@ AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae
 AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
 AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
 DIST aws-sdk-cpp-1.8.105.tar.gz 31880249 BLAKE2B 1a2eb972b716c656f45b8d1d12fc3e7280c171e4a19eb5431e320511365d305211e8567aa7fcc3e21f553ad5befda91829df6ccf60c23296d210d0c7347bb2a2 SHA512 a76da095718c8569c62597431d29a0a54c1a7f81c1825894f0f40b1a971a3e0b4f0813da4ac929612b9bb5f92501ee6a034436faa6eef678d936117765baab7e
+DIST aws-sdk-cpp-1.8.160.tar.gz 33282825 BLAKE2B 3c48edb5578d4450feeab94f9c44ec8222e2e7785d8f69d468b97cddc9bb503bb1648facdce85c2c90a73141c60a22aa6d1e29aeb4b8a904f8e926055f48124e SHA512 b71bed89d27361bf735907ad86908a3dcb952ff6ba9d6c2c04dd2ff6afded777b12ad2da79ba97744ef9ade6fa21a5ff4451f5b664bbab8bae4864fa4e0db073
 EBUILD aws-sdk-cpp-1.8.105.ebuild 9102 BLAKE2B 99c9f1bbe0a8f7e080d3f1773d73d60a2561379bf532018a7c05584bf8d8f6abcf4627cfecdf242b4672e03cdefce7a5adb93c6095c1836c2937d56525ab166d SHA512 3c87ee547f1d4de9ed5e388a2e22db69bc2abed07951867f6d6cae160fe166bcbbcd56e239caf9832f920ca71269741cfcc9fec61fc9d3e56ce49e6dc88dfea7
-MISC metadata.xml 25252 BLAKE2B 34a5f5c3272d0600cf2691c550df70872ec1b1ba2f2eb29a6956fa6f20e5b801992012f713be262abb86d3b56427a2644e1bb924358e91145a074f2198525e1c SHA512 6218e390850f5751638951eb00cb108709ae055b7e42bec42ccee3dc1ed6ce4042a7c9d968d3e445e232407fc278be1499f81c2dc37efaca5ad1e7d928e023e6
+EBUILD aws-sdk-cpp-1.8.160.ebuild 9570 BLAKE2B 3dabab040f6b10ffb5a65b8d957aee74093f8300beea27f51ca200d84709414a441e6f115a48e2d6b636c70afeea866e3061146ee474deda6bca7d9cf38c0cd5 SHA512 c8e8e67a6eb11f2d62bd00b065813d83e5a6cfc78386335bb8030bc520a3bc263e1bf2e1131853cc995bbcfc5c7e1a53dc8812be4ffdc6ebf6c9656a3594b4a4
+MISC metadata.xml 25687 BLAKE2B 3ac65135a5b29c6331a443ab72b6a90af13bca4a8e7f73d4e7643381ecfdd209eebe30088ce89d5394ae80bc0782a37e8ba058694b8238343a787014d2e8f093 SHA512 e06c92856f134dc4b610a3aefc38f2c17ae6159b30efef70f0bdaae83ca79bef58876885bf62e38aaeee676c865a38c0f858cb4e9cd81c449c004f44db4b8f95
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
new file mode 100644
index 000000000000..4f2cb238a8cb
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="AWS SDK for C++"
+HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
+SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES=(
+	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
+	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs
+	eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events
+	forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail
+	lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks
+	organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3
+	sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe
+	translate waf wellarchitected
+)
+
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	http? ( net-misc/curl:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
+	>=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+	"${FILESDIR}"/${PN}-1.8.105-remove_Werror_from_FLAGS.patch
+	"${FILESDIR}"/${P}-disable_http_testing.patch
+)
+
+src_configure() {
+	local mybuildtargets="core"
+
+	for module in ${MODULES[@]}; do
+		if use ${module}; then
+			if [ "${module}" = "access-management" ] ; then
+				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
+				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-admin;sso-oidc;sts"
+			elif [ "${module}" = "apigateway" ] ; then
+				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
+			elif [ "${module}" = "budgets" ] ; then
+				mybuildtargets+=";${module};ce;cur"
+			elif [ "${module}" = "cloud-desktop" ] ; then
+				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
+			elif [ "${module}" = "cloud-dev" ] ; then
+				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
+				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
+				mybuildtargets+=";codestar-notifications;honeycode;xray"
+				if ! use "queues"; then
+					mybuildtargets+=";queues"
+				fi
+			elif [ "${module}" = "cloud-media" ] ; then
+				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
+				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
+			elif [ "${module}" = "cloud-mobile" ] ; then
+				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
+				mybuildtargets+=";pinpoint-email;sms-voice"
+				if ! use "sns"; then
+					mybuildtargets+=";sns"
+				fi
+			elif [ "${module}" = "cloudhsm" ] ; then
+				mybuildtargets+=";${module};cloudhsmv2"
+			elif [ "${module}" = "cloudsearch" ] ; then
+				mybuildtargets+=";${module};cloudsearchdomain"
+			elif [ "${module}" = "cloudwatch" ] ; then
+				mybuildtargets+=";application-insights;appmesh;auditmanager;cloudtrail;compute-optimizer"
+				mybuildtargets+=";detective;devops-guru;guardduty;health;inspector;logs;monitoring;synthetics"
+			elif [ "${module}" = "cognito" ] ; then
+				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
+			elif [ "${module}" = "dynamodb" ] ; then
+				mybuildtargets+=";${module};dax;dynamodbstreams"
+			elif [ "${module}" = "ec2" ] ; then
+				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
+				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
+			elif [ "${module}" = "ecr" ] ; then
+				mybuildtargets+=";${module};ecr-public"
+			elif [ "${module}" = "eks" ] ; then
+				mybuildtargets+=";${module};emr-containers"
+			elif [ "${module}" = "elasticloadbalancing" ] ; then
+				mybuildtargets+=";${module};elasticloadbalancingv2"
+			elif [ "${module}" = "email" ] ; then
+				mybuildtargets+=";${module};sesv2"
+			elif [ "${module}" = "events" ] ; then
+				mybuildtargets+=";${module};eventbridge"
+			elif [ "${module}" = "forecast" ] ; then
+				mybuildtargets+=";${module};forecastquery"
+			elif [ "${module}" = "iot" ] ; then
+				mybuildtargets+=";${module};greengrass;greengrassv2;iot1click-devices;iot1click-projects;iotanalytics"
+				mybuildtargets+=";iot-data;iotdeviceadvisor;iotevents;iotfleethub;iotevents-data;iot-jobs-data"
+				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph;iotwireless"
+			elif [ "${module}" = "kinesis" ] ; then
+				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
+				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
+				mybuildtargets+=";kinesis-video-signaling"
+			elif [ "${module}" = "lex" ] ; then
+				mybuildtargets+=";${module};lex-models;lexv2-models;lexv2-runtime"
+			elif [ "${module}" = "macie" ] ; then
+				mybuildtargets+=";${module};macie2"
+			elif [ "${module}" = "marketplace" ] ; then
+				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
+				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
+				mybuildtargets+=";servicecatalog-appregistry"
+			elif [ "${module}" = "opsworks" ] ; then
+				mybuildtargets+=";${module};opsworkscm"
+			elif [ "${module}" = "other" ] ; then
+				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;appintegrations;braket;clouddirectory"
+				mybuildtargets+=";comprehend;comprehendmedical;connect;connect-contact-lens"
+				mybuildtargets+=";connectparticipant;customer-profiles;datapipeline;databrew;datasync"
+				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
+				mybuildtargets+=";groundstation;healthlake;importexport;kafka;lakeformation"
+				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
+				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
+				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
+			elif [ "${module}" = "outposts" ] ; then
+				mybuildtargets+=";${module};s3outposts"
+			elif [ "${module}" = "personalize" ] ; then
+				mybuildtargets+=";${module};personalize-events;personalize-runtime"
+			elif [ "${module}" = "polly" ] ; then
+				mybuildtargets+=";${module};text-to-speech"
+			elif [ "${module}" = "qldb" ] ; then
+				mybuildtargets+=";${module};qldb-session"
+			elif [ "${module}" = "rds" ] ; then
+				mybuildtargets+=";${module};pi;rds-data"
+			elif [ "${module}" = "resource-groups" ] ; then
+				mybuildtargets+=";${module};resourcegroupstaggingapi"
+			elif [ "${module}" = "route53" ] ; then
+				mybuildtargets+=";${module};route53domains;route53resolver"
+			elif [ "${module}" = "s3" ] ; then
+				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
+			elif [ "${module}" = "sagemaker" ] ; then
+				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-edge"
+				mybuildtargets+=";sagemaker-featurestore-runtime;sagemaker-runtime"
+			elif [ "${module}" = "timestream" ] ; then
+				mybuildtargets+=";timestream-query;timestream-write"
+			elif [ "${module}" = "transcribe" ] ; then
+				mybuildtargets+=";${module};transcribestreaming"
+			elif [ "${module}" = "waf" ] ; then
+				mybuildtargets+=";${module};fms;network-firewall;waf-regional;wafv2"
+			else
+				mybuildtargets+=";${module}"
+			fi
+		fi
+	done
+
+	local mycmakeargs=(
+		-DAUTORUN_UNIT_TESTS=$(usex test)
+		-DBUILD_DEPS=NO
+		-DBUILD_ONLY="${mybuildtargets}"
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DCPP_STANDARD=17
+		-DENABLE_RTTI=$(usex rtti)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UNITY_BUILD=$(usex unity-build)
+		-DNO_ENCRYPTION=$(usex !ssl)
+		-DNO_HTTP_CLIENT=$(usex !http)
+	)
+
+	if use test; then
+		# (#759802) Due to network sandboxing of portage, internet connectivity
+		# tests will always fail. If you need a USE flag, because you want/need
+		# to perform these tests manually, please open a bug report for it.
+		mycmakeargs+=(
+			-DENABLE_HTTP_CLIENT_TESTING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
new file mode 100644
index 000000000000..8bf926148e52
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
@@ -0,0 +1,17 @@
+--- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:01.193340560 +0100
++++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:42.684342951 +0100
+@@ -18,7 +18,7 @@
+ using namespace Aws::Utils;
+ using namespace Aws::Client;
+ 
+-#ifndef NO_HTTP_CLIENT
++#if !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
+ static void makeRandomHttpRequest(std::shared_ptr<HttpClient> httpClient)
+ {
+     auto request = CreateHttpRequest(Aws::String("http://some.unknown1234xxx.test.aws"),
+@@ -319,4 +319,4 @@
+ }
+ #endif // ENABLE_CURL_CLIENT
+ #endif // ENABLE_HTTP_CLIENT_TESTING
+-#endif // NO_HTTP_CLIENT
++#endif // !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 08001e16fd87..f8f498c7fc37 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -22,7 +22,7 @@
 		via GitHub Issues.
 	</longdescription>
 	<use>
-		<flag name="http">Enable http support via curl</flag>
+		<flag name="http">Enable http support via net-misc/curl</flag>
 		<flag name="rtti">Flag to enable/disable rtti within the library</flag>
 		<flag name="unity-build">
 			Build using a single unified .cpp file for each service library.
@@ -266,7 +266,7 @@
 				(such as sensors, actuators, embedded devices, or smart appliances) and the AWS Cloud
 				over MQTT and HTTP.
 			greengrass    : Extends AWS onto physical devices so they can act locally on the data they
-				generate.
+				generate. Installed are both Version 1 and Version 2.
 			iot1click     : A service for simple devices to trigger AWS Lambda functions that execute a
 				specific action.
 			iotanalytics  : Provides advanced data analysis for AWS IoT.
@@ -276,8 +276,8 @@
 			iotthingsgraph: Integrated set of tools that enable developers to build IoT applications using
 				devices and services that use different data representation standards and communication
 				protocols.
-			Also enables iot1click-devices, iot1click-projects, iot-data, iotevents-data, iot-jobs-data and
-			iotsecuretunneling.
+			Also enables iot1click-devices, iot1click-projects, iotdeviceadvisor, iot-data, iotevents-data, iotfleethub,
+			iot-jobs-data, iotsecuretunneling and iotwireless.
 		</flag>
 		<flag name="kendra">
 			Amazon Kendra is a search service, powered by machine learning, that enables users to search
@@ -301,7 +301,7 @@
 		</flag>
 		<flag name="lex">
 			Amazon Lex is an AWS service for building conversational interfaces into applications using
-			voice and text.
+			voice and text. Installed are both Version1 and Version 2.
 			Also enables lex-models.
 		</flag>
 		<flag name="lambda">AWS Lambda: Run code without provisioning or managing servers.</flag>
@@ -362,7 +362,7 @@
 			you would like to have any of the following modules to have their own USE flag, please open a
 			bug report and it will most probably get one.
 			The modules are:
-			AWSMigrationHub, alexaforbusiness, appflow, braket, clouddirectory, comprehend,
+			AWSMigrationHub, alexaforbusiness, appflow, appintegrations, braket, clouddirectory, comprehend,
 			comprehendmedical, connect, connect-contact-lens, customer-profiles, datapipeline, databrew,
 			datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue, groundstation,
 			healthlake, importexport, kafka, lakeformation, migrationhub-config, mq, mturk-requester,
@@ -470,5 +470,10 @@
 			the requests.
 			Also enables fms, network-firewall, waf-regional and wafv2
 		</flag>
+		<flag name="wellarchitected">
+			Use the AWS Well-Architected Tool to review your workloads against current AWS architectural best practices.
+			The AWS Well-Architected Tool measures the workload and provides recommendations on how to improve your
+			architecture.
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/bareos-fastlzlib/Manifest b/dev-libs/bareos-fastlzlib/Manifest
index f2e564b17588..098f37698b6f 100644
--- a/dev-libs/bareos-fastlzlib/Manifest
+++ b/dev-libs/bareos-fastlzlib/Manifest
@@ -1,5 +1,5 @@
 DIST bareos-fastlzlib-0_pre20140912.zip 379089 BLAKE2B 6a6aa9bfbf54492c6f54f06512ed4c503656d5115ad37cad72fe85e75099093f0093fd20c42d340293ebdb11d59a8fdd38944ba65846af5f6bcaab73783c4d34 SHA512 94b9bd1c599b65d2dc074beb77fb8fe4139647bb047bcfd52b36126dd95ddb3e3e88cdb10464631594ebaff18405446a566fed4eb83ba08e71894de5a47d019f
 DIST bareos-fastlzlib-0_pre20150524.zip 379650 BLAKE2B 0ef9cc815da6926ff2922cd61a0670f3f55ab2094e2986bfe8ae4b6847eae72ba0ccd27821fbf7b1d09eebf405cd5fcd759d074d890b11e62b23d22a45361758 SHA512 cf4b657ce27fad7bf8e0ed5183507f544783f4cf9d72a50754ecdce9784095ec110b51cc22c164610dc037f23a30f945a9c69e38c6cc8e55cf7691ac2b473bc8
-EBUILD bareos-fastlzlib-0_pre20140912.ebuild 615 BLAKE2B 3c889b08735acf86c45ecce4012995359c20b9a00d1a571266d01241f316cf129f77c21c72576682dc6c9677ec40add211c7ba4adc29d11b1868d4ca2a850b7a SHA512 51c5e2109974113773650383ecbd6d1b659573c5459c15205d883f23ccbdf60a2a9db25cc8b40fcce0449d3635732e282b6ee4f477c1cd45beec7914fc6a53c8
-EBUILD bareos-fastlzlib-0_pre20150524.ebuild 665 BLAKE2B 7d7144fcf9b0b3fff03624a17138b82e1d63d65f43687f12510d70278fe8ab9428a9a1bb002e3ae93f7d0c31072cf8a48ba38e98fbaf023648395aff5c739a80 SHA512 8903bb08b48fd24acf1a8369e14cf2aaed19b1867cc89eb93a4f417d34c1ff8e6ae5b6eb0bd08f3395c02b7a4b0679e3a39119eddc88374a9daf1161a6828ecf
+EBUILD bareos-fastlzlib-0_pre20140912.ebuild 596 BLAKE2B b23cd28cfba5c4d105e8e77b48c8bcbd1e6d428e9b64bcfd9dc99f1561246b41ab5c68f81db14a18d4d3736757cdd161380837f242aef73e999f0ff4c5d52bac SHA512 71856c25e927277af54f4c9a002ff9336d1894284da07b4ff62d5d9c8350a5ca39c60397d070bc81bf09db202994effc92b1a73698a572a2ff8a1f1cd95a1d9c
+EBUILD bareos-fastlzlib-0_pre20150524.ebuild 649 BLAKE2B c44e213e5fd1e26a7f13c1c43ff37cb69e2dceb0e500ba3a1a8235eacb460ddc44291db2d17628e73ed046defca9356e5f19a8b25865cab95f770c64a63761cc SHA512 12e6ac37ac95e238e1e0c988ca3c335f5371e291ac4dd9999b0cd8f458d8028a03516d16efc591f23ae50c7fe602a0ee3341f1e19cba5cd7d2f9b7a2d405f36f
 MISC metadata.xml 341 BLAKE2B 90fd686e41c5147f54e18ac1764f58f1c3ca5b23d30ef8b91d074a6585e48db99cc1b1b8c14514616c5fb9d1cf2e27fc1a06784544bbd0e5440381a325caf392 SHA512 42a17b883b1b739d4c8a916ca7fb1791467ae306a51b37d003b621b4d63bbf23e764c1b9e6628bfa32910e1bed2440e2f87e214bdde2db3a26a3d24f7b1cf1bc
diff --git a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20140912.ebuild b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20140912.ebuild
index b748fee355af..5711131706f2 100644
--- a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20140912.ebuild
+++ b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20140912.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
-
 DESCRIPTION="Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries"
 HOMEPAGE="https://github.com/bareos/fastlzlib"
 SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.zip"
diff --git a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
index e657d1537775..135154284534 100644
--- a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
+++ b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
-
 DESCRIPTION="Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries"
 HOMEPAGE="https://github.com/bareos/fastlzlib"
 SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.zip"
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 9c8b0e6cd93b..679a4c066ba1 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,3 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
-EBUILD boehm-gc-8.0.4.ebuild 1374 BLAKE2B b1cca8dd7948a1cc82e5c806a405ee6db176951be5cb1c18f2c831aa04356fe05d2b5e8ba604cf9756487dee5e3320faffc5e62d66b18eb43d250df0d1324047 SHA512 3616c2bd66cd7cde4c4b067b8d76503fe9256173a62a9a644348abe676202c02c0ca81ed2f73d826cd41c8482505c555ee00580326a24b9b0cf16660f53a2d2d
+EBUILD boehm-gc-8.0.4.ebuild 1375 BLAKE2B d13298d2d295a08eb8c81da159626f0bf76b6fcc3f179f3499e344ed0fbca55471f9cef0d16d473f62eab1f88654f82bb39ea688a77df171324aa1cb66d5ebcb SHA512 0f15858d9ac606d270862aaf321b9375ef725b789aa91b2ad6cd511e8ede91c3024581576bb345c75bd5a5c23a30c8602ee33b374e2b6bc6deee74aa0f862000
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index 0731963bc186..7211307e2d0b 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 1b07d9acd65d..7f6799872500 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -5,5 +5,7 @@ AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166a
 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
+DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-1.75.0.ebuild 11092 BLAKE2B 6ec533577d40edcdc62f2cd18a714366a2892a14c7bbcd183f99df1b346d222cd2034817da45d6c385fe60c92364c7765ae283f23401cf13ac037659070b96c0 SHA512 d4f0bfd53afd7077cc21248ce742005db00e2be99317dd4048496dd6d8e47575aeafad7fdc1db39c6f3d9baf859a6811a1d2ff1a76011f7855a100f39dbb2581
+EBUILD boost-1.76.0.ebuild 11072 BLAKE2B 863d64d1be7a6f81e8287f1f7b8545004f6d091ff8875dc72f0f891a17e9cb88da39c0684528a9ab7e8484cb5f8bf4ebf12757a23422a41a45c564b51cd950bd SHA512 f7784206f1620d169723f293ddc264010cdab1719f6d3f0c0904d7ec922e50248a587699f8d700d773733307ea6cec4ab52082e43f4f8c56c9f7e77c1fc890c0
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.76.0.ebuild b/dev-libs/boost/boost-1.76.0.ebuild
new file mode 100644
index 000000000000..8216723986fe
--- /dev/null
+++ b/dev-libs/boost/boost-1.76.0.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}"/usr/$(get_libdir) >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index a87f58fcccec..c3cfdb2d1c5f 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,6 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
+DIST Botan-2.18.0.tar.xz 5941536 BLAKE2B 2a4182bab5e681fdfeafa113462bf5a31057d7be97d71d0a6e60975b84432dd3932498f42f0b879e216727df4bbfcbf0d844e971df95eaf9cf922280f32858b4 SHA512 8613412e3e2fe8b787db7a4d4dbadf60b8fe6b68a84408c600c37cd0b5dbdf3f347a49f5bd88eb8d4f658e927a8b976884146551bf7d256fa80e9675297c0f09
+DIST Botan-2.18.0.tar.xz.asc 488 BLAKE2B b9a9c98e11eae227fb900cae2dca3aecc2114ecacd87336cf5cdbe6fbcb9676514f11e365e94dbfecf3b9edc1a9a3398ff2c66f34a77d7b4d6b0f87518af6d9a SHA512 f2e1689e10b0706eed5a3cf08dfcb163874d3ada12968ac739eeff259ae81b1329fafdae4d29290195276fe3bb1cdeaf3f302b8df53a377c5bbdb7964deaa044
 EBUILD botan-2.17.3.ebuild 3099 BLAKE2B 218965706fb7d39380d3268bd416c2a35cec007fe9e4e8102a009e020716c00f4e2a930e681095d2bce998d277db2c280f051693652f95115285628b8028a2ed SHA512 968d68556f6203cdbe818514469ba59b5001375efd844177c9f036cb954e2caa833d08f7c34efa3912599093af08ff7a38e631db8c3c85ca7e666ed177b02dec
+EBUILD botan-2.18.0.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.0.ebuild b/dev-libs/botan/botan-2.18.0.ebuild
new file mode 100644
index 000000000000..4d9fc251745d
--- /dev/null
+++ b/dev-libs/botan/botan-2.18.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
+inherit python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
+
+CPU_USE=(
+	cpu_flags_arm_{aes,neon}
+	cpu_flags_ppc_altivec
+	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( dev-libs/openssl:0=[bindist=] )
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+	verify-sig? ( app-crypt/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=(
+		$(usex boost '' 'boost')
+		$(usex bindist 'ecdsa' '')
+	)
+
+	if [[ -z "${DISABLE_MODULES}" ]] ; then
+		elog "Disabling module(s): ${disable_modules[@]}"
+	fi
+
+	local chostarch="${CHOST%%-*}"
+
+	# Arch specific wrangling
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)
+			myos=darwin
+		;;
+
+		*)
+			myos=linux
+
+			if [[ ${CHOST} == *hppa* ]] ; then
+				chostarch=parisc
+			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+				chostarch="sparc32-v9"
+			fi
+		;;
+
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	local myargs=(
+		# Intrinsics
+		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+		$(usex cpu_flags_arm_aes '' '--disable-armv8crypto')
+		$(usex cpu_flags_arm_neon '' '--disable-neon')
+		$(usex cpu_flags_ppc_altivec '' '--disable-altivec')
+		$(usex cpu_flags_x86_aes '' '--disable-aes-ni')
+		$(usex cpu_flags_x86_avx2 '' '--disable-avx2')
+		$(usex cpu_flags_x86_popcnt '' '--disable-bmi2')
+		$(usex cpu_flags_x86_rdrand '' '--disable-rdrand')
+		$(usex cpu_flags_x86_sse2 '' '--disable-sse2')
+		$(usex cpu_flags_x86_ssse3 '' '--disable-ssse3')
+		$(usex cpu_flags_x86_sse4_1 '' '--disable-sse4.1')
+		$(usex cpu_flags_x86_sse4_2 '' '--disable-sse4.2')
+
+		$(usex hppa --without-stack-protector '')
+
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_enable static-libs static-library)
+		$(use_with ssl openssl)
+		$(use_with sqlite sqlite3)
+		$(use_with zlib)
+
+		--cpu=${chostarch}
+		--docdir=share/doc
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--distribution-info="Gentoo ${PVR}"
+		--libdir=$(get_libdir)
+
+		# Don't install Python bindings automatically
+		# (do it manually later in the right place)
+		# https://bugs.gentoo.org/723096
+		--no-install-python-module
+
+		--os=${myos}
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index fdc6925a70a1..3dbce6e3e349 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
 EBUILD boxfort-0.0.1_pre20200110.ebuild 954 BLAKE2B c1ef5350723e0f9e902185c0fb4af1eb6a135efe3b02a139c9a8664254ae08405b29bd816732d03b9fbcf19ad2e6eb5352ef78d36105860e5f345419c59ebc39 SHA512 1a1dd166d91b25c6f9230995abbe70ecb6f65e236bfdc58a4b20333ef2e3413aa4d42b61a686649a736c13150d82256d0c569ba64fba39796e8e5da75c9265f4
-EBUILD boxfort-0.0.1_pre20200902.ebuild 950 BLAKE2B 7617fc51f48ad733f2e6b56ed34746bd4430138a8e17e1a2b42a3d34f888b9cb4cccdca83fe95e98e97c0f45227488a81e4a7cfbd5c78e1a09cfd889458b5567 SHA512 dd6949f358583dfcc8cd4e68bbd28800fa58d0e8f3a60be4d1afccf6199eb078253d4171ee752165a8842f9676b13cb49dd9e64fde86d881b00811f07f5839fc
+EBUILD boxfort-0.0.1_pre20200902.ebuild 955 BLAKE2B e2bb6d346fdd0287d95b370035067b320720105e6c082d98fa28552df6339fd3b00323ebe531bdcc30d551bf8ced1d87c5e80d029ec67f9d49469ee0fe31c4bf SHA512 fc62cf164a55fce91e97b8cab102951ff33d51ea2f19bcfcbf28d400a29a7d3059dc17d27770b00704c5271b2c6c48e41dae8e86597c5dc1f45c11e707d3a5f8
 MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
index 2fee581c239a..aa3165f2c70d 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-capnproto/Manifest b/dev-libs/c-capnproto/Manifest
index 070c2613a08d..89dc900a25f2 100644
--- a/dev-libs/c-capnproto/Manifest
+++ b/dev-libs/c-capnproto/Manifest
@@ -1,3 +1,3 @@
 DIST c-capnproto-0.3.tar.xz 620560 BLAKE2B bae9d568531cf4138c945255e16cc989e096714c088581716f49b52d96c552aba231b0f3ff7795d9d64a51555f7af3ea7e06f3c5d5cc249d3eb8a017a093127c SHA512 188167a7e1e50e099135dfdcd2e739585074e0c63fe891ef173a5070cd4f019195823eb8f30389c82228b8981fd595c25fe03c3ac35a158f593c1fbaab87691f
-EBUILD c-capnproto-0.3.ebuild 446 BLAKE2B 7fac4fdab40df3f8cc54d4bacbb0acb043d378c31a0b509a4988658ea3d06afb09a6666f3996b3b79d78aa3cd8806b2a89fac85cab21381b365fd4a78a676d66 SHA512 105cd934715644a359c898983bc2236801c16260c545e0a42e2ed890ad87593906e6f164dcec1314b15b0930b52ea81c3bc496299d7747f2c29cf29f26a36091
+EBUILD c-capnproto-0.3.ebuild 427 BLAKE2B a00a243698279d56c9e85dea1ddb2b13006257be0d998d3b86412f80a4b725cf851a924d41af2a9579f4e9ef29d94b6d177b467bc36637782894b37d4d7fbe29 SHA512 e9d28ecd465806c8d3e9fe97d881cf63ba23c443a6507d771f5fdf9c48e088a0a0d78df6a3e9f7e980cf0abac5eec69c82a1cad6102fb9a720bee19d13736636
 MISC metadata.xml 353 BLAKE2B 972f3ebfb843abe4d9acc4bb0ff4ab7fc228cd07e6b7c69994d18b418b41a1934729760e69c53f7bf64b548f30f091c5d7dd7f84b612cd9a5af12b941735ba37 SHA512 944318c246e57822b1aa483d96932cc9848e7377ae564246981e2f8d3923f3b3df5fea1be3de94f45dfa120732c96a41c41c17ae858c94664bd3b3e8596e5c68
diff --git a/dev-libs/c-capnproto/c-capnproto-0.3.ebuild b/dev-libs/c-capnproto/c-capnproto-0.3.ebuild
index efe586aaee46..143d47a4ac1f 100644
--- a/dev-libs/c-capnproto/c-capnproto-0.3.ebuild
+++ b/dev-libs/c-capnproto/c-capnproto-0.3.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="C library/compiler for the Cap'n Proto serialization/RPC protocol"
 HOMEPAGE="https://github.com/opensourcerouting/c-capnproto"
 SRC_URI="https://github.com/opensourcerouting/c-capnproto/releases/download/${P}/${P}.tar.xz"
diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest
new file mode 100644
index 000000000000..669a114b6cda
--- /dev/null
+++ b/dev-libs/cJSON/Manifest
@@ -0,0 +1,3 @@
+DIST cJSON-1.7.14.tar.gz 352028 BLAKE2B 203795f004496793fb04577df1e4a917df2424bf7866e32459584d3dc776ee13263c5e62ded01e3776973d2210e642d1066d3126e2c737bd0fa048464f3aed84 SHA512 8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01
+EBUILD cJSON-1.7.14.ebuild 587 BLAKE2B 23c0ce3bd52fcbb2bb5af1e2d27ab9320fc4be25ca357022c7d061af848508dd935f642890d0c8f6ce7a2e6facdc1fe76d62d298e385faa476bcf24dc4574907 SHA512 9ccbfc68479b8011e03528d759f8364a0c1f11e283a3507cc72b102c5fe89ead0f815eff49ac15703c66bd36af959e25efdf48ea95dc0891402dafdd4187ff91
+MISC metadata.xml 337 BLAKE2B 978c9df8613b18cfc28abbc3c97f01db84578bf7f8679dff0e6267989de828840cd60c7c5fcb93031b7b166108399ac12782364b3fd9e9189c5af615188481a0 SHA512 7a3117192e55ea42f26b1a48969fe68cd4086fd3269714231481abbee471ec271de15113426a38ba23e3eb119518ba49c7424a7803e46f8e17040a5044dc2724
diff --git a/dev-libs/cJSON/cJSON-1.7.14.ebuild b/dev-libs/cJSON/cJSON-1.7.14.ebuild
new file mode 100644
index 000000000000..23f5aee8a50f
--- /dev/null
+++ b/dev-libs/cJSON/cJSON-1.7.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION=" Ultralightweight JSON parser in ANSI C"
+HOMEPAGE="https://github.com/DaveGamble/cJSON"
+SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e '/-Werror/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CJSON_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/cJSON/metadata.xml b/dev-libs/cJSON/metadata.xml
new file mode 100644
index 000000000000..84162a8abc75
--- /dev/null
+++ b/dev-libs/cJSON/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">DaveGamble/cJSON</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 7c2c9b90cf33..4f130bb72aca 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,3 +1,3 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 608 BLAKE2B 1c6c284b9d84cf74043b4415773b7db17089c3b38333964163aea7ef9916b7929ada37318161bd3731e55b181bbee21eeb0ef71fe9f905c115d5d0dfde037702 SHA512 6a223b44e7ecb8962fa1825574c6a08277a16608e68f65f96621fedcc5cffeefe1cdd7ecedd688e4fc9e361c353221aae62e205ba7ee1517c1b5d55b813fd14c
+EBUILD cgilib-0.7-r1.ebuild 609 BLAKE2B 3deb4deb4b253b764197868564f79dd7143c2f65c1206714f9c70f0a09fecfe5ae3a3714c7784b779d8b097defdcaed7a977bdc161d9ca1d4ea487f94f1d2746 SHA512 b50f8ded4a0260ce9d00b2a4090f6ae45b70b0716382298238cae575c276c86eea66f28f2a9d8ceb2d69c37d79bd289ab389b95f6ae8c35306b86d0c5a5032b6
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index 265ae95244fd..bb5ecf9baa14 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-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
@@ -10,7 +10,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 597e2b87235e..67251887ceac 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
 AUX check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch 887 BLAKE2B 7e3828af77a430ef366b2d7855c1fb5f909c9e8b13273e2d89b34711c95e5b930f95d39b21438e115b208f8eb1f4637aec0eb4ab0e6efb293174d9ddbd2946a2 SHA512 eae3e3b2d3f7f59c94af3c39797490247df827450999edadd363d99c373a465aeec913e90656e94d04215268742fb79d049a32bb3910b16b64175f1177de43f8
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.15.2-r1.ebuild 1508 BLAKE2B b90bebd7e0176acd2c518b620667150eae6cf8879d2d2fc9f7621660ceb2868e51a7b01f563ec77adc49e968450e30aee7c8f970adb42fa329f492b9b5cdcd9d SHA512 a470c03eb155773df82692d9590e779eef9cc7372ad6ec9cbdef5fdb5a168572affae9493adc6562dc2f719c7f9f9523815b84be299686cf635e7772648fba25
+EBUILD check-0.15.2-r1.ebuild 1509 BLAKE2B 98990a42bafb8cd545ae88318c42cc68521a5ef513eeeb7608de3e012fc73f7a24637f6d965c06d6c5217bdfb387ffad221f3e01c6d641456a43ffb33f1e49d0 SHA512 235193b2b78530cdfb87cae3501bf62650978ed3842a056dedec946de17f32a04792ec5e8e6a740f6af96d9898141054b50295d2bb34aecf74939fb8f707b4b4
 MISC metadata.xml 488 BLAKE2B 1cd690b0e4398779744c8a2efedabaa5e3355061032d88ebb2c23d1defdcc619e5924ba6d7ff6ad4e857e25923563b2f3ff0f1aa4dd449f5899b1a9b9d2008fb SHA512 6373c637eaec3cd674bb38bc8108fcda5715818b52b351b101d852f1a29630c5382e88a4759b7e6b8d3bb220b1b6b57eb4b4d9b525519dbec8d9f99b2e5e7365
diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild
index cdad4dc1aee8..a96de0605c27 100644
--- a/dev-libs/check/check-0.15.2-r1.ebuild
+++ b/dev-libs/check/check-0.15.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
 # Tests seem to timeout on ppc* systems, #736661
diff --git a/dev-libs/cl/Manifest b/dev-libs/cl/Manifest
index 6afa5fb1a4c5..c7f5415d7ff8 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -1,6 +1,6 @@
 DIST cl-1.2.3.tar.gz 137921 BLAKE2B 66e79e60d9e5b16b7ff15ecfbccb928ce293a39ad72b403d885c676cd5eed0d1a08e7359a5f38bdfe22db485aacc314c0956585a04fdf3d2d6c10903b352172e SHA512 aaa19700b1b54921ea8194e1b7fcb2dbb11f22c32108fd99d0cd9796c7524a49653dcc97c8c8b34f7739d0b972cbbc3cf61b929e342429b524b11df93e434863
 DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630eae0fb2097f4b2ae0690e41bb96d3fd947186d90b88a68982f5af03bf0cf0f6375304f6a1d05395f018701 SHA512 f7a7f24abf6c374b42f9aa809984c818ac2514d013ff224b3392b2b5df1ba75f2b393ad0bcd822c4118dd0034ed4e815f83041f0b2350ba71def1b33b42e8801
-EBUILD cl-1.2.3.ebuild 632 BLAKE2B 7882f31c8e02540c8ed061b218c6676cdb303deb056f74024ce447c6edcb49fb620d29c667957f91611aac92d1e7454d5c7680af4da4ce6cf9de862096bd0c01 SHA512 25cb9c95249908be4baab3dba8b6f0ce5c227d9b30d9355ef818557bd4f560277420c68186ba23da2d901d3bc09877ad6fbe3ef955df8f533af50f85e4ea885f
-EBUILD cl-1.2.4.ebuild 634 BLAKE2B 28bdc5aeb4e95d6e90c73da885be55df8dea96d5379bda58274e87a809f4b5c0f535e2a759feddfba285c07f07c2d733c87242f64d79e253781bd5e0f0f02b98 SHA512 923186f9725a3f928d1ad1c035e7604f52f1ca31c721b20d6e9220e04e7a994efb52c59098b9dc2b20db83d04a02bb68edf7aba2078edc6ff1308031a0d611e8
-EBUILD cl-9999.ebuild 598 BLAKE2B bf094e1740ce11fa5df1acb211576b4c2535b28abcb50ea8cee089597ecafff60e0b2638b45f270ab274f93a093d524dd3822e8d41a9b2456ccf5905d0f986f6 SHA512 9c19c9546d93683432aff81fe2bccc305b663c832fb85514879884dc76c6b52f149173ed0e05e5a0851e66bcc839bb1b5a4b9368e8a91d6057094e3b04d09c21
+EBUILD cl-1.2.3.ebuild 625 BLAKE2B 43da93f762d3491bc93bec09b1cf0ede5f928ec2d7a4cbd66b8148ee0c9111031c83120f7ae27efc8a254729c94c448e581b02a571b4c2682bb9ad557d4febd8 SHA512 4bda84343d75ea607da0b5b21532573f671acad422739c5ce08010e4f5b275ef8fc056754f225d5f8943a236ba3d02cd268f0b2331e67b70cdd0a0d9e592bb88
+EBUILD cl-1.2.4.ebuild 627 BLAKE2B 7b54b3de09fe77950815b34f7290eaf94695d264d66ebc1d04198a5b2d094e114ba72aca7e488916d00bf8831c726a38cc9628440aec15891018f0b6edf2a920 SHA512 9133f83bc57d0bdc73ccb64f9c3095ac53d6c95c73ecc1fd036144f985cc120a75a283309af5bcf5e7a56f3c752131231804b839b596194e6b931d823b55166a
+EBUILD cl-9999.ebuild 588 BLAKE2B c5df9507c713ab02005e58e78f1240417d76ed3accd4f3e51fca5fb192af9e4851f30a80f14eacc04ee72f320590ed3177ce8457496762089ca632feda880173 SHA512 55bad9cfc22d88826d96fc6eec447bf61abee0ed5165471144a6592fdc90c78cc6e12697b4b605e2af32e8321fe9daad3a1901f7851af5092903b2d46181753a
 MISC metadata.xml 242 BLAKE2B 498ef94cbfabfde7f3466c887e02ca4a668df7f7a6709de93b2b7d45aa1c8434580418ac3193a36596163e3ba2b168601066f2424fb0351f0f880be522fc719a SHA512 1cf1ccddd19d1895cef7b356b9aea1aec44b21adbc573a0e51858661f5ef6d81b0e15936fe70bd271b75fd019a27289f7c35c530298d49ea0596cc6ffd0ed709
diff --git a/dev-libs/cl/cl-1.2.3.ebuild b/dev-libs/cl/cl-1.2.3.ebuild
index 844ac37b3133..413eaad000e5 100644
--- a/dev-libs/cl/cl-1.2.3.ebuild
+++ b/dev-libs/cl/cl-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# 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 multilib
+inherit multilib
 
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
diff --git a/dev-libs/cl/cl-1.2.4.ebuild b/dev-libs/cl/cl-1.2.4.ebuild
index 8228333f6832..7f303904f45f 100644
--- a/dev-libs/cl/cl-1.2.4.ebuild
+++ b/dev-libs/cl/cl-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# 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 multilib
+inherit multilib
 
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
diff --git a/dev-libs/cl/cl-9999.ebuild b/dev-libs/cl/cl-9999.ebuild
index da4f1445d486..de492d6b12a0 100644
--- a/dev-libs/cl/cl-9999.ebuild
+++ b/dev-libs/cl/cl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils git-r3 multilib
+inherit git-r3 multilib
 
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 71ac3545d2f7..768e94d73daa 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -5,5 +5,5 @@ DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 787
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
 EBUILD criterion-2.3.3.ebuild 1068 BLAKE2B 75f224ac5e583fca3bbcc50cfe73d95e42ad170d1693c31ba599c1218751613f239a54926bf7763a479785f71d87e5ce6a199fef3a71cbc8d37ab82947608f96 SHA512 1256d827ed9165cb3db614351881875ad00ee0539f7c2353e47d4ee4946a5628860240f4398eb1446bad739c4be6a43211ec37d01b60e55c3fbe51f38531f8aa
-EBUILD criterion-2.4_pre20200110.ebuild 1867 BLAKE2B 1029f52c1685e51e4043f0333b080eab363dab0b3959d9a874fc51f469be5883bed57ea9eaf809f75917586656ad157f50a086c6c972823f5a1d6aa52d6b5a3e SHA512 c628cc00d973def8bd31d4db04d2439eda2b4e030affc2ce677d587d8aee7cfdadd01613c1d0eca43637195ae8c46b81e5ea9ebde882bef9b7098257adb2e356
+EBUILD criterion-2.4_pre20200110.ebuild 1872 BLAKE2B 7373ea105be2fc03182d11133d5c8885a278fde1919ba61e2a0ce275bca4798192da7c4164d61ed7f3421320949e1539fb8c6a629859c115970669c4a4cc9cdb SHA512 8f96b4b6b975cf069ac35fe7d72a753eb29ca78f4f9445393509f809e3cb986e95b28ee14bb702e8db80bb387fe747a40974cc47a777f1622a49930d4e87ee3a
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index 44e8faa084b9..169702c042ff 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/crossguid/Manifest b/dev-libs/crossguid/Manifest
index 1c3a99f6c11f..b3a22d8de318 100644
--- a/dev-libs/crossguid/Manifest
+++ b/dev-libs/crossguid/Manifest
@@ -1,3 +1,3 @@
 DIST crossguid-0_pre20150817.tar.gz 46569 BLAKE2B 3384b6c507c4713f5ea0d6012138f3543445a42c7353e934e267b91275f7cf75720a446f5fe24f334b1022946f856a65f5c158d0036c999c761e626c1e30062a SHA512 823ca301f1d3b78a778649cd9169194d98dd33c65cadd5bfb9f86429e82049c99c17e09f093b92675981d2aac2aac25b60cbb157fad57a3e1bada826edd8ba0a
-EBUILD crossguid-0_pre20150817.ebuild 1036 BLAKE2B 1c235494b810a15de702903f40321cd5144c4f564c706e4d5ea96a4c3edde29d7c87084c9c11ce3ed140277c5ab3677d0c46a6f323677d66653b20ef4d49edb1 SHA512 19b9dd47f589650f72b8232fa6b1812231e5ec505e61727ae452eb9302f67f19283f8ef12a1cff92a7bc42cb2abbaa1f7533da413eb565afd32e2b75fb9c536e
+EBUILD crossguid-0_pre20150817.ebuild 1025 BLAKE2B 6c9da2696b275c68a6860fa8466fafbd77d51d82077cdedbcf5ceff6cf726ffc85a8cefe933e1bf6c175b1163a4e596e7af44116bfe96f4080cbc3bdb6fa17d7 SHA512 cce6b06a3f3d8b4c2d4339cadda7795e43d141511d890db0d6b89bc8d5179631bef551bae25669a6b85e4a7824680996b33a22b8ea7cd6ef5bb70e7c0b432ae8
 MISC metadata.xml 249 BLAKE2B e76b8e1b26522b43a97fca8a4678caf478be9cf4c7c6acdc0a51ea6bfaafe545ab12ffcd28dcca146549b0b2cc790fd764e39f0684ec9d369ff7f54f7cad16bb SHA512 81a2303b39a3473f4974960abbafdee923ca794264443e4f54ebba440a3d3ff9cfd247964cb226c6170d1d2a48642e6da25ab9b95f748b7ea1fa7e88afcdcc52
diff --git a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
index cf3fcbb50163..ebe790edd00c 100644
--- a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
+++ b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild
@@ -1,7 +1,7 @@
-# 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 toolchain-funcs
 
@@ -19,8 +19,7 @@ HOMEPAGE="https://github.com/graeme-hill/crossguid"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # We use libuuid from util-linux.
 DEPEND="sys-apps/util-linux"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index ec436df5585c..f25e284234bf 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,7 +3,8 @@ AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66d
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
 DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c79739550b1ec7a6da3e7183af5748c2dfa5127be3810d73960af2f3b09b4b2bf4e624a43bfc4357ecde12b SHA512 090472545c74bbf0579b56b09e8b5dcd777b38f29f7199a2e68f45d4a8c687acc82f105ba8b2a38f9aa65e5997a3d846aaf2341ab74d58b4bbfd1f5f03823b93
+DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1236 BLAKE2B cc4fc8d3a8572bf3b4fafe95068010dd630d78889140755f1d80026c3c8e093353da39e64b3e5c161a2fa1ee6407274578546a3073cc148b124a2c268d0b64ce SHA512 1159926b46feaa144c9481007e8045ebd8ac0f8b9f1a1b7aa6c26f24792cf05c65cb69a5f0ea94322a2ba597e58c4a14ff777f4bcc80a9624596bffbd19d4209
+EBUILD crypto++-8.5.0.ebuild 1440 BLAKE2B 6fd40d369412459418e76241cd90788fef0d015976a03a5c027953184de628563cfe2ec8fb5cc85a16a0834ef39e53099199244e6bc4113808bb42c3b4d184ce SHA512 38e41b410b90da0a8ee1e77e85ceb4fb2823fafe8df903d5f97dd8d3184856e7ec36e21619748f16c1d76adb6ded08d67f40801f713528a2f1d4f5a15bd71683
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
index 0257ab4cfffa..dd8465fa9ae6 100644
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.5.0.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/crypto++.asc"
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+SRC_URI+=" verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )"
 S="${WORKDIR}"
 
 LICENSE="Boost-1.0"
@@ -17,7 +19,10 @@ SLOT="0/8.5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="+asm static-libs"
 
-BDEPEND="app-arch/unzip"
+BDEPEND="
+	app-arch/unzip
+	verify-sig? ( app-crypt/openpgp-keys-crypto++ )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 2cc0996cbad0..2b623a0e0d7e 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,5 +1,5 @@
 DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
-EBUILD cxxtools-2.2.1.ebuild 527 BLAKE2B 93a451544631790caa015e69682d33cdd35a8227300a1bb45f9db233450a6cc47da2eaae2be2bf17d620eda62d5abec10d967dbc1cccb7511d5d4ef13e8c2dc8 SHA512 9e191e97d2ddfb7e02843896d3c3e191e0b3fa7628e4a417e980bae2320774bbcea0c391f8b32eeaf8dcdee44068e6a849f9fc863daeee814d56a7fd6db6d3f3
+EBUILD cxxtools-2.2.1.ebuild 473 BLAKE2B 32106e510b978e7ab418230272024b0a8703364d3297c91c8a8e2f2237c3aa124a8ad16134d1bfe32544f30ac3c21fcc757d365d3fa932719d7fd4e634c5b081 SHA512 80dcc712ddb860c1e15598351a42cb9bdec2ce91318a26a20b0f8ad8a658948ff0cca86dab766456d6fad2ea0c50ebebc2af7f95e2d190765b0e829a8bebb36a
 EBUILD cxxtools-3.0.ebuild 678 BLAKE2B 590ce72d8498f55b3b41e8a8be4d422a57af427d0fbedfa43ad955ccee3b126cc3137372590f0dc384389ada519d64b052da27a8779ee940207d3975a33c4718 SHA512 5b055479448d32e975ee60e22a371e43289cf357251236c5bfa5b2b409e83e93df6cb8d60912dc96340e33ab56be1157c2c4a3f23cc5df3d39d9de0325eb4945
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
index 70a5b32243c0..eb54949ddad6 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 DESCRIPTION="Collection of general purpose C++-classes"
 HOMEPAGE="http://www.tntnet.org/cxxtools.html"
@@ -10,18 +10,14 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
-IUSE=""
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
 
+DOCS=( AUTHORS ChangeLog )
+
 src_configure() {
 	econf \
 		--disable-demos \
 		--disable-unittest
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 75e00d3d5e04..8bf807065483 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,5 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
 DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
-EBUILD cyberjack-3.99.5_p14-r2.ebuild 1946 BLAKE2B 4b0cc5fc8fe4311f257ff91855f84fcbd49ddbff7668dd12442f732ba1adaffa1fe75a3399da21dc5bf58ea3c9d5ec7beba91121a85d85fabb285260097f3ca3 SHA512 5bea615f670c3f775d0fea640803c1d0bd8ffc9ede53e1b82781901c21f22523aa7038027b2fc1e5c206d2a9f3f35ab15dffbd4696ce1feaad84855e8887823c
+EBUILD cyberjack-3.99.5_p14-r2.ebuild 1933 BLAKE2B c266c616b905ad859000bef946c33f17c85f54220bb6802bddb40c51fe846a106b9f5d77c87b7848e829ddc5bcd214bdf21dd39d49055c1481efcd4a44b27c4f SHA512 c0453cb55d8386c87a93372863028d23a5e3c35119838933b91c7abb80bc9dc2b82e85fb1f550877b25d93fb2a305d075f699c60939f7276a36bc4cd5fa57c32
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
index 5ca837df4452..bb855c3443d2 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.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
@@ -7,7 +7,7 @@ MY_PN="pcsc-${PN}"
 MY_PV="${PV/_p/final.SP}"
 MY_P="${MY_PN}_${MY_PV}"
 
-inherit autotools flag-o-matic toolchain-funcs udev
+inherit autotools toolchain-funcs udev
 
 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 2d6845f0b9fb..c7228976f825 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8253 BLAKE2B 273da39c2982498c0fb1bce4f5c4139bd298d0718292bb874119e13f4f2e81215ca55849b99d1f758eb4f0783ca2a342c8ac2996c10e2f26486c83555504c2e0 SHA512 6e3362324d3f6a60fc032110517eb745986f83d89938db1c56b78f6eadc28c0d9803ff8012215d83f2874a88267b8c1be7c44f5e1c4c7898a5e8fb328b969e02
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8247 BLAKE2B cbae08b12754bdac5024532561201abbc98379d579134a487caa06c08ea0e9b948dd9d1ed74be05cc1ab210c5abcc5f43e46e28338038a711770566c25949d77 SHA512 fc49bb71103e037a4497ceeaaa84fd65d36d53c3881330c0eb1448f90d8085b04d2d744ee4577d610bffbeac3dfede4309d4ff3d24f5db69c892457ba1e4afa4
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 32fdde1ac701..5bd1294f7a48 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
 
 SASLAUTHD_CONF_VER="2.1.26"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-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="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index c611958b5747..42d1cd9770ed 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 2528 BLAKE2B 7d8680f35ec3931c45c4a83e267307d2698335edaac686b6cf841d79b6f29a89fe0d6ee7b3dbb8179dbacaa5eef95923b9115303108988f548c234bfd8612caa SHA512 1e73bf30551d1973f8966edb2ea22a482349682ff60c995dc0f85721412e4073631b9872771f79dadbe5e0d378095d06f88341b70167ac0577f3d3369e0b213a
+EBUILD dbus-glib-0.110.ebuild 2529 BLAKE2B c6dd69cefc578851654563776f84097817eaf615ab3a2e017ec216f80d42f0fc228bb6ca7a4237b0bec319aa0856a17866636f1c9f96c9fb4fa6ef76cedd4d28 SHA512 a1470a80a5711b505ebf8cc6a643636e239677614c84ce917ca6c1167999fb40778eee35a66a3c50d117fdd5fc9a7d20b00c76c66e71f0d36a4b11f3b3ed9b88
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 0da7888c532e..7a4c8e0d4df1 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest
index 391e93f55ef0..9c37682f5e4d 100644
--- a/dev-libs/distorm3/Manifest
+++ b/dev-libs/distorm3/Manifest
@@ -1,5 +1,3 @@
-DIST distorm3-3.5.1.tar.gz 137638 BLAKE2B cecd29dd30a78514e8f8275fef6d0d8338f8d3f5c22b9b48abf2a156b9dc14626455db92172a9bcf6ce36fab8975149395437697a464ce8dd7fb73e9acfcad9d SHA512 0f4cc669c0c562f8458f29d7d6c5d6c308e4681c1c1737d9d81dd2d02e11e5af236b7084d1b24980d1bd0fac514a043bb83d3b6c499b731d43cb4b7458172c48
 DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19
-EBUILD distorm3-3.5.1.ebuild 528 BLAKE2B f3ceacc416b85d7d3a1f6d63f33f6c99e9bf3a555a1e2af47c2f33c8699d7c893099bfb77d27d58ed68377805264ae0f6daa64f2265dd65cea5acafe1dea8e8f SHA512 4f8461ce074820af6b2b0aec5aa1dd12afae2f0636748c4213196b9f50e906a60b487b4e923c6eb6cce00c042c4ea604c4a9c694c1536394d23cb2e7ddc7a3a9
 EBUILD distorm3-3.5.2.ebuild 528 BLAKE2B b554e285b744047f91468cb9a4c0132ca0179cb354251d0d9afda88c2549594cd1361a6bda4dae48ad0b5b15188d8d461b910ef11268177dfd4fcabfa97df466 SHA512 75d186ec72e5c5e873c07fb1c40e276223d349e9a9b7a6bdef0cf0416e6b32f47d1a2da9ac2c3e41ca6dafe156197c777d79157bb97797858be8a054a9638bf2
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm3/distorm3-3.5.1.ebuild b/dev-libs/distorm3/distorm3-3.5.1.ebuild
deleted file mode 100644
index 595dc882599f..000000000000
--- a/dev-libs/distorm3/distorm3-3.5.1.ebuild
+++ /dev/null
@@ -1,27 +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,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
-HOMEPAGE="http://www.ragestorm.net/distorm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-DEPEND=""
-RDEPEND=""
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_install() {
-	distutils-r1_python_install
-
-	# don't know why it does not happen by default
-	python_optimize
-}
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 715f8c9362de..c4d659691a7a 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -5,6 +5,6 @@ AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6f6b59e0c648989c1012b625f4e07ed5b0934cd4c21865af154a1745e1ce2b72bf90f738efa40d7c2654e5e2723b389c SHA512 e29aba00d3e5edf0639685858215736f3aed4baa9f7b79577a69bf5e2e51a0072e92befe7ad0e24a68ea35e184271c15312b5acea145ff1a186eb0d35a985c72
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B 178895ee67fb6e48aac2001352b9e73243beae5432ab6236d7851a74826c9774ac938c7be26fecf6fd444bf20ae9337072dd5082a7aac011fd9599572104ee34 SHA512 bf44f7e338a9122146932a9e351aefd2d18541ac394d69cf8ed1ef28a03f121024ccfdba9fe6263be520e9a51f473906b2bde78db06cabf2ddde2633990ba165
-EBUILD dmalloc-999999.ebuild 1706 BLAKE2B cdfde19b66fb9a99b8bd9651407d52ec4df3c32c605efcafe19d739ac8c3d423376efb249cdff5c988c017d32500de2083a0aca054e18d6b64d110642b289d26 SHA512 f3a92909acacd3cee47bec324c4c98e391a2ca469d8c07aa4e6f32265c0cfecfff3ab61a6ff565e20a03b48ef54562c6da99ef299e15124dfe11aed65dda7e24
+EBUILD dmalloc-5.5.2-r7.ebuild 1821 BLAKE2B d054daf5d6cd9c454c6e559dc79eb29dd53e097d52a0a51eef27fd81747b671f16c1b526f314e1355fef2096d3da14c1ccca4ee9a3487909d2850572669b4306 SHA512 58b422a27913326552300e39c55e84083d0d0ec14970cbdf3480762b3df54b726bd3787a17932136aaf348c0e5bfbb63f4187e1f3f3ede41657a9be3a7bccb4c
+EBUILD dmalloc-999999.ebuild 1655 BLAKE2B 9f6453eb6ea54a84f0edc491e66944a15034298b9f945d27c311825dbc6256642a030e36cc9b1125a7fa4637ec1e99e69125320107d8a3f7751214e3b073e955 SHA512 b1abc70b2221c1d1c69030b1046ab5e3447594217e4fc3f637aa4548dab5bf8018211bb600aa6cc31b9f7ee77c4832792817e7f81a8a668e3a99e3d93ae24ee1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index fb49d37d57e2..60e05ee68fbf 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -1,8 +1,9 @@
-# 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 multilib toolchain-funcs
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="https://dmalloc.com"
@@ -10,11 +11,13 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs threads"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="threads"
+
+BDEPEND="sys-apps/texinfo"
 
-DEPEND="sys-apps/texinfo"
 DOCS=( NEWS README docs/NOTES docs/TODO )
+
 PATCHES=(
 	# - Build objects twice, once -fPIC for shared.
 	# - Use DESTDIR.
@@ -45,7 +48,11 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
-	econf --enable-cxx --enable-shlib $(use_enable threads)
+
+	econf \
+		--enable-cxx \
+		--enable-shlib \
+		$(use_enable threads)
 }
 
 src_compile() {
@@ -77,7 +84,5 @@ src_install() {
 			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
 	done
 
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
 }
diff --git a/dev-libs/dmalloc/dmalloc-999999.ebuild b/dev-libs/dmalloc/dmalloc-999999.ebuild
index 8408576bf003..e94bdfb50036 100644
--- a/dev-libs/dmalloc/dmalloc-999999.ebuild
+++ b/dev-libs/dmalloc/dmalloc-999999.ebuild
@@ -1,8 +1,9 @@
-# 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 multilib toolchain-funcs
+
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="https://dmalloc.com"
@@ -10,16 +11,17 @@ EGIT_REPO_URI="https://github.com/j256/dmalloc"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
-IUSE="static-libs threads"
+IUSE="threads"
 
 BDEPEND="
 	app-text/texi2html
 	sys-apps/texinfo
 "
+
 DOCS=(
 	ChangeLog.txt README.md TODO dmalloc.html
 )
+
 PATCHES=(
 	# - Build objects twice, once -fPIC for shared.
 	# - Use DESTDIR.
@@ -49,13 +51,16 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
-	econf --enable-cxx --enable-shlib $(use_enable threads)
+	econf \
+		--enable-cxx \
+		--enable-shlib \
+		$(use_enable threads)
 }
 
 src_compile() {
 	default
 
-#	makeinfo dmalloc.texi || die
+	#makeinfo dmalloc.texi || die
 }
 
 src_test() {
@@ -77,7 +82,5 @@ src_install() {
 			/usr/$(get_libdir)/lib${PN}${lib}.so.5
 	done
 
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
 }
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 293472403d40..1c6918304702 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,4 @@
 AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r10.ebuild 8191 BLAKE2B 9a217e079ef634df822d42bc9106986c395978bee7a3deff60f7a5f5564f9c7e6c31b07a46ae70142a01a3cb16e840d0fdfe3ac6f5be01a02dd31fa52f76ecc5 SHA512 9c8efce650ab2c9ff5e2c12663a5929c4d4863b6630c9bda7ff9733519f45aad69d865a8007e5d53821eb92f12153420dfd3cdde723c351a14cc0bbb9aeba3d7
-EBUILD efl-1.25.1-r11.ebuild 8249 BLAKE2B ba546c94a4460a4544b3634ed2fa01a36595e10d92468e9e5fc672b103cc5996861b2408c331f0c29c759683cdecddbba19ada44cea1e5c4347d9a8b990d54bb SHA512 6cb05681c695432881d5e82f1be291f59a2267013df33b02acbe5617357ea50a2ef5616bd6e2946b1ca542e5884306d4fefcbe80e84413ef027f63d239689bad
+EBUILD efl-1.25.1-r11.ebuild 8291 BLAKE2B bf2cb6a42f92cf3e9e5328901b79621378cea528d0ec5bb1df78f1384366e0ccc95b869f60c32376cb749fd190a427e0111f4831823c0757726ea491b475fa6f SHA512 ff43b223e4fd42d63fa71ff840ef57e278cd69e6053881a82f480a4b1426d99ad4cc563f97cc0b817e061bd69e2f13aa7856f95fd3b3acea07412e679324ffb8
 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
deleted file mode 100644
index f02f9f63e12f..000000000000
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="${S}/doc"
-
-LUA_REQ_USE="deprecated(+)"
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit docs lua-single meson python-any-r1 xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
-	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
-	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
-	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
-	xim xpm xpresent zeroconf"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	?? ( gles2-only opengl )
-	?? ( fbcon tslib )
-	ssl
-	drm? ( gles2-only )
-	examples? ( eet svg )
-	gles2-only? ( || ( wayland X ) )
-	ibus? ( glib )
-	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl )
-	xim? ( X )
-	xpresent? ( X )"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	X? (
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	avif? ( media-libs/libavif )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2-only? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? ( gnome-base/librsvg )
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	v4l? ( media-libs/libv4l )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
-		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Remove automagic unwind configure option, #743154
-	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
-			die "Failed to remove libunwind dep"
-	fi
-
-	# Fixup Doxyfile
-	pushd "${DOCS_DIR}" || die
-	cp Doxyfile.in Doxyfile || die
-	sed -i \
-		-e "s/@PACKAGE_VERSION@/${PV}/g" \
-		-e "s/@top_builddir@/../g" \
-		-e "s/@top_srcdir@/../g" \
-		-e "s/@srcdir@/./g" \
-		Doxyfile || die
-	popd || die
-
-	# Fix python shebangs for python-exec[-native-symlinks], #764086
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		--buildtype=release
-
-		-D buffer=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D install-eo-files=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use lua_single_target_luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use elogind || use systemd; then
-		emesonargs+=( -D systemd=true )
-	else
-		emesonargs+=( -D systemd=false )
-	fi
-
-	if use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif use gles2-only; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	local disabledEvasLoaders=""
-	! use avif && disabledEvasLoaders="avif,"
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local bindingsList="cxx,"
-	use lua_single_target_luajit && bindingsList+="lua,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use lua_single_target_luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	docs_compile
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
index 30a74e5dfdd2..6bd28b2a70e9 100644
--- a/dev-libs/efl/efl-1.25.1-r11.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DOCS_BUILDER="doxygen"
+DOCS_DEPEND="dev-texlive/texlive-fontutils"
 DOCS_DIR="${S}/doc"
 
 LUA_REQ_USE="deprecated(+)"
@@ -19,7 +20,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index cb425e7f4bd2..40c6c128b9e1 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,10 +4,6 @@ AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
 AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
-DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
-DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
-EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
-EBUILD elfutils-0.182.ebuild 2544 BLAKE2B 823a32e0296d64970a15eabfe65c41eec5b6fa69eb1086a1fce79f5b45fbf26555fdda7d1438116a39225d32b7b9c8bbfa823565ff84e10e98094c53be59a83f SHA512 ef31def7b22c27baeaa6e2634ac69f24c90643e18a549a54ba48d18f4492a5ef2f68c3971877969b00d0e8cc0afcde57728c515cf805ff7102fb5e565e24a464
-EBUILD elfutils-0.183.ebuild 2426 BLAKE2B 16fcb915dd57c117584d17a02d9963b4f8bef874ea0b6d06cd255927f08abde3be07f6050218a6de81cdc213cfc868db3b4410038cf0589b9e4f5550bb4944ce SHA512 b3dcff33aecdfe71d8432ea18f400802b28638594a5ed2f72c0b18e0d665d66bb4f8ddb45e8dec4de88c8b1ac85f491c92802060d0ccde2bdd655fd95ff29a43
+EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
deleted file mode 100644
index 4a77d80ae440..000000000000
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-	"${FILESDIR}"/${PN}-0.177-disable-large.patch
-	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
-	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
-	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-flags '-flto*'
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		$(use_enable valgrind) \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	# CC is a workaround for tests using ${CC-gcc}
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		CC="$(tc-getCC)" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
deleted file mode 100644
index 52d48a39e1fa..000000000000
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	!dev-libs/libelf
-"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-	"${FILESDIR}"/${PN}-0.177-disable-large.patch
-	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
-	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
-	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-flags '-flto*'
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		$(use_enable valgrind) \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma) \
-		$(use_with zstd)
-}
-
-multilib_src_test() {
-	# CC is a workaround for tests using ${CC-gcc}
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		CC="$(tc-getCC)" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
index b5b36cf44378..f384d98065c5 100644
--- a/dev-libs/elfutils/elfutils-0.183.ebuild
+++ b/dev-libs/elfutils/elfutils-0.183.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="http://elfutils.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 544b69e88d10..a943aed80090 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
-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
-EBUILD ell-0.38.ebuild 1253 BLAKE2B 39c42d8c149bcae4b0ce4c886c2c83141d02a8dc8d0ccd2b4cdc2ae8af80befaf9af2f1a8b242363ea83a6095ee9616bc8eb2de37cd7d1e30ac6e99e7a7274e0 SHA512 67b5dd3428f4db0ae63145963c5678d2c75dd07150f771d3f31c9e09e004477115d139bead25bf188f0b59035408e1f0a9caac976601dad1be5d9453c6ce7ae7
+DIST ell-0.39.tar.xz 523932 BLAKE2B de1cb68347ed9047bb1fe79dc91ed1db7ab466a5610647660a4eb50519c620f8ea28767538d0cb79e3c3de17f884227f1dd957453c56df322ffff2c5856e94ee SHA512 ee525268276aec13bd8004c8211c768c682fbbe4b50d5dfa886a76cfa20be98e867cb2b1850b23fc16cf47b942e21ad272f19ae3d5cff36ce856ae8811938dc0
+EBUILD ell-0.38.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
+EBUILD ell-0.39.ebuild 1255 BLAKE2B 2f1cab8b6a2f77c85d80dee309aab8c74984638556a7eb88142dddff5c339014046bc981205c70b6401e5181ea3b8134356e2fd831a315822db894bf3898e03d SHA512 908ecb88433c7ddac197aafe986edac040a944a73bc46ac9c0c4fdc56c6f0a029ec15b1974754a9295acc91355ec22c5be520ddda8ab8a18cfdbf3a27a3efe9a
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.38.ebuild b/dev-libs/ell/ell-0.38.ebuild
index 163c92118f1c..8d87287e5656 100644
--- a/dev-libs/ell/ell-0.38.ebuild
+++ b/dev-libs/ell/ell-0.38.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.36.ebuild b/dev-libs/ell/ell-0.39.ebuild
index 8d87287e5656..1275d91a1a22 100644
--- a/dev-libs/ell/ell-0.36.ebuild
+++ b/dev-libs/ell/ell-0.39.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index 9492b901fb41..bce40a4072d7 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 661 BLAKE2B fa62ad1de3646f17b71278d5da27a1259654f755609dd8fe9a6b9b8a81625105d3f6cc087c2d6badf305a4cf6a6102c3b513099e20caef195f036ad2842ce0f0 SHA512 33e4c766b5096d9667e429d102f11c29a232c5498dbac1f77e3a6148f055591963470e634132ed2f2997fe907c6003a687f0a9791897396234de4caf7f5174fd
+EBUILD eventlog-0.2.12.ebuild 668 BLAKE2B 762525f8b0f4de2f5200235a2dd6b115e1ba25d9d00cdfa1365e0270930fd47512f338a3723e5df80c4d4dc1947a3e1f266d28bf9765b29c21b357127f20cddd SHA512 8d09d20f9384442a4701918bbe97028d854ae6c4bfac2802daca98ccdd0c29b5af7545e9307218109604df896798c822b068861be5491f33b4add932f0151c9b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 4314da457d3d..528c481f39e5 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -1,8 +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
-inherit libtool eutils ltprune
+EAPI=7
+
+inherit libtool
 
 DESCRIPTION="Support library for syslog-ng"
 HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
@@ -10,12 +11,14 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar
 
 LICENSE="BSD"
 SLOT="0"
-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="static-libs"
 
-DEPEND=""
+DOCS=( AUTHORS CREDITS ChangeLog NEWS PORTS README )
 
 src_prepare() {
+	default
+
 	elibtoolize
 }
 
@@ -24,7 +27,7 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="AUTHORS CREDITS ChangeLog NEWS PORTS README" \
-		default
-	prune_libtool_files
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 867ecdbd3929..253c31f6bbc0 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,5 @@
 DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
 DIST expat-2.3.0.tar.xz 433508 BLAKE2B b547cbca23f2ca11bef326225b8e2958a3539dbb14789c33fb0f2aede35bfbe12981d151624b0497ab2ad488ec06529ae2a996e514b19b39622ae7fc29f47832 SHA512 dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
-EBUILD expat-2.2.10.ebuild 2502 BLAKE2B 07947eaabcbb85f59b000397fbd706f1ce50e130264bc3488f77dc1ff791743e7384d4599554c0755b7db4acee42f416d3f0dd72d31643323c965647604199f6 SHA512 8a4dc27c419ce5ae213fec3645da06f36a284d043d607aa573360c02a7711ed2376c138b49aca60a768e997ae105eb8181259a4f7d5b55033f6959c30dbf9029
-EBUILD expat-2.3.0.ebuild 2511 BLAKE2B eb303a5fc83dd273559bfc14c0d0b2fc501f2cf31af6a9266fcd2f9c2e2efd9ddf65d5b999b024a9f287b5553cc23def4cc1af3529fa61b9eb75e6dfe81895d4 SHA512 1022ecd3102ced90899e12574169d8295491ac3292a764ef28401d6de1a704b57a942f1360681ef482ac0d8f8a9a9fa50468d5314bfd43da26cfaaf1547672d5
+EBUILD expat-2.2.10.ebuild 2463 BLAKE2B 2a8e49570989a3551678feb811de9b44f117bc87c485c5bb17ec5d93bfbafb4c52c35ca2020fa230b369876d1181556aaf014d665eeff0b3f8a8a9419b16fe48 SHA512 a50c4974e7dc22818b1d580114e45d00a5066c116575358c8e12614f317cb918a26aa9a8355b749c6d116f8beb3d2287f5109a4dd1a82247594d4da6eebbda4f
+EBUILD expat-2.3.0.ebuild 2471 BLAKE2B ec8e417f394f038843c9b41de497ff614eb214c7a6227249cd14d1852ecd15b25d0fe688b5d4ed16e15465629818ad8c63a0823edfbc02261441c35f1d10199c SHA512 e55f579f5e3df0f93cc1a549294e88a240516a976c08531a879b088f08f3f48346b71e9e5b730877bf3a4f305ca3c8352cc5ab9fe3d0b31e29a2fa6acc3d14c3
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild
index cf18a8043d2b..005072fd32af 100644
--- a/dev-libs/expat/expat-2.2.10.ebuild
+++ b/dev-libs/expat/expat-2.2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+inherit autotools multilib-minimal usr-ldscript
 
 DESCRIPTION="Stream-oriented XML parser library"
 HOMEPAGE="https://libexpat.github.io/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/expat/expat-2.3.0.ebuild b/dev-libs/expat/expat-2.3.0.ebuild
index 259918860d5c..9a3178cd3f51 100644
--- a/dev-libs/expat/expat-2.3.0.ebuild
+++ b/dev-libs/expat/expat-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+inherit autotools multilib-minimal usr-ldscript
 
 DESCRIPTION="Stream-oriented XML parser library"
 HOMEPAGE="https://libexpat.github.io/"
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 437d9875b71f..e0e5088b183e 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1252 BLAKE2B fa7b071b03beede780c2174584f276a2c245c6f4b3f073c18df78b7d49d0f691358293179b2e5a4b504ba61045c5f5acf387934963609fdd12fca9857a636758 SHA512 10564a078014496a24b3a14498c42e1e8ba9165cd19e21d44b91248f99f0bf2e6a230dc2f5bf08c38301edc6193eefde12b09777a31760409b1cc0dccbf22efb
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1253 BLAKE2B dbc06d0435b3cb9598b647e89a63bc9e189e7136e613d4ed4b9db3501d14cf6cf26537d1b5e2786babc2e66dea8c092f8781159f093770fb50efd2782da5b045 SHA512 7441f6975caac7dac44a5bec87bd335a89c24f799d81b81f7f7145413aa58767df3821f642d031d1e636314c467dac53dfb3cec18c7b600d5df7fcb8cde9b6a5
 MISC metadata.xml 233 BLAKE2B ae934b099af8794db5635a540435443d177ef7a27c2eac37aecfe093dac318d44f717f79ddce49ee446fc10d4416f8c4034fade511b6c0bc36dde5768729e1c0 SHA512 bc903c3d553ad0aab3b42fb9cdba1972ba9b010206d29a40137490b9f49a454515ca1326d17e3b9a10e37cbb9a8ca4f5b9a8829ac6648989fe2bde5f23267f18
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index f0ef81ef037a..ea9b98a522cd 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="html"
 
 S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 1efd1b1d1893..35c49e02784e 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,3 +1,3 @@
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
-EBUILD ffcall-2.1.ebuild 1504 BLAKE2B 5bfa46cfe3a1a1937449b9675ac5fd563b1f71d695dfca26d43c28936f4494222bcaef9aa731365f3a4929af8e2a87d7f059c5f3cf863f5521852598940e1862 SHA512 38fe5bcfa7e335eae2833ff99926628b45ddfa3f91c1729bb47f8b11171b45ad056b0501c03a7b9bf0edc325ff24b659369fcf384f8c609290f245aabbfba770
+EBUILD ffcall-2.1.ebuild 1453 BLAKE2B 3d9deb4d428ebf62b36d12c0816d13f36f7af7169ab6a229b0284f5d23b481890611ab8002944965917506b2d94d59ebe95e363ef6d0971374cf04377efac603 SHA512 b15884f72bd6d03b7967a5cdeea552108b0332d238610b475d5c9ab7f893ec840a2c252a8ad762f0413b7c0de509d8b4e972923756ed6807603300eece75b56d
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index 9ba00e5bda71..f5b5a27c49d4 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic ltprune toolchain-funcs
+inherit flag-o-matic ltprune
 
 MY_PV="libffcall-${PV}"
 
@@ -17,12 +17,8 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-S=${WORKDIR}/${MY_PV}
-
-DEPEND=""
-RDEPEND=""
+S="${WORKDIR}"/${MY_PV}
 
 src_prepare() {
 	# The build system is a strange mix of autogenerated
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index c39bec387810..da939a761ad3 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
-EBUILD flatbuffers-1.12.0.ebuild 710 BLAKE2B 3570f028de583c4509a927aefff9d5ef8f69fd6aa6e05542d78ad57e3864f65b919e2c3324eae56671c3ffadb2704fb9bbc5ae9d9743a622540bea80b2bbeecf SHA512 e35ff2395a348c4c3e1a769d165d8a3b034f49d53adb8d38f4ce708889ab5d75e53e780152e9c0e02867701addaedf3c930afbf62a6b4b7b855c54b73800c889
+EBUILD flatbuffers-1.12.0.ebuild 709 BLAKE2B 570b8680fe48220728539d9bee3d5bc2c851e4105b4f2d8926d5564359c32dbafee39aed662c311621610f75f64bc4464ded9ecd0571f541eed883d053cb9b8a SHA512 fd7652dc1a6a721965027ffcbfcee9826e2c1728fcc94e69735d14487be1b073c388baa1c56c98de6e5989e7feed3b908ed73fb4941365a9e5aff4a23ca69c0b
 MISC metadata.xml 332 BLAKE2B d8d0407f0bf9b22966b551396238765d83d830aa9d70efc8de522fc58a0424ace05025bdc30732c96af91d69202cbfd417f4775805e630b728550dec44a2598e SHA512 005454078e3fbb9fa650dd6ab4eeeb69708338e5c1b0a3595937365ce5d93174e352d9f8bda055127feb6b80644c91f6f3e82e85b5c162ffad09ff19aaf1dbf1
diff --git a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
index 2016bbfb5edf..5bb8e0e5a754 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.12.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/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 821eec6a8d20..2e6a64dd94da 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,4 +1,6 @@
 AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a
 DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
+DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
 EBUILD folks-0.14.0.ebuild 2576 BLAKE2B 84fe21b7e0138b6d62a6666dcfa426ec85261008441ab2b7c3576e160615c57699ae4b6bcdeb6ceb0c9a00d183a0bc663b0e67c6bb2892bc8a7fafd13757a54f SHA512 c21b9a13e3e3b4fff805d9a713e85b4db03dcf151b55628b94652603586681fa020588bdcca234780ef6c95295113ce853899e1277daf72abafa4e80e3388a9a
+EBUILD folks-0.15.2.ebuild 2210 BLAKE2B cb605b9befefb6c7375ede2a2dc0730d2d14bac8d5e18664cac68ea628eb5a57138e289709d99b6be99cfc654b00c9cd899337f4331525b4a32ad1af0787343d SHA512 fc066f9a57f573f942e6fc8f1afb3282b45e400ff0b3750a8f54cdb91932d4bb003d3bed78ec4debbe35a7186368345f4d29ed735c4425e65f620a3458a3c5c1
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.15.2.ebuild b/dev-libs/folks/folks-0.15.2.ebuild
new file mode 100644
index 000000000000..be6aff222324
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? (
+		>=net-libs/telepathy-glib-0.19.9
+		dev-libs/dbus-glib
+	)
+	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+	test? (
+		sys-apps/dbus
+		bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+	)
+"
+
+python_check_deps() {
+	if use test && use bluetooth; then
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 39dfc846beb2..009955ef3de9 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,3 @@
 DIST fribidi-1.0.10.tar.xz 1147588 BLAKE2B e40e16b4b6167d0c7cc26b72ed21a7b4b2ba78dcce56eaf5dee94835cd2d4770401ac17bc2b5f13227e41e8f19513a0616f49edab07ea8fb2969eab30e24f653 SHA512 cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
-DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
-EBUILD fribidi-1.0.10.ebuild 952 BLAKE2B ebf4dbc1024b485b26a40b96d729dd3bde2067040d34fd5dd34577b2733a85752cc26eba4e5bec5b053e1969918a8a4524dd26aa67042ff429cea0264588c1da SHA512 872c4d71dcace580aadcf204a34d374480073a2b587f7842de576db0f504d99ffc60f8c7e1d80f3c80c9951c9a472dda9e35fbd48ca626537300c2a325cb4ee7
-EBUILD fribidi-1.0.9.ebuild 978 BLAKE2B 906ea4d45f2c0dd17e61806495ce2c07b288f760802704010c7684e8296afc032f0d1fb19b060d061c1afe7a2c641ca80c0e413379f5552223d5afa128fbe16a SHA512 9e0773611eeadb41ebbe08bbdbbdabdf623bbdd3ab4b8d8c07f34bf91c108de50a59c30b4eac8a409b3145adbed9265fa54001ec3b738bab113f41b92b5813a5
+EBUILD fribidi-1.0.10.ebuild 944 BLAKE2B c628cefe1e2497dbeac3e4b270c264a4b5905ff7213e6b10a01789ce8422ca9881def434ac13fe3be8b2e5cd06fe88a47847f895745a1b48292182dca4796715 SHA512 a14bc7ef193982d676d9c29aa35d89ba094eebdcab386a0b3316b4aea6e850b7e82ae4b97bcd8c6dd73e24a44e44d9da9d23ebcd47da80e0caa4fa7ea62537db
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.10.ebuild b/dev-libs/fribidi/fribidi-1.0.10.ebuild
index 76ff5d8a3ec1..93619b5401dd 100644
--- a/dev-libs/fribidi/fribidi-1.0.10.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
deleted file mode 100644
index eec75c2b00f0..000000000000
--- a/dev-libs/fribidi/fribidi-1.0.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		--disable-debug
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 423ed3dd64b7..3a2fc26fa90d 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,4 +1,4 @@
 AUX geoipupdate-r6.sh 1085 BLAKE2B f093f49881fa86bb81ac8b7c2705568a186e51c669a3da85114e0985ea7b2cc3de7ab5b6f8ef2e73ccd46af89149eade9b9b116506c6d9891e70dd8613a3c7a2 SHA512 97cdeadaf42510b88e00b3187e51089f62838c87d11500f572ed19232aedde1cb51a4183a84d7421773d8248072c2ef7197a28b0fe9a06cc10624b0f5d00a21e
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
-EBUILD geoip-1.6.12.ebuild 1261 BLAKE2B 694ad4c8f091ab1aa112c7a2afa148a75680c029b46a0bd75525416406ff0cab9f10195e79868663193e93023fde445f6a82b12abf91545ee8c012362d2d42cb SHA512 9651aa6ea38fdf8842a38913309ae923411f547bfbd35a5410e9105638c0f803bab3c756242911833792ce408cb29b2c30035ef89e3d8901ba70a531c3a6de9e
+EBUILD geoip-1.6.12.ebuild 1262 BLAKE2B 43484f4c2ce0bd4156b45ae57923ab3c5324eafae9bdd414b317a0b7d2ab9ee5f839acdd6558ac9e3c80b43ddc879d4cbb2f8934139253d773a254047f1c46ed SHA512 03c950f9f2e2b4232e512a1c5e8c298d36be2f8a631d47e08c19fdf01637f8e9cf2a6d3d25b0e1686705751c1efcc916cdd36faca614496f483a353f76ea63b6
 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 8d3acd5e9c69..427939a236fb 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-api-c-${PV}"
 # 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/gf-complete/Manifest b/dev-libs/gf-complete/Manifest
index 24290fac85d7..d0da6837e830 100644
--- a/dev-libs/gf-complete/Manifest
+++ b/dev-libs/gf-complete/Manifest
@@ -1,3 +1,3 @@
 DIST gf-complete-2.0.0.tar.gz 122566 BLAKE2B 20cfc2dcf437109f5ed703434c5c383bc910d57127583a4eca6ccea860d0f42c82c93558ba992b9b35d6025d745a8bb39c32ed35809ffc063fa83b11a975e0d9 SHA512 3b0693bf374086417f04cee09dceeb694aafaf7fb3c829b89f303b65634ae509406c8a0de10f57c666b4c78b11043f355bb3c81f95eac061cb16de9db2b71b89
-EBUILD gf-complete-2.0.0-r1.ebuild 723 BLAKE2B ce2657fad4cf466b6be446235949de6f6c42abfe0b78531bb9e778ed17a3e3d98d4d56d711f95727ddf2c97116b510c8868a536cdc4496e2a0f58da43a40348f SHA512 5a512b143669c98fb3bced1f1d5aa91d084266e321e958dd964114d8b06e8ab8a595992196269748d9a78b048061c75f850886623d7b9af579800c53ed4fa848
+EBUILD gf-complete-2.0.0-r1.ebuild 717 BLAKE2B f38ec23b558a3acd7283f0d61e2930835a3130e94ea4bf8e31c19e0541d363c43d29ee397cc79932799aeb8b120e4b4bf72daa2de7e6ae4a01f037485b64953f SHA512 088a74ce8bb0bfe47dbe8ec11074883a2850bab2dd7f33c4009637ea30a49f8070877414cbe019db1d012d7562a17a522e69e680d0d476d5003afda6bc2f70f7
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
index df56d538b824..50550ea6c716 100644
--- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
+++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils
+inherit autotools
 
 DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic"
 HOMEPAGE="http://jerasure.org"
@@ -30,5 +30,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index b7a843e7161a..350d93d16e30 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,7 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f
 DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
 DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.66.1.ebuild 1114 BLAKE2B b2324eeaa60bb5a885e782fd5cf7b84534565d7470b153b30e972a5c624b1a83fd71d4eaafd72d01807a2035fb667d6c205c24f0db591c56df6cc043d1542f76 SHA512 9aaa7806c10fb4e27d23bf0c21575054d309dd2ccafdc88023e1543b083b61a53f4a1dd56395e0e53a90be552c51b0da64fdba21ec36a522844b78d4eff764db
-EBUILD gjs-1.66.2.ebuild 1113 BLAKE2B 4e1047bb670c2a98558699f476a8c99d784978ae531c42713b20a37aa67616df6ae4c51c140095f3cf387094e476504a8cc99cf4ca32ea1be4635abae0c45c99 SHA512 f4268bb5ab845fcabad639291c1a92f27f90900a57dc7a035d70ac642ef3f21d13e1c2b1d166ad424f36abdf3cb1ae70ca9de507df459894d1bc9c18b4fc9c58
-EBUILD gjs-1.68.0.ebuild 1114 BLAKE2B b491b84d6c4d291452f05d9ba8dc7b1066b7ccc4902f2eec42ccb2e4657468bfbfed1e3cdac021738279a75266293daac5689849e7de5da4e39e87b333438f43 SHA512 cd017ab7fa37b91149201287fcf7b3e5e262b6b5168fecba8522dffd02f6767bfff185cb5bfc50978542a5b65b47e5291ad020b587dbf5310981db25ed09888c
+EBUILD gjs-1.66.2.ebuild 1109 BLAKE2B ed052e7b9398fefedf71ee2cacff2e00702f1e6c7444ea37a218bf047c07f91d8c52002f12cbab4c2a322bf85eece5377686ec44273e6bb59eeae4de093172fa SHA512 b7418593774f5712eaef63a66beb01a15cab894b535b8ee91596dbf6b10351b5b23fb52175977ad641c11949320bff14d0fbd9439889de3b955e23c9160d33ff
+EBUILD gjs-1.68.0.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.66.1.ebuild b/dev-libs/gjs/gjs-1.66.1.ebuild
deleted file mode 100644
index 857e675b110c..000000000000
--- a/dev-libs/gjs/gjs-1.66.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.61.2:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild
index fbf9d3dec01a..355eb763d380 100644
--- a/dev-libs/gjs/gjs-1.66.2.ebuild
+++ b/dev-libs/gjs/gjs-1.66.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.68.0.ebuild b/dev-libs/gjs/gjs-1.68.0.ebuild
index 02c500d445f5..69f56003cd50 100644
--- a/dev-libs/gjs/gjs-1.68.0.ebuild
+++ b/dev-libs/gjs/gjs-1.68.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	>=dev-libs/gobject-introspection-1.66.1:=
 	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
+	cairo? ( x11-libs/cairo[X,svg] )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 3c131aed0a01..1a2520ac05d7 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,8 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
-EBUILD glib-2.66.7.ebuild 10439 BLAKE2B a6ddcde770682eeaa0908e335d66e7339234ba8e32d8ef670b1daa1f9a603dad17bd5c1a450e8488b34bb3ef13e3adfcc0c15990ecec1f3fad0eab871820a939 SHA512 110402fe5b3dacf806cf13355e05e6e76e6e50a012a21b4c12536f861dde7464a4bc2a97b7d28ca679945fad120146528c9d0ea83373f7079eb72e0fd6cc0540
+DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
+EBUILD glib-2.66.7.ebuild 10440 BLAKE2B f73b51d8b515c8068e1bfc136a10f1ee0d2506002b1d807a5536fa75af8e767f99c740eddd4edda977cbb3395e7c880ace4a05adc5f29600004af7bc757191c0 SHA512 5b6bfcef44dbc7d87cc059df97dda2e57df512811934a85ce753602772952889f62ec046579986f0adf5ad95ba14b7a40b29510f0131cc07a35585790fcb5a7b
 EBUILD glib-2.68.0.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
+EBUILD glib-2.68.1.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
index 417cda9f1dd4..0f1be9803c93 100644
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/glib/glib-2.68.1.ebuild b/dev-libs/glib/glib-2.68.1.ebuild
new file mode 100644
index 000000000000..afd809960de6
--- /dev/null
+++ b/dev-libs/glib/glib-2.68.1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		-Dlibelf=$(multilib_native_usex elf enabled disabled)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 44b9cba1d9e4..8f7b34055068 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -3,6 +3,5 @@ AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f
 AUX gmp-6.2.1-no-zarch.patch 623 BLAKE2B 4cdf9b780ca92f56eb3dd030a3614169b8cf4df94ec3b419d97c5488dd091c1847605b3525e1d90f07434b38cb82135b9a91d87785b79f0af828cbb09c54adde SHA512 6f071f6c44d3991a92f157545832238bcd2d7275321f7420aff0b4f88a95a66ba7cfd457d3c56040f8579a1be0b77ddedadc7dc4ce8a31c75266909fbb61c399
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
-EBUILD gmp-6.2.1-r1.ebuild 3101 BLAKE2B a042c754bf50429a85c65d63e33f5391b6f3ff3acdf5325a965b60a93ec5302104e31271803a2df9081216d8dcddad82304ef4b13e11cd4a5e5a6ef4dfe10927 SHA512 a8c4dd19a4c20b9723af536a967333bd8c1d011f74f93c7bef24422f1369963340de217a77e66ff62bdcfda4b563d13be6a5dd89c56669ca4391568663ad8d54
-EBUILD gmp-6.2.1.ebuild 3050 BLAKE2B bf2eb852144ec36f5ba182371b501d9c9c2e66a311fdb83ca1288017615a5ea07839eea21a4aa8d7fccad342f5ff8b0d842517254419f6af80cebdc8c8485324 SHA512 52be7365be21e1b4109df63cd8dc544a54681bbeede58ab1e518b9bf3f852ab1b6360066dc17d85eae7f43d8757016b50e2558709779462f53d6c3cc775fe78f
+EBUILD gmp-6.2.1-r1.ebuild 3086 BLAKE2B 97ea974b0027cdd41930ab77bfdc6cf21a4ddcb3796675914963f0716c03ae0df96580c62e4e2ef0a40ab91339159beb461ae25d6c7930fc4281b0b3b2225c5e SHA512 810cbb7b830f84b1f7a0120bf69f8784d339fdce24e7934d5af17d9938344f78cdf86bcf78a4ec19fd9352193f9111bc59b04e1809a88d33c95d27cc10d42e70
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-6.2.1-r1.ebuild b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
index 9046e8651103..46b021bec16b 100644
--- a/dev-libs/gmp/gmp-6.2.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 MY_PV=${PV/_p*}
 MY_PV=${MY_PV/_/-}
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cxx pic static-libs"
 
 BDEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
deleted file mode 100644
index e78f841aa4d6..000000000000
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MANUAL_PV=$MY_PV
-MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )"
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +cxx pic static-libs"
-
-BDEPEND="sys-devel/m4
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P%a}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-)
-
-src_prepare() {
-	default
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# https://bugs.gentoo.org/536894
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
-	fi
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/usr/bin/env sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped} || die
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	#367719
-	if [[ ${CHOST} == *-mint* ]]; then
-		filter-flags -O?
-	fi
-
-	# --with-pic forces static libraries to be built as PIC
-	# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--localstatedir="${EPREFIX}"/var/state/gmp \
-		--enable-shared \
-		$(use_enable asm assembly) \
-		$(use_enable cxx) \
-		$(use pic && echo --with-pic) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs || rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/go-fuse/Manifest b/dev-libs/go-fuse/Manifest
index a81e41ae9fae..1e0c8dc2823b 100644
--- a/dev-libs/go-fuse/Manifest
+++ b/dev-libs/go-fuse/Manifest
@@ -1,6 +1,6 @@
 DIST go-fuse-0_p20140812.tar.gz 111389 BLAKE2B 13cc74fb8844b0486e593ab62e5564111d0a01361edfb3be4c8b0ae3bc298d0043ad80a33318a407236e74f0d9bcea2f87ba4681db4d34ad8818a32b8fa0e459 SHA512 d951094e290bc914b418c165106368d6b73634ffb177b770ce53baaca4cd6026967f11d602b3e687e59a49323c7af1af74913ec1a911093e4e32503025842cb3
 DIST go-fuse-0_p20150422.tar.gz 110741 BLAKE2B 4c01af2a86a97ea9d0309066bc032aa41847b74edc18bc91483fbc789e143f297c90c7fe89f7c376ec0f12859d337a271122884bab79b4e9a94f95bacb63e426 SHA512 a0c9fa666ab39632db258baa5bf6ba1546aa847beb0d4a4b812a96e66d8573e3c0a0600ad24e16e314fbd8082b36027a3e1bc2092667766f611b1321aaea70c5
-EBUILD go-fuse-0_p20140812-r1.ebuild 1403 BLAKE2B a627a52d58af5618e1de30b0a75e4024c4c9f9ebd90125ea419e64db3ee7acc9fd8b678989eb710ffafe4a5ed014f44e9d40ad7ea13264bbf180027946eb9593 SHA512 84394933986ecadcd3d502de94f3683283e955678f73706d904776bbcd244ed584fff9b4bfae06318bcdce947abd3a7b8eaa5717938d5cd8d0a92fed62b99f3c
-EBUILD go-fuse-0_p20150422.ebuild 1199 BLAKE2B f73afb16724857c45102225910d27ee453c29df9b1fe974c5f1d18dd2c46986065e64fd1d19c1047d54dba3b5cd46bf5a4a320ff115685d7e883f58275689dbc SHA512 d58082ad9f749e156269cfdddd7bce9b66f18414be9294d58cb48b04295e6fa99b7bb5567b9349c34ff16c2b56799adf394e0c93e02f6f06234863b460ccb528
-EBUILD go-fuse-9999.ebuild 1273 BLAKE2B 594609089537158de07827453db07f85ea6023a28a172edf65a09ca44d36a545a16f8de5fa5c1a61114656081ecc6c62be4c58dcc287f64b60510eac96aa09b4 SHA512 d38a8926f9f12f3a51d462734e7e9ba03c641eff7ad8e315a12876c3c55a56514fb3e8c4f43aa4155accb86f07b23ea20ac7c65131402f5accb7582e8d9707e2
+EBUILD go-fuse-0_p20140812-r1.ebuild 1378 BLAKE2B 864e049e76dcb7108bccb553fcd76854b0b110c829d5f1b45138492669c9841f6dc22024aae1244cdcafa32cb5dba9bb4c5f7c521fc1e6c25008b824f09fbfb7 SHA512 0a157e7664d801c3b2318c4ec04f5ffe01a2e2406f64b6edd5dae60b178bec75cf04ff44f6a56b3da29d331ddc98d6e7a2208ea0ba916d6d6cebc352cb1eca70
+EBUILD go-fuse-0_p20150422.ebuild 1173 BLAKE2B 434725573159f029575a857c8182227a039af469dd584a56da1e1445703b71ea79423ea1619c0d9bfcf5b3f148d018a922018ae99cfb448ff179118cb10fad1f SHA512 8af3d601d8741f7cc7223c75db5bd3ecf281920a113555449cd5b494ad567969d8ff7a5a1b3c10d7fa52e59be82a9fff8236eab5f64f1a0628b710eadec7539c
+EBUILD go-fuse-9999.ebuild 1252 BLAKE2B ef765f5b5aae88905322863d107a4a0e93ee27951b5012db404ec74368a7252905ddde07e83aed654bf2d7a58bd69eef985c1e3c32f53cfd6a4a6510c5b0232c SHA512 cd0e37fb26f4ca74dd257977862417d7995fa5d6a2e08a2050325465506c484f3f016f7d96391cd06da926ad4bc1cb3610b6721fcee7f446454776f3759ea325
 MISC metadata.xml 336 BLAKE2B de18fba9c2787705a6a3589ee62ac0147e67b24717499e2b2072a876e44b7529c7ddbd8ac238b6f13d0e1170b608d5de19bb9715825b333f771fc3b29aea21a9 SHA512 d8919ea0b18f378d1dfcae8879976485da1fe27d700fbad0006a9e835a4e87ddae1e91703be9d6ec6d8232737049805f57adf93d9cebbe64c7ad82bf1fed7373
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
index b962c085f6b5..0ff5a2228922 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -1,9 +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
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
@@ -11,19 +11,16 @@ EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
 HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=">=dev-lang/go-1.3"
-RDEPEND=""
 
 RESTRICT="strip"
 
-S=${WORKDIR}
-
 src_unpack() {
 	default_src_unpack
 	mkdir -p src/${GO_PN%/*} || die
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
index d432b751b899..2a069dc0c67c 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
@@ -1,9 +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
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
@@ -12,13 +12,11 @@ HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=">=dev-lang/go-1.3"
-RDEPEND=""
 
 RESTRICT="strip"
 
diff --git a/dev-libs/go-fuse/go-fuse-9999.ebuild b/dev-libs/go-fuse/go-fuse-9999.ebuild
index 6e408999381f..a745fe10ed3a 100644
--- a/dev-libs/go-fuse/go-fuse-9999.ebuild
+++ b/dev-libs/go-fuse/go-fuse-9999.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=5
@@ -11,11 +11,8 @@ EGIT_REPO_URI="https://github.com/hanwen/go-fuse.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 DEPEND=">=dev-lang/go-1.3"
-RDEPEND=""
 
 RESTRICT="strip"
 
@@ -26,12 +23,12 @@ export GOPATH="${S}"
 
 src_compile() {
 	local d
-#no examples right now
-#    example/hello example/loopback example/zipfs \
-#    example/multizip example/unionfs example/memfs \
-#    example/autounionfs ; \
-#or tests
-#fuse/test
+	#no examples right now
+	#    example/hello example/loopback example/zipfs \
+	#    example/multizip example/unionfs example/memfs \
+	#    example/autounionfs ; \
+	#or tests
+	#fuse/test
 	for d in fuse fuse/pathfs zipfs unionfs; do
 		go build -v -x -work ${GO_PN}/${d} || die
 	done
@@ -46,9 +43,10 @@ src_install() {
 	insinto /usr/lib/go/
 	doins -r "${S}/pkg"
 	insinto "/usr/lib/go/src/${GO_PN}/"
-	#for this ebuild, to fix bug #503324 I have limited what is installed
-	#another possible solution would have been using adddeny to the
-	#hide installed filed during build
+
+	# for this ebuild, to fix bug #503324 I have limited what is installed
+	# another possible solution would have been using adddeny to the
+	# hide installed filed during build
 	egit_clean "${S}/src/${GO_PN}"
 	doins -r "${S}/src/${GO_PN}/fuse"
 	doins -r "${S}/src/${GO_PN}/splice"
diff --git a/dev-libs/go-usb/Manifest b/dev-libs/go-usb/Manifest
index 4022d53e3ece..25a03afdb643 100644
--- a/dev-libs/go-usb/Manifest
+++ b/dev-libs/go-usb/Manifest
@@ -1,2 +1,2 @@
-EBUILD go-usb-9999.ebuild 588 BLAKE2B d114ce899e91535cc0fcd3f72e485c97dc92f2bca5f95a6333ac97e8d976675041335808cc3a52bdaa3a541d65ef6118aefccde2e23a1cbaf95f2537e7c21bc2 SHA512 47cf595cff1e86834df60a21f5bb729d664ae8b111c807d440a5d54904b4bc4a9e19b4b83005d33b973451dbae687f642de32221f8ea94f9e56ff5d090806068
+EBUILD go-usb-9999.ebuild 545 BLAKE2B bfc1e00d0a4f9d6b5d950fe4551bb639e47745d798626e36bd65e3f0d01ddeb87795a77fa4466f8546c9f7e089425d6dd8aa75ce89dbf6e736e5536fa716ca05 SHA512 3f525110b6a6657fd0559442725270323c21d27ba9c410c45c0fb4c39d4dd93407fd4a22c47410b02676e698cfd50fe0d54674ee9960438f49f201ca9ae1119d
 MISC metadata.xml 332 BLAKE2B 5015b049d96897d2a7969096f0ed50a6606139d982a16ab849d0a908576f4c5bd2f2c17b7fd1c26f5ba4161a9140e9126c531974d57c2cf899e44736253ff4df SHA512 72d224af53ac4c93a252eae5a518d76abf05052e9a268ee007cc7e03f96ec5e673b6c7e83e4de15ea9f6e1a2222f7fe687fd10834b45edb7e638d75f61bb9cb9
diff --git a/dev-libs/go-usb/go-usb-9999.ebuild b/dev-libs/go-usb/go-usb-9999.ebuild
index 7c84be80dbe4..1cc0b177b86e 100644
--- a/dev-libs/go-usb/go-usb-9999.ebuild
+++ b/dev-libs/go-usb/go-usb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-r3 multilib
+inherit git-r3
 
 DESCRIPTION="CGO bindings for libusb"
 HOMEPAGE="https://github.com/hanwen/usb"
@@ -11,22 +11,19 @@ EGIT_REPO_URI="https://github.com/hanwen/usb.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
 
 # Tests require a connected mtp device
 RESTRICT="test"
 
 GO_PN="/usr/lib/go/src/github.com/hanwen/usb"
 
+src_test() {
+	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN} || die
+}
+
 src_install() {
 	insinto "${GO_PN}"
 	doins *.go LICENSE
 }
-
-src_test() {
-	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN} || die
-}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 69783f551b93..c76e79ce3a58 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,9 +1,5 @@
-DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
-DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
-EBUILD gobject-introspection-common-1.62.0.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
-EBUILD gobject-introspection-common-1.64.1.ebuild 920 BLAKE2B c58eabe410ac713f0c2110d056ce3c7093da7bfab6aafa05eb44b040147eb012ae7e0a673739c889cab9fee60059683ecc45aa553020a48935c389737915e3da SHA512 13054c33f67fd99e8478d1ae5c9d3c6aa7ec5a1fb2d6365ca4c6f033c6c4dfa908bb56b1f0764bdbd7c2b468b8aeb27b063633650df52d2aee4792ee56883600
-EBUILD gobject-introspection-common-1.66.1.ebuild 933 BLAKE2B 71ee79d00a27e507813d457e42cc47c0f1e1ea632658a00aa5a136f85c730f7c8eb139aae1bdfb1e6973f59c5592b6ba81698130e45c343b5edace9dfcdca605 SHA512 040b38d3f00bcd8971adc567f5001db0a4997305790b6cf8f490bc21ef4dbe664cf0745e28ba126fd50844c712273aeee463c3e365fc6529b75dd3ed750815b6
+EBUILD gobject-introspection-common-1.66.1.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
 EBUILD gobject-introspection-common-1.68.0.ebuild 936 BLAKE2B af10d956a35e545df5668677594a4f138f89d5fea027dc7b17ac5a54c9f7bd1f764b13445635809914adb1f6dd7ff1749fe40ee43d2550bb1240dba33858d1ce SHA512 d4a952192a343d32ea4c33ade3aebcf58efa6ebbe05c4234f4db2c1a0a12f1468f5815bacc01e0098f104b05ed61104f1a779c7db0580534b2451af7a23bce12
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
deleted file mode 100644
index 9237db2d3ea1..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-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=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
deleted file mode 100644
index 9237db2d3ea1..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-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=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
index db1675cc69c9..483d8f843f5a 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 974c11af33d5..6f93213e3eec 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,9 +1,5 @@
-DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
-DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
-EBUILD gobject-introspection-1.62.0-r1.ebuild 1859 BLAKE2B 795ef4666619c07a748877530d15eabfdd36b7f879c443302aa8e7a4df838ef4c5b542d05d7501ef327ae9d29122dc386c915b4349f3aa7148251c575a5436a8 SHA512 8907970414f5b476118aa1767723af2a89dbad574b367e3b1ab72ce6b6a7fb53b8514cf82edea6fa6626a529da2f0965cc8492a776f5bec7f9623ee816e62f0b
-EBUILD gobject-introspection-1.64.1-r1.ebuild 1991 BLAKE2B 08b7dba997ae74f49652ed88a627a9ee4a78b87bcae3c51f0965ee7b19955fd7e5f7be57658549ef058d41482b3168733b9ba38282d33397667406b323d8a65b SHA512 7d840f3d50e3bc413b0802d8d0fe2914b885b5bfb3f85f92e1cbff73a56d6d72c1ccfa511cd8f8c3e3d610e80b1ff931876a8b2444081cb867a6ee18ff4d908c
-EBUILD gobject-introspection-1.66.1.ebuild 1999 BLAKE2B 2725fbfeecf0e0409c534e849b320d5513967273f8c043a05878361634e4cc9966f1fa4e9451929fbcbc5da80c51f4473e76f070539408232586744b99808c94 SHA512 eb8d4dd24fc807a9cf2ece4b6b262b9a5f8145f44d026ec8747989bca59f50363bb67104c6d042e2ea1defdd435e0a6178592f7baeb8bb7ba561cc090e5b8502
-EBUILD gobject-introspection-1.68.0.ebuild 2002 BLAKE2B 7b07d4469f899141ab22f76b3ac2edc479bed6c0634b4da5b1486c54a51bc5d5caea1b85cfe5611155dae13e9ed42c673782accff1f14becbf967c38293df532 SHA512 05d809a40a9cac45ce04e0b9079fafa562ba38d1c6cae12ba144b7ddb0bab18e5f8c2d7954e541e6fda50b254b6330cfa33c409c55b6edbee4aad71bc8422c3e
+EBUILD gobject-introspection-1.66.1.ebuild 1978 BLAKE2B d7f800483e3ab052eb7145aa5b75f77c638d18e2fa157f1fa6688d15c4c8eb5fec5c38d794501a68d594f954d9086ed045ff7688ba8d1ab11e2c005a0090a64c SHA512 3a07d8938879607fc037572828ad66f4e2330b41c9e2ce667ad523c7c6d9855ffced9f731720a70e5f4dc0c75017b6c207ed7613b7818bd8cc0d9df4376a4f0a
+EBUILD gobject-introspection-1.68.0.ebuild 1986 BLAKE2B 59da2442f58a0c2e334031fe5eaa24b138b9f506ba5a12787a31c9b57ef3bdf24721ec43943976d25b948e73fa6679240f306a916681cdfffb239151c3ea4523 SHA512 0e7907beb30ee32fe16c399db6feb2cfdfdd5efedd4f0dfa7db211560e4e2b970281ecd90fb9f3d504ab2058654a16c8f55bd0ff0b676f0a142a065adf7317e1
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
deleted file mode 100644
index b2247558d7c3..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? ( x11-libs/cairo[glib] )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test cairo)
-		$(meson_use doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
deleted file mode 100644
index 22d9fced0c39..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
index 9a97f44f7394..d71b7d125b04 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 toolchain-funcs xdg
+inherit gnome.org meson python-single-r1 xdg
 
 DESCRIPTION="Introspection system for GObject-based libraries"
 HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index 23eb08dfbd85..a573126690d5 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 toolchain-funcs xdg
+inherit gnome.org meson python-single-r1 xdg
 
 DESCRIPTION="Introspection system for GObject-based libraries"
 HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 9e4e9f4084e3..d032d246286e 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 1436 BLAKE2B 4d67f96b5073f62386ef08c68faadf17968af6738ab56efa4975c80b4f0d3ca2d493b587326d45d66ff043787b083f63ac95411daec86e4527f4216dec8aa348 SHA512 2d7199dccabd8192faad41bad00e6587630fbe2be2972c58000f5a348b389b24d32150b377a385e20622bc008b468103c6bd4dbbb218d5d6293d6d7b6036b2dd
+EBUILD gom-0.4.ebuild 1437 BLAKE2B 2aafe9f0c26726614b251351e3c692f78f696a34fc0e988ec125c5f02da442747918d3c4adeb03f9d0e7e5f891e500f524776e134ee683dcc92b062c5396da83 SHA512 290e27468dfef10a420cd36f87e4f94bcf3a999118bca75cc4509150917d040c87ed737e876819deb9438e102c88a01d0a90e352276c0f1146839661d5902518
 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 3bcf4b239602..ed2f7c4b147f 100644
--- a/dev-libs/gom/gom-0.4.ebuild
+++ b/dev-libs/gom/gom-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org meson python-r1
 
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index a5ee5c10cec3..924ddb390171 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,5 +1,7 @@
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
 DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
+DIST granite-6.0.0.tar.gz 442902 BLAKE2B b142e13467f88522b910338f7921801914186ae567e99dc640474f0edff2ee464ff98c755fac742cabee90dba55a302e1642fc65989f50fe4d0eebc509b5c78d SHA512 7e856eed992a81b896c39c753897f95997682a8c754d33c0c4b032645a77d191111767968e07831948786088fb0cc52441551ce1c5f585f58a25cc147196f0e4
 EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
 EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
+EBUILD granite-6.0.0.ebuild 826 BLAKE2B 8a8720efd9c6cb7ed8a1e46f0e22fa6de6d645f488a3771713391b5a30dd955dbb0af3ad5bb459b92e48f92755a18559c0946ed3b18c786ea7d312ab9de93fa7 SHA512 4489acb0fc3fea97259fa7752a60abe78e41d6bb8fb52342aaba09c3725d6b8834f3af7758441d7509f1d7cc00e31180482f06faaa4b39b0bcca7a51141f4df5
 MISC metadata.xml 774 BLAKE2B 9e6ec6d0fd5d7317eab55cb85f4595521e406bc29337a2524d80edfeab3bc94b149e714190b2be764b2f620a4c3a6fc5f8a622c00a7d04492fdbcb14c7f0e178 SHA512 17100ad403d72b53479e9a918cfe0da4ec1375395fc1f9d54263835b2db81c9affd4fbcdef9f25f37651a8080ac9cd4e1ab962461dc2e20c8afe89653d3f50ab
diff --git a/dev-libs/granite/granite-6.0.0.ebuild b/dev-libs/granite/granite-6.0.0.ebuild
new file mode 100644
index 000000000000..e63ea67376b0
--- /dev/null
+++ b/dev-libs/granite/granite-6.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+inherit meson vala xdg
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3[introspection]
+	dev-libs/libgee:0.8[introspection]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
+src_configure() {
+	# docs disabled due to: https://github.com/elementary/granite/issues/482
+	local emesonargs=(
+		-Ddocumentation=false
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 7ba1857c8d39..6979bfd44fe4 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -3,6 +3,6 @@ AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6
 AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
-EBUILD hiredis-0.14.1.ebuild 1896 BLAKE2B bcd029d45988f3d9062c5a04280c3f32411675b11cddae223a5cf23131200449d0a0fbe671bf309d14a946d92cdb3a05dbe25ba8b22c4ae31d39e2b3b6ff92bd SHA512 d77e215352c7916fdaa6d48971b3996bed7cf11f9b8ce24269d1172387a368af582bf65b3f8943d92412e8943133751df5778aa96985deabf6ec1c0177b021c6
-EBUILD hiredis-1.0.0.ebuild 1920 BLAKE2B e9e52cfae8466badb34ab305bf3eae01bed4c0f2949305d7180f240b4b25ddab617ad652fc1d469210b4406b8930740532d879f01bc882a23dc8e4883b5a8395 SHA512 f8322d09b80a8e674859f6a2b3163fc89a15c2ae1173d8909ee4e6cf24d6f189f9d4cd604e6d3932d727dc232c21482c22f031d4eddb01d226f2df5cd028c326
+EBUILD hiredis-0.14.1.ebuild 1897 BLAKE2B f247584df6ce3646f5fe5a9e014910d0a1392679b596ab54bc0879914ec63e45a9d0e0e8d27c29ffc41143bd7f033cacf24ca3103fb56cec816fd0e2455bbe87 SHA512 4a2f9e9f98f842a30051744892647fa3b2c9e91b0a8c117215609ad4ffd66a599c2b6603b3b4fab5815b21488176d103d9fa29026b9f1cf437ffb30c1db67167
+EBUILD hiredis-1.0.0.ebuild 1921 BLAKE2B abbfe4ad5d4d1eb5956c119fd8ba1c25e0782ca2421f1fea033a84a1af4f98763863459786cd216d97301bab0ac23ee4e9addf2076951613f510dc1d27587540 SHA512 2bf2265d384b9bde244d94fcbedbe16c6a91a09f4fd8465f50e9bae9fed6dfa5f7fbad299d5bbd43a5829ac4eed2ac721b45eaa069e5990342c5325b14b112c1
 MISC metadata.xml 403 BLAKE2B 77095f90219f95263b17fa5413af441651aa6a56e8bb4f5a4c763ffa7d0524f1ecf2c2fa0819f214fd519fc783071da31cff6d2c329b36befa9cbac64ccd9072 SHA512 08e5981022c6e6b88243dca594b48733707d12ebbeefd3f41d7818d2bd46c362dc0869aad5757b8909d292493f4732834bec1e34cc438e401d57ee871421192a
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
index 81bbbb4420c3..8711e421b030 100644
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.14"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index b9046749771f..b66961f6faf0 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index c222daf5ae43..66bbc34a17ac 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,5 +1,3 @@
-DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-EBUILD hyperscan-5.3.0.ebuild 1289 BLAKE2B 74be6787446cfe317f42518747191e76c732e6d74cefb93db6ab4dae5bc1253439aab7016a9e2b2e2d1fac6d705b35dc9e9784925352c0d6c5ec4676c27d693f SHA512 7677a01807bacbdfb054c4a77503ed86a86a1d865cdbf10737e830d7b2d4ff833b241bcf8c64c556581fc31db4e2987e6fca5d50d6cadd25440629d9260cdb1f
 EBUILD hyperscan-5.4.0.ebuild 1363 BLAKE2B adc6e8411b9d96faa2315242ad2bc072e84736791c9d5a2129d7120333213a57dc1d75b882afba16abc09d8dbafa4815538b983063809fa351b7f90b6a74868b SHA512 f3d4b3135c522b99c365b4cad575a7d92681896c3501e551a2cdbe2d35c8ae1eecb6af933a66634637f493804255afc306ae6fa975e9e284b1c5f6eee1225c42
 MISC metadata.xml 592 BLAKE2B 34be91efe23c3f15a33721893e48d8b963b9a27b6d2ce58eadfbc7a90cebbbf83f14231b9b843205d6906ceb69b5756b00326b32732a91b3abe0b49cf26e88a6 SHA512 c1a119770e21839d0775f898453e8dd7392fd248bec79a794702ade386edc7a1794359c1e4b368148f84603daca09f303c92d660473a5b45a0ab88e60b90e8b2
diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
deleted file mode 100644
index e05b00364aaa..000000000000
--- a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ragel
-"
-
-# We can't default this to on as it's against the expectation of
-# how CPU_FLAGS_* work for users.
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_prepare() {
-	# Respect user -O flags
-	sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
-
-	# upstream workaround
-	append-cxxflags -Wno-redundant-move
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-
-	use cpu_flags_x86_ssse3 && append-flags -mssse3
-	use cpu_flags_x86_avx2  && append-flags -mavx2
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
-		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
-		-DFAT_RUNTIME=false
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/bin/unit-hyperscan || die
-}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index dc99bf30b672..f117cd21783d 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,4 +1,6 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
+DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-layoutex-68.2.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
+EBUILD icu-layoutex-69.1.ebuild 2508 BLAKE2B 4c9ffe7646a368f7ed77e09eecd0c316eadb0a4a7dbfaa4ae87661a91f0625b8cc1fe78184f34edb2dd7cfba946ff915ec99d621fcab2d1fec7b7dedcb7db77c SHA512 aa19d35f20cd9503458e4eab052c6d83667c92eb7be47bf653c61db17cf51b2717317c36adc90c6ab89985770992745cfc10949a759781f56fa567e6ceef92d2
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
new file mode 100644
index 000000000000..9f0d780f0e8b
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 8f1c8ef1696b..3773fba1f703 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,5 +2,7 @@ AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
+DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-68.2.ebuild 3513 BLAKE2B 96030ab9f3819d5c9d60adc9cb044150abf0adb958bef0925dae595ea4139bc80fc02d1743df56feb6b9a4ee8235d62a24280457710f6a51d720746535a50b1a SHA512 f1aba2f2669183077e5d46356ffaa570b7dcfab7531e0e4c33b6b6a4d1d8b19ef63422396b9dd8be03488089faafd4e66d61e60c763330f94dc03b9d83d55e63
+EBUILD icu-69.1.ebuild 3521 BLAKE2B 78e7c37da536a36de76cd071139c037935c959f5c15448107b2508e6e9ec325f98fc194d5c08dcd101e37bedeb188ad823ee44475a6dba12fe41df3137f218b7 SHA512 d9e95da2917901daa3c3189d2055de4a96794ff990e557bf7ad58b9bbd653e47faff354b4e9c63effe846be2c6f1465792caefebefb2366cb7b94c20793438b4
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-69.1.ebuild b/dev-libs/icu/icu-69.1.ebuild
new file mode 100644
index 000000000000..c460afee8489
--- /dev/null
+++ b/dev-libs/icu/icu-69.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://site.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# work around cross-endian testing failures with LTO #757681
+	if tc-is-cross-compiler && is-flagq '-flto*' ; then
+		myeconfargs+=( --disable-strict )
+	fi
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index bf0c3d0afe83..0914520e701e 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,9 +1,7 @@
 AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
-AUX igraph-0.9.0-cmakedirs.patch 356 BLAKE2B ddef81838cbcd7142f1ac31b276bafd9e490ac4951e09a1624dd5479f534245abb1efde09455bf633af07b6f6f550739cadb4809094ae130b6aa2ee5321e1338 SHA512 ebb4bef1fa95e0b62a788df1d34b965c8c91e3adffdcb5444ff40c498c120eac1568dca1ce56527c8447422a780b984e23f46d8f073b53a6cdf31451a3470d7a
-DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
+AUX igraph-0.9.2-disable-broken-tests.patch 378 BLAKE2B 7f3748ec5d9ed8f9f97f638ebfa353a8373e3d672fbd4f0e697aaef92c1ac926386ee4fc38d94e2f2bfc1bafe0b44922f7c1536016ca6d7334bd419006b66f2a SHA512 93f4509b498eacb384c8af9d52c6c74efbc50c15e178d365774140421eff7005f7428e7f7da2d58cfd74adfda44e833e1b2fb54d220b6a64bdb144bf8fda0e7f
 DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
-DIST igraph-0.9.0.tar.gz 3752584 BLAKE2B ab8724de1fb57fda1250a9a3e1958609004731f72d38c225c23a94b7ad39af8af7a269bb9e9a2cae28b5d4038acbb0fb4f12bc90831340f59cdafa75f4b7c264 SHA512 ee6ddda3ebb9fb01029a3efbbab2329516d42ecb3030c57e7a78c8d7f28b76650fb4f3245e993cbef6161de6f6a1e0a4f5ba2533cbd8271df72554561b4f407f
-EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
+DIST igraph-0.9.2.tar.gz 3805091 BLAKE2B aa0e140a9dc8e1005f7f9265aef5880c071fab63c5914c8d93fc7adcbda84d7088678cdb6c277d40bc5998140c70d4a3b359517a4e3583153d1d7233ae8ba42d SHA512 8feb0c23c28e62f1e538fc41917e941f45421060b6240653ee03153b13551c454be019343a314b7913edb9c908518a131034c8e2098d9dd8e5c923fb84d195b3
 EBUILD igraph-0.8.5.ebuild 1177 BLAKE2B 0aebcbb3875bb2ee611d6e35fae031a41cc0eec694649e573adaa3cf987099b2114417332b930102a3b817344ef30f5c383f4f72a70ac9dfe7d3a0caa8397207 SHA512 b8c588bd5a802b2c879d02e81d6c5cde176ff698739423eeb4de5df89cf03d14e70030218b957974f4b65278922116ae0035bf9ad3da9cf9ba275ada0311fdf3
-EBUILD igraph-0.9.0.ebuild 1079 BLAKE2B 6ba6490a7a042c441e64df9fe37cf03d8c078cdbc5b970431007a720d4a80d4c39154948b15eea4496266be58a298380a27c666dab001beb81c77ff07da6adde SHA512 2fcca50517868fde197fda25adc3c827abaecf903f9b67c1792105ee32aabc15ae3281cdf2899d41ce2ef9f413d43eb8b6caafd154f49373bdb3e2df0badaaf2
+EBUILD igraph-0.9.2.ebuild 1090 BLAKE2B d883cb49549f5d829bfb66f771b2aa2e212fc86502f68b08031b4fa70abefdf771b3e82d427407fc892493df7d818213d81eb4adf393356a4ff245a182836294 SHA512 0fccd719667534d855dffe24648ef1e17793e5d5ba0c602b3d0b75232e832b5dd8651bde81a258358a9b748d38f0ecdb47c8cc180a990ec9d0e84220d8cd8043
 MISC metadata.xml 821 BLAKE2B a81ebb12eb30401f4a4d19a16f45d50455588465cd22cb3604ae9bdbbb949645efd0ea0a4d9e01bc330262b1a51f0cddb9a4a03ef32d7fab236b36ffe2159bf2 SHA512 8d5fbb68495909d06396bfc2456911b7fbfdd4d4c0bbe946435eae35fc23eba7d7a790fa696f721203a49681ea9af0ca0d6c86281be41ce5419d5df9ca8eefc2
diff --git a/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch b/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch
deleted file mode 100644
index a7682d41e0a4..000000000000
--- a/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -440,8 +440,8 @@ generate_export_header(igraph
- include(GNUInstallDirs)
- install(
-   TARGETS igraph
--  RUNTIME DESTINATION bin
--  LIBRARY DESTINATION lib
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
- install(
-   DIRECTORY ${CMAKE_SOURCE_DIR}/include/
diff --git a/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch b/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch
new file mode 100644
index 000000000000..9bf9ed7bc764
--- /dev/null
+++ b/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch
@@ -0,0 +1,15 @@
+upstream issue - https://github.com/igraph/igraph/issues/1694
+
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -678,10 +678,8 @@ add_examples(
+   FOLDER examples/simple NAMES
+   igraph_scg_grouping
+   igraph_scg_grouping2
+-  igraph_scg_grouping3
+   igraph_scg_grouping4
+   igraph_scg_semiprojectors
+-  igraph_scg_semiprojectors2
+   igraph_scg_semiprojectors3
+   scg
+ )
diff --git a/dev-libs/igraph/igraph-0.8.3.ebuild b/dev-libs/igraph/igraph-0.8.3.ebuild
deleted file mode 100644
index 186bd9a51133..000000000000
--- a/dev-libs/igraph/igraph-0.8.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Creating and manipulating undirected and directed graphs"
-HOMEPAGE="http://www.igraph.org/"
-SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libxml2
-	sci-libs/arpack
-	sci-libs/cxsparse
-	sci-mathematics/glpk:=
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch )
-
-src_prepare() {
-	default
-	rm -r src/lapack optional/glpk src/cs || die
-	eautoreconf
-}
-
-src_configure() {
-	# even with --with-external-f2c
-	# we don't need f2c as none of
-	#    arpack lapack blas
-	# are internal
-	tc-export PKG_CONFIG
-	econf \
-		$(use_enable debug) \
-		--enable-gmp \
-		--disable-static \
-		--disable-tls \
-		--with-external-arpack \
-		--with-external-blas \
-		--with-external-lapack \
-		--with-external-f2c \
-		--with-external-glpk
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/igraph/igraph-0.9.0.ebuild b/dev-libs/igraph/igraph-0.9.2.ebuild
index d825b06fa454..7d9cab598422 100644
--- a/dev-libs/igraph/igraph-0.9.0.ebuild
+++ b/dev-libs/igraph/igraph-0.9.2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	virtual/lapack"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.0-cmakedirs.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-broken-tests.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index fdaf2280d7c4..4a104ab86996 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,6 +1,6 @@
 DIST inih-52.tar.gz 16808 BLAKE2B 12d4078ad7b6a4013ea77239c486fb7b5e9165252d4a67ee57d60fc72a98f15ca537b610c7b22841cc660e46bb424aa5c9b7ed1cf2462600a2aa58d40447ba90 SHA512 14c0d0dbd78efc99bec8df12067107d130eef8b124e0616f7d83dc4e14530b57f0c8fcf0b8862d425b5a0b84d6c6a6bff7b3c852c9b2e2364ef56c8f64a1f339
 DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
 EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
-EBUILD inih-52.ebuild 791 BLAKE2B 09983b3a0fecbc3bc76218f7852778282568682a355c2e9644205b8adb0efc6b4710e5611b08c674359ac828aaf8c7797788601f0eac5ac3b9b5854cc2f9a0c8 SHA512 6da75c3754efd2dcce6e7c24e13ed14880427d6291d2d01e35c15b4d67b1ffb2c2a9d390ed4b0c73e56b1593c1d31ca0ed91914543aa150b2bcc3eaacf8a8ef9
+EBUILD inih-52.ebuild 792 BLAKE2B 3951febb447caa2fb0941f4d5eea045f38dcc4025307844769289443a74a96db6591f0c40c097e5910100b835678030b2e74f16cd2b32c63d2fcb5974968b972 SHA512 f86ffab553d7205dd69fbbce5c68f878a4217dcb1e4c02b1ab189a15257a6190e011f01b002c54cff744e89c25a82249e32f554d48789f6704be5dd2041e78e9
 EBUILD inih-53.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
 MISC metadata.xml 519 BLAKE2B 837ec41139390ae96130a1be2c25e178f4ca39a655a263e1be689c3da09236c43cc9750d07af108577d54663710ccc0cffb5fc432b0320c9c3f55177424ed35e SHA512 b9c05b7b9e8314a943215b721862d16b361306cc715d77250eb5e4fa1ac24f22165b8a79465188f4b5e3dc2381de72821c76b6bd6b6c7b966a3c6697209a8234
diff --git a/dev-libs/inih/inih-52.ebuild b/dev-libs/inih/inih-52.ebuild
index 09154cf1b6eb..a9416cdfe171 100644
--- a/dev-libs/inih/inih-52.ebuild
+++ b/dev-libs/inih/inih-52.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
 
 SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 0a90dee0848b..0a637c163bb6 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -3,6 +3,6 @@ AUX iniparser-3.0b-cpp.patch 1032 BLAKE2B bc558d7c0263b2fef25a0cca617a717378a203
 AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c67ead108150375d850d6afe6f57815e9c4b434415596c514632e0575ea1cdf0cb464d6ca12e47780db5cd237bcf38849771ee41a SHA512 f1f01120fbf740cce5749f8ee9ba2014794523bc045999f45ad28a2bd4842d1e822b65fab2feb0751cba074de956c753949fb8b188454daf129c1ba8f0b6a1d4
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r2.ebuild 1252 BLAKE2B c3c809050f2b6c66f01d176fb572b0db720aa81b4ace43779e2b260bc152e7f385a32033651831b50e2ab697a88ecd7827e9d973cad78a4e358fb26abb30aeaa SHA512 ec4d773fc5abc0ed938a3da74831ed3c78b624792c4d4a57352149811f3243a5dd28a307715137a4948ce4b1965e1806915cfa579022321ba1466d2110e2a2ca
-EBUILD iniparser-4.1.ebuild 1517 BLAKE2B 99c0f357597f64dcd60f14286b008734efb6be67e3f4e876e1a754507aeb695b839e4a2ca6b00d928cacb164e178ea21fe0118610fe9084c8c2e1fb67ac9aecb SHA512 ad844f55ab76916cbcb3377fee3956706eeed73c068f7371f579b45d0af93db31473a225cc87bf89c9ac5a0bf4e0881fa84cbb7a7f05d8948914889921426c0c
+EBUILD iniparser-3.1-r2.ebuild 1253 BLAKE2B 1722b381eb3374c140190731a14fb0107793e7a066b300eca24b38ef82a0ff10258a76dd89269a38ef621edc5fc455d3ee2766a9c231d86d5546cb1977f6e013 SHA512 8dee9bb632dd198ac1bca4d6fe14974abec2a3a67ab99979e772ef956d27d66815df1f5d060c274d5946b8855d33ffffcc58ce68400e6fc4c289a79238acbd96
+EBUILD iniparser-4.1.ebuild 1518 BLAKE2B ef72db016c415698b04a70f6159d8793395107fbdf897a06985561b288506a0b13296a45e97a8fb67031c9697ebe5bd20833e686b85d069e64c4d85f218a7db2 SHA512 26ba8dd3133e02739fcced145f3c450aeed48f20b9bec0d73aac155f67e0ef0eba35224931cbea747929af6a96a0797c2db8fa76aa7fcddc98e8c69d96526897
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index b1d29efbc66f..43064dc3c80b 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 # the tests are rather examples than tests, no point in running them
 RESTRICT="test"
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index d524ee1cfc13..d964286c74f8 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index a3181187b1a3..82d3c1afee5b 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -4,5 +4,5 @@ DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf7
 DIST intel-neo-20.44.18297.tar.gz 3586089 BLAKE2B ddaa719db25bb9b57b76a47c438e7a3185a15ce0863665efa7dd205354684773dbc89a05c943a87987588dcc2220683b47e7209ff959b2a8ad596090ff253c15 SHA512 919aba7cde56304c84db7c7ba30c53fabcca72ceab362a2b406f5ecf124e1c024980c29689f19b173b76c903da1cb25a4f1e4b19ba9279bc6ca2ad1d100e046a
 EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
 EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
-EBUILD intel-neo-20.44.18297.ebuild 1260 BLAKE2B a0bb152b9fd94a30ed9de552611b461e65e82321c9e7f29470f724b42edfa345bd11cbf13b0e7daeb1ae536b4fb3f7368c2eca30fa177c04f91f7fb24fffbcaf SHA512 3480f3bbe928354b9240cadcc244676f7d4814417eca30568787304b73b4df160f90bb3dabe23b2eb384e67081bf722ca832a70bad0d20e6e28faa8618dac64d
+EBUILD intel-neo-20.44.18297.ebuild 1314 BLAKE2B 3331dd0deadf7f23c93062f4b6b2fccdd8321ed89a088184c39033c7de25a7bb308c38d0e898115ba0536b9cdeabe0080ad693824a8565b79e38ff3b25d97cdf SHA512 5758171c4fd80b1c07c638f4491dc20f253141c45b1ba5366eda8ef048291a47e66d737def616db408b91444a70326688ab62124378bdd824f5c190031ca89d5
 MISC metadata.xml 1094 BLAKE2B 47c0260920268a5e8cce5344a9b734a37bb550d6302a1e08bb617ee772a6fe6d8a11a2683d00b3aab525a7a54974f73e19210f44352b7927b5de57d53cb4804d SHA512 f610b7b2d81cdf52cca290a9ca574feb84ca8447b9c0944e42fa73d0a0eb52c13b1045cbd118606f12e65bd059bfaa3f8d76ab10c3a48bf16b2be6b3f5acb166
diff --git a/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild b/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
index 0499936a2f01..a83773bc9149 100644
--- a/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
@@ -44,6 +44,7 @@ S="${WORKDIR}"/${MY_P}
 src_configure() {
 	local mycmakeargs=(
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
 		-DBUILD_WITH_L0=$(usex l0)
 		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
 		# If enabled, tests are automatically run during the compile phase
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index d651b188ea2d..3b010e61d68d 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,4 +1,4 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
 DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
-EBUILD isl-0.23-r1.ebuild 1945 BLAKE2B 8355a8123cd3d180220fd832fdb8ccc40825ef790207697669a263c7ef3d25df4408c18b05580a48da92d7c09bffdd173fc6a8750356221975d4261b4fc06f70 SHA512 3e97137772ae9412c4b99ecd908dc5dcfd0b7511b07a00f8c759374fea77c51f694973d58b5a24b6d9566ed02ed11344c830f1b5cd1b2167a185fed248ce92a0
+EBUILD isl-0.23-r1.ebuild 1946 BLAKE2B 74d448cc3408bdb9bea687ebf578effc2b16676974b156b3dda38c84d27ccb5073bc8de951c615f3e68ff8a0ea0fdd65ecbf6cf41867a50484434e6c8a446e7a SHA512 c8d379c083def1b02c4c9e50d5d520b6cdcbff3fdad85c8c954a28004174ef9e2fe6b985f79d3bd770bcb959365ab067f17a361a9ce929edda4a9dc2eb9ca30c
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index d0c02bfe7c8f..5668340ffa59 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index a05943db1fcc..8abac7311a5e 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,4 +1,4 @@
 AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
-EBUILD jansson-2.13.1-r1.ebuild 941 BLAKE2B c4415794d498b4c805b33084d58a3aa985e287632fe364eb21cb4a35d1bea38eba94ecc87f7827654420083429cb4cfe10a5f74362e2b2016bd41aecfad864c4 SHA512 55a7703ca6a653613983eddcdbe866720cced62bf971f037c5400938b7da472354c09da69199453f7c4b2a9e922759bb03959baf87ffdb20b37d7931a90f4b6b
+EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
 MISC metadata.xml 394 BLAKE2B a0157c37450b88ecfaf562c147202583689aede1fc452623d49014b9caba19d0df682bdd470104378b5249e206fd47135c77bb8afbed49bfeb49fb7a795f2325 SHA512 50148e361ebe81f5bfaa3ac850fcee6aa7d5bae32d6f613494fe62e3b6884b8b7cccb6410f525f77ba819bbf1615adf19a12486f6985b3fbd7873ba4ff71e7ff
diff --git a/dev-libs/jansson/jansson-2.13.1-r1.ebuild b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
index 1f926f3cbf18..0ea1a8080ff6 100644
--- a/dev-libs/jansson/jansson-2.13.1-r1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1-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
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 1245938b2259..15acc2922519 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,5 +1,5 @@
 AUX jemalloc-5.2.0-gentoo-fixups.patch 1443 BLAKE2B 433f445195f13ad3932d3b0c86a4b3ab2adfe99711584c96d8377fddf31730d9a0a116b345dbb9f46e487df9d11b222625dd72238b828452be1fb3ab838c347f SHA512 6fe7419d4cbf68e4725e9a10b8f42af126be924b011aab09a6872b0bd59effec3c641f9df4c2ba9935fb1b7bbfb62c3f272bc63a5264fdc105351427fd739958
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-EBUILD jemalloc-5.2.1-r1.ebuild 1435 BLAKE2B 9e9fdb48087a1e230f2e1d2c654fb4c37eb9a80af4cdc1320d9aeac97154827ab0ac49fd68a8294748d957a3396d4b94f8881f52804b9f0e409307771a33b0a4 SHA512 89716e2251317d2f30210abf011b323729949b6f7cad17ad5c1e7fb835c4690fd99c775694b140af1b25853b842f1b439489770a566ad0569e62c765446a122e
-EBUILD jemalloc-5.2.1.ebuild 1844 BLAKE2B 24a281ca1f56030555daa9ff4a6579ae47ee028fc620b52b77c027e94cb043d73a64c62c7493a28ce2a3cc42f02b497135a3bb30745d94048fec2b163ccc9ec3 SHA512 859ad5e39b236d091b3761264bb1b3966f9ea81ffa107d809a8c13817e89aef5a3141be309d47807fa2344aed9cc0e6e60686342d52bacc5bdb19ac1d705f60c
+EBUILD jemalloc-5.2.1-r1.ebuild 1419 BLAKE2B 73e88b9255bf68eb5c5c4a4b237c6512efbb58b6694c9fe5fd7c0e1e872fbddd7cd52ea2890a19e2cac1cbf79663cd970fde7972a73c220a3f94eaa02948b9cf SHA512 1a1019ac53ec9a84555009534f9d1251ef316549261d2cfd8f0c57d70f71e01c6ef8ceebff0230eb984e07165b21f0ea3ae51bc31139862ba44a8897ab103e60
+EBUILD jemalloc-5.2.1.ebuild 1829 BLAKE2B 0b23722c52381d2b4888589c5c78a789b78cd2f23e80f6672f6f05e2ba4cf3d6dac4ecad3fbd4df875125aef6bf7b81840cd2594796eaac339dc0c51d9c88d4b SHA512 bddd9d44266a63fcd70f1e8a7c8469a465765fb37c49181fe0afedb53b8548578ef56313088bd3ad7ae484c5905b340583a88dae38cda1ee6f915c85340b4325
 MISC metadata.xml 637 BLAKE2B b46e5e87219f04586095e7fd74d9666ecd180b4fdfaf8bfc971ec9931d907090a6a4a2948d9dcda9d469f6cc575526016eb46bf21f55483b4bde4da3fdb255d2 SHA512 56781e13ba2ee54b398941fcb80df71de20d1fdf999b9dc3cbd47db7cf7193ea0a970dd29e69d839622da32906b67d845f4e543542633ce05359d92d467680a9
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
index e66e9eae5177..2772dd3276fd 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit autotools toolchain-funcs multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
 HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index de9d97d0f769..6504cb8f9b50 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# 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 toolchain-funcs multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
 HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/jerasure/Manifest b/dev-libs/jerasure/Manifest
index 8bde780006ed..6d0d66142203 100644
--- a/dev-libs/jerasure/Manifest
+++ b/dev-libs/jerasure/Manifest
@@ -1,4 +1,4 @@
 DIST jerasure-2.0.0.tar.gz 806283 BLAKE2B c2513c103aaaeab072978c0711081b0ec89d75881e7ec5a3046fc31f96ce3e2540dd988078aa705768de28c8d495b4c035256d87810d54b6d29ac0b4678c39c6 SHA512 c14b227b4c4ae50d7e1add0f14a888894233228be8aadfc96e8788a14c51ff82fd48d9ca5fbd7d77bf5d17edf0deaef9ff61dffc65100f22f28d7cf32fa32e31
-EBUILD jerasure-2.0.0-r1.ebuild 731 BLAKE2B f4ed7dc776e27397700e23d0213565fafcc76a95a9ac41b0068f2172be93e2a361342f66766e6660203ec5fcecc8bad1b558ec995b91d4e1fd58beca48479dce SHA512 cbf9e0934b4bedb6b5f43e61b71d302090c8926873eeeb96ce8c88f9ca039a2934d25e762940069847cd1d52acb9259fd96ea76de0daa5604283526fc61c7834
-EBUILD jerasure-2.0.0-r2.ebuild 830 BLAKE2B 59315d7fdd5a347bec0086e31072a2f8bde5f748248acf8bc3dc435bfe8f04ffdd25eaf7cd3735d69b0ff0fa53970790c9f068ed19b97789f8cb237be3021f7a SHA512 d65a75a5728e7a6d46049dbd6edc630f141f0d24369eed786c7db91b1578261cb58c8368482c794b0856d9b040b09ecbaf8d35878f96318ba3d58e4622c0493c
+EBUILD jerasure-2.0.0-r1.ebuild 724 BLAKE2B 85cfcb1e02447fd2992d6a65eb575adb567767ef579100a851944bfcc307332007b5090edf761ef5e6037431ebae7de26958c556ff05465d58603ba803c80dc6 SHA512 010b1d4ec17ec8a9d883f19c318a6ed1fe3d31223222d0974a10443343684ddfd5b23648506697ea49b865d84355369255938bc7155c1e1cec17d5a68f860e52
+EBUILD jerasure-2.0.0-r2.ebuild 823 BLAKE2B deff40f84258e240ae42cf41e843adda4ef361eb834b5b95df098453fdbffa3718faeefbfad1ac532b608a9ad51ebee3203df6c66ad34857306b2c3adc9ba878 SHA512 6f3cf292c6191529f9d9b5c00e344e66d2b051372c6f918d23d29852c897bf4586342f3524ff9a33dc50b20bd3664b4477c6e25bab2ce058356ea73a7bcd5586
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/jerasure/jerasure-2.0.0-r1.ebuild b/dev-libs/jerasure/jerasure-2.0.0-r1.ebuild
index 67dac714885f..21aed21085dd 100644
--- a/dev-libs/jerasure/jerasure-2.0.0-r1.ebuild
+++ b/dev-libs/jerasure/jerasure-2.0.0-r1.ebuild
@@ -1,9 +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
 
-inherit autotools eutils ltprune
+inherit autotools ltprune
 
 DESCRIPTION="A Library in C Facilitating Erasure Coding for Storage Applications"
 HOMEPAGE="http://jerasure.org/"
diff --git a/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild b/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
index 1796fd75e75c..a51c667c0eb5 100644
--- a/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
+++ b/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils
+inherit autotools
 
 DESCRIPTION="A Library in C Facilitating Erasure Coding for Storage Applications"
 HOMEPAGE="http://jerasure.org"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 9386daa06318..9ee34ba7fbc2 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,4 +1,4 @@
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
-EBUILD json-c-0.15.ebuild 1085 BLAKE2B 8bea9975427aef1949cd491bb742c3c76d0d2ec2cba6aad7960d13b79bff0a6572ca8921700f3f2313ddfb6af4977e742f1b4d03701e54f560393595e9a57552 SHA512 15d69aff34c431107940a7fe6bd0604749230ace47df22f616bd430ad8ec44f5f5ea40edb36449977064c1132e268427e04138fe002567722733c3201f0f7290
+EBUILD json-c-0.15.ebuild 1086 BLAKE2B cc7bdd1a4e2dc8e37e96ce14b0283095d8ab1204419b7c0939b840df2e1d8d7e065bd7ad10862a44c67c78ac181b541f31d8a75ba62fd42060aab981a2c8fa84 SHA512 cbf41b3e50ead7c6c4d7388b024e49e3a67eb6f11bb3414662d1b9887969b65e288c1c4f72a4cca669248b4de45a8c3909ab93900bb2b77f83812f276a02b9f7
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
 MISC metadata.xml 1028 BLAKE2B e75093103471c8de368b8845e7131ad99044c0bdbb436e1fef1932958d8f870b1bcc6ce0f3df8aaa8eaed1f152637b29806a0f156651bc573bf2fdb1226ef317 SHA512 6c36e1df600b5f4b891efa330df66907c08ba5521113d6d7c02900add0f48140ab1cc46a045ffdc766a80159e2ed8805f2bb7dc47c899a76b4f502723f417d0b
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
index dcdc8fd0cc0c..70e366eb88de 100644
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ b/dev-libs/json-c/json-c-0.15.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="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 36c853263880..6ee2281845ea 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,7 +1,3 @@
-DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
-DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
 DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
-EBUILD json-glib-1.4.4.ebuild 1514 BLAKE2B c6c90de778fd04db9f8d1656bc195a66643dec302b44eb46c845d87f226ea37ac5641df57d0d9076ec1ed69039458ee00c609f7fdcfdba0dbb0122aa39998ce0 SHA512 a65556de5ead0c2563fe9106a2d94ab83a428a8973d1b5931f79858fc2a73d47d1bd7244a4d77347a3e14ff4809674be35a7d02bd3c7b7689e8e16878447c5e4
-EBUILD json-glib-1.6.0.ebuild 1546 BLAKE2B d0fd4b5fc752e04635cfa09a871ef20be76f7b4583bd2b891557dcd48a12e1f7f00a8719321aafdbf275e305d572c1cf5bf19c7013b6a462a5953e712a228225 SHA512 9031ed6ccca2955ea60bae281c8b0d18aea3c8fb3356216106f12249b696a4982e52f76574e593ed7da79e63b1f99c3100ac151a4fe5e01f1e217de6043330e2
-EBUILD json-glib-1.6.2.ebuild 1548 BLAKE2B 37c85cae4a14e5c954455abec37a247f0b5c58f3ea3ae6f966c1fdef7492b8fb0288daa2525183a59ea5a4711092c8ca7a8efed41215ab94fe93caa283f2568e SHA512 5e575a9c93fccc033aabcc1a12c260410af684b21e56d3cf60d07b440c2d366ea3f88a60489c15fb36d405a0bd71b6dabe0c9921c23e5197be644858a865b198
+EBUILD json-glib-1.6.2.ebuild 1541 BLAKE2B 6c9b9b98a35497cc1358f2548882b64499b41f015502e5d6138d60eb30d1627171b4af6181b095438c3297689c63a2d2af388a4a3225d28928152196ffa008ca SHA512 ec2ef89c5d886b0070297b03b62d1fa99d22278be55cb813233928a8fefa5530051a46bc546e50f9553be4072d6da2b9353c4dfbd63e5f88c42c35bb9fc4f6bd
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
deleted file mode 100644
index 0f1020925a1d..000000000000
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson multilib-minimal xdg-utils
-
-DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
-	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
-	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
deleted file mode 100644
index 36f1245c389f..000000000000
--- a/dev-libs/json-glib/json-glib-1.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson multilib-minimal xdg-utils
-
-DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}"
-# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
-BDEPEND="
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
-	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
-	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
index 52f80fbce692..7041eea07b26 100644
--- a/dev-libs/json-glib/json-glib-1.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 87f90e4ccb73..6fb8576bbf88 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
-EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B bae78e37b12fbb846e185efadecca0bd7143716516602b36c974e0268291073e723f60b56557474989d7e3b9f5eb92601ab134a9f8586808cf787c32792be7ce SHA512 b9c6409a4deea7910a2a979b411f0b00e48af9fd5642957e488cc7658d901f5cfe11097d4ae18e1dcf9cfdd2887b47253a9f3b2bfe1c5e443807ca1f8a182694
-EBUILD jsoncpp-1.9.4.ebuild 1216 BLAKE2B fae64c4fc57bbecaacb38ca95b43f3fed69f232d4c0de937d7b1643f4539550c68319d228187f8357aff504b9665fdf4b91ebb08e25883d0cee4f040fc1b0ac3 SHA512 fa014b54448a202a5456f05e3031848d73833374878f50db3aefc4ca9171dfb0e374ab7ebef82268fd77d690621c5d3af2edfc6bec15f6b7ea6c94f7925b369c
+EBUILD jsoncpp-1.9.3.ebuild 1027 BLAKE2B bf5471834eff9feaeea9c821007dfbb7683d046e2aa48a29cc484a3fdcc275bdf144c2f212eae9e5457a36d344be8ca20a74574247bad35a6f55c1056a2297a0 SHA512 6a6c382bba7abc7e79dea025430078185f6d4f6e841966d75c0a70d65a8065f54b604f2d376c2dbd2362a84ea979d10d68f6271dca17c93c167fe234d456c845
+EBUILD jsoncpp-1.9.4.ebuild 1217 BLAKE2B 7fca9799cff917932d3809519f78ef90762ccc649a24b5ced6eb6a953483a8617a0e9bd1bb8ea1575df384a580aeeca88b908ea8ed598b227e30eed87117e34b SHA512 c95cfcfb3a867d69cdf29511d64ce6694803acccbe1ad2bc26353abc34ef9f5e4fb8fac1a5456bc33a4fe471f69d2ef12d8ab51d1a2327e141a7504fe6504972
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
index ad08408b0a6a..1b704d188812 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.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="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 31c1b29293c5..5c858b99e519 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index dd204168c657..d8e2c013bc2d 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r201.ebuild 816 BLAKE2B c596dfc37bd7857c0079da3da6ccfa1bf0eeae992a442cb7c57dd2e50034d94da1b3639d698c2cb52053a505d48388aa5f03b1a509ea8eb753f2ee2d20decd29 SHA512 b14989000cd7072fc675cc9b87fd7dbf8ea4f00092962b3540d5b8ac5347d9577447e2d51c5b1dca75bc6439fdcea390d20ab08cc1450a2c0223e661d986bc14
-EBUILD keybinder-0.3.2-r300.ebuild 1077 BLAKE2B 9cab94a818634862846cace83ccfbe75194a84a574c2e85e22c61d5a7a394cb71304c208f663487c95ee074280f311babfbe74ebe4109240154fb2fcf0d220af SHA512 a23945953fa2f08d916e132f0e52129dabd294f21be6003544b6c9bd4a42272b70d9f793b7ebdc033df0ff02a4e0bb1ac4b2415e0eca5754d2c8cc9fa2b12f17
+EBUILD keybinder-0.3.2-r300.ebuild 1076 BLAKE2B d62530a41be87998e0e32901852bb08797ff6457774cd49e9fcf6e582a4ca89456ff2d7b35a5cfe09d393a90dceb9039ab454050ab0addf1acfb9f9c03ac06fd SHA512 1142db1016034ebafdaa85765df21e35380bdf127d0a2311494f0cea73d1972a4314696890e9262b1a88877375d7d04e39311268d215681da8ef0839072bc6ab
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index dae197934270..832566c0f6c0 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
deleted file mode 100644
index 94951f72f79b..000000000000
--- a/dev-libs/klibc/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX klibc-1.4.11-interp-flags.patch 494 BLAKE2B 855857ee581560a01a07dbf78d6a7ed281a6e8b44522c365fcd5acc3af0c00bb754b161246e77de919d1559aa3f04498c29492efb3f13efabbd9b439814f263b SHA512 64242223dee668467b52092dba81a3ab29137d3611cf11f331aae1fa9eb8a3ae19b3847128bd693cd2c835c7e2ff1e247cae821561ca7c039bb4a212c8726a42
-AUX klibc-1.5.7-strip-fix-dash-s.patch 420 BLAKE2B 44ae1a131348421d17b855f6b83c1d7286b3fb6c543eaa9aceb133b4948df791bf77712baefc84f3595b1f24453264670fa6db461d90a161c723f3b0f158ea8d SHA512 c1c70c86d34ac1ea716fe5f2caeb3005db6d060ed0c5dabe94a44f0317725c7775a9da8e463b71b8533f0315d6e0cd861c8684ddf1f426586296dc69d88ac438
-AUX klibc-2.0.2-mkfifo.patch 488 BLAKE2B 71662521449be96fa059f2ea3bc3c371e8065a7d209b919ff142526deecce21317c7d952642b74572c452ee2cdfe967fe14668f7aaa60ebe311a14621d63dbdf SHA512 9e72e10eae1639da2821ac14767ae7f8df1b7dcb2f559a47d8e6ac7f6ffa865a13f93c9824b8051cc2d0d23cac2c228274cfc3dabfac060eb32275d2eca100ac
-AUX klibc-2.0.3-kernel-uapi.patch 4584 BLAKE2B cb8a9344eaed0ab8fe2d87934f64d6239cecb7ea66842fdebe469b779fc3ea5d4fa3c5f014acdc6cdff04bf7e74219251a310952cd4fdec416891ec05fa4a065 SHA512 c0ed840875da65a185915a9ba1df335ec05bebfbb30f6be1bdf97fd94e45fdbd63c34ee70abb18cf71039876b71929ffa42fca6767c2ed8326e24454763761c5
-AUX klibc.m4 3619 BLAKE2B b0895e5d775b2edc497514ce5adffa3824730cebd1b0c9f166a6ca84fed7880d5bfc13409835eb07d515307e5a83e2459665fa45987ee182619458f80b49defb SHA512 42cf4add07031105689d7438838e0306d32a637e8a4719afc11722fd8f1ac040e6bb92cc7ba3536b83a6de8907a91bc5ad11036f22810443f4cd24161950cc6b
-DIST klibc-2.0.4.tar.xz 469348 BLAKE2B 5975e3d25f72b70c4cbaa56ea5363417407e8dace1e02e2da0b835bbb2cad56648b0084e5404528206ef3facf4ffd3611e8bd729eadd80b00e30d1a70b3057cf SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d
-DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3de2e33da583e0ea7597f666461977f461303566f9e363e9c96994c7b0eb6213c6a17b2fab72df7460db3cfbc0c2e1cf8 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-EBUILD klibc-2.0.4-r3.ebuild 9428 BLAKE2B 8ab59f770788adc02e0f3d02b32d67dd59512c57794824c11297dd0a6401aea77d807c7c809ff1db3c69aad1070233b3ceea122ba5be63b6fc5fa0198c712145 SHA512 9d86935619a8b35be0debdf04832f207f066c66f7fc8dc437392eed76c279c44c9783d7c59318e036a4d24b21339751af211a2907079e083360602e3698e42f4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
deleted file mode 100644
index a5bb91765287..000000000000
--- a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
-index c2bfd2f..8066bda 100644
---- a/usr/klibc/Kbuild
-+++ b/usr/klibc/Kbuild
-@@ -152,7 +152,7 @@ # build interp.o
- targets += interp.o
- 
- quiet_cmd_interp = BUILD   $@
--      cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__     \
-+      cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__     \
-                              -DLIBDIR=\"$(SHLIBDIR)\"         \
- 			     -DSOHASH=\"$(SOLIBHASH)\" \
- 			     -c -o $@ $<
diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
deleted file mode 100644
index 94a0caee2526..000000000000
--- a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in
---- klibc-1.5.7-orig/klcc/klcc.in	2007-12-03 01:17:26.000000000 +0100
-+++ klibc-1.5.7/klcc/klcc.in	2007-12-03 01:18:39.000000000 +0100
-@@ -259,7 +259,7 @@ if ( $operation ne '' ) {
-     unlink(@rmobjs);
- 
-     if ( $strip && !$rv ) {
--	$rv = mysystem($STRIP, @STRIPFLAGS, $output);
-+	$rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out');
-     }
- }
- 
diff --git a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
deleted file mode 100644
index 3ddf834d46da..000000000000
--- a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar --exclude '*.g' --exclude '*.cmd' klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c
---- a/usr/utils/mkfifo.c	2012-10-03 09:41:43.000000000 -0700
-+++ b/usr/utils/mkfifo.c	2013-12-26 13:19:34.270949780 -0800
-@@ -13,6 +13,11 @@
- 
- char *progname;
- 
-+int mkfifo (const char *__p, mode_t __m)
-+{
-+	return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0);
-+}
-+
- static int make_fifo(char *dir)
- {
- 	if (mkfifo(dir, leaf_mode)) {
diff --git a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch b/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
deleted file mode 100644
index 7d253977e998..000000000000
--- a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Update header locations for uapi & generated
-
-In the v3.6 kernel, many of the headers were split out into a uapi variant.
-klibc should be using those variants to compile.
-
-There is also a generated subdir, to seperate out generated headers.
-
-The old kernel header location needs to be included as well, because
-linux/compiler.h is available only in the base include directory.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar klibc-2.0.3.orig/scripts/Kbuild.klibc klibc-2.0.3/scripts/Kbuild.klibc
---- klibc-2.0.3.orig/scripts/Kbuild.klibc	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/scripts/Kbuild.klibc	2013-12-26 14:39:07.113906101 -0800
-@@ -77,7 +77,10 @@
- KLIBCCFLAGS       :=
- 
- # Defaults for arch to override
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
- 
- # Arch specific definitions for klibc
- include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
-@@ -116,6 +119,9 @@
--KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include				    \
-+KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include/uapi				    \
-+                    -I$(KLIBCKERNELSRC)/include/generated/uapi				    \
-+                    -I$(KLIBCKERNELSRC)/include/generated				    \
-+                    -I$(KLIBCKERNELSRC)/include				    \
-                      $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 	    \
- 		       -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include)    \
- 		     $(KLIBCARCHINCFLAGS)
- 
- # klibc definitions
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG klibc-2.0.3/usr/klibc/arch/i386/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/i386/MCONFIG	2013-12-26 14:44:56.349161344 -0800
-@@ -34,3 +34,6 @@
- 
- # Asm includes for i386 are in the merged x86 tree
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG	2013-12-26 14:44:56.350161362 -0800
-@@ -24,6 +24,9 @@
- 
- # The kernel so far has both asm-ppc* and asm-powerpc.
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
- 
- # The asm include files live in asm-powerpc
- KLIBCASMARCH	= powerpc
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG	2013-12-26 14:44:56.350161362 -0800
-@@ -22,6 +22,9 @@
- 
- # The kernel so far has both asm-ppc* and asm-powerpc.
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
- 
- # The asm include files live in asm-powerpc
- KLIBCASMARCH	= powerpc
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG	2013-12-26 14:44:54.522128579 -0800
-@@ -37,3 +37,6 @@
- 
- # Asm includes for x86_64 are in the merged x86 tree
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include
diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4
deleted file mode 100644
index 389226974506..000000000000
--- a/dev-libs/klibc/files/klibc.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-# klibc.m4 serial 99
-## Copyright (C) 1995-2003 Free Software Foundation, Inc.
-## This file is free software, distributed under the terms of the GNU
-## General Public License.  As a special exception to the GNU General
-## Public License, this file may be distributed as part of a program
-## that contains a configuration script generated by Autoconf, under
-## the same distribution terms as the rest of that program.
-##
-## This file can can be used in projects which are not available under
-## the GNU General Public License or the GNU Library General Public
-## License but which still want to provide support for the GNU gettext
-## functionality.
-## Please note that the actual code of the KLIBC Library is partly covered
-## by the GNU Library General Public License, and party copyrighted by the
-## Regents of The University of California, and the rest is covered by a
-## MIT style license. 
-
-# Authors:
-#   Martin Schlemmer <azarah@nosferatu.za.org>, 2005.
-
-
-# AC_CHECK_KLIBC
-# --------------
-# Check if the user wants KLIBC support enabled.  If so, set KLIBC=yes and
-# fill in KLIBC_PREFIX, KLIBC_BINDIR, KLIBC_SBINDIR, KLIBC_LIBDIR and
-# KLIBC_INCLUDEDIR.  CC is also set to the proper klcc executable.
-# NOTE:  This should be called before AC_PROG_CC, and before header, function
-#        or type checks.
-AC_DEFUN([AC_CHECK_KLIBC],
-[AC_BEFORE([$0], [AC_PROG_CC])
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_ARG_ENABLE([klibc],
-              [AS_HELP_STRING([--enable-klibc],
-                              [Enable linking to klibc [no].  You need at
-                               least klibc-1.0 or later for this.  Set KLCC
-                               to the absolute file name of klcc if not in
-                               the PATH])],
-              [KLIBC=$enableval], [KLIBC=no])
-AC_ARG_ENABLE([klibc-layout],
-              [AS_HELP_STRING([--enable-klibc-layout],
-                              [Enable installing binaries, libraries and
-                               headers into the klibc prefix [yes] ])],
-              [if test "X$KLIBC" != Xno; then
-                 KLIBC_LAYOUT=$enableval
-               else
-                 KLIBC_LAYOUT=no
-               fi],
-              [if test "X$KLIBC" != Xno; then
-                 KLIBC_LAYOUT=yes
-               else
-                 KLIBC_LAYOUT=no
-               fi])
-
-if test "X$KLIBC" != Xno; then
-  # Basic cross compiling support.  I do not think it is wise to use
-  # AC_CHECK_TOOL, because if we are cross compiling, we do not want
-  # just 'klcc' to be returned ...
-  if test "${host_alias}" != "${build_alias}"; then
-    AC_CHECK_PROGS([KLCC], [${host_alias}-klcc], [no])
-  else
-    AC_CHECK_PROGS([KLCC], [klcc], [no])
-  fi
-  if test "X$KLCC" = Xno; then
-    AC_MSG_ERROR([cannot find klibc frontend 'klcc'!])
-  fi
-
-  CC="$KLCC"
-  CFLAGS="-Os"
-
-  KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)"
-  KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)"
-  KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)"
-  KLIBC_SBIN_DIR="${KLIBC_PREFIX}/${KLIBC_KCROSS}sbin"
-  KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)"
-  KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)"
-
-  if test "X$KLIBC_LAYOUT" != Xno; then
-    prefix="$KLIBC_PREFIX"
-    bindir="$KLIBC_BIN_DIR"
-    sbindir="$KLIBC_SBIN_DIR"
-    libdir="$KLIBC_LIB_DIR"
-    includedir="$KLIBC_INCLUDE_DIR"
-  fi
-
-  # At least KLIBC_LIB_DIR should be valid, else klibc is too old or
-  # something went wrong
-  if test ! -d "$KLIBC_LIB_DIR"; then
-    AC_MSG_ERROR([your klibc installation is too old or not functional!])
-  fi
-fi
-
-AC_SUBST(KLIBC)
-])# AC_CHECK_KLIBC
-
diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
deleted file mode 100644
index 0045f3691815..000000000000
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunately.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-EAPI=6
-K_TARBALL_SUFFIX="xz"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A minimal libc subset for use with initramfs"
-HOMEPAGE="https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/"
-KV_MAJOR="4" KV_MINOR="x" KV_SUB="14"
-PKV_EXTRA=""
-if [[ ${PKV_EXTRA} ]]; then
-	if [[ ${KV_MAJOR} == 2 ]]; then
-		PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	else
-		PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	fi
-	PATCH_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
-fi
-if [[ ${KV_MAJOR} == 2 ]]; then
-	OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-else
-	OKV="${KV_MAJOR}.${KV_SUB}"
-fi
-KERNEL_URI="
-	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
-	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
-DEBIAN_PV=2.0.4
-DEBIAN_PR=9
-DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz"
-SRC_URI="
-	https://www.kernel.org/pub/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
-	mirror://debian/pool/main/k/klibc/${DEBIAN_A}
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="debug test custom-cflags"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	sys-devel/bc"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip
-	!test? ( test )"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86) echo i386 ;; # for build on x86 userspace & 64bit kernel
-		amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A}
-}
-
-PATCHES=(
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-	# Fix usage of -s, bug #201006
-	"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-	# The inline definition from sys/stat.h does not seem to get used
-	# So just copy it to make this compile for now
-	"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
-	# Newer kernels have some headers in the uapi dir
-	"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
-)
-
-src_prepare() {
-	[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Borrow the debian fixes too
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		PATCHES+=( "${WORKDIR}/debian/patches/${p}" )
-	done
-
-	default
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	LD="$(tc-getLD)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	HOSTLD="$(tc-getBUILD_LD)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		-e '1iCONFIG_ARM_UNWIND=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-	append-ldflags -z noexecstack
-	append-flags -nostdlib
-
-	# Parallel build intermittantly fails when doing `LIST usr/klibc/syscalls/klib.list'
-	emake -j1 \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs}
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs} \
-		install
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	# NOTE: This totally violates sandbox <asturm@gentoo.org>
-	# find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-	find "${D}"/usr/${libdir}/klibc/include -type f \
-		\( -name '.install' -o -name '..install.cmd' \) -delete || die
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
new file mode 100644
index 000000000000..5969f007c5a5
--- /dev/null
+++ b/dev-libs/kopeninghours/Manifest
@@ -0,0 +1,4 @@
+AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
+DIST kopeninghours-21.04.0.tar.xz 62144 BLAKE2B ae90c941716f30bf36cdf46bf0d2d28eb17793b7c9b81773ec6694561e1254bad40dea64481f871ea2dc9f91765cf18a174c77d07113844d3088a1dad8b85550 SHA512 a074c5920439fcc18a4078dbb0df410555725f20d06bc8d9fb4f9c97613a55ae74077c600b77260d7b699e50badbdd0c086e43500e182ce25b1466ce00135b96
+EBUILD kopeninghours-21.04.0.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch b/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch
new file mode 100644
index 000000000000..939bcbcd9e37
--- /dev/null
+++ b/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch
@@ -0,0 +1,79 @@
+From fd7c2e1f3797c1a67dc6346dfcb192f042cb19e8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 11 Apr 2021 14:33:48 +0200
+Subject: [PATCH] Use FindPython3 w/ Python3_SITELIB, add
+ BOOSTPYTHON_VERSION_MAJOR_MINOR
+
+- Use BOOSTPYTHON_VERSION_MAJOR_MINOR to inject desired python target
+- Drop deprecated PythonLibs
+- Use FindPython3 with Python3_SITELIB for correct install location
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                 | 16 +++++-----------
+ PyKOpeningHours/CMakeLists.txt | 10 ++++------
+ 2 files changed, 9 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c50b40..a9a9328 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # SPDX-FileCopyrightText: 2020 Volker Krause <vkrause@kde.org>
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+-cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.12)
+ 
+ # KDE Application Version, managed by release script
+ set (RELEASE_SERVICE_VERSION_MAJOR "21")
+@@ -56,22 +56,16 @@ set_package_properties(FLEX PROPERTIES PURPOSE "Lexer generator for parsing open
+ find_package(BISON REQUIRED)
+ set_package_properties(BISON PROPERTIES PURPOSE "Grammar generator for parsing opening hours expressions")
+ 
+-find_package(PythonLibs 3.6 MODULE)
+-if (PythonLibs_FOUND)
+-    # Extract major/minor python version
+-    string(REPLACE "." ";" VERSION_LIST ${PYTHONLIBS_VERSION_STRING})
+-    list(GET VERSION_LIST 0 PYTHONLIBS_VERSION_MAJOR)
+-    list(GET VERSION_LIST 1 PYTHONLIBS_VERSION_MINOR)
+-
+-    # boost-python requires exact version number
+-    find_package(Boost COMPONENTS python${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR} MODULE)
+-endif()
++set(BOOSTPYTHON_VERSION_MAJOR_MINOR python36 CACHE STRING "Version of BoostPython to feed CMake's FindBoost")
++# boost-python requires exact version number
++find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR} MODULE)
+ 
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
+ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
+ add_definitions(-DQT_NO_FOREACH)
+ add_subdirectory(src)
+ if (Boost_FOUND)
++    find_package(Python3 3.6 COMPONENTS Development)
+     add_subdirectory(PyKOpeningHours)
+ endif()
+ 
+diff --git a/PyKOpeningHours/CMakeLists.txt b/PyKOpeningHours/CMakeLists.txt
+index 771cedf..e755ea7 100644
+--- a/PyKOpeningHours/CMakeLists.txt
++++ b/PyKOpeningHours/CMakeLists.txt
+@@ -21,11 +21,9 @@ kde_target_enable_exceptions(PyKOpeningHours PRIVATE)
+ target_compile_definitions(PyKOpeningHours PRIVATE KOPENINGHOURS_VALIDATOR_ONLY)
+ 
+ # Set up the libraries and header search paths for this target
+-target_link_libraries(PyKOpeningHours PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} KOpeningHours)
+-target_include_directories(PyKOpeningHours PRIVATE ${PYTHON_INCLUDE_DIRS})
++target_link_libraries(PyKOpeningHours PUBLIC Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${Python3_LIBRARIES} KOpeningHours)
++target_include_directories(PyKOpeningHours PRIVATE ${Python3_INCLUDE_DIRS})
+ 
+-set(_install_dir lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages)
+-
+-install(TARGETS PyKOpeningHours DESTINATION ${_install_dir}/PyKOpeningHours)
+-install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${_install_dir}/PyKOpeningHours)
++install(TARGETS PyKOpeningHours DESTINATION ${Python3_SITELIB}/PyKOpeningHours)
++install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${Python3_SITELIB}/PyKOpeningHours)
+ 
+-- 
+2.31.1
+
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.0.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.0.ebuild
new file mode 100644
index 000000000000..405678cd3d3d
--- /dev/null
+++ b/dev-libs/kopeninghours/kopeninghours-21.04.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
+HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
+https://invent.kde.org/libraries/kopeninghours"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
+		$(cmake_use_find_package python Boost)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	python_optimize
+}
diff --git a/dev-libs/zookeeper-c/metadata.xml b/dev-libs/kopeninghours/metadata.xml
index d8d5cc720330..2fdbf33d963d 100644
--- a/dev-libs/zookeeper-c/metadata.xml
+++ b/dev-libs/kopeninghours/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
new file mode 100644
index 000000000000..dcbd2692f8ea
--- /dev/null
+++ b/dev-libs/kosmindoormap/Manifest
@@ -0,0 +1,3 @@
+DIST kosmindoormap-21.04.0.tar.xz 332056 BLAKE2B d433a262497c1331c4bfec603e0a8707bb47f10534928b2367729bf6aeeefbc9ec830b78432262cf314f8200984445ed669789272710fa3397eefcdc1319d1df SHA512 dda7c38cc586239fa2338e48371262b44823ac25bd5d95e0d1be787620899bcfb0b66cf28cdef6571b9169538057b2b3f2c6af56b0d7d20b86160661a595a624
+EBUILD kosmindoormap-21.04.0.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.0.ebuild
new file mode 100644
index 000000000000..a16f08aee91b
--- /dev/null
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.04.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:5
+	dev-libs/protobuf:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/klibc/metadata.xml b/dev-libs/kosmindoormap/metadata.xml
index 6f49eba8f496..2fdbf33d963d 100644
--- a/dev-libs/klibc/metadata.xml
+++ b/dev-libs/kosmindoormap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index b54a10e83782..fbec6f92dd08 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,7 +1,13 @@
+AUX kpathsea.conf 36 BLAKE2B 5f3ea92946c78a2a4aa336aa38783cf894859e368ec2437facdb9a814ba258097831166df15afc412d6df3fd6639fbca8f2c2f33efa5d69fde75090a9fc7dd3b SHA512 4221eda451499869a3b9b6b5c07e6866df963368481c7169645e0923f674ce6aa7bd9411303bb087fe55d99eea8b187b2a978c9f9ba0e40802f1863268566e28
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
 DIST kpathsea-texmf.d-10.tar.xz 12784 BLAKE2B fcd9b46504c58da90babcbd1e5d4ea655d3cb85f4be0a7430da62758f9b11e68219adcafab9ae26756f3f9dfa97b460db3e8b8b1a27560d2f3a91e612336dc75 SHA512 f2cc6a1bbc7be463877fd57d5351fb9e7bda472f1094f93a6962e14f9d71067cdae87464b615818341728c9fbd32e67f060dc09a3590353715fbc31fe64f93ef
+DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f69519428973fad5b7a734eec269b3cc89fc2ae527a459b4ae4d966a3394d6a95f40fac16841f59f9f6cabf2a07dcdcb98a14cba9 SHA512 eec72ecc35edd47bd9a5762f0d06212e4625eea1ee2ffc36f93885b548ca6c4e0eb65345a1ec050f3f838aed5128bb32eda509b5aadbad6643469b4955441f22
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-kpathsea-2020.tar.xz 32324 BLAKE2B bf4365d3ae47ce5344916d6622d40c121a34e722d166c983224f356c75d1b3e10216182ee79a76cf1dc703741e5302d8b427215a72af3060bae05b698ac0c316 SHA512 53887f73784f96528081bf9ce39fdaff3c94b2af1827cc2da7abddf2821c86c45f014ddcb624b24ed6265b7de25132dd106040f736fea180c122c9026f6cd101
+DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575
 DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
-EBUILD kpathsea-6.3.2_p20200406.ebuild 3254 BLAKE2B 3dbfe1048b519e42397baa5402e192e6a5fb24934ccdbe5b0b9422af99f855175d1736d61e69d07409f6fdb8bff5192cc77ae9418a7be5dfd0fc6a3a149c885d SHA512 3b7c8df6d80fce09ba1cc2fce73e365930fbeb3154c86aa9b2e762c0e567e521fb4103acfa08949699a6902347d0ea508a0e976b0d19a9facc781c34da029f75
+DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
+EBUILD kpathsea-6.3.2_p20200406.ebuild 3297 BLAKE2B 77daa60068d648efb1b1c3020d9b78446ee588f478c4f2feb2750b1798d0e18bcb6633c33a75d953879ffc0c0dc1f3f6ef2955bafbd3403b8658a70dcf4bf2d5 SHA512 6ffe280320825ec0228cefcd822347b8f80f70a864b27a777c6615697ed4c11e4dae1e81d6f7dce1c085abd12dfd479c807d7c2358fed6b02b2ab4a81a5db8bc
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3318 BLAKE2B f22884982032df28eb754ad3aecfe3b7fc1b355b72947c658fbc8ca0af2a62bfd4b263c0a6c882724421bc661080539d91d5583064c81161ad82068bf561704f SHA512 1c0fbc057720571211fa3433b269d632f0b6f53ae449f2a8d1d40dcba817a75c569221ad3eaae6a5a5416f533f7f1b8bb1df5b30dad1b5a9efadb9ebea24eb73
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/files/kpathsea.conf b/dev-libs/kpathsea/files/kpathsea.conf
new file mode 100644
index 000000000000..f68f5d5e125c
--- /dev/null
+++ b/dev-libs/kpathsea/files/kpathsea.conf
@@ -0,0 +1 @@
+d /var/cache/fonts 1777 root root -
diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
index e2fd405ab8c0..e3494ced7f73 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit texlive-common libtool prefix
+inherit texlive-common libtool prefix tmpfiles
 
 TEXMFD_VERSION="10"
 
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-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 source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
@@ -68,8 +68,7 @@ src_install() {
 
 	# The default configuration expects it to be world writable, bug #266680
 	# People can still change it with texconfig though.
-	dodir /var/cache/fonts
-	fperms 1777 /var/cache/fonts
+	dotmpfiles "${FILESDIR}"/kpathsea.conf
 
 	# Take care of fmtutil.cnf and texmf.cnf
 	dodir /etc/texmf/{fmtutil.d,texmf.d}
@@ -98,6 +97,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process "${FILESDIR}"/kpathsea.conf
+
 	etexmf-update
 }
 
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
new file mode 100644
index 000000000000..c5ab6c78239b
--- /dev/null
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common libtool prefix tmpfiles
+
+TEXMFD_VERSION="11"
+
+DESCRIPTION="Path searching library for TeX-related files"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV%_p*}"
+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 source static-libs"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+TL_VERSION=2021
+EXTRA_TL_MODULES="kpathsea"
+EXTRA_TL_DOC_MODULES="kpathsea.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+src_prepare() {
+	default
+	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize
+	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update || die
+	eprefixify "${S}"/texmf-update
+}
+
+src_configure() {
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #347798
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable largefile because it seems to cause problems on big endian 32 bits
+	# systems...
+	econf \
+		--disable-largefile \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
+	find "${D}" -name '*.la' -delete || die
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	# Take care of fmtutil.cnf and texmf.cnf
+	dodir /etc/texmf/{fmtutil.d,texmf.d}
+
+	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
+	# texmf.cnf
+	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf" || die
+
+	insinto /etc/texmf/texmf.d
+	doins "${WORKDIR}/texmf.d/"*.cnf
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+
+	dosym ../../../../etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
+	dosym ../../../../etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
+
+	newsbin "${S}/texmf-update" texmf-update
+
+	# Keep it as that's where the formats will go
+	keepdir /var/lib/texmf
+
+	dodoc ChangeLog NEWS PROJECTS README
+
+	# The default configuration expects it to be world writable, bug #266680
+	# People can still change it with texconfig though.
+	dotmpfiles "${FILESDIR}"/kpathsea.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process "${FILESDIR}"/kpathsea.conf
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
new file mode 100644
index 000000000000..5745eb547e31
--- /dev/null
+++ b/dev-libs/kpublictransport/Manifest
@@ -0,0 +1,3 @@
+DIST kpublictransport-21.04.0.tar.xz 391620 BLAKE2B 745068bfa85f07f87da196d936ec138c8be1fb15e0fe2bd4cbb3364fc3db64b1e0ec1f63ca0eb4252ea90250e6a589f2837da5864e1b39ab51db774cd206abe1 SHA512 0761d2b26fd4cf46c30a8b4aeb69c8d304791184860230f2094503246b3a146deb86b66639e2f0fd1e90ddaa085c7bdf5badc42fc9f3af3b1a56c6920dc5f5e1
+EBUILD kpublictransport-21.04.0.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpublictransport/kpublictransport-21.04.0.ebuild b/dev-libs/kpublictransport/kpublictransport-21.04.0.ebuild
new file mode 100644
index 000000000000..a5fa8262d790
--- /dev/null
+++ b/dev-libs/kpublictransport/kpublictransport-21.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Library for accessing public transport timetables and other information"
+HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
+	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/protobuf:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/OpenSRF/metadata.xml b/dev-libs/kpublictransport/metadata.xml
index 79d462e85571..2fdbf33d963d 100644
--- a/dev-libs/OpenSRF/metadata.xml
+++ b/dev-libs/kpublictransport/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/kqoauth/Manifest b/dev-libs/kqoauth/Manifest
index 390f038b6c13..cf89df4a99f5 100644
--- a/dev-libs/kqoauth/Manifest
+++ b/dev-libs/kqoauth/Manifest
@@ -1,3 +1,3 @@
 DIST kqoauth-0.98.tar.gz 37059 BLAKE2B d1214ac22cb52e7ead1be3ce7af2af9c4b2e1cb74e2b4bf3891300099c0a0abb0c7295fb4616adcb59cb4405eb52bec4097b48d39563ac407bfe692ce94492a2 SHA512 f89e0f046fb7fd7812548f94c460d7c18d4881972e155a99e07503e97fd46b6eada0de9f2c3a94af33ef5b1b3b489bbd5dc6738cee104fe2d11ed62e681c7979
-EBUILD kqoauth-0.98-r3.ebuild 1157 BLAKE2B d092dca4d5ee1b6f603f03ef5004af596548259122f442db151a6e75881ef9f22fc5b88842f03033c2200f43d370efa517f7db5b75d3696e7f6f321678eb6cdc SHA512 0fdbe01fced1aad9d173f1e2ef20e1a6118b29029afa7ada2ce57f546563a598b95d28ac88d763b85b25c9779cd997431280895817c6fadcce5253491453bae5
+EBUILD kqoauth-0.98-r3.ebuild 1148 BLAKE2B 7f931def2610e800ccbd0dc7f1af10e2d4439ccd09c452de689e808c1208a20c2e32f2cf36b8dc321f5a36bbbafe183300a77eafd33533c1f49e9ac86f9657d2 SHA512 77926082f9931d23f3dbc08037fa66c03d9c18d0309aac7cf1c0ea67198c4052a34eef65de254a249583ddf256720ee975332ca68b1a83e856957f76c2398ba0
 MISC metadata.xml 473 BLAKE2B c1c2589050b344e5c6565a5495480b937e6482d0f129b6810ff67a0a98c92e28c7c49d21db2b0bb19ae5aa0714ef7428d4151e27f72189f056bc7a695b301dba SHA512 8f65f8cd8a4bbfb7a74f42880904d62cb224fdec7e56e1193f0783463ede735ade705ea0b4cb9362a7a0448e6307864da4a0ffb841d9b27d63f8aa345b5e7a38
diff --git a/dev-libs/kqoauth/kqoauth-0.98-r3.ebuild b/dev-libs/kqoauth/kqoauth-0.98-r3.ebuild
index e557c8191dfb..2da85d77ce6d 100644
--- a/dev-libs/kqoauth/kqoauth-0.98-r3.ebuild
+++ b/dev-libs/kqoauth/kqoauth-0.98-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib qmake-utils
+inherit qmake-utils
 
 DESCRIPTION="Library for Qt that implements the OAuth 1.0 authentication specification"
 HOMEPAGE="https://github.com/kypeli/kQOAuth"
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 91ea99dc3949..cc0a37154786 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,6 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
 DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
-EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
-EBUILD leatherman-1.12.4.ebuild 1329 BLAKE2B c6be811b3ef20dc571fc8ba7423d6ad96033171cce89dd1845bd44695dce67fea6b9c66ae8701a58bbb6f64a337f63c97bdd44b916f546dc90705bbb5c92d0be SHA512 4391da9e69af541cffcb1f8aab5e60a1f4bc1442d4450d43d159fb6617b84e9521d48ab5efc92fe2774b29b7628687003f16ff22d027b2fe869e89a120b5f82d
+EBUILD leatherman-1.12.2.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
+EBUILD leatherman-1.12.4.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild
index 4161088fd099..e41dffc8583c 100644
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
index 12a9cdb19849..e41dffc8583c 100644
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 289c3437eab7..787f7632dcaa 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,9 +1,5 @@
 AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef31dd01c4813794640ca7f40be8e0c09a084205a6dc954748b2877d8fac1b419ddc9d2461a894bf9de8e53b48852926 SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e
-AUX leveldb-1.18-mips.patch 1399 BLAKE2B ea9bf52ce2c6482c8a43116c5782b2219af3d8a7eafb39a7d0742695b144f50c5f53e33c85ec562c690b78313146eef7a1edf41eb178bb6b9d8e179d87d72576 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54
 AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200
-AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75
-DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
-EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a1f89384c07ac4ebc92daea56c8d795fe378275bfc72cbaa8e41ee754176113a936f670b570466fa3824c98eac093e25a8fa1d7c0e6cc6499a3ba5ec499fe8d6 SHA512 8ca2b28ef83e6e08ee85b6d055d6cfc09b4e294c2d68e0c06918a10a009492b5a4bc804e1527fd202cf0adf39a0c0d1e6df2dfbff6b353ca43445ae214909917
 EBUILD leveldb-1.20.ebuild 1755 BLAKE2B 0fe19dead939d81398ad0c54874393300221f7b45a1ec24dda1949ff2080d8d6bf5275efa1a51c83c0251b247cf5fcf4328ca26116ae6cd35dd9450411dba8bf SHA512 125ffe35e50299b19f937fdcd5a0876b5e576555b0bed70ed1cb2a29e908ed626a24f4a39ba4173de1cf0db923f9d8359bf068e640e2f9944e66c65229d79492
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/files/leveldb-1.18-mips.patch b/dev-libs/leveldb/files/leveldb-1.18-mips.patch
deleted file mode 100644
index 379223d210b6..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.18-mips.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/google/leveldb/pull/272
-
-From f216400e702a51c900f2ce0285fdd6a21d3dd87b Mon Sep 17 00:00:00 2001
-From: Ben Chan <benchan@chromium.org>
-Date: Thu, 11 Sep 2014 21:38:48 -0700
-Subject: [PATCH] CHROMIUMOS: Add memory barrier implementation for MIPS.
-
-This CL is based on the patch authored by David Turner <digit@google.com>,
-see https://code.google.com/p/leveldb/issues/detail?id=109
-
-BUG=chromium:413517
-TEST=`emerge-{x86,amd64,arm,mipsel-o32}-generic leveldb`
-
-Reviewed-on: https://chromium-review.googlesource.com/217834
----
- port/atomic_pointer.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
-index 35ae550..341909e 100644
---- a/port/atomic_pointer.h
-+++ b/port/atomic_pointer.h
-@@ -36,6 +36,8 @@
- #define ARCH_CPU_X86_FAMILY 1
- #elif defined(__ARMEL__)
- #define ARCH_CPU_ARM_FAMILY 1
-+#elif defined(__mips__)
-+#define ARCH_CPU_MIPS_FAMILY 1
- #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
- #define ARCH_CPU_PPC_FAMILY 1
- #endif
-@@ -83,6 +85,13 @@ inline void MemoryBarrier() {
- }
- #define LEVELDB_HAVE_MEMORY_BARRIER
- 
-+// MIPS
-+#elif defined(ARCH_CPU_MIPS_FAMILY) && defined(__GNUC__)
-+inline void MemoryBarrier() {
-+  __asm__ __volatile__("sync" : : : "memory");
-+}
-+#define LEVELDB_HAVE_MEMORY_BARRIER
-+
- #endif
- 
- // AtomicPointer built using platform-specific MemoryBarrier()
--- 
-2.3.0
-
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
deleted file mode 100644
index 0df587a3f9c9..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- leveldb-1.9.0.orig/Makefile	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/Makefile	2014-03-28 22:11:05.000000000 +0000
-@@ -61,37 +61,45 @@
- # Should we build shared libraries?
- ifneq ($(PLATFORM_SHARED_EXT),)
- 
-+SHARED1 = $(PLATFORM_SHARED_EXT)
-+
- ifneq ($(PLATFORM_SHARED_VERSIONED),true)
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1)
- SHARED3 = $(SHARED1)
--SHARED = $(SHARED1)
-+SHARED=%.$(SHARED1)
- else
- # Update db.h if you change these.
- SHARED_MAJOR = 1
- SHARED_MINOR = 9
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1).$(SHARED_MAJOR)
- SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
--SHARED = $(SHARED1) $(SHARED2) $(SHARED3)
--$(SHARED1): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED1)
--$(SHARED2): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED2)
-+SHARED=%.$(SHARED1) %.$(SHARED2) %.$(SHARED3)
-+%.$(SHARED1): %.$(SHARED3)
-+	ln -fs $< $@
-+%.$(SHARED2): %.$(SHARED3)
-+	ln -fs $< $@
- endif
- 
--$(SHARED3):
--	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
-+%.SHARED: $(SHARED)
-+	@true
-+
-+%.$(SHARED3):
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$*.$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $^ -o $@ $(LIBS)
-+
-+libleveldb.$(SHARED3): $(SOURCES)
-+libmemenv.$(SHARED3): $(MEMENV_SOURCES)
-+
-+.SECONDARY: $(subst %,libleveldb,$(SHARED)) $(subst %,libmemenv,$(SHARED))
- 
- endif  # PLATFORM_SHARED_EXT
- 
--all: $(SHARED) $(LIBRARY)
-+all: libleveldb.SHARED $(LIBRARY)
- 
- check: all $(PROGRAMS) $(TESTS)
- 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
- 
- clean:
--	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
-+	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(subst %,libleveldb,$(SHARED)) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
- 	-rm -rf ios-x86/* ios-arm/*
- 
- $(LIBRARY): $(LIBOBJECTS)
diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
deleted file mode 100644
index 0a4ac6bfd31c..000000000000
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="http://leveldb.org/ https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy:=
-		static-libs? ( app-arch/snappy[static-libs(-)] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.18-mips.patch
-	epatch "${FILESDIR}"/${PN}-1.18-configure.patch #541186
-
-	local SHARED_MINOR=$(get_version_component_range 2)
-	sed \
-		-e "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" \
-		"${FILESDIR}/${PN}-1.9.0-memenv-so.patch" > memenv-so.patch
-	epatch memenv-so.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	local targetos
-	if use kernel_FreeBSD; then
-		targetos="FreeBSD"
-	else
-		targetos="Linux"
-	fi
-
-	TARGET_OS=${targetos} \
-	USE_SNAPPY=$(usex snappy) \
-	USE_TCMALLOC=no \
-	TMPDIR=${T} \
-	sh -x ./build_detect_platform build_config.mk ./
-}
-
-src_compile() {
-	emake $(usex static-libs 'libmemenv.a' 'LIBRARY=') all libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/*
-	# This matches the path Debian picked.  Upstream provides no guidance.
-	insinto /usr/include/leveldb/helpers
-	doins helpers/memenv/memenv.h
-
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 5d925f5d4c5a..b671c6beeccc 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,6 +1,6 @@
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.112.ebuild 2124 BLAKE2B b3016e52def118b2b7d7b7bb8d4f1d9d1439497c91b1116245d6a82729077ae41832700cc00d3ca8e3d8f3fc09f3a9e5de55f959e1af310497cfb2d2187edecc SHA512 55aaef6e962dc5aeb65da6922988d4c3aa18724b5c75d2aa2f39700ad7efcc7724e13d3d5feaaacefb539a3081041e708514ae14e24df8d7719c4d7979fc7c7b
+EBUILD libaio-0.3.112.ebuild 2125 BLAKE2B de7aeb7469543f50fce366acfc71ce5635b0ce1a30e65b7a96228d7f58d0939c050c494a193b2eef4b1fb31ac022fe8117d55c6703964f9937043a40f40f625f SHA512 e87fbbbc0e97827e9c19680e9ed6c77f3b8b515c9394e925cfa381542149b3bae64786cd20d2a666f5c4ce03f4a0878ffcd97a847a4e2405bfe85ad16a72114e
 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 4795bb4a812b..93a8952b8ee0 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.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 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 4a48e16ac2fb..f57088a4908f 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -3,5 +3,5 @@ AUX libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch 2937 BLAKE2B f5782
 AUX libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch 483 BLAKE2B f81ffe5960196ebf683f9f52b5cba097843727086f4e836f7d27788e1cfbcb7d54196f19bf0035910aeb087b8896b54f7d91e318781fed05c74571a0a000d63a SHA512 a9ece0e95155a83a26fa070381edd3e46bf6c0346e5b5adbe6dde84e9a5792fb6d92b40dc98f7309f2776efcbeb0cd8ff7da1c0091f399b1e00eef809d930a3d
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r301.ebuild 2112 BLAKE2B 1b023a5c34ad17ac37e9a5fa266704212b315970a45ef7c38a40779f56b1aabdb7ba2fc107fee08b02556eb45ff3455ee0ae8cfa73036e20f0086cbaf7efd7ba SHA512 60635b2a3aad69c039dcea4e2dc33a4ed94e55af2a41ae883c1cba9265489c4695fba19d690cc5b2b478410d3588569eae14a194bf75a5c70168ef3eda3f44c0
+EBUILD libappindicator-12.10.0-r301.ebuild 2107 BLAKE2B 08669f52456439e1ed2e79e621c05124ce7411905c4edae741ea56db68f9fb4f6b0ba96d0a62ce0ed0dc469fee47807111854c3182eaa5a0c06d56c1046a1d04 SHA512 eb6e2de2779cf909eea82a208dd02659a32559968040fe07804de7cf739570cdd466a08b3956771aaacc608d700b8dd9b3299bd6b7ecb4a6373dedba7790fda1
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 534690231318..32b93d812d6b 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils ltprune multilib-minimal vala xdg-utils
+inherit autotools ltprune multilib-minimal vala xdg-utils
 
 DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
 HOMEPAGE="https://launchpad.net/libappindicator"
@@ -59,7 +59,7 @@ multilib_src_configure() {
 		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
 	fi
 
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-static \
 		--with-gtk=3 \
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 76fe8738bb03..d7d533bda284 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,7 +1,7 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
 DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
-EBUILD libassuan-2.5.3.ebuild 1204 BLAKE2B 6e42c683176d3d20582599a7cf7e0415ecf9c582da9f0342fa71ae85d41c1c2b436383c38e2d1a49ea18fb9a5b5f8ada25ac864e2cb607fa47c31313dc05643a SHA512 6ef03b3e23e05b37a9befef849f8a593d43918448387faa8297fc39332c2eb15c562aa5f65c58f9dfbbbee75be1aa027061564bf90d1acc7903be623614588be
-EBUILD libassuan-2.5.4.ebuild 1209 BLAKE2B bb0e81091e3b66cf35a48eee7b6aa389dea009c11f7c12952dd61f15e1d270f526ce854dabc03f3f8a2559b683469d8839a99693c26ca61eab3b4493d12d5ed6 SHA512 b0d95eee5fc77a64346954e66dbd52115b5a982e4d14bec913be38b13e31d6644781ffc587893d0bdca151cde8096246a8b9d9a36cf0155ea0e90a7ded83a4de
+EBUILD libassuan-2.5.3.ebuild 1205 BLAKE2B e8d3dc198fe9e2653bd42c2cc0ea107696f3a07ee7d2b943992a5a9843e565e7a62a653b718884b3a5b94ecc4ad1179b4ec5d534fd09e2ae71211c18816c3554 SHA512 b78dd22d73b01e200b5d365bf3a558ecfadb79494ff50787a4da9faf2175dfd948a22b5a557f641d88706c851ae45cb556d22bd2718cbe52fa22ce2e1a506953
+EBUILD libassuan-2.5.4.ebuild 1206 BLAKE2B 7ab8a7b9f4a768fe4a03da25a331e0072426a3cc75bc679e3c51d308b7c282c97710dd8fe09902c6f0e367e468a4f1aa5c7bdb0440d57e08cd2ba4a3d58b480e SHA512 6e7446a389c86d3be8b28b25302ac04ccbf14b8a98a54131e4e874ff17e78dbf6a08a857fb9ab7019e3945a8efb8bd54710edc95a48eb06df7fbe8f2b0ba2918
 EBUILD libassuan-2.5.5.ebuild 1214 BLAKE2B 0781a4a4af292712cac67400b78d06d04dacee6b2a0014f3aac6e2c80f7a7eed3870359b3e651c8aea176e158e25353002171d21bbb85735889da6805b6a7c9b SHA512 51faf23074d4436560e96d2fb1439b19d851e6760f3a469af9cdf2b9ed9205bf47e21bdda72568cab8993647b69e7b03a30afa5f680f3dbb05c6d50da9318b3a
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 35ede059a696..6b7c07a83540 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
index e0052e618097..869dbf172ae6 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.17"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 954f5d15f9fa..2f229af6823a 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,3 +1,3 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
-EBUILD libatomic_ops-7.6.10.ebuild 737 BLAKE2B 06ffbe98ef44cd6fb90779f1aad9219be03344fa0e29b4ba63e6c8788a8d41d4845d3326b0215c799ea71bebf71b953a7a47b687b4a2476c85890c7d38069005 SHA512 27c6eff09a8a5525956f28bea7cb7204400f77f54afb95c730513b062d6ade7b91c103fc36122f9655bd110cba1d23f96fb7019179a52756ed7baca9ba674084
+EBUILD libatomic_ops-7.6.10.ebuild 738 BLAKE2B fecc2d908f130bb635c358cb321a292bbc64ff11faef11c4c8c692cace88100caedd49f4101d6e30e35dcfd5d88c7ae1988975e47aef1afbfa3392c2eabcea33 SHA512 2a1c470638fd5306e70154c391ae17aeefdcd4f504fbe079a7d2a79c2575ea819a8f506cafe0f449685f1875c4d2378a741da2f160c7f5e59d1c09851d13a5f2
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index e8b75ba46a6b..9216699224d4 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
diff --git a/dev-libs/libb64/Manifest b/dev-libs/libb64/Manifest
index 6ac910cc00ce..22b24be1a7e6 100644
--- a/dev-libs/libb64/Manifest
+++ b/dev-libs/libb64/Manifest
@@ -1,5 +1,5 @@
 DIST libb64-1.2.1.zip 23316 BLAKE2B 1e3aa08679e363d61b7a0a77bfe909c0fc80411bf2c7b0f35e7a8a692a25585a37303ea0f010600c0e07e0419f016fe60f88851eebb26d044e7dbaf3d02726a0 SHA512 8b1e5c8086a38be82471b5f37393f3f236c923f4a2bb737209a297cbab32a9f0a5c4af4ac912c695f0f7d8ff9458d97ce0d01092fbacbfe7181e4fd816e2153d
 DIST libb64-2.0.0.1.tar.gz 15766 BLAKE2B 45e3cab768cae39758d146cd84b72a7644592e55553be9c11ed1e83c3acbf4ed05cd00bbd59371b9e71cd53012149f25c371769afba7fbdaafdf561a297247c8 SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23
 EBUILD libb64-1.2.1.ebuild 608 BLAKE2B 080c2a3b5e60b3f85f4b95ba876bfa810189212b348c9f5ebe3b4b5559baab652ad2176218f1d03fa53da2e9381a4542b930e2430500f73d381239303ef822c1 SHA512 2a093186f85978e1190b3d8f48bc9116380b7b1e5f39752000f6bb2b3d6fa77f6e72aa6f12b2d7d7fd0b095436ed8415b1aee1ab4d7d18f3889214077c966ff2
-EBUILD libb64-2.0.0.1.ebuild 617 BLAKE2B af426acce7c54df31706d10ba362a1c6df064e057d302a910b95a81155028b96e05a68c6507a18e56e8492ba37359b6615508853da2861e1dd44d0024fc4ee5d SHA512 18c1c6e66300392c5e59e52edba34d84010d3ee88a2c455b66b43d4346e4c6ff3898b69250cbcb4c798f5eb3ecf15f6aa51211d8bc9d0bc6981e70a62a15d800
+EBUILD libb64-2.0.0.1.ebuild 610 BLAKE2B 2632cf1b0032081695dafb68b00895f3fdfbb7013d47b45d20bbbf7904811604432621436859c57e1411badd1eed1bb6be43d305f669cf6308c0d61d4fb90dbe SHA512 d81de28d06153a70b8e91f7e211cf2a7f76f34eaf1e8aa223f2ea39b04d8ad392b00d57ec2c54f522fe717d3b9d9142eab0b4b17c93ee2ff2713d3b432f43178
 MISC metadata.xml 323 BLAKE2B a5f023ab7e18b96fd023bab92d37b806bedb465a45619074084b61c85fb72d88ebcc241be89461ee733b6aea4661e858c38472245b63f5d36104500645220e67 SHA512 1280f198aab48b475f7bed0c8e27bb538ae9097630f18008879592a2bbe0430f0635c93aee0db13534c3cc5678929c758a0d734902f6509d4da332b4df9d14e4
diff --git a/dev-libs/libb64/libb64-2.0.0.1.ebuild b/dev-libs/libb64/libb64-2.0.0.1.ebuild
index 9adbb345b334..a99722ebba95 100644
--- a/dev-libs/libb64/libb64-2.0.0.1.ebuild
+++ b/dev-libs/libb64/libb64-2.0.0.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,9 +12,8 @@ LICENSE="CC-PD"
 # static library, so always rebuild
 SLOT="0/${PVR}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_compile() {
 	# override -O3, -Werror non-sense
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index f09de4bcf24d..b3478d0972aa 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -18,6 +18,6 @@ EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff8
 EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
-EBUILD libbpf-0.3.ebuild 1228 BLAKE2B d6eed3093c1f3d0bbf065250190cc458fce536586a64f2f4255f50667ddcc1389f7cd075b95e6cf2aefe7c9e9311065f466df245726233c1ca1954d91846d71f SHA512 5c3d6d4ee284aa33aef21ed93355ca4a16e0dbf87f7daca372a89a713d8fb98341e289f10d9359bd5aa305292e0596b08bd12ffe1980c3d61aac7d330f9802d8
+EBUILD libbpf-0.3.ebuild 1235 BLAKE2B 8e2dc29916632b53101aa81a6981addb3f472809ef65b320d9551d4d4925b05de919b5d0587b59d7d45260ba6e5bfe536f8588443ca686c5e0fdd188a72afcf7 SHA512 1f80a3a91e36d1333b96d37c151065ea155e1647e9b40022f54f993ef800f813623cd642e91062df6e2aaa4075605240a1fdb8a2d38411f1c56537bd6eca499d
 EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index 8b55fe162b20..f97946618eae 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index efac42510f40..5dc691266d32 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,3 +1,3 @@
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
-EBUILD libbsd-0.10.0.ebuild 1239 BLAKE2B c110896b486cf75fa1e68220a4963778595d637b27919859f6d347e5478ae5ff2dcf9171a0c6667963a883141c86db02bdc07e6a571ffdcfbed2aea1290c1dca SHA512 81b9fcbcce1ffc181b0851a583d08a5afb5661b4a88d26a590e55d9ff32f39e5a102e30909c925c337784b5385bb7aeaf9b722622114185f8293c1765f5b5c23
+EBUILD libbsd-0.10.0.ebuild 1240 BLAKE2B 8fd9398aff8163c5651bd1ea4edfc1afc6e0a1c0309be8afec21dc719d5259b3931975f713e86e1825af00b2bccfe64b19fa69c7f7958739a0eb966c330ebfd2 SHA512 1ee29cd1a6175d09427a1d56311dad8b341c5094c7a24f8dceaa5e7114941e91ad9dc014153a57009ac79fe5851140def2e9cf0a3a238da654be87fce3640eba
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
index f4a24da07906..ba68dc9c223d 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.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
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 0bd7afc28064..260cc11e622c 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +1,5 @@
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
 DIST libburn-1.5.4.tar.gz 991212 BLAKE2B 3fd4aa70eed2c9d0d33ef8bb967cd6208f1561aeebe8bc2b222fa4639fa3c215d49ee5ed3efc32813221fc4a9016ec9a3cabdcd8ae052d161794c0af11c7e6ee SHA512 dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9
 EBUILD libburn-1.5.2_p1.ebuild 889 BLAKE2B 981fee1ecbfca821dd15422f20963858807ccf0c7624157150c9f75eb4b9e4ab0527e8b63a50bb4efacecdb3460ae5fa3f2d471f0f0d7385763ac77c5ef8a86c SHA512 654cde093a0ac37397e4d0d63284259e2cb8230f0ae8d9934573501425c39049cd2b04238f284c62f8e13f3c885d3cabfb17ee70b8811533354b2ffa4b7e1f8d
-EBUILD libburn-1.5.4.ebuild 847 BLAKE2B b7ca55dcb20d93929b1d70059ecbf6cb02f3fae4c57c9200b32b40ab31f9f6705ea4595d46548af274f80d787d93f2d1fa9c47b93762640905da702526f74fea SHA512 287c3aede68b0dd378cdd3999e04dd8ab19c9a4979cfc0dab2ec647c28d4914216cc4f1d652b1741b9599ecda7de1e91a1302e967153a17c8dc10911a097b5de
+EBUILD libburn-1.5.4.ebuild 849 BLAKE2B f7c9d98a54e5b4994cc8b19e6c3be36a2f5e565cc59d752003c5e762fe4b6bc11eaf69fc73f2f4e36db51e03e2dba477fecb0bcf78d7ec279cd5312c3fa29297 SHA512 ead0f167e16f8be9119c46b31b0414412d6e6b532188860ea70c725a970af3a4431ce8764ae118116531c368471495cdfabe74c038132a2e77509064846d4ad8
 MISC metadata.xml 243 BLAKE2B d63a20aa244e2d01198a2c4d25830ea1a68f7fa3fcb918ac373c31e99b303cb825bc33a753324b0999290c49421076f5fcb2450783a7e13a15cac8bfa8ebd044 SHA512 010182e2f4aa6b9ba90b1cc05b0efe19e0f40188917402ff7ef6034b5210376b33a35f9a2cc921b4cd90030bd6bd8d7e632928b34e2ed91a3e3a36a1e0b8dae7
diff --git a/dev-libs/libburn/libburn-1.5.4.ebuild b/dev-libs/libburn/libburn-1.5.4.ebuild
index 49396c70db5c..a728b41049fe 100644
--- a/dev-libs/libburn/libburn-1.5.4.ebuild
+++ b/dev-libs/libburn/libburn-1.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libburn"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 057d2c5f042a..efaffb0b81c8 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.8.0.ebuild 1410 BLAKE2B 3ad39f5bb83d22fee253e59a2b64e35a4bc1adc49a2032bcfd1527f2b1dd381bb0a7e5abc5c8318e329d5a8de35f7abb2bbc1717d6b632c80d15c1f2f7ed85f8 SHA512 f1caab5b2558387f561e8afb7aa22b21abcd6e97d756268f33c065e499aabe6e577849425541924ec2c43b50eb8f11b96ebcccb89376e7730a365b986eda6daa
+EBUILD libcbor-0.8.0.ebuild 1411 BLAKE2B 63458110c30a0a74af224f5fbf0201bc5e3bb0f51477ffefdbd63185d6559dc0352ac62fd1e0c53146e758a21e3b2702bad36823281fb3bbd9a7416261ba52d6 SHA512 8b471c59566087bea2b4387462f5ba9eb4565f105430f445297359942b66f93d453461c59ba205ff828ba3334fd2b1f6d5ad36667fd8a7832e5f06efabb2a2c6
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index a59a570f5eb1..825d999239cf 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libcdada/Manifest b/dev-libs/libcdada/Manifest
new file mode 100644
index 000000000000..6a587953d222
--- /dev/null
+++ b/dev-libs/libcdada/Manifest
@@ -0,0 +1,4 @@
+AUX libcdada-0.3.4-Werror.patch 688 BLAKE2B e4c6bf7c8df550a2dbafaab78b9933e39c7c7b8875a6c87c125b25b5396092b17b5e718fbeaf8ac6a79fb759d9378702ca98852e69ef1c782fc069cf85318e9b SHA512 3fb6fcc7ae855c9049256f74d69011a5599307eda280c5d5b546e7a1a8ff08e64eb3a842835753120c498e7f787a86193ef21624a0fd04ef67f8408752fdfe3c
+DIST libcdada-0.3.4.tar.gz 1772957 BLAKE2B 5a7b24e7e033807586a30beb35a304b37262e8e673a02f307af63606b2119e3c76b2ed90cec6f494cac26f77aaafd1756d69c5043cf9adfd6a42cd0db76b4298 SHA512 363f2ebe9a054a6356040bb68460321ffb6dc0f66dfd2f95d275864135bed715e12bb6bbbffe11d665020a119033cd80d6bf323020760339664f1b7a4f1ae9ca
+EBUILD libcdada-0.3.4-r2.ebuild 884 BLAKE2B 852811e2ae9cc561f2ef0698ec08102dd173deb564be61ee13d4675caac2bf55e1469464a2d6e6db3662b433aaf7f80a7e3fa72ec71398a0cb8c03bcf2deb211 SHA512 b72e444b3eeddcbf9c79a381d7a111b015fcc8ecf25e5f73d33857ca06dea70a390a4c821cf42f83c21d3cea6d5cd992a1a78228f8675dcf2bb39db4595ac86d
+MISC metadata.xml 297 BLAKE2B 443bd84262dd090d820e57c965389436a5171d2fbe66b014ce8d54f179c364d2aa9b427ca3ed3dc278e2f0715315a6b5b0c536a3f0e630076dfcd018456fc777 SHA512 92959e0933ddad451b58c94489270aedab92efc5847cf09fa4e88018b50d535545a7efc0510d6317fe3b89c02251d737bd10a6532caa07993662e8ebb54bb370
diff --git a/dev-libs/libcdada/files/libcdada-0.3.4-Werror.patch b/dev-libs/libcdada/files/libcdada-0.3.4-Werror.patch
new file mode 100644
index 000000000000..94ceb4502318
--- /dev/null
+++ b/dev-libs/libcdada/files/libcdada-0.3.4-Werror.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index f2c4dde..fbde89c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSION), marcdevel@gmail.com, libcdada, http
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ 
+ AC_GNU_SOURCE
+ 
+@@ -24,8 +24,8 @@ LT_INIT
+ AC_ENABLE_STATIC
+ 
+ # Some useful default flags
+-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS"
+-CXXFLAGS="-Werror -Wall $CXXFLAGS"
++CFLAGS="-std=gnu89 -Wall $CFLAGS"
++CXXFLAGS="-Wall $CXXFLAGS"
+ AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description])
+ 
+ # Check for Python3
diff --git a/dev-libs/libcdada/libcdada-0.3.4-r2.ebuild b/dev-libs/libcdada/libcdada-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..fc96ac0f21fa
--- /dev/null
+++ b/dev-libs/libcdada/libcdada-0.3.4-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Basic data structures in C"
+HOMEPAGE="https://github.com/msune/libcdada"
+SRC_URI="https://github.com/msune/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=( "${FILESDIR}/${PN}-${PV}-Werror.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if ! use test; then
+		sed -ie "/SUBDIRS/s/test //" Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-valgrind
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libcdada/metadata.xml b/dev-libs/libcdada/metadata.xml
new file mode 100644
index 000000000000..6f70602dc28b
--- /dev/null
+++ b/dev-libs/libcdada/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	<upstream>
+		<remote-id type="github">msune/libcdada</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index df4f1b0b30d5..fb30da6f7dcb 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -1,11 +1,4 @@
-AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a
 AUX libcdio-paranoia-2.0.1-pass-NM.patch 3534 BLAKE2B ba200b7245b7a39a43275968d1b8f9f54e2abf22080a069894468da6a0e2911ad5307f12ae99fb6c60c4db3c316d327c466cc32fe002404e2c1f62c4e8505afa SHA512 e0b263699249e7d873b2040373419d395697cabf02d61fdcf576d162bde9b232caf891354c2d560767d5044c14cea48401453cff069c5f3c33322c25f97101d1
-DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
-DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
-DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
 DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1874 BLAKE2B 2b751b7cb423b578e24ab7316f4f24486c8714417831a7e182b885d667d551a8fa997253703effd435a5ba7425deb8e71b545279d26e2294836488e9a6aa7541 SHA512 d1de0cd5c1fc3dfdd43cc2d3d7244f0f216543e947b499d23aa959b13394ddaa7f9db8d9e90948c4b1eb835677df57de9d4a0d0a0dc7cd3025bde76a53784c04
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2105 BLAKE2B fe43fe3ffcaee953b476907e8bc9bc4a16f4c2ec6016f2f792972bc40f5c582db904924bf025f9783e530bda0483c15cd1c587b1d940fba0cca4c11ac19f5fef SHA512 19d32ac3062983579041c4d60ca70c263236c95cab386646893889912fc28f1b67a040410971186ae452ade61683a9e2b272a3cc809196e595ed34ea7e85889d
-EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1863 BLAKE2B 4845a7f2cd91ec4c6ab8b4248ff89bc46b760cb6d325d7217098039efa312e10039c139c0e601fa513e9bed258bae775c4c436989b69cd73e007129f20fd19a8 SHA512 b618eb3dc8359160b6f055b65135666ad67fd194340b84c0253565d59e5c099aac3f6ef76a2c25d2527ab2ebdcd3e0eb8869bff5ba5aefb4d32323824b2f8883
-EBUILD libcdio-paranoia-2.0.1.ebuild 1861 BLAKE2B 0fe86632e1d39ac70f6edb6c760b1717bd732ab238d63e3b0bd6c3d2808ac6328bf4236f792783b6add0aa12761e5c731c9e8f601089fcd703acb31102baa5c2 SHA512 549465168cd729329f2845cced1d0e36e15410a398050efa7d8daf22bc30a247e6d0985576a490972a4d930373b202e0239ae12be04e5ba55691d38392f3a49c
+EBUILD libcdio-paranoia-2.0.1.ebuild 1848 BLAKE2B 6582d5bc8c0fa9b6063a2d01a9eadad49fb7752e82bc563c94b176a994691be2cbd99c3da4d2f8188c8ed01da543bf5d538246baeefd64785963b05219f17d31 SHA512 cb0fec9ac541e2c4afb9e0fbb0f5e1769aa687fa8758fda5d5e8531dccadeeb7b1610978ec14d4d25609dc8dfe4f4f53a9a4ef6076b6f15ba66cebe7b97b72cc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch
deleted file mode 100644
index 86cf9da8d0fd..000000000000
--- a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4803c621d4f907402f29eba8cc3a6515bdda2ee2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Mon, 12 Jun 2017 21:20:35 +0100
-Subject: [PATCH] configure.ac: fix out-of-tree tests
-
-To reproduce the test failure one needs to run
-configure using absolute path in a directory
-outside source tree. For example:
-
-    $ $(pwd)/../libcdio-paranoia/configure
-    $ make
-    $ make check
-
-This will cause 'native_abs_top_srcdir' to contain wrong path.
-
-It happens because '[]' is an escape in autoconf.
-As a the following configure.ac snippet:
-    [\\/]* | ?:[\\/]* )  # Absolute name.
-gets translated into the following shell code:
-    \\/* | ?:\\/* )  # Absolute name.
-
-The fix is to change quotes from '[]' for a short while.
-
-Reported-by: eroen
-Reported-by: Paolo Pedroni
-Bug: https://bugs.gentoo.org/546388
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index a502273..608277b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -243,7 +243,9 @@ dnl native_abs_top_srcdir is used here.
- case $srcdir in
-   .)  # We are building in place.
-    native_abs_top_srcdir=$ac_pwd ;;
-+  changequote(`,')
-   [\\/]* | ?:[\\/]* )  # Absolute name.
-+  changequote([,])
-     native_abs_top_srcdir=$srcdir ;;
-   *) # Relative name.
-     native_abs_top_srcdir=$ac_pwd/$srcdir ;;
--- 
-2.13.1
-
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
deleted file mode 100644
index f286655a9ba1..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.93[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		$(use_enable static-libs static)
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
deleted file mode 100644
index 5e6a4e8da4ee..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		# upstream accidentally default-disabled it
-		# reenable it to preserve ABI compat with previous versions
-		# https://bugs.gentoo.org/616054
-		# https://savannah.gnu.org/bugs/index.php?50978
-		--enable-ld-version-script
-		$(use_enable static-libs static)
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
deleted file mode 100644
index d21799a10eae..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-src_prepare() {
-	default
-	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		#--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		$(use_enable static-libs static)
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 0664c3353804..2ceab952939c 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P=${PN}-10.2+${PV/_p/+}
 
-inherit autotools multilib-minimal flag-o-matic
+inherit autotools multilib-minimal
 
 DESCRIPTION="an advanced CDDA reader with error correction"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 630b2aa14eeb..4fbfd58f0b90 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -4,5 +4,5 @@ DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200
 DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
 EBUILD libcec-4.0.4-r1.ebuild 2018 BLAKE2B 36e7fd1cac2551febd35fa3d0533bf9e06d8d5c8981283c6948acb78c1fb2ca405a80113afd3b31fecc315f271442a4c589d02ad300c0461a4615a0e456205df SHA512 619a8dec29e7aaf7daee20f79ccf8d330a4cf199054568f4be98e9d23f09d20a0aca4c389d0b41036acc1d53f0bfe749d70148cf22efd9aa6502d27f57a6ed0b
 EBUILD libcec-4.0.7.ebuild 3271 BLAKE2B cec8de0c00a3976c3eff2e8631846f5a175ea00129b32eefc37dbe9d3000c594aa653e4cd6f5f673bc2eb0db6de1bb18a3ee16f258871c826afa43cd1ff9869a SHA512 79ffd559dd8a0ae22622571ceeb73616574fa0fcf1b0db876ec0bf92fb9d22ad5460e5119abde10bb977e51027609fca6989f372173e7e3aa72960b503218a58
-EBUILD libcec-6.0.2.ebuild 3267 BLAKE2B 9773e80e558a71b13cc078a17aa6ae8260f41d58846df3776f5af90bec787f307e93f11de54f3f960cf312c7bdad2cb0a9a450d56fe2c177b9ddeb6a46e00ad1 SHA512 cb196f88c80859d2a504dc26693e1cc2b4afea636545b20c0aa972866b2273a07290a7afeb94210f0e1619672490e67dcdb97220bb9f0aa441d2df1177ebac51
+EBUILD libcec-6.0.2.ebuild 3266 BLAKE2B be938ad3a2f57a01a66015df0d2c5529ce950dc1583b8fc34414932902f4cd30c1dadc9f254c003bcd52846301b41a9c6ca93fe3b4fef348866cee5d71104ab3 SHA512 b2e4302d25d1533fd60cec507472c8a93d40aea7257fca4dd090a2223f4e9723229554997b33246132524c33b09c45926f3e1467512882374b4433617654e2ad
 MISC metadata.xml 911 BLAKE2B a1c97593e181f44ae3c90ba70e8d36344272663b3d7090ca9b2716df532903ec821009321b0183dfa82b6c881349f559216ff040ed1f45e78c214c8601ab67d1 SHA512 7c5dd62ea6d854fdc4e7083487e141c703543d7220ca98fb9431279080ead371a42ee386d1c015dbfc3ea96e183cf4b8f810d8a6a5791d58aca4b3cdb38a7dab
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index 0457daa7328c..e4f03cb101b1 100644
--- a/dev-libs/libcec/libcec-6.0.2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libclthreads/Manifest b/dev-libs/libclthreads/Manifest
index 00b3c8d35589..2219f83ade9a 100644
--- a/dev-libs/libclthreads/Manifest
+++ b/dev-libs/libclthreads/Manifest
@@ -1,4 +1,4 @@
 AUX libclthreads-2.4.2-Makefile.patch 1130 BLAKE2B 485f02a464a367fb32ff6b888beaa7cf293d295ca8ae4b7f8f36b540c1dafba6f2ba09dcead778bac4a69931c63eb4191341399e5042b00518c7422009786444 SHA512 a8a72ee6cb0eea6c37ecd517ad1398255e2c4c107f2d5f22e08cc9fb8b7de01198f8dfe0938024ed6053244bc1968ff369a970d908ac00ba57c10751b3b2e968
 DIST clthreads-2.4.2.tar.bz2 14357 BLAKE2B c73696e816431d70737d0481237efbb7a05d274f9fb0728b2bf2ba748a4a0540672af92ab8d35b6ab331c91841185aeb3705f5a75e3446a0c2c3631a8b331421 SHA512 a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131
-EBUILD libclthreads-2.4.2.ebuild 785 BLAKE2B cc8f17bb5ac2a08c02b654371a23290528ca3416ebe8e4eb721efb0e45c45aacc0f1d96d53a9ecdcf08cc15b0f66e46bb1ffb13d993abd36d7566026b174a3bf SHA512 00af75e98f2fd09b9dcdffaef4bac4236c6c20d5918ef96a3631c9612efdb40a11e84dce96815016306c0b5d894a88737386efbc741b76fc24d1826a8b9d1042
+EBUILD libclthreads-2.4.2.ebuild 768 BLAKE2B 94f0ae3a8b87fc3b4fda10ba381f2ecb9a7f50f8ea2bd48416592677dd059bed2b0ee1160674135ced967c0325684a3fe7980e2ce56229c58d2beeae62a56c60 SHA512 bde1012b82bf6676b13eff4ad9eb2be39238ad77c8d425cc04c4ffcd4e40f9224088642ce00dafe4e3d93ec6c0a613f41de9eeece1efd29ae4ae586f9fc4f288
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libclthreads/libclthreads-2.4.2.ebuild b/dev-libs/libclthreads/libclthreads-2.4.2.ebuild
index c67a139ad53f..8e731a22504c 100644
--- a/dev-libs/libclthreads/libclthreads-2.4.2.ebuild
+++ b/dev-libs/libclthreads/libclthreads-2.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="POSIX threads C++ access library"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
@@ -12,7 +12,6 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${PV}.
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
 
 S="${WORKDIR}/clthreads-${PV}"
 
diff --git a/dev-libs/libcoyotl/Manifest b/dev-libs/libcoyotl/Manifest
index 1ce11b5811b2..33d07565fdc7 100644
--- a/dev-libs/libcoyotl/Manifest
+++ b/dev-libs/libcoyotl/Manifest
@@ -1,5 +1,5 @@
-AUX 3.1.0-gcc-4.3.patch 1106 BLAKE2B 1fbd61c40ccff44e3122ec297a645651f4288b13f6c5ae44e8c407a79db29197077bea0cbf0f2fef722c476b3c2dc446a6c6522037e3ee2ced5d9b37fcbc20ef SHA512 4db742551b39ce51b804588e22ef7c3691f3cece1414c6fc361c69f79682c91c06a9d58dfaa2d75c0654fbf75a80dd30c8f9b86de7192399f3601d145e84d1a8
-AUX 3.1.0-gcc-4.7.patch 286 BLAKE2B 760411a919d57e0209d520225c7b73524a4fa7a9d96c1d07b57ac8aa7dec8de56aa243b69f0bcf9ef361e1b7e555b5778c3241e2154880ac2f7eed3f95bc5d2e SHA512 616ddbebe40254ac0d4b04f7f7633c3ae77a88d261ea8c74f4105f803c2bfffcf5eeb50822d65a9a3aab58cde020464b8ce7ff56a3e8551b9a04f33ecf35398f
+AUX 3.1.0-gcc-4.3.patch 704 BLAKE2B ca080c51b1892e264fc7221255e5583b94e3a5dcb0ae978d34480991e6bcca71250759078381aef46a450f527ac46f7bea5484a6cb553568876ff35d361645e3 SHA512 f7b971314024466f699572385803bcc6845d538d2a20286fdebac96019491b7e6d17c05e49af45f5e55de9ce92abf967e83bb5c2af0b4369ebe4e3d11d396d60
+AUX 3.1.0-gcc-4.7.patch 213 BLAKE2B f2b8d6138693e80632cc96ad1f832cec646d39489b30a3217ce2d00e406b3f5317a39b1289c15510dc09b04dfb595a494dbac74a972fd1410263a15a1246e6c9 SHA512 13f9b79181ddc795ba0b392e7d1aceb6b0d804cc2dd01d28fdb240dbbbb6cde08a88e641c13b8c033fd6d3a13a3fb2c602ff99e12d57613721b3d22217a4ef76
 DIST libcoyotl-3.1.0.tar.gz 346384 BLAKE2B 7b3b63e5cd629bc5a53e95d6fb35f9f8d64df593eca95bafce71934560e38d37b89efa3fa8a0b12a50e570d761609cda4bbdfbd0a1577d062a8c4fa5e12a07a1 SHA512 18d0a71204dc57d44f73fe03fd88c2a040e83615557cf1f018c22ad7c9a11d793c7f71df8e10a156b9fd4fae910882ed6cec37f9e57efd3546ffc15fa82a51b5
-EBUILD libcoyotl-3.1.0-r2.ebuild 969 BLAKE2B 7b44c40141b3ed82086d07bca82a90d81a3ae0ea82fd49784601b3aafd4580da333945b73e7208a4b67c4ff879dc5f506c2c2a8cf7dc96a73056b0da77ea05b7 SHA512 689d02caa09e7f60f28f6a08ee8144d5198118035a2d3e799cfb83cbd8abdb34360cbb5442b831cd4afd870a49ba6f888c881ba54c4cab123e9d0514a5ff934e
+EBUILD libcoyotl-3.1.0-r2.ebuild 972 BLAKE2B 91e15bcb3aff35df8b79223d939783b3360d2640972cc4abcf780176bfb1a9ac260e06ddef60eca098744f8c008cd6d2415ceac1beb1638096d787f8786427b6 SHA512 c735f97e2ac385eb503e1d69d5cbb1b33df8e41a482298e6335cee8ab3cf99a366a312c0eefc1251624f87f6859de3725c27e4703dcf3db71978eb809d4d41d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
index 4d3391e21161..e81476565e3a 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
@@ -1,6 +1,5 @@
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libcoyotl/command_line.cpp
---- libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp	2008-03-21 22:41:41.000000000 +0100
-+++ libcoyotl-3.1.0/libcoyotl/command_line.cpp	2008-03-21 22:41:59.000000000 +0100
+--- a/libcoyotl/command_line.cpp
++++ b/libcoyotl/command_line.cpp
 @@ -30,10 +30,13 @@
  //      http://www.coyotegulch.com
  //  
@@ -15,9 +14,8 @@ diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libco
  command_line::command_line(int argc, char * argv[], const set<string> & bool_opts)
    : m_options(),
      m_inputs(),
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/sortutil.h libcoyotl-3.1.0/libcoyotl/sortutil.h
---- libcoyotl-3.1.0.orig/libcoyotl/sortutil.h	2008-03-21 22:41:41.000000000 +0100
-+++ libcoyotl-3.1.0/libcoyotl/sortutil.h	2008-03-21 22:41:59.000000000 +0100
+--- a/libcoyotl/sortutil.h
++++ b/libcoyotl/sortutil.h
 @@ -34,10 +34,11 @@
  //-----------------------------------------------------------------------
  
diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
index 443cbe2a8657..266a5631fec9 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
@@ -1,5 +1,5 @@
---- libcoyotl/maze_renderer.cpp.ORIG	2005-10-10 06:48:30.000000000 +0200
-+++ libcoyotl/maze_renderer.cpp	2013-04-12 10:29:31.127689828 +0200
+--- a/libcoyotl/maze_renderer.cpp
++++ b/libcoyotl/maze_renderer.cpp
 @@ -36,6 +36,8 @@
  #include "maze_renderer.h"
  using namespace libcoyotl;
diff --git a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
index 2f05d1305b60..0e59b18b7752 100644
--- a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
+++ b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
@@ -1,9 +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
 
-inherit eutils autotools ltprune
+inherit autotools
 
 DESCRIPTION="A collection of portable C++ classes"
 HOMEPAGE="http://www.coyotegulch.com/products/libcoyotl/"
@@ -12,39 +12,45 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-gcc-4.3.patch
+	"${FILESDIR}"/${PV}-gcc-4.7.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-gcc-4.3.patch"
-	epatch "${FILESDIR}/${PV}-gcc-4.7.patch"
-	epatch_user
+	default
+
 	eautoreconf
 }
 
 src_configure() {
-	ac_cv_prog_HAVE_DOXYGEN="false" econf $(use_enable static-libs static)
+	ac_cv_prog_HAVE_DOXYGEN="false" econf --disable-static
 }
 
 src_compile() {
 	emake
 
 	if use doc ; then
-		cd docs
+		cd docs || die
 		doxygen libcoyotl.doxygen || die "generating docs failed"
 	fi
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
+
 	if use doc ; then
-		dohtml docs/html/*
+		docinto html
+		dodoc docs/html/*
 	fi
 }
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 09642c09007e..5ae8ddd8b88b 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,3 @@
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13.ebuild 1301 BLAKE2B d1b4fb29e6f08e571d23db6c468d92edf44c607c8f0dea724a97d5220fa2f5125d08dfc8cbf494758a7124975acf0dc511b48805dc1feb2b8c4319b003b0afe9 SHA512 198d05f0fbe5cce5f2beb3d761679cbce9c9e5f30d4aa0b145eb611a8d9baa497360cb505489f3eac0814230db43f43adae936de719141971d25f6cb56bc2ba6
+EBUILD libcroco-0.6.13.ebuild 1302 BLAKE2B 15f0c96be42c7d22ca83459c00dc590ad48550faa90b5f8d96af710a6885fd8fc0cf737b0b53e7a8287a3d496fa6c3648311731e6befebebe11dcf0371ded8fc SHA512 329a9c29ad729cc29fcf3e6073f1e6096a03d8d125debb886e9534a1138a883793506e6156593a4066f208e2d25da7395ebf7da3a7f6122f47982c783ed39671
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 0c9998c63a95..b3717ad99083 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index df112c9add00..5b341784646f 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,3 @@
 DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
-EBUILD libcss-0.9.1-r1.ebuild 1084 BLAKE2B 9ab5540531a15fc4da96c8fb980fac5f283929291826dc3bedcc40dd9010dc9dd71ca6e7bcb511a0b6943960aeae43905bd69aa6c0c4527bfa234f8d2659b94c SHA512 d3356cd9946a95cf8dfca67b3ec1d406eba08274c205f10a4d8779cd27455a5df9d8e7fa8b70340d5f1c9f2eccadf068df534a471faf86597f70c73d745b8b91
+EBUILD libcss-0.9.1-r1.ebuild 1091 BLAKE2B f32c655a43de7f6d6fd16231a3647d569ee791de3709c7936f1a1937841a12e12f9701139b4b765803a916877d8289059ceb5d98b730448fe27619605956c2db SHA512 82d4681b4d38f2d738b07a8587236aeb28306629b6935f8d8495844e182d1366d648d023656104452bfccbfd7da78310bd6168bf1b9d40c97370f232fd548a66
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild
index f532d433da5d..7dbd9f64654b 100644
--- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.9.1-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
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 33b6e57c86c3..5677ee068429 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r3.ebuild 1321 BLAKE2B c11172c6af481aafdd2880ca376f1280e8e453ce42b9d2fd3cd429cd46cedf1f97b0b413daedeaef53ffe0fdc3999610f35a3474b578c655b213318e5d4bb702 SHA512 fd1ff2899c2ea346c8e716a6798375bcea53f497c6268aeabe182896cec11d59d580f6e8b1b71546a203d410665bbabdbb6ae166b19e5c91971eb5605f1971e8
+EBUILD libdaemon-0.14-r3.ebuild 1425 BLAKE2B bdb7b1506adaba7a2c21cc746ca3655dbc327d5bfff197c022df5a845907e4e46380257b5d6abcf22bdd156cef606c689e532fc74ada003dc1971c69778289c0 SHA512 6b3a6dc60cef1f96b5defb327bf2775ca439a68a4098a4ff030ab88a4d7db8f9bf07a4acdefc3bd5f4045c6379ddace377d877dbfaf1bcc693c58caa93c20095
 MISC metadata.xml 263 BLAKE2B ffc12ff3506230708339c526731fc41075c998b49a137ab20123d685a623bc7b1a1f235a3b3bd170c7761ff470a92fa8d7a4b5a5d12d0d9bc6bf487a39f5dd37 SHA512 0d09fd7f66692657dfa07da397338a22091bdca415b13d84b7fb7f21ceba2c3ecccc49144612b6a7c639ff802c01851e7120a62789397ec585c8db497a3ae692
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index d4e5dbbfdfe9..62e9be489eca 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Simple library for creating daemon processes in C"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
@@ -11,11 +11,10 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc examples static-libs"
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-man-page-typo-fix.patch
@@ -24,6 +23,11 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# Refresh bundled libtool (ltmain.sh)
+	# (elibtoolize is insufficient)
+	# bug #668404
+	eautoreconf
+
 	# doxygen is broken with out-of-source builds
 	multilib_copy_sources
 }
@@ -57,7 +61,8 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+
+	find "${ED}" -name '*.la' -delete || die
 
 	if use examples; then
 		docinto examples
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 35c70c3b6ba0..dcdb672a3f50 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,5 @@
-DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f
 DIST libdazzle-3.38.0.tar.xz 447304 BLAKE2B 77add33e1947dc33a086501928377cc9547563a9a8095f38283a5bc4b1916bafe1ac3073abe4111ba4907857de0726d2325458663acda4df122e6237f703281f SHA512 76dee75fab5a508c274f45cf5f51bac4edc80786942ccc64e49ffe1721607d88f9067b0a7751f44a48bfe38ee87b6986d449e8c5e6b704c6ec32de84d21f7e69
-EBUILD libdazzle-3.36.0.ebuild 1695 BLAKE2B 42df0fb02ff8f2c40b0de1a786f32c79c847a5c1488eb8fb09ba5d106c439ebca3fbdac90e1359c436745d154fe7b2ab2f294469ba17029e63cd9eee73c6355b SHA512 d6a3bd2d6ed1b0b8f1544957c9ca3764c9456052c4549614749bb75501e28633333a1e8c2a7fbbc8ebf48d4c0cc3546b25f67b599df01c19dde76bab45044afd
-EBUILD libdazzle-3.38.0.ebuild 1696 BLAKE2B 5ecd3023a2a81c7e664bd5392427ae8c517fb932a45941ff41685fe3760306b86218745c311e16981b4469be07706c52e582d814bf9505611863da4fa782087d SHA512 691016a10690e94dba29fcd2e5bf82aa13831d52d0f657bbd1534b6a5d7fd7b358620775f10c7e311a7aef7f5c790f2d42498abd8680f23f65ea1a3f22fba6c4
+DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
+EBUILD libdazzle-3.38.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
+EBUILD libdazzle-3.40.0.ebuild 1697 BLAKE2B a6aa766482370f52f70c77e452dba044ef2b58f1920ba8767b52c95911ae06d02e644402a83df073072a8db7948ea6dc31d08fc78e159c9b3b0d84af8311a6f5 SHA512 790ee187857161fa3336d5e0aa226b04f69c2ce79040785fb2306fc982a4ae0e055eebcb305b9c9a6a0d8697418de07d0c80eb453a035446cf87612b721973df
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
index eca00810e1a9..9995d728a144 100644
--- a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
index d07666e1c344..870ecac11850 100644
--- a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.40.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 6e49ef8ac7aa..a152841fdbdb 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,5 +1,5 @@
 DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
-EBUILD libdbh-5.0.19.ebuild 766 BLAKE2B 776458c68471e42a401937f8d6c8eeb05d7e1365412c00212ef9e32ceb0f06c8afac848b584066aea5a2d723557527cb9e805b5218ebc90e882544271509b859 SHA512 5f2a90307c5c7009efa691d2f0a5608f6f67df1ae95d8a95fd0e5758f21f4bbc2ef42b3bcb3ef19b46d2259a09090a0e33d742a377fae1d3af943de6e2aa6c28
-EBUILD libdbh-5.0.22.ebuild 743 BLAKE2B b6b0c9b0fd998adfc02e34b47edcf15b85562faaab3b0a8920d62b979c4a0367b620c95dd19737e3242f10a165addfc21d7879e0c0853e2e27858564de30c495 SHA512 a30978a83bf0a27ca44b6f50e8b24f271e199892acfba9000fbebb4a263cce680d23ff7f889c98bbb20ae8bab5750b7ea34aae1c3287ce188f85b258cd911133
+EBUILD libdbh-5.0.19.ebuild 771 BLAKE2B 2c0cb01aa6ed080ba8fa85d308e0069024a65ff70972f82a5160ace00a5a57e5cadb0df2fe06ebc256df53423ca50795e7cafc17771887ea0db5539e076ddce6 SHA512 27f8345459aa9c6852a386b1ea8384c86116c767674e55fde533b3caf934e25482b3b04e61f3da218cfb98d3328c1fabcce77306c9d0164eeb28573262d5102e
+EBUILD libdbh-5.0.22.ebuild 741 BLAKE2B a980e996e70ef687900f1174a9d485b9e67fb1532153d8298d827361c3f93598083bc08210b43392390323f6bc5ad8eb6a2d2696bff8eaa6fbe0c4bc3d346fda SHA512 443158de2cb28a88ebb5c85e0e705c152cedaa90c341f3b4561ba290c257313ff709b188ed1ffad4ada886e999b3afec74ee1c9f92283b96dfb9491be4119925
 MISC metadata.xml 466 BLAKE2B aa2426494b4350f37e04cafccb578c0b2883dae5029e8b6ecf60081006d8d10d578b6e6d2aba9f68ecf1d74a8a82b6af75c80abfa3b9efea3b7685c91e106110 SHA512 fb102058f5974d30660f2c4032dd8422703a7acdfffba825e63ea907f50facc4c012884066e4c17b870794d3cb2d685b62d7ce45f3beb1ce223386db55c3c9f7
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
index 81bdaa952a54..ffa6f88eec88 100644
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@@ -1,7 +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
+
+# eutils for einstalldocs in EAPI 5
 inherit autotools eutils
 
 MY_P=${PN}2-${PV}
@@ -9,22 +11,18 @@ MY_P=${PN}2-${PV}
 DESCRIPTION="a small library to create and manage 64-bit disk based hash tables"
 HOMEPAGE="https://www.gnu.org/software/libdbh/"
 SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
 	dev-util/gtk-doc-am
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 src_prepare() {
 	sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
@@ -37,5 +35,6 @@ src_configure() {
 
 src_install() {
 	default
+	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild
index e15065a43d35..f24e96b09343 100644
--- a/dev-libs/libdbh/libdbh-5.0.22.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.22.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-util/gtk-doc-am
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 950d2ba9606d..e05cc98a291d 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3875 BLAKE2B d3dca585372505f5b2e86dbd4ce0a6252eef0c489caecd0d06dd9b3937f5ff0f127b73be4e4fc8a8e83456201ee95500d4288c97ad74e6970d72f56f063e5b5c SHA512 c1edf76187fc6260e345bf0b468824ba22c2d1e789ff45c243912cde18f42faf67a4f703362d8ba31ba17434db05499eac89d917fe8011556f4f61a7b620efd6
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3874 BLAKE2B 2ed71743f7f42342fd33e6da8a2eff206338f8289ecd2af5163893d15e3627ded3a21b5a7f7e126fc74573fb1ac647ec74542129816186a0b38cc4ea05033cb5 SHA512 5f614313b6b666e0d8dd86988094b6e872c5da0b5fac8c7c01d34bc10bd266bd0b65e3f12b0ff1d98a6a66632671b3912a3ec29822edcaf3ab872daf0c10f4bf
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index 1651b303c421..d12a12d270fb 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index 18be87745d15..d9b051fd970b 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -1,4 +1,4 @@
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
-EBUILD libdispatch-5.3.3-r1.ebuild 954 BLAKE2B 7642ecaa20be03b9f2d2354794b7d8befe16f2a7322c8293b7b91b234680ac5589fb9a48c17cc51b03a807c6e7b6a36d7d3b47dcfbe26ff4c266d18f60d4c8da SHA512 32467c96ee7fdf079da89fa6e5c5b2281128640008cb0d5c0c63f0225c0b7aa6128496c9b7c4ab3ddaf5ff43dea785f630977fb12bc29d669edf41a0983b5f2b
+EBUILD libdispatch-5.3.3-r1.ebuild 973 BLAKE2B 7b699cb9c43c24d620da09ddfdf365b2a06e563bbda09e0aeffe860fc00b5d96174e22567dec796da43d083e1993f47228d3345b2d1277f7013571d06a06ded0 SHA512 07d9c15c80be8853d372e2c0b67a68223674e1ccf7ea61af37400915d9b59795b305c95fff66eb6997933f9c399c753a8882366234491f26faa7bdc4222e52b6
 MISC metadata.xml 349 BLAKE2B 7019847597264a24c724fc1c4ace226ad2b952a82e881813d9725f1153ef728cb0e8ed4b8071d8891606e8a6a1d4c8c2a270395a02de960388a7d084d2ff090c SHA512 dddd39bdbab38f07c35e78d7d38465b8b187854475f4b1feedfdaaea42bb53e4fbdd68f70c24f82c10a7e1abbb8683424ff865cb3d246d360aeddf145457e0f4
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
index d02b56e15ca3..063c0a8fde6c 100644
--- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/clang
 	sys-devel/llvm
+	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/dev-libs/libdivsufsort/Manifest b/dev-libs/libdivsufsort/Manifest
index 899f90891ae5..3c1f53b38731 100644
--- a/dev-libs/libdivsufsort/Manifest
+++ b/dev-libs/libdivsufsort/Manifest
@@ -1,3 +1,3 @@
 DIST libdivsufsort-2.0.1.tar.gz 31290 BLAKE2B cf8d5259adbef828dc1650d57969001f23b65d064658af4333d6bd86ec2ca0618f92d21e50e135eec7102b142ead15c3cc53bdba0d9d336507578db36b92edc4 SHA512 c82299adbd49995145872cd67e03b1c8762de99043acca48964b16c66a39347fb6211b17c9b5f6e12878983ea7cafa65991179f67e3a4cb5e5e14bb57775487e
-EBUILD libdivsufsort-2.0.1-r1.ebuild 847 BLAKE2B 8f6891cbdd9eae07d385e608bb91ecc0c586e20d09fcf646ea7774514e9df2117ec09f5cb087421db5bee1a778c498f3fb28e1406dc14f92edea099f33f94d75 SHA512 e8379f5d00f1e9ab38ebba3c5be0d1b1fae66a185c56407789cfe110a9e6332111bc758ac530e3df56bb1867bf87136e4a7e29dc1f73a7e08f6f71e54ee8eb2b
+EBUILD libdivsufsort-2.0.1-r1.ebuild 838 BLAKE2B 55afe5d8921ada3e026dd421821f2084938b342e7608eedef9645443535d0cf60d4307115c1a56d32ef0cf31e93a462df846b36674f132f6439642a123acebfb SHA512 fc9e0695514488b9959605226514b167896f79a3b8f2f93d7d411c5284807ca81ac874987d2bd0b67cea9d6439fe632d1b67d3dfcfac39db361b24a669ca0557
 MISC metadata.xml 331 BLAKE2B aeb4281b9559ab0e91ed011c9a695e8af8bb2613a54b6b49a6629f952c26607704995d274033132726e21a51a296fd4efee6d090cc022d0db08476003d1a6529 SHA512 44257e79147e95579eff4b63be25a6ec673f8a2a09e7b2240163260c3f13161585746bf9967f479aaf6094271669f1b16202a1c5766c3c638a4f9054dd9408fc
diff --git a/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
index 095839e75be3..24cae0397e53 100644
--- a/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
+++ b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake multilib toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Suffix-sorting library (for BWT)"
 HOMEPAGE="https://github.com/y-256/libdivsufsort"
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 24f57ff1bd02..a7d671abf520 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,6 +1,5 @@
-AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b50263f297db16bd838dd31b571ee69f0f15056542be533115d92115963e49b357e0caddcb34a0e5a9eb7160fddecb9ca5c SHA512 e03cef80831c8982705e9ba3448a379e48a443b3b09b4c6f6be56ca2d0ac594f4569b76739551cc945bef27fc0fac2ffea3ad532355933a528753338f4094172
-DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
 DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B 4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412 SHA512 2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c
-EBUILD libedit-20191211.3.1.ebuild 1138 BLAKE2B deb7c2ef49a6252134c6d875b05e8c56f20dccc08906266f6ae58d96e2053751f4e4a756255e55d1ab7ee820371582f93094c473e52eff56eb3373ae2d9c672f SHA512 530de4d2e9057d064c7ac5149b82ae2893f30ea1a34fbeec79bdac6308c6ee73a4f30ea19560d9766fa06331354cddbfe1ee17d942dbafdad8dca4625b3a42ff
-EBUILD libedit-20210216.3.1.ebuild 1076 BLAKE2B dd57f842c575047c0e8480e4ca90126f4c1decc736c44e0088cf10ee28546af05dd461eedf6eb62786b3edc846bdcac2c8659f21d5d7123d06abf5a14e76aba7 SHA512 bf6780273b052aca0b4ac375c41bd1b3bb8c4d4f8478abaa8d896a7f0e21b37804767ab190cb2e531ab4d1e8f0decea232f581bd7aade04b7a0ba9952b6996ee
+DIST libedit-20210419-3.1.tar.gz 522387 BLAKE2B 265c7a10905120feb096d147279a9cf7296cf3b19e16ff4a683d7de11305c0d0c7a67fe8652c1b8f16cbaf3e09b7727987bb6839be4657eb41323c0220704969 SHA512 d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9
+EBUILD libedit-20210216.3.1.ebuild 1042 BLAKE2B 322abd1848d37ff9af698b84771f3a59394c513c4e6e05e9b8920f918c23a071d0e9c5d3762993b0c58e6cf91657081f8930cf745405a44859b3f5f125ab5a91 SHA512 5a7476007f620f676971050ae1e0620877e50039d119601386c9281b7b9118b2543fb64897daca5e3e6a525f91a056ac9d9bbee0ed4f2a5ad026c53accb759dd
+EBUILD libedit-20210419.3.1.ebuild 1050 BLAKE2B cdfe8dbc428f92ece8a36cd29630b8ba3237c13efff3fbdc9f7ccb189ba8b169ea4dd1f6639d0fba57b2b48233f6dd79480fa6b8a35f0acd25cede62b3a26865 SHA512 be908abb3e81a7c14383cd14369e98f8b24a45478d5073688adaf6245d6d827336715daf5db978eb87ba5ab6f24a7b7c30c5ce7740bb815a806658e7cb2142ac
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch b/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch
deleted file mode 100644
index e52b2559aa75..000000000000
--- a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Jun 2017 21:36:54 +0200
-Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses
-
-The newer versions of ncurses support building terminfo routines
-as a split -ltinfo library. Account for that by adding this library
-to the search list.
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a571b2..5d714b5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,7 +49,9 @@ EL_MANTYPE
- AC_CHECK_LIB(ncurses, tgetent,,
-   [AC_CHECK_LIB(curses, tgetent,,
-     [AC_CHECK_LIB(termcap, tgetent,,
--      [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])]
-+      [AC_CHECK_LIB(tinfo, tgetent,,
-+        [AC_MSG_ERROR([libncurses, libcurses, libtermcap or libtinfo is required!])]
-+      )]
-     )]
-   )]
- )
--- 
-2.13.1
-
diff --git a/dev-libs/libedit/libedit-20210216.3.1.ebuild b/dev-libs/libedit/libedit-20210216.3.1.ebuild
index f615587f5f2b..0884e172659f 100644
--- a/dev-libs/libedit/libedit-20210216.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20210216.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 MY_PV=${PV/./-}
 MY_P=${PN}-${MY_PV}
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20210419.3.1.ebuild
index c5be4154428c..0dd34927e935 100644
--- a/dev-libs/libedit/libedit-20191211.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20210419.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 MY_PV=${PV/./-}
 MY_P=${PN}-${MY_PV}
@@ -14,26 +14,20 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
 DEPEND=${RDEPEND}
 
-PATCHES=(
-	"${FILESDIR}/${PN}-20170329.3.1-tinfo.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-widec \
+	local myconf=(
+		$(use_enable static-libs static)
+		--enable-widec
 		--enable-fast-install
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index e4297c8eb83a..c098f0033ee3 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,4 +1,4 @@
 AUX libelf-0.8.13-build.patch 1358 BLAKE2B b0a6ea3d29cc508da873b9dcb9c99c171e01d47df4f6c753434f9da04f18aa56314df089fd2dfebca320645a99fa474359f731d315d51989041ccdc4eb997460 SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c
 DIST libelf-0.8.13.tar.gz 148529 BLAKE2B c0364d6a155ec1590c8ef0754ff0989144d2331e99eb2a5208d80259229904a72328733460675e334ce6b26123f1c92d28d5fb9aea1acdff3ea7a16f4b572a09 SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe
-EBUILD libelf-0.8.13-r2.ebuild 1296 BLAKE2B b61450350a775935e9206e41f0fb867d60ba409a097068c1947a8cda2304aa30867367f5dec2948f1ee35090b0e01e1725188307722c312a313d5af95f393150 SHA512 8fc7720e2753aaaea7748b7d54dac6ec3692d16c2b8a8c459e56d218d64f94f657414ab645c30a683a51735dc088d2815fb84617b47caaba039b404fe263c6af
+EBUILD libelf-0.8.13-r2.ebuild 1280 BLAKE2B 4a8324f56dea6835502763c25fb0536ce77da4ccd1592a902f71a8587b37b759d27c5b0555634c2f40e1438b8f3f913fbb594db1c07444b0d99c475f37ef14c3 SHA512 6fb4f4e72e753585efea226828c84797c6c7a4430d38ddcd88c3f37db624ca6f012bdd9df601427d057cf14007963df2d8a0ba2fa18551a0538bebc01df27b63
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index 8938735f433f..e2d116e1932a 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -1,9 +1,9 @@
-# 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 multilib autotools multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A ELF object file access library"
 HOMEPAGE="http://www.mr511.de/software/"
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index 870b6d6f4dbd..66411133a866 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,3 +1,3 @@
 DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5
-EBUILD liberasurecode-1.6.2.ebuild 800 BLAKE2B 82bd50037625ee3c7996499f8deef9d2a50616fd1e2449c2ecb4332aae83a1e0f131270b0902fe1bac99a8b664362c23b34a759633ce04ce2a84958e88ea291f SHA512 adacdf535eba63f5e187634b95e3d0b4f0e4875a756ce8dd81c832693d24d9581f395351165ece4684c3b960fb804e57838a14ec8f341ef861a2fe56f8f8693e
+EBUILD liberasurecode-1.6.2.ebuild 737 BLAKE2B 496ca1515929b34cb646bc66d2bb196ac4ee15cc53ee8e3b2627d40278dcab5f6855a546c8b210451a4f7718cf3515b4a7bee1abcee0fcbd1ae5758753c2dac2 SHA512 db637560fc7bbdd1ba5cd83ca36966f2bc5ea699212315b68b4618d0de2b2eb94365e6a7787a3caa024d4955bbbc170b3801cbb1051cf5360fef7e3be5cffeb4
 MISC metadata.xml 464 BLAKE2B ca354debebf2db1768ff8cd28d88b0edeb6a57d47fad34837d04e6ad21f59e37204c85b63df08dbee14d3eae342db561a785bf00ecb2d908fc5c0112a72baa6d SHA512 1b94d0071d7670f163e28193c066b6a9f39a086051aba5e6291c0f31d56465e6cbf48798adf6fc90e08fd56121063d909bcd4aeec58547539ec72dde4210b197
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
index 04ffe4e54cdf..b79569ec340a 100644
--- a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
+++ b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils ltprune multilib toolchain-funcs
+inherit autotools ltprune
 
 DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends."
 HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc static-libs"
 
-RDEPEND=""
-DEPEND="sys-devel/autoconf
-	doc? ( app-doc/doxygen )"
+DEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	eapply_user
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 0cd518fb64d3..8e4637643104 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,4 +1,4 @@
 AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
 DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
-EBUILD libev-4.33.ebuild 1022 BLAKE2B b9855ec8b68f6f01610941f9fae592343f3f745c161bbaf33d8a4af00b914fc66821b4310db4b9903f4288fd973f7e5eb98373e85c7766885938227747ad6496 SHA512 9c211867e69c3d8805a7c873972a8162e1105922ec61f92bea2cb9f096178677335b1127a892a050f0f3dd47b5e7dc01ee632d8281ff43185c653ec168c3df21
+EBUILD libev-4.33.ebuild 1018 BLAKE2B 91e78eca852afa857e611786a26935a9e49ef66eebca95bc767b8919cfec1fd30860eb88677416d40e0654a49590db81134914c4f7ad5acef337ef8a7844608b SHA512 02c14a9067b00f59d0e190ae9d37652798128ea929bb07da574ba0fd6a0000ae13aa95ba360006b0580b4ddd7e0755be5ea95482597b1512182f73c78fc8ff79
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
index 4bd39b49d822..4b9fb143c7fc 100644
--- a/dev-libs/libev/libev-4.33.ebuild
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A high-performance event loop/event model with lots of feature"
 HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 DOCS=( Changes README )
@@ -36,7 +36,8 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	if ! use static-libs; then
-		find "${D}" -name '*.la' -type f -delete || die
+		find "${ED}" -name '*.la' -type f -delete || die
 	fi
+
 	einstalldocs
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 6d0583b5d695..7fbe534952a4 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
-EBUILD libevdev-1.10.0.ebuild 1252 BLAKE2B 445b3ae22bb70fb6d4f4e9f36dcd1baec01d28b0b4c9c8f3efe26deb452767f6db4eaa1c2049acc0fe31b4a5c9228f7e2ee43cc6acc5a38f8053dd1255c35407 SHA512 2bbffed6d3693907dd99588b83a76db4c9b19c7c0eeb90976a4e4dc58d527097f540ba75a77c3f31e9e3cb0d144eb5cd2fab6e7db0b5e7225bb85a6cfc3d7894
+EBUILD libevdev-1.10.0.ebuild 1253 BLAKE2B b3b3d4a9035d033fe36cbb51f3c72e2bd4ab4edba00833001220d8fdcebdda4bfb3c8793dead132e89987025371cc8a04f3d04c135423cb804a0a6df880e9c09 SHA512 9c8cc9469ae58eb1d1439ca3954b9b8259d43d49f797ddcc6c92bb158089218da669bcc5372273b30401cae07db0c79b94be765885a9be42bef0227b538e7ba1
 EBUILD libevdev-1.11.0.ebuild 1253 BLAKE2B b3b3d4a9035d033fe36cbb51f3c72e2bd4ab4edba00833001220d8fdcebdda4bfb3c8793dead132e89987025371cc8a04f3d04c135423cb804a0a6df880e9c09 SHA512 9c8cc9469ae58eb1d1439ca3954b9b8259d43d49f797ddcc6c92bb158089218da669bcc5372273b30401cae07db0c79b94be765885a9be42bef0227b538e7ba1
 EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
index 03c27dfc74e0..0330325b6d33 100644
--- a/dev-libs/libevdev/libevdev-1.10.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.10.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
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 76ad199b24d9..d6aae5ac86b6 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,6 +1,6 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
-EBUILD libevent-2.1.11.ebuild 1665 BLAKE2B 02f538b2034c238ae7e78d95733bca29f7812503168f029ca01c7378638f470f5954b740c7d138a11992ced77cedb9aa4ffcca44a1e6d55f2e45d530e89341cf SHA512 9845473b2b28b3967d08d1bba2d92f3eb21ea8ea0a6d79ff1c6570e238ad9edca0b83dff1487b8029c14187cc08210da7e6b852984d76d84bbb341406f057048
+EBUILD libevent-2.1.11.ebuild 1666 BLAKE2B ae2d3998cf4a12578d42d07d1fdd0e7ce0ca7b297f00af9f3a39c16fa51a7b3bce4e6372d5969e0dd0170f11c5028cef5425d9fc5cfa15916d367695150fcace SHA512 841f9287f7564a2a334f61c8c47e929baca632a248362a7d09014043536aaae76cff34e4b2bc3104a36f8c548be4aaf77f51d103997abdfb1810bd5623b8dcb9
 EBUILD libevent-2.1.12.ebuild 1870 BLAKE2B cd6bcd23d4c6d50c5574eca2b2e8114897b200184fd604061ecf5e6c89b82cc5cb65ccacd16dbb6eb048ebff6939144cf1ef16d37f9237a04d229dada1d22559 SHA512 b9084aa06b8d3fdf515a4d7f6d6f3bae35f0490bb2134834f8f11184b1c9fd6c921e4650049cae7496929d5178c0368a6032f40ae5c86b6d4e483c0c3b2f4b46
 EBUILD libevent-2.1.9999.ebuild 1454 BLAKE2B ea626beb07c670f44b0d66f534933baa9a56c1db12e330022eb79388ce86518b9394187008c0107cae83abfab219bd179a9f0f79b7cbb79d1f5d78fbd0602a43 SHA512 68daa118fe9171bf7e5818628cff1b41aa21f67ea965b95aa2d3c0f544f57f2f42905ff9847b27ea4ec516b007ad3273a3e0ea98b7063c38ab3904cc2e6e98c6
 EBUILD libevent-9999.ebuild 1456 BLAKE2B ef35cb0e687a4e96c43112c6fcca73e9596ebc51f07beb1f28f19babdfb064c462b38c6c791f20e0efa64c4ca4b446b91df68051f9eb0a5f378021008c22e3fc SHA512 a41daeef937820670ab644e658e15399b5eb2dfca6cea10b149dc3aa281d2dbbc7ec2a391bcca71fa4b105feebc880bfaa8d0246b7c90daaaba883f56d404159
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index 5addf6160254..10869e3ffaff 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD"
 
 SLOT="0/2.1-7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libevocosm/Manifest b/dev-libs/libevocosm/Manifest
index 2cbeb62c4216..c96f45161973 100644
--- a/dev-libs/libevocosm/Manifest
+++ b/dev-libs/libevocosm/Manifest
@@ -1,4 +1,4 @@
 AUX libevocosm-3.3.1-gcc47.patch 402 BLAKE2B bf6e11eabc9229ff8fe0badb61b01089a46a34abda5d42912caff7e6d494e01a55ab4de06e646a5af73d118314f9b023feeeff00cfd644c4070f2fe4eb7313f5 SHA512 2d4b2f615e17fdbcd8dd481384172755bfc26d98f6b3807d866e33a96f676292c70487b1c3c35b67d7425eec8e86733baad62da51be696c457ee2100fc180bf8
 DIST libevocosm-3.3.1.tar.gz 414392 BLAKE2B 7952cb83a1d5affa4e9b267670cfc889373fbf5c461fdb7022fe1c4af01e2116266f298b4a6ccbfc8102e0bf38fb8411eb6b741e5d72ffefe97b15281a7e44e8 SHA512 ebb4200ac533bdb86051a8a33e5da08d677ae0aa8c2e65a9855e9465b76827c0a72f31e260ee34be62600cd22794a4e47c4471623de8d9fcb4749dcf0a37d946
-EBUILD libevocosm-3.3.1-r1.ebuild 906 BLAKE2B b43a17983998f831a434737a6dfc098555407a303862fae5afe104939740d63c64b0e080dabb20a0a3bf2ff2816ef511433bb98fdaf766cad43740b098ac6199 SHA512 a80ceddb1cec94a2b4a1d3da03f658c97403a04909554f99766852c10be49ff6b4e2d4b94c07fdc485ae410ecd81457b5dcaf3b19953bc48060a7618376ada73
+EBUILD libevocosm-3.3.1-r1.ebuild 906 BLAKE2B cbc6254083f228be1b0ce0a5f3595dafeca8d8435f4f7307fdb5cdf53f67baa4f05e6c1d168352cda6dba4aee8fc27d665f13491916d2a820f01a14239fed50c SHA512 1930d62e11052eacb9493563d98e388f7827fe5a725c684bbf38f6e73e71f56a8616ef345c7ae5a351685687dc76cf8d5c3ded1596773c468f2650fbbde79551
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
index 310e22a38dbe..fbf770314d27 100644
--- a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
@@ -12,15 +12,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-BDEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="dev-libs/libcoyotl
 	dev-libs/libbrahe"
 DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}"/${P}-gcc47.patch
 )
 
 src_configure() {
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index 7b2104f7ba04..dcb3e905bf26 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,5 +1,5 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
 EBUILD libfastjson-0.99.8.ebuild 798 BLAKE2B 128eb7191ddb61e58a1fbf7a0d3628c7e2be7e75b95b177e9052c41f29eea8fe0f286a6fb9e3980b0896ac0626bf05618e6b5e51d7166113f758f20401fffbb8 SHA512 9609f897070f08b031ff226023afe58db45cd34b2200c5f636d71f1bc1665214e054004e3117edd5bf0f01fc1c30cb4542e0fbd9c2b24c91bab5c29b6945526b
-EBUILD libfastjson-0.99.9.ebuild 800 BLAKE2B e19d4260483213531d2089b5740f2cabd18e573bda645870361778181b5a15f0b340038de46787b5e703ae8e4e0edceba95c66973736c8cdf73194484a1b9bc3 SHA512 8df16a7584f5df12cabb70407c9ffca163fff4e6b38893b0a020ce2c3f3b2f87972622230535eb1bc30335b4d1e56bc98244f802986d79cc332f4e15aa6336fe
+EBUILD libfastjson-0.99.9.ebuild 797 BLAKE2B 879d9774b9fa08110cc2f2a4d5b93c8b8838e310b0d6d7af66c70610bc4bdd99980127753bd1016315403c0dc5352a4a938165120b933f0fc1168113ffebfc1e SHA512 99455fe6dc1f5a25fcfd54a3c7f5bc716fae37b4e2663e1048e47faa7aade7d43ad484db52b625737459c769f3829f816dc006b11a3bc515dce338d4baddb113
 MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
diff --git a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
index 6da78b3bb964..5f1435d24f4c 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index c673b65eae36..0fe672b446b2 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f5826524659
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-compat-3.2.1-r3.ebuild 1610 BLAKE2B 02460fbf0bf6b4db47622358b7509641e9a61d1b5cd6b1a9783786dcd61b2384610b732d0721889cc04665e5895849c9de0e52385fc616df15127d618c8ab024 SHA512 15a32a4f689353f9c337fcfda720162ca93cbba5517bd578a0b8406c697785b93f6b3d174a6a7e889e7efbb41a01b13ab2a547d4f5d0d421ae2a76069ad08bdb
+EBUILD libffi-compat-3.2.1-r3.ebuild 1578 BLAKE2B a598c484fd4c93fe5b3a41ccbfbc8af4f26b88d3528d016a47fafdf4fe057fb43a3d503249edce3ba15c0e4015b7a4c8c8b302d47cc995743d5198a6a9a0d912 SHA512 5847e6071169ed361876a30783e43c495a81dc89a7311ff04ab9b0a9678f767388026c758ce0c33fdbd9c234ab2c06d78e4c5612cb93ef6fb1fb60cdf3c2c6f4
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 948e4ebef179..135b4dbf980d 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils libtool multilib multilib-minimal toolchain-funcs
+inherit libtool multilib-minimal
 
 DESCRIPTION="a portable, high level programming interface to various calling conventions"
 HOMEPAGE="https://sourceware.org/libffi/"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 3628b8500bc8..7a72a86070c9 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r2.ebuild 2309 BLAKE2B 3bc8d68b1b8162769054b385bbd3041f01ffc439834b006697c6d7d06e9118ce10e226e264115dee675b4b9ddda0d5f2abe45495264def5992028043cb840c43 SHA512 f08294ee06f0d06d2dab9441298e702d4eebb5bf52e57e8865802a4766cf1c8e97a05c865fa95b7dd701c7174fa196a86cc96c546dab21ac8f205ace16d0b6ed
+EBUILD libffi-3.3-r2.ebuild 2301 BLAKE2B dbc462fa7ac8a8591869c2d6a5f0bcf60d9431fd73b2eca3e14118afcc11beef021cd854a572ded04db91a7afad18d89488071ba09b540a3109add47e9e5d265 SHA512 ec3d62803ecde748bf13975aadc9130698dcb46fbeb698b7754f3cbe7f51c81fedc7240949265a9607830a62798b19e01b9e299081836ea7ab920746a7785284
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index fc243c08f0f6..3433babf3aec 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib multilib-minimal
+inherit multilib-minimal
 
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index a048612a2e62..6b56be4b8a98 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,6 +1,9 @@
 AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
+AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a
-EBUILD libfido2-1.5.0-r1.ebuild 929 BLAKE2B 4e5c9850cdcfe89d1475d4c2dd6394a3b9d6d3f27b763f1895a3e7855c494a575d16f46f2b9345351ac6f915e2b5ae9da6c75c91977d462f41aac33cfaad7df7 SHA512 1124757841813f7137c274481d0b2ea8976744d7d232cf42ebcbae1c34c0e2d117bb94afcb2f24841f2c60af344bf0c94764eaf2a4f1df4069d2f06654c68d87
+DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
+EBUILD libfido2-1.5.0-r1.ebuild 930 BLAKE2B cf13a87979df2b351e4ee731c6faca845c3ab3c579461bd559d69d352b8755b7a1c68cc775270adab7318e99bccde68284e485112662379745d60f1d1e4b9732 SHA512 c1b66d54635ab61e99fbbfa7c91299c89eb26deec4749fe51aae1c7cf851ce02f562db4c7ff6ab5c4cd222d517deac1e69bc1841f50bbf0b653d225bb2a1daff
 EBUILD libfido2-1.6.0.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
-MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
+EBUILD libfido2-1.7.0.ebuild 988 BLAKE2B 7fa3f17d035bb8a6c68c561b8c53b7d414a39e5649250fc7aa1afc3d724930537bfe8516625283b571b79fd08004f1a0c8f16b17f55ae03b060f1ff65c23442b SHA512 9b34b0926ca1210ac1d62e59894b3dfbd25fdf8bdd882a986bb2adf7cdb72ae04d5fc8a07f0d2081d908b095b1f0a9633c1b01a0091a369fd6b7314a21417fcc
+MISC metadata.xml 330 BLAKE2B fe16e7735c17510c8a41691a7dd619d9d62c96f58508979936877acf1c261f402e5219decc02dafb97e7b171047b62981c616abdaafe24a3acad1a6893da3725 SHA512 4eb35ebcdd1831a7fbd6e00336dfbcf6e8697ff95e68b68686032b1251fec090c22d3096666ed48833c5b9a8e9afe10bfbddf592834095a3ee9e95f1ec594c52
diff --git a/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch
new file mode 100644
index 000000000000..2a1bfc1614db
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch
@@ -0,0 +1,30 @@
+--- libfido2-1.7.0/CMakeLists.txt
++++ libfido2-1.7.0/CMakeLists.txt
+@@ -246,14 +246,12 @@
+ 
+ 	add_compile_options(-Wall)
+ 	add_compile_options(-Wextra)
+-	add_compile_options(-Werror)
+ 	add_compile_options(-Wshadow)
+ 	add_compile_options(-Wcast-qual)
+ 	add_compile_options(-Wwrite-strings)
+ 	add_compile_options(-Wmissing-prototypes)
+ 	add_compile_options(-Wbad-function-cast)
+ 	add_compile_options(-pedantic)
+-	add_compile_options(-pedantic-errors)
+ 
+ 	if(HAVE_SHORTEN_64_TO_32)
+ 		add_compile_options(-Wshorten-64-to-32)
+--- libfido2-1.7.0/man/CMakeLists.txt
++++ libfido2-1.7.0/man/CMakeLists.txt
+@@ -3,10 +3,8 @@
+ # license that can be found in the LICENSE file.
+ 
+ find_program(MANDOC_PATH mandoc)
+-find_program(GZIP_PATH gzip)
+ 
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+-message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+ 
+ list(APPEND MAN_SOURCES
+ 	eddsa_pk_new.3
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index 5fdacec0f103..e836ac168b5d 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild
new file mode 100644
index 000000000000..21c57df89552
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nfc +static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:0=
+	virtual/libudev:=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
+
+PATCHES=(
+	"${FILESDIR}/libfido2-1.7.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNFC_LINUX="$(usex nfc)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm -f "${ED}/$(get_libdir)"/*.a || die
+	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libfido2/metadata.xml b/dev-libs/libfido2/metadata.xml
index 4eb20a048df2..faf987beddfa 100644
--- a/dev-libs/libfido2/metadata.xml
+++ b/dev-libs/libfido2/metadata.xml
@@ -5,4 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<use>
+		<flag name="nfc">Enable experimental NFC support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0780b46ff647..bb8a781eb313 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,9 +1,3 @@
-DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a
-DIST libfilezilla-0.26.0.tar.bz2 564361 BLAKE2B 962f513846cf74a419a281c751266360196225c06577e7f5fe6b67f23ef3a4759f7372cac8fe11918e49a0ed20e08995c4bd971a02e692979dc09726be51fea9 SHA512 96ccc61e66dae744c092389a570f591e4f4e62ebf4fc39ed5a60206ea96b47b1aeb3d8f2fb7e22b4920560af4ec212540cc177d23ddbeea879dcd80143b86af6
-DIST libfilezilla-0.27.0.tar.bz2 567792 BLAKE2B d20013746a0a90b9e95436a2b408e9d95eb6b2d32e5cbd0bb827f401a9917c2f376fce45108f332e0a8b71c55d29a78946396440b18f345d8214775a3b7f3b39 SHA512 f7545d0220bc83d66dd6b66494696a8799428d065037c98d7752d841e03fa5ea2198751cd22e22b9b1ad8023210725dd1af8afcffa6f61bcfe6aa12671200011
 DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
-EBUILD libfilezilla-0.25.0.ebuild 1197 BLAKE2B 50fb4560d6a60d5a1a490fda01184173f1b82cb6f636330f6bb2d1186e9bd3327384757e6fc586be6ea15396a7d1c8aae27b90dd62a73dc3487e811329f6c1fc SHA512 8ed8773b226a0b656695e139f9eb97e1c7b6d9b32ece10085a3440427ee49aa802cb2ba587ecce33306ba85821c3a067937cdab2a5e17232c604bb186fc2d28e
-EBUILD libfilezilla-0.26.0.ebuild 1201 BLAKE2B 605e1c7fd2059de3beeebcad1207cdc87d4003361e72fa2264c71e1570fab8a263a65e32d29c8b32a08caee46af68c20b60c56ec8f617f41ed3f66649ccfd1aa SHA512 5b195d6c324cc8467c46552ba4f60ec0b3b6a1dd5caca1810164f33fb50f49984b13a40dc42557b5c8fa9f44f731289a528bc8725f4c2583753fecd55264744a
-EBUILD libfilezilla-0.27.0-r1.ebuild 1201 BLAKE2B d3da57e06cb22e50cc25d0cf9d7c77a9aaff1d3b64d4dc6770d54781d01d9ce9d576d797c516cfd62624aa40c69dae29b55ec308b49e2edcdebd4a00f49c9b1b SHA512 0d77c5a2f3d2789c17b4f020af992321f8e17c0c63f7f2bbeade84981c29473dfb637c419440e2a6a900773789886a036cbd887cc70825be31ec4b910f9dfb7a
-EBUILD libfilezilla-0.27.1.ebuild 1201 BLAKE2B d3da57e06cb22e50cc25d0cf9d7c77a9aaff1d3b64d4dc6770d54781d01d9ce9d576d797c516cfd62624aa40c69dae29b55ec308b49e2edcdebd4a00f49c9b1b SHA512 0d77c5a2f3d2789c17b4f020af992321f8e17c0c63f7f2bbeade84981c29473dfb637c419440e2a6a900773789886a036cbd887cc70825be31ec4b910f9dfb7a
+EBUILD libfilezilla-0.27.1.ebuild 1197 BLAKE2B 1721a789f540228af93da1c6d89fa8845cd7b47c6498eaf51a65f9a166e9a4e122f0f20dc45c4866c2ffef0a0a57623f5c0b910f9ba45ef793313344122ae8b9 SHA512 125b8ca7f430c73013d15ddb64dadbac8b5c1a1f7549c4b52abdb013bd0a62ffdaea9e884134e2a659532872c767a202894d5ee36d81718e364920cd41ffe72a
 MISC metadata.xml 1135 BLAKE2B 403d46fc71d4b6e9bdcd741cbf6ac8f911e35f998253495834db8346fec1fd58066949877e4d14e1bba895db0d05690ad9e499d5772a82fc08e99ee7ae8f23eb SHA512 87e61d89897246499ad56b231afcb9beda85d6b1f67c5c9dbdaa754e82d556a94a6df77836c11c5d5fd7c0a6926155d0cd77f17acaecd2e279fd9a63fc915404
diff --git a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
deleted file mode 100644
index db81501d1fee..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/10" # libfilezilla.so version
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_configure() {
-	if use ppc || use arm || use hppa; then
-		# bug 727652
-		append-libs -latomic
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.26.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.26.0.ebuild
deleted file mode 100644
index 2f343c359bae..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.26.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_configure() {
-	if use ppc || use arm || use hppa; then
-		# bug 727652
-		append-libs -latomic
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild
deleted file mode 100644
index f77f65fc8d91..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_configure() {
-	if use ppc || use arm || use hppa; then
-		# bug 727652
-		append-libs -latomic
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
index f77f65fc8d91..0aafaec97579 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/12" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index c7849cc07060..6bc6dff3d204 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,4 +1,4 @@
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
-EBUILD libfstrcmp-0.7-r1.ebuild 939 BLAKE2B cda956ae139031427fe6346602bd3fa28c1938012c8ff1850c830dee33fe003bcce333fed87eb669cefe6c669e01d58fdab3e94f6cb1a7d68031bbef177b2e0f SHA512 6763478ff05745eb98ca41fe8bae6ac83e21c6cd2eb3d928616d6492757b10b26705fe90100a9c7816050db4eccc4a12bd549b51fba84427e03def975b440b03
+EBUILD libfstrcmp-0.7-r1.ebuild 938 BLAKE2B 287360a9f02417cf53a022c0536ad950a28056b462f5dd4bf640c45310c8e0c1ed01a56d14e4d40b656ef9be719fa49f105a4f69f499725a12a1e425c1147116 SHA512 a23ee9fb8b64391c14c8252f4390bb9d9791991cf0c81be637438cf3cf8871703f1821a257c583b53538616b62721cf7a7239d6de4f0c58d531fdf5fd996cf24
 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
index f2b397cece4e..cc5b6fe41c0e 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-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
@@ -14,7 +14,7 @@ SLOT="0"
 
 SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 
 DEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index e4ae15435702..6b243184596d 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -8,5 +8,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2975 BLAKE2B cb257e9e2c3c6edde80de20c28633b3a9f100f53dc742e2ee859f644bd377b1fceb60a80565e894370cbe6802fd1dfbdf3ab421198f5e3ac5de88b9b7d7f3adc SHA512 bc15a0af58508a6190f248898ab65e37cd9bc9870a595cce1adfc6d8f3f7b0047fcda24c3ca21ec242ee3def111d75e7ea8546ad31437c0a7fe1b23de9265ce8
+EBUILD libgamin-0.1.10-r6.ebuild 2954 BLAKE2B 289bfa423844c31180af02d1228fce432d5d5b87f1535c879aa2e819b71250a1868ed8221b2679cc1e8d8534c17df48d0f8327c0bbc5e78f06763c3a9d6dd351 SHA512 0771077bb6b0364c6c9c09e28c066c10c118b04ab4dbebd160452faa65e46b49a5efe0a88a9ccdb290e689588e2afcc298ad31aa01a5f170882846c11b648d4a
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index e5dd8a9130fc..c19392a7f869 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.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"
@@ -6,7 +6,7 @@ EAPI="6"
 GNOME_ORG_MODULE="gamin"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal
+inherit autotools epatch ltprune gnome.org multilib-minimal
 
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
 HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index d8dfc62689e3..f598c8e35e33 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1559 BLAKE2B 5d507b6d0c8a6da9ad627adcc9bd1074c7aeaf8b4c754d04b520f8fd015eb7805892f58f69da5635e199316d4c11c5291a14f63f45c08845659d191d7022a44d SHA512 5da4010791f3ea0326b14efc101aa8d4af7997d9122d97d6b7c9bf0a379e1b24660b1dca951215eb4acbce34044dd3831b004b63aeb3da6ceec2d58c50a68f4c
+EBUILD libgcrypt-compat-1.5.6.ebuild 1560 BLAKE2B 1263cfe7d7f281b19737a9ee4640bdbda4bd9581c3a7cbfb73f64921b5f3d679b0601dce7e77cf345e810ffe67ed68296e5fb15be8a554e6e3daa09073554547 SHA512 787b49b758d421a41e9d063e13789b2909a6b1a6e49e1c8ea6a732ca77ea84f79e32b3bd8d0e69343e0063e825b8dfc32c0c426f800a36f9c87c66edff726ba7
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index f4078eb5c0c4..ec5dee1b148b 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -53,5 +53,5 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake -C src DESTDIR="${D}" install-libLTLIBRARIES
-	rm -v "${ED}"/usr/$(get_libdir)/*.{la,so} || die
+	rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
 }
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index de0f68536d2d..a7bf68b5abaa 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -5,8 +5,10 @@ DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
 DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
 DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
-EBUILD libgcrypt-1.8.6.ebuild 2306 BLAKE2B 0430932adb2cdd898c6dc95d54027360a412d31344467bb9798d156414da65813a6f99b5e1601a95f8a3d5394febdcead90b6e61bba5d5c7bb88689c283d8ed3 SHA512 a9b9fa4c02560843ff46a97f275693331df1b3d7cfc25e011ad36114294bca1c994985c0ee0b375c1685e1b2fc820351671107d7aa1eaa21c99c24c9832b7137
-EBUILD libgcrypt-1.8.7.ebuild 2310 BLAKE2B 15132b9445970dd4d1936401053f6a04d48c10f2d7e64b6aaf460e50f910ff1fc49f070bc50267c68065c5fd296d4a627575939a397baf40f16ade97211f373c SHA512 0d62aa086533727166d44e01875d3817b4e2c17f491ead3abb5450d83d46b0c1a7d482a3041e3c214398d7396e1ca09963031fb654d4d3bf270e6b77469a7ca2
+DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
+EBUILD libgcrypt-1.8.6.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
+EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
 EBUILD libgcrypt-1.9.1-r1.ebuild 2896 BLAKE2B 450a6eabffe65b2d7cac0f8e0495c9ff63ea041c3f7227bbcf729326d45ce57529f1cddcd4514a5533163fc10e2b1dc4edd612a7ce4f2d067ad404f53334cb0d SHA512 0d3c07a5893db2941d7c33c1f5465e5e04c62a7e0d457bc8143b4beb9a4afc8d53ff32166072837e56d2d941c1b7eb52a71a91ebc0d8831776530473a15cf736
 EBUILD libgcrypt-1.9.2.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
+EBUILD libgcrypt-1.9.3.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 MISC metadata.xml 484 BLAKE2B 3e077dd32170cc7cec14a9b68ae2565d6eadb1e78566fc6462ca16e07cb20de6f058de037887654c3269160c069561c30c1c90e432c355663e6008741e1099c9 SHA512 0b8ff0cda84bf73068a89ab4164b164a34161146a6aeac73cfd4baf2420f41f3b352b3e80a1668f28c7221732f06e8366fffd806c53854ecf6e64c06fc7d3b9b
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index 4a892f63e455..104cd442afc7 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index 086e92fab044..104cd442afc7 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild
new file mode 100644
index 000000000000..584154b6ff2d
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 4fc3e0e4cde4..702228348eba 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,5 +1,5 @@
-DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b
 DIST libgdata-0.17.13.tar.xz 849888 BLAKE2B a364f6175828dcf6d870ddf8489da3703b987587639675ed5cbe851de8761d918da9ef91531d2b992ef5188b51f00f4bc13c3ce3b36afe6d07c4e162a93b2889 SHA512 b074097bd3cc78951638f0d726a948c9ba994c64c85c0cfe713c3d87419a9a96b66688bde88732dfb529325dca2b8251bd161337532bffaf9564f7f5819b9343
-EBUILD libgdata-0.17.12.ebuild 1764 BLAKE2B cb791f3610253c6d818650a8f22da2845f54b23d7eed8d78e51a5e7705482369709d088390618dd6b2b81db6248925e0f8e38a98ca984c2853b02a5cee160b53 SHA512 afd6a51628c772a174763460eb627bfbe07bb15543c0005a6e00052e7214896d4f38ccb87f273bae4943d4c28e2e89370ebe559fe50e2170f89fb521a21e34bb
-EBUILD libgdata-0.17.13.ebuild 1742 BLAKE2B 923e1470eb5ef9c57c00a2bf02ee5cc126d0717e4c27867d417594f6a0e86a67b965d6ebfdcc3d523f14eedc6528de3b654fe7f956dbbedb98caacaf2b602a79 SHA512 b22a8ce0a026137b72186f509b0c3a021501e4cd3db91a1b8a2791ac2d65f2a97ededde47443fc3f13135334946d05bd61568d03e9932a8800b7ca3bba3d643a
+DIST libgdata-0.18.1.tar.xz 851584 BLAKE2B 860cc42c4d0bdbdd6ca1a1001ec7ea5acc26dd1339052365554123e6524fddce65704a11614c8a081eb3eef10395fb1b4d2dfd3cf942dd1ae3556507af4c7c52 SHA512 15ff708760ca5023b692fd565c26a7c3acf035073534c0cd3f1f90e46ee0c60d14dedf360d3ac146d37135e200d9c2bc4b657e81468d0efde4821a9219875b98
+EBUILD libgdata-0.17.13.ebuild 1739 BLAKE2B b4f8b0057d3d15c247eb622fcec1eedfb4fd7387447c1c30f0b84b7c3cd3095a4047ac5306a23a6e9531f6b6a33866fd808a19744cf2cc053866a24266dc7024 SHA512 617a4a847ea87f9ae8a0b3bc82dbe9c105142b7a4139b51b34ddb37a230a1378514a9a5e8389ee7128b31f3435b87984ae2c50940d4b6d1e253d731b48b86f14
+EBUILD libgdata-0.18.1.ebuild 1743 BLAKE2B 9a1827aa873c81475639d4e2ea10d9f252e97cc71a89804f5a9e5c67087ecbe8906a1bda96390b5d84839751506d32b0f852ba67cd5b0d10527bac25a20c9e6b SHA512 21656a73beb7f340b8f6521fa9fc273bc84ceebeaca768dfb3b3942992a927ef60b64a21e97a64503dccc6b6ab3ecb500cd65c0bf4c70f6d52ac9a45026c0dc8
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.13.ebuild b/dev-libs/libgdata/libgdata-0.17.13.ebuild
index 0e18668269dc..214315f26395 100644
--- a/dev-libs/libgdata/libgdata-0.17.13.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.13.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgdata/libgdata-0.17.12.ebuild b/dev-libs/libgdata/libgdata-0.18.1.ebuild
index 9fc1b081eef2..4b2bee552d91 100644
--- a/dev-libs/libgdata/libgdata-0.17.12.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.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
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
@@ -29,7 +29,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=dev-util/meson-0.50.0
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.25
 		app-text/docbook-xml-dtd:4.3 )
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index f1c8f4f5042e..cef3db20542b 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,5 @@
 DIST libgee-0.20.3.tar.xz 678488 BLAKE2B b35dbad89ebac58ab382a1733d7add2e6fcf1e1ba3a194f20ceb6c33b5cd01d18251147af0e7879e12951bda308597ef64776a9ba4eb3d2b86309136fc709713 SHA512 c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7
+DIST libgee-0.20.4.tar.xz 684068 BLAKE2B b40d37f5d90abb8d96d5e90c67056573960bd54cadfb1cb5daf7fc07147a9e1706e23bf0240b84245c7e1ffb814c5e358f12e974a0d8a038b0179be25f271d90 SHA512 9a4b1db47543e80a6191054fa8fb04a8c07468befe05f738409ede317e64a8b884157bb488b330cd27f3dce3af5eeb7aefb74a180c2913ed8c834d1bde8fe9c5
 EBUILD libgee-0.20.3.ebuild 676 BLAKE2B cf10539a60968b946876b6f0afd2711d10cb1bc6ca808811e9dffc852c037d439623f6df047fcf1e413772ac4c8278c9260cd6a25bfbec4e4655ac185258841c SHA512 accc81319287a22cd861f2b0cec938cbca66864814fab81896162df849d02f1b444005588ba632045c20f708e3083e24dfa455247c7cf7497d3eca2c7b9a1263
+EBUILD libgee-0.20.4.ebuild 691 BLAKE2B 5efaa4525cbf431c4526e8b6774d8b359d04795d1d58e5beacc5bab264fe53d09a38732b4556364b20bb8299446197d9d4aa56992d81f4f44358faee15ece84f SHA512 65c1e5c2a59ce18532808b358a2ac98fe5fcd782879ef2543deef460c292de0584d7075427058690fb34f4f23abfaf37063e9df06c3c56dad9b8a59a8d7eaf0a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgee/libgee-0.20.4.ebuild b/dev-libs/libgee/libgee-0.20.4.ebuild
new file mode 100644
index 000000000000..1bdddf0d98a6
--- /dev/null
+++ b/dev-libs/libgee/libgee-0.20.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.8/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="+introspection"
+
+# FIXME: add doc support, requires valadoc
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		VALAC="$(type -P false)"
+}
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 58b2f4436429..ffb55f4fb216 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
-DIST libgnome-games-support-1.8.0.tar.xz 44808 BLAKE2B e6195087e99a3d34f47af6b4e0d9f068aa7b0a80d545da11744173ff8c881c62f81c913f8d59f855a71f4754ca92d09afdf79e1571cb3adfcf90d60b589d73c9 SHA512 0de9523d590dcc00b628bf88115161da94d5f3e7b3e074f4db851b6cb711d65601c290ec6e0485aaf4e4759faf82e7b1c10a2a26656d44874adaa7e8358f7124
+DIST libgnome-games-support-1.8.1.tar.xz 45264 BLAKE2B a2bb36bcff92d3e24e3f6092437cf1e2fc93de6a891ce85448d0b68d42e0b717a084fd0af927a0ec0203af79b6f7ccc67c64c4f6b7a23473bc624cba8e0489c2 SHA512 ed5ba94db9ab3d6193e7bb2d0956e20c42577b9fdba4d1d31acb252c43d248cc9b478c807b5f9489dfc88d6757bf95206405d0adf4fb68aa50b8f9d1b6ec59bf
 EBUILD libgnome-games-support-1.6.1.ebuild 666 BLAKE2B 0bbf6c886e20d56785ced43dfb3ca8fd4fa5fe205c3a22c56aad82a179bb57e966e1dd6bc6c057e640ca29b7256ef91fbdb3c0da9cd53e7f2c2ed2615379cb27 SHA512 abb35787d23eb98d9cb36e4673af42b3f5208cda2476462a4775afbe510bc56bffe8ea26553ee7ab36779c06b8f007435a44e487bb5c09f469f5f9ac913b9a28
-EBUILD libgnome-games-support-1.8.0.ebuild 669 BLAKE2B 5fead8b825c9819b2e7b42d029a00e0eca35cdb10720ed16b79659c17a8587636cee3d3e15111d902d83d20279dbf185c3a2d874e6d1d1f5ccaf6ee01ad41a01 SHA512 ce730270c935e56421e2bae3c32dd04d8bfa46d59f9334f7c77db9c323bcc8a2f921b7cac9c1d122737ff12766a6c61630377fe557e896153c06b9af9f37289a
+EBUILD libgnome-games-support-1.8.1.ebuild 669 BLAKE2B 5fead8b825c9819b2e7b42d029a00e0eca35cdb10720ed16b79659c17a8587636cee3d3e15111d902d83d20279dbf185c3a2d874e6d1d1f5ccaf6ee01ad41a01 SHA512 ce730270c935e56421e2bae3c32dd04d8bfa46d59f9334f7c77db9c323bcc8a2f921b7cac9c1d122737ff12766a6c61630377fe557e896153c06b9af9f37289a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.0.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild
index 38664f56d3d4..38664f56d3d4 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.0.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 0c5aa4286545..1802b5c24d17 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -5,7 +5,7 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca913
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
-EBUILD libgpg-error-1.38.ebuild 2150 BLAKE2B 912412e589136e6b537967940954c084339726c43700f4dff5a5bb69e0792fe6a0b8832339ad81aa2df44555d7f95bdac7ad1e9a3b79ed9df9818bcad5d2aa42 SHA512 a301494ab2e81d6e94a6134124b047f1fbf37e448f1b141ea97d6c1bfbaab29b2b168fecaea683c63b42393626cd8487ac0aa2a9e26e6a5d4d5e5afc22846440
-EBUILD libgpg-error-1.41.ebuild 1869 BLAKE2B 07a8a532fc812e2fc3305a33151345c4be5644341642fcacde218d5fe9b103ff369a148bb02231a7381bb59c506f3c62388a22c6ded3089a698a4dcb6a16c02c SHA512 4aa2ef0af8471449d3070917793dfcbb81f5d0f1f4458a703c72c4f83ddfb22d5e8d07a6561e0c402ed8fa539d03935db29e3e29acc41559422c87ad4bd650f0
-EBUILD libgpg-error-1.42.ebuild 1914 BLAKE2B 1426f8dd59c37ce476f8955119aa8437e77435035a8842a23be1074c7a39d22c690136451992f74ebe92ad2e23c20f4c1f5031084b9e79f2ac1c4c1c136167dd SHA512 bbf1e315fe8d87f46c5b10a83833779cfcc925849b6535b87e3f4b107867f4b7e0b51763e3168971443b632b643d2a23d0a95654f4ad7d63685ec6aa86962469
+EBUILD libgpg-error-1.38.ebuild 2143 BLAKE2B 85b242f6bfef608990a997b86947621e81eefb9f3c2afc4a41d8ddfc5b95f62e2400bc0df486e1a279146f142083dc8a672586e59404708fd18500b5d1edfe9e SHA512 e158b46312d9d67bf5bd52d5b2a8ca84f4054b408abdf307a41df5a3e2051f74afaf665ac02d9f87c96a15e5a70713b986ed498933f17ab59355e7a00e430b19
+EBUILD libgpg-error-1.41.ebuild 1858 BLAKE2B a3d5fdb6789c80b710e53558a1a4c46e204815ab16548eb39d423ab03fcae2b3351f667510501939475f217bced61e60d61e9ab5512755b774ccb1f138a613f7 SHA512 7aa353d58bfec3f89e4e5fb06b8e3439d05f59b4cb810a8e9f21f842767570fae835ab220c6977552a698a854516d7f15cdf1570b55bd71bad4f2ac48d1aa3ff
+EBUILD libgpg-error-1.42.ebuild 1906 BLAKE2B 8cd23b6c36c330d94489b7fcd3981d460ae3e3e3fa4bd7c4d0f84d1e2558c98752339357be606d03cccdd2955120fcb22a09dbc20778125c4553ad70aa7ae166 SHA512 51cf06997b500c79b3a958bb457d2c70bcfb3886bbcb7f67d785c29c1437bfd0dbeea60de11e72f023f4dc5f26f2f82648f7c3183f12848594200130ff6d0a2d
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index d37b93f1d197..e5d788d14218 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal toolchain-funcs prefix
+inherit autotools multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index 1edca981c296..b83de2c2f4ae 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal toolchain-funcs prefix
+inherit autotools multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
index 2d6c54abbf78..3822446f6e8b 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal toolchain-funcs prefix
+inherit autotools multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 15057f473d39..f83ad2df2fda 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,5 +1,5 @@
 DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
 DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
-EBUILD libgpiod-1.1.1.ebuild 745 BLAKE2B 16302de3b0b62f5c84d24590f82dfa55a299b23d282cc5c98e50976e56ea3bb8a1a503d47bbc375b940b04a4684ab97a07d8a03889dc10d3e946a0e0f832f2b9 SHA512 67b61b49911d95cc9a07f5acfd75c84d38ede56a1a4deaac41942dc0704c3c6e515f30130b341ec4fc9463b122882852356f91f290580a44dd5647b564d849bd
-EBUILD libgpiod-1.4.1.ebuild 1174 BLAKE2B ae3c9b4aa9a1b7be5760622542e774e5ee3edc3b3bc27b1dac76b5894d25004681c2f4f63bbe01514f94d00e88a61d8e7fb428545fc6b44d158f57781ffd7c69 SHA512 f50de223950d38b7c4bc587686a9a8d26f2e28bbe8251a162899d398f6410cb54418d172e49946a36526a2cfba205d0e5a24dc4d3114bb67f39e2faa497ec286
+EBUILD libgpiod-1.1.1.ebuild 736 BLAKE2B e04de4a7ea0c97eb4a4b35b4f521bf3518c0ca405a6a1f6be33a9b86625dc1f14f3a662564cc36db38132569907e33c7b2027d921a469b67ac4f08277b3fb989 SHA512 7009091c715c3fe253bdf04ee1578de6bac4d3649d9c55b50e9d9e4ad7f2b261ba6cbfad30de6569c2676c46f8d665491a2aec6b2bd1d6a83325290e8ed76df8
+EBUILD libgpiod-1.4.1.ebuild 1158 BLAKE2B 46960c20d50db7496763df92276e7c8716b0c0ee1748dd4132d6478be13db5358b1356d1a5d191f276ae60ea43941da9a31a1db4d3384b8938fb0c08d0550d9d SHA512 8c27b7efe56d758be660d6c9a45e7e1da97907b8f1cfd553d6fec25bc6339384c44d0478d0ca1a9dd7bb9f05e84bcfe6237cb0b7f79cf72e2e7725f53ba524a9
 MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
index a933e767983e..0c838e1be35d 100644
--- a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
 HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
diff --git a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
index bba3d79d1423..bea88003ccbd 100644
--- a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
 HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
diff --git a/dev-libs/libgpuarray/Manifest b/dev-libs/libgpuarray/Manifest
deleted file mode 100644
index 3ad463a94bdb..000000000000
--- a/dev-libs/libgpuarray/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libgpuarray-0.6.0.tar.gz 232281 BLAKE2B 73c4fd5598edc3b81296aea7acd24fa48d0302f54a0050de8bc5539a5150dcc4be052dbf8d0c1d822f79a8529ba47d60d51c3216ad774b5954915cab4c65b5c8 SHA512 ef2b37d7752d7b19e6034ca1992dfa0c82806bae7a15ce54aad785f5abbe06e57a77b804699c55b3b7dc94496afb22acaf3a43cfc15148c150f2c93085c23080
-DIST libgpuarray-0.6.7.tar.gz 256440 BLAKE2B cc0880259c368c02fe0fca1a7f9424ad78f057540426d28179ee2cb20a2559853566c9ebb7de3488d5fdf0fa0eefb4e9f16db198cda2727370d567fd16363480 SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2
-EBUILD libgpuarray-0.6.0.ebuild 1409 BLAKE2B e40a1fe39c74ed7322f639be8de20611b3c8d6774b02b7f11f9e4fc917e1cbf17c874355ab967af9faa9e7a9e41347c17f559d42970d86b0fbf02e7d905ff738 SHA512 bddadfcfb40cd4a08a730f181db2932c2d1ea28af16c85cb38c84fd09ccf8afeefa053cea2b4736a1ca1d34436017febdba351dfd99490e913b9c235c1207443
-EBUILD libgpuarray-0.6.7.ebuild 1411 BLAKE2B e6d9c7e7683918f205e4f81fed6d5f0ed9c0f695572f45b66b7872d66e0dd29a69fcddc147f98dc7ae13549a1832aff4ed9cedd80fe817681e0a4e9e756e856c SHA512 faf3deaecfb62f6f4e0237a613563b6a9934dc867c0900854b67742eae4ded6ebeeda08cf91bf6ac878a28e8074cfd65300926cfd93a8dcf3f6ef7b80849be2c
-MISC metadata.xml 639 BLAKE2B ce7935c01ad94d02b4a1596cb7adbee6bff4a50276efb77d80d815e4f8664528d14f8b278beccbb79f0fe2a695c1e332a43e50e7894507e3a4d44b17e41a8d0b SHA512 f4b06c37069e3db5cbb303cc731f841b88ffa682ecb6f4238e6e89b7d915d720dcee1cca4595be8a3c80afde0df3b8c18dc66f2844469ffa65572a264f4b58b2
diff --git a/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild b/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
deleted file mode 100644
index 032dc90b2654..000000000000
--- a/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-MYPV=${PV/_/-}
-
-DESCRIPTION="Library to manipulate tensors on the GPU"
-HOMEPAGE="http://deeplearning.net/software/libgpuarray/"
-SRC_URI="https://github.com/Theano/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc opencl static-libs test"
-RESTRICT="!test? ( test )"
-
-# cuda/opencl loaded dynamically at runtime, no compile time dep
-RDEPEND="
-	cuda? (	amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) )
-	opencl? (
-	   virtual/opencl
-	   || ( sci-libs/clblast sci-libs/clblas )
-	)
-"
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( ${RDEPEND}
-	   dev-libs/check
-	   virtual/pkgconfig
-	)
-"
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i src/CMakeLists.txt || die
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	cmake-utils_src_configure
-	use doc && emake -C doc doxy
-}
-
-src_test() {
-	local dev=cuda
-	use opencl && dev=opencl
-	DEVICE=${dev} cmake-utils_src_test
-	# if !cuda or !opencl: no testing because tests fail
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/_doxybuild/html/. )
-	cmake-utils_src_install
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libgpuarray-static.a"
-}
diff --git a/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild b/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
deleted file mode 100644
index 843671c0eb75..000000000000
--- a/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-MYPV=${PV/_/-}
-
-DESCRIPTION="Library to manipulate tensors on the GPU"
-HOMEPAGE="http://deeplearning.net/software/libgpuarray/"
-SRC_URI="https://github.com/Theano/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc opencl static-libs test"
-RESTRICT="!test? ( test )"
-
-# cuda/opencl loaded dynamically at runtime, no compile time dep
-RDEPEND="
-	cuda? (	amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) )
-	opencl? (
-	   virtual/opencl
-	   || ( sci-libs/clblast sci-libs/clblas )
-	)
-"
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( ${RDEPEND}
-	   dev-libs/check
-	   virtual/pkgconfig
-	)
-"
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i src/CMakeLists.txt || die
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	cmake-utils_src_configure
-	use doc && emake -C doc doxy
-}
-
-src_test() {
-	local dev=cuda
-	use opencl && dev=opencl
-	DEVICE=${dev} cmake-utils_src_test
-	# if !cuda or !opencl: no testing because tests fail
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/_doxybuild/html/. )
-	cmake-utils_src_install
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libgpuarray-static.a"
-}
diff --git a/dev-libs/libgpuarray/metadata.xml b/dev-libs/libgpuarray/metadata.xml
deleted file mode 100644
index 81c8daf45558..000000000000
--- a/dev-libs/libgpuarray/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    Multi data-types, N-dimensional array library for the GPU, and
-    with python numpy and theano workflow in mind.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">Theano/libgpuarray</remote-id>
-  </upstream>
-  <use>
-    <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
-    <flag name="opencl">Enable OpenCL support</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 2cea76903f83..2c9a77c194a5 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,3 @@
-DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
-EBUILD libgudev-233-r1.ebuild 1098 BLAKE2B 01e9a601ff8142d174ceed9397f231d9e49540b15b66129059ca0fd6a7843ed44cf7156bd9c885c67e1bc55c68c93ca16b28f987b7da8570bd080b820e5a8b9a SHA512 52f0b728dec487a6316b2a31652280bcc5c456ced107acf3f97f7fdcee3568f5f5555afa3d1bfdd415be3a903e1e55506f18aa2a593dbacec2106bf48e7febc2
-EBUILD libgudev-234.ebuild 1086 BLAKE2B 7fc3c968b2365fb5dcb9a858913101e5f268e705db6483c730626be501f95f066bf8bb626fc2fc9d421334125cf59d61c54c85ee6a06d7ed2be8b873bc03e81e SHA512 a41293ee10ec266f7c6320e2eb7bcc2ccc54582f42b686f386ea64b1f62665e34c0bf7545a589e00973cc25cee335a4c9fe88f1a72fefba7557cff7c5cefa3a1
+EBUILD libgudev-234.ebuild 1081 BLAKE2B 26c021954778132e9f1cca77f2a1bdf55bf322579ec0bf5ea7a547661c1ca36d17aef91fa50694f86f95e50cfbdd117f04f17eb6dde89e1987071ceb08659479 SHA512 e9c13dd47f24324f4d13754cdb4540d341abd27d457546cbaba1d0003e513db5c52e990915ea4d9cf2744ec261f07506250cb4ac560d284ed6654c1006fa2e70
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233-r1.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild
deleted file mode 100644
index ff398aff9a35..000000000000
--- a/dev-libs/libgudev/libgudev-233-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GObject bindings for libudev"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="introspection static-libs"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-fs/eudev[gudev(-)]
-	!sys-fs/udev[gudev(-)]
-	!sys-apps/systemd[gudev(-)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.18
-	virtual/pkgconfig
-"
-
-# Needs multilib dev-util/umockdev
-RESTRICT="test"
-
-multilib_src_configure() {
-	local myconf=(
-		$(multilib_native_use_enable introspection)
-		$(use_enable static-libs static)
-		--disable-umockdev
-	)
-	local ECONF_SOURCE="${S}"
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
index 4c186713a29a..ad003efac93a 100644
--- a/dev-libs/libgudev/libgudev-234.ebuild
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="introspection static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 93d7f148b8a1..8f0169788f06 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,3 @@
-DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
-DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
 DIST libgusb-0.3.6.tar.xz 41648 BLAKE2B c4fe7661c3912233022c90b6201e2e9007871355dd2c7f6a67a96da77ab1d3c937bad9cc44fc8a91f89e93a66c6a072e0835e0e9178e9352b0bab73463bece3c SHA512 a185b6feaeace72f78672ebaa6788659fcccb5d6414d49afb8ab717307c7a3d8e55a2adaaadc24f00ee0059fc1e3fcee54212ac3477989f7cbe4aebbf91699c2
-EBUILD libgusb-0.3.3.ebuild 1477 BLAKE2B 1384a0af7a44ab3ecd9c18aac872719e77c2a0b785045d1f58002d1187735dcfb1ca1fd209a64ab05e28ab8ff194cd2d3dc566dd07eb27fc91c51ac69f6d8c5c SHA512 973501c489c7b109fa5c42ae1608ac396ba4677c06ee001c99f637ff98652dd8f3748fc4b2f967cb2550ba322f540e801386573271ef2512445f429eeeea8467
-EBUILD libgusb-0.3.5.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
-EBUILD libgusb-0.3.6.ebuild 1701 BLAKE2B 1e0868395e1c800f11674bc074df49b5acfc68f3eb5beaac7482338f27a78d9251e6017021bd79b2839a196ef3a1296f70d4da4e9125f4910f8ed82978ea44c1 SHA512 25e2950fb56c29f4770f9fe95642360ac48019d27d8f71318ee0676b2a2716d90c4dcf6eea85f5062b9ff5f1292f0f094d7e6bb7cac53f4393ec6ca47498165b
+EBUILD libgusb-0.3.6.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
deleted file mode 100644
index 54f4646d9e52..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson multilib-minimal vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwids
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild
deleted file mode 100644
index 2288ee798781..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson multilib-minimal python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwids
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/libgusb/libgusb-0.3.6.ebuild b/dev-libs/libgusb/libgusb-0.3.6.ebuild
index 4ff3c4ea094f..2288ee798781 100644
--- a/dev-libs/libgusb/libgusb-0.3.6.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index a130b3451847..076186f5ecf1 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,6 +1,11 @@
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
-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 1863 BLAKE2B 1a8f0e6a498fa583744e3b22441a379d3e17d4315eb7342a18213a94e6c358d25af4bdebe3ee2819aa30af942d65b2ecaf3eb5fd0a05f4c1404fb39936b0f5fb SHA512 111e19e7e7773c353205efe69575f64068b7fbf3ef575aa2d72f18713b42e8ae19c7a9c4652ca11b63964bcdd54c7f76267ee5ec821c5b709ce9807c5e1cfd64
+AUX 3.36.2-autoskip-network-test.patch 1034 BLAKE2B a675ec70e9f8a0bcba89743c1ae1d27cf0b451d2bd654ff78ee1097c819ac2c0b9a812bcc0592860ff50a5e0b7685dfb1904ba73522f163cdd75fea6ac047eec SHA512 c160aa40d450d11507db195dbb265aa7e1d261075e841fc521c650301ebaa0d43468aaf508ee9bf0565dabbf4240f3903353f63f15cac94caa10948cab0ec129
+AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
+AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
+AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
+DIST libgweather-3.36.2.tar.xz 2707976 BLAKE2B 0051e1fe9dccef44ff6fe46bdf8e6b23c9a772ed000daf3a0349e064819d0f17f3f7d902f9c860f0d186a67fc6c5a27b31a8b20b4fec7e738221a58830216ca5 SHA512 58012931382d87b10ace79f6e2337a9244a0877a8bc241bad5da6368f6d8eaa815f88bee25cfd49b12baa4b2399a407b905f1cf0afb98f649fda6b0dc9f61f01
+DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
+EBUILD libgweather-3.36.2.ebuild 1968 BLAKE2B 4603276671a2870718979c6bf27fe522c61b9ac8d3cb4225c4a85ac73ea038be0389e89d0d71f4de6422b3122f6b2bb2f37aa6a4eebe9e6f8d18401adaa20b1a SHA512 9867a812b3c891b43ba32d44d2a47e132bccd17ae703ebaa73d91fa404e327d75969312025ffc1c1b1f8e791308e528035b5ea0dbc488c247ed2c6ab3e1c4e10
+EBUILD libgweather-40.0.ebuild 2111 BLAKE2B 74dd0ed2a40d1876abf51a98e9a18a433d078884f55fab046941b22a0fcd678fb198ae1c357885af704f3815940227aab4c23ed4fb3ab3776838e37617325f23 SHA512 92b59bcbf89993b72ba2ad6a594c8c25b319f5ef897375af17a2b7c04b2d58c742bfee385f2e6e094cc34c24cae062dd319d8d9c03dae7a51b2bbbceca841604
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch b/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch
deleted file mode 100644
index d6b3d2f61313..000000000000
--- a/dev-libs/libgweather/files/3.36.1-autoskip-network-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f2bacee194ce58aabf5a08752556177bda6ab570 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 30 Aug 2020 10:35:13 +0300
-Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
- resolved
-
----
- libgweather/test_libgweather.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index 8a21911..ef401f8 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -419,6 +419,12 @@ test_metar_weather_stations (void)
-     msg = soup_message_new ("GET", METAR_SOURCES);
-     session = soup_session_new ();
-     soup_session_send_message (session, msg);
-+    if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
-+        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
-+        g_object_unref (session);
-+        g_object_unref (msg);
-+        return;
-+    }
-     g_assert (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code));
-     g_object_unref (session);
-     g_assert_nonnull (msg->response_body);
--- 
-2.20.1
-
diff --git a/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch b/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
new file mode 100644
index 000000000000..bc35bb3c4fd5
--- /dev/null
+++ b/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
@@ -0,0 +1,29 @@
+From 4bc5b6792706788f0930bda7049adf349713a2cc Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 30 Aug 2020 10:35:13 +0300
+Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
+ resolved
+
+---
+ libgweather/test_libgweather.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index b481278d..5704bd8b 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -424,6 +424,11 @@ test_metar_weather_stations (void)
+         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
+         g_test_failed ();
+         return;
++    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
++        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
++        g_object_unref (session);
++        g_object_unref (msg);
++        return;
+     }
+     g_assert_cmpint (msg->status_code, >=, 200);
+     g_assert_cmpint (msg->status_code, <, 300);
+-- 
+2.26.2
+
diff --git a/dev-libs/libgweather/files/40.0-autoskip-network-test.patch b/dev-libs/libgweather/files/40.0-autoskip-network-test.patch
new file mode 100644
index 000000000000..def65382613b
--- /dev/null
+++ b/dev-libs/libgweather/files/40.0-autoskip-network-test.patch
@@ -0,0 +1,29 @@
+From 1d0ae284635ef1975a581b4d73ab497ccbd4532f Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 30 Aug 2020 10:35:13 +0300
+Subject: [PATCH 2/2] tests: Skip metar tests when METAR_SOURCES couldn't be
+ resolved
+
+---
+ libgweather/test_libgweather.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index ee13dc7b..7ffaac41 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -438,6 +438,11 @@ test_metar_weather_stations (void)
+         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
+         g_test_failed ();
+         return;
++    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
++        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
++        g_object_unref (session);
++        g_object_unref (msg);
++        return;
+     }
+     g_assert_cmpint (msg->status_code, >=, 200);
+     g_assert_cmpint (msg->status_code, <, 300);
+-- 
+2.26.2
+
diff --git a/dev-libs/libgweather/files/40.0-meson-tweaks.patch b/dev-libs/libgweather/files/40.0-meson-tweaks.patch
new file mode 100644
index 000000000000..aa56c592890f
--- /dev/null
+++ b/dev-libs/libgweather/files/40.0-meson-tweaks.patch
@@ -0,0 +1,109 @@
+From bbf17eac53c128904190ef2d74176b0717d7d907 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 23 Feb 2019 12:21:01 +0200
+Subject: [PATCH] build: Provide introspection option and don't build manual
+ tests
+
+---
+ libgweather/meson.build | 21 ++++++++++++++-------
+ meson.build             |  4 ++++
+ meson_options.txt       |  2 ++
+ 3 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 26f067e6..8f0f9047 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -74,6 +74,15 @@ lib_libgweather = shared_library('gweather-3',
+   install: true,
+ )
+ 
++libgweather_dep = declare_dependency(
++  sources: [gweather_enum_types[1]],
++  dependencies: deps_libgweather,
++  link_with: lib_libgweather,
++  include_directories: root_inc,
++)
++
++if get_option('introspection')
++
+ gweather_gir = gnome.generate_gir(lib_libgweather,
+   sources: introspection_sources,
+   dependencies: deps_libgweather,
+@@ -91,13 +100,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
+   install: true,
+ )
+ 
+-libgweather_dep = declare_dependency(
+-  sources: [gweather_enum_types[1], gweather_gir],
+-  dependencies: deps_libgweather,
+-  link_with: lib_libgweather,
+-  include_directories: root_inc,
+-)
+-
+ if enable_vala
+   gnome.generate_vapi('gweather-3.0',
+     sources: gweather_gir[0],
+@@ -106,11 +108,13 @@ if enable_vala
+     install: true
+   )
+ endif
++endif
+ 
+ test_cargs = ['-DTEST_LOCATIONS="@0@"'.format(locations_bin.full_path()),
+               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
+               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
+ 
++if false
+ executable('test_locations',
+   ['test_locations.c'],
+   c_args: test_cargs,
+@@ -121,6 +125,7 @@ executable('test_locations_utc',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+ 
+ exe = executable('test_libgweather',
+   ['test_libgweather.c'],
+@@ -129,6 +134,7 @@ exe = executable('test_libgweather',
+   install: false)
+ test('test_libgweather', exe, depends: [locations_bin])
+ 
++if false
+ executable('test_metar',
+   ['test_metar.c', gweather_c_sources],
+   c_args: test_cargs,
+@@ -144,3 +150,4 @@ executable('test_weather',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+diff --git a/meson.build b/meson.build
+index 87f9a7d8..48ff0ca2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -104,6 +104,10 @@ else
+   enable_vala = enable_vala != 'false'
+ endif
+ 
++if enable_vala and not get_option('introspection')
++  error('Vala bindings require introspection support')
++endif
++
+ root_inc = include_directories('.')
+ 
+ subdir('data')
+diff --git a/meson_options.txt b/meson_options.txt
+index 19b2c6a7..bf4c5175 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
+        description: 'Install vala bindings')
+ option('gtk_doc', type: 'boolean', value: false,
+        description: 'Whether to generate the API reference')
++option('introspection', type: 'boolean', value: true,
++       description: 'generate GObject Introspection data')
+-- 
+2.26.2
+
diff --git a/dev-libs/libgweather/files/40.0-tests-locale.patch b/dev-libs/libgweather/files/40.0-tests-locale.patch
new file mode 100644
index 000000000000..ea1f6020152d
--- /dev/null
+++ b/dev-libs/libgweather/files/40.0-tests-locale.patch
@@ -0,0 +1,55 @@
+From 6b2801a8195990fdf5166b62f62ddfbad55f11e4 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Mon, 9 Mar 2020 12:21:57 +0000
+Subject: [PATCH 1/2] Do not run local-dependent tests with missing locales
+
+Not everyone has all the locales installed all the time, so let's check
+if a locale is available before using it.
+---
+ libgweather/test_libgweather.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index b10c1f16..ee13dc7b 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -678,6 +678,7 @@ test_location_names (void)
+ {
+     g_autoptr(GWeatherLocation) world = NULL;
+     g_autoptr(GWeatherLocation) brussels = NULL;
++    char *old_locale;
+ 
+     world = gweather_location_get_world ();
+     g_assert_nonnull (world);
+@@ -689,10 +690,19 @@ test_location_names (void)
+     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
+     gweather_location_unref (brussels);
+ 
++    old_locale = g_strdup (setlocale (LC_ALL, NULL));
+     setlocale (LC_ALL, "fr_FR.UTF-8");
+ 
+     g_clear_pointer (&world, gweather_location_unref);
+     g_clear_pointer (&brussels, gweather_location_unref);
++    if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
++      {
++        g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
++        setlocale (LC_ALL, old_locale);
++        g_free (old_locale);
++        return;
++      }
++
+     _gweather_location_reset_world ();
+ 
+     world = gweather_location_get_world ();
+@@ -705,7 +715,7 @@ test_location_names (void)
+     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
+     gweather_location_unref (brussels);
+ 
+-    setlocale (LC_ALL, "");
++    setlocale (LC_ALL, old_locale);
+     g_clear_pointer (&world, gweather_location_unref);
+     g_clear_pointer (&brussels, gweather_location_unref);
+     _gweather_location_reset_world ();
+-- 
+2.26.2
+
diff --git a/dev-libs/libgweather/libgweather-3.36.1.ebuild b/dev-libs/libgweather/libgweather-3.36.2.ebuild
index 78a29db1ef23..ac0aaee8a251 100644
--- a/dev-libs/libgweather/libgweather-3.36.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.36.2.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Location and timezone database and weather-lookup library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
@@ -35,15 +36,20 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.3 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	${PYTHON_DEPS}
 	$(vala_depend)
 "
 
 PATCHES=(
 	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
 	"${FILESDIR}"/3.36.1-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
-	"${FILESDIR}"/3.36.1-autoskip-network-test.patch
+	"${FILESDIR}"/3.36.2-autoskip-network-test.patch
 )
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/dev-libs/libgweather/libgweather-40.0.ebuild b/dev-libs/libgweather/libgweather-40.0.ebuild
new file mode 100644
index 000000000000..25aefdc8fd5d
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-40.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
+
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/40.0-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+	"${FILESDIR}"/40.0-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
+	"${FILESDIR}"/40.0-autoskip-network-test.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 6b329cead9cd..5b4df4799c9a 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,8 +1,10 @@
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d765cd7968ce148e42cf3cb13cbd3439d6d802352101a4b3a07f4a8f82b7e151f2239fbe8d792ab536707db75347dd SHA512 98b0b685676e7aa54e49050ec8adab4bb6cd3827fcd3977c156d841a527268cb47b3227852036f4bb195931ae8295fa6761bc96f4d4042f059193ab6f75aa27a
+DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
+EBUILD libical-3.0.10.ebuild 2426 BLAKE2B e6ccd11cc43c019987229a1a88db9d9f41aff869c18d1d457ef7793193ae0144fb58071cc12d1bbb10b59142a094f89fc5c8c126af22146d601a622e328429a7 SHA512 05c59f5fbb58bfdcb1457af1b75debfd7fc0f55ebff929661d981822c8e928dd228dd4ede47477498f6c795a5f4d25d148154be5ac6c8f21ac6513f5288fb207
 EBUILD libical-3.0.8.ebuild 2329 BLAKE2B 072647dac4c4201e08c647feda8eff2a57810055beae2074c3d05bd249d708d1b64609304955fa270991c154bfdd9a141aca47e00b49c74f2f4d8ebe149900d9 SHA512 6bd7a557255734399a525bb9b0f47c834fd711ec2f27368d5e6c6374dfdf13ac5804caa8656f74c1283bc07cc5a6e9a4291d78ce36ffc3f64393dce9c1d52d9a
 EBUILD libical-3.0.9.ebuild 2422 BLAKE2B 097a119eea70c4f138b7db60bb038bf1559ddc5b09ed11427eacd6c2591690bedf707d89caf962fd2265fc566ebeeea513f6ea15426f2df6fe43bb79bc03a8ee SHA512 556de64fddf6ef83cdcdcccd5c023ef15a7ad131de754e621af15e101596608a67080530567c60f5485dd6bd19e3136ee7211a96c9ed67662ac5edb90dbb2f18
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
new file mode 100644
index 000000000000..4cf2814895d8
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.10.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index b1cb032173d6..f78819fb2228 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,5 @@
 AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0d1eaad48c1d5b40e774d368923f764b6030a090e414fcb9851e32a9d582691dc70fc04da4d67386db53489db2feaed6895 SHA512 0318b24af8671043ee9e5c547734f6f768ef21b122b23ab95f7d1a5dcfe6c2c9579db87633a765e9bc83915d2097d3e2f3b6320cdf094106e3bf87b72d05d461
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.15.ebuild 1899 BLAKE2B 97dbdd31ed75d3974d7dde2ee0e15161c975c035dc1dbabf5b783ade7a753698faad874685445ff4741ceb9f14b5dc52b10caffe289bc07662bb53d546317fcf SHA512 2c8d665688404973e11aee5677eaa25c328c414f76566a59e2b490146b57431cd9e77604829fb2afd98705c1bf96bf534a464c05ed35fc8cc1ce563f8f5d8a52
+EBUILD libiconv-1.15.ebuild 1883 BLAKE2B 6465ea829fb9c274e600dec8d0b8f382f20a09acd096e25a78ac1935ffe0e1660fdda712605939e88d3b36edb059f9169af00e2fbff77ed8fd2bf5ca4d88b092 SHA512 185a8b821546553392393034c8b926792db378668b88b9756bda5716c949edd49f6eac2315e408ce7e0cc9e6be875ccbcc7a82d235824db035aeec8dbf82a745
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 7afa37189e82..d6a93da72c86 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit libtool multilib-minimal usr-ldscript
 
 DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
 HOMEPAGE="https://www.gnu.org/software/libiconv/"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 92e6287ba2bc..36b3c1739167 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,3 @@
-DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
-DIST libinput-1.16.5.tar.xz 595000 BLAKE2B c325aac47a73992232cf7905935bb6ef0ace89d6e4e8d64feff3fcdde3aa9acb6c1470a07cc89430bfecf52df62a37617ced1cf5f05435eefa1902ee85e20a0e SHA512 b2fdd87375cbd5b212f76cefedfaa146966dde1d5e5d566beadd3167749dc3667214946178b157fa4b44360dc6b86a25ffb0356049cdf5a57d0fa2b8e3fcb1e9
-DIST libinput-1.17.0.tar.xz 612004 BLAKE2B 035b85115917804c032a4b0629b4cfee29513beff6cf84921d95d3f9d09d5f55574e1088256f72e271dbb6508b66c6a7271cf07be572a402e6c9ef02f075591f SHA512 490c7e59cbaa43e4190dbc421582dca887b6ae92304c4f8f3ea9df515bd76de41ca9a376e6f1cfe7b235dd2d5d8d8ef5982f5ddcf958e3b31b981e9440bb0888
 DIST libinput-1.17.1.tar.xz 611492 BLAKE2B 274312240fccc49a45dedc3d41018bc952f25040217f388fd461aebabe796be106dd4f34cb2e40ce91fc75219c47fbd605c6facdc4d47893420e5df199a7edb7 SHA512 2e7baa198fed9c673d28453efb066f9371f2b575a844e41cde455c636bbe1cc68faae7129026944a502cd5d7bfcc72272066b9e3cda5c959f7b464483f9dd860
-EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
-EBUILD libinput-1.16.5.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.17.0.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.17.1.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
+EBUILD libinput-1.17.1.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild
deleted file mode 100644
index 66c9079fcdc3..000000000000
--- a/dev-libs/libinput/libinput-1.16.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.16.5.ebuild b/dev-libs/libinput/libinput-1.16.5.ebuild
deleted file mode 100644
index 610b570961f9..000000000000
--- a/dev-libs/libinput/libinput-1.16.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.17.0.ebuild b/dev-libs/libinput/libinput-1.17.0.ebuild
deleted file mode 100644
index 610b570961f9..000000000000
--- a/dev-libs/libinput/libinput-1.17.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.17.1.ebuild b/dev-libs/libinput/libinput-1.17.1.ebuild
index 610b570961f9..66c9079fcdc3 100644
--- a/dev-libs/libinput/libinput-1.17.1.ebuild
+++ b/dev-libs/libinput/libinput-1.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 672bcd157ead..eb1db6053831 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,3 +1,3 @@
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD libintl-0.21.ebuild 2070 BLAKE2B a924a4888d3ff1848ac1dfd490699b0a65356b2e8e999fafbab5fd326ccba136126acc591b7e1bba598813e84f21cfd2371e09c0c557d5722f1482d39f190e70 SHA512 faf1fba22dedd58f9bf957c46a0a464c9581eebbb6d55bf199bf4491b3697e73763d5bb16740bc03810af44b609c63bc793e0fd9a711f26817145af1e38d4fff
+EBUILD libintl-0.21.ebuild 2055 BLAKE2B 8044a0388cba8e2e3e6d5b3f321a7e6c3279b15840b63c0ca97604fe00e31c0ef5dcff6235a7a11815f4d8ca8af281d352a747a9d0a4c2600eed9a4ee7931ab2 SHA512 706442a85464e74c23aaf02d864e4452a31fc52efb4c4e64dd1de41c2de05130462c8524d5ab522c11720625b2fcc2f9899e05c1eae1d0cb0a6296d9496f3941
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 85dd82bf4f60..bc6709653098 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 
 MY_P="gettext-${PV}"
 
-inherit multilib-minimal toolchain-funcs libtool usr-ldscript
+inherit multilib-minimal libtool usr-ldscript
 
 DESCRIPTION="the GNU international library (split out of gettext)"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
@@ -48,7 +48,7 @@ multilib_src_configure() {
 		# The gettext package provides this library.
 		--disable-c++
 		--disable-libasprintf
-		# No java until someone cares.
+		# No Java until someone cares.
 		--disable-java
 
 		$(use_enable static-libs static)
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index e4633c383b7f..063ae29c8f5a 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
 DIST libisoburn-1.5.4.tar.gz 1623904 BLAKE2B 3bb6ba88ad0422e1f3fbefdadb60231ea338a6bb8f39087fd25d58d68a4603c445d5d02b54c0a69897c321b4620f2ceb46eb8899552d2486e579a34f345a9d7f SHA512 5fc8532a13caf6caa5a0711753ca99ee2b3f4d5e2db9b3ed2aeef76714e3ae6de6d9c2db0d8297c0d749c42c5ab84fe92989751d8da24d41457b98656eb1bd86
 EBUILD libisoburn-1.5.2.ebuild 1833 BLAKE2B ac256b90ba3b81d78cdc0d06f02454203b1a961616e5c00820f1092a3021be875c96e79f2eb0c642a21c6ed4ca1e7d1c0a3ae962ae78d6ec30ee4f6bcb6c1cab SHA512 a8e7d0e64616cbafcda65ccbb59977270beabc0c0042a3ad8af4ce7af40896c625c4050ba4a6332139f7c9b7da494013e511ce0ef877665d7138b2ba385c3965
-EBUILD libisoburn-1.5.4.ebuild 1840 BLAKE2B 3dedf53dd455696e9c5533a5e626638b3593418f2001d5754d2a76faa6da216acf682a9ab8a0461480427cb959a518792577ce0f9c15103481c3311570fd2050 SHA512 6af321a3a264b83eb7c5aa22a4b9a01dafa9b0108e9870e5d5f51307cea29084f07dc8a4782fbd4d25c9b53cfe7361d02e9451d8c0ea5df588e97f8ea2ae2eb6
+EBUILD libisoburn-1.5.4.ebuild 1845 BLAKE2B 15785212f54f350e4013cc781372fd881bb61ad567f529a78e423403351d8d6de2d36e1b842faca552e92cfb7ade25f659db48c6ab98dd229a69c899f6836a63 SHA512 6ee29b24d11773e7aafcb5f7dd8e302d44dfa2e38d83e6acc76d03d8159f0f3ead2d83ce1209bc978cd4a7784fae6df9b552cc08ac9843e671086ffa5dbf934b
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
index d2b83150fa03..2534c8e6a8e2 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisoburn"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 6d8c6cef60f4..c0d3d86f5277 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
 DIST libisofs-1.5.4.tar.gz 870395 BLAKE2B 2cb9d247219c368e9808dbb2b7bcbe22829e78683a6dc6d8a182b54ebfe6d8c8a082990179b784f891fc79f2ed4830f09dd43c64bfdce60cbff6c34fae2150e7 SHA512 a06e834e81081358478cdd27d1dcc6f3bb52ffd2ea57ade59f3ff2f69868fb6886a0b38fd1580d24295b7ed936ac471f107df64d62c1ff42b57dd8ce0810e3f2
 EBUILD libisofs-1.5.2.ebuild 960 BLAKE2B 2484974ebec23a28c2dd5308c671a90a3f6ddad3aa85175796bf50118e1537be24cbcedff6c450ab2ce71ec39eebfa895d2b25518e4ae863029a501b5351289a SHA512 a8b19668e891970ce4e5b77f57ede6f8d9b8d718908098874de505208a86dc4dc2ccba51e6eddddb5d1bbe1da28cd1f0f1e9bd39d8e4041c60b8d3f6e8a8fc1a
-EBUILD libisofs-1.5.4.ebuild 967 BLAKE2B 1e6a27109539084cc10dbb69935942c803d09a4721ff38130ee01852dbc9027cd5c5f88e7a2ef17be6438698920cdbbda5b243317c2e540ad65609fef9684e2d SHA512 038891c2355d326864c622ef0e193735eab26bdd6f6bda8261fc7b4bf3cc1eb483926cc7adcd4253b732a90e4d99819d9b3db70a2a62606de2d8810a20b9d356
+EBUILD libisofs-1.5.4.ebuild 970 BLAKE2B 684275c10493d432ed810d4422cec31845681d2795f272a51b9f2fb3e4313ad5b5e5884366e3a6def81643132d3435106f79a858f39ea68b9dbde6b8e12d1e60 SHA512 97e373da807d6d4b5d38c71a50efc56a1f2970ab0fabb386ac77f2aebafc7b84d8953282044ae83db3191c3aa7616a14e54d231e3baa81bb8d9bd5cd1bae409c
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.4.ebuild b/dev-libs/libisofs/libisofs-1.5.4.ebuild
index 9260b375ebe6..46c26f45cf04 100644
--- a/dev-libs/libisofs/libisofs-1.5.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wiki/Libisofs"
 SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libite/Manifest b/dev-libs/libite/Manifest
index c6718f1967a0..0eea19478154 100644
--- a/dev-libs/libite/Manifest
+++ b/dev-libs/libite/Manifest
@@ -1,3 +1,3 @@
-DIST libite-2.2.0.tar.xz 267172 BLAKE2B 6f3e76fca28b72978fd92e2e52234ebeaee764945108c0d3b1049c759bbba3a1e1c6aa6822707ae8323b1fc8d1b56b360b93c58f109ba1072123a27488b54c34 SHA512 56b4d21730b1e31f7c70ec16d0983d5c060866d6579fa69c44d1d3d2a539a7b4691adb4964bfac3f8bc04282537e93f53dc2bb5af2efbca637ddc6442db181af
-EBUILD libite-2.2.0.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
+DIST libite-2.4.0.tar.xz 276008 BLAKE2B dcd721d02d15b6e8dbe84a885548429552eb4a683e51c49d144be2e40922e3f6e6e36f1fb92ec96db148f71068826b3a1f80812d8d5b1bf381a88b1598a3a1a8 SHA512 8e79084b616150dd4de491c6b8441d5043c81cf161bb655a32b6b7f8536682b967f4810870d8af4ae92780dedb7302bbc8db093036493506c88126143cb9bbef
+EBUILD libite-2.4.0.ebuild 498 BLAKE2B 794225e50e1b9e93c893b6ab669f2eee25173e20b17e8e5bd22541ff48257cef8c79cd8f9cdb15706e2c2f5fc4666cfa08abdd82767530f270bbef1e7bc94a5b SHA512 eede06ff86483536de20cfb79210f9cc230c7c78652de577d90c6ee3aeeea6a7ca17a7c59b47b0973ae24614c8eab18ef12dc922b906020ef3d2b7a3fb953dac
 MISC metadata.xml 803 BLAKE2B 5111a2ed83e3330597b13bb2f67f519ae07d132b2f1c86e00d703225cc91aa224f8a5d9734d338edafef5a213f6891fb5f0d524b117f6bf2632f4cfc0c3cb2f4 SHA512 ba0344ef7f5e1c11cebf1ea786b3a812423898a3951cad070c6211c110ecc19ff420a51681d8f3e7d5ed5bc26d53eff51f024e943756c19ae6830d0ad9218e31
diff --git a/dev-libs/libite/libite-2.2.0.ebuild b/dev-libs/libite/libite-2.4.0.ebuild
index f0baf554132e..2caf2e8389ae 100644
--- a/dev-libs/libite/libite-2.2.0.ebuild
+++ b/dev-libs/libite/libite-2.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
@@ -10,10 +10,9 @@ SRC_URI="https://github.com/troglobit/libite/releases/download/v${PV}/${P}.tar.x
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
 src_configure() {
-	econf --enable-static=$(usex static-libs)
+	econf --enable-static=no
 }
 
 src_install() {
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index d4c83b6089b9..991c46941ace 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -3,6 +3,6 @@ AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e
 DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 EBUILD libixion-0.15.0.ebuild 1197 BLAKE2B 4e29a88f44a9d75b451213de6cd404675aa105cb3b838f06a604d4aae7cb935cfb464fd07e8f8c602d5224731274db509ea0fde95dbb0b51c9e6aaa39fe196e4 SHA512 7dffca8b8d82fc84b6888ffce3d3ef43c8307fe7148fd15b2ecceb1b661cd927fade9daf97fccedecdac15089b527ab6b3e2e6a6c5f645e3e4b2363c4dc32d91
-EBUILD libixion-0.16.1.ebuild 1211 BLAKE2B ebc09a973772c773f53c637ba0afe242797e8c4282c9270fd230115957fe1685641d1db560d95d8f698478dab6311fc84ce7f5a000dbb93f0422f5267bf32e61 SHA512 7eff99faae43a0b55a066e89177300eb647d490818ab9d7d016e3ce0966b4dc966850ae90de40da42caad3af098de8d093aaf458d206e945073c817875c50379
+EBUILD libixion-0.16.1.ebuild 1239 BLAKE2B bf99e7b45b3e46abab4c99ce2a020067c5c58388c92aa887fe276e018eea59e4805aa46d85690dfb8e9c3e1680160919b18e2c1e26784c45b0508f1d25d5e14b SHA512 d10a3ccdabab34d7c4ffc6bb91ee10b67bd0623b87e636dce743e097bed28ef66c56810ca0748225203a79bc395a1f43a887116c3d681f283820dd7af7a8709b
 EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index 52f2afa3ce6f..ab01ba54382e 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-#	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" # no ~x86 to avoid blocked update
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index b4ffa9f3e3a4..fb4393cb88bd 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,9 +1,4 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
-AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0
-DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3
-DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a
 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
-EBUILD libjcat-0.1.4.ebuild 1502 BLAKE2B 8818aae450ccb38e1bd1dc0d43fc6932a0fd3713dcdf1aac649980dd1958c8aa7a1103642a672cbac0e9cf29153ce12fc67961764704c9bc3d16c642d6a9024c SHA512 f4257592f032bb21b7213a98a14ebddde72d3dd09a25147fdbe9980cb6d890d6833fac0f47d5b683493de910f5db2347cda7abf1f32f6d2ab55f2467e08d6e95
-EBUILD libjcat-0.1.5.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
-EBUILD libjcat-0.1.6.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
+EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
deleted file mode 100644
index 3c31e63eff59..000000000000
--- a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make installation of dev-lang/vala bindings optional. Unfortunately
-the option name "vala" is reserved so we must use a different one.
-
---- a/libjcat/meson.build
-+++ b/libjcat/meson.build
-@@ -122,6 +122,7 @@
-     install : true
-   )
- 
-+  if get_option('vala-bindings')
-   gnome.generate_vapi('jcat',
-     sources : jcat_gir[0],
-     packages : [
-@@ -130,6 +131,7 @@
-     ],
-     install : true,
-   )
-+  endif
- 
-   python = import('python')
-   python_interpreter = python.find_installation('python3',
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,3 +4,4 @@
- option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
- option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
- option('man', type : 'boolean', value : true, description : 'enable man pages')
-+option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings')
diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild
deleted file mode 100644
index 649a9b130eb3..000000000000
--- a/dev-libs/libjcat/libjcat-0.1.4.ebuild
+++ /dev/null
@@ -1,66 +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="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib:=
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	pkcs7? ( net-libs/gnutls )
-	vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	gtk-doc? ( dev-util/gtk-doc )
-	man? ( sys-apps/help2man )
-	test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
-	"${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gpg)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use pkcs7)
-		$(meson_use test tests)
-		$(meson_use vala vala-bindings)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild
deleted file mode 100644
index bada11c0c7e3..000000000000
--- a/dev-libs/libjcat/libjcat-0.1.5.ebuild
+++ /dev/null
@@ -1,65 +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="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib:=
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	pkcs7? ( net-libs/gnutls )
-	vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	gtk-doc? ( dev-util/gtk-doc )
-	man? ( sys-apps/help2man )
-	test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gpg)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use pkcs7)
-		$(meson_use test tests)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libjcat/libjcat-0.1.6.ebuild b/dev-libs/libjcat/libjcat-0.1.6.ebuild
index ef894f74d4c7..bada11c0c7e3 100644
--- a/dev-libs/libjcat/libjcat-0.1.6.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index fbac2c74d35b..3dbd8330942e 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,8 +1,5 @@
-DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-DIST libksba-1.4.0.tar.bz2 651319 BLAKE2B 0e3f49fd0d389d905ff75ddad6ac1f3d158d2d4d9f47d08c14d11e3fdc07aa3f661e7ea53612770269b4e08e7b61af2d83a1679874daa0605638454059cb3321 SHA512 7c1666017ebfa50b5663153dead1e019e0ee342c4f44ee8f644fc749e82dcc983237ef0f557de9de3f7908dc90405d967a4db2e36e04fe0d5a09edf49f8a0c8d
 DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
-EBUILD libksba-1.3.5-r1.ebuild 756 BLAKE2B d3185dbbfd55a7d298ec44aaa9c0b02167d6ea9783f19a5d8090b394d5291654b4518b6c0ff812ca09c8bad06ad2e2b50b1b4adc85837f702c7d46e8a832f78b SHA512 247e8b964e99f2d6c90ab459fcc50f482a99abed223011435bece555a1555e96ac81337d547af8083c87983652b67bf4e2427ff6da372b70f8369c070e8f32dd
-EBUILD libksba-1.3.5-r2.ebuild 1020 BLAKE2B 6d2b16b54418920f6523a0a40cebe8468b6c744e8e6b8533710e09445b4024957c9d16f51d5f57a1c1863dbf54d09370f6d6100602319f3ebd52a7a46ba12c5c SHA512 3b1eb99484ade6415cb226df36193e55d19446e5c0ced57149126098aa66ae2838ed6dfd6661ea2cd445ba5c6efcb85860aaa86efb9fe121d0ed6cb90701d0c0
-EBUILD libksba-1.4.0.ebuild 1046 BLAKE2B 4ebe4e7501cb4a327c13b71e0a84f37b3e563dde026af18815fe9e780dbabfa2802876ecdfa184a5e7b571e1cb00dab186ae26c6a1658f6f7bd8d0284d675b4e SHA512 5805d1dfafe5c0b04eba150a4367eb8ab827608348dd8cb19f5d0af808969d4786a4b10b2f6afed15d26ce741e5250b5d79fef201690671e9f0f5f99221d9871
-EBUILD libksba-1.5.0.ebuild 1038 BLAKE2B 9cc00a990c34fc839b28d73775e13796e0522eb6fd405743831b225ad32c50cff5fd5bf4ca410dd32fc0406515879a933fc19a88ffafc4249536d2897db45f46 SHA512 71ed1254ca0b7a7b4d6d0ec4e62c57a8ba1f1175e4a17cb7b49609e4e3e19bdb6b5289b5101e65d59f78f37e503a70614183adf54e7ed556a7eb58af387760d8
+DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
+EBUILD libksba-1.5.0.ebuild 1038 BLAKE2B ed27687308712eae693801147acc1d84f7ecbeefb2a3cfc9cc9b95cc71eecf4949302c6cc2f83f77fac733ebc90be9c96921681fbca358fca94fcb5f1bce9cce SHA512 3daa8cef1e092e7c21828da9b2a0687cb7b1d9fdcac2487db46e154f0c4cde9aee50ad6b3e67ec0749daa903e04347aaa38fa328105027322ff0400137fc5f7e
+EBUILD libksba-1.5.1.ebuild 1046 BLAKE2B 4ebe4e7501cb4a327c13b71e0a84f37b3e563dde026af18815fe9e780dbabfa2802876ecdfa184a5e7b571e1cb00dab186ae26c6a1658f6f7bd8d0284d675b4e SHA512 5805d1dfafe5c0b04eba150a4367eb8ab827608348dd8cb19f5d0af808969d4786a4b10b2f6afed15d26ce741e5250b5d79fef201690671e9f0f5f99221d9871
 MISC metadata.xml 252 BLAKE2B da45974cde6a1708a138afe22c68a85a8ff108b4fa2761d3552c4c9200dee3f548bb3a351a70b3129e574e21b52ca9dc2028776ca644f7e0d5a7c82ed6dff0aa SHA512 1b195c0e35c6cd524cbb5e1088f3a634a1917095d133ce81625eef7b8ed76532a9e3dc7b364fcc3f65a13767cddfd194512104586e4a55487b1ffa067cfad3ba
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
deleted file mode 100644
index 6db218588f6e..000000000000
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ltprune
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	prune_libtool_files
-}
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
deleted file mode 100644
index a4e474c9c339..000000000000
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index f8c9d4dcc06d..6b66a7c049fb 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.4.0.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
index 788b29757356..788b29757356 100644
--- a/dev-libs/libksba/libksba-1.4.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.1.ebuild
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 940a32244316..7f60b51415d5 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1,5 @@
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
 DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753
 EBUILD liblinear-242.ebuild 1459 BLAKE2B ad59f7cc9e33ddd6ca95c9917fbe60e94c61fd37a01e2ea9f40ecaeba0b58db1ab8779800b16a3391495acac236797e8a273df47ca89440d43862265fd8e0cd8 SHA512 a539d6f4ec7eb498e08fa4dae3519ece15cf89e574ecd3c9e77ebbe747caea3a924406d8510b74331752fbf0b7059f526190c8d60d915f02b11c2f5766a16ef5
-EBUILD liblinear-243.ebuild 1466 BLAKE2B d89c1f0947d4b3176eba2e180a01f2d2e3cfd9df84c72f96b1e2062a7ccc8b6e7d96f9ef7288e4952829ddda9c91cd3c95a7eca4ede97c958647b8009bb1e451 SHA512 17f74636c94082a4db0021d5a50fae3816774f213d4f57f6784e0758c0eedb658200e6f928fe94228d364a63c3c50605d9b74cc800457525e6ee1ae06796e2aa
+EBUILD liblinear-243.ebuild 1459 BLAKE2B ad59f7cc9e33ddd6ca95c9917fbe60e94c61fd37a01e2ea9f40ecaeba0b58db1ab8779800b16a3391495acac236797e8a273df47ca89440d43862265fd8e0cd8 SHA512 a539d6f4ec7eb498e08fa4dae3519ece15cf89e574ecd3c9e77ebbe747caea3a924406d8510b74331752fbf0b7059f526190c8d60d915f02b11c2f5766a16ef5
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-243.ebuild b/dev-libs/liblinear/liblinear-243.ebuild
index f30b1423cc71..d05e7d8cc0df 100644
--- a/dev-libs/liblinear/liblinear-243.ebuild
+++ b/dev-libs/liblinear/liblinear-243.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest
index 699a2a636b0a..9a6d04b9b27f 100644
--- a/dev-libs/liblist/Manifest
+++ b/dev-libs/liblist/Manifest
@@ -1,3 +1,3 @@
 DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd
-EBUILD liblist-2.4.ebuild 1207 BLAKE2B 712b61bce5ed43e2388aa24b2b900d80008400d517ade4e77a578305a5c50c46a2725ad86e472ce93017b67e02576f0cd9c5546f87daed633d1bc01a66373533 SHA512 a229a31f5696516eae6054b322749477beaef1b8cd664e46c9c11c2b53d2dcebe56a36159ee8478f3eb715ae88ea9a3e8ccdd4b0a281a1372d41f398a252b5a6
+EBUILD liblist-2.4-r1.ebuild 1170 BLAKE2B e042525ad9c579b056e2fa5b3bf8a50f2b16e300782ca183c696d3a90c146b27102d4f9da40650611a09694e66d2ff1643eea82f84107f9fcd958e3817a9f2af SHA512 4d5222708f38d78a10643c1a213a50b80b05225c2c0119bfd4879b2723f7c67274adf7f2b0cf846a969a356628a59eaef1cf4a0cd65e2b4f64767be8fe49a468
 MISC metadata.xml 356 BLAKE2B 2e6c2a54ee9fd3a59c8e211ac442b72d4015961357c5ec18d277f4a6b322c2ba3cfc4fb107732037149d290c308ced9c357198fddf62649a6fea40d6da0fa055 SHA512 8f96ffa65c0fdb773f41835d285cf5d2aa59d84ab3c096ec6b6224d057c32b657f0d3de7a531fbb602ce2d84d2fdbcbf4a96a9947a2cd244dd90fcf7b8972f11
diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4-r1.ebuild
index 928ed1b2bfa5..4ff0ef02da9f 100644
--- a/dev-libs/liblist/liblist-2.4.ebuild
+++ b/dev-libs/liblist/liblist-2.4-r1.ebuild
@@ -1,10 +1,8 @@
-# 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="Generic linked-list manipulation routines, plus queues and stacks"
 HOMEPAGE="http://ohnopub.net/liblist"
 SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
@@ -14,13 +12,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="doc examples"
 
-RDEPEND="
+BDEPEND="
 	doc? (
 		dev-texlive/texlive-metapost
 		media-gfx/transfig
 		virtual/latex-base
-	)"
-DEPEND="${RDEPEND}"
+	)
+"
 
 src_configure() {
 	econf \
@@ -42,7 +40,7 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/{list.0,paper.dvi,examples}
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index f85be8cf6d1c..7953be10fad8 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,5 @@
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
+DIST liblouis-3.17.0.tar.gz 14868166 BLAKE2B 2edc5ef4366e29080d0d138fe45d946730e04dea278a14751106a25862f6266fe0fda492e12f4d2aa7d26d7277a11dfa2eaf8be39cdeffbcf83f2c143922e6d6 SHA512 9511e0f76ef6def3fa30f0bce4df188b2a11251e8ced0a76a92e172026e6751bc19b2c8ccd5789043b65398190a367bca03b3f1449344750e63ebd0fde60b4e3
 EBUILD liblouis-3.13.0.ebuild 1743 BLAKE2B 488ab7006fac89c4304ba02924d8e24a99df1cbbacf18083a5a69367dbb9bd2af1b7aef6a132dde5f1b9ef06c05639aaec2356702336feaa2cc92f2b06a67eae SHA512 3d8a7ad11b920e767511611cf147abcff1144141d4afa1b90aade5e1b78659c04a792753e040c5776aa1ac30635985c8e8d0aaaec2ae64ae2b170b2fdf3bba02
+EBUILD liblouis-3.17.0.ebuild 1749 BLAKE2B 986987f2ccd8dc45f221485058d06fa1b59a63476dca61eb6e48a0170fb2489212e2e44282d0831b0968de5b1f96e959ac6b98044be2364587a0ef23526b7903 SHA512 f3f8a40d5a999b442de6a45d1d1822c7778574474a546755bca53bdaeb1f1b60acab2a42a6e7846a31785329e9c47a7cbbf55e2572614445852d5044289d2ee7
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.17.0.ebuild b/dev-libs/liblouis/liblouis-3.17.0.ebuild
new file mode 100644
index 000000000000..6ea877ba7b42
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.17.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]
+	)
+	test? ( dev-libs/libyaml )
+"
+
+src_prepare() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils-r1_src_prepare
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-ucs4 \
+		--disable-static
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		# setup.py imports liblouis to get the version number,
+		# and this causes the shared library to be dlopened
+		# at build-time.  Hack around it with LD_PRELOAD.
+		# Thanks ArchLinux.
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
+			distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	if use python; then
+		pushd python > /dev/null
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
+			distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index e5fcfede1692..8fb533fd988d 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,3 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libltdl-2.4.6.ebuild 1088 BLAKE2B e6525679e4f04d9f4ed7008cf170be9d58b0f42484c33ac63ac0ab2133f82be17a9dc7c89bc79f36bc65e8c61d3bf5fac71a7f7f3db6be566b400c62fd0ef023 SHA512 fa0116e4e2bd6425d23f49c35885bf1d2a0d97079ecc7f9742f2eac284257de44e38ad1f035e6008e81dbf28b4a3d29601d63d18e88435c671cadb9866a32316
+EBUILD libltdl-2.4.6.ebuild 1089 BLAKE2B 0adab6d846d7b0582778434cab8efe131a930dd35ffca24e0ba208e2e1eb2f7f5daaaf8ef9cada8b39d0735e50ff0de2364273965812e7caa98d5e8f62540572 SHA512 834278fbd9e8c5579f90d5e652a0c588d1f2e7cb12a42b5308f8dfb97b5496bb4da611f10d370177416684154f4c016a718f7cdc3a4da88d10e29351d710dc99
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 019882fda44e..31fd0f949972 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index d7486f03687b..d5d2872ff1ec 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,5 +1,5 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
 DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
-EBUILD liblzw-0.2-r1.ebuild 475 BLAKE2B feb1b5ff6c6a9e16cab04c92114682be0e44fda1eb0c4a0d6180d35afdeabdae6083e81c13d23ff0d86d7829bac409d919f38ee222cc1c5c80889dafa97f63a5 SHA512 8ad04869d1d2ed550f6d85f5d24187dff06276abe4af086eecd7dc9755c2a85c6dd34e1da6f8f895d76bb4af810e03fdb90f3c31af6edc28cacf4996b689e5de
+EBUILD liblzw-0.2-r1.ebuild 476 BLAKE2B 104c25cb095aceb80273d733339988b018813c6e235e208e889286d860e43d33c8a58e488be593dfc2cdca54f136cae82e0556498a3938e705f627bee03dc8ab SHA512 82bd07de4a6cadfc977cfc8db0383e98d411dcd0e85d9e653c6c1dd8bc242a490062349e06ae6205ed51bdacc2452b4511015411f892c8d487e1e11641ed94b8
 EBUILD liblzw-0.3.ebuild 555 BLAKE2B c52e24798c330849f4554f5b29d6023fb7dde6eb629f331320a809ae2e3e027ac10f0de228cb13d085e20ed9395fde594b5da90bdf3804f49dd8500e9aefada0 SHA512 c86074f950ec5e3d26f7e568ddeaa4d3f88bd24a94f83b289ca1ee83f9b07868178abc08284449f32507c05495b3ef3c2ede29536656e25e38e6159f0f16e388
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index cf4eda2ecdfd..199a30521694 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k s390 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k ~s390 x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index b6faf0ebd30a..9d4d1a27ace3 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
-DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
-EBUILD libmanette-0.2.4.ebuild 848 BLAKE2B e51749eb7218a9b57c8b985ff9fffa57c1d9e030094a7e2871d31bc098166b7317c6399687d06b98a18bb2bb5aeada4b0dc5b9d687ff5b6b29c6a503043fd461 SHA512 bd51de492690d789d2b54dd8b6393c5eb29307aa0edba21f9708100ac87a7772fcd38613c515c78fcde9795669defc0bd534879148e13557e29dd748e8f7be45
-EBUILD libmanette-0.2.5.ebuild 852 BLAKE2B 5e23446d52217af26ce1f93c38c6285e71507388e055bbad9e41c09426803e4c13d3129c0dfa45849f345f795534f8af5db678b40bc5807348b5ed6b0d0795ab SHA512 ae742520b9c6c87ab599ed5456a5a7778711c10470c4ea6efb883a428a8333f9f9b45bf35402989621987367b1d772ed4caaff66ca05dba4b8b2f60b32bc4a67
+DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
+EBUILD libmanette-0.2.5.ebuild 848 BLAKE2B e51749eb7218a9b57c8b985ff9fffa57c1d9e030094a7e2871d31bc098166b7317c6399687d06b98a18bb2bb5aeada4b0dc5b9d687ff5b6b29c6a503043fd461 SHA512 bd51de492690d789d2b54dd8b6393c5eb29307aa0edba21f9708100ac87a7772fcd38613c515c78fcde9795669defc0bd534879148e13557e29dd748e8f7be45
+EBUILD libmanette-0.2.6.ebuild 992 BLAKE2B 915955e4a40c23772e02d5d438f82aa72350e3370f024d9d026a0d625f53301430593a49985ab2dbd7b8b6eebcf5983cbeee9721929f92b474c45b35ed3dc016 SHA512 631dc22e595724a55174649928aa5e84b19ce008b5c65db559b84095bfa378ee7ba9347b4e0997d7a785ac6a9ebfd5eddf5641be065b5dcf6ac64104f302f268
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.5.ebuild b/dev-libs/libmanette/libmanette-0.2.5.ebuild
index 537da110a670..521893394297 100644
--- a/dev-libs/libmanette/libmanette-0.2.5.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.5.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index 521893394297..92be27b7fa41 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,8 +9,9 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+introspection +udev +vala"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gtk-doc +introspection +udev +vala test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -31,9 +32,13 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature udev gudev)
+		-Ddemos=false
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+		$(meson_use gtk-doc doc)
 		$(meson_use introspection)
 		$(meson_use vala vapi)
+		$(meson_feature udev gudev)
 	)
 	meson_src_configure
 }
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 67f8f2d86e16..92e15cf16c3e 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -2,5 +2,5 @@ AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d610
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
 DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
-EBUILD libmateweather-1.24.1.ebuild 864 BLAKE2B f3150774a7be4a0cea1b7a918e92a0f98cd09ba32c3610630d502d84d72b9a2626a9c2f8d78d791435e3eba56d8672e640a28e472dd9d392677184a390bddaa8 SHA512 e4d8312b027e6c0bba32589ca62f359b0b1e5e8a8a9bb2e651cecdc1344fd4a8987d6257d17eee38415dd18d4f6ae954cd5c7cf44d635907f053bcf50020e0fc
+EBUILD libmateweather-1.24.1.ebuild 854 BLAKE2B 6247e97b1ed42648cf549413e14ec9dcc850113d53b9de2ef580b4e176aeb7f6962a142ca3ea043a2f3e859a47610b2ba29408c30eae7ac37d92c4dc8dd5e221 SHA512 1548840faddf35b77677bd30b50abcf4cdfd525d066a24eb0210d27e45c859156344e6d67a38d2acb265bf8498a767123ae63b62a43844ca6a401444fd5ff9d9
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
index a5ee3530e693..2b91243ec874 100644
--- a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
 
-inherit eapi7-ver mate
+inherit mate
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index d1f298f1fed1..ce59d3ad5568 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,4 +1,4 @@
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
-EBUILD libmaxminddb-9999.ebuild 619 BLAKE2B 1334372b07ce20069e2e7dab6f8cee0682fce4c32cbb85def685ce773a5a8595a4ac2a24a69346b099ef428c14d7ae1b5f998649d345e156292f159e6c250751 SHA512 f2df46949fc7d937bd0a76bdbd6f769732665521f17012888c2cee80dac94a056e515d41fe136ee74b28057da5cbd3c7a490d65e58d1dc90c559d2b1eff1a95f
+EBUILD libmaxminddb-9999.ebuild 629 BLAKE2B ffc5f031cf5cb70207ece2fbf937f44f38a53d65bb9153ed6edcb52c663375c687b5cc549729ea8f7a93ee6b503d8f54e0f38365e113331d06aa8f53413e8ab4 SHA512 1e331eca7e54007e1c6a3e41d4a0aff03733a9e76a7d1b6a6b3941e82005ec48272c820f59c726875fd67101614fe094562977991a6552736ff42484723ecd3e
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
index 39b988d3675b..455b87166499 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs git-r3
+inherit autotools toolchain-funcs git-r3
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
diff --git a/dev-libs/libmba/Manifest b/dev-libs/libmba/Manifest
index eeeaf1be4a77..7ae231357233 100644
--- a/dev-libs/libmba/Manifest
+++ b/dev-libs/libmba/Manifest
@@ -1,5 +1,5 @@
 AUX libmba-0.9.1-glibc-2.20.patch 1039 BLAKE2B 6c458c43a164d2cf438329bbac156d9b41117d1781a2d92b998c0a8d1ac866d7a9a0822b27ffef7610bcc3776c6e054bf333339241ccbd0ca956d373b376bf3a SHA512 b0d0ea1425dd4dbba685eee62609f0627c4d8a579a566d52d1c7f333a92109cf700faaba8ed0f0697d08409feb14ceb5bebf9a799c23e9de1aef388ba1ba4b95
 AUX libmba-0.9.1-qa.patch 2927 BLAKE2B c6b6e364ee2d3eb6026574e2b9a9cb0367da714d06b44a9e0fd8429757d85a42d850634ec3e96d31db47942dd182932d0d5fc6c4b552c552fdc7b3ac11dea984 SHA512 b5886f89c4ea4739e6bfe34e9f8026946ffbbc619922cbd25bab0d7c5df3fefbaf1f198f1321feaf5bbffa79951c58b329cf1d47f4f7ee0f3014de4434c179ea
 DIST libmba-0.9.1.tar.gz 290080 BLAKE2B b46890229c1cb1c0e6a2f7c41234f46fb2e590316182944c0850d0fad098c968a738bec434dd82b3c1d831694ba9fc99719f525d83a2bae645ee0ffecc8619c9 SHA512 28696e6066cb6c54434e1a35576c1e2430e3b83a478fddeabb20ddf1d8b889edac023de15090762fb95a759ebb9d2d8fcf1b0d19ec22f6a98ef2780400456da6
-EBUILD libmba-0.9.1-r3.ebuild 982 BLAKE2B c5bf723630cbbe32acdc50b88cbed52b9669cd362a632c48db4eefc96759a2d0efb539933a1362a4f2580414a14a848eac57e8ca140328a428c6587f237617c3 SHA512 608a53c3ce57b6297dd4d835e4f0c5120e82f6fc8397999e100889fb665bf000a1b9adf85306d89d09de62562d488029b9628bee4ccd020503549ad784b5b8b7
+EBUILD libmba-0.9.1-r4.ebuild 913 BLAKE2B b440fba0822100225a8eb3a79ae71b34f9015ba62ac0752973ee51621473f1cdb7e03b6659e5fa7a02318a9e6ba0fc1e1bd8c3a36f1fc50a84836ed55ca849e7 SHA512 ceba4e436da172bc55708919dd3853a58ae68d10ec2d563601eee3fae756f72527c7a612958e64cc767d6ec5588f6c71df6854886fe764f1623cccdbe21ed391
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r4.ebuild
index b0ffe135dfad..df4485f0ce4b 100644
--- a/dev-libs/libmba/libmba-0.9.1-r3.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r4.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A library of generic C modules"
 LICENSE="MIT"
 HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
 SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
+
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
-src_prepare() {
-	use static-libs && export STATIC="1"
+PATCHES=(
+	"${FILESDIR}"/${P}-qa.patch
+	"${FILESDIR}"/${P}-glibc-2.20.patch
+)
 
-	epatch "${FILESDIR}"/${P}-qa.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.20.patch
+src_prepare() {
+	default
 
 	tc-export CC
 	sed -i -e "s:gcc:${CC}:g" mktool.c || die
@@ -33,10 +36,11 @@ src_install() {
 	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
 
 	dodoc README.txt docs/*.txt
-	dohtml -r docs/*.html docs/www/* docs/ref
+	docinto html
+	dodoc -r docs/*.html docs/www/* docs/ref
 
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
+	docinto examples
+	dodoc -r examples/*
 
 	gunzip -v $(find "${ED}" -name '*.[0-9]*.gz') || die
 }
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index cdc47ba1b247..581764a6e456 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -2,5 +2,5 @@ AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab7
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r3.ebuild 1607 BLAKE2B b8d5d093d1e8a8f9d37ef6bc53e5cabb6e7ec12f514ed949975a4c89df4eb0182206b8dae8f4a29245bc8b126cb31e4f94f7771624f5740f546acea73b7ea17f SHA512 1236ba219ca320ba73c4316f0b3d6a5f96d131db1ecaeb9fffd5ba08647b4b8b6d27529d54cc40a7d1a17db194c5a5cdac1d897ef9e2676e813ac1a304dc3d78
+EBUILD libmemcached-1.0.18-r3.ebuild 1608 BLAKE2B 9f2407ed8d539dcda7af004f743f4e99cccbc20d29d6ef1670a5288c51a9137da8ddffb5ea93d4aacee8acdf64ecbdd1e310cd971fd04dab2645bcfbf3efee79 SHA512 1dce280cc7a5d9b3aa3ec5a6880747f513faf5d6390078c1caef1cd3b7617eb997a5fa205bb4866bd8d803dfc57511a230c948a3e1eb23496519f41dba576f1f
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index 07703af4feb4..cca07f3e5255 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 WANT_AUTOMAKE=1.13
 
-inherit autotools eutils multilib
+inherit autotools epatch multilib
 RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
 
 DESCRIPTION="a C client library to the memcached server"
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 16ce18b2228a..21a7f6ab6972 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,4 +1,6 @@
 AUX libmirage-3.2.4-gcc-10.patch 1207 BLAKE2B 60104bdd6feebe1d654fe69ce7218c0134c3f28dc3b2a39cd64987ea6459c12041f23f4eb253d98ea4a15454f9ad9ea263056b2fafba794c3bd7df0055dfbade SHA512 b4aab3ea20ed4d73669d6cb911191eda0f6f509a84af803154b397809a4ba5719cb2270c32b71686a236b8362fe5dfe88fa745a00313215c06bda35d38fc38e0
 DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
+DIST libmirage-3.2.5.tar.xz 229380 BLAKE2B ee73bf8418a209633afe7b30888c851cc0f206c03413d0b8d2717bbdb6fe77f3f32e81e1210931753cf453759ff7e4af48164866ad973b3a219381cbafd3d6f6 SHA512 f1247430d428b63734ab16328c3a484acab05fa2189b5979dc0e5759812190abd38b84bacc87b68f166f77cc88c3d4e9fb64ab0d7ec24c116c08d9314dd6b75b
 EBUILD libmirage-3.2.4.ebuild 1213 BLAKE2B d43481df1f7e1150c4163b292eb9586d0df99c78aca6fa545df6ef02445413b8a728a31ba013a825fffb458434e64305dd4d4c0b43b7336e66087433cdecf584 SHA512 1f262c22797a3df1f813eb1716d568fe192b869dcb1e7ccf7c63539d0ee8686ee1e972da6f597296842fdc8278395fc8bc731b2a941b2c6ef305ef22b2dc297d
+EBUILD libmirage-3.2.5.ebuild 1168 BLAKE2B b0686f882d6e047fa4698fc3cdc8f8d72bba375b60197a74205b0534c54be5cb7593b93a020b7bde563b80d940e43a6d8e45e21e02a2c22d19d59fa7842616a6 SHA512 fca50c501372b12b4f03862533a760e6217bb15006b86c0f6a6e624bb7c6ac740eb3cde2e07076a5e22c08b31a3b33e2d532a5488b461d885413df51ba6b5f3d
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.5.ebuild b/dev-libs/libmirage/libmirage-3.2.5.ebuild
new file mode 100644
index 000000000000..9625ed04c5a2
--- /dev/null
+++ b/dev-libs/libmirage/libmirage-3.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="CD and DVD image access library"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/11" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection"
+
+RDEPEND=">=app-arch/bzip2-1:=
+	>=app-arch/xz-utils-5:=
+	>=dev-libs/glib-2.38:2
+	>=media-libs/libsamplerate-0.1:=
+	>=media-libs/libsndfile-1.0:=
+	sys-libs/zlib:=
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DGTKDOC_ENABLED="$(usex doc)"
+		-DINTROSPECTION_ENABLED="$(usex introspection)"
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 10ed1821202d..5c80731693b5 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 842 BLAKE2B 6120e359ecbfe1e967b36feb3567d25e105d6895ec44fb611d9a0d3503bedac87d7c8faa6f57803f333715bde640b045aeafde0876dcd3dd14e1e9d358e9a134 SHA512 811f39642386af86e791db5dd6a2c7ca4a84e71360a11b29c7689a459484b349f73d81f091b37cb5f6983dabea3262f53a0f418bbecf1cb9233ea4ccecb15a60
+EBUILD libmix-2.05-r7.ebuild 843 BLAKE2B a631e0daddd86b3c257aa51a6621d21c1840656fc5abe193f23f84c5c149b015367ccfac486cb37839b3b8a1d292d15ad2311531603c0392ca90eae332ac68de SHA512 76d66229e9292b2021c84e09cc204d0ae61c60061d7c2569cfc327b0091b42e1d77f7061a132b34175edc5f70593dc7f5618ea2d288e80404cbd1f1b8da1581b
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index b372ae36efaa..0bedbeabb8a3 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 4b191d3175aa..57c745e87144 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,3 @@
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5.ebuild 1297 BLAKE2B 11b67ac37a11fbd04cb0905c255f05870a8f78ef299b0dc7857b0db5f7c1771611b94d1f99a26e4a09b8621077e8c682f0cd327cbae313b1fef2f19be6ea368a SHA512 2617b83fc36e16c5344eda64cc0bb0ffcfb2e07fdc93b277228dfd12694a32af890ed6d2aaf66b7dac88dcb4ac81cd6e33eb6794da26d295767844605ea7d755
+EBUILD libmpack-1.0.5.ebuild 1313 BLAKE2B a442d80eadc638b6af35bf7abe6628c9f433d41d0185ad8b935356a696610cd0d9101398e0cdefc245c5c21a7630f5e67f77121e877e17c941e61777e2e92a8a SHA512 8ddc0a4a2d8b408ef12ef406ddfac55ba5662b2efd161d986ea747a26884154f843001d952eea454b09119f440bead40644b7f8836adb8c763f7c9ff1213c158
 MISC metadata.xml 332 BLAKE2B 3e7c0cefba3436a86cd9372ce8688845a913eb01bb7b881aab9037ba97cf15a50bc0f908a70a3ed9a0043981132449bbfc8369d32243e5cca2362390714ba69b SHA512 4d22048dff22d80484cc344eb409e28c56eea3b7c1f8e43861be5560842aa165dd750126efdc059a50125232570fe08df5acf90d613cb7c1163ede670dd8568b
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild
index 6c07fbb2582f..fdebde99d872 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -54,9 +54,9 @@ src_install() {
 	emake "${myemakeargs[@]}" install
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
-        local file="libmpack.0.0.0.dylib"
-        install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
-    fi
+		local file="libmpack.0.0.0.dylib"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index e38375c9a9e4..4351738f5cfa 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-EBUILD libmspack-0.10.1_alpha.ebuild 1637 BLAKE2B c9a493cd294f8a7ad550c202289e032567e8a68b2d4e78ccab53b111a872a7258305b2895f0dc1789c10562d0d8fc8d2aab4ef7a87d8a08bdbc3e8bfa6d57134 SHA512 8cb2368af6156b34cee97cd05750cce4c1ec2cc8285e69d17472cfed31e14b61db047c671004dc5d3b7254f3af422c4d5e20745cdb4e6bd018d6e0238cab8518
+EBUILD libmspack-0.10.1_alpha.ebuild 1638 BLAKE2B 66e3c38c096b112e2214e3edad870d47bbe4484cfdcc471b438f85a3784179ae43933e08ce4f3cc5a51fe995a73f35e82d1ce8d767d0beafa72779c158c74bb5 SHA512 915e8b7ea9aa4af662568c560c126181b066850d8d25bd3ce1c707ee4fdb4472eafa26bf3d6270d90aba212b34b2d8c3fcd0569b38e0f3d3bdb02bf77b86058c
 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index ac019166123b..9ddf9f32ef53 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 1ade077ccc67..81a6286d0665 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,4 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
+AUX libnatspec-0.3.0-bashisms.patch 516 BLAKE2B 16bcea9de6c577400bc5e4e5db89fb5f8456270198eb07b2e79434a20cc763a92e708e57983360af6b1ee5e7bb5d259fed0a08b94048cc4ae52b479ba82af839 SHA512 0d0c968a4523cdd9b25fd0129e5f2dbc4561a7e268146910312c9a4a4982f456aecd1eded939bb367c8eef6aad83c487fa4ca8f94a8b718481b998c0c8bcbb87
+AUX libnatspec-0.3.0-doxygen.patch 804 BLAKE2B 6ed20412605783845fd1fed4f8461535b25bcac6f49b8c9bccaae52e3b83184763b313fa050a349fa4f73b1dff6374c0361d370dacf84d90963613f2e92b8524 SHA512 fd68c998fcb5f359b8c10a0f37d8408b28545bb9f1bdc3e4b9b5f8f68066a0705dcdd776329585bbe5b372fc64b2205470c7bfdb60a215bd7d4d563c78e65318
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.3.0.ebuild 811 BLAKE2B 6d1c574502cc70006314543ee428fc4abec1efac10740a28b52f642854cc51dc82d6aa5248e8292b8340a23c88a02c7eb9ef4bd69192993152dea1d79c9fb6f5 SHA512 ce54556828c45f5675a4ad57d05bc2247b315a5829e72141511f9c32d4981552f7e51394d5a11d44e01de78097c1ac9fe26862a5f4fc4e05d9f0ae1fa0858305
+EBUILD libnatspec-0.3.0.ebuild 935 BLAKE2B f8908766eb137b26c61af13f38a5dbc1a748c6bd67dbf9495873eadb9424dfd9ae3839e50b149ee7da6d85c684387c423d62386d0aba809b9c261246306fc7f4 SHA512 63022f4e7fe8962126f21f0f61295ffed1484384c9dc056abf2c7cec84bf9b825c2e39c011495a61ecbe21f53a60a71516ea4e943e1486b24ca4ee925a6f7676
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch b/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch
new file mode 100644
index 000000000000..cf775e7c644e
--- /dev/null
+++ b/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@
+ dnl Checks for libraries.
+ check_popt=""
+ AC_CHECK_LIB([popt], [main], check_popt=true)
+-if test "x$check_popt" == x ; then
++if test "x$check_popt" = x ; then
+ 	AC_MSG_WARN([ libpopt not found.])
+ else
+ 	POPT_LIBS=-lpopt
+@@ -47,7 +47,7 @@
+ 
+ check_iconv=""
+ AC_CHECK_HEADERS([iconv.h],check_iconv=true)
+-if test "x$check_iconv" == x ; then
++if test "x$check_iconv" = x ; then
+ 	AC_MSG_ERROR([*** iconv.h not found.])
+ fi
+ AC_CHECK_LIB([iconv], libiconv_open)
diff --git a/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch b/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch
new file mode 100644
index 000000000000..cb7c542088ed
--- /dev/null
+++ b/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,13 +54,10 @@
+ 
+ # check Doxygen
+ DOXYGEN=""
+-AC_ARG_WITH(doxygen, [  --with-doxygen    Generate doxygen documentation ],
+-[AC_CHECK_PROG(DOX, doxygen, yes)
+-if test "x$DOX" != x ; then
+-	DOXYGEN="doxygen"
+-else
+-	AC_MSG_ERROR([*** Doxygen not found])
+-fi
++AC_ARG_WITH(doxygen, [  --with-doxygen    Generate doxygen documentation ])
++AS_IF([test "x$with_doxygen" = "xyes"], [
++  AC_CHECK_PROG(DOX, doxygen, yes)
++  DOXYGEN="doxygen"
+ ])
+ AC_SUBST(DOXYGEN)
+ AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN != x)
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -19,5 +19,4 @@
+ 
+ 
+ # install
+-docdir = $(datadir)/doc/@PACKAGE@-@VERSION@/html
+-doc_DATA = $(shell find $(top_srcdir)/docs/html -name \*.*) 
++html_DATA = $(shell find $(top_srcdir)/docs/html -name \*.*)
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 02722757df79..02e0a60d3cb2 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -1,7 +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
+EAPI=7
 
 inherit autotools
 
@@ -11,28 +11,33 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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="doc"
 
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.6-iconv.patch
+	"${FILESDIR}"/${PN}-0.3.0-bashisms.patch
+	"${FILESDIR}"/${PN}-0.3.0-doxygen.patch
 )
 
 src_prepare() {
 	default
-	# regenerate to fix imcompatible readlink usage
-	rm -f "${S}"/ltmain.sh "${S}"/libtool || die
+	# regenerate to fix incompatible readlink usage
 	eautoreconf
 }
 
 src_configure() {
-	use doc || export ac_cv_prog_DOX=no
 	# braindead configure script does not disable python on --without-python
-	econf
+	econf $(use_with doc doxygen)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 385ba9ef2951..46ccd50031f6 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,5 +1,5 @@
 DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
-EBUILD libnfc-1.7.2.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30
-EBUILD libnfc-1.8.0.ebuild 1046 BLAKE2B 4c94880d6a30d0c995bb6a1609b71eae9975a3d19341622ba37e4f4e96377f8fe0fbe9dc3b6dc072ebef27ecfd05976784faaa1672a270614dd86e6b05598c37 SHA512 75b7dc3bb476ce50c6731c6ccf71ca4e788cb01778a042168be4b5e802956d8ef858b4d8270cda2af0c5089e43a41638e8b5822f96200dc2629dca7cab2fef30
+EBUILD libnfc-1.7.2.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
+EBUILD libnfc-1.8.0.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
 MISC metadata.xml 463 BLAKE2B 53a92a5eee64b4e8b1b438424064575b09fce5d121e0c67318b970f16aad8fbf5e4823fba3525beddc868cb7bae500c08413f0f132552bfa09c86e6c7cf04818 SHA512 1b7c15643550b90d07893eae94a866d490d14c4596dc19dcea1e6f9b488a5a30d91d3e8b253169d70f4bcab4e74ca14e1ab7a1d548ea434fa7accdd79a6e309d
diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild
index 102f2a1983e3..ae5228fdac73 100644
--- a/dev-libs/libnfc/libnfc-1.7.2.ebuild
+++ b/dev-libs/libnfc/libnfc-1.7.2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
-
 DESCRIPTION="Near Field Communications (NFC) library"
 HOMEPAGE="http://www.libnfc.org/"
 SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
@@ -17,8 +15,8 @@ IUSE="doc pcsc-lite readline static-libs usb"
 RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
 	readline? ( sys-libs/readline:0 )
 	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild
index 102f2a1983e3..ae5228fdac73 100644
--- a/dev-libs/libnfc/libnfc-1.8.0.ebuild
+++ b/dev-libs/libnfc/libnfc-1.8.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
-
 DESCRIPTION="Near Field Communications (NFC) library"
 HOMEPAGE="http://www.libnfc.org/"
 SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
@@ -17,8 +15,8 @@ IUSE="doc pcsc-lite readline static-libs usb"
 RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
 	readline? ( sys-libs/readline:0 )
 	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3b43c6b00334..8c4159dd2752 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,8 +4,8 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1144 BLAKE2B 4e83cca3689722cce4ad101f36db5923b0fd4771f2d49113f512f7f742370c8ae019b39925b9b29e4597f15d4011c85a54aeb1ecd6fec28a8216282f59d71e02 SHA512 cd7685ae97104765e5f432371572e7bf1a6b1bd984e62dabf87563fcd3fedfbde975972ed84d5c485c45cb2a71dbd7a141b54b237b9525d2b5abef50d3b636d5
-EBUILD libnl-1.1.9999.ebuild 1056 BLAKE2B d8a6610330b2720caa2089e9365c913c7e7822097fb744e57ee5f5edb0c70217ce758928f3953e529d2052a6d5f309f57e22bdc92e77d6a80e46fdc706fab106 SHA512 0bd08b49ab67f6702737ce1fad08467b8b7fe522bcdcaabfd4eaa04d2b78f85d7afab72b5440b7bd9b41dec994f8f6fd5a64621552ef575dcb6c6a540e56c856
-EBUILD libnl-3.5.0.ebuild 2380 BLAKE2B 4d6de097ee0a7872659872a0560e3080f388a8db1d1b3447d5db0d2769ac5754e1f9b722098352f05d1354ba8dbd9da46e86683054c12dfb162510849b557d1b SHA512 7fdb26d018634fe77c0a5aa38e53217e5d1a997ed7da6615e73c726c8af3d57d065492209fed1482f1ccc60a9320c63b3e5d17376a9dd1a53a0fd03237a6143f
+EBUILD libnl-1.1.4-r1.ebuild 1163 BLAKE2B 765d47612b1adcfbea4b8d0ac71d5d8cc3d7e198fc225138da70f3f96dc6925b24cd83775c74b6404d98496e1624a4b76cdc33f18e9d8352cd6084505cdc48fb SHA512 2c902a544a77e6ab768589d4125658eeaa6983fac474e1e5703486fa574fcc9d3c5f1ca5225a6433b42b6614757b6a9bd4261e42135ff095a4d0a4ee2e97d763
+EBUILD libnl-1.1.9999.ebuild 1064 BLAKE2B 318f89cd93c4c3d342fded3d5d399c8560e5e1977057248fcd1ae3ae7da3d03bea0a02125e4d5d8c8e1017c3ea1add6cb02babcec3305ffc45b1d7b9da55ecc1 SHA512 2e8e94e598c956e51fbc835b7cff45c0c3783686038cb01bc47acd20f877884c8453fa8b932125e204cab027f546dfe4cca0b24a1482061fbca8e7192f66b056
+EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B 40d00f5217a2171ea39df48d27715f5a3beb7dc8be5c6adee13be66cceb373b76ff1be9bcd7b5e0c696a86d486474a7798a17bce76d9d35469b2317ee5193739 SHA512 ccf215de0ba3d60d9c8fad9be370824e80b23cfe856fd8c3b7a757841ff3afc009b50acbe5b5919650a56c36cf4e2a6d5504946a25acb9fb00c159507b44bd6b
 EBUILD libnl-99999999.ebuild 2425 BLAKE2B e1e0af93008411e8e8857b2dda0fee2c2fa8a9f707df10601e95ff3ce003787dbc1cb035aedb7a1210e4339e2764eb890cd38fe125ded76be2e52e47533ff262 SHA512 c891cceb93025e2456efddb03c69485b6e2ded0db86f46734b00698e9736d1f7d6c095eb20b6108e040a8430b01d317857b72c4728407f29c3345b61c9db9888
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 40141bb55b71..8f3ad2437d6f 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-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="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 DOCS=( ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
 	"${FILESDIR}"/${PN}-1.1-flags.patch
@@ -34,14 +37,14 @@ src_prepare() {
 		sed -i lib/Makefile -e '/OUT_AR/d' || die
 	fi
 
-	rm -f lib/libnl.a
+	rm -f lib/libnl.a || die
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		emake gendoc
 	fi
 }
@@ -50,7 +53,8 @@ src_install() {
 	default
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
+
 		docinto html
 		dodoc -r html/*
 	fi
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
index 30fa4a923c0f..14a4835802c4 100644
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ b/dev-libs/libnl/libnl-1.1.9999.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 multilib toolchain-funcs
+
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
+
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS=""
 IUSE="doc static-libs"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
 DOCS=( ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
 	"${FILESDIR}"/${PN}-1.1-flags.patch
@@ -30,18 +33,18 @@ src_prepare() {
 		-e 's|-g ||g' \
 		Makefile.opts.in || die
 
-	if ! use static-libs; then
+	if ! use static-libs ; then
 		sed -i lib/Makefile -e '/OUT_AR/d' || die
 	fi
 
-	rm -f lib/libnl.a
+	rm -f lib/libnl.a || die
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		emake gendoc
 	fi
 }
@@ -50,7 +53,7 @@ src_install() {
 	default
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		docinto html
 		dodoc -r html/*
 	fi
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 2c8d76055e42..ea0332a4ef97 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${LIBNL_P}"
 
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 840a0cc3c5f9..04f93e309314 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,4 +1,4 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.2-src.tar.gz 82594 BLAKE2B 6deb775e77df71fbcefac6ef8755484bed476b652ae5dc3fe8914b859262ea1f6ee49da9d27a5a1bf34256481c58dd98339f0eb96511dcdc44cff2bef9ef6a7a SHA512 8cd16c0ca974aad8105dc32c8ebd627cf24f6d3bd81360515c2e0159e35328920e91039bb06ab4f52c93264c2112d0e130761e3837ba26fc703caeb52bf27b66
-EBUILD libnsfb-0.2.2-r1.ebuild 1110 BLAKE2B 26f4d07d3c83dd2d0bd4779a7d841279302ea22c739cdd84bcd4e0114421c0479891edf644d62a5126e774464681dfdc597ec5c8acca925c45b4fec32ec6c30c SHA512 326073cf13c49446c82cb8674542484ebf8025a97e042b0ac297efd62001aa874cb0b56aadb351ca6c28c1367ce5436ef9cc70b36d73bf3d61b8d948fa78a223
+EBUILD libnsfb-0.2.2-r1.ebuild 1117 BLAKE2B f55f0a30ac4eceb6491a851544d5493ab958756871843378774ef91fed50f23c69cee261b07ce8789076f4b3914d36949c078eaa16babc2ccd3d236c10657206 SHA512 65eee3e706fbf8ec0564f1d8999de5fe95d013f684b398b991779563e67ddadb03a48931507acd17e0ede22c965bab30c24854d45755ec8cb5a3bab6e53d40f6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild
index 0e4bb3ed2549..32d9f63adb80 100644
--- a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.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
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="sdl test vnc wayland X"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 8707113dfc6b..a0067bb6c125 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,3 +1,3 @@
 DIST libnsutils-0.1.0-src.tar.gz 8840 BLAKE2B 9f25763b945a96d89ba33959caf676b09964da096a9e969396f3b0ba0f6b4bd6bfb52a61bdcc222432463f2bc0f6bc148bc754200fb80a9ab521c5d64638bba7 SHA512 82d75e799b21484120b9711c853075a07990aa4d5ac5bb0574683bd1fd59eef547d9b78333eeb2da9d96c2132b4e7c32510cf690c80cef291cce8ef2eb44198e
-EBUILD libnsutils-0.1.0-r1.ebuild 584 BLAKE2B 5ced7bb5432b56ca1ebee8a32aa8b6e72b9e798d531f2b1e8b4fd32e12f53cf711d3d00209598867516c26af621544d39858adfcbc029f3b3afa4a5a7ef30d10 SHA512 290d2f21f0514430d41b3f833975d8b09b78c804ce2c0883c7b35848190fefcd3a0a7f9d0cd77fb11b835e64e6b9e08920b0eb20bb49ad46bc50559481ea75bd
+EBUILD libnsutils-0.1.0-r1.ebuild 591 BLAKE2B 22d49308ece78197afb78c8d61406fc63ec78cf867a436e590a22c6adc913137ff943084c6e14046c660bfd0f66dfd796041d65bb6f21ca16397c3a74da6c7bb SHA512 9c1abf150669aa85e7a74b4060d5d138fef1e155978f8e52b84012f103a12d7305a4490cb3b5d532c3eef2f79420c739780074adde5a5fab375b92a59704a4b7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
index 84b713406a96..14931dd56ae4 100644
--- a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
+++ b/dev-libs/libnsutils/libnsutils-0.1.0-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
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index d92f7b444774..e4ec5e5ffebd 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,5 +1,7 @@
 AUX libofx-0.10.1-docdir.patch 1192 BLAKE2B 0fde1254701b6022970346600f1dbdec14c9024e72f6d8012c64e5e81e24af469ed5933a16d4702b68e4f0f2e7bb4afc8ae8a7a730ebb3fd6af52e4f06e0884c SHA512 953cdc7e38fe7ce563eac06087f114294abde65cd8fb93c25d3fcdad8cb6d0a49a3ab1818558eb3ca58617f868b2eff146ad8f55fa38774dd675476e19983e9f
 AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a80470c5b2fcde2c2c2ffaaeb75901e1391e79c617270af5b22942d067d43bb9522e78faeadca300e7a59c2f9f5a4e58332a SHA512 f5bb1ba87e68213e609c50f96635e7bf1de009a8e6720586fa62ad19f68776f9b8871a7782ff439f310ea31dc8010c5a4bce4b78398b980c11a6f8b6a81ebf27
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
+DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c59191fe2b836a0c2a988b6d0404821a9f99be1fa4b258afbbc35b0cb254b348a1e7a0f7a8c4010645afff52f91 SHA512 14ba2779d94209312a8a1bbf598e6a31820df4fa7e222ae1abb8d4234a6c7ba7068e06a73ad4ee93bcb53ccb99a8007d799d9e66a9921704dc75c84b0e7dc307
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
+EBUILD libofx-0.10.2.ebuild 1157 BLAKE2B 3c53d2e9540cd5f0e97e1ba9b17fb4a82b0f3bd900f757c99cd63c3a92363cbfe02632db68469a5fe1b3bdd73d08323d1041376321746c2dc392b9303498843b SHA512 002c21658a1d11af11de67fdca9380e489fc74991b6cdf2bc50f4396cf4b1acdc9407aba9a36206242e31213f6136b59241edf06f53a04505c1bd0bc96411a6d
 MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/libofx-0.10.2.ebuild b/dev-libs/libofx/libofx-0.10.2.ebuild
new file mode 100644
index 000000000000..ae5c04394d48
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.10.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-crypt/gnupg )
+"
+RDEPEND="
+	>app-text/opensp-1.5
+	app-text/openjade
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Not included in the tarball
+	sed -i -e '/INSTALL/d' Makefile.am || die
+
+	# bug #566456
+	append-cxxflags -std=c++14
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc html-docs) \
+		--disable-static
+}
+
+src_compile() {
+	emake -j1
+
+	if use doc ; then
+		emake doc
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.a' -type f -delete || die
+}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 54c9cbf93d8e..10e11e690b4e 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -3,6 +3,6 @@ AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101e
 DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 EBUILD liborcus-0.15.4.ebuild 1330 BLAKE2B 1418857b75f7c98f4160430afca5fcfcc05540a01b1c9191e71701c8900f2937a6bc2632697778af6364b3995fb487b9307a376420b5f62a1572a62673abcffa SHA512 a1f0505fabb9d35f33d620f31add9c96ebdaeaee8fbecd20b1537c2e0a72cc1b1accba1171ba2b0c2cd6cca7de66a5be2dfe90b8b19a79221b74beee8e915a82
-EBUILD liborcus-0.16.1.ebuild 1365 BLAKE2B 498d60136a42d169af92c15e563136f19f9564cc2d8fe1c75780fa160fec6c509aff5c717668da8007eb9c521e456fe5a63cbcb5541e67526c556e696ebc9c96 SHA512 8879c389ad9813f09349261382a452b3e6f3a6d99f392478273c8c4a3b80244eab6c33fffcc02181857b81ac15d6e67ffa798d7c57ed0ed5fd85b4550461f693
+EBUILD liborcus-0.16.1.ebuild 1392 BLAKE2B 22154af60194fac2b9f9ff50bf99bf29c86eb2bac68d4bc616ddbd43315c9e7477167f07585216166fb58667b2e11020e851f17f3f52bbbdc7850da1fae2b85a SHA512 37cbdef0e744cca3ce992c428a9f3e2b4a846efbf853bb6a283815c68cf40f62ceb9485450e8f2a3549479e8b26441a7d415c8a8c3a892e1bddc1f1ee298cbfa
 EBUILD liborcus-9999.ebuild 1298 BLAKE2B d36fecea100888f02258506873c9590989d7d8abadb2e03e97b0c80d1d3643fd462f13a7af52ca889c9ea91d44a8eed9b5764887f8a2c0b0d4fd78995b9e28cd SHA512 d7c070b9f43558abda76cd5602a0176ca4713abce69b458243edd089a114bef05ec189fa61384a158406427368463f5618f256d65c7177b04d59051a6ab954d0
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
index 668bff144022..e26df784f7e4 100644
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-# 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" # no ~x86 to avoid blocked update
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 273a8c6a71bf..17dcee50513d 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,4 +1,3 @@
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
-EBUILD libparserutils-0.2.4-r1.ebuild 926 BLAKE2B 9ca877b42e5ec18999b631c757e789b3cd065bed250c0759b8ead0ec309f5d5d0bd5a330023590eeae369c299ee7fb6a8d76e5afcb6a36784b5d786178df0c0a SHA512 7213800d743699f75b296afd3c1033b92c30907635ad22d425dd80015558e90ef1ea9f5aeb123fdec4275229e4e8e80ccaac7e99455cfc5e43c345a5f61668cd
-EBUILD libparserutils-0.2.4-r3.ebuild 848 BLAKE2B f2f66c1e397f83cc424d6bb38e1e03df0281ad29f839a48e4ff547430191c00e6b9c964a478dcac96ad1553a647845de8d895eeda90deb05fd9d9f76427a4bf0 SHA512 b4f57afdee96f869b1654ee679e6c89dd6f25ad615c046bcf2387dd3a2698a8bc7faeff5ea87062adb3f99807985c323e1fb1b35c8ce6dd9fa75f2c8db157d09
+EBUILD libparserutils-0.2.4-r3.ebuild 849 BLAKE2B 1049681266cbb3d1610883b0c3429dc71d1182c6624011d44b04a4afd9fa053ad2b2d00c1934c87c4969cb04994f75c83c799a7400345da8d136159eae0954fa SHA512 584f01ff041938d5c538cb7b28473ed29cbaaf1cb0364f0d6768a46633cd6f591dc0f1b171fc91da89284916f9d43f7ec46e2fa0aaddfaa3d101f79058dc2120
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
deleted file mode 100644
index aeb14abc754e..000000000000
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="library for building efficient parsers, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
-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"
-IUSE="iconv test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-util/netsurf-buildsystem-1.7-r1
-	test? (	dev-lang/perl )"
-
-DOCS=( README docs/Todo )
-
-src_configure() {
-	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-}
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
index 6fad562646f2..d851e35b45c7 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
@@ -11,13 +11,14 @@ 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="iconv test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	>=dev-util/netsurf-buildsystem-1.7-r1
-	test? (	dev-lang/perl )"
+	test? (	dev-lang/perl )
+"
 
 DOCS=( README docs/Todo )
 
diff --git a/dev-libs/libpcre-debian/Manifest b/dev-libs/libpcre-debian/Manifest
index f3089e5487bc..59b1de632ba2 100644
--- a/dev-libs/libpcre-debian/Manifest
+++ b/dev-libs/libpcre-debian/Manifest
@@ -1,2 +1,2 @@
-EBUILD libpcre-debian-8-r2.ebuild 612 BLAKE2B 23c888bc1318642f320e1140e2e522275524ab649e85dae9ec69481053c75dd3c54564940fbd89a0591d66a190109ecbacd3b8423788abbcd474666538b429b3 SHA512 1a34ff4dad2ca71f03b03d6cd6583580fea70a86b995570800ccabf15af1362f4c4decd3b8eae3c38434b75c2bd9673c09fa1424030d60c7730f0c61c7a403e0
+EBUILD libpcre-debian-8-r2.ebuild 604 BLAKE2B 188737c74125c5b7df6c5ea4753020ce2949cb6114294edf55e6c8afe8d5c8c4cd27acbd99bac2fa108c9868881452422c85db65e3a81d60667050403c643a33 SHA512 f23c9cf3830bc7394e308c8ae25ccbb0f4ddbe2505adc26b1a63dd42e6aeec22b1bd310ee826a41b6a4811d0d257e6511e6a60d408eba979745331e79e4364dd
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild b/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild
index 377aa75f7c86..01cd18656c14 100644
--- a/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild
+++ b/dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="libpcre(posix).so.3 symlinks for compatibility with Debian"
 HOMEPAGE="http://www.pcre.org/"
+
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index ead97301327f..bf9174ff473f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,4 +1,4 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
-EBUILD libpcre-8.44.ebuild 2573 BLAKE2B 6ec9aaac5493ecc7f150bc9f85aa5932bdc8cdae20e98c7298510ed3819b802978fb7ed406d0c1885bbe24c649015c457f6b0908c91b8a03d4411869df4c0e65 SHA512 c0a9c49980afa9cdd46d45bffed17c7dd79d5f0d5941ee5d826b3dba8f9da3136cc4151a3816a4eafd2dbfdf9899065387d54f939f64d4d951520113d17c8964
+EBUILD libpcre-8.44.ebuild 2536 BLAKE2B 4816504c3c0aa9c6c4e2acf598483ad24027be06de64ed33f6451457391e4b76b4b1a3c7df2900b4823f0b57befa5f440421a9db67a63ca11ea0909d0a5a8d83 SHA512 76d67bde25ad0c478001d82a6760b63e9834fe478dd326b94ef2e54d7a7a9c45ccb16b663b155b9719fb3a5ea4ba847f7ec3be78d62bc608d5c234af78e893f8
 MISC metadata.xml 1219 BLAKE2B 633af3b60f5cd2d75585f1747b6d0233f5b5c46a182450777c55038a3e0da55b6bd70e471e4287267ba28b18af8bd9c9cd4f44a76415ad1baa2b5738655d5c86 SHA512 f012e32d3a8198b9ecb5b03aa99007c3a9a64652843071c6d106569ba9fdea4d1922c58f2e049a21217b92e0d3b32d264c5a4c41f4a84b0c2320f4f06deffcb1
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index 4c1eeea38bc7..658a081edcdf 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+inherit libtool multilib-minimal preserve-libs usr-ldscript
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index d84ae8edabc4..362fe49f2365 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -2,7 +2,7 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
-EBUILD libpcre2-10.35.ebuild 2509 BLAKE2B 3c553f0620a2edd6ef5b812b29f09e1775c924eb469d2d2e182be74858a78e6036ccc45c681d14c78e55102dd72a377be3231d5220b7767b5d00dbb9723652f6 SHA512 257bae0550c2f750b00e68f829bdbb245f596cbe39e74c871167f704874e03ac3976c4378947acb7eaa424f355eaee79537cc121c46e93b43896dd39ea210d55
-EBUILD libpcre2-10.36-r1.ebuild 2518 BLAKE2B 85544807e037c63e7fd8542f9f31cad99303cee1772f3e0efb154ec490cbff9ca900e59ca7ac0e1904b5b34563a8f854955ddec2536fbc3f94fd5b83b5877d9a SHA512 169ff5b447a212aba4567f9ba8e3c9f66ee641b6812f3ffd6b444728ca968bc1a8d4086af151c8c003689555ec004f268e0fdba637b0bf9d2256e27fb6fd5e1d
-EBUILD libpcre2-10.36.ebuild 2518 BLAKE2B fa8f19945df570d515d34566d40a6fd85160bd5edb7be699f486d6d0d4c2e20e3725e37321cfc7ef4e936e69196ba0ae5cb06f84598b5b3eb733a81056db35b5 SHA512 9cf1d48a14904b3d4fa4e5b3cfaf2c0d7edc58c19c47647f50b4d25011e99520d1aeb6755187d95ca46d01a9a18874c90201b1b5cbf5357f563b017708d64b00
+EBUILD libpcre2-10.35.ebuild 2481 BLAKE2B c3ce3209732e12075dc7fdedf741b1231a2384772db8488714a2118c498b1bcc162c3418046057774daaee98322bb1f39dd3239c5025e0fea4dcc20c877a2d5c SHA512 c38aa830008c2d1dd265e837056a3f2ca69d3f849b80fd056fe25b3dc52338b8817db44005f01747dd66b39a46f78ee38d7acb3d7aece0f6dd1425ff936cc077
+EBUILD libpcre2-10.36-r1.ebuild 2489 BLAKE2B 30f74db58f2b15669218d4048007666cef94165fea2aca29370f9d408f321b7a10b6d5c1d41ffe1a459e6d6278fb7ca7c3faf9a12d62a4c20f11c11ef1b76fd9 SHA512 eea086d82c04f9d35a40cca0cc3397fc8a244f302291b810230aff45c8b2374e78e07fad0cc24c85bb29831be4c1de42481bfc2878b8e6afa3a6ac9670ddc3dd
+EBUILD libpcre2-10.36.ebuild 2489 BLAKE2B f85a42c119e96bdec00f6e3a74141e670e9da7a0db2fd9328068c647a16a934b589907b05f267ad5a574f1b0f32048e3ed461849326a789c13b93ca56bacaf4f SHA512 37436173e30d3ec421c37fc1793bdc1f68f5c126f511255b7710ba654b2972b42b1de0f5c53f1d7575a629c50ac66b1ee36f024dc60b760d9e55d0ad253e7c82
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
index f785b364fbe0..2619bf00b12d 100644
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+inherit libtool multilib-minimal usr-ldscript
 
 PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
 
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
index b4562da19092..e6cb3ef7b5d6 100644
--- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+inherit libtool multilib-minimal usr-ldscript
 
 PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.36.ebuild b/dev-libs/libpcre2/libpcre2-10.36.ebuild
index 64d021adb4d8..7e73af9f5258 100644
--- a/dev-libs/libpcre2/libpcre2-10.36.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+inherit libtool multilib-minimal usr-ldscript
 
 PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index bd90c3e3ab05..c57f97198e23 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,9 +1,7 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 AUX libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
-DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f
 DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.26.0-r100.ebuild 1956 BLAKE2B bd378be55d13ca21fde9f6fa2f8c07f9a663d74d79557fba54c3a91a0403637de3f2cd9cc3b1f5b5e93547ef53ba372e39e3ca554e800d5be81720b9fcb26042 SHA512 c6916121ae64171904763a553584b35630c4b6ef3df12ee2343c6baf7080aff8c963822b4e50d5ae223b42b4f12ec743c21ba6eb7c5709fe75a4d40121c32688
-EBUILD libpeas-1.28.0-r100.ebuild 2041 BLAKE2B 6a213c0d7428aca879da294e886f953afefbb29e46956f0e71f3d39f10858bb669665c007ee2760a6963ea7976bb0623d51e810b1829a92a0db0754bf53afeee SHA512 2796b1f8a6048f9ad98be9353a13d608dfb5376359a8ef41a62227a50452ec608e5fbd8a2674b547c619af0be53031410e7687876c610a48418a1399463dfbd9
+EBUILD libpeas-1.28.0-r100.ebuild 2040 BLAKE2B fb7fdcc138182770dc0e904aee6162fe6b9eeb873c139e309ae1a1a88fbf8c9fe76f9c50538fffa94c1b1b06ccb37ad078f854a3f8325f4429f1f6843256e188 SHA512 aeabcc490ab781cf1fe4ede74f724c6f9ab63c6b1f7bceb6ba768d51f87a1b4a455c059fda906a7d4e1a2ca7d4c7dd02f2c98d5c2ccd83079d5a51d5f1a197a3
 EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 4a46bc3b4047f9597e5385f4366c6132bdaf0615dc6b0ff15ed4acd9081d16c542e3f2d7a3c54f3467fb2d379050b7ca74cb7a0652e863ac5885ebc00cbfdb6c SHA512 2175312d704f747450208ec0a423c985ad4d3de7ea5d92e2387acdd528a9428ffc8b5385a951721c4f82f38997566c499369747f016a7c35baeef323865f8775
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
deleted file mode 100644
index da4819462557..000000000000
--- a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua +python vala"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
-		')
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo-specific lua tweak hack
-	"${FILESDIR}"/${PV}-lua.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
-		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
-		-Dpython2=false
-		$(meson_use python python3)
-		# introspection was always enabled in autotools; would need readiness by consumers
-		# to USE flag it, but most need it for python plugins anyways
-		-Dintrospection=true
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use glade glade_catalog)
-		-Ddemos=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
index 4e8105de81ec..f0e4f3205a53 100644
--- a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
+++ b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index e14c9add95ea..c02909a53dca 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,5 +1,5 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
 EBUILD libpfm-4.10.1-r1.ebuild 898 BLAKE2B 5f6ea6c7e7e0620ab1dfe1c55630537500f1e70e479311b37d7c1a63518abadc324d664c394c6f87382462974bd0600bb532f43322989dbc2d916fc55316c528 SHA512 91fc7332530d754b3f6a9644df4b69c8cc49f60781a68fc83f5f45cb530722876884398b6cbc3a0ede8a1cd684db481fe1778d77819309f257a74420182b8b6d
-EBUILD libpfm-4.11.0.ebuild 954 BLAKE2B c61b75632adc63256fc622613636b825f529466c6ae42862e74bd424ec54e8b9243fd9289cc225d638c9b81b4cc4557fc76936e546e64814deaa2dbae75b272b SHA512 28becc516f87911cb2239cb1f42241e36b8eee1a9880b128d96eaaf7da353b9317f549d8babdcbe83eac949d940ef7379d6e7d1e38c7595cd0579949f7ada76e
+EBUILD libpfm-4.11.0.ebuild 959 BLAKE2B 34c4547c18f332707f66c52448d1ec4ef5153ce2101ca3c6cb276f498396082a8b46677ba2f471b796cbbb62c2efe25fe9fba78de9924cad988fc3d2a66b58e2 SHA512 33ff61ac78e2682d28fcdc8d123be19a9b8fa9a6de17e01846ca7eae7431afd1fec41ff9dede878e1978eef6148b9094288822ae8bc5c2050a3919e1f54494ab
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
index 9240db60b044..878150afc22c 100644
--- a/dev-libs/libpfm/libpfm-4.11.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 655525492dca..6b828a05acfb 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
-EBUILD libpipeline-1.5.2.ebuild 659 BLAKE2B c3b670d2bef99463ca028d1f175bfae4c3bc9772a6803dd5e5c0fa899f19cd68bdf86ec55b4834b2452ea3c0ad4aafef308e85ab64f6c855722c01beffd4800d SHA512 2bd28b0d1fa62c1cc5b2c988c6e534d6991409bb71a5e67c269d3ef512c64799296c5c8e0193d3584693f76006e83518350f1393b9a0216dbe59c2ace10a219e
-EBUILD libpipeline-1.5.3.ebuild 717 BLAKE2B a3fd2fd9c4eb7db96b3379ef7504bccdf15bb514c65222356d91f904ce4580156a032200c6c7b1b83a92d7163e329aa8a3976a28165e0567d53730079d98c8e2 SHA512 e7b69b8bfbf0cac2e0ba143f976de6e27a091e95a684e1d310237198d0e0897b5c3e6e3fac55e622bebe3fcd177c35004fb841f42cff3f25665b38a07b0ac059
+EBUILD libpipeline-1.5.2.ebuild 660 BLAKE2B 3e25748545e8ad9ede9fb984ed0268fb1d722330812e56dfc050afd19ded2cef7fc44f3c54412753ee46600027cb1086c22659452e659ef4b0e1d6b53d07e8c6 SHA512 da522a788eeaee490856730b7aaf739f28b56917f8c96a734201791b0d74f5401ea05bcc1c6b70a9a068a11f20318f5bf2b6afb25dabcbe5c7c934528b71eb68
+EBUILD libpipeline-1.5.3.ebuild 718 BLAKE2B 94a758c2901b0f9eed957679cbeb2d57e9b12c6e99c6f2ac32ae2a4a52b492780e210ef9ff4300ac43a8d077b54ea840236aec8dcc9e925a175f38aab892604c SHA512 6549cc511528332a602e48e7469a878cd6352c54ebcb562cb848395ec1b7990b9b1779d8eb260d2c3714bf92ff229e25ad95f1b722937732640c2f42cf77f5ad
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
index a892d88117a0..49a89ee95a4e 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index 8c19f8a1b990..c841cfd67015 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libplatform/Manifest b/dev-libs/libplatform/Manifest
index 483432b1df15..57759daabd61 100644
--- a/dev-libs/libplatform/Manifest
+++ b/dev-libs/libplatform/Manifest
@@ -1,4 +1,4 @@
 DIST libplatform-2.1.0.1.tar.gz 75257 BLAKE2B 99887e7d8b1b51578a5b84cdb63c71caf75cce1674ab2c7c658bb9bbf67b69a23f4facdef8d4a4a9e2f7c0101886a5350fd92708cde3aa3010589c7055bf6a50 SHA512 76e6f1ac64b61e4def7d99965708d0f05698379e0f3e846317174f0bc12a9654b3341afc84bd8a3a70f101ecab6c692dea96b57d7e000dfabf6cedee2b8dcd8a
-EBUILD libplatform-2.1.0.1-r1.ebuild 657 BLAKE2B 58329b650c6562b779ca01d67ae3e9ddc64ae5665a5da74da9453403750676b3abe77bff9d7825418306fe3e0c8e153a8c6352d2601fb09170088b807f276069 SHA512 03e2bb0f4cbbcb057a1ce1ef1fedb2d3697a83becbb61416b38e34c4e6e4809645194e8ef7096defb8ae35d627eb95400348ee83fcb34d6d9b7dccfefee768e7
+EBUILD libplatform-2.1.0.1-r1.ebuild 656 BLAKE2B c3bdbc205079149539e6ed13cd370f028382bc261095cbd728e87e6f580a6df9e5c37916c7cbf3a7d0bf6ded83c775e4ab123deaee7815b6e922b02697f6e43c SHA512 2716924e8c1c7b50f8772e4c5b40180f181d7b05eca461e911730b32c576cfbcd81e6c98065ed8282a2582c5c502b062d7594a995efe000097235c7d6f3214bc
 EBUILD libplatform-9999.ebuild 652 BLAKE2B 917369a687338cc365c74fc57511e5605457a95772f9a8a6b7ac4ca59e36dda3fd53d097470a0f5672052bb09ff70b2537e0f51cb9c8537379eaa398f1937773 SHA512 fcda25e97e51b1e83df9459db7f2c61fba84b3ec732f9ebd746346dd623752de1916549dcad46a13ea77175019ba2dea85ca28e8e52f68f1df8e88db21f96f09
 MISC metadata.xml 341 BLAKE2B f7f71cc610ac0604026427e72d3d5cbeb21f8a78aae2eb95fd3c242648a31fb1a8fa9fbd8c7e3e8a46e3381a85c2f2c68b08e19958e1a3e9455da14b6465480c SHA512 eec5401306206626e2f4cc37e587e1b4e5c69be08a62f877df58d25749f1fd12bb61a89bf9e68089e823876f9a125f8e613753df2d4bef3792526905af358951
diff --git a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
index 9e534eefa006..e8a4bd5c4df2 100644
--- a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
+++ b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
@@ -21,5 +21,5 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index cb8f67d7f61d..abadd84b40a0 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 812 BLAKE2B 37ebd75d4a99030bcdb0590430f64c53f16c45d6db36f729211a4b7919685635372cb8bc6ec58a1e3cf9cfc9b592aaab95669594d57ea864bb406d3390a4c432 SHA512 79304d28ed2a4c07aa2b62725d82bf19841654ec9e5e654ee431ca16a0328391a18a924e9e6ff26a024347794229e5608223246ecf48fd45fb87dc4f69ec5248
+EBUILD libpthread-stubs-0.4-r1.ebuild 813 BLAKE2B cd553e979017489860e145cb61db91be26ff39b57cdc21fc4cc80a7596d802d94baf0122460e515cadbef8c48470aadca8fdfc0f8dafa654185de24486d69f7c SHA512 0f4dab86427640d12c4bd24cc4f3b283aa55b2ed97becebd8be7869eff6d01ebb5709b5692585b5982370f7ebcc0489edbbb3d1cfdf2bcefa39257fae2c2d66b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 9db4fbaa641f..3440248d88e0 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 25fad21b6f08..fcb353b005af 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
-EBUILD libpwquality-1.4.2.ebuild 2022 BLAKE2B f6575f0a1b098d95c54920ed9ab83439cdcb03b3ac98ef070e2b6ea30711b5d14e4438960aca5ddbd7cb04d3185e48ff2424dd29b6e2c65eb8fe07229f814c94 SHA512 80134ec60d0241443c655d10a529e861138df9ac00d4d00511eec0967296bfd2caca7af916c10e140139f7f4b0a628d0083ad5266ba8c554d0ca873c821b4571
-EBUILD libpwquality-1.4.4.ebuild 2027 BLAKE2B 068ec5a5c54c82ea7582466a015f012690fc868984d6837da4ac0fd1d349fe8783fad0dfe78d6faa76c863ccf9c586e1440ea298a4df30c8ce58b2fcffe8ae12 SHA512 50a65fe49ae91174c7e8be21de08532de70173f41d2b6b510695caf4e45f7278d0b68368596ae87938247673b1f948fb996e5e893617936d1b83deac99f873a5
+EBUILD libpwquality-1.4.2.ebuild 2006 BLAKE2B 7a4a78dbfe9f5ba3c8c0067534100080c4f3fa33c0fbefe5a1eec3b4844bcad9fa16fa359c2857196ebb97434396ff3e2f10b563a5b9c97df919d6d2d6758580 SHA512 6640d72ace02066c5a9cdc3b2841d4baffbda4237e8fc048b73700443830555638941e57b8360c959e5be61647babf25aec16da38c939198e868c0453b01f15c
+EBUILD libpwquality-1.4.4.ebuild 2006 BLAKE2B 7a4a78dbfe9f5ba3c8c0067534100080c4f3fa33c0fbefe5a1eec3b4844bcad9fa16fa359c2857196ebb97434396ff3e2f10b563a5b9c97df919d6d2d6758580 SHA512 6640d72ace02066c5a9cdc3b2841d4baffbda4237e8fc048b73700443830555638941e57b8360c959e5be61647babf25aec16da38c939198e868c0453b01f15c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index b247c94e1220..c20212beb2f5 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit pam python-r1 toolchain-funcs usr-ldscript
+inherit pam python-r1 usr-ldscript
 
 DESCRIPTION="Library for password quality checking and generating random passwords"
 HOMEPAGE="https://github.com/libpwquality/libpwquality"
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
index d9354232d9e3..c20212beb2f5 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit pam python-r1 toolchain-funcs usr-ldscript
+inherit pam python-r1 usr-ldscript
 
 DESCRIPTION="Library for password quality checking and generating random passwords"
 HOMEPAGE="https://github.com/libpwquality/libpwquality"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libpy/Manifest b/dev-libs/libpy/Manifest
index 0a3a1c9cbea3..3695d0f977de 100644
--- a/dev-libs/libpy/Manifest
+++ b/dev-libs/libpy/Manifest
@@ -3,5 +3,5 @@ AUX libpy-0.2.5-no-werror.patch 286 BLAKE2B 3c623746f7d97c94eaab94c75d50cae433c6
 AUX libpy-0.2.5-permissions.patch 360 BLAKE2B dff3c4650d5779e8756dbd30a62a6105070ef97cc806f5de1de106f5f51fdf29b514601dfae8d645e51aa36a9914e77998f6a36560990f1f656048b19121db32 SHA512 6eced1f0d98a9157bc7efe540bbc3211b4e4c78cfce533d96e71f1503f07355665da0d715b1fdf4d9e0394cb624f93b817f90801a830bb091a19b85963ed86dd
 DIST gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz 862253 BLAKE2B a7d7acd2a41924d37c06e4908315d80df92815ed3e81973baf915951f2fcfeb4485ce690ba224cd7168537d81bf43b84efbecef8074dd3246a020e0877924803 SHA512 f01af7e17a3b7fb064bb5b7f1f75f0eca5e987a9976555734a88b7f7a18a763c620668da0628cb6bd1553a69b248bb0b91569b99cf873789c5b27700c25a479a
 DIST libpy-0.2.5.tar.gz 201467 BLAKE2B 629f650740a54736bc014abd63c729c11070d7d226469668386b6fe187a05b830b7ababa17e6c90777c97d2af5397cb1295712218626c837c1cc2c5526e957fc SHA512 8127bdeffdf218837928d6e5743156987cb5e3ca943ec3e84f1fb5d01c1c5fa387eca3b8c276d60d1eeb18fad7a9555bc54c113c976f1d5f23f779336dd6ed71
-EBUILD libpy-0.2.5-r1.ebuild 1242 BLAKE2B 71522afbe1cecf633fabbf3dfce074585c561ef164f60df906fccb123a9371f26f4cd520236b5c59540bbf7e10acea85672e9f25be20848c38af64cf2fd0cb6b SHA512 00a9c7efec1f04be0ad9de26e97808b8b6fdbac1124546b937133a690b26ffe368f46d4f83652f9a6966fdee93f46d5d9b8c382e6af273fc20ccc7ecfa906269
+EBUILD libpy-0.2.5-r1.ebuild 1204 BLAKE2B 1086a432c3ad94942408618117bcffca270782a3bedd9aa2fb6e020c3ed219d9c9ac4c46eb3e60feb6ce813747311b482cc724d36d06d0cb917a2339d3e0e93b SHA512 882c4aa01e500d9a1bb374fbd53a17691ec5fe5768065914b52e1a0434e7c3f5481333f77c1a8f484a9ec3b83ae1a9bfd7f5bc1dfa156821b80523996924f840
 MISC metadata.xml 354 BLAKE2B 8cb70562636ad858ca25145cf68283e660cc905aae1c67dcf39cf9e2b9a6fc332e62be9afafae1664f02ffa53319a8da75d132ba6ebf1302bd305081e020ea66 SHA512 ade47a31a8d334e3464d893021a1ef91c76e10bdf96305eeb1b0a188e24749cc8f1b462fcaf87edae4c71045b13da40c8dfe5a7ec8133737230d7922c3a3a7b6
diff --git a/dev-libs/libpy/libpy-0.2.5-r1.ebuild b/dev-libs/libpy/libpy-0.2.5-r1.ebuild
index 59090d4d18ab..521e5e711a40 100644
--- a/dev-libs/libpy/libpy-0.2.5-r1.ebuild
+++ b/dev-libs/libpy/libpy-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ PATCHES=(
 )
 
 python_test() {
-	emake GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}" test || die "Tests failed with ${EPYTHON}"
+	emake GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}" test
 }
 
 python_configure() {
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index ca78b86a5f59..ce8347a13d20 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,5 @@
 DIST libqtxdg-3.6.0.tar.xz 76028 BLAKE2B 138f0f8bf9889c7f6aa0d4016c52d4c7745a9f3b34b53babba5d0be457485157d66884395488d4e978ba953332696b977bb60c1d04b6b0a53086ab7f3b0b4492 SHA512 8574bb6834c0a44c983e906c3d84fb5cfd6e2f40ec2ac70f4998ec5fe213aeb0d4439ff294f56c1988cb9d1b311c4e074906ba66b21d24190a911d0e643d1a16
+DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
 EBUILD libqtxdg-3.6.0.ebuild 971 BLAKE2B a4471147a7ae1f92b03f04c85b65d7950f6b4f26dbc7241583eab924ff53372e588f6a0f02c54e5ad9d56f0c34424b070ee229bb584cbc54c9169c1d3ce97ac3 SHA512 5953b841cef2438a9d47c8690a18e9d80160bc6117baf3f982a7fdbe51d542ba385e88896cb9df1dcd7608f6fafe6c6df286113e79ddb74584cab155e2df48f1
+EBUILD libqtxdg-3.7.1.ebuild 1113 BLAKE2B 8ce8b2f980ace15c2eea33d1c0b52cb508a1fa437fdd16d41706d8b6437114b760391b804f19dec693df5808662c5daeb4ecee7a30315cfc419778353ff69bf3 SHA512 e7d365d49b2757673661a98a555e2a88ba3cb35eb90ecda03caee1e9be5fc59c4d93804ac4a65df85b7eef21c49db0f21a77f5b08135d7c4421329eddbe1772d
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
new file mode 100644
index 000000000000..ef6c277b7552
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature virtualx
+
+DESCRIPTION="Qt Implementation of XDG Standards"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.9.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake_src_test
+}
+
+pkg_postinst() {
+	! has_version lxqt-base/lxqt-meta && optfeature "features that require a terminal emulator" x11-terms/xterm
+}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 86808453ab6f..c4617068537d 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -9,5 +9,5 @@ EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.6.0.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
-EBUILD librdkafka-1.6.1.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
+EBUILD librdkafka-1.6.1.ebuild 1960 BLAKE2B fbecafccc3028981e5820e6e2a59d8c812135f1391b6e64d6bd4f201bdfda58dba274aa3b8aabcb33a05a4630ce947d5bfaf2ba4c39fd004116c7f1b9c6c4ba0 SHA512 7031c0242ce441df6ed5d26c6b5cd5d3d13732e6b1ef64d19e1d8a79e2c8300638d710e42b392815b3544715d5496f2286bb87be45613fccadd37239e5afe34f
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.6.1.ebuild b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
index 01faa8bf266f..34c76012da45 100644
--- a/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
@@ -78,6 +78,10 @@ src_configure() {
 }
 
 src_test() {
+	# Simulate CI so we do not fail when tests are running longer than expected,
+	# https://github.com/edenhill/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
+	local -x CI=true
+
 	emake -C tests run_local
 }
 
diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index 8b04ac9e27da..d4cd7bd20ebb 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,4 +1,4 @@
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
-EBUILD libserialport-0.1.1.ebuild 713 BLAKE2B ef09c04a80beb409d96fd7a1593bde7c2371cfdb311edf1b98ceb88530286dc81fd6bcad81f6812d4c06e7e1e9f30cbafe36580dd832aca4ca32c50263de7ab2 SHA512 70f4752b91285cd20309f73b6baaf82a56d9806f2d2c413d75cea09641fbf4a7af9d6fe030e58d64452c740c24ded511fc48b29632431822753e5386b3f2997f
-EBUILD libserialport-9999.ebuild 715 BLAKE2B 59c1b1dde6e00e100b1e5735eb3e0ad3f92db13e21a9a7f384079cf7f4fd7f456a285cce8e857594a78e8744b00766b9bfa16f0d922e38427f10b259f3a5bc82 SHA512 c155b99009a3d957cc3d26349847d0fdf988c7980175cd8e28de04318fdffb6ea12bd14aade14095d4ea4aef7b3f3a0c858a058979257614eede9ff68e171509
+EBUILD libserialport-0.1.1.ebuild 692 BLAKE2B 106bdff476945cefbbc9162856b0af9747dda3a3b3865754756f7e4ade3aaa3b79460aeaa628ca79e65e6584f093003ea40d153cc891a86ad75cbb25ca17d154 SHA512 dfbef0d6b5a7e303594c9b07298011c2b85ec66e703f9cedcec9eaf161a02d5392ff1dcea3f9289e270650d642316c39cca81e7b027e1ec18f14a3ee9760e4e7
+EBUILD libserialport-9999.ebuild 694 BLAKE2B 9671aab0c1051e374eee35100e207bf27b013e55bcc6085594d4532d474b6455b3c4bf0c575daff46d0e76aa649c9685bc254a971760f71c534b3c2aaec9c997 SHA512 32f60eaa716ea29efc044c78793a4ac34fd1dc2d2943325abb964315d5721151abefd53123028ac5d19b91fe5e4445208a160e8f5ea14681077ff9052563844d
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-libs/libserialport/libserialport-0.1.1.ebuild b/dev-libs/libserialport/libserialport-0.1.1.ebuild
index 36916226487d..b6824186f222 100644
--- a/dev-libs/libserialport/libserialport-0.1.1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1.ebuild
@@ -1,13 +1,11 @@
-# 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
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 x86"
@@ -20,13 +18,12 @@ LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
 }
 
 src_configure() {
@@ -35,5 +32,6 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libserialport/libserialport-9999.ebuild b/dev-libs/libserialport/libserialport-9999.ebuild
index cb6bd9f168a1..13181d0099a0 100644
--- a/dev-libs/libserialport/libserialport-9999.ebuild
+++ b/dev-libs/libserialport/libserialport-9999.ebuild
@@ -1,13 +1,11 @@
-# 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
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,13 +18,12 @@ LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
 }
 
 src_configure() {
@@ -35,5 +32,6 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 1eb78672a2b1..2eb30b82b927 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,12 +1,5 @@
-AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edfa8ac895a4d40187f70a3045ac12c1d808d856ad98b2a1de608663c8ca78e5640367967d5cb543cecd094833eb47376f3be SHA512 aa3b8e38ae64e8a0c833b530e1717944a3849c9396988c343e0ad71ada31362472c2013b82911333cb468aad56238b505ef1c2b45cd1866d5456a5a972011f38
-DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
-DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
-DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
 DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
 DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f36ee15eedd8d2ed0ad1b19933600d04669f9082053ba20543d2195e8833b46a2056055da23fc2ceb1784d5c96cc9 SHA512 4ec5319eda5c0809f1971044152ec7aa142742941644f43ec3944b248667d5694b97a30de8ea0e2260265bbf26a2ffdefbfa8cac5016799d26b92b02411b1c51
-EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
-EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
-EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
-EBUILD libsigc++-2.10.6.ebuild 1382 BLAKE2B bad058d50e0b8a11d95cae3e972ac83a83adf152451e7145659b8a9030e2f94521948ab91baaf3649e3fc07e6a7e63e1c5a5f06a6a5f1decfda8cd3a5be57611 SHA512 594a6d430af8168b465f0939277ad050f2f04a5f3db686caaed45114184f6ca8844433d4cbd886b9624395fb4e633ba5d658d954e2b4d7e5cfac2b058bf7216a
+EBUILD libsigc++-2.10.6.ebuild 1377 BLAKE2B a98f755e46f8b2c9c7e6618e6701be08905008bce599f3351663af2bc642c6a1e7b196a3803badfe2254380fe470ebe4ce03cea0fdae591012aa95f2674e3d7b SHA512 014c99c199e16540c482d2d02af97b6a5380b2e45c9cdfe63a122ef668eb53bd41c4e84074c1efb9bf1a5084eec348ff93caf566efa1c0c4f8f4914f8face3d4
 EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch b/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch
deleted file mode 100644
index 3b4703631909..000000000000
--- a/dev-libs/libsigc++/files/libsigc++-1.2.7-fix-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigc++/Makefile.am.orig	2010-11-27 20:40:35.301189910 +0930
-+++ sigc++/Makefile.am	2010-11-27 20:40:46.871110361 +0930
-@@ -12,7 +12,7 @@
- sigc_built_h	= bind_return.h	\
- 		  object_slot.h retype_return.h slot.h bind.h		\
- 		  class_slot.h hide.h retype.h signal.h       \
--                  method_slot.h method_slot.h
-+                  method_slot.h
- 
- built_sources	= $(sigc_built_cc) $(sigc_built_h)
- dist_sources	= $(sigc_fixed_cc) $(sigc_fixed_h)
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
deleted file mode 100644
index 25b6ed8ce022..000000000000
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools gnome2 eutils
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="sys-devel/m4"
-RDEPEND=""
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog FEATURES IDEAS README NEWS TODO"
-
-	# fixes bug #219041
-	sed -e 's:ACLOCAL_AMFLAGS = -I $(srcdir)/scripts:ACLOCAL_AMFLAGS = -I scripts:' \
-		-i Makefile.{in,am}
-
-	# fixes bug #469698
-	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' -i configure.in || die
-
-	# Fix duplicated file installation, bug #346949
-	epatch "${FILESDIR}/${P}-fix-install.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-maintainer-mode \
-		--enable-threads
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
deleted file mode 100644
index 79f39c3b14d1..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
-# Needs mm-common for eautoreconf
-
-src_prepare() {
-	# don't waste time building examples
-	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
-		Makefile.am Makefile.in || die "sed examples failed"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable static-libs static) \
-		$(use_enable test benchmark)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	use doc && dodoc -r examples
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
deleted file mode 100644
index 4a5217a1a0a4..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
-# Needs mm-common for eautoreconf
-
-src_prepare() {
-	# don't waste time building examples
-	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
-		Makefile.am Makefile.in || die "sed examples failed"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable static-libs static) \
-		$(use_enable test benchmark)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	use doc && dodoc -r examples
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
index 085db00084de..4133034c604c 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index a61acb4955cb..1d13ef40d1af 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,4 +1,8 @@
-AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
+AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
-EBUILD libsodium-1.0.18.ebuild 1345 BLAKE2B 20eacf865ae5a6179a986da2a38f5a7bdea2caa28157c5a6968965766e40b8e46c53bf02072c75d33beeb9c4e38d6282714e4e7d8f81c51d49c35b0578250769 SHA512 30e01ab0c8f062506f9e6c241220578804f72fd0039f8fab74bf852b9cde74db24fe7053e53da92d48fc3a1d4a2ae80451c3c347977a3ec59aa0849c072f814a
+DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c
+DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589de42b38a7586b4a35571eec9a0b0afd1df101467cb8f82e9a32dbdb9a25058d827a5565ad8d49ad2216d2b6af5b101612a94080 SHA512 ddb77c0608a7e6cacf1923a3d0f5950975511c46d53f6f9c23f80dd99eab84dde2a1292c1e35555f7f1659f25a1b80668516558b83c42effb921fff06c0fb559
+DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf
+EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a
+EBUILD libsodium-1.0.18_p20210421.ebuild 2601 BLAKE2B 30bd99e992c1b54bbccf7aca1a1aa8de0b0b40cb6aeb7f4459400a71e2b44c261583a78da90a30d2181a29e18a19d1c85d5d6007092d8c1fddf3a6077ff45f5a SHA512 943eea50ed848239893ad87190067ab75f2a63928feef0872da28b0583cfd50094e6bbab8982dd466860c574498c775c6fc73f274f17c7d3980334261624f120
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
index 544c283d8509..e03a703d7fae 100644
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
@@ -1,5 +1,5 @@
---- libsodium-1.0.10/configure.ac
-+++ libsodium-1.0.10/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -344,6 +344,10 @@
      [AC_MSG_RESULT(no)])
    CFLAGS="$oldcflags"
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 220e1a8d1c63..238c5c7e06f7 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+HOMEPAGE="https://libsodium.org"
+SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
 
 LICENSE="ISC"
 SLOT="0/23"
-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="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-jedisct1 )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
 )
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
new file mode 100644
index 000000000000..3afca22ee5ed
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://libsodium.org"
+
+if [[ ${PV} == *_p* ]] ; then
+	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
+	MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
+
+	# We use _pN to represent 'stable releases'
+	# These are backports from upstream to the last release branch
+	# See https://download.libsodium.org/libsodium/releases/README.html
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	# TODO: Could verify-sig.eclass support minisig? bug #783066
+	SRC_URI+=" verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )"
+
+	S="${WORKDIR}/${PN}-stable"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
+fi
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+IUSE="+asm minimal static-libs +urandom"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+IUSE+=" ${CPU_USE[@]}"
+
+if [[ ${PV} == *_p* ]] ; then
+	IUSE+=" verify-sig"
+
+	BDEPEND+=" verify-sig? ( app-crypt/minisign )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *_p* ]] ; then
+		if use verify-sig ; then
+			elog "Verifying signature using app-crypt/minisign"
+			minisign -V \
+				-P ${MINISIGN_KEY} \
+				-x "${DISTDIR}"/${P}.tar.gz.minisig \
+				-m "${DISTDIR}"/${P}.tar.gz || die "Failed to verify distfile using minisign!"
+		fi
+
+		default
+	else
+		verify-sig_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		$(use_enable cpu_flags_x86_aes aesni)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable minimal)
+		$(use_enable static-libs static)
+		$(use_enable !urandom blocking-random)
+	)
+
+	# --disable-pie is needed on x86, see bug #512734
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then
+		myeconfargs+=( --disable-pie )
+
+		# --disable-ssp is needed on musl x86
+		# TODO: Check if still needed? bug #747346
+		if use elibc_musl ; then
+			myeconfargs+=( --disable-ssp )
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 55fd0cdf270b..63b696add831 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.3-r1.ebuild 1230 BLAKE2B 1e5f6f08b13593ac30f36d4ee40d36b158e576f5ebe8ac9e9e14eeb96f76c1c8d476c51ea0c8f6204c65f6a6db84cfbd75a6e74aa6ffdcf1ae8ec0759ecc240d SHA512 a5cfd5f810bfe569ebfdb268023fde6c06286e2afa895ceb01ef7e2a3c81181873426626355adb63a0814f44b3365f5b31aec5a08018034fb4b3c5c2ac611e51
-EBUILD libspnav-0.2.3.ebuild 911 BLAKE2B 5bc75de1c7f55d63e56221fa2e0de3b468d391bf025a8d961d168792de96508dfda92019bc36eddcfcb69fbdf7b5fde085bb2d7385e01ef9e661d41308055ab0 SHA512 d7baddeca48ec813dad886a2724c1d7afb762b417a5b976fc21b6d1b386df01aaaeb76325960f7351a8e58743374e1a5dde1713463fa9dc3b04a7fcc8cdebcdc
+EBUILD libspnav-0.2.3-r1.ebuild 1221 BLAKE2B 0cee26fd75e106584926b1bb7560def4cd0f67df5a4786d66239f9af380b5d11bd9606c92903c9251609b1a41de120f6b29e7cb0fc82de86eed472bb4312fc25 SHA512 6fcde605c9c61b3f71ba9c0a6a8e6c23b18135f7db30b103da13829bf2f7e2e298d5c489a5cd94befdf9c0ed14c6eb3deaf12ac401854a533ce3a41efae7c7b4
+EBUILD libspnav-0.2.3.ebuild 902 BLAKE2B 2ad55473d8968bdb60f8524277cbb63f9f396e981a7f4325af10f2c89b827e3f732325b1cfb0723dc4f8ff8e3bc1817561cd025e37c6f7c71a178a4ce3c12c24 SHA512 673f746c05b2c3ef44452f9206b4dbbd03c28203e952228902972f380c71e8d437f58e83ad42546876dff5362c9ec041eb8bf35f28a5bbb1aca4f50ecfa92093
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
index fab23cc86475..a77335b5f705 100644
--- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN='spacenav'
 DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
diff --git a/dev-libs/libspnav/libspnav-0.2.3.ebuild b/dev-libs/libspnav/libspnav-0.2.3.ebuild
index 51c269b4b20d..094057542c4c 100644
--- a/dev-libs/libspnav/libspnav-0.2.3.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN='spacenav'
 DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 85d38923c73b..bcd02e3fa55d 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -2,5 +2,5 @@ AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286d
 AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49648c0814535c02b129e49f4d7185edac370f17e58428e180056dce31844a1accfa6503f0ebfde32c53571f0c SHA512 8f064315215fb99d7302b544b7a3da1c239bba21e8ffdc21b0bd05e496bb0ddd54ae5ed55c36b9fc0386026d007f19082d1eee95264edda1a124e9629c5093c9
 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
-EBUILD libspt-1.1-r4.ebuild 866 BLAKE2B 9cc05778431eaca782a70660f31b5b1283671eb42c77fcea4fcf9f10521b8e56b9b23098a0a2e09c4227942dac65260a63c9b44f6431d122f85c7200c37ceefe SHA512 2e71fbb8a15defc13c3af392da784c848961427d70f29db5b48936dba136a096a99b3e345852c0f3f6af2fde69cd6b96ab597cf4a079ed259fcdf074123075ad
+EBUILD libspt-1.1-r4.ebuild 863 BLAKE2B 190127e562a089f8aa7a99521365a2355c107d32b1e83f68d56e33afb968693000b18f51fac6d3d36625bc983a87ad4f3bcea3e0a88d92f2898ca63df47048b0 SHA512 61bd97bc54db832b7e4a6e7131451b94a71e25361803f3baa82a41a65daeac3ed928ca45aac39769e698f0722554a6b37c2cce9324d57bf1b7e894e997b021bb
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index 9d9b7f4ce4d4..d4af4a723188 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="suid"
 RESTRICT="test"
 
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 618f0e55cd04..dc875122985a 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,7 +2,7 @@ AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e3339
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
 DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
-EBUILD libtasn1-4.13.ebuild 1162 BLAKE2B 41bb25897af7a979dd91a4822f546677f416911d1b197e98ad5a8cafbea02d9f5b66e2c729cd405c7dbfaa8cfb2a1dfad0dd11e8bb3697e64790b784857b1874 SHA512 f8ac1964b3cd4c198efb120ceeef8f5dd1911ef84c7ed58fab179e033a92bad065aed33c5a858887b3bb21e44acc7d27df593c832f7c30f8ce80f011d7801bea
-EBUILD libtasn1-4.15.0-r1.ebuild 1281 BLAKE2B 3e900f8e02574b46bdac5e2e502598296c273b393baeb0a977cd82cb8cf2564ea489f853b96674762fe5e0490e58b0e9e0d93f285c719704a396f699fec1671f SHA512 1b807a3cac75441d00ed0ab51fa30d2a517c96059d28e8649c5f3486e9905a35f09e140f94c69ab797c51838c3b229a063f644b93f7e213e931e578bbc48f675
-EBUILD libtasn1-4.16.0.ebuild 1214 BLAKE2B 5f294af76a7d4ea0cfb1cc31fd5e1e985b7af4a11fd3e0a803eaf49bb8a4fed1d25cd2544c636ddd0c359b7eed9b3d2a742c0553b19f16f1e0c2e4ff5636c2ab SHA512 717c12a7999081b3cf508d4b0cbe99c1c3a4f40694367f31a3204ec255027043ead56644a72bec8879d53065e713fd0aa23d1b1e51432dbf97f0b2244597dfbb
+EBUILD libtasn1-4.13.ebuild 1163 BLAKE2B 4934861cc72fc43601fe3fd74a8457281b8026cb71e8b6352464c7065762d4e66050da9dfaaf816cddbd34ce4aa56c4ceb891931b5a355a1f61d0d1eace8b07a SHA512 457f57d65320f2c6844eab613026cd1e1133b70a0312b224d186cf52fbfac9e5267357b9dfff190681e40acac5a7e877bc4cb2f9fd034cc6cc2ddc1fdb2a0057
+EBUILD libtasn1-4.15.0-r1.ebuild 1273 BLAKE2B af0146a38efec40a6eaa823d595172df9ec93d88057d32e8a56e1005be8134226b4e59a033397ac2b8b2caa5c9619785acd46b83ba314bf6078cc5f8fab55922 SHA512 a184b48b49f1d7ac25fbe928c2eb7f7aecd54658e0c91875f72cee5c0dcd736789675ab7e3fe46378ca159ac10b519572f806cb238dbfe09625c7e8113a8efa2
+EBUILD libtasn1-4.16.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
 MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 33a39406d1e9..0670215fc266 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test valgrind"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
index 70c4d4906352..0dd7f7bf3a2d 100644
--- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal libtool
+inherit autotools multilib-minimal
 
 DESCRIPTION="ASN.1 library"
 HOMEPAGE="https://www.gnu.org/software/libtasn1/"
diff --git a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
index 930631602f40..208c031ba4e9 100644
--- a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test valgrind"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 2769a19e2c2d..a820535c9b1d 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,5 @@
-DIST libthreadar-1.3.0.tar.gz 440695 BLAKE2B f4f08d27f6be640e44c9a3abb564c2f1b8faf5b10ec26931a77d6de9769b456e577902c8de378d6fc420e930f20a59081e6916e2b4aeb4f083e70a1565570112 SHA512 54257ebefa0473f78510a5add0241f1282e1f135037edeecc76edd0982b6cc279592ae86e1df263327e1e090b7905ab65847ccdc2afdd366c7bac5c3097abd9e
-EBUILD libthreadar-1.3.0.ebuild 940 BLAKE2B d40987c8faf08383958d1ac697b8bb4cbc108f7621a0d44319f3f53fc0ab3d71c6e462e5c348842db43c3df1ec426b3aabde43e30849750a37081e93eb289c6e SHA512 5a0d662f7f4fe7751b278858f201ab4bb8eb7f52a9a1bc65056cdfa84061b0a736e7fe784da6d7808473974c9ae441095c34b43d8caaad74a0cd31f77a115c22
+DIST libthreadar-1.3.1.tar.gz 441062 BLAKE2B 48ab120290f93c5585c1d1d9992f80836a27bf88bf250c74bff12cad7f87dd192a706ef75fe5b8815ceb2108c20d71dd932432bf37bf6ee3f01af4c3bf935647 SHA512 6eefe4d2262a170ed04e6e9e7efaae2945b68012cfed2e4606f0d6089050f3e4059d4dca2141ae862c158f5161c5ebaaa35c3eeb431fab10263787e5b74deddf
+DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
+EBUILD libthreadar-1.3.1.ebuild 916 BLAKE2B 4671cbdf194c1d90489e063e73a9187cf0ef1c4ab3409d18e62c3ac3d4cd64702196aebebc043cb4a869b6a95468833ce3aad2b3628732e37b52ebacb2dc8a81 SHA512 230032d451e5b4250cf55c45d1f53d34cc86a67d163dd3e8a80aba67086f6bbe995f143ab6cbb469f6a8fc80c5546efeb0ae660c3ea002ff9e69fd0163904d8d
+EBUILD libthreadar-1.3.2.ebuild 916 BLAKE2B 4671cbdf194c1d90489e063e73a9187cf0ef1c4ab3409d18e62c3ac3d4cd64702196aebebc043cb4a869b6a95468833ce3aad2b3628732e37b52ebacb2dc8a81 SHA512 230032d451e5b4250cf55c45d1f53d34cc86a67d163dd3e8a80aba67086f6bbe995f143ab6cbb469f6a8fc80c5546efeb0ae660c3ea002ff9e69fd0163904d8d
 MISC metadata.xml 889 BLAKE2B 461d6b835a6e98325f56d0287e302ed14e8cf2bd8ce16a918b2e2c041e7dccd39c62ea0426fe5f5b3ea40681077582cb130d816259d6b79ad8712e9b46bbdc48 SHA512 792b25f96d0107116a0ce2d2617356796052026aba471228e3c608c665c76f5f0319e38d6da2b5d0f4547ad6e31d8b7b8a1e9424a4b03f003806e1be5517a8b2
diff --git a/dev-libs/libthreadar/libthreadar-1.3.0.ebuild b/dev-libs/libthreadar/libthreadar-1.3.1.ebuild
index 8d535391c7a5..7ba08a0fde3f 100644
--- a/dev-libs/libthreadar/libthreadar-1.3.0.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
@@ -23,9 +23,7 @@ src_configure() {
 	# Do _not_ use $(use_enable) until you have verified that the
 	# logic has been fixed by upstream.
 
-	local myconf=( --disable-static )
-
-	econf "${myconf[@]}"
+	econf --disable-static
 }
 
 src_install() {
diff --git a/dev-libs/libthreadar/libthreadar-1.3.2.ebuild b/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
new file mode 100644
index 000000000000..7ba08a0fde3f
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+	# Copy this comment from app-backup/dar as it applies here too
+	#
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+
+	econf --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 5321bbb7da3a..47ca5dc18052 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,4 +1,4 @@
-AUX libtomcrypt-1.18.2-slibtool.patch 2859 BLAKE2B 2af276b50dd627a7dab88b6d349c908a32b364b0cbf199d14ca43019a65c4ac47ec16f8498c22e27454ce0144286502253fe3434cade6a614c7f9162d99fb20c SHA512 f6c5a802a581971b309815f82416c649a388e853c143f849bf89478ca4b9d883b3ab426c4ab5bbd94b5748d5b466f6ec56336c18959ca1c3ef5396b5be8d2da0
+AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
 EBUILD libtomcrypt-1.18.2-r2.ebuild 2948 BLAKE2B 6621119cf52e105c1fc2bb8d25558cda5e4411f7d06e9844bd7d2bb59f2799c50bd2c82f3642df701dcedef41d78bf9de8d218a124ca01a659cb34f1e946eb26 SHA512 00353d27023436f1d4154a6179ce17d74a1d5f342cfd58ff8bc4109c7841c97bbaa52106b5c337c0ac9000f25a4e6d0335653e0764c63ffe6ea165be2cb21953
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
index 5c7bcda502c3..b783ed1d2440 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
@@ -1,4 +1,6 @@
 https://github.com/libtom/libtomcrypt/pull/433
+(and then https://github.com/libtom/libtomcrypt/commit/4b3ef7890156a55889b6657e4b295a77907c1f0f)
+
 https://bugs.gentoo.org/777084
 
 From ccc18b9eda52c31cc70a3e46eb33b87b3c076d65 Mon Sep 17 00:00:00 2001
@@ -70,3 +72,46 @@ index 98ec2b501..c72f2ac8d 100644
  endef
  
  $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
+From 4b3ef7890156a55889b6657e4b295a77907c1f0f Mon Sep 17 00:00:00 2001
+From: Steffen Jaeckel <s@jaeckel.eu>
+Date: Mon, 3 Jun 2019 09:32:06 +0200
+Subject: [PATCH] TGTLIBTOOL wasn't always defined
+
+---
+ makefile.shared | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/makefile.shared b/makefile.shared
+index c72f2ac8d..e63d77032 100644
+--- a/makefile.shared
++++ b/makefile.shared
+@@ -18,19 +18,22 @@ PLATFORM := $(shell uname | sed -e 's/_.*//')
+ 
+ ifeq ($(LIBTOOL),rlibtool)
+   TGTLIBTOOL:=slibtool-shared
+-endif
+-
+-ifndef LIBTOOL
+-  ifeq ($(PLATFORM), Darwin)
+-    LIBTOOL:=glibtool
++else
++  ifndef LIBTOOL
++    ifeq ($(PLATFORM), Darwin)
++      TGTLIBTOOL:=glibtool
++    else
++      TGTLIBTOOL:=libtool
++    endif
+   else
+-    LIBTOOL:=libtool
++    TGTLIBTOOL=$(LIBTOOL)
+   endif
+-  TGTLIBTOOL=$(LIBTOOL)
+ endif
++
+ ifeq ($(PLATFORM), CYGWIN)
+   NO_UNDEFINED:=-no-undefined
+ endif
++
+ LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
+ INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
+ UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index d7ed3b32f623..8ce5df8cff49 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
-EBUILD libtommath-1.2.0.ebuild 1833 BLAKE2B 2eff38293dc8f9d275c6d2a8f17daf12d8033aa6c4b6199ce9df037e18bf546fee34c76156c116da0c29ca47100e9979ea3ede861beb556d454a8ea1e34ef74f SHA512 c484330dfe95bbbda9551f241017f20643769878acbaf22c5f5b4a72105a26ba5471cb681976bec61f545b8404a8c4822379934ac8e93d302dbac744e85e98cc
+EBUILD libtommath-1.2.0.ebuild 1834 BLAKE2B 2ccac0b08ab3533e2f168d8a89b9f7a5fa094738aef9275eb3276cf909e75c503df6b1f490de4677c6bbef1bf7298a5b69124ed8222c826d54ff25bd463a6644 SHA512 cf92f7c22625ce6367fd0164f945344689736f298da7c9447f0c332d0acda3addb9722165bf67bb43a515ea9a3fc07e5a5615ecea656529a635f2b4e23949ab2
 MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f
diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild
index 98ca746cc7d9..401c2d508d60 100644
--- a/dev-libs/libtommath/libtommath-1.2.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples static-libs"
 
 BDEPEND="sys-devel/libtool"
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index ca93a396357a..fbbd1cd6fbf8 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
 AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
 DIST libtpms-0.8.2.tar.gz 1253915 BLAKE2B 48281512f2611376f0f3a67a2646fdc406c2d28bfd560a07b23c122a1b4d68c2840c5cd23f41beae4a13eab419e722aed821cecd919ae6219da325724d55e3b3 SHA512 635f1b30265f1752602caefa1fa87f0032e4d38f1b7113137b7e25a85da10e34f89f9d928b960660e9451306807f111ed96c2a11cbb2de4fb4beb7e638f83727
 EBUILD libtpms-0.8.2.ebuild 1253 BLAKE2B df095e423e0020bd75c7507eb49802b077747ee619ff001664905f70f41540fdf93fb485c2cc4095ef77ae5253423bcb07913ce7b4332d2360fef35d29abb305 SHA512 96b9caf1d2c761f93a98926a16edd6be5ec828d4c45142bb1c9bf3de878203af9ef9e952edf405b9864c3ec2f4e041b7e8351ac9875760e7fa5758dc4009a69b
-MISC metadata.xml 399 BLAKE2B d3c2e40efe608d0831d27d53513a7d32564f16af81293284d17c5620f6be10ad4d2cb7192ff7eac4e7a3e64570e0a12c753b04e6d356e203b9081efca779169c SHA512 cef8835ec1f1c5fec60891f10807ab9687078b75380da019142fd02b878db4e73928155749ed9c7128f57ea907814f81d14e0340c79f4719b0b56b8b77bbe45d
+MISC metadata.xml 403 BLAKE2B 4814e5c482ca758a1dabe326fd8a25fbe32554dbc1f68c4fe0b4db76ae1db086a31d256d8c015884fa6b811e495862a559fe3cdd08ffff7b35def3099769f40d SHA512 f0c7f037abbe22a17b86ae160ddd5c703051b10ec53bea2bf9f2aa6efdaf50bdb8fc2eb1ed7caa47bd2d7dc3276d8d0212dece07184c4fc2daa8793d1592e50c
diff --git a/dev-libs/libtpms/metadata.xml b/dev-libs/libtpms/metadata.xml
index f2b95e147157..69ca4c8149b6 100644
--- a/dev-libs/libtpms/metadata.xml
+++ b/dev-libs/libtpms/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
-		<name>Salah Coronya</name>
+		<name>Christopher Byrne</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index 72b528abd7b8..8acfba8466b2 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -1,6 +1,8 @@
 DIST libudfread-1.1.0.tar.gz 33506 BLAKE2B e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e SHA512 340a03fe90d26a8a5c78e1e4f558a0b448a14332a661494f44af7de3e6c98cd219125e19f69d2a611ecb4870648a5d5b55d794e665eb8ec4192c0b499a0701ed
 DIST libudfread-1.1.1.tar.gz 33546 BLAKE2B 2a9781d2db569ca5787b0fa27b75b790d21b78454727f7377fde511abe2426912d44fd14fc6954b59e8a6b152a1f4ca95dc0b4759cc7472490f42c0158e1f418 SHA512 7c7a4553f2cea82a4496799376380ba75285b82cdf37e701d28d723d760e936b7e625223cd162bccc5c65aca3ef721c6af839bd4c75928237cb3c77eaaeb23db
+DIST libudfread-1.1.2.tar.gz 33744 BLAKE2B 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61 SHA512 3069feb5db40288beb5b112b285186162a704f0fdd3cf67a17fd4eeea015f2cfcfbb455b7aa7c3d79d00fd095a3fd11cffc7b121dce94d99c3b06a509a8977d2
 EBUILD libudfread-1.1.0.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
-EBUILD libudfread-1.1.1.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
+EBUILD libudfread-1.1.1.ebuild 810 BLAKE2B f49028a3629713c2b30adc41b2d3a0077d8e2d04d929ddf3fd63eb92e55af7bc90c27953d4746dc2315121490086091cf520fb0b4095798834ec4a9613c83d5f SHA512 521ee13434baae3b1f6211980f27a99d64aa2f033251239ca8c156c38d3acafc47464f600b7327e6dc560d36f4b0312bbefffcbe5211768410982b00e58dccba
+EBUILD libudfread-1.1.2.ebuild 830 BLAKE2B d5828d070d851547b349e1310cf41e687b85c9fb58e7fbc074446c1da887e1219a24d62c5c0d367d0224a81880d2ef4a436586f88d0760ab61719dad63cd421d SHA512 fd98a3ad4f49d38f286e17094358c38bb3f557e2a56d13cfe43cb86bce5d251b47c349fd444379a50f6f31d82f207b737b56447db7fe1c382888dfa62b1c3c5a
 EBUILD libudfread-9999.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.1.1.ebuild b/dev-libs/libudfread/libudfread-1.1.1.ebuild
index f4fb055b98c6..929ecb363fe2 100644
--- a/dev-libs/libudfread/libudfread-1.1.1.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libudfread/libudfread-1.1.2.ebuild b/dev-libs/libudfread/libudfread-1.1.2.ebuild
new file mode 100644
index 000000000000..53cb73f5648b
--- /dev/null
+++ b/dev-libs/libudfread/libudfread-1.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library for reading UDF from raw devices and image files"
+HOMEPAGE="https://code.videolan.org/videolan/libudfread/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 392b37a1aa88..f270a1548baf 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -3,7 +3,7 @@ DIST libunibreak-4.1.tar.gz 642497 BLAKE2B 79a09cc19e72bcf98605f3c49649c2d075377
 DIST libunibreak-4.2-1.tar.gz 643399 BLAKE2B 620e904113730078a8e74a09594b9e18c63768a926df433b4a251767fd492ae11c0954e97a4d94db577956a621f075bc6743535bdc67f9c5151243f304b33bf4 SHA512 26bbff1203dde9ffdc2b9046727ab7698f5693c1eb898c819ee83d0c97fbfd32b9dc7c4406dea29fff6642b2678fee74a1307aa5c9c3279f65484eb080ae1e2d
 DIST libunibreak-4.3.tar.gz 639886 BLAKE2B ec044b659f1a837b4e6627067b96a6f19ee8302602d635e1e32aab9533486b5cd063aa99114c6443ede9d76d3f382d7492eac8b52b84a4baa2ccd9c2129e79d8 SHA512 4b53fd169912033403b6ca09047b7b928211fab3607ef26070ab731054138b9a291f7d138d3a479f9cde8edb0fabf8da114da68aee32e60cddf45cc3baae1170
 EBUILD libunibreak-4.0.ebuild 1271 BLAKE2B c5f7d7a51ea9c2b7ff881ba8fcd0381f6f35671d6758ab17486d0311cd29d686fbb78ccc23190aa3952fb84fc45c6a4646cc8dce57670df40eeb7967a1c23000 SHA512 d47e18f51abc0f7497dfc97ed4cc81a3ef9b33c106687cc94d4954fb3987089cb37a0958d79ccc239b8fcaead0cfb32ccdf42b299ec292b532f09c1dd6438c66
-EBUILD libunibreak-4.1.ebuild 1232 BLAKE2B 47504972e021c99175e799f3a306ba130c031da7b92be3f31aa0138d98efffe6cfdd7609027f989bc7cf278e64bc457efca0bff9b3580a802f921c69ed04852f SHA512 68b7674d00f517183383124702a51de40ce2f0d06992f29e1965e0cb55c74444ed8ef6b4c268839cd7a0ab123d47ce878adcb4fdb7a4816ef1d646abeb82af27
-EBUILD libunibreak-4.2.ebuild 1233 BLAKE2B b85936fcba3579d376ea3ff9657a1d64460cce6e9d26a8d8f6c7ea3e5edc52575f56ae25cbcbe1816df4baa40d56d605cef07c57e278c8b980b0fa899f3f7f0a SHA512 d2b80e682602a2fb8daccaf15a873db4352307825ab9ded6d88e8013ae62c9bbf8d9bb7fa2931fc294b7efcfd03701acde2f2efbd390f2b6ff4b21b72e031ada
-EBUILD libunibreak-4.3.ebuild 1196 BLAKE2B fc79f3c2fab1c8d9788932a5e561a5a020512351a089e5b7d8c60d8e6751ede0abcd4b0dfe1e42ceec9f60488e24df0d99a91fac0358ba85cc1a7b0908b33712 SHA512 808611b6e37b739ed80ad42988c9a9f6ac8c0dbbec48bd209037a90d57d1c3283a2b964d58c95b2e1f35d306a2b480589b26865489afb1d648813b15deb3c338
+EBUILD libunibreak-4.1.ebuild 1230 BLAKE2B 20da26006ff9d4aabd415c0be02fdac518647421d40a7d8b5cc3e23e536d4c0326106cf8fff84d45060b17548825f31d05469362dae29bc133d6ce95cf657368 SHA512 e73b879b0b7792fdf74efa2155bdd59f1dc0402f8c015f47fca55a8e8635fe0e13d968c8e564418259732abcb82b9b1b5486a827eaeeb3e07af0128273bb488f
+EBUILD libunibreak-4.2.ebuild 1234 BLAKE2B 510ae17cef0028a398174b3a905bd30a2658cf431aaac7d0d4fac001750613c1f9afbf52d3b7de5baa487fe60b4bc87274689e50f5171e23ae36de99eb81c1b0 SHA512 05662c0d806159fc8d04f338d56ec6927c13926d518e3784c74e3d02dac13a2ba9a7bf4eb5f3cc407ed2b1a207cecb824fe5d69d86a3b3e5f2632187454bce21
+EBUILD libunibreak-4.3.ebuild 1197 BLAKE2B b2acb5779e56d5cfa2b343b3dc44b02bc655d825a5e4f65a4f52e354b069374ecf53067944f19f8d2e505abf004819fed97d30877893070542b063806a4ba891 SHA512 8f41bb2001e031b33ca9299abde2598bea6600b20fc6b6015b9adcb08d0940d7a15ed83c26cf995511a87e7723be4a36ffd5ec980d69bcbcb90e08d4bb28dc9d
 MISC metadata.xml 555 BLAKE2B eb162dde2c8d6c9d3e5098ab2c7c983c5907345de68e067a09b820f1b430980502bad3c0271b59b0a971556bb7212868471b6d31c7aefc8d75d0b569b6de64e1 SHA512 44d76eef672e931f6d5b76d667af5f667cda9f8d15cad07ab7ac97fb785a34b7af21ba735ef692571e8a1364aab3b98dde787566f7db3eb2b4442924ebebe8d8
diff --git a/dev-libs/libunibreak/libunibreak-4.1.ebuild b/dev-libs/libunibreak/libunibreak-4.1.ebuild
index 132e80d6701c..ad178e53f0e2 100644
--- a/dev-libs/libunibreak/libunibreak-4.1.ebuild
+++ b/dev-libs/libunibreak/libunibreak-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="doc +man static-libs"
 # Tests require internet access to www.unicode.org
 RESTRICT="test"
 
-DEPEND="man? ( app-doc/doxygen )"
+BDEPEND="man? ( app-doc/doxygen )"
 RDEPEND="!dev-libs/liblinebreak"
 
 src_prepare() {
diff --git a/dev-libs/libunibreak/libunibreak-4.2.ebuild b/dev-libs/libunibreak/libunibreak-4.2.ebuild
index cf949d1c77a3..96cc401c5b2d 100644
--- a/dev-libs/libunibreak/libunibreak-4.2.ebuild
+++ b/dev-libs/libunibreak/libunibreak-4.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
@@ -15,7 +15,7 @@ IUSE="doc +man static-libs"
 # Tests require internet access to www.unicode.org
 RESTRICT="test"
 
-DEPEND="man? ( app-doc/doxygen )"
+BDEPEND="man? ( app-doc/doxygen )"
 RDEPEND="!dev-libs/liblinebreak"
 
 src_prepare() {
diff --git a/dev-libs/libunibreak/libunibreak-4.3.ebuild b/dev-libs/libunibreak/libunibreak-4.3.ebuild
index 80d0efb7d58f..f4466edceb68 100644
--- a/dev-libs/libunibreak/libunibreak-4.3.ebuild
+++ b/dev-libs/libunibreak/libunibreak-4.3.ebuild
@@ -15,7 +15,7 @@ IUSE="doc +man static-libs"
 # Tests require internet access to www.unicode.org
 RESTRICT="test"
 
-DEPEND="man? ( app-doc/doxygen )"
+BDEPEND="man? ( app-doc/doxygen )"
 
 src_prepare() {
 	if use man; then
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index eeb55d91a38b..29d043ee608a 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,4 +1,4 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libunistring-0.9.10-r1.ebuild 1001 BLAKE2B ed9d0bf1519676081ff0865427b23df5dfce37e864717b63a99582650817ce583a5e8562404a8fa9cc80738f18647dce4d868ca9060718640773c7a7e8332c35 SHA512 2cb5a118ee0b1bb80b874ee6a89a00b3e847934a4e53e80119cd198ad3eac5e04581e0c0e943d1fe76f6012c92d4f3c001742a6056e4e0e832a4cac5822ff027
+EBUILD libunistring-0.9.10-r1.ebuild 1002 BLAKE2B 463f36f34659e0f7ab85ac360c5e5f610a9203433088f0cb59e96bb77f9cf63395a2f33c90ffe6de39fb51d55c9eb199e2c19f910c396b811c78ed5bd42b43b4 SHA512 a14c66dc168c74bf5a176fe60efaacee3798d4d297c3301166b5e408a5cfb735554e233b80219fd17e50e869d3823d07d1450b18b98dd8b31d077bee33480c55
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
index 521b7e2ce71b..7c569f145a3c 100644
--- a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 89c00f54c148..192df4d666f5 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1132 BLAKE2B 9fafaddbd587bbe0f41e2a392ca97a1a3623d44e7c4742d08e03576b2d72ee58afc782cdf4a1211b0de39ec6e74cf8605e5fabcd11fd22047c2873e0f882b5bf SHA512 098be72cfcf6333c2a873c78d2d6ae522b1e698102b39f14ec9c2f86989f98282a0df35d91db13eb5e667ae8c1cf5fbcdec65ebc06168bc309f029e4c0c2fae4
-EBUILD libusb-compat-0.1.5-r3.ebuild 1191 BLAKE2B b1e57370c6937f442ef810018746ec2a94f045fd309d12d55b083c4680e5f3a5bb3499daae5b7724ca2f324e052c7da1143e753ec9d54f147a660594531cafdf SHA512 cf1eb2f353e9717f5cf6cdf85e0a4b48edea524598b28feecaf2a7840e415e5ae168d992fbe859787cf758bd8b5ac9a302ed066aad902477ef6597f196b40ffe
+EBUILD libusb-compat-0.1.5-r2.ebuild 1119 BLAKE2B cac1767551107388bcaec8f195c2f27004b4f3595b6f3a5c26cca94408d0277e49135376b6fd47d299b0a527cccd635aa365c6fb9752895f0188e1cae5d33e2d SHA512 1a289d196dcbaa89e071c853d46d2835211bc9d998112b6a1c4a6cc7a84451b84f5d61109c0ff0826e6621e84bc2e3913306799396dbe0f1522793a23b9abd76
+EBUILD libusb-compat-0.1.5-r3.ebuild 1177 BLAKE2B 9a9d3b358b9000a7df31e80c0aab1fb6027deff8591ed56cd05c7cefec7872cd02c1a84397757a36cd6ed73af5bc72839ff55e57f3300b602c2999c9c60e8e67 SHA512 396e8acf2f2e509ea48fc6781d18561e2bdf1b09618a65f28c8431d2ddd2ca6e7c070cf0c2d923c35accc4e8348cc98cd894d1955a78160ac100921c1ec6d78a
 MISC metadata.xml 333 BLAKE2B ee2452df6eb77285ba7e918f882c543d413656aaf0a199ac369ef60d25b8790fa37e320101f9645d5042ed04826e00922d5d38752b31492deda2cc78e7c41b49 SHA512 10f5333485c01d415c73f195e22785a9584d9dcf9662317605d9c6f14507863be5769457d2080137d31ad79fd0e825b9f02ec4160c40a5347591726843148705
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index ffe991fdd59a..bb832fd04764 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
@@ -26,7 +26,7 @@ PATCHES=(
 )
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug debug-log)
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 8965a1761566..8dcfb5c2424b 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -30,7 +30,7 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug debug-log)
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index e8de448464bd..b2712666e3ae 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,6 +1,6 @@
 AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
 DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
 DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
-EBUILD libusb-1.0.23-r1.ebuild 1613 BLAKE2B 89401653b8c15aab27b6831fb790a86fc9262a5af85107b8258578759ca623a7cf566e4d291ed25aee353e2c6b8a4596f7c76e79fe87418130faeb0e206b61f6 SHA512 44f76fe0654bc228fef08ac8369c2fb1dac14b846e77854c3ea534266869d6cf3337541fb1dcb1b78a5baa39943b458e915955ab38ecc187236683bee572853c
-EBUILD libusb-1.0.24-r1.ebuild 1636 BLAKE2B 64b78e7153cc4d3fe9b78d935591c89f44c5cde20ece7dc0dd8bd85b140808b7b9497e6ab8c9869c0e10f0d4030f40d6a351c425f97d7b1dd4109e0dcddeaa41 SHA512 20235a64aa3098965c47cb1b95515dfad1039c99c252e4d0e177c7f5f543fb7069845c5637cda669f1a67dfcec459e0465c4e6739993890a9bdd34e90ecb5b53
+EBUILD libusb-1.0.23-r1.ebuild 1597 BLAKE2B 05b9fb4d16f65f021d12b7fd1b80fda65daea7c235901df41ae34ea8daad6e8bbf83adf5b60dcacbfe8381b16c3ceccd1fb14dd84963f14f20efa1c60eb07bc4 SHA512 bc52490ef3e10480be59c05023dced2e4ce4f7587af2b7257d5fec93dc791163bfd0bfd6dff12ed6b1799ab34b2de17428955bd47a755feafffef35dc3e0ab56
+EBUILD libusb-1.0.24-r1.ebuild 1612 BLAKE2B 8a3c2959232ec0eb9b550f54ae1740f4fabd773d8ac16f1358e711218871827df88834279a16c26a0a2fa23a6137cf78bbfe250d9111e741a84f212b7874aaa0 SHA512 a12a0d4b510c097c1a818f01e504d32813db4fd1ba05844b56c1127d24d43ca02ba38d61385d21d4a7e87fd9732d720e63e3a963310d1e451117fbadd590d47e
 MISC metadata.xml 335 BLAKE2B 8d1673cd194774a9e68e0f7458cceae03774fc5601925758a96406da4c41e9a399e42117b31b2dd23bdaf8626bfad3deb3c0a6c9b8af882aa3b4724a5bf017cd SHA512 e1040f513f81c769094c6b10e3b9bc4a64b55d281d9d97c8f3d33f1e95681b4f85070fb9731567629636b83243420320d63afba64ec7541c605f91d693f76ce0
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index 15919c6c0a3a..ac3237f1c821 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
diff --git a/dev-libs/libusb/libusb-1.0.24-r1.ebuild b/dev-libs/libusb/libusb-1.0.24-r1.ebuild
index c234dc18fd80..d12a5876b22b 100644
--- a/dev-libs/libusb/libusb-1.0.24-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.24-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 2c7937748749..ec9c0743e6bc 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,12 +1,10 @@
 AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
-DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
 DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
 DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
 DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
-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 1421 BLAKE2B 2181d7b0fb6e532bf5699d855c4c6d7035c352c3110a8498dc64e0655e28b577c8d5c8e7b4a5cc6c501685b80ae6255b40d7c491e585032287a6d177785859ad SHA512 dff03a28363082c6b2b1441ef4bfa6bb1f86b97aabd68d40378e4ced3cfd6dab87684e4f42bf23218829b71321d286f8b4278cbd5bb2ca24ad8861ffead572dd
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
deleted file mode 100644
index 79c37a8b69eb..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_P="${P/_p/-}"
-
-DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-util/netsurf-buildsystem"
-S="${WORKDIR}/${MY_P}"
-
-_emake() {
-	source "${EPREFIX}"/usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared "${@}"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index fd2e1ddc83e4..0b082f3556b1 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,4 +1,4 @@
 DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
-EBUILD libuv-1.40.0.ebuild 1701 BLAKE2B bfbbed39189e52b44fb4d78756f153301e560cc1ec46f7c0bff212a2887228bc518307c8fe16e7bc65792129427dea87b79d37e16f11eabee62ee6b646d77f19 SHA512 953a0078cf5c97f43f548fec0f338f0d71362ba9607953d6d559f5fdde276cb6f547cee89f025d5bb078cd15dcd3667dd2c22b298f66ece4f0ec91880a942c2e
+EBUILD libuv-1.40.0.ebuild 1702 BLAKE2B 3a8c32240dffaf200cde5cea866934965106d3dfcd56b330d8f346e2b317d87a3dad03511ae954f93e3548c5baf9d707a40fd25347768b9125e55084f108d4ba SHA512 147a8e3ad48b3dbea5da4b635cc472d5f85b4ee3deb2405bef38712a3d9a124f4f9b6576a3a973905e665735229a84d7af06741e4713cdf77564bfeb5a9a8e26
 EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
 MISC metadata.xml 1317 BLAKE2B dfa271e354ff7c8fb44eb02c8513f9069ff97f409caba0e171a598625732561e41208c61b1cd923f0d920cb7f91b982520c35f2306743b259b51c92247735e64 SHA512 43c3692fd4f7d9ab1e92bd6318782135e6e359c01da018525882f0ccd368814787203e0fedf650a48e3d57bff7f59d3d8418a7d2f72eb3ee061da7b5fb74d67b
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
index fe965cd36cfa..74d8000909c1 100644
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 3277432f7375..91844d18419a 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,4 +1,4 @@
 AUX libverto-0.3.1-non-bash.patch 5519 BLAKE2B a829048133f79a2eb954bba3f094233f187623f87d994b79d75fb768e392ce5428e86fe6f693a9b98d18ad5dabb0e73f83275a8adcb1b5e51ed0f3c305f220bf SHA512 c1c4f9a33a5d7795f30ce0c225bf7e64e313a17f3f6718c292da9b3f9ce009730eeb6ce70e7730d8bd466e5aa67f8b3ffded61617e7f6f661b19adbf1aa218ef
 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
-EBUILD libverto-0.3.1-r1.ebuild 1549 BLAKE2B cc7e3720382409599ef8c54a141eefd5c5d1b13e65f6f2c05af7784c0176db744f192015441b00096aa8a205fb88bccb2ccadf94e395989cc0378412a927d3fd SHA512 73b578432bce57e95b03cf126664a19a1ac0b36cbfe02138ee63a67d90830c5b633cd7550b4b61067f674416579d8817d069d1b4c37e288c1208a49f75c2c2a7
+EBUILD libverto-0.3.1-r1.ebuild 1550 BLAKE2B f4cd26c8231b8d784824e604762bfa5dad91ad833fe15991a208e524a4b9e6e377491357d5d6e4e711225a6427a081cf757c8871317157b8e9c3b5125f122a87 SHA512 fd1eb18bffd0e16431241486c9f1a22b738c704591b889afc76ec7fa86d40d2d664e77bf5a9164bf7a77b76c402e166f3fcba84fcd5b4c05021c9006cf51461c
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.3.1-r1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
index 6964058d33d5..298ede94f7a8 100644
--- a/dev-libs/libverto/libverto-0.3.1-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 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="glib +libev libevent tevent +threads static-libs"
 REQUIRED_USE="|| ( glib libev libevent tevent ) "
 
diff --git a/dev-libs/libvformat/Manifest b/dev-libs/libvformat/Manifest
index 22698f4defd1..f7ffc5154275 100644
--- a/dev-libs/libvformat/Manifest
+++ b/dev-libs/libvformat/Manifest
@@ -1,7 +1,7 @@
 AUX libvformat-1.13-has_unistd.patch 216 BLAKE2B 088a3394b55a96f4d744f5c8f5b482dcbf6bbaedb6770ad6255b3dfa78bc16bb2bbb11774dc3799d77328b08e45d638b5676d3b174fa7c1d8c1974364a748200 SHA512 3a953942b2d19e6296bf55ed13175527a5def938209b55db646460b1c50be43e5fae1a0b7a68d7adb1946178bd21df5f260f07876160ce02887c168fba5fde88
 AUX libvformat-1.13-str.patch 561 BLAKE2B e914d003a99449eb3c1b85c7385cae24eb4aea73962d30d3ea05667f583a1f0c2d9214e75837647193adb8038c789d00e410dfe26fcd66bf1aae197d2382fd02 SHA512 f34c993ad54cfc87505147cb9023807cff08c8c6b70630f1110f6bb20c5054f749ebf0f473c56be62dc9a5034903df2659416742bb5a9e40b300e65e15df45c9
-AUX libvformat-nodoc.patch 225 BLAKE2B 52c6e0487043ed5be2bcef3bd15fb9d325a2e468e752fc90e7b09564420bd2ed6c7fb15557e28e9e6c960851073177141e24bfc46139e3e9db231c1e26c705bf SHA512 92d1478c8c452c2de5780dada50d716f612a944ead5cf5d803d277d549ef83d6ece7339a051b8764a97132dc1f34514027db095f1325be40ae97bc3ac7e1c0ca
+AUX libvformat-nodoc.patch 152 BLAKE2B 16afe084a8a90f440c30904a8f85838eebff9ea5e622bff011d35917863e9f07cd9d1fd00a569f0d7bad198834cbb1c8812082f9247540af9ecab06b7e35ec64 SHA512 d84c718cc3e4677c70cec6e460a016cdee41f03f8c6c99dd915f22024ec4d1260c2962ab1447562405408b015879a3db6aa34218a78334c1515509472456632d
 DIST libvformat_1.13-10.debian.tar.gz 25884 BLAKE2B 73f2ef1126dcf51ef1d8128a74b131e6ed67b8a83c4a7db2d142942bd3f4748d0925f4bdd09633f4be47260d035066d0f730bd7680ebd4b9721bc0416e61d823 SHA512 fd3635a697cf52215a024118dd5e7776829ec2e537a6795121361046588be23f00225fafc50e14e25e94e94659bb16d7830193b159925c63ff2e0644394b3626
 DIST libvformat_1.13.orig.tar.gz 254463 BLAKE2B ee7d7bf9585e670ed3f6999d002669072535ce7c2c474b1f86d80026ea4bf6852a5c000a45a03b881e6d15695bd3162c132864ccb4f7cc574207209ea3a6c579 SHA512 80b47897dd4f5dfa05e78a40de821406a007e330fc82584a0d26e2d1580a5ce52b6af90ecd4c0f7f36eaf00d6a78d9ba3b84ec2b7c7d814ba890a629d7a2c7ba
-EBUILD libvformat-1.13-r2.ebuild 829 BLAKE2B d9d94271dbbb3f49d86fecc9cc531234a25c0dccb5a8ad1b0975066e177461f7acbf3d368fe2c641440c32568c50b0b5d4aa1ae417fe216244d51c840f17aafb SHA512 01acd17b03b81d922b205de58044ddedbecabc8e56d5f6db9afaaf9a1ce899e678a7a1d5992a92d8364252c0ba47c40a460082d837da3bacfa422ddd4d53e0d0
+EBUILD libvformat-1.13-r2.ebuild 792 BLAKE2B a328991fedb8f70c1f160b30bf96f1cf5ee8287c0b9e3e070fc5d096779ad0fd7ec6663d7f73482981a60f5abb387590bc7782e8aa86a98f7013034fa1e6c4ba SHA512 0e02a6e9fc678ca2ba52f47c103c70a417ced2e1c5f698e5ac72a1aef653574d174b7169e4c71859670558710e467d863f976524b74704a0b2701aa74668f8fd
 MISC metadata.xml 244 BLAKE2B 86616d2746ad8e10c8fec5f671a9b222cf1beaa800872b7d844082b915997eddf7c3791a5de227e0d23e7af580149a86e3b5bb50dbfb4ee8cdb070778182f1e3 SHA512 3d993814c475475ebc27bf08f0695a156d5a3380d23f4b3c782304ae2cceb7d5c4d0695ee07451abffb516ce5237b889bb8daceb70912d94653572698f0332a4
diff --git a/dev-libs/libvformat/files/libvformat-nodoc.patch b/dev-libs/libvformat/files/libvformat-nodoc.patch
index e9dd55ce25ef..cba04e1e569d 100644
--- a/dev-libs/libvformat/files/libvformat-nodoc.patch
+++ b/dev-libs/libvformat/files/libvformat-nodoc.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2005-08-12 13:36:39.000000000 +0200
-+++ Makefile.am	2005-08-12 13:36:57.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = src vformat test doc
 +SUBDIRS = src vformat 
diff --git a/dev-libs/libvformat/libvformat-1.13-r2.ebuild b/dev-libs/libvformat/libvformat-1.13-r2.ebuild
index 22f1d04278fc..323b1ec0b2de 100644
--- a/dev-libs/libvformat/libvformat-1.13-r2.ebuild
+++ b/dev-libs/libvformat/libvformat-1.13-r2.ebuild
@@ -1,8 +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
-inherit eutils autotools ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Library to read and write vcard files"
 HOMEPAGE="https://sourceforge.net/projects/vformat/"
@@ -10,29 +11,30 @@ SRC_URI="
 	mirror://debian/pool/main/libv/${PN}/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/libv/${PN}/${PN}_${PV}-10.debian.tar.gz
 "
+S="${WORKDIR}/${P}.orig"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${P}.orig"
 
 src_prepare() {
-	epatch \
+	eapply \
 		"${WORKDIR}"/debian/patches/*.patch \
 		"${FILESDIR}"/${PN}-nodoc.patch \
 		"${FILESDIR}"/${P}-has_unistd.patch \
 		"${FILESDIR}"/${P}-str.patch
 
+	default
+
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 795c6e964757..4c146a706b80 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,8 +1,5 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
 DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
-DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
-DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
-EBUILD libvoikko-4.3.1.ebuild 1246 BLAKE2B 48e3376a16b900f9313aebac627bb2c94a34841cbc9c8c86b73d4346e9b8677e277c4c1b248365644ef93f4d9075821ac5d497f908d3299ccda8bffa46187cff SHA512 6e0fb734888ca763517f376886ffc255d6b4813c66c8dd4037d97e890153a296c8fbf684aa99be98d68945f7e2d37f685e25f913f9aaa795149f03712c25a444
-EBUILD libvoikko-4.3.ebuild 1235 BLAKE2B 3887dfa49f9c0bc1d62a52e4c38dcee8b64131538f3687ca6722036de2cfaa4233507a3a36f375660ac7693fd8760f3c354584002412b90987ad1eca3a3e1de4 SHA512 112c5a28dad525cda883157251dfe3bead401c834ac49c7ef7ced715d585432f8896bfc544654d01e17ea55fa7de34d00ad13ab994e2778e5fc6f4f9da58ea95
+EBUILD libvoikko-4.3.1.ebuild 1244 BLAKE2B 9af46e333ec8ebe53e3df8ea21b34d9c6c181ba5f9ed56efad93407d3af7fe98d79caf4063af5817cb7af69a2e24e14c606b5d9c9854ded11452de4b7fedf724 SHA512 21640f9b98d1362a4f6a6d69af4306f28d23ddca1a4736d415013769554b671af36d2f9dcaa5b24ab04f446604a420acd888f3cfc193d6064a4b24a2bbb65a10
 MISC metadata.xml 419 BLAKE2B af90ea5ea311d4352bbdfd4852f71dc51564f7f34cd088b8b77016b5500a468d37c4ca6c1cf38ba4e091e8adfaeb5a8051955f189c4855963a4fd6c5b4523ef2 SHA512 8b84aa16876a8aad7bd8bcfd588ff4de660dcc4ec9fd5d07f22d513bfde4cac278992cfd619a5d556256adbc4b00bb946448feefa561fa99e07da2181b121a88
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
index 51d52df53811..772aa6d83de7 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+expvfst +hfst verify-sig"
 
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
deleted file mode 100644
index 16a28656c60d..000000000000
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1 verify-sig
-
-DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
-HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
-	verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+expvfst +hfst verify-sig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	hfst? ( >=dev-util/hfstospell-0.5.0 )"
-RDEPEND="${DEPEND}"
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
-
-PATCHES=( "${FILESDIR}"/${P}-disable-wall-werror.patch )
-
-src_configure() {
-	local myconf=(
-		--prefix=/usr
-		--with-dictionary-path=/usr/share/voikko
-		$(use_enable expvfst)
-	)
-
-	if ! use hfst ; then
-		myconf+=( --disable-hfst )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	python_setup
-	default
-
-	python_foreach_impl python_domodule python/libvoikko.py
-
-	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-}
diff --git a/dev-libs/libvterm-neovim/Manifest b/dev-libs/libvterm-neovim/Manifest
index 218bf03fac01..9d00fc9eba7f 100644
--- a/dev-libs/libvterm-neovim/Manifest
+++ b/dev-libs/libvterm-neovim/Manifest
@@ -1,5 +1,5 @@
 DIST libvterm-neovim-0.0_pre20150309.tar.xz 52244 BLAKE2B e4791789b2373e9cad4796d0567dd87f347f5b83b293a996d155f163602d10a3d9326d5f0b1417cd46c5b26532064f2d90b1401002413d44e81f895038bef8ac SHA512 916bf1806f6c88b64debb19a119010e6e3ef968e289ab921ebf7a5ed2d98f52881379792bc9c8826bba546da0f65cb6154d9743bb89a614ac4e12d24167a1fb4
 DIST libvterm-neovim-0.0_pre20150621.tar.xz 52240 BLAKE2B 040c2510356a03c4b5b98197a2353285e23025fb8377396fafd4dce3b1afdf0d969e067317f5eb08878fbe69cca601ac85c8dc6cc51416f58e0611100bd54f5d SHA512 e6fe678da5498177d7fbd0cd945600b643f7cd76ff9ed00f3ac7923be55793765429a2f2da5fba4055dfaa4b7200c28a021f3672ce7ae16b99e58738e5093fd8
-EBUILD libvterm-neovim-0.0_pre20150309.ebuild 726 BLAKE2B 85d96804c0d08466602a345ffa736cc14bf8e1d16f44e044cebbc53a137c98672d1f69d8e9dc990ac787c5af289df816e9fcd5c35076967030b3f59b8e71ef57 SHA512 4eee2ced7401b3ac13e93458ddb0148380e23df4c6595320105dbfda1a3d4ed1306a0efeaace98b28faba32d95be9c8c0a2de03cec062bb5a3985430bfc057b8
-EBUILD libvterm-neovim-0.0_pre20150621.ebuild 726 BLAKE2B 85d96804c0d08466602a345ffa736cc14bf8e1d16f44e044cebbc53a137c98672d1f69d8e9dc990ac787c5af289df816e9fcd5c35076967030b3f59b8e71ef57 SHA512 4eee2ced7401b3ac13e93458ddb0148380e23df4c6595320105dbfda1a3d4ed1306a0efeaace98b28faba32d95be9c8c0a2de03cec062bb5a3985430bfc057b8
+EBUILD libvterm-neovim-0.0_pre20150309.ebuild 712 BLAKE2B 24425e862d2e5e2c71ebbe77224fff45499295c9b12cc7cbed451a48e42d4235ca5a98dde511a23cb95e4e706f1f31944e01e9ec0368d0bc67e5ec990c04938f SHA512 4b6fbacb8f74df0a9007d6f8834d113f288731b6d8033b12061b6e1cc2ecde71d7adbea36facf331ceeb0965af475515aa6a7956ef942f9d6ebd266b2967aba0
+EBUILD libvterm-neovim-0.0_pre20150621.ebuild 712 BLAKE2B 24425e862d2e5e2c71ebbe77224fff45499295c9b12cc7cbed451a48e42d4235ca5a98dde511a23cb95e4e706f1f31944e01e9ec0368d0bc67e5ec990c04938f SHA512 4b6fbacb8f74df0a9007d6f8834d113f288731b6d8033b12061b6e1cc2ecde71d7adbea36facf331ceeb0965af475515aa6a7956ef942f9d6ebd266b2967aba0
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
index a689ddef67c4..2725d021a680 100644
--- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
+++ b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
@@ -1,8 +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
-inherit eutils flag-o-matic ltprune multilib
+
+inherit flag-o-matic ltprune multilib
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -11,7 +12,6 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
index a689ddef67c4..2725d021a680 100644
--- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
+++ b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
@@ -1,8 +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
-inherit eutils flag-o-matic ltprune multilib
+
+inherit flag-o-matic ltprune multilib
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -11,7 +12,6 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index acb3fd58dcce..e8de7ff01d07 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -2,8 +2,8 @@ DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa35
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
 DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
 DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f2cfe46a22f133ca2b414f40f3af97331a4aaa34ca2a36f39b2ef92b63f2730bd872db8181512fd18f95921034 SHA512 de68b36c589638cc727fdd8153af66cc9288d32567bca1213e3769418a7b98afff68565dfd34f73f74625c39e66b60da7e658e9afa9bef4efa2072ff91d872e5
-EBUILD libvterm-0.0_pre20181126.ebuild 788 BLAKE2B f7e9795a2b2a162d34bd32cb639d917fc6d52f41e0548b2dd85d906766f9129ea90355bd2e96ff2db5257c7a3e652901b00e1ee67af696a37dde1b41662189c6 SHA512 585e8bda6f77157a95c9451e3bd6491902eb20b23ef3b8c10358e3095e1e2c5aa405e90bccc76632a370cd1b4af2a0fc834c02abc87363bc01827335edc8183c
-EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
-EBUILD libvterm-0.1.2.ebuild 832 BLAKE2B f037c535ecca36cc4140cd9bb2d46883526e252ba477189c283deadd8068cbd41e95fc775ea24e145d8b7ef581b6927f0e4f67b251fc6f50c9b2fd906550e89a SHA512 7d72d2bd2335e516dfed729797c57a1f4119f8c9e656f2c1d20333997dd1406efee3c699330007a46ab29c7e1a31d2c503d5fad3b1f2dbbeec793c756f82fb90
-EBUILD libvterm-0.1.3.ebuild 841 BLAKE2B 3b95bf1247ee69b2731a406523b61d199974d667654f7b4d6afd63eae426085e1549639128eca7e0e620106df6f3c3acb67c632f26531e2f2a9a142980f466f8 SHA512 aaa02f7be85278d20745bce9f3b190bca9e9a57445903ba0d9e3fae9903b483474b19e9ac7d737f8f2d462ecc1554559e36824c9ae341df5c376e0dce056b5b1
+EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
+EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
+EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
+EBUILD libvterm-0.1.3.ebuild 863 BLAKE2B 0c5bc8575e7e377f452b1c7d9e3ad93493d94e6a235773b5f97e6677bbd768a81759440b8e8e336f1933c2ffee7e7c351c94ecbc5abe5f40bc78e1053bb7ac99 SHA512 62a55f2f314507287739a31030257c07d8e8c74984c3648b2ff9501a8da0e7d1f88c95d33ae64efdb8bdb1dfe23a925589958fc51d650185ac287d3eaa8633f0
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
index 00da1e7c0664..75e2b16d3eb5 100644
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@@ -1,27 +1,28 @@
-# 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 flag-o-matic ltprune multilib
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+S="${WORKDIR}"/libvterm-0.0
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-DEPEND="
+BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig"
-
 RDEPEND="!dev-libs/libvterm-neovim"
 
-S=${WORKDIR}/libvterm-0.0
-
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -30,5 +31,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.1.ebuild b/dev-libs/libvterm/libvterm-0.1.1.ebuild
index a9f83554b9e2..64440bd5eae4 100644
--- a/dev-libs/libvterm/libvterm-0.1.1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -11,18 +12,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/v$(ver_cut 1-2)/+download/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -32,5 +33,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
index 6802cf9d98af..d4ac11e08b8e 100644
--- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -17,11 +18,12 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index fbc62d84bc3c..6530912e8f74 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -10,17 +11,18 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
+
 	append-cflags -fPIC
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index bfc98adb266d..5adf68179061 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.3-r1.ebuild 802 BLAKE2B c9df38b6c3d96a78d9a63e701a65010393a429dbe80305b45d7165b4ae9ae5680bc4f928b82741cd2abf8682fea5f8d5d7f712bd1ef4d009051f1541a1c0ead1 SHA512 87a0226039479bde3b6c3049ce6d6d14ae8fc5021d8d32ab62e7706c8ba95ce7a9b3c9e62babbc378ee1a5b941df95dfe8a4c084c328d2b4cd49c40c2a33b009
+EBUILD libwapcaplet-0.4.3-r1.ebuild 809 BLAKE2B 2b6d1d90699ddbd6a91caae27f9cd37dcdf2cb8a5888f489bb5ca737f3c220b749ed089d040e2881da3d306d9a30a9fd3b163858da844f6524e6ef020106989c SHA512 4567b98c4bcd3333727c2c3fe69fd408510e73398dbc90c18715176f9a5367246c11ff476f617ecbd5474c693e77475c7c3e83a89ab05034c7c2214becb8aa02
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
index 4bfd12648e23..3d4c8aa78358 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-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
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index b63a5623283a..8321aec603f3 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,5 +2,5 @@ AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3c
 AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
 AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1233 BLAKE2B 7165f84264a5c936d29ad7030070f356074a0c47b87916b1a0ace57c4b58d2e1aedc7fe33ad08792fd054a1b7a753b2befddf0629b888551ad8693be9943b2ad SHA512 0efb4a9c19918395ca2831223c35b201c4dc7e4fbf628ff34f90f6b8e444a86894c6386e1a8edf075f67f0e19a652b4bf2f471586f8668e4a1357c92d90cfc0d
+EBUILD libx86-1.1-r4.ebuild 1223 BLAKE2B f465918876f219c1eaf76d5a223176c2a82bb1ee3d3cdfff14df433c9410fc6294fe53851f800e9b323442c3e3609683ccd0638cced62de9911912aa42553f98 SHA512 63789d27dc2c5963f24e64f3c7234ba75523f21b70270240d928a011fab4a3c5a1173ff7185f3ff971270fc7a3d4ccb005db217f5624a94ee9889358ea01f0ff
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
index 24efb4976012..e001fab4a41a 100644
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
 HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index 108d123108af..e58b6653fbc3 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 933 BLAKE2B dd058ba94ca0432d6fb3f15245bea89acec6d2ed600c524623e453716c4ab9e680246a193de0e3e6f303417eedc50f9104fa5eaa66a40b7cbe7e0b898f7bbe89 SHA512 78845dd0c336fc25521e43598055e856bbd878c86c8d7c50a987b18efc3dd895e78ea9c00dfeb3cebd4305c5713481053abc939e70cb017f38924f100822e227
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 918 BLAKE2B ebe980502ede7623065b0e0e49e7c19d626c7d9bbd623461a287e36b11d32c01cc10c4be7878efbe3c4b4e6ba4e548f111d4bae3e4dc8a19b984d0080fe03acd SHA512 e2cd24b2fe461a425a185797ac12e764728d417a83b96f5ec01e79bb74d0409b85b1cf7fa856945202c9cd6d2178b3a45953bc2ac5b72e79ba6320009d9221dd
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 025e69060d40..8c306a31e412 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Small library to access XDG Base Directories Specification paths"
 HOMEPAGE="https://github.com/devnev/libxdg-basedir"
 SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
-IUSE="doc static-libs"
+IUSE="doc"
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-buffer-overflow.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+	default
 
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable doc doxygen-html)
 }
 
@@ -42,8 +45,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	if use doc; then
-		dohtml -r doc/html/*
+		docinto html
+		dodoc -r doc/html/*
 	fi
 
-	find "${D}" -type f -name '*.la' -delete
+	find "${ED}" -type f -name '*.la' -delete
 }
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 0287ae59bc32..b59a97f5ac68 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
-EBUILD libxls-1.6.2.ebuild 678 BLAKE2B 6004c15f9ae333c904771e243a0fedf11cd967d016892baa1a54bc3fee1dcf585e91428e28d6debedb0d7815c29cbdb46391dd8e7c2d084f2970c132858c3628 SHA512 bdb9c051bf324a816a22da10605ec983ca23541922f72fa293e14c1b29598c1c227e0fa536854ec0db0ef2ccf98e86518882738146c3369eae66785cce19ae66
+EBUILD libxls-1.6.2.ebuild 636 BLAKE2B f074728dad2854ba9c91618e05799d4614942c94c75f84dc7aba30614e52d1593337fabc31272cbbbbbda6b81a33c4a282a7e842a5d7c34175ff6cf64bf2c7cb SHA512 9cd01561afc1a257356676a801f0d0e390c7dd2da11ff8a74debf56efc8d0a179d8613555a776b8aebfe7b21336fc63a06bb4cea53534ecb05a394cfa9360bfd
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild
index 51f16d208994..5db6df61122e 100644
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="A library which can read Excel (xls) files"
 HOMEPAGE="https://github.com/libxls/libxls"
 SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
@@ -12,16 +10,13 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND=""
 BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
 "
 
-RESTRICT=test # test driver is missing
+RESTRICT="test" # test driver is missing
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
@@ -35,5 +30,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1f8c1701886e..7a09f43ac82f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,14 +1,14 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
-AUX libxml2-2.9.10-remove-TRUE.patch 942 BLAKE2B bd5272551189d21162366318b211965aca2da947e5bbadaa8a487821369c3f552005de243c4b110392908277144317bd64c86d8641b972cbdb338d7eaf93dd08 SHA512 6abc43b95baa5540c78435654f391858c8e72667afdf00c993907510204441aee4367d1d8a038961e65e9d4d25ac8d0c4f5b7a2ee8d8357737dce5b643898502
-AUX libxml2-2.9.10-xmllint-utf8.patch 1082 BLAKE2B 166f408a9c8bd01a000362845beb77b3bff1736f4d13296330d074a9e3fedb242381cdd63363500632dc8b21ff3c8a9800f6e9ee9c476b36355d7307979d2bb3 SHA512 99f6b54898f12c42579c868fe963f8ad164d81c0f3f4f20800a2b809423b46f11d792794354d3ac77e3b545f15f1cc2a5163a940288e40a6ac0292f7a7467b72
-AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
-AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
-AUX libxml2-2.9.8-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba02468c01b9b87fe21dc6e2488d56f599573bc442f78386f64477a89c3332cd25f9b5ef3b4fedc47b51915c727a1b8eba06e7776d SHA512 a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7
+AUX libxml2-2.9.10-remove-TRUE.patch 798 BLAKE2B 9dd837f4d5a9a9fa6a499c369df7ee707d6614f045c734d1a2d99393888d854f47c434782c779d788225db06df527c42ad8c3c4429d3d90548941348ad9ca1b7 SHA512 b3f1a3a59dbce6cadbf6c749b98f32fc31bb577a26531bc83048e7d4b2d970ad6caa875e20f3f39f4be997dfbe7696d9ca7cdc439b76ddacd5b43ec7333f1334
+AUX libxml2-2.9.10-xmllint-utf8.patch 947 BLAKE2B 77bd91eb6c5763b7f4d0817bd54cc6b2dbac919a0f4766d7099b50cacf70e5fad6d5ba3698a4a2272798b623fbab4fb9500096449a7f580dc9816826f9313858 SHA512 70c3ba767e7dd5fcaf72f41eb7ce01970fc7ea49774b39fc222d3e0d14e40f0d8303d78ed8c31278611f80e57b869a1f067d56ab2cfa8c4c1f87c1a3a1978fcc
+AUX libxml2-2.9.2-python-ABIFLAG.patch 588 BLAKE2B a2f6b67478a7d284dc318c1495833a51dd3e7d1f0d774f644b58e733bd5823041258750231b1b6e19e14fb210188a3bcdcacbbcb46e3b0130efcbb98492ea5e9 SHA512 ed9fc4c732f3c7f6a71c2cd6b1696995b6685ab231937a589da432e1fe452549d4d38b8761acdcc5a7145d1c721907d65d9d6539b3ecbb0628b7e2efa42d3b30
+AUX libxml2-2.9.8-out-of-tree-test.patch 1113 BLAKE2B cc257e20d3bad841e6afe220e895d15b0b83acbfeb2eb9d5d181549a954749c9b44bdf926346cb1c2ff3f3dbea739246a3ecdbe06cc98739b5ab132f46a7b36b SHA512 0bc18eb059685cfdfb6e30c995d6d43a83af37c8cc702467de6bd339515edc5d580cc22819a5612766431450fec59d37a28c7d5f24be3fb124c31cdbcc806b41
+AUX libxml2-2.9.8-python3-unicode-errors.patch 1156 BLAKE2B 15d58fb615aef745ac6aa4dde01823f3e0d2c39cd86ca9369874d6c4ae01d2a95e804e34b125ff77af612906397307cca1489b93d331d0f87dd9651a3ef1869c SHA512 fbe89d3ab0d4915782752d6de8a0b057cbe78bc5372a2801556bb521f1c64bf14e641af71b97d98377dc8b65cdc520938d144758ca50ce6fe628883d8bfd6411
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r4.ebuild 6409 BLAKE2B 82a43ea7f6ffcf9e648c711db4beec9c6b82ab825fe0f676484fff6529bc00ed948758130919877ac01d12f16ba074f1036e940167e125069183726097ad4d50 SHA512 fea86142743f481018290de2282a06d1a7abe6a838ff745b563a01563db4c0272ae837e562c98ffaed6ba2ecac98f3569016ace7639d6b07194232c900ba0390
-EBUILD libxml2-2.9.10-r5.ebuild 6654 BLAKE2B 03f733e1a13bbfdbb800f35fcd9c9dd4732673fdd80b6134c76050046c19464a6dc6c1d63904092359c2cfe835172a350e7df656e5d414d7a65d5e283dc509c9 SHA512 e084e118d5ef90c4cc9e9adaf6971d9a67e7526b910d6a78f84afd3c289b458d93a002bf9de9dd4828a2ccaadae29847614cbaafb1d844c4bb94eaf4dbbd2a4d
+EBUILD libxml2-2.9.10-r4.ebuild 6402 BLAKE2B 101c269a5cbdfc142a37c1a794e68d7c60f2ab964c6b936fc6964df89b04c1c0e12ecd46f7a1dc04c15b49319db2c7efc89c95d81a105681f94602a68d75b355 SHA512 cbd927cf0ac16032fd14d328ad71d1348247f663bdf001d163715217d36c0d7dd77d999291fa6c722eecc600df457306b9ce9c7dd719a920b656a8965388c59a
+EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch
index e405feb37c36..c979c8414779 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch
@@ -10,11 +10,6 @@ icu-68.1 removed macro definitions for TRUE and FALSE
 
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index ad4d8a63..ea1fa99e 100644
 --- a/encoding.c
 +++ b/encoding.c
 @@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
@@ -27,5 +22,3 @@ index ad4d8a63..ea1fa99e 100644
  #endif /* LIBXML_ICU_ENABLED */
      else {
 -- 
-2.29.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch
index 179f3a8c3847..205b26b54f82 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch
@@ -12,12 +12,6 @@ Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
 the report.
 
 Fixes #178.
----
- xmllint.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/xmllint.c b/xmllint.c
-index f6a8e463..c647486f 100644
 --- a/xmllint.c
 +++ b/xmllint.c
 @@ -528,6 +528,12 @@ static void
@@ -34,5 +28,3 @@ index f6a8e463..c647486f 100644
      if (result) {
  	xmlGenericError(xmlGenericErrorContext, "%s", result);
 -- 
-GitLab
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch
index 14dd5bc7342e..7c5557f9915b 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch
@@ -1,8 +1,3 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 14ac0a8..f787b12 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
index fcc441d05de2..1e269c3387b3 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
@@ -9,12 +9,6 @@ When building out of tree, the relative path this test uses doesn't
 work.  Resolve the path relative to the test script itself instead.
 
 Url: https://bugs.gentoo.org/565576
----
- python/tests/reader5.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/python/tests/reader5.py b/python/tests/reader5.py
-index 82d0daea474a..da5355ffc4c6 100755
 --- a/python/tests/reader5.py
 +++ b/python/tests/reader5.py
 @@ -4,6 +4,7 @@
@@ -36,5 +30,3 @@ index 82d0daea474a..da5355ffc4c6 100755
  reader = input.newTextReader("REC")
  res=""
 -- 
-2.19.1
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch
index e87dcdedf88c..db20221afe42 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch
@@ -1,7 +1,6 @@
-Index: libxml2-2.9.5/python/libxml.c
-===================================================================
---- libxml2-2.9.5.orig/python/libxml.c
-+++ libxml2-2.9.5/python/libxml.c
+https://bugs.gentoo.org/745162
+--- a/python/libxml.c
++++ b/python/libxml.c
 @@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
      PyObject *message;
      PyObject *result;
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index 9db3902e430f..07ac3c9aac1d 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal
 
 DESCRIPTION="XML C parser and toolkit"
 HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -102,8 +102,8 @@ src_prepare() {
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
+	#elibtoolize
+	#epunt_cxx # if we don't eautoreconf
 
 	eautoreconf
 }
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
index 9c503eb4ff2c..97ea995cd045 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 
-inherit autotools libtool flag-o-matic python-r1 prefix multilib-minimal
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal
 
 # Note: Please bump in sync with dev-libs/libxslt
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
@@ -30,7 +30,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 07668a1a999c..55b001a09abc 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,3 +1,3 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.34-r1.ebuild 1699 BLAKE2B 1ed4960b46018ff32e2b62975f77ae30b44129d7699c8dfaf601afd8ab49be3d041c0f3a6ed0c60518444e56d162761919feee8e323678a1a9473f6947772101 SHA512 1c42ff76e742ed948ce2c080e72f650f341261bb2aa1d82ac5fd4b3853310eb93291b8992a3bfa610d52f3c3f38634c0f98a01d4f1953c5cfa3818e3ddd743eb
+EBUILD libxslt-1.1.34-r1.ebuild 1683 BLAKE2B ab30c33121afacac6d62c7eed3ecc19a0abd12503240280f834df8388ebcef884858560778163df87bdb3f0f64cdc4d02f3c2cdbf147421ffca4c2efdea77ef5 SHA512 52652130cbf3ded34298371dfe879461bceb708c479e88438fb904ae47b2893eb8445c57dbba4e87f1aa63cb359c412233248d9ad9a755dab220b032a366b1cd
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 350eede2cb08..91f4f334349f 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool multilib-minimal toolchain-funcs
+inherit libtool multilib-minimal
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 DESCRIPTION="XSLT libraries and tools"
@@ -12,8 +12,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
 BDEPEND=">=virtual/pkgconfig-1"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 8ad715403711..f3be7a6b5209 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,5 +1,5 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e
-EBUILD libyaml-0.2.2.ebuild 991 BLAKE2B 3ed138f98dad86894d6be8806a7f2155be731723d229a4936c533ce83bef958d9a194719e43dc6de509c4e5678455f874e4d5519227d90de9c4d4a3f04309034 SHA512 e3c9b38411b2c0dcea5a70cc9a170d278f9a4b9c00fdb8b66685921055b770ab27f96851accab0c6dea7fc537362cdd500e6736e8eda816c20b191ce0af7cbe5
-EBUILD libyaml-0.2.5.ebuild 992 BLAKE2B 8d75b902e62f054adf08aad721cc32357be9ea13b4760ccd23d3593675457abadfe3bdcaebd9f6f7c5e6ccf887bb975476dc9cead46d6ba9af77db9e49f2c724 SHA512 11792abe80cbb8083b9d329529d3176ef858eca5494aa9fc35ecd36a3c73ec04311869cea032237fb9e924a869221bee50ccb40ae386fd9fe30c74f265b76df0
+EBUILD libyaml-0.2.2.ebuild 993 BLAKE2B 8d26be29e9b4c92cceecd418bba6063ec365dcb86f289241bed0e70e3173bf0092c405c558c927ac9b1ff1f508c48a6d7eb64010f9ac616a748068ab78d70f58 SHA512 45b4731bab1ce91ab192c52b91a13c869b0d0e7fb9a29e20e36b53a07d8a3c98590a0f451aef9847b99473e25beaeaa7a20cb9a0168bb2469e6c879b87ac8532
+EBUILD libyaml-0.2.5.ebuild 993 BLAKE2B 8d26be29e9b4c92cceecd418bba6063ec365dcb86f289241bed0e70e3173bf0092c405c558c927ac9b1ff1f508c48a6d7eb64010f9ac616a748068ab78d70f58 SHA512 45b4731bab1ce91ab192c52b91a13c869b0d0e7fb9a29e20e36b53a07d8a3c98590a0f451aef9847b99473e25beaeaa7a20cb9a0168bb2469e6c879b87ac8532
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 75975f00a462..98fc658a8de1 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index 4cc51836cb2a..98fc658a8de1 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 16acd2f07110..feff379322d9 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,7 @@
-DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
-DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1
 DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd7161762456a44f6532462e4514851e6298ade881b61c3d02175a7029b43358e94ebdad558aa82d8210600e35b9a32e30 SHA512 5d3d9f80b53baa3aeaf359d4b3c0eeec265177e47bf11bf2c5bcebf23d339e481eaa14a1ea7f5f686c9c7477fd607095c77d85399df479d297cc5bde1086535f
-EBUILD libzia-4.23.ebuild 963 BLAKE2B a2193135182336fdf555b83670eb02a97cc10aca94a4058b8cce044b3aafedc0c4126534ca3fc47ba5bfc3e5297def41c702de85a173ac1e678597ab4cd7a55d SHA512 68eddffdc4734b8e54f38e886f9bb8a510927210190c538f935f0da982b4ba850e4fa3234678804392c4ba21931d8f1dde5859aa1ef7817ea87c09573704a4d7
-EBUILD libzia-4.24.ebuild 965 BLAKE2B 8805cbc629207604f0c86ec56006c7da1ac1f1524f903cef9f6e847a259041fe638381cabde739183e2a033e131b14f3a299baf5b07657431d59f3b88b479bc5 SHA512 4942e7626e8a464d48642e6b313cfcb2368f9e081a8e4359cebee692333e6f2a2ef42f1e9d15e619a2c0a440e01787054bda2274174af82b8f347e082b77aaa0
-EBUILD libzia-4.25.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
+DIST libzia-4.27.tar.gz 632660 BLAKE2B 2769e24b628731c4363437513358d7de9a8eca2a49580de2b8b0a791692ef17adc696c984db202e1f7015edd5d5259dd6dc4e9a057e8267b510051aa70a4bf20 SHA512 5022569931a820cfd2c0e76b26021bf07a7c55f77872786b5907c7201be9da1a2d6d653eec3cdb9f504ce43d54207478eab38eaf697ae9dd42f17c3dce6666f5
+DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
+EBUILD libzia-4.25.ebuild 963 BLAKE2B 654a9ef983820db7b0bca89042218f313d790e2c8425d40a4e45717f1506eadc8ea6906038046d0afc7e92a81e88b29a65e7cdd42a40e971c5c00dab368b4b90 SHA512 1fccdc580e2bceb1b2ffad9478239d103ba682887545e812b605cff09a35ab1f2ba362a2fe48a03233ca60208e9b20402e2a6884d47da8ca99791924004af9e7
+EBUILD libzia-4.27.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
+EBUILD libzia-4.28.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.25.ebuild b/dev-libs/libzia/libzia-4.25.ebuild
index a3fecb46f788..527e88508dfa 100644
--- a/dev-libs/libzia/libzia-4.25.ebuild
+++ b/dev-libs/libzia/libzia-4.25.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libzia/libzia-4.24.ebuild b/dev-libs/libzia/libzia-4.27.ebuild
index 5b0fd3c5e716..a3fecb46f788 100644
--- a/dev-libs/libzia/libzia-4.24.ebuild
+++ b/dev-libs/libzia/libzia-4.27.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/dev-libs/libzia/libzia-4.23.ebuild b/dev-libs/libzia/libzia-4.28.ebuild
index 732c9aaf2d9f..a3fecb46f788 100644
--- a/dev-libs/libzia/libzia-4.23.ebuild
+++ b/dev-libs/libzia/libzia-4.28.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
@@ -10,14 +10,14 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
+	ftdi? ( dev-embedded/libftdi:1 )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-libs/light/Manifest b/dev-libs/light/Manifest
index 116f9606071b..35a540a9b44e 100644
--- a/dev-libs/light/Manifest
+++ b/dev-libs/light/Manifest
@@ -1,5 +1,5 @@
 AUX light-1.2.2-fcommon.patch 483 BLAKE2B 466c16e726297c4b32d4c3276465d7f8f8dfd74e2a646446a6bb3a8c1168c0d81ed0c7076882660623c93f471b21ba4144144ead4fda286aaad19187030ec9c2 SHA512 e2b1662d20d9ee04b7fec20fbbadc4be1383edc7af661500dde2d11a76afe0e0eb334b4f5a1a6a6e83309478af1216e52a782a93e0b51f0afce3aae59b8c1dd5
 DIST light-1.2.2.tar.gz 33009 BLAKE2B 6e23d7f89c1dbf412943f2b60a09f9189c5420649397a286fa964d249adb57cafb2943ef610dd13470e486d9dfb51ca40289d9974760e907f794baa27963821d SHA512 5815394fb1545d1e06234c261d475e1836e4c43e47e7707b8628891d20b70db04f1661b78ca1d236d549c734430b606498fa46de060c854791b13cf49de07b59
 EBUILD light-1.2.2-r1.ebuild 814 BLAKE2B 8f45a0005854034dfe385adcebace9d07c2ed5b3dfa4b214315232de93d067689da0bf74400ca2368642ee1e0f7be4107ebd6a2d19d94a91b2ae726262aca786 SHA512 daa7efc5aef76c592e1bb69c39fbf18ed434f717f9e2ec2c274521c29af5b33c5442a5fc1ae54c8cd3b9b79c814e629dbf327f5f833f36ae99cd83325794d27e
-EBUILD light-1.2.2.ebuild 690 BLAKE2B 3182a88b9fdcb68e375dd63115ba130e5dfc73fe529ae56772eaa8962de24c982f2d9451fd5fd2837701f26a9477b05c920b0685e63ebb53ffb407ce2e60a2f2 SHA512 2c0b5dd73ed7ad4346345f931e10079102e466c230d7875056b8bd9414367b833738a24d31d99320d9e3745d2dafd3ec6066d8721455a4f1a61b878bd7669b60
+EBUILD light-1.2.2.ebuild 670 BLAKE2B 91c9e5f0480946caed558963fa54db2f77fc0eae82081f5c8000ece9acded174d67a66f08731380bfdf6ed55f83f6fe751b42677b6e1d0d6511bba49463131c9 SHA512 9cfe55bf283d337ed30aef0ad1b5076668369e78f8984759cb39b39bdbb1280c684e98025826099a38bc15990840bce3c7a0e19a7b05365b004eaf218b3c4ef8
 MISC metadata.xml 355 BLAKE2B 87de7a4fb6653614915e68daf6b4acf751c6e0a27b156acb5f442bfe118496ec975cba6edad9c79063cea8811a0692991d74a3d179f3ab50b538bb1f41de9e03 SHA512 9dbbe3645a35e946fcac945c8e1aa52500393e12b44db82fa8eb0fb804109b045081ba9ad808b7a5f52a9d2fca7ae303b7af7093591096f2e11c6bb47768ff76
diff --git a/dev-libs/light/light-1.2.2.ebuild b/dev-libs/light/light-1.2.2.ebuild
index 1e6fa905666f..8210dc3ec01b 100644
--- a/dev-libs/light/light-1.2.2.ebuild
+++ b/dev-libs/light/light-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils flag-o-matic
+inherit autotools
 
 DESCRIPTION="A program to control backlights (and other hardware lights)"
 HOMEPAGE="https://github.com/haikarainen/light"
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index a1ba60ea04ea..5f203284c7cb 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,5 +1,8 @@
 AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138
 AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
+AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
+DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022
 EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
+EBUILD link-grammar-5.8.1.ebuild 3055 BLAKE2B b029a010785009c0463a272e8fa70a0166e14419292a4ea8f0c09d4d1bac7bd75ed7122ade19c4615816650dc71a0296c4ff97d0f873f756f8b6f3f9f9c61505 SHA512 7d21f89272decc806e310f961d3e40edc5fa55398aca74f71a9d80b151e18e7a27ee4d243c0fe5aee81ae5662f24ce242ccf3b0254ed9675b57aec786932a2e6
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
new file mode 100644
index 000000000000..af48d251046b
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -324,9 +324,7 @@
+ 	dnl 1. Abort and notify if no zlib.h. 2. Adapt for non-standard location.
+ 	AC_MSG_NOTICE([The minisat2 headers include zlib.h])
+ 	dnl The bundled library doesn't actually need -lz
+-	AX_CHECK_ZLIB([ZLIB_CPPFLAGS="-isystem $ZLIB_HOME/include"],
+-		[AC_MSG_NOTICE([No zlib library found - not building sat solver])
+-		enable_sat_solver=no])
++	PKG_CHECK_MODULES([ZLIB], [zlib], [ZLIB_CPPFLAGS="${ZLIB_CFLAGS}"])
+ fi
+ 
+ # If zlib not found, then don't continue with minisat.
diff --git a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
new file mode 100644
index 000000000000..2cdb1a11a0e9
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools java-pkg-opt-2 python-r1 out-of-source
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aspell +hunspell java python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+RDEPEND="
+	dev-db/sqlite:3
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	java? (
+		>=virtual/jdk-1.6:*
+		dev-java/ant-core
+	)
+	python? ( ${PYTHON_DEPS} )
+	!sci-mathematics/minisat"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+		ewarn "you want aspell support."
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	use java && java-pkg-opt-2_src_prepare
+
+	eapply "${FILESDIR}"/${P}-lld.patch
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		--disable-maintainer-mode
+		--disable-editline
+		--disable-perl-bindings
+		--disable-static
+		--enable-sat-solver=bundled
+		$(use_enable aspell)
+		$(use_enable hunspell)
+		$(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
+		$(use_enable java java-bindings)
+		# $(use_enable pcre regex-tokenizer)
+		# $(use_with pcre)
+	)
+
+	econf \
+		--disable-python-bindings \
+		"${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf \
+				--enable-python-bindings \
+				"${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+my_src_compile() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_compile() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+		}
+		python_foreach_impl run_in_build_dir python_compile
+	fi
+}
+
+my_src_install() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_install() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+}
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index 526a61910eea..e336fa13212d 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,5 +2,5 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2108 BLAKE2B c288fcf22e901249114c408ab9f83922600339f8fdf351e4c3d0a5243eb6499ad87359b438d0c1cdac4025c759db3803930a43d149e2f31d800392692036b117 SHA512 51e3ea7340728cd4c59bc32bd14c2f7949704fc1423c6e022279c2e429cd5267fe64101293ee71a5d204556024d0e654505f7f8a9f1993aa18461f6cce8aa6f0
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2063 BLAKE2B b76eee9e03d1bc1302e29260d2887a441e934a2a7f8e995369019f09bfd0c61bd4af853f1534b0dcb79c394a97cc734bf14678fc15c4939998392ca5146d43be SHA512 586d9ab056155acf4f13bd23972b0983bef257859d29bb7824a8ccc90b2d3c761326c241a810541e334eae6e7f0a4ac5ee18d43d74e6d41de9654810cfa7cde0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index 06cc4fd7efc1..ce700fe6af56 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 GENTOO_DEPEND_ON_PERL="no"
-inherit toolchain-funcs perl-module eutils versionator autotools ltprune multilib-minimal
+inherit perl-module epatch versionator autotools ltprune multilib-minimal
 
 MAJOR=$(get_major_version)
 MY_PV=$(get_version_component_range 1-3)
@@ -18,21 +18,18 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
 "
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="perl"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}/${MY_P}-add-autotools.patch"
 	"${FILESDIR}/${MY_P}-fix-perl.patch"
 )
 
-S=${WORKDIR}/${PN}-${MY_PV}
 PERL_S=./LockDev
 
 pkg_setup() {
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 97269737b57f..97af4c460b59 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -5,5 +5,5 @@ AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
-EBUILD log4cpp-1.1.3.ebuild 1256 BLAKE2B d39928e410991866cab1fba01212606f77164d68336b0c458772c1242d38576806bd43c0936cf5cc216cee625144f7697356e6162c06efa6e7c9673a3e04015e SHA512 0852bf6c27231f07aa214073511789de1d90a8d66d60f5f35243880a0ef2b927e1bac349a00bc398d369238ba7a939e8867e2c5726f8cd58e912771b8c7037e8
+EBUILD log4cpp-1.1.3.ebuild 1257 BLAKE2B 9e9e895da3197dd42ce48fd079419e27501bc45e4b2dd1ca85416d4fe46da5d19b73016b26be881e0cd133f40922ad5be68d7b7adae6a99afd19190de12c79f5 SHA512 63774de481f1ad5202b64d5c1ce87adb50e7d9f485edf75b56f4fa8dff35c1bb696a65a2c8af4f18df7a4210775f3e21b74e48f66d03deacf69f0047aa77824c
 MISC metadata.xml 244 BLAKE2B c211d7844d07df7225f7396d520699eb92a3d36a24a42153a7e736aa91ec766fef9ba07b120f90fe0ac295a982123259d294cc7a4cda1375c52e5d55a938e41c SHA512 0adb9b66d52e83eef31fe24ba677684835d998f9cf88054128834a3bff80878aabb6b2b8209f1d34f3e91b4d9c615d632d58c86bcb6fba38c85dc33c05d950e1
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
index 705c161ed490..2fdc153e4873 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm ppc s390 x86"
+KEYWORDS="amd64 ~arm ppc ~s390 x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/log4sh/Manifest b/dev-libs/log4sh/Manifest
index dd69491629ec..7236c757080c 100644
--- a/dev-libs/log4sh/Manifest
+++ b/dev-libs/log4sh/Manifest
@@ -1,3 +1,3 @@
 DIST log4sh-1.4.2.tgz 91994 BLAKE2B 4ce0e65375e7e7470fb080c2873f50a6c5e86dca79ab81eecf14e6922763b2281bc2486b8c5bd689a00b4aae2debe4966d6fb3f57c6e730c370392c85c08c27a SHA512 f4b983e352c94b33b355a2e743e8431cff4bf6c24b4db18087556d5a8d10ee458c2216f7b9175519e3904051e34f61b2add8faacac0b125c61cde2d76538b290
-EBUILD log4sh-1.4.2.ebuild 992 BLAKE2B d991a1ac4c44c65502e857ee8cb5f58ef2aed9eb6bf918dac4aeab8d75386a76b9a169d80b3575bff28a701a15d54b15360563aeb792a322feb2e0cafd83aafd SHA512 12ed5bfb076920276a8f3dc30ecd6c21909bb2dc985af3c5964b3eb973b045631490a48d6a9857876b5dee725d257ae459dd27a0fbeb53ab6c8c662667a33971
+EBUILD log4sh-1.4.2.ebuild 964 BLAKE2B 29bd17eb8074b1e0be1df4f943a7a7ca58c870f89187a0ae3d5500e798dbedcbf40749917f0e61136684dd0afd8519b37e861a5bae469ed435f82d3629024b33 SHA512 feaaa3338dbb487f57629dbdb2052e1f6fa6f98c17013f24d9f650a69c3071cd750a44d4df06c983b00ca6beb40d07bff47dbc765223fb93d1ae6ba93f926057
 MISC metadata.xml 323 BLAKE2B 2c4b9e9d846a491b27adc7b85e61405f8184ffdb9bf603c3931c7fe776379c0537f840ed068a4f1c29c77a5292b918830b99adf04c8d6bb0ac0b455462528fcf SHA512 e01225b153a0070455460ac8c7b9da993816a4c27c92c94140d36fa0ca0d0e5a689d55f0aa6e7a575bdd040ac2f7312e336d8ea3f1a84362e7cb6321e2b20513
diff --git a/dev-libs/log4sh/log4sh-1.4.2.ebuild b/dev-libs/log4sh/log4sh-1.4.2.ebuild
index bb98dc57cf64..09caddd99216 100644
--- a/dev-libs/log4sh/log4sh-1.4.2.ebuild
+++ b/dev-libs/log4sh/log4sh-1.4.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A flexible logging framework for shell scripts"
 HOMEPAGE="https://sourceforge.net/projects/log4sh"
@@ -22,8 +20,7 @@ src_compile() {
 
 src_test() {
 	# testsuite needs USER variable
-	export USER="$(whoami)"
-	make test || die "make test failed"
+	USER="$(whoami)" emake test
 }
 
 src_install() {
@@ -31,7 +28,9 @@ src_install() {
 	doins build/log4sh
 
 	dodoc doc/*.txt
-	dohtml doc/*.{html,css}
+
+	docinto html
+	dodoc doc/*.{html,css}
 
 	if use examples; then
 		docinto examples
@@ -41,7 +40,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To use log4sh, have your script source /usr/lib/log4sh/log4sh"
+	elog "To use log4sh, have your script source ${EPREFIX}/usr/lib/log4sh/log4sh"
 	elog "If you want to use remote logging, you should install package,"
 	elog "that provides netcat binary (for example - net-analyzer/netcat)"
 }
diff --git a/dev-libs/luise/Manifest b/dev-libs/luise/Manifest
index 5e76b7c7174c..c9b5ed3bf73a 100644
--- a/dev-libs/luise/Manifest
+++ b/dev-libs/luise/Manifest
@@ -1,3 +1,3 @@
 DIST LUIse_0.1.1.tar.gz 393815 BLAKE2B be7e35e1f4d5f6227f92bfeb5ed414593215c194e8d7ab67036ac7316cf6faeada839bbef15d8569b6fc276f3bddf41bdaf66e7315f6e8ff1341f8d697327895 SHA512 821b62ed476088c3818cb478a3c525e1d92e9879ef4059da0eb534852a294f802550ad7169066fe439f0cb3645e98656f405594db633061029ae9d7eff86f31d
-EBUILD luise-0.1.1-r1.ebuild 1009 BLAKE2B 1c81be489b57c112edd0e3f79be2ea1c3abc622f2cfd3f5b91f16ebcdb3d4d0dad3b94bdce042ef376cef69c6cfa2835d06b01c9f7ec9a1e70ed0d3bc5b8a28c SHA512 306d1290a780dfa5f79a95e4f28ad0ff9c2323f555d451a880173b21ff42b00ef3c26a8382ac32d0478dfcc1b53d4e2d284dca9615838989a96215b879da285f
+EBUILD luise-0.1.1-r1.ebuild 991 BLAKE2B ef3adc32a45786e68f1eb8490a64b801b94597d478b98f03d7b52d5af4dc692a053cd264e03d0bd010903c93f89668e9b73e3ddcddf9da00f32f8bd8febe903d SHA512 24b9b8d8fbe50f97711c01d63664f4b4b58149f6076339937991a8837d00dd4ffde3210fce9909f03d04016a71ee88328f72e84a1b805284f19de82a2c5fe48a
 MISC metadata.xml 1194 BLAKE2B 9205382d50d4a6c64f752dfcf4d7c22b8f581dacb7724ecd4255949a843e0fe07b9550f16e75ba8b8305faa3df6942fb532887a62715999d9b151e8c660a1961 SHA512 ad7ed0c143e0efb40eefdcec9d83bb0851f16a4815b2cb2acf1aaf8595a39727d375d4f34c3c9f772df1d31e47a779e91a2f9297c42bbd7bcf540afbb087704e
diff --git a/dev-libs/luise/luise-0.1.1-r1.ebuild b/dev-libs/luise/luise-0.1.1-r1.ebuild
index 2653ebe53508..d2dfb59779fc 100644
--- a/dev-libs/luise/luise-0.1.1-r1.ebuild
+++ b/dev-libs/luise/luise-0.1.1-r1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PN="LUIse"
 
-inherit multilib
-
 DESCRIPTION="Programming interface for the Wallbraun LCD-USB-Interface"
 HOMEPAGE="https://web.archive.org/web/20140102061822/http://wallbraun-electronics.de/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_PN}_${PV}.tar.gz"
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index ddf6f3242df9..8ceb3d41df7e 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 988 BLAKE2B d06aff3d78112ba066f09109489c5582de17a5052eb8d631103b4bd1ce82be0ffa4486a0bad083e195b269a80f0354fc16accb28da18fbb6f5a6622298ec94dd SHA512 3eedc944b7bc9fca864af2e310edc0e0daa834fed62958c8156189f33e640ffed4ebdeee93e052b8cf032461d30fdb66ce172b9dac2ee06241fd899d7f4d11be
+EBUILD lzo-2.10.ebuild 989 BLAKE2B e778ccab802d51963be01f85561af9b1e7965ceed904053ca72e5ee389c736668b1520fc6e643314fc20b34418c66f4c70bd56607381c50e7d1a10ce18909b2a SHA512 dbb9f5ae1558ac2a07e9b176d4fca6ee15fe41efcbec38593b83c2d82b21cba3c1b83c5ef22f66fb21fbe18951b1a021a882810e1eca15f3bb530cd03f60de7e
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index b7fc48293da7..d21765fe4f99 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index 8859b6715190..1ab1f225691a 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -2,5 +2,5 @@ AUX maloc-1.4-asneeded.patch 440 BLAKE2B d1693dd96756f83e8e0381eb399ef3a80bb920b
 AUX maloc-1.4-doc.patch 446 BLAKE2B 5fccdf966ba391c91abd3f2c3d219af122bc12aecbb2a5195aa3cf2335f7ba1a3cdd67aefbd994472d5bb50c49a718f4499499d059510a1c02b83265d2435806 SHA512 80c1abe14d01b1953a97c15e682d2c5b1a58e3b1bf6afb72d3aea0566365458cf2b173f9e82eb05457622d7eb62cfbc8cc267db8f45741d258332b5df186fa58
 AUX maloc-1.4-mpi.patch 581 BLAKE2B e2ac355eb674189e7368fe6b7d2f93c3cc60094cfc73d65d0a3a2b639e5705ce750e89f44bce09b5323e39f73355cc890a598d958612c3d683309eedbdc8988b SHA512 cc5957bdd189199d52621d511673a41b7204d8efe9c3453a5f1cb1408a4863911c939be78f47929fd664aa502be53fa4a16a5b1da0b17a7b62aa3eac78a9883c
 DIST maloc-1.5.tar.gz 794138 BLAKE2B 28b5b6a3bb9769ead517e181c9098762378dea7c8b8ddddaf809c958a553a4e96ee654d477a974c769b027c57c93b84ec5e447af142489b59d2ce8800b5631a6 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c
-EBUILD maloc-1.5-r1.ebuild 1240 BLAKE2B e2d70862242145079ba6958e636881de0efdd66f0c31f35f45a9e18ea3866e74a4f60850274cb52ac1a39aacdb694ec6b7929cfea79c613e3b131d968d48b00c SHA512 c8256aed84edbc4268fd4b9c3da794ddde36cf818c11e461eeccdbcab1a33a896df4e41cd0c434d7a8c892c32af3b61b53a47fbd645f96886e4ddd11c20bc5ea
+EBUILD maloc-1.5-r1.ebuild 1247 BLAKE2B d659796482caae2a2717cb06836d609064593eff5f6a08ec1bd3491d7e77c35b1d6e6ff63e7652aab315fb127f8656639b8f66a912ec693fb6e67987f4cf0b65 SHA512 4f7a958b893ae8e351f56d20347978b4f58b13a1e94037379f963f7aae87014315ea03c30c28ddec76f114231c6df58903863c1a4982ae861c7f30b2ef50d13e
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index 7c7351aab1b8..62b158098d87 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="doc mpi static-libs"
+IUSE="doc mpi"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
@@ -48,6 +48,7 @@ src_configure() {
 
 	myeconfargs+=(
 		--disable-triplet
+		--disable-static
 		$(use_enable mpi)
 	)
 
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 964b29d28039..b47a3bb3f5f0 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,7 +1,7 @@
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
 DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
-EBUILD mathjax-2.7.0.ebuild 1227 BLAKE2B 6d20d73dd444ec67032fc13236558941ec7cedc25965167d6fbd91f2490f0a4ae1bf3be28f1c676a81b46a4d9f70dfc856477af9e4f839382146fe97e3a75c80 SHA512 67c3d55adcdbf879b1d5079d45d6c29b5ea604a4f3d7d58ae1b5915e9ba2d435180eaee1fe1c24786f8fa25b9067ddccb541bafd93dee003212189ba94cac19e
-EBUILD mathjax-2.7.4.ebuild 1227 BLAKE2B 6d20d73dd444ec67032fc13236558941ec7cedc25965167d6fbd91f2490f0a4ae1bf3be28f1c676a81b46a4d9f70dfc856477af9e4f839382146fe97e3a75c80 SHA512 67c3d55adcdbf879b1d5079d45d6c29b5ea604a4f3d7d58ae1b5915e9ba2d435180eaee1fe1c24786f8fa25b9067ddccb541bafd93dee003212189ba94cac19e
-EBUILD mathjax-2.7.7.ebuild 1354 BLAKE2B 6d42b99df71be72d4fd20bc28d82c60abc00b9be2a2e7e689f974f9359b4d4f7b0bff3949151cd48171b3d959adc142733270c3070772e3cbdfa7c9d15cf3084 SHA512 ec1df645f5e4420a9ba1ca5ccad8d183d77f1a58a396c7452a75f1c083490c9e0ef0323cde7ad143e679ccc3120a78aae473e45d645550052d99a35ddef04e84
+EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
+EBUILD mathjax-2.7.4.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
+EBUILD mathjax-2.7.7.ebuild 1355 BLAKE2B 6e6b8d13af34268afad11e2c942d56d4bab7e02db8260645eb40a2c81632ea4f8c3016246fa7171548319109dcde907f663e42b8074b41af64cb4061e78386b2 SHA512 3d1c0f9b491e189c3eb2745674283ef4619a58fc29793eb6b33404157ddc8f81c672ead14fa6ce00e90e109b57b9ef7a4a346beae3779f185bfc882facdab815
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.0.ebuild b/dev-libs/mathjax/mathjax-2.7.0.ebuild
index d2f69ad8e4c0..b61ec426b028 100644
--- a/dev-libs/mathjax/mathjax-2.7.0.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.0.ebuild
@@ -1,13 +1,14 @@
-# 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 vcs-clean
+inherit vcs-clean
 
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
 HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -16,8 +17,6 @@ IUSE="doc examples"
 
 RESTRICT="binchecks strip"
 
-S=${WORKDIR}/MathJax-${PV}
-
 make_webconf() {
 	# web server config file - should we really do this?
 	cat > $1 <<-EOF
diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
index d2f69ad8e4c0..b61ec426b028 100644
--- a/dev-libs/mathjax/mathjax-2.7.4.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild
@@ -1,13 +1,14 @@
-# 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 vcs-clean
+inherit vcs-clean
 
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
 HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -16,8 +17,6 @@ IUSE="doc examples"
 
 RESTRICT="binchecks strip"
 
-S=${WORKDIR}/MathJax-${PV}
-
 make_webconf() {
 	# web server config file - should we really do this?
 	cat > $1 <<-EOF
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index 6e9b1f771e0e..c30baaa60e5e 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.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=7
@@ -8,6 +8,7 @@ inherit vcs-clean
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
 HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -18,8 +19,6 @@ RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
 
 RESTRICT="binchecks strip"
 
-S=${WORKDIR}/MathJax-${PV}
-
 make_webconf() {
 	# web server config file - should we really do this?
 	cat > $1 <<-EOF
diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest
index 54297f67651d..dc84ff7ed444 100644
--- a/dev-libs/mimetic/Manifest
+++ b/dev-libs/mimetic/Manifest
@@ -1,4 +1,5 @@
+AUX mimetic-0.9.8-build-mmap.patch 688 BLAKE2B ca85ba15a59d9581c14e5d04095988ea18c9e8ea5f6e55f085ce0796a7f0a84633a8506d503b55700155f5b5320ed9b9ae7aa32c9f26c95afdad9ed6e97bb605 SHA512 37bb61296c0f337ba670ab721360fcc22bbff375a7a5f8e612076e49545a34abe83e9c079bcd28c7735145b2f07a60e3b012eb55937999d9c3abab32d7e773d0
 AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63
 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58
-EBUILD mimetic-0.9.8.ebuild 951 BLAKE2B dea52f7d511ff1c0a11752477c2f94e7d547c3f425a64e46cb590efaf116f917d4d8a984035395da39a11959b1f844c3065a2c0a9f4c1cbff34fb5f4a5729922 SHA512 897f203937ee81452058c6acc1e2b703968a376a10d06b1fd0c9ef12502a13bd62ac63f9e005e757af383c3e197a00cc72f137b08c0b71053d9f7a589b601d7f
-MISC metadata.xml 307 BLAKE2B e7b916fd70cef60506087b468d421ad3f2e4858de12815eed8865c4ef02af911c1e06621f81abde9cb88c50763d0cce7f210e9348dba5cb37dc850cff3817059 SHA512 7dc1a2417c2a4a7eb521af83ee15b9fbd50a6f28aa178c1c3bd78d34bc77006aaee58cc6994ede664b4873cff656ab63da5f852cca152f52c7307d9f5172ac9f
+EBUILD mimetic-0.9.8.ebuild 997 BLAKE2B 98479848e22567504865a04b8304c22f3a148fe1affe5a89454fd2565cf1952454aaea876e8181024a195d8ed8a2dcf913f4310788937181ecaebae3ddccf8e6 SHA512 cfa349619b31bf205bcdd3ed640d73e411b0b38d1bb916b4da2c54d7897b0978bf4c8aff29dac4b1b74371927c1fb97d8f6228a8188ff8bc4a54a2cfda661593
+MISC metadata.xml 383 BLAKE2B e3a09c9f6570065172f26e62a088ae0458288176871e88ee9677fb3f4ae78d38814fd31ec864c4ac2211d540c26e9ae43fdfe5264e4c5f17cedc5e20c41e4572 SHA512 ff86c0a6b6b67f03673b8aa9b942913c806c2b7e7d93496d5c65b17122c2f41f0f370093b80280a3ad77f81136eadbf92049174f549715d1933a337bb3d07ecb
diff --git a/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch
new file mode 100644
index 000000000000..d6c6582cd42f
--- /dev/null
+++ b/dev-libs/mimetic/files/mimetic-0.9.8-build-mmap.patch
@@ -0,0 +1,22 @@
+From bf84940f9021950c80846e6b1a5f8b0b55991b00 Mon Sep 17 00:00:00 2001
+From: Stefano Barbato <stefano@parkopedia.com>
+Date: Sat, 27 Apr 2019 15:00:58 +0200
+Subject: [PATCH] better mmap error check
+
+---
+ mimetic/os/mmfile.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx
+index dfc95b7..9627516 100644
+--- a/mimetic/os/mmfile.cxx
++++ b/mimetic/os/mmfile.cxx
+@@ -57,7 +57,7 @@ bool MMFile::open(int mode)
+ bool MMFile::map()
+ {
+     m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0);
+-    if(m_beg > 0)
++    if(m_beg != MAP_FAILED)
+     {
+         m_end = m_beg + m_st.st_size;
+         #if HAVE_MADVISE
diff --git a/dev-libs/mimetic/metadata.xml b/dev-libs/mimetic/metadata.xml
index 0f8f01bc86f9..77dd42e18fd2 100644
--- a/dev-libs/mimetic/metadata.xml
+++ b/dev-libs/mimetic/metadata.xml
@@ -7,4 +7,7 @@
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">tat/mimetic</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild
index 3f54ec09712e..1190360ea4df 100644
--- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
+++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
@@ -1,7 +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
+EAPI=7
 
 inherit autotools
 
@@ -14,9 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc examples"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/signed-char.patch" )
+PATCHES=(
+	"${FILESDIR}/signed-char.patch"
+	"${FILESDIR}/${P}-build-mmap.patch"
+)
 
 src_prepare() {
 	default
@@ -46,5 +49,6 @@ src_install() {
 		dodoc examples/{README,TODO,test.msg,*.cxx,*.h}
 	fi
 
-	rm "${D}"/usr/$(get_libdir)/libmimetic.la || die
+	# bug #778887
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index dfb93160e16a..3fb1ded79afa 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,3 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r2.ebuild 676 BLAKE2B 536eefdd1293a703221436dc4a15d13c841f369a121363abdaa125ad9a2e9720878e26f17525d37338b03fd0dbfb2f864cbe3feddc5f9a794be05d504050c3fd SHA512 236bacf95dba530b0d9272d84306a2462b6d84a24a963447e4ce233e1002d76c78bc3d8b339f0f18e4bbe2ab9a4f9b5cca90948e072d1f73ddb59ebec695f33f
+EBUILD mm-1.4.2-r2.ebuild 677 BLAKE2B 3200d523c550b3929e00f86fad7eaef28f42d2169cea4b3bc51cc9c7f1e10fc02e81482b8f4defbf7dfa03280780121a000c25428355439deb8c1afeef1f34e6 SHA512 24d9701c71a079cd142e8d8853b066b169c087e02e75c0b53b9cef3d11442db597d8f63778445c73d8d4d863f7df305bc76a9978015474c7268e4974859c8549
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index ddbbd173ac9a..b643ff1f18c0 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.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
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 1ba855e6a640..1a8155573e06 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,3 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
-EBUILD mpc-1.2.1.ebuild 894 BLAKE2B f6a2cf87e66b4ceab484c9a175504946cb08bf8a7655ee6ece92baf7683f1c0d418310ebd06a253b3b9fd267c131acbc00f75352b2bd57d5090c7054acd20672 SHA512 bc7cf4f7c3633b8f399effc6abd0698311e540e05b74c690fa207969059d934e22368386601eac33bfac98cd0095d14f079653c2f9a85442ca000dc0d6b10969
+EBUILD mpc-1.2.1.ebuild 895 BLAKE2B 9a642d89025cad75ab3e62c076f96dc181cd8aeae6a7429467fe2059873e13d586d510c73a235120c1fe2fa38f014a2bc8563f9e3d72b6d99a7de00184563be9 SHA512 f864f95a874a05147636d1e00eebcccc0d8ad56fd6ce98f5116d8d5fdfc9cc9c61689150efc9f14c450e90b407871a6899da1b795cd6d912c20bd4e974fbc5d1
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index f82ab1ed44e6..f2b23959fc05 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index dcb8d0626049..ac86a9ef8ce5 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
-EBUILD mpfr-4.1.0.ebuild 1029 BLAKE2B ba9f4e81b4a71eeed8876d34f9797bf35136898002e0744fc688d279bb0dbb4776adb1727bb5b0f74671cab53ecce29daddb6d3de4631c4a21670a26921729c3 SHA512 14d8cfadd8681170b35fc29c6119522181aafd24bc65ee1dcf3bc809c386d3369e2e961daca16b9249a7cf6a37876e005d7fdf7e2ec3e142d66ac60bdcb9a988
+EBUILD mpfr-4.1.0.ebuild 1030 BLAKE2B a1b8777c4f2fe4ac8afd3976f558337939a8e014ca769ca578e4da191ff9979812d0cac14e07d548e62d6894953745dd5c12a784ba9c6e02155ce24f1cbb26be SHA512 7a72b7738bcdd94af674217928b449350f085e9269ee4440dd4d50d3307cf65f77fef95b4ffb16e5f1ffee5a1703f565a0736d9d5600a12a7a2d74fa5266215c
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
index e812670ea0dc..286e23371367 100644
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 1155f413b3e6..5e7d7cc9128b 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,3 +1,4 @@
+AUX mxml-3.2-slibtool.patch 723 BLAKE2B d5e086ac0b600c2314d92224ec37da16b0c1276d2da8032579d95b4ae4eb641c985bd6374411453037779d3cd0d8e86e7d89a445ba263c03d1863968d7e22460 SHA512 3077e580bb44843a09f7a8c80ff05996af70658195eb07e31f5da69409744729e5aacd706ca5f4f91e2ddf75c79f554dbc3667bb6720997c03e8c57ad279db60
 DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
-EBUILD mxml-3.2.ebuild 1409 BLAKE2B afdcf43d2aa69d1b0f6844d87081eb33321dedf69ae21a1ece4002250c189a6ca471c92cd2e23b100bcc7da776173099267be587a2883216f211c761baf79f32 SHA512 dae312aa29973a53c3f352330e6f86acb25e8610208e7d8f36c26de530a7476138f93a7c0a7ead4f6264c81ea0022660051670d7fac1be302ea119b76b651d06
+EBUILD mxml-3.2.ebuild 1456 BLAKE2B 55a8efb6c1e105b247c247de0a347310139f13348ee6e8ddc0096ba915026ddacc1e9cacfce388f0ef77e9ad388a0f7f80eda91087295fb6db3164fba025dfa2 SHA512 506db0f7762d585f208d15202d937d5eb52550ce99fe39450b7d05d5ad904cd0944f9568e554b39931a2824edbad4e461bd4d7308c2ade606818749ab475a092
 MISC metadata.xml 1379 BLAKE2B 9980eb701a13296c1f307c52427336ae892bd9905d86619bea889b3e4ad9fd3cd8dfbe23454c8a562a512628e83fd9cbd2100a2036e607bdf27585599481a9ec SHA512 d3a3de9e7b8ad130622bfa2e689bb1a944e1fb344961fda5ea39ad9fdba754e44bcb225a753834387e7bc490f25667a28422c79ef78ce4324ffb8706d0a71108
diff --git a/dev-libs/mxml/files/mxml-3.2-slibtool.patch b/dev-libs/mxml/files/mxml-3.2-slibtool.patch
new file mode 100644
index 000000000000..b5d0df44df7f
--- /dev/null
+++ b/dev-libs/mxml/files/mxml-3.2-slibtool.patch
@@ -0,0 +1,26 @@
+From 4e2e31236f731c0b7e880078269d9f98f595bfd3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 7 Apr 2021 09:17:52 -0700
+Subject: [PATCH] build: Don't use libtool.
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8c05daf..cdc3450 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,10 +52,10 @@ BUILDROOT	=	$(DSTROOT)
+ # Install commands...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
++INSTALL_BIN	=	$(INSTALL) -m 755
+ INSTALL_DATA	=	$(INSTALL) -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
++INSTALL_LIB	=	$(INSTALL) -m 755
+ INSTALL_MAN	=	$(INSTALL) -m 644
+ INSTALL_SCRIPT	=	$(INSTALL) -m 755
+ 
diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
index 710eb09a6790..b21734763a11 100644
--- a/dev-libs/mxml/mxml-3.2.ebuild
+++ b/dev-libs/mxml/mxml-3.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
@@ -19,6 +19,8 @@ IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-slibtool.patch" )
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index ff726e880557..7a5d7948ef49 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,7 +1,10 @@
+AUX ncnn-fix-glslang-include.patch 326 BLAKE2B 6791c4dea3e81f24ee4e08d9cd62960509f5b15ff458735a3c50877f27944af6a98531787c018dd61764dd30f67c91d813ad0a6d4ef7fc69e0e4bb926be6ac29 SHA512 5cd86899e0d943d83e336cc8da480cf8cc5a9381ae32f9885286473ef6f48fa6846406bf4dfd4c545dbbf2bcd90d81cb8a1ce33b1160163400d3a43ba87fb6d5
 DIST ncnn-20200226.tar.gz 10363010 BLAKE2B 3f5e22ecffc7d36d7babb8c316eb95785f60b2938672cc2fc4a56ae8e4cc79fef8d498032117998a1813b4a5491b4b99f6941ac41be3fe8d6c6e3276ae46396e SHA512 e91694692e2c48ba4b404b26b382939be62c61e8452a09b8c1cdad351adcda1ea8bd19ded671f6c4c6cf979ccc49c181dd47e501a351fe89ecdf17a5395b3fab
 DIST ncnn-20200413.tar.gz 10520160 BLAKE2B 10fc59f3a09d1a6b21a6c73b87dabd450279d2c30923b15266461360c6a63b7cc58f91e33c6563752161de3ca067098ed4f2d22963410fe3f72a8affbd39172e SHA512 3f3610f94cbfa6072347857675865b3b21e4cb330a3b889214e7e8cf6e7a558451979ee4ba727c28fc5919a38b27d3b0288dfbd1bfa06d92d3677b4035b019fd
 DIST ncnn-20200727.tar.gz 10989866 BLAKE2B 27ec105d4ea24b1bcccfb64074f47332515112b7fed7b6f833c6d3fd846542f14248254d076e3d1e63eb16cedb51d16dd156890ca805f4160d7e6ceb3de1b46a SHA512 122653ee4fcf6e45665154ff6014eb3291d48174ec153b27ccb9013bd705a81e664e4c4ad94df5cb3ea661891115929562db45c7c714747fb6f7673b09a16b68
+DIST ncnn-20210322.tar.gz 11339362 BLAKE2B 26848f8c6598c98e10e62717bf4aa86f803b425848bdeebd7dacd752f57174e4c3a7fe56d309cafa150be7cb80176fbd8f487c9fe79bc957e29157b1781fe849 SHA512 78862bdbba3ae4127d856f514ea37903098e8a9e827ccbdc85faa498d8a343b4c404465b7f55d368f2ea867063340f33facf286c2bad6a0587b903ba8bbf2394
 EBUILD ncnn-20200226.ebuild 692 BLAKE2B 3fb887404a2de19dd311439714ece71fd51d84484762f57fadd2a06059a569ae55b39b0cb924e3016312ce3474a03ba1917efe9b100a7d242f7bf9ea68168c35 SHA512 db08ff07cf73c967e31a9a64a361a0e40ac858a3ebb074309e0f0d120392040a5fb5874c6612f9163d2056fce9883d40aadedacbbff2a55ed17f6521b58c0a09
 EBUILD ncnn-20200413.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
 EBUILD ncnn-20200727.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
+EBUILD ncnn-20210322.ebuild 883 BLAKE2B 67350ea55f8bec9dde95b5ee61930d7eafccc59c57a977fd4443ec90552931f088a4bc550290b591d866b573ad2e11ab5729fea4940f21f2a3e13a760bd672f5 SHA512 b0bebef4edf4b905f842a5736868fd67a2c41b0b501e14dfee27011f06f459134f3f7b8c8ffcfbab5891d894d66a3ea124adc27f37540e2b3660f5b4a61a0d13
 MISC metadata.xml 329 BLAKE2B a70f4b06a9dffcd4c7182c52354bda1faa068fdcb5785a1e8ffa40115cf963c89a40a321688618e95ac79e5c5eec1f87772cce5fe2fdf924b57b2c8d914b6660 SHA512 3ba55224bd0842ba5354ce52680471a7e5a364acb96d530bae821c99d3ca4a9e74db67c7f854eb89a7760996e4e4d4f050fb9933077213af0bd5c9a138869f96
diff --git a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
new file mode 100644
index 000000000000..bd96a79e1755
--- /dev/null
+++ b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gpu.cpp b/src/gpu.cpp
+index ce1306c..468cd03 100644
+--- a/src/gpu.cpp
++++ b/src/gpu.cpp
+@@ -21,7 +21,7 @@
+ #include <vulkan/vulkan.h>
+ 
+ #include "glslang/SPIRV/GlslangToSpv.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include "glslang/Public/ShaderLang.h"
+ 
+ #include "command.h"
+ #include "layer.h"
diff --git a/dev-libs/ncnn/ncnn-20210322.ebuild b/dev-libs/ncnn/ncnn-20210322.ebuild
new file mode 100644
index 000000000000..0307bb67e2fb
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20210322.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A high-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn"
+
+SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-util/glslang
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+RESTRICT=test # Tests tries to use real GPU.
+
+PATCHES=( "${FILESDIR}"/ncnn-fix-glslang-include.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
+		-DNCNN_BUILD_EXAMPLES=OFF
+		-DNCNN_BUILD_TOOLS=OFF
+		-DNCNN_VULKAN=ON
+		-DNCNN_SYSTEM_GLSLANG=ON
+		-DGLSLANG_TARGET_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 2f2f4e81c0f5..d984d822aa1c 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,8 +1,8 @@
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
 DIST nettle-3.7.1.tar.gz 2380974 BLAKE2B 2dbc0204623ca9d42d4e4fec0d96e3d1aa164ac63f046198c2827a9eb8946392cbf5dd48a2a77cb98d52591eb83b48092686e3f5eb5dc2ee5f5e92cfaa335f26 SHA512 25567c0546b68851a03741ea69a2959b07cab660a723b193a9043faf1fd9eb4cd7aea72de150bb0717fd2db28e417f03ad31b14e98aec40ad316f1bcf0caf50b
 DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
-EBUILD nettle-3.6-r2.ebuild 1781 BLAKE2B e01bf5e416b31404c955406cc56094f192504a0a9f18e1de009af0376704279a24f7b61f4d6ab713690b81d97a4117ff67aa8f202c64f7dd3a13b736e0583329 SHA512 a34481eeaecaeb8928ec7185a14a747447ed6bccec1b275347a2f20c03c81fbf07dab3ea0b89d2d629234825ed9fc1c2f84997bc88121bb08b68b13064db46a2
-EBUILD nettle-3.6-r3.ebuild 1831 BLAKE2B 52f6b9858662beb73050485055be6eef7982d280bc8da67141a6077db7245c0162e176ebf722068dd6a3a711946070a233e6cb088740e8474eba055333da2bf5 SHA512 53de5e013ca2c84a211d694ff4495c22085a35698122f4b36b3a56444d69c5bb984a7e96d5ee91df0c091f473f864b3b19ba89fa20181ec759b67e4124c566b7
-EBUILD nettle-3.7.1.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
-EBUILD nettle-3.7.2.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
+EBUILD nettle-3.6-r2.ebuild 1773 BLAKE2B 02d33ac86c7654a29d44d8f4be02e4e59cac3f63cd3d0df5d3ca37d8a0e3aa77b2b68648f02607e11d94ae62f0ee1803702ba7cb13311df7db5d31dbb7ce3b27 SHA512 f9598e6f64b7f935709a3f7ae81385e1e5ac2df0653cb818e264b99601e246c1ed75652852e08bf3896b70850793375a0e8d3a1b66c06e80112fa204680e78a1
+EBUILD nettle-3.6-r3.ebuild 1822 BLAKE2B 2de9fecb8d61e2e0b46f146da248290c1d55c8b6ccbc150d37c827bf8d70ad787f27eb6d1a75fde8368553b5b4f7502c781b599669e8680d25ebcb45fe1668ad SHA512 415ef79be7b99269dd09820a424ff7487dbe04eba4493bb078d528d40f3e148b3c34b7e42ec4ed2c67b5b1c66ea6687764861801a04be4cb62f141073778e4ea
+EBUILD nettle-3.7.1.ebuild 1844 BLAKE2B c1488108e31969da2e7cfacef25af839eedb8b93a4d4d7f53c9b6e0236415289e2c475d6fa069e6647c769282fb22e49c7a52e597cdb51e6970f4f6bcbb213fa SHA512 29525e4cb2e5f88bcd013157a24dcd796bc662f3f76534838daf89169b2811db35ffc5343b323cafb2a8d09cadb5fab03f6c1bcc5cdf38cdcb5a749a85857096
+EBUILD nettle-3.7.2.ebuild 1836 BLAKE2B a8109c4bea51c922c1e23a706c33bba6faf27e58931a058a7051b172e7dcbbc244f2589e57ac68bfc47b6f3ddefc1b092462fb764c45506e7dba5034aaa84de6 SHA512 3d112ed3d24c410c1768974a9702a468c3320772aca3565d7d7e9777969bcc1165f5994518d04966ae92f0adc27580348b369ccfd3e3c1cc721c56d30fb796d8
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 9a9d30443dcd..2ee080ecf97c 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild
index 2b02db1d06f0..e7d64d586cfa 100644
--- a/dev-libs/nettle/nettle-3.6-r3.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
diff --git a/dev-libs/nettle/nettle-3.7.1.ebuild b/dev-libs/nettle/nettle-3.7.1.ebuild
index c99897e5e98a..38e1726fa6db 100644
--- a/dev-libs/nettle/nettle-3.7.1.ebuild
+++ b/dev-libs/nettle/nettle-3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
diff --git a/dev-libs/nettle/nettle-3.7.2.ebuild b/dev-libs/nettle/nettle-3.7.2.ebuild
index c99897e5e98a..88f5f2c3fec8 100644
--- a/dev-libs/nettle/nettle-3.7.2.ebuild
+++ b/dev-libs/nettle/nettle-3.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index cc3e3d7fb7bb..1ae92acf4534 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,4 +1,4 @@
 AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
-EBUILD nmeap-0.3-r1.ebuild 1215 BLAKE2B baf3062bd535bbe03c9e1ca12d0a31be57cea8cb6c3fc632fbb0772d43e744de21c0b98b4ff908fae5ae0664e158091bc77f2567ae10d7a949c31cfd59bc1e5e SHA512 d9334116884dc8a31d8d0fd056d65bccd372cb8117467981e9005c4cb54bf6ab470971167cc6cdbd7ed437df319948278560887921789bf091d45dc4a13b5a73
+EBUILD nmeap-0.3-r1.ebuild 1216 BLAKE2B 2f57fc0c90221f88ff6aea08f402c93394772e6f3e0c5d31d1555eeaee98f685c64adfda2d2ee47609d1e210e494bd0ca89bf9294071fb8c4f025b2c9ecc47d5 SHA512 d61cf4288d9f1051d168bcfa01b38df3d576d968a9e5db86334dbf21cacdff3060b863fb9e192b66eb728f50b0e540949a1ca99b7268fef8e23411d995050e97
 MISC metadata.xml 594 BLAKE2B e3a1979b0f92e21be1221c01098c1ff25462ce244ece52e675632cb812dd34ce02ef8f7241da70e1427fccaa920b212b47a03c4cbb99fc679f73795233152a07 SHA512 4f104de142ef75158b7bdd371aab0fd19c318c7d34d51cbaa030ace243cb609788f88d6e548f1659ba891d3d6827c2fe24611bc9a78a67d32315a245eac50f75
diff --git a/dev-libs/nmeap/nmeap-0.3-r1.ebuild b/dev-libs/nmeap/nmeap-0.3-r1.ebuild
index 6684bde5b236..6a69fd4d389a 100644
--- a/dev-libs/nmeap/nmeap-0.3-r1.ebuild
+++ b/dev-libs/nmeap/nmeap-0.3-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
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=( "${FILESDIR}/${P}-fix-unitialized-variable.patch" )
 
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index aaaae6912b7e..e237d680ec11 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,3 @@
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
-EBUILD npth-1.6-r1.ebuild 607 BLAKE2B 6a0b84ecd916c60634f777d8afa145041643995c294b784359f1a6b6e5fd7d4b1b6fcff5b140af155025236f3966ed9cc3390121b35bf62e0741b6bf3eee2df5 SHA512 95fe303819ddc70c039ba912eb34eecc1f088d8a31230c37bc66d5841b49b8bcb049d468fe201112901ee5e01e01b3d7b11d2e22c813db24360803a5bf766959
+EBUILD npth-1.6-r1.ebuild 701 BLAKE2B f1229b95c59b1665f23ce2cb3a2d0288ac063b23d0cfccd8ebfbf48fb0753fc11b3e931728abdb54313cc40be1a30f5a77c3daf864a41b36fda9f2d217b32e01 SHA512 6eacfdf84209c2a692dd47e21ce6a4873bc5db77a82fd7a17d2b6b1bfa3efefeff521a108606ad8690ae7d58d1ef76112d3354ed6e8729acb3914c1cd0717d11
 MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 1255bcd4baea..003688741725 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
@@ -21,3 +21,10 @@ src_prepare() {
 src_configure() {
 	econf --disable-static
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index 48f150076d6c..b80b3a650abd 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,3 +1,3 @@
 DIST nsgenbind-0.8-src.tar.gz 117463 BLAKE2B 63ada11eb9e818bc864b8100d80fda5686d4b1cc2a1b021f6cf76d098f5c6551b2792da6dc8aba02774304d3e87bf9728a85d3c80ccb0c24e4bff5a4fee3f977 SHA512 850769fedc82c103b6d063ba25ec97638178e56f5b331a1e237566b3f3bd858aba270bcd37618c638575f5361ff88a09cdae92f6d2b5dc100491e5cc75c072e5
-EBUILD nsgenbind-0.8-r1.ebuild 624 BLAKE2B 494d4b6c14783c67a9df4c8e22ac8ff9e309dfcc430c7fa65ae204ba39a825603a0cb48106af65d2c16a897a9fc4251e03065787d2079d09ac01912f599eb2a7 SHA512 a5d73dbcf290f0094c3dfbf0332599301dfbd9a53f5af06e53810005267c1e9c85ce84757915e3d4c5e61fe58ae831665882da6ce112886264ce61b7935ae1bc
+EBUILD nsgenbind-0.8-r1.ebuild 631 BLAKE2B d3bbcbb1d6074bd4282c00446c2d5af18554a0fc3f075ef504a90dc4949a299acbc79374d738fe2fbf98d8c35c063d40e90e1744d46fc2825092fc5bd358ec9c SHA512 3da00a88837bc9d9eec0fd95f2555ed9b53fe34f263c2fafa794693e0fe710cfe5594d5a7c07e5c5588102030d0fd885c15075483c0a88459439f816d28798b4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
index 353b0a1d9722..6026522fef7c 100644
--- a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
+++ b/dev-libs/nsgenbind/nsgenbind-0.8-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
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b47bf5ae63b2..ccce50eaffe5 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -5,14 +5,6 @@ AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
-DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7c71400e691dc3e882ec6d63cbf13996eb1ae1a03a294def419e1669e38fe42990c66efedce03f121087e6c SHA512 d6632cde3570ee386ee1459257eba99f91dd62fa905fd82679222c83d63c185b76d8dca0422d4349de2dfce603472ae52bc0dcced0f142acb733374c74155d3c
-DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
-DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
-DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
 DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
-EBUILD nspr-4.26.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
-EBUILD nspr-4.27.ebuild 3904 BLAKE2B 24d7d9a95cb45cca71357f4f8adc5d7f1b04f2eddb3a36df4ba9ec078d6ec0eb1155157d30f83d3ea01a2ffb6a447266386ae54c838af8535698a1de17061831 SHA512 d8c2002a06f296b3937501637d2de6fc6dcb11fd23f7fd0e83c91b3574751169b91c074edcd63747f94911207a7ef8ea2cadfd8310df34759391191974eeaf78
-EBUILD nspr-4.28.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
-EBUILD nspr-4.29.ebuild 3896 BLAKE2B 8adfe2c29c34d2c67ee88bdcaddb57b7b5892ea9cad4bbe811d8c24aee0398da8678ea036ddc04aa6f291f0b241346ea567d4cbb125002876e2bc71aa1414e5a SHA512 276ce63679d11ae47c2734144c10386dbe227ef8cb703b7f7689ee471e66c5604426dfddb2edec4d2e7459edc7f149b81442adaa52b23ed0e28b83a7e14b4411
-EBUILD nspr-4.30.ebuild 3905 BLAKE2B beffe244b6b9b998f3b2dfd58245deb316872b38e341eb5eea14400d2cae82609b6b369ff7a2409d3ffa3c3a62ea7bee155cd90396a57604517bda50a8236af4 SHA512 64ca9f3d0b72e8002dbc6cb4e303055ac394cbf4db3e953b2ca0c96b66433aa99b818fc711d62cbd62344d8338430cd3f132b7e1cc5303937faa30bca57a02d7
+EBUILD nspr-4.30.ebuild 3897 BLAKE2B d8eea75f84f2e4e06469394528dfccdfd1a9f82ae4c301445111e2a942123bade2de6f04d305198cffc179ec9ac6a1b6c37c3d4f0e164ae6b5f4b81f1cce6e29 SHA512 ea58e507ddf472f5fa560344dab8ca4f3022b4bbdc4f8805183d1142bd5ae7280f6638acd2a74decb0184c037cca0ea5ef8feb09ec580f4a376bab3ff01af637
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
deleted file mode 100644
index d3b29336fc1a..000000000000
--- a/dev-libs/nspr/nspr-4.26.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.27.ebuild b/dev-libs/nspr/nspr-4.27.ebuild
deleted file mode 100644
index d88655c54b85..000000000000
--- a/dev-libs/nspr/nspr-4.27.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
deleted file mode 100644
index d3b29336fc1a..000000000000
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
deleted file mode 100644
index 72a4a2f0f762..000000000000
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="https://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.30.ebuild b/dev-libs/nspr/nspr-4.30.ebuild
index e6c6b0dfafd2..1c632936ea8e 100644
--- a/dev-libs/nspr/nspr-4.30.ebuild
+++ b/dev-libs/nspr/nspr-4.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 3ffe43e7ca93..ff147aaba975 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -4,5 +4,5 @@ DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452
 EBUILD nss-pem-1.0.6.ebuild 717 BLAKE2B 6e91bc089f8202ebd11485f70e634698aa8b037c19d32c0412c412316e504fc396298fa8fb6477606457b924dfd1af0bdac72a263f3502e7af3abb20d581acf3 SHA512 8b0102f0110b02740e6e19790b6d7cbde13a60b5bd3beab3626fe31883c5f96672c6c8f2d93ab51b7e20fc6a1c9fec95ce8ac05f58ca86b670718074d1e3501e
-EBUILD nss-pem-1.0.7.ebuild 705 BLAKE2B 74d4b74cc269e43b628e60d24f6d15720bea2eb23846508e44777b0d566ec407b8d2aef448e9b949a3f55c377f371a2a451f93be9be9dcce593272f9ac10d5cd SHA512 1d01a928410061b35200268f1e1a938a2baf4ee0cb8d390353fd71e98a0b505d370e906b1045bf86815e4289db1354c604743e42f1e4bb0baa9193b0d1413a00
+EBUILD nss-pem-1.0.7.ebuild 702 BLAKE2B 410d9a2f78d5966dd5f26deba58716e841608cad779c9284fd77af7d0f0a0c76d5dfeea998237cca2130b2e955cc54a26e874534abef0f7c89571ebbef049a68 SHA512 11e2af21ddffc0f5266508e99d6c5881fd3d08d2c7edb68ea00c739fff075d2f26fdcf6a677fba2f60905d9c722acd6ec6bc2c92099b4398bd4b938c7f0e5495
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
index 7ff29704683a..e43a5cdaac95 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c9348020ea5c..a6379d034c46 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,13 +1,9 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
-AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
-DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
-DIST nss-3.63.tar.gz 82167087 BLAKE2B 3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9 SHA512 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
-DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.58-r2.ebuild 9243 BLAKE2B d064a59fb9780ffa37454397ff738b4ba91ceca46d98facfd9e2fff2f73980280a3ed06bc02d5ea8ba6915440c4cbf697006484cb5580fae8b16472230f01186 SHA512 ebf3a0df5de6170fa14428bfeae73d8a34d02bf010c9cac49d9edcfbc3303044dde0bd28d6b330f327a9f4f7e8cf9fe2b7b1fad8dba19768fbc51aee06ceaac9
-EBUILD nss-3.62.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
-EBUILD nss-3.63.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
+DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
+DIST nss-3.64.tar.gz 82173054 BLAKE2B 4786a1ff6f4e47dbb6bfef6a2bc47ffeac51aa37f12168872d23799b8d6ca440578acf512e9ec7563ef64331d3fd84c387f17e41afa2ee30d8623c6f66207631 SHA512 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
+DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
+EBUILD nss-3.63.1.ebuild 9222 BLAKE2B ef1afc1f6d05c0b1797759b093a1e5baa00d75371f6260302d2fe998d0b5d4f7dcfbb0ed05f21a122b5a9ed210d5e4f520353ff403d62c80d6cedc225a08fb94 SHA512 f7c24d8da1afe3514c4019b054d710061d095a808ebca71b1147eff17af1b62fb22d8853692a6820b70e3aae24e617f029f2767395b8fa1776698d0c6593f003
+EBUILD nss-3.64.ebuild 9230 BLAKE2B b75b7ae2b93705d2d87560a4307ef92691c5d9e566e3fd5c91362457a083a20f188671478f8bb03eece5ee599ef9725e67fe00a3d47e5dfae3d22d616f81fbf5 SHA512 7cc7697cf96188d5eacd43d849e9df72ce16fdc60f9e8833411941ffb653db68657aa57fa9ccef82936fc09e947a55d983c2727deeba0510569a03502631e7b5
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch b/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
deleted file mode 100644
index 962b9cb1eedb..000000000000
--- a/dev-libs/nss/files/nss-3.53-fix-building-on-ppc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
-
-From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
-From: Lauri Kasanen <cand@gmx.com>
-Date: Mon, 1 Jun 2020 12:11:45 +0300
-Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
- ABI version 2 is not compatible with ABI version 1 output
-
-Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
-
-Currently make only, I don't have enough gyp-fu to do that side.
-However, the reporters of 1642174 and 1635625 both used make, not gyp.
-
-Signed-off-by: Lauri Kasanen <cand@gmx.com>
----
- lib/freebl/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
-index 5f7384429..e0461c7d3 100644
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
- endif
- ifeq ($(CPU_ARCH),ppc)
-     EXTRA_SRCS += gcm-ppc.c
--    ASFILES += sha512-p8.s
- ifdef USE_64
-     DEFINES += -DNSS_NO_INIT_SUPPORT
-+    PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
-+    ifeq ($(PPC_ABI),2)
-+        ASFILES += sha512-p8.s
-+    endif
- endif # USE_64
- endif # ppc
- endif # Linux
--- 
-2.19.1
-
diff --git a/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch b/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
deleted file mode 100644
index a92c03899360..000000000000
--- a/dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-
-# HG changeset patch
-# User Daiki Ueno <dueno@redhat.com>
-# Date 1603691171 -3600
-# Node ID b03a4fc5b902498414b02640dcb2717dfef9682f
-# Parent  6f79a76958129dc09c353c288f115fd9a51ab7d4
-Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
-
-Summary:
-This flips the meaning of the flag for checking excessive CCS
-messages, so it only rejects multiple CCS messages while the first CCS
-message is always accepted.
-
-Reviewers: mt
-
-Reviewed By: mt
-
-Bug #: 1672703
-
-Differential Revision: https://phabricator.services.mozilla.com/D94603
-
---- a/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-+++ b/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-@@ -343,29 +343,28 @@ TEST_F(TlsConnectStreamTls13, ChangeCiph
-   // Client sends CCS before starting the handshake.
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-   ConnectExpectAlert(server_, kTlsAlertUnexpectedMessage);
-   server_->CheckErrorCode(SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER);
-   client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
- }
- 
--// The server rejects a ChangeCipherSpec if the client advertises an
--// empty session ID.
-+// The server accepts a ChangeCipherSpec even if the client advertises
-+// an empty session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
-   EnsureTlsSetup();
-   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
- 
-   StartConnect();
-   client_->Handshake();  // Send ClientHello
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));  // Send CCS
- 
--  server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
--  server_->Handshake();  // Consume ClientHello and CCS
--  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+  Handshake();
-+  CheckConnected();
- }
- 
- // The server rejects multiple ChangeCipherSpec even if the client
- // indicates compatibility mode with non-empty session ID.
- TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
-   EnsureTlsSetup();
-   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
-   EnableCompatMode();
-@@ -376,36 +375,37 @@ TEST_F(Tls13CompatTest, ChangeCipherSpec
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
- 
-   server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
-   server_->Handshake();  // Consume ClientHello and CCS.
-   server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
- 
--// The client rejects a ChangeCipherSpec if it advertises an empty
-+// The client accepts a ChangeCipherSpec even if it advertises an empty
- // session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
-   EnsureTlsSetup();
-   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
- 
-   // To replace Finished with a CCS below
-   auto filter = MakeTlsFilter<TlsHandshakeDropper>(server_);
-   filter->SetHandshakeTypes({kTlsHandshakeFinished});
-   filter->EnableDecryption();
- 
-   StartConnect();
-   client_->Handshake();  // Send ClientHello
-   server_->Handshake();  // Consume ClientHello, and
-                          // send ServerHello..CertificateVerify
-   // Send CCS
-   server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
--  client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
--  client_->Handshake();  // Consume ClientHello and CCS
--  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+
-+  // No alert is sent from the client. As Finished is dropped, we
-+  // can't use Handshake() and CheckConnected().
-+  client_->Handshake();
- }
- 
- // The client rejects multiple ChangeCipherSpec in a row even if the
- // client indicates compatibility mode with non-empty session ID.
- TEST_F(Tls13CompatTest, ChangeCipherSpecAfterServerHelloTwice) {
-   EnsureTlsSetup();
-   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
-   EnableCompatMode();
---- a/lib/ssl/ssl3con.c
-+++ b/lib/ssl/ssl3con.c
-@@ -6640,21 +6640,17 @@ ssl_CheckServerSessionIdCorrectness(sslS
-         if (sentFakeSid) {
-             return !sidMatch;
-         }
-         return PR_TRUE;
-     }
- 
-     /* TLS 1.3: We sent a session ID.  The server's should match. */
-     if (!IS_DTLS(ss) && (sentRealSid || sentFakeSid)) {
--        if (sidMatch) {
--            ss->ssl3.hs.allowCcs = PR_TRUE;
--            return PR_TRUE;
--        }
--        return PR_FALSE;
-+        return sidMatch;
-     }
- 
-     /* TLS 1.3 (no SID)/DTLS 1.3: The server shouldn't send a session ID. */
-     return sidBytes->len == 0;
- }
- 
- static SECStatus
- ssl_CheckServerRandom(sslSocket *ss)
-@@ -8691,17 +8687,16 @@ ssl3_HandleClientHello(sslSocket *ss, PR
-         if (sidBytes.len > 0 && !IS_DTLS(ss)) {
-             SECITEM_FreeItem(&ss->ssl3.hs.fakeSid, PR_FALSE);
-             rv = SECITEM_CopyItem(NULL, &ss->ssl3.hs.fakeSid, &sidBytes);
-             if (rv != SECSuccess) {
-                 desc = internal_error;
-                 errCode = PORT_GetError();
-                 goto alert_loser;
-             }
--            ss->ssl3.hs.allowCcs = PR_TRUE;
-         }
- 
-         /* TLS 1.3 requires that compression include only null. */
-         if (comps.len != 1 || comps.data[0] != ssl_compression_null) {
-             goto alert_loser;
-         }
- 
-         /* If there is a cookie, then this is a second ClientHello (TLS 1.3). */
-@@ -13061,25 +13056,24 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip
-          * will fail if the server fails to negotiate compatibility mode in a
-          * 0-RTT session that is resumed from a session that did negotiate it.
-          * We don't care about that corner case right now. */
-         if (ss->version >= SSL_LIBRARY_VERSION_TLS_1_3 &&
-             cText->hdr[0] == ssl_ct_change_cipher_spec &&
-             ss->ssl3.hs.ws != idle_handshake &&
-             cText->buf->len == 1 &&
-             cText->buf->buf[0] == change_cipher_spec_choice) {
--            if (ss->ssl3.hs.allowCcs) {
--                /* Ignore the first CCS. */
--                ss->ssl3.hs.allowCcs = PR_FALSE;
-+            if (!ss->ssl3.hs.rejectCcs) {
-+                /* Allow only the first CCS. */
-+                ss->ssl3.hs.rejectCcs = PR_TRUE;
-                 return SECSuccess;
--            }
--
--            /* Compatibility mode is not negotiated. */
--            alert = unexpected_message;
--            PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+            } else {
-+                alert = unexpected_message;
-+                PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+            }
-         }
- 
-         if ((IS_DTLS(ss) && !dtls13_AeadLimitReached(spec)) ||
-             (!IS_DTLS(ss) && ss->sec.isServer &&
-              ss->ssl3.hs.zeroRttIgnore == ssl_0rtt_ignore_trial)) {
-             /* Silently drop the packet unless we sent a fatal alert. */
-             if (ss->ssl3.fatalAlertSent) {
-                 return SECFailure;
---- a/lib/ssl/sslimpl.h
-+++ b/lib/ssl/sslimpl.h
-@@ -705,20 +705,17 @@ typedef struct SSL3HandshakeStateStr {
-     sslZeroRttIgnore zeroRttIgnore;       /* Are we ignoring 0-RTT? */
-     ssl3CipherSuite zeroRttSuite;         /* The cipher suite we used for 0-RTT. */
-     PRCList bufferedEarlyData;            /* Buffered TLS 1.3 early data
-                                            * on server.*/
-     PRBool helloRetry;                    /* True if HelloRetryRequest has been sent
-                                            * or received. */
-     PRBool receivedCcs;                   /* A server received ChangeCipherSpec
-                                            * before the handshake started. */
--    PRBool allowCcs;                      /* A server allows ChangeCipherSpec
--                                           * as the middlebox compatibility mode
--                                           * is explicitly indicarted by
--                                           * legacy_session_id in TLS 1.3 ClientHello. */
-+    PRBool rejectCcs;                     /* Excessive ChangeCipherSpecs are rejected. */
-     PRBool clientCertRequested;           /* True if CertificateRequest received. */
-     PRBool endOfFlight;                   /* Processed a full flight (DTLS 1.3). */
-     ssl3KEADef kea_def_mutable;           /* Used to hold the writable kea_def
-                                            * we use for TLS 1.3 */
-     PRUint16 ticketNonce;                 /* A counter we use for tickets. */
-     SECItem fakeSid;                      /* ... (server) the SID the client used. */
- 
-     /* rttEstimate is used to guess the round trip time between server and client.
-
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
deleted file mode 100644
index 50de523f59f0..000000000000
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.29"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-	"${FILESDIR}/${PN}-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.62.ebuild b/dev-libs/nss/nss-3.63.1.ebuild
index 5e3240e8db8d..106c5b77225a 100644
--- a/dev-libs/nss/nss-3.62.ebuild
+++ b/dev-libs/nss/nss-3.63.1.ebuild
@@ -11,11 +11,11 @@ RTM_NAME="NSS_${PV//./_}_RTM"
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="cacert utils"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
@@ -42,14 +42,12 @@ PATCHES=(
 )
 
 src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
 	default
 
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+	fi
+
 	pushd coreconf >/dev/null || die
 	# hack nspr paths
 	echo 'INCLUDES += -I$(DIST)/include/dbm' \
diff --git a/dev-libs/nss/nss-3.63.ebuild b/dev-libs/nss/nss-3.64.ebuild
index 5e3240e8db8d..f05b462f30da 100644
--- a/dev-libs/nss/nss-3.63.ebuild
+++ b/dev-libs/nss/nss-3.64.ebuild
@@ -11,7 +11,7 @@ RTM_NAME="NSS_${PV//./_}_RTM"
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
@@ -42,14 +42,12 @@ PATCHES=(
 )
 
 src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
 	default
 
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+	fi
+
 	pushd coreconf >/dev/null || die
 	# hack nspr paths
 	echo 'INCLUDES += -I$(DIST)/include/dbm' \
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 3f88da05a328..bb31dad2e152 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,8 @@
 DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
-EBUILD oniguruma-6.9.6-r1.ebuild 1486 BLAKE2B 9196a06dc0641952398e978e142ebf212193dda3529edc2fc3bef52d32a7efec4b6350a8754434df02dd69291cd6cba0c8f25c239e8f629abd632b5854819a96 SHA512 db2c5faeb079d697872cf44e37648e8135d2da3c56e867820c5d58c2ef261cca2619978f6f5d0338c6ba6e21e4cad4f82ba6263a50fd0d59539918b782580ec6
+DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
+DIST onig-6.9.7.tar.gz 935733 BLAKE2B dcabf46429ba1a99fb3c645144ee68cba2594ae30972dbfedc229eaca0686c32b776688218c68564a8c24f9f782f84901cd81bca01e2126ec39c742c002a517c SHA512 eba6057f87ef5897fe72d4535942e005329ec532db2f4cf8d5e901c478c151eedf3886ce04d595c406e2d5ad98273c0c2696eb46da5ee359b24f8221531e1f5a
+EBUILD oniguruma-6.9.6-r1.ebuild 1487 BLAKE2B 7d1f980c6b2ff38dfd80e68632b9d769c4be4ff04dec7c4fdaf4011e066e7860a59bf3326af4017d68ecfc065d3d4a7fbb1cd4b3fc5a91887dd6ad70bc4e8df7 SHA512 1fcec2d9665c2bb992fba0f2cf0b5883397eafad5c4cea454fe3e2619a588d88924bd07a380bdf7163a9a515f9eed3f28674eef4d71ba7fa6f6a636dd173bb6c
+EBUILD oniguruma-6.9.7.1.ebuild 1293 BLAKE2B e08073844fa4976597cd780c938f780b20d9d32804e415d554a2d45bf67370a14b7a6bf6f47f6cd3ba4101e04cf79f9d060d9266e4666892fb98540ccc2f0c10 SHA512 ff026347150e916bbf676a11093df79b162f701850be502de715386a4c6c6c522ead8f51e882fccd5f0ff71ba75ead4d2ad44704e3289eb6972c9a3dbc17e88c
+EBUILD oniguruma-6.9.7.ebuild 1284 BLAKE2B 0918276e5fcc2dbb2c67e3a650d05e6e00cf9ebe1f7d79dba01eaadbc545ae5a312af2d689b2df4c699922d68cb4d4366395e20157c07047702ff4edeef10325 SHA512 7e9e0ec5344f12d49016983a54ec0d34579be7f8b5b9f685878eba5c444933eca1b097bd132a09ce6df79c7829e2fca24b86669d8b739670491ee79e8d030384
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B a501302d3a207054c966c8fb3bfc56fef6a301e8e33ffa406d4a2c5fc40d63d12babe0733a43322a7aed4894ab82f215a586b7f8038b4d38f0f73db6c855cc17 SHA512 1e261ffa3fa322957e5cbc4d78e7f7cc7b690f35e68af298d85bbefd673365a134d2b7c3637a741b427fc95b658e7e942f9cdf3a8958edb501d2098906ca025d
 MISC metadata.xml 913 BLAKE2B 1a3f13483acefa02561c779bd419f49dad5ea2abb5b6a1cf42825674bb3a9076fa7890de17b60dd8b10e975908add14575c166a00ce5e5e5c403fd29969c4cbb SHA512 c79b54199a79a798074aa0c52cf60dc2f019184c99f15a60b07adab2a34d65697fd864d5ce1405de2df1bc013defab86d4a2e1e27b2ea970aca0819dd8d967d0
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
index a4c616e538da..57411083c8d4 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
new file mode 100644
index 000000000000..46eb96a4eefe
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-$(ver_cut 1-3)"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild b/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
new file mode 100644
index 000000000000..a600340da373
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index b0a70734fd53..87ce8b9a91c0 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
-EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 MISC metadata.xml 340 BLAKE2B ade1ca3014eb1b6b36aa11078944e4b13ecdc02ee889751c1c69bf85d320a75dc70c5f74bd24aa69ed4822f966ad218f4742c3249e2b2aa2f51f21ab9cf07064 SHA512 599a65843a54b48228a37ee4e8219e5b128bdf2e6f998fd397292e0aa6466a5b0b1ce3977c1aa8ce9341778975cace7ffb890ba66a2c1c7ac44934ce9891e906
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
deleted file mode 100644
index 566faffb1de0..000000000000
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-MY_PN="OpenCL-ICD-Loader"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Official Khronos OpenCL ICD Loader"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-util/opencl-headers
-	!app-eselect/eselect-opencl
-	!dev-libs/ocl-icd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Until the next upstream release. Bug #716410
-	if use test; then
-		append-cflags $(test-flags-CC -fcommon)
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
-	cmake_src_test
-}
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 2be5a03ee0d8..6930d9ca9f48 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,4 +1,4 @@
 AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd42e2893cf540484fa6b3bd914400c2fd39067e8cfc29d030691fd0e4e4fb83b229bc2c03085e5df2f0 SHA512 3bdc6d2f87b2209163ad08915afa900f9c14324d3e48619cffe462c3c651996fe0e0b485eb6331552fcb22297cfa7bda9b6440a8bad9419d6835a047f1b2a0e9
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
-EBUILD opencryptoki-3.6.1.ebuild 3100 BLAKE2B 8775c159cf881eaa7d3b2f10125c84b34ed008490e06f7addf110b9cf4a27a884f02a43c32bdc31508de0f0dc51afadb1e5842f9d28a84966223be2a85158046 SHA512 d44e5d8f572b380245a9fa330fb423867e7cc1118a3c3201cb41414768510e3cb34ee513c7be6af166461b73f60c84c843800af400d1ff276501b1f11fb23512
+EBUILD opencryptoki-3.6.1-r1.ebuild 3103 BLAKE2B 57e38cc7df3d6f198f471118bd839204223171aaeb0449f0ddb89e0970794cbc599d2589df320a329af38bf97c7d5d6cf20a6e81478b70901cca6413b58424f1 SHA512 97d7e7fa252b534e3ae696b6f4f365dcd993d12b4c2f2841e8a897a4f60ccafd57538cbfd928d621c7ddda666c1e33541ee48bdc2bb281fd02dbab89e92e7aef
 MISC metadata.xml 375 BLAKE2B e00a1038bf53c0b8a93ee545e4674dcd7081a70874f5a3fe94794cf65b47d34cd94ccf512c8340b8b84170205840afbdc785dcd49b8391cdfdb655830a483c6b SHA512 fb29b7702172d4e47fe7cb29ec502f9ff0e1f713181ea5af7834a776b2844f4f5d51972764d4bf62088325c498d48a17479856ba5d24ef050af3d3f835c58352
diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
index f3666b16096e..a391a24d3fa4 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1-r1.ebuild
@@ -1,13 +1,14 @@
-# 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 multilib flag-o-matic user
+inherit autotools flag-o-matic
 
 DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="https://sourceforge.net/projects/opencryptoki"
 SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz"
+S="${WORKDIR}/${PN}"
 
 # Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
 # token sources are under CPL-1.0 already.
@@ -16,10 +17,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
-RDEPEND="tpm? ( app-crypt/trousers )
+DEPEND="
+	tpm? ( app-crypt/trousers )
 	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-	libressl? ( >=dev-libs/libressl-2.7.0:0= )"
-DEPEND="${RDEPEND}"
+	libressl? ( >=dev-libs/libressl-2.7.0:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/pkcs11
+"
 
 DOCS=(
 	README AUTHORS FAQ TODO
@@ -31,12 +37,6 @@ DOCS=(
 # things that we're not interested to.
 RESTRICT=test
 
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	enewgroup pkcs11
-}
-
 src_prepare() {
 	default
 	mv configure.in configure.ac || die
@@ -74,24 +74,25 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
 
 	# Install libopencryptoki in the standard directory for libraries.
 	mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die
-	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
+	rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so || die
 	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
 
 	# Remove compatibility symlinks as we _never_ required those and
 	# they seem unused even upstream.
-	find "${ED}" -name 'PKCS11_*' -delete
+	find "${ED}" -name 'PKCS11_*' -delete || die
 
 	# We replace their ld.so and init files (mostly designed for RedHat
 	# as far as I can tell) with our own replacements.
-	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d
+	rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d || die
 
 	# make sure that we don't modify the init script if the USE flags
 	# are enabled for the needed services.
-	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
+	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init || die
 	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
 	newinitd "${T}/pkcsslotd.init" pkcsslotd
 
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index d7ee9eaa095f..d2222ab6d4a0 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,4 +1,5 @@
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1725 BLAKE2B cc4ca9e888e1b67f5f6c486ce34fdc50b54a11b37d17d85935e026e9b41e4998fcab32cbb8a642938f9a052b77980cadba2e906bb39a71cd14b3b450d4319f6f SHA512 0f567dfda5421d78b3f680a717622c7252a2a9f667e65ae42f2ec13f8ae2408c98c64bcf86ca01756811649abc25d0594807da7252fe6c4af6d9e90d7be456e8
+EBUILD openct-0.6.20-r4.ebuild 1734 BLAKE2B e9e193badd4a5236e18f6adb5ea278edcc7f3458000eca74191310fcbf9cd58dcc18bcd25533f5a0ef848a6545514572ca8c5425b368dcc7b10d689b65cd7fec SHA512 42ab456144313113ee22de1b6e643624f9f8c1a2057feedbf49021cd68e381818ab9e01a8650a9c6612b173b687d69d5cd612515209a3e44a88a7c4db264e51c
+EBUILD openct-0.6.20-r5.ebuild 1725 BLAKE2B a014f0a6706343c5b4b77baf23d1731533029cbd2a07e1ab289a07c95c6d7113df964bbe010e156dce36564c9af34770cfa01e7fa914fce38a4674787e08c575 SHA512 3259da10043b859c7f46f56b869b5c4408abcf2ee305b131a243b703bfbe56fd7f0d50dfdf129b49c68ce07a23ea1e09247369c16b2b14839c98226d768abd26
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index a9c60e5a3817..7c44328e3709 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic multilib udev user
+inherit flag-o-matic udev user
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
 SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc pcsc-lite usb debug"
+IUSE="doc debug pcsc-lite usb"
 
 RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
 	usb? ( virtual/libusb:0 )
@@ -35,7 +35,8 @@ src_configure() {
 		--enable-non-privileged \
 		--with-daemon-user=openctd \
 		--with-daemon-groups=usb \
-		--enable-shared --disable-static \
+		--enable-shared \
+		--disable-static \
 		$(use_enable doc) \
 		$(use_enable doc api-doc) \
 		$(use_enable pcsc-lite pcsc) \
@@ -45,8 +46,9 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${D}"/usr/$(get_libdir)/openct-ifd.*
+
+	find "${ED}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/$(get_libdir)/openct-ifd.* || die
 
 	udev_newrules etc/openct.udev 70-openct.rules
 
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
new file mode 100644
index 000000000000..12d4c000e8c6
--- /dev/null
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic udev
+
+DESCRIPTION="library for accessing smart card terminals"
+HOMEPAGE="https://github.com/OpenSC/openct/wiki"
+
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc debug pcsc-lite usb"
+
+DEPEND="
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
+	usb? ( virtual/libusb:0 )
+	dev-libs/libltdl:0=
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/openct
+	acct-user/openctd
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_IFDH
+
+	econf \
+		--localstatedir=/var \
+		--with-udev="$(get_udevdir)" \
+		--enable-non-privileged \
+		--with-daemon-user=openctd \
+		--with-daemon-groups=usb \
+		--enable-shared \
+		--disable-static \
+		$(use_enable doc) \
+		$(use_enable doc api-doc) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_with pcsc-lite bundle /usr/$(get_libdir)/readers/usb) \
+		$(use_enable usb)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/$(get_libdir)/openct-ifd.* || die
+
+	udev_newrules etc/openct.udev 70-openct.rules
+
+	newinitd "${FILESDIR}"/openct.initd openct
+}
+
+pkg_postinst() {
+	elog
+	elog "You need to edit /etc/openct.conf to enable serial readers."
+	elog
+	elog "You should add \"openct\" to your default runlevel. To do so"
+	elog "type \"rc-update add openct default\"."
+	elog
+	elog "You need to be a member of the (newly created) group openct to"
+	elog "access smart card readers connected to this system. Set users'"
+	elog "groups with usermod -G.  root always has access."
+	elog
+}
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index dcdd1df2f172..a0dc452ee086 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,4 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
-EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
 EBUILD openobex-1.7.2-r2.ebuild 1093 BLAKE2B e90f1bcf3c18d19114c7f52dfe168e04af5312f61b633c77df9994118ce9d68e5b419a34ea5e02bd361ab33f56261b42639346c4d2bd5ce680149922c1ccd81a SHA512 df464b66c3b92e73d7b662b3fb62cc6d062777f1dadfd1963af95feca2e7e7a90baf77d5b94ca272a4f8ad2a48be06675a8baef63aee1eb3881978dd122b8579
 MISC metadata.xml 390 BLAKE2B 4e99b94506bfbb231f3c852ef5810db630a1bcc61406e7bd55ef424643f1bd4b4ff4acd30a291b6efdaa4c5a72d363dce7dc4e44e9f371683eb707b58541a95d SHA512 33e975ea200b31202c0751cd95f0e3757b9a7fcdd74c232e93b11c4d51458cc1780c4ba2a9c8b8cc85db7f245685b072b7dac2fd4644fa2719f9d2a6b7b673fb
diff --git a/dev-libs/openobex/openobex-1.7.2-r1.ebuild b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
deleted file mode 100644
index edcdf803d0a7..000000000000
--- a/dev-libs/openobex/openobex-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils udev
-
-DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
-HOMEPAGE="https://sourceforge.net/projects/openobex/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
-IUSE="bluetooth doc irda usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:= )
-	usb? ( virtual/libusb:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${P}-Source"
-
-PATCHES=( "${FILESDIR}/${P}-version.h.patch" )
-DOCS=( AUTHORS ChangeLog README UPGRADING.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
-		-DOPENOBEX_IRDA=$(usex irda)
-		-DOPENOBEX_USB=$(usex usb)
-
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 43f0d3d52228..17db0c72f352 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -9,6 +9,6 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab86433795
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
-EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4961 BLAKE2B c7df84cfeaa20321bd4325b80dcdf05030d9b1b05d6e1a59521fd32354c350afcbbe4acce8952508f21cbe01ff644cdebb42e6aeea7a2f7d4974d38291d781d4 SHA512 ac4308c5d28481bf492007879d284be72742a7c3f846debd6f010250a3c714082a0d9a00dfcb69d473960a608d0649c555d7aa1fdfacd79f28329859606d79cb
-EBUILD openssl-compat-1.0.2u-r1.ebuild 7765 BLAKE2B 14149b50171790fa67e53358e9b17cb0aae83c162472789f31d60c615a917679e7734e6bb5b7a7637f5957a84e09f06f6dd8a3e2f698ba3626d45c740424a1d4 SHA512 1727bbc6ca47cdbf6ee0940ab16fa6b3a57a3a27ffd3866687a0f8fe833cfc24c271d6bc2f2fd7dd4f6833b54458c6e7b3b2d60a4b98108e208c69cd94c1dec4
+EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4945 BLAKE2B 68b7267977a3fb5319c05af867706c2929df497b76732059d9d95dbf4af9110f6949574771a58220aa92e281d6d2581fdba639225eade564619e44d47a793897 SHA512 e3f5c1f2998b7e0c0dc4cd0c0e068e1c0ddae237a2a7852b497f9492ade24b6ebf8134bc433035accc3a7d9467cf615e20d0a2b79da9e33bf46c6f80d34b18c2
+EBUILD openssl-compat-1.0.2u-r1.ebuild 7756 BLAKE2B 807839a953f771a269573eee0dcdbf0f25434aeb98c958adf40a53ed0abf773b3b0563149353084026d273a48aad6d5cf925adfd9e72f2caccb2cc2f02e8013d SHA512 76d29fbefdcb46989cbd84e52769996c3faf14547b765ca1d2ec3a549652ed95ba695a93b8c6ec0c914eee00f8728ae04f5757fa4bac520bbb95591914cadabc
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
index ba39e4f76d4d..e683f59fccfc 100644
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
 EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 #PLEVEL=$(printf "\\$(printf '%03o' $((${PV##*_p} + 96)))")
 PLEVEL='h' # _p8 -> tr '[1-9]' '[a-i]' -> 'h'
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
index 1501ae504d38..4ba9941176cb 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 # openssl-1.0.2-patches-1.6 contain additional CVE patches
 # which got fixed with this release.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d11a48814754..9eb64976036f 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -5,11 +5,7 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab86433795
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
-DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
-DIST openssl-1.1.1j.tar.gz 9823161 BLAKE2B e5699abeca83acd82546e74a0645f2a765d51f22226f8c537d92285eb0b11e12b0a9476cbd3cb6a594e9840433d713be39884fb4dcd5c3968b36ad4f582ed23a SHA512 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
-EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
-EBUILD openssl-1.1.1i.ebuild 10262 BLAKE2B bf22af5fa5b25103bdefe046949fe26e6ca78dbf5f9965e2cafc4e08f927bbf8baa478296dfce2f182c13f1576e87ae3f257c18da16a1cc3cfb6c2f2862098ff SHA512 047c34d02e00529450d982dc891a9bc0319f8e7d1f3cdad70d8954f0c463b3c7621005382c091f282982337ea0f2d397038bfcdf2bfad99c16b51de466988ff5
-EBUILD openssl-1.1.1j.ebuild 10262 BLAKE2B e10b9f419bd7689bae4f6e19e4c14407eba31c27e9c67e8b68fa7b0bedab8d8a572dc3c7e6155e080001de43d37df90da8c4585d8340a891440d15b942a2a64c SHA512 f7d468aa14b0d5753db16ebe4daa23ace9b3974324971898e5c8ed48db2e33be1a01b8edc982c2bd19824f664dc15029b66ac295d7a57855e9782a27a0f15241
-EBUILD openssl-1.1.1k.ebuild 10263 BLAKE2B aaba8c0af1e37fe57bbc17c7a99f6c3bfab1a281a9ae43d36fb6f4376837dad017dc715cf012d11d2ceeee036cd722ff1ba2bf038426cf093cb022d76eeb6ade SHA512 7f119451851dc8bc2e966dbbe5fab4a3c66035c8743a12da3629939750aaec9fb54e6942095b8d117c0b4dce44985638f4faca52d89857e2d52f57c54f429e74
+EBUILD openssl-1.0.2u.ebuild 9857 BLAKE2B 22b13b347cfd5dd3f42253f768912a1dcac00a3ce017a6dc0f2b8dc28201ffdc4d2b37e1ca17b3caf4665b2998e9e903b03934f0975605ab1cd1d35a550abba2 SHA512 4b0a57fbc4c06ea56d51d1715182bb309df4b18951bb69fea15ab4cc1225b648481003372cad3701dd6a42b75f20aa860c88554867338c709f6e0226a0dfdadb
+EBUILD openssl-1.1.1k.ebuild 10254 BLAKE2B 2a0cdf09786c55a7c503421cb52c4c304ea61ace51dbb6517c90b26d5769905f3b00aba5418ba44db2cd67c7144dc68eed475c5747d0899cdf72ef1dfa9e3a7e SHA512 26c79f8e5eb6b680b04feac08ee71eb33c1f874b5ef2ba76a0a79ca6ed084806cba85dba15fb992065eb79b5486fb6817ae917dc5522b65f1b067ee214ad4b3a
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index ab6d946a8b33..b7b3fba6c2ed 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 # openssl-1.0.2-patches-1.6 contain additional CVE patches
 # which got fixed with this release.
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild
deleted file mode 100644
index 6c86f655c996..000000000000
--- a/dev-libs/openssl/openssl-1.1.1i.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 31,
-# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-# force upgrade to prevent broken login, bug 696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if has test ${FEATURES} && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		local known_failing_test
-		for known_failing_test in \
-			30-test_evp_extra.t \
-			80-test_ssl_new.t \
-		; do
-			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
-			rm test/recipes/${known_failing_test} || die
-			eend $?
-		done
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
-		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-		rm test/recipes/80-test_ssl_new.t || die
-		eend $?
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist sm2) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1j.ebuild b/dev-libs/openssl/openssl-1.1.1j.ebuild
deleted file mode 100644
index 2763945ae17a..000000000000
--- a/dev-libs/openssl/openssl-1.1.1j.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 31,
-# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-# force upgrade to prevent broken login, bug 696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if has test ${FEATURES} && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		local known_failing_test
-		for known_failing_test in \
-			30-test_evp_extra.t \
-			80-test_ssl_new.t \
-		; do
-			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
-			rm test/recipes/${known_failing_test} || die
-			eend $?
-		done
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
-		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-		rm test/recipes/80-test_ssl_new.t || die
-		eend $?
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist sm2) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
index 59adb0cadad4..9b4eaf0e7a62 100644
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P=${P/_/-}
 
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index d43ef5b5cc07..3bf91716a49c 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,4 +1,4 @@
 DIST pcc-libs-1.1.0.tgz 198204 BLAKE2B 7cd665ba6a1a69514ead9a778cb24fe35561a34ae72cd5e53b63027ae7d4261261542434e3ead68f74056f228c35fe599dd76982280d3fbd2f71f5dc957b30d8 SHA512 89d90f246300ab1da652f652c685756aa038017f5b7d57d050bb5c88e01e70b594ffaef8772230fbeb9461e07c5b1df60e85e550ec4717008159218d50c8697a
-EBUILD pcc-libs-1.1.0.ebuild 497 BLAKE2B f0647265c5d4fc49d9f1bce77ec535857bb523071dd6aa0b8dad589fa43e930e294b29c76f9f93d6803e94a2af07e12f9d26ceb92951b2141d090360c5c95727 SHA512 647442082dd5e636feeaf54557c415ef21527bbbaa5ae5a9657f9ea6ecf067a43bd4b61424f1f37911c6747ec90e70373893ecc235922b32be248df2641a3935
-EBUILD pcc-libs-9999.ebuild 597 BLAKE2B c5979d8a9c3fbae31d7b9f1fc31bc12eeda6ce80fd0d6f3803cdbe6e2873a0f80ab18949dfb961192886fd8e8c5e98850853c49bc7469880a69199fae369d85f SHA512 9a210ba6ff26466d4aa343c3d9aed6a9382a3e0d37da9a156828ab604745d68488051493d2fa5fe4642017b7d89d2e73500a0102373c82a0e13b6222eca10002
+EBUILD pcc-libs-1.1.0.ebuild 383 BLAKE2B 96aaa5418ac41b0cbc347d2d0585a1e878c26c53d500c914a5af49bcb0977ed089566387f9f8700ef1eb258a04b35bf5ca5a3fd18ca6eefe153bf95cafd7a77c SHA512 a463a2556d45ef6e265182bc3635fbec65df4401f028215c573d4c6148b2cb2a91e411e493dc5ed88df7d0983957b8b8f1ebeb47adda18c434af6b8292d3cc42
+EBUILD pcc-libs-9999.ebuild 482 BLAKE2B 8d9cbe06d3cf0d625b53207f5a57b9aec5645ad702c7315c2930f8edfe95a6c79d325a64565e26f552bf17bcfd2ad0350fd73494d472ed476ea9a38e573844fc SHA512 19ad3fd43c0967487a1b6f5c54052d1ed2ff145763e767a60e8f70368ddc66d397992626df7f99a8a9f7952a8eb957e561673cf2a37d7f2fc05dd30d742cdec2
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
index 1c1352594b89..7e0b2be67888 100644
--- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
@@ -1,28 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils versionator
-
 DESCRIPTION="pcc compiler support libs"
 HOMEPAGE="http://pcc.ludd.ltu.se"
+S="${WORKDIR}"/${PN}-${PVR/*_pre/}/
 
 SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-${PVR/*_pre/}/
-
 src_compile() {
 	# not parallel-safe yet
 	emake -j1
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
index 004d91f4e4f7..acb5ea6516e3 100644
--- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=5
 
-inherit eutils versionator
-
 DESCRIPTION="pcc compiler support libs"
 HOMEPAGE="http://pcc.ludd.ltu.se"
 
-if [[ ${PV} = 9999 ]]; then
-	inherit cvs
+if [[ ${PV} == 9999 ]]; then
 	ECVS_SERVER="pcc.ludd.ltu.se:/cvsroot"
 	ECVS_MODULE="${PN}"
+	inherit cvs
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
@@ -20,15 +18,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_compile() {
 	# not parallel-safe yet
 	emake -j1
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index a0da4e355d9e..22675840da7a 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
+DIST plasma-wayland-protocols-v1.2.1.tar.xz 38716 BLAKE2B cf651ae6511ac8c2c00c71cc9d3cfd3f76132adc29d143cbd71fd0d22b5cebe221aeeff1db534e62515a297b07cbd6b705752a0da0498b12635455cfba8f06b0 SHA512 7c94ec6e1a6e47651ea3194a238b2a2e28452c541095c17b0d7cf240a939bebb854c2acbff1ca56cc5a737ba2c802bd04674c7a3b0be623e3bd4328741374306
 EBUILD plasma-wayland-protocols-1.1.1.ebuild 455 BLAKE2B 9072fb9f96bef5c5e3733242fb648b295f95bafe31d79a3142aca781765e5b05e73e9b9741e5de50179c0bf8634c5146086a41d1e4826874935ac8529c290d75 SHA512 b5c9738c1215e5bfbc914137b0746b880fecdc54024a88464254ab97e0311d34ac6482453ac74edbdbb6807df4ca0c6033c5d1f9fc477e834af709480cffd3c6
+EBUILD plasma-wayland-protocols-1.2.1.ebuild 489 BLAKE2B 7e4d525ce58897c1c9f7c4a3b28129f44f454454260744443d3efe9796f1f8d42874739fd7c75e818581b0d7ce94da953d5e0c27f86ecd6787d1c0ad9ad318b5 SHA512 57feab76f5857bba8917901620c05ad6cd6681c323f5d2306674e06affb65b7a4d4bb1c2174f700d83d3b9c4c26aaf40d262a91907665c11ee76812b053cb031
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild
new file mode 100644
index 000000000000..9a8b42d6b9d7
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_NONGUI=true
+KFMIN=5.74.0
+inherit ecm kde.org
+
+DESCRIPTION="Plasma Specific Protocols for Wayland"
+HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PN}-v${PV}.tar.xz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 453d5452d8a4..c4274aca2835 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,6 +1,6 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
-EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
-EBUILD popt-1.18.ebuild 1048 BLAKE2B 83124f69d4c06eff99ef898f4130ba5c8f0cc542bf5ce8c00c1189737aa5f855ba25182968d10abf42629919f82cbec1600abccc3448c14254e3268aced83fbd SHA512 db2da74a7c82037182d108e18ab01519b085c08374597fcde48f0ec0eeb9be4e5eabb5467e5a6c51487f7e05be37657aa190a60de2c954cf09545b2da7911102
+EBUILD popt-1.16-r2.ebuild 878 BLAKE2B df6688f7cf7ca2caa6a067230b94313b8f3f1af3e28909ee463deee3431957025d70c3e0b6cfcf694d5be896daadb575547672ea79a12d9e42200f8487d5c73c SHA512 4e803a1fad54ee563c76012e98348601bccb0e4f500e57d67644174a122aaba894b3038fd98e9b962dc16311dffac0534d600187b36fec472dfa90bc10e8971e
+EBUILD popt-1.18.ebuild 1050 BLAKE2B 1de18863ebf0723884dac14a651dfe7d5616565837907c6d8cc123c664fc488adf97aa30f4b616e9c0d8e2fc68c86f9a9ab7e96747cd5d0f234194d17e3ae890 SHA512 27bb08946bfde3d17f2acd09d245e1907f3bf139ad1c35c1ec3ae12f42dfd6e4762171dd5cb5897242e6275b9d35931832f9eb9f8601cb2e4e37a5ccd95cf178
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index b97a1597e36b..5e46e3a68b81 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -1,8 +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
-inherit eutils multilib-minimal libtool ltprune
+
+inherit epatch multilib-minimal libtool ltprune
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="http://rpm5.org/"
@@ -10,7 +11,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@@ -23,7 +24,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable nls)
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index c10902006d52..296a95e62b02 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib-minimal libtool
 
 DESCRIPTION="Parse Options - Command line parser"
@@ -10,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index cdb80e2a54b8..fbfba415bca8 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,4 +1,4 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
-EBUILD protobuf-c-1.3.3.ebuild 976 BLAKE2B fd9d077375ab6355a98d33dea2a30233a3548d453062c9c5929ec1d70e74f01277347309d1c352894dea4b94886d917408b1469aa77d7cab5ef2695ac7a81611 SHA512 b1189e57806c7124a3a8c6d44e7a192618f196425b2dd8bf820df1f126e111747b838d9e13991666c6f20d7afdda5cc009ad239637f455088620379acf242fbb
+EBUILD protobuf-c-1.3.3.ebuild 977 BLAKE2B eb1ef10b3aef000bb45b85af1659efb7a817e4fd4d8bff0c55fd6620e9ac6dccdb8a16f19c0c8048e3dff66332ca1d698bbede15d4631fb1fe10dd77bc87d0fd SHA512 9d85ad8df7dc4bcb5c89d1fae0d4cd0b669c490746f07d7f65ed2a9915bf5bf9d1340c0124a59a1d342ee90f7c1bab4bd65ac1b71536e5a15d490d9b9899d0f2
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index f6604b26b18c..9a6f86d79c89 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.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="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 744e654c7f88..a38619348594 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,19 +1,33 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.12.0-disable_no-warning-test.patch 965 BLAKE2B 77ed571f16f9fb2d333d656f56c28e512f4e78984a47740644c7d7b8fec8b26d29d2c1138e0c73fda027ff916871f80447683d959e0fef9bd55471b89ee7bf19 SHA512 6fb45b1425428054795d3a0898b993d9ef2f6b0b4da048b411cd62e3a3fb3114abb0c382c7fdf8f7eee1a02fafc89c0f452dcbfaaa8bc283f0fb6a3861c88ff6
-AUX protobuf-3.12.0-protoc_input_output_files.patch 10321 BLAKE2B f248067eb23303ee5eee4ff3f312cc882c804dc4c2233f4a4cd84377ce7f8bfb35df1e4e794c7d1bac1b84a2723b6cac4a49b3af52f402964ea388ea3458b35a SHA512 137209ef76dc6d3517f4e50845572aa0b79d7b5c0931134b4017f783f13bebd37ee5a6b34f26d70bfa8f601563adb42ea7efdc75506754ef8ce08f86f536d601
-AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424fe987e214d3be19b90c82abbb12829287811bd9e46757df3ae65db49b30b47aeefdd8ded79e15e01483f2222b1fa3e8f3ef1d319d SHA512 76c41f48c9661a30aac0cd9e71f52101e3068725bd8e1b0f46bea113115233739849978750f063241fd45b2982d41a8da7b0e972afc3d4cd517943d533fffa91
 AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
 AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
 AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
 AUX protobuf-3.14.0-protoc_input_output_files.patch 10684 BLAKE2B 79b86a293fd48e3694327e772dbb7e7ecad2ceaa4d719e2eef5a6221face7bbc26ed00d1efdf9e73dedb9b437603ba6560b5812bbce1c4585bf2d4813afe3aa0 SHA512 35f0ffad2ed3c3d37ba832be4bafa59577e91fba7bef862581369ab92d8c4d3dd801f2e5ec486d989d5e8dfbd04d52d0a869aaecb62c716696a8e3ff6fb9c4db
-DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
-DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
+AUX protobuf-3.15.0-disable_no-warning-test.patch 965 BLAKE2B fdc24fa141b5d3c4d45dace718d089e26862bb451789c14e652e74cfedde7cca14d1c4c2bc7fbf028516e47b790841bd9c69658b94a47d3ad36ee61bed596b36 SHA512 d1c4ad3ff7a5548437a116243b263d4ccc22b2bc8872c0e043788e902c5190b26de73d61736fb08403bfe4a0b4c2340dbe8d92f35768e52ba3c770350b26cb49
+AUX protobuf-3.15.0-protoc_input_output_files.patch 10060 BLAKE2B 5e20468fe2d31da3651106e57522c2efcdfd70b2430dc1028c95f9752f446b150f8304835349e048d0bcd9aab673814a4540e01671a67e31850f0c44da9cd0a6 SHA512 c43d0a0b5d022ffbac545b596aee139267b5232d4971356d90327a4016e0b2cfed12711efef818aa747caed08964c3b0bfcf501668b9df887b7d3988c17885e3
+AUX protobuf-3.15.0-system_libraries.patch 6352 BLAKE2B 8d54bdfbbeb0420c9d4629ac38b4ba172d59bc832dbff46b6438985bbc76239d3f1a74ada052b046f0e982fe3b2f5109621e6370f2546c37160d31e2d1b4593d SHA512 d98c88b2e96990f943464c429e01a19fe47458d0794ad9ebdae098c48eb25bf46e1fecbca9d09a2e23330a4b9723b9bc18638eb7a043cbd486919b29d57033bf
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD protobuf-3.12.2.ebuild 3009 BLAKE2B 8fa16af3fa8a044e4855a3c97de40762ae4e68e3c7dad59bf490d87c1685cd1f12adfc4919df70236fa2fc200c5e5b8e7089ed5735211336a93014f0c49493ef SHA512 305056f299b34c4adbd9b05d402f7561625a1e232abd64fb6d44ccc90e5eadd1f30c72ac629e6c9976e9f384b639ba645763a85472b2cecbd1574858c5958cf2
-EBUILD protobuf-3.12.4.ebuild 3205 BLAKE2B 5d41dab953c7a0230df22500c99caa1ef843600fa17940d77567da33ee0c0fc68062e69fc816d480670e97fbfaa101c274c03c4d005aa87ae6f2f182cdd257bf SHA512 e33502f6f03bb899fada09a8bc3565b1e1d0994b85984ab69a0acf39c9139ebee6cb0c625ed97d6f781def4efec1497dd36e24d4a86bec6652dadb90fed27cfa
-EBUILD protobuf-3.13.0.ebuild 3199 BLAKE2B d79383364ae304ea0a4682e9d9d92b673ab524820262b8e8fbc303594ca9079961d6964222d1d2beba4733f97a9e74e4df48e8f907f1ffb1e46901f986b93625 SHA512 22f2acef4cadb511040ff2f6421c2e5efe4e0d5983ffaa111edde7d0737b82817dea34dc640c7c97a45c10678c2e0ffd7061c90031b2bcf8adaedebb0efd4027
-EBUILD protobuf-3.14.0.ebuild 3005 BLAKE2B 155eca420c45741efeb31947fa0357408abd0e7ca40fec5e8642af8522fa1a93bf626231307a28466edba9d0a1d22cded2d1abedb0650542e8c6ee8caba129e8 SHA512 aa95ff5ba7fe2d9571279f48d17af10d6a7dd33dde0bee4a160b90de1f71a4849fb181e7d3168e3ee524b70ed0a528dcbab7aa3e87b5cf6e2c7aafee89088156
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B 07efb172c0fe3b77561e061fad4f59f1b7827620450d64568e980e77b2e0efc80ce5668dc2118184d2ccef91a96733d25d96aa3ecf732ae4b049ee1c2296566a SHA512 23acf5d789030bf0d69d365ae46bc4e1d13dcd62539ead55d0411fea810c59de3497c55bb6a8ce298b8781e05421d37ed6b203e1ffddf2aed4393c2e68ec35bc
+DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
+DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
+DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
+DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
+DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
+DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
+DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
+DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
+DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
+EBUILD protobuf-3.13.0.ebuild 3200 BLAKE2B 1f4ac4437cf047b4f840fec6fbff8e8e909dfc6fab90262e2892856b1884c0fa9762712cf965284c9e059014a47ce4926a12e7d35fd2dc508a4e159e7c15e1f7 SHA512 dbfa8ff4355832fc09465e6cc78a12fe99d92daee74930d86ed4cb5848d51506012cb609ecfeddb21f2ef3ba7f7251a9afede1bfde6fd3b6976121564cfc961f
+EBUILD protobuf-3.14.0.ebuild 3177 BLAKE2B be70e69c5cdd268a57703f3cae7cf65213f59b5b00e5ee2094c9a28fa120cce21dc5f4b56fb3b0731e2f8a67e2326bad1b8ad210a4f6e7bc2f929ab0f6038b14 SHA512 51f186dee878884e6c1918de30c3e42f5b46c386a52eb8df0158db14d2961b2f82cbabbd0c21f8afd31315f3f003eba66dc0479c4dd314073a37fa03e62db796
+EBUILD protobuf-3.15.0.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.1.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.2.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.3.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.4.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.5.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.6.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.7.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-3.15.8.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 6aade3fdee471f2548e673b72a1b2113bb3ecc484f03fc39fd73263f3dc117510bbf96733a4d0d8626a9622c4878c50bd3dbc8cf48d61e7f3c51b84f3f40eba4 SHA512 36c081fd688a7386f70d1e99b448fccee19d7fb99e7443f67e58511bad9221d85fea9c449ca17c7ed38ee047f9b3b24046dbf251e414ccf38497f9f46ce49402
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch
index d7dd5b5b1bb9..031b1b222a9e 100644
--- a/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
+++ b/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch
@@ -2,7 +2,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
 
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -717,7 +717,7 @@
+@@ -709,7 +709,7 @@
  GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
  check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
@@ -11,7 +11,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                        $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
                        $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -904,4 +904,4 @@
+@@ -896,4 +896,4 @@
  
  TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
          google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.15.0-protoc_input_output_files.patch
index 3123ae5b27b5..8e9733fc4644 100644
--- a/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.15.0-protoc_input_output_files.patch
@@ -2,7 +2,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -997,6 +997,28 @@
+@@ -1109,6 +1109,28 @@
    }
  
    if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
@@ -31,7 +31,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      if (codec_type_.empty()) {
        // HACK:  Define an EmptyMessage type to use for decoding.
        DescriptorPool pool;
-@@ -1005,13 +1027,20 @@
+@@ -1117,13 +1139,20 @@
        file.add_message_type()->set_name("EmptyMessage");
        GOOGLE_CHECK(pool.BuildFile(file) != NULL);
        codec_type_ = "EmptyMessage";
@@ -58,7 +58,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      }
    }
  
-@@ -1049,6 +1078,11 @@
+@@ -1161,6 +1190,11 @@
    for (int i = 0; i < proto_path_.size(); i++) {
      source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
    }
@@ -70,9 +70,9 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Map input files to virtual paths if possible.
    if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1750,6 +1784,12 @@
- 
-     codec_type_ = value;
+@@ -1892,6 +1926,12 @@
+   } else if (name == "--deterministic_output") {
+     deterministic_output_ = true;
  
 +  } else if (name == "--protobuf_in") {
 +    protobuf_in_path_ = value;
@@ -83,75 +83,53 @@ https://github.com/protocolbuffers/protobuf/pull/235
    } else if (name == "--error_format") {
      if (value == "gcc") {
        error_format_ = ERROR_FORMAT_GCC;
-@@ -1886,29 +1926,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2254,7 +2315,9 @@
+@@ -2019,22 +2059,38 @@
+   --version                   Show version info and exit.
+   -h, --help                  Show this text and exit.
+   --encode=MESSAGE_TYPE       Read a text-format message of the given type
+-                              from standard input and write it in binary
+-                              to standard output.  The message type must
++                              from input protobuf file and write it in binary
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --deterministic_output      When using --encode, ensure map fields are
+                               deterministically ordered. Note that this order
+                               is not canonical, and changes across builds or
+                               releases of protoc.
+   --decode=MESSAGE_TYPE       Read a binary message of the given type from
+-                              standard input and write it in text format
+-                              to standard output.  The message type must
++                              input protobuf file and write it in text format
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --decode_raw                Read an arbitrary protocol message from
+-                              standard input and write the raw tag/value
+-                              pairs in text format to standard output.  No
++                              input protobuf file and write the raw tag/value
++                              pairs in text format to output protobuf file.  No
+                               PROTO_FILES should be given when using this
+-                              flag.
++                              flag.  The input/output protobuf files are
++                              specified using the --protobuf_in and
++                              --protobuf_out command line flags.
++  --protobuf_in=FILE          Absolute path to the protobuf file from which
++                              input of encoding/decoding operation will be
++                              read.  If omitted, input will be read from
++                              standard input.
++  --protobuf_out=FILE         Absolute path to the protobuf file to which
++                              output of encoding/decoding operation will be
++                              written.  If omitted, output will be written to
++                              standard output.
+   --descriptor_set_in=FILES   Specifies a delimited list of FILES
+                               each containing a FileDescriptorSet (a
+                               protocol buffer defined in descriptor.proto).
+@@ -2341,7 +2397,9 @@
    return true;
  }
  
@@ -162,7 +140,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // Look up the type.
    const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
    if (type == NULL) {
-@@ -2266,15 +2329,15 @@
+@@ -2353,15 +2411,15 @@
    std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
  
    if (mode_ == MODE_ENCODE) {
@@ -213,7 +191,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    std::string descriptor_set_out_name_;
 --- /src/google/protobuf/compiler/command_line_interface_unittest.cc
 +++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
+@@ -97,7 +97,7 @@
    virtual void SetUp();
    virtual void TearDown();
  
@@ -222,7 +200,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // command is automatically split on spaces, and the string "$tmpdir"
    // is replaced with TestTempDir().
    void Run(const std::string& command);
-@@ -2625,6 +2625,17 @@
+@@ -2596,6 +2596,17 @@
                std::string::npos);
    }
  
@@ -241,7 +219,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    void WriteUnittestProtoDescriptorSet() {
      unittest_proto_descriptor_set_filename_ =
 @@ -2719,6 +2730,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
+       "Can only use --deterministic_output with --encode.\n");
  }
  
 +TEST_P(EncodeDecodeTest, RedirectInputOutput) {
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.15.0-system_libraries.patch
index cd7c3493da86..9a75a6665f0c 100644
--- a/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.15.0-system_libraries.patch
@@ -47,7 +47,7 @@
  AC_OUTPUT
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -711,19 +711,11 @@
+@@ -703,19 +703,11 @@
    google/protobuf/testing/file.cc                              \
    google/protobuf/testing/file.h
  
@@ -68,7 +68,7 @@
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -815,12 +807,8 @@
+@@ -807,12 +799,8 @@
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
@@ -83,7 +83,7 @@
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -841,11 +829,7 @@
+@@ -833,11 +821,7 @@
  # full runtime and we want to make sure this test builds without full
  # runtime.
  protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
@@ -96,7 +96,7 @@
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -857,11 +841,7 @@
+@@ -849,11 +833,7 @@
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
@@ -109,7 +109,7 @@
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -871,8 +851,7 @@
+@@ -863,8 +843,7 @@
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
index 416c4ef82989..25ec4601ee41 100644
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index 660ea4e3039f..babe73b00d69 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -46,6 +46,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/7413
 	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.15.0.ebuild
index ce7b47101c51..9cadeaf49236 100644
--- a/dev-libs/protobuf/protobuf-3.12.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.15.0.ebuild
@@ -21,8 +21,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -46,8 +46,8 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/7413
 	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
 
-	# https://github.com/protocolbuffers/protobuf/issues/7682
-	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"T is overaligned, see b\/151247138\");$/d" -i src/google/protobuf/arena.h || die
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
 	eautoreconf
 }
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.15.1.ebuild
index e86ba1284f34..9cadeaf49236 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.15.1.ebuild
@@ -21,8 +21,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -46,6 +46,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/7413
 	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
 	eautoreconf
 }
 
@@ -99,7 +102,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
diff --git a/dev-libs/protobuf/protobuf-3.15.2.ebuild b/dev-libs/protobuf/protobuf-3.15.2.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.3.ebuild b/dev-libs/protobuf/protobuf-3.15.3.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.4.ebuild b/dev-libs/protobuf/protobuf-3.15.4.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.5.ebuild b/dev-libs/protobuf/protobuf-3.15.5.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.6.ebuild b/dev-libs/protobuf/protobuf-3.15.6.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.6.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.7.ebuild b/dev-libs/protobuf/protobuf-3.15.7.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.7.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild
new file mode 100644
index 000000000000..9cadeaf49236
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.15.8.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 842b1bf5554c..adc2b704358f 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.14.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 0a0deac3190a..f7c86f0d1c33 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,3 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ptexenc-1.3.8_p20200406.ebuild 1308 BLAKE2B b3b7a19de2c2a2900d8c248821c9e711763068a7ac28b439910af5a141bd331ecf14e3c0144f1537d234152b70e5b4eb24d0930439e4a387ad34dccbc8df5709 SHA512 d569fd8a987276a2e0abcd97df12dac2bfeb50a357eb3dd8e711e560043c0ed52254a61f652b197b339e8cc1d45104a0c25f514aac8a1898c9e74dfa936da840
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+EBUILD ptexenc-1.3.8_p20200406.ebuild 1309 BLAKE2B 0ae99cd71415c2f06d42137dc44d8a5ef23ee8bc11fb262056b6b3c4bb529f0f19a1272977fa6fc5cdc3f385661175c79e53803bd3d8ecbe508cfaae9d125e75 SHA512 07d7ea7e9cba8b47c86d1758d84c189f5a5c8b171de68f9f9383822bd8695dc2ef17f8ea39fa0ef6c1c65b5475c0f2100c0496f8a719f200e60c0adaeff9de01
+EBUILD ptexenc-1.3.9_p20210325.ebuild 1254 BLAKE2B 1d62f5a28813e0b2ab46d45a6202f22db61bc30edf5f759536ac5dbe713b0f137ec9387246111ab006aeefd503e1357f530a07dede1bd89bbaf84da35c0b927d SHA512 1d76cf17e7bf30ad2cdbe826acdd88dda1ff8d67b0a93bbbb9008cb40132394977d61b29314866326663b19ca0b8713f7c04cf3da7185aee90c7ebfdb38890a0
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
index d9ea39be2bf8..b55a38d5234a 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
new file mode 100644
index 000000000000..94d3676e1748
--- /dev/null
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
+HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="iconv static-libs"
+
+DEPEND="iconv? ( virtual/libiconv )
+	dev-libs/kpathsea"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=377141
+	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
+
+	cd "${WORKDIR}/texlive-${PV#*_p}-source"
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+}
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		$(use_enable static-libs static) \
+		$(use_enable iconv kanji-iconv)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /usr/include/ptexenc
+	doins ptexenc/unicode-jp.h
+	use iconv && doins ptexenc/kanjicnv.h
+
+	dodoc ChangeLog README
+}
diff --git a/dev-libs/pthreads4w/Manifest b/dev-libs/pthreads4w/Manifest
index eb5738ba84bc..6f31f7b766c7 100644
--- a/dev-libs/pthreads4w/Manifest
+++ b/dev-libs/pthreads4w/Manifest
@@ -1,3 +1,3 @@
 DIST pthreads4w-code-v3.0.0.zip 862409 BLAKE2B cd23103c92f8eaa2088fdd68cfc94655771d44c365ca32180395cdb8645b570c2f65620d3c2969671a48c6ac45889bc439f3490dc7ec2497dfeca9f758cda6cd SHA512 49e541b66c26ddaf812edb07b61d0553e2a5816ab002edc53a38a897db8ada6d0a096c98a9af73a8f40c94283df53094f76b429b09ac49862465d8697ed20013
 EBUILD pthreads4w-3.0.0.ebuild 1768 BLAKE2B 3f20bd24ca66a940d859bb745f3a8a4c62751e8baee1cb93715de7a14f24ae499bb81de4c7c1190ead216d3b78f7ab91b1aa7f489988af275b612d27e25d7d12 SHA512 56324493ca725379bb569f305916d3c5a13e6ed7c3b0cde110a67ea6c899bfc1a51a9858a40442410c2e64c39aacb12eee430dfc7efd287db97f8d290a95cf5e
-MISC metadata.xml 463 BLAKE2B b69ce2232b47e30b12f97c56b5ddc429313e2dd26c32829e4c67718abb3227701ae0e7df05a3a78c94e847afe2ccb8eca53890891310f2839acddb9b330befb8 SHA512 86b02a1f3f72d68d070392f355dcf4e03a4e8161b1e13b249e70ddf3335dd6e97ffa58bb0df0f1235330fa78b40f5182f62db6027fce19890ecd1b545952c82e
+MISC metadata.xml 377 BLAKE2B dcb2941c0ba5f6e7359f8aa89118b48aeba36564c7cf1ec1441639e79565fa8ed6ac4a03384ffdb67a945ce3fd4d8fd06e648596b6cf97f1b23471e68c07abfb SHA512 664f4b0ef7005c2d8b6fc595868e7171e8f38033915b17981df45ff2f1ae867ead61295bba04faaa6731caebd7a6ac91e6e6123a4039ed65257fbf5c4ee7e0c8
diff --git a/dev-libs/pthreads4w/metadata.xml b/dev-libs/pthreads4w/metadata.xml
index 30aaf1fdc57c..64fda0eeda3e 100644
--- a/dev-libs/pthreads4w/metadata.xml
+++ b/dev-libs/pthreads4w/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Also known as "pthreads-win32", POSIX Threads for Windows implements a large
 		subset of the threads related API from the Single Unix Specification Version 3.
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 79a648d6e189..00039f69e2d0 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,8 +1,4 @@
-DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5f92face3ea3bbd9f970e442043d3c4d4c471178c8891d7b3245aa6193d89fe3bfea122886ec0261418a69cc2c6 SHA512 4af70f11bbbb8a33240bf12c6ea14973963303a8cf7fa6ce56376726a6c4764c2f6c87a4e6d7672961850a84d8f430712686d744da8bc12d5fe0a711dad6e90b
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
-EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
-EBUILD pugixml-1.11.3.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
 EBUILD pugixml-1.11.4.ebuild 570 BLAKE2B d48ab88ac4014ac2a5fa31e2a9adc1c3ea93100f06c97275e9c7442aef426c5d87e47ad19710e17486d87fa714cfd0bac266ec48b8ec7571b91e9b872c5a5fea SHA512 198d20b624cde5812c82b6d18d1e5b8d573712f9cf758ec21c72b99d0d024d4cfb570e5a1fede5afccdaface8a912b8bfcdecc4f6a0b2a72121f34fa0c778e3a
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.10.ebuild b/dev-libs/pugixml/pugixml-1.10.ebuild
deleted file mode 100644
index 514b88073ecc..000000000000
--- a/dev-libs/pugixml/pugixml-1.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
-HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
-
-LICENSE="MIT"
-SLOT="0"
diff --git a/dev-libs/pugixml/pugixml-1.11.3.ebuild b/dev-libs/pugixml/pugixml-1.11.3.ebuild
deleted file mode 100644
index 0750359ebd79..000000000000
--- a/dev-libs/pugixml/pugixml-1.11.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
-HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
-
-LICENSE="MIT"
-SLOT="0"
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index de596d87b84f..c6ac6e2f13b9 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,6 +1,6 @@
 AUX qqwing-1.3.0-autotools.patch 5417 BLAKE2B 9314f4e0c85b8bf646b22ebd13409b305f05a25eecaaced65ba76b307a0c062eee7a9dbdc79c4ecab69d84756c646caf6e69183ad3621379aef14492b91f1ad6 SHA512 cdb88b9a07cf5c68790c4ce7e6f1156dff4c985c0f65bd73f81556d41570be5789d8fce53594bcd698fdf182dfa0f88618f49fbdaee153b5dcb4c833553ff515
 DIST qqwing-1.3.3.tar.gz 89629 BLAKE2B 5583318d15a4bf31833576bec037ab27fc17a57c95ef42be828ae0de9d6d86709fdcb63f71cf51b737b45c39657220e1e14a817094065f29b17c668f53b16075 SHA512 cce6e3122f0620b4a27f5c4186b468906006b6f9deda0b3fc474d40e678722bbb07474c479a75cbcac0812a097e5be4d7ae58339810a897f966d5a73b07a6833
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.3.ebuild 532 BLAKE2B 94cab553be4fd7e3966a67df6015262068f232a45f4deb0ccc6a374fbe137e72053d00374397433500fa48b1b9465361c4dba50bdf4a51969dd7ebd2e05d3c33 SHA512 b0b6a28a1a55b2e26ef8fa65c4d11d27a84ab29fdcd07e4df15e5a42799f48bbe1b6f8b2f4bda1bbd83684722225dfa2bef997592dd2ad029c4d277861f5c30d
-EBUILD qqwing-1.3.4.ebuild 407 BLAKE2B 75da47a9cd1524ab964ca2240c52ded825ebb5255ea43f721da95be9f40e702ebb1f73707f4d05c8ad98023d596fde7fdadbff660b901cf0fa5808248585bd89 SHA512 1b9558d7b5cade97ad11d21e3fb2beb8ca3f5afecbb9ba2a8aa814e25aba76b5103971e2fcb6a0cec2b21c5a7e734017ad870d37bbfd4efe91339ea2500f811e
+EBUILD qqwing-1.3.3.ebuild 489 BLAKE2B 6a7a6bb5ae79a76ec00bfd818c15817c3ec12abbc580c8a6358f7e323056d95450908363bf562f1af5f9704b0215a8559e0e02fcab32529857344335af15ba03 SHA512 3d78c8ef369708afd53aab36d7166add1b9f009ce68cbf25b621db4e9e3ad57412f02b341c3ee773e67deeeeace069c0588693df95bbeac207d45d61d4b60684
+EBUILD qqwing-1.3.4.ebuild 360 BLAKE2B b072a7c3cf93cf04ea0bc3a215d79fdf18dc94b43ba494920536cc6741692d81de5af520caec46f4c648690d64ac3436aeaff64d40f99cdfbd1525a966541119 SHA512 1595d9acfa4207b8a19da5e75e4ebc869b30d6a3ca2e3c8ead2dadec810f9a781b6f169f0565a52482c6536ef50686d00fc502cb6b15195aa21a7b6415f9b34b
 MISC metadata.xml 343 BLAKE2B 912f9f399214a554261a33b1f52f90a9fb43540437c0dd37dd9555bc3e27b526f661c43611599362f4a7094a43f7dc1f61931a155e704e119a9187ea807759ea SHA512 66bf722993792485e5e84f2ca612dcc9b803fa022ba94249788b211f48a27e360c9bdd5303a3858fdb73cb2d71eb23377ab67ee0918cfdafb8711cab9283deca
diff --git a/dev-libs/qqwing/qqwing-1.3.3.ebuild b/dev-libs/qqwing/qqwing-1.3.3.ebuild
index f9527626400d..8755e040c441 100644
--- a/dev-libs/qqwing/qqwing-1.3.3.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"
@@ -12,10 +12,6 @@ SRC_URI="https://github.com/stephenostermiller/${PN}/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 src_prepare() {
 	# Make autotools work out of the box
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index 30b47aeb2c3b..ccd031c7ed29 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -1,9 +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
 
-inherit eutils ltprune
+inherit ltprune
 
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"
@@ -12,10 +12,6 @@ SRC_URI="https://qqwing.com/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0/2"
 KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 src_install() {
 	default
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 7402d2e0cf39..25fd06e48637 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
 DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
 EBUILD qtkeychain-0.10.0.ebuild 912 BLAKE2B 341affb568d1a6d996ff9406b5b05ceff59a5d88b25c8e036836ea322dbd2f69877ab0dd86f4e14a7ce9263ca583825823ef2f7d62c1753cc61b7c04497b722e SHA512 63996a4ee7e2bed0f7a9f47db4f7815874dd4e85dbdc2c171794795e72afa57674db12132e94ade8a12d2ca84eaf30f77b1dc4ccaccba1e3235eacc84dc9d778
-EBUILD qtkeychain-0.11.1.ebuild 915 BLAKE2B b28f2247ab6722532a235032743872b276b332bff164e747f98c9c972115f44e62e375ad3846ebee0dee56a91e349337a4be2a7fdc4f7ad0488a43b42136c7a6 SHA512 6a5498bc5d648bb6b87406c4c8c5d5a2f10a7e362d004957a4d2db8a0fafc2b720977186570ce107da8ca5a5e056cd602f132a1e6013497bc482dfad03621fcc
+EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
index d70d621d53e4..168255e0a6bf 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.11.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
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index b0d8d3037ecd..ece077553afa 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,8 +1,4 @@
-AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321
-AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119
 AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
-DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
-EBUILD quazip-0.9.1.ebuild 831 BLAKE2B 7c9fae6be60bbca4abccfaa1f9fe33ae87071e576365ecf9f2197f0cba6d4fa3a134004d93f07cb16ef6a1136d7b39ec61c1c12aaa5e56bcf6f0871a18a9f3e9 SHA512 c2e3152d2f13f9bad676af409ec288ab49771d54f17fd6891effbc025d1cb5aab1c524647817d97bfce1ec766a73813553759669dcc19d5c624722011677b276
-EBUILD quazip-1.1-r1.ebuild 950 BLAKE2B 3dec02c01fb48908d0e3cd6d88c89c10845087387b3f3a6d2b4733ae3d5937758a5a6cecbcf17fb9e69522426f9d90d3eb041e76731f78ad3cc872c4d3cf7bf4 SHA512 8abd1d854f14803cd4952bbc63f09b6058b4be30949dce8df03f7dd7e1e9b8cff39355cf662d170dec76a8293319a649ebf02330f60a8fc6e4ffdcd7a109f4ca
+EBUILD quazip-1.1-r1.ebuild 934 BLAKE2B 3bf86d7872c881b8bce8b141e6f6c807e37d396ad54f103e240bb167d22e48ba62124700bcc2438e9ddcf242cc52e9490a839a77cec69f866ed987ced5d476af SHA512 5373be3092940b55575cca3f28645ee8726cc066a71a546964d50e5d9945ddb28f6674eba3ca636178c70b50cf5f3a3ebccc70c309e2553bc961ad8f88b35c32
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
deleted file mode 100644
index c8dc5b6e3ad8..000000000000
--- a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 3b1bf010e6f19908c90fdd51f01797dedb62fd53 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 23:08:22 +0200
-Subject: [PATCH] Use GNUInstallDirs, fix pkgconfig libdir/includedir
-
-Dropping LIB_SUFFIX.
----
- CMakeLists.txt        | 16 ++++++++--------
- quazip.pc.cmakein     |  6 +++---
- quazip/CMakeLists.txt |  4 ++--
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed96b33..c3cce42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.8.5)
- project(QuaZip)
- 
- # CMP0042: Explicitly acknowledge MACOSX_RPATH
-@@ -11,6 +11,8 @@ set(QUAZIP_LIB_SOVERSION 1)
- 
- option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF)
- 
-+include(GNUInstallDirs)
-+
- if(NOT BUILD_WITH_QT4)
-     # try Qt5 first, and prefer that if found
-     find_package(Qt5Core QUIET)
-@@ -48,18 +50,16 @@ find_package(ZLIB REQUIRED)
- # All build libraries are moved to this directory
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
--set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
--set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
--set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE)
- set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
-     INTERNAL "Target name of libquazip" FORCE)
- 
- add_subdirectory(quazip)
- 
- if(UNIX AND NOT APPLE)
--	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/quazip.pc.cmakein
--			${CMAKE_CURRENT_BINARY_DIR}/quazip.pc @ONLY)
--	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-+	configure_file(quazip.pc.cmakein quazip.pc @ONLY)
-+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- 
--install(FILES QuaZipConfig.cmake DESTINATION ${LIB_DESTINATION}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
-+install(FILES QuaZipConfig.cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX}
-+        RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
-diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein
-index e46d4c6..50d280e 100644
---- a/quazip.pc.cmakein
-+++ b/quazip.pc.cmakein
-@@ -1,12 +1,12 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib@LIB_SUFFIX@
--includedir=${prefix}/include
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/quazip@QUAZIP_LIB_VERSION_SUFFIX@
- 
- 
- Name: Quazip
- Description: Quazip Library
- Version: @QUAZIP_LIB_VERSION@
- Libs: -lquazip@QUAZIP_LIB_VERSION_SUFFIX@
--Cflags:
-+Cflags: -I${includedir}
- Requires: Qt5Core
-diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
-index 84607f6..74e02fe 100644
---- a/quazip/CMakeLists.txt
-+++ b/quazip/CMakeLists.txt
-@@ -18,5 +18,5 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_
- # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
- target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
- 
--install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
--install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
-+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- 
-2.27.0
-
diff --git a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch
deleted file mode 100644
index f0ce3e6e392f..000000000000
--- a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c061634452fe259dc5eb62395fbdb9159d4c9e09 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 22:54:59 +0200
-Subject: [PATCH] Disable static lib
-
----
- quazip/CMakeLists.txt | 13 ++-----------
- 1 file changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
-index 1efb5e2..84607f6 100644
---- a/quazip/CMakeLists.txt
-+++ b/quazip/CMakeLists.txt
-@@ -11,21 +11,12 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
- set(SRCS ${SRCS} ${MOC_SRCS})
- 
- add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
--add_library(quazip_static STATIC ${SRCS})
-- 
--# Windows uses .lib extension for both static and shared library
--# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
--if (NOT WIN32)
--	set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
--endif ()
- 
- target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
--target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
--set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
-+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
- 
- # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
- target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
--target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
- 
- install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
--install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
-+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
--- 
-2.27.0
-
diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild
deleted file mode 100644
index e1cde21e0b7f..000000000000
--- a/dev-libs/quazip/quazip-0.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic qmake-utils
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-static-lib.patch"
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-)
-
-src_install() {
-	cmake_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-}
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 6a18b5ce23ed..069d025af9ad 100644
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
 HOMEPAGE="https://stachenov.github.io/quazip/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -37,6 +37,7 @@ src_configure() {
 		-DQUAZIP_QT_MAJOR_VERSION=5
 		-DBUILD_TESTING=$(usex test)
 	)
+
 	cmake_src_configure
 }
 
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 74a9c23e8724..749eb9cc5b87 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,5 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
 DIST raft-0.10.0.tar.gz 315569 BLAKE2B 2365ee2ef4aca44257cf7631875013a6778d8858427946443ec02411783517f3ef129529c3302eceedbd43d9a57de9a3fc20a762b51ce8c7ed96045d4c8d27b0 SHA512 5039e2305c92f5002de4ef33f3c0b76dac1e72b8d983440ae0f5cb65d99213278e23a80401476617f32857c1913ab30bf257265d92f6bb5992d2701d4c25f977
-DIST raft-0.9.25.tar.gz 313444 BLAKE2B a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55 SHA512 8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
-EBUILD raft-0.10.0.ebuild 948 BLAKE2B b594180bd763206d959ed723aa4058a7a3a1349a97a6a1f3b5cc2efb0ab5a9b2acaf82ae5c24ce559b2120b539da09b724f44568fba25939fbd0bd33944c8b4c SHA512 d5fb44d9341600d522abfdab8f72b3fedbc458a883c481ca6adbae20f1eb4c24f8fa6edaf2e674d10a06d9e4b0043540d03ddc0dea7d55c862aab76dde29621d
-EBUILD raft-0.9.25.ebuild 1030 BLAKE2B 39e3e289802fde309d41d0a5ecf5484d58610db877e276bf3bc601c33f3060f9d8d968345f56868d3c653ab6192789761a972f2df2a16f00f4d4fa1e69b49658 SHA512 ae0f3446717543f20a52a54e143d16351758fe2377d6b38319a1d288a45dab0b1c2e78d5813a6a97c060ef9d1b04fc864a6c8fdabf6f525677018b8c9795118f
+EBUILD raft-0.10.0.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
 MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/raft-0.10.0.ebuild b/dev-libs/raft/raft-0.10.0.ebuild
index ffd134995c1b..7d5c828a261c 100644
--- a/dev-libs/raft/raft-0.10.0.ebuild
+++ b/dev-libs/raft/raft-0.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test zfs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
deleted file mode 100644
index b5f0f01804eb..000000000000
--- a/dev-libs/raft/raft-0.9.25.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="C implementation of the Raft consensus protocol"
-HOMEPAGE="https://github.com/canonical/raft"
-SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libuv"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch )
-
-src_prepare() {
-	default
-
-	# ACCESS DENIED issue, #723208
-	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-uv
-
-		--disable-benchmark
-		--disable-debug
-		--disable-example
-		--disable-sanitize
-		--disable-static
-
-		$(use_enable test fixture)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/rapidxml/Manifest b/dev-libs/rapidxml/Manifest
index 841a236ba97d..b71fbc1fa0b3 100644
--- a/dev-libs/rapidxml/Manifest
+++ b/dev-libs/rapidxml/Manifest
@@ -1,5 +1,4 @@
-AUX rapidxml-1.13-clang.patch 1723 BLAKE2B 383b584ce31ec95af51ce061b33eb655ad710b86fc20f31d4bb141b3a3154a89a216d20ff26d084de70984aa19457e9c1bd2f8a2f8b10097a91aa0353d2720d1 SHA512 feab3e9058b565353c8929f356f72b16dc8c68e4a2cfaaf476dabd34ae4cf5c21d1b5c5a9ee7b6947aaeb29c3ac7852aab81b0b551c3118f9c86c710f42760aa
+AUX rapidxml-1.13-clang.patch 1650 BLAKE2B 6e807a3266dbaa5a575a7036ec65b2ce6cfdb3347f4baa0c776f7ba2791fb363fb861994363a9131111e61a40f0aef818ad2e484b0b9f8d676a1cebc79be7d85 SHA512 b55735e503fbf51fa24c381effb1346dde3a2d31f0a4320634fab816832d75b23f51839f280d837247bc228d59504170bda1c1350898f9b4f79c011084f0d0e3
 DIST rapidxml-1.13.zip 44163 BLAKE2B 9db90dfca1943c47e95541a323e1210368447c054cf072d6768031488070e375fe2aa78a4e41f61f252d4c487e94cf1e24e4d3756e3f8774b0c2c52ef86959e7 SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
-EBUILD rapidxml-1.13-r1.ebuild 484 BLAKE2B 5d13532aa937f14da842e5fd78efa2f67c42e3f19fc5246ccdfc7049923cd8541ba7bbbb35aba28ebd1d577ffbe18000727499beb481926473ae8cb2d0a63d45 SHA512 aae5424c134b83ede758421c1841e61634392973508d7fd770faed15993d867ce4e1ac3de76a56ea7b502db15767df14b3d61e26ebbed1eef8b7de226bc4d755
-EBUILD rapidxml-1.13.ebuild 413 BLAKE2B a465322a88a228024829439130053dac2fe53e3a8274595bbc135f75c0feb85259d3bc856e3a02920ff0c7e5ffb87a2c407e89fb74551fc07f002b48323cd2e7 SHA512 4d58d277035c54c87a8cb1670602f1b6dde76362e51d1f8e9aa7fdb8942a04ab29a67f11a143a26afad285574c06192e7300f9399a84f32feb8474d988c64b99
+EBUILD rapidxml-1.13-r1.ebuild 470 BLAKE2B 5980f833c7b4731a142bc1247927352a21a62e304016df596bb32b5ec5746bcaae00ad849461209a2adb2c23beb025d864241978e90a21327a84b99be7b6dcd0 SHA512 ff849cc207629d4ea144c81d0c98b5e17d924a2fd64d249eceb9c18c2a866bd668569874845b10f5da14a9c38acde42ba94dfd69d1c7e2039a0ff0a1b8a4fdf9
 MISC metadata.xml 331 BLAKE2B 76a526f6ca4463cd836f236c88d20308be9ce4660a996c8efec1cb4266c776692e8cdebdea353d9c91f8b86cfdf9e697a2ca8c5ad60b3a790c7c19fd62e41578 SHA512 b38279f1436fa145a86830d5aada7ac41581c16aadab546621a0cabf72c1ca26b275c158a1a051e4b47f16e936c5c93bb7d5f8e386dfa9b5135b434d3034af22
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
index 007ee19fa8dd..7609984f5a28 100644
--- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
@@ -1,5 +1,5 @@
---- rapidxml_print.hpp.orig	2015-06-21 15:46:43.330070116 +0200
-+++ rapidxml_print.hpp	2015-06-21 15:50:58.745053512 +0200
+--- a/rapidxml_print.hpp
++++ b/rapidxml_print.hpp
 @@ -102,6 +102,20 @@
          ///////////////////////////////////////////////////////////////////////////
          // Internal printing operations
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
index 316fb1fc0d33..80a5284c808b 100644
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Fast XML parser"
 HOMEPAGE="http://rapidxml.sourceforge.net/"
@@ -12,11 +10,12 @@ SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
 LICENSE="Boost-1.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-clang.patch
-}
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_install() {
 	insinto /usr/include/rapidxml
diff --git a/dev-libs/rapidxml/rapidxml-1.13.ebuild b/dev-libs/rapidxml/rapidxml-1.13.ebuild
deleted file mode 100644
index 4b8625867211..000000000000
--- a/dev-libs/rapidxml/rapidxml-1.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Fast XML parser"
-HOMEPAGE="http://rapidxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
-
-LICENSE="Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	insinto /usr/include/rapidxml
-	doins *.hpp
-	dohtml manual.html
-}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index b566a4a41b2e..d6f9d99730fa 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,7 @@
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
 DIST re2-2021-02-02.tar.gz 402958 BLAKE2B 824afc7f6f92cfa7070f37e975469c995e9d4aa4bfb12a6e22a739199b74ea414536278ca18fc3a61250aa8744d56eeaaa203f4a8a37378fbf554750c9c8db9c SHA512 643ebbd998ae4089f1cda259df98f7c973df716f2959c3c01dc0c9ebdad685a5392d26e2149a1f865a93334dfec42d2e133776a39a4bf6a36053829958fa86db
+DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
 EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
 EBUILD re2-0.2021.02.02.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
+EBUILD re2-0.2021.04.01.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2021.04.01.ebuild b/dev-libs/re2/re2-0.2021.04.01.ebuild
new file mode 100644
index 000000000000..383b552b2a85
--- /dev/null
+++ b/dev-libs/re2/re2-0.2021.04.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="9"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
diff --git a/dev-libs/rinutils/Manifest b/dev-libs/rinutils/Manifest
index 11d1d9e1dce1..1d0e0a553844 100644
--- a/dev-libs/rinutils/Manifest
+++ b/dev-libs/rinutils/Manifest
@@ -1,5 +1,3 @@
-DIST rinutils-0.6.0.tar.xz 16768 BLAKE2B a4fe413c6a4f18bd8c41a4d933a2515ba64f2dbe180d8a5868eadd8cd6ed7008d30f5b6cd5fa730edcb6548f6ea269ab419b912fd6c7346dd013a737320bb714 SHA512 2523747f9cf5f830e5fb5acc1e92691e8acfb59d6c4474d3768b68de9190dbc63c9e06cdd3c6ac67f8a853d37d1711d4c18550bb24446b2730198668f4ad0c45
 DIST rinutils-0.8.0.tar.xz 17112 BLAKE2B 362cf1e00092347e17a2a7da259316013af19f66ecb435b9e061355c7e3797b695b2334c86595380e70b6ea168fa50d4bcb055e75fa407601368d5a869a6d721 SHA512 06bbcdb5092762bf2ed92d4082eca17e8dc0e822ce8634f8ec8782fe7eccb4b954c081dbba3f1e2f72e0285607a813f020d4277af77accc43135bde50153359d
-EBUILD rinutils-0.6.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc
-EBUILD rinutils-0.8.0.ebuild 570 BLAKE2B a9405f71b0e2894b6a27e1575790e69a82ba89e47625d052f1b918e13fb4888bfddd969003d7a3dce388260f4cef3ceae03ffd454131683756169d0b6bebc87e SHA512 e5ed35d2c0894dc3ca1ea4e0b99508c1dd2cd423b894a486c7ec276f80ad31d2ce0c03e1ac5fd5d522d5a0cbb0d30e1dd7bf615748333f7f92b4aac5aa302db5
+EBUILD rinutils-0.8.0.ebuild 567 BLAKE2B a8c758153c5f40be11294d2f68a07d5118d9ba0c3815c36a52feb852f9b4395a2ed3a2fdfd0dd6eed67009ea5574ff2be6a602570d33a0cde8f9ea1ad36ece01 SHA512 533d3ec789d86a825d7303d55dff7da506f620bff439248bb2c3f892637d53a813afe920f8384c310b183cccd6234fa2b7db2b72a3916052a05c925249822b3f
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/dev-libs/rinutils/rinutils-0.6.0.ebuild b/dev-libs/rinutils/rinutils-0.6.0.ebuild
deleted file mode 100644
index 84f476ca6c2e..000000000000
--- a/dev-libs/rinutils/rinutils-0.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Set of C headers containing macros and static functions"
-HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
-SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_APPLYING_RPATH=OFF
-		-DWITH_TEST_SUITE=OFF # tests require perl
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rinutils/rinutils-0.8.0.ebuild b/dev-libs/rinutils/rinutils-0.8.0.ebuild
index bd309594839d..4bc1e8ed5bba 100644
--- a/dev-libs/rinutils/rinutils-0.8.0.ebuild
+++ b/dev-libs/rinutils/rinutils-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index aea6f54c0ada..0a010dfd7a25 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -3,12 +3,15 @@ DIST rocclr-3.10.0.tar.gz 813435 BLAKE2B c49f84d1ea62f14436bb6d24ad950427b353662
 DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb
 DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73
 DIST rocclr-4.0.0.tar.gz 813510 BLAKE2B b9043c6f2725bd8d1769669db522cfa8ece40d83f36dc0e79662137b285a6e89952693d55e5b241144aa7412fa31192c3aafa74ee8d498f02f9a0cffaec7de92 SHA512 81e64af843720efefd24478f65c2a8d9dafc55eb94e9c4865d7fc3e9fa15371570ed54882e3086dcb20f16487bf24bdde0d65c76c07195d854ed51895aad06b8
+DIST rocclr-4.1.0.tar.gz 823082 BLAKE2B 69631f72124d8c7888576963b964b7971304593c1a231f6ea69940ff818b095676e1fef030efcddc4dc89c5e3768413e8e4832a0a95424a042b8df73d0b059e3 SHA512 1c82399d3eda8ebd11609272e756e45565a8c1ebb1354ecf44cf443bfc38a61af9210c6609d346d464e977407f07363da36e8c5ab89faeba3e11bfdc78bc32b3
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
+DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
+EBUILD rocclr-4.1.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
 MISC metadata.xml 511 BLAKE2B d2b374303172e793b16f6cb1dcd569e4f112ed2a2396f8ee85d053411b31688c2fac0c20ddf43205ad04aa36f910edcbc0de57b4e972615953b22e2475b3fd7e SHA512 349b4d3a8bc6414c5d015f8f50d4b09869e04dc67fe8317644cb148752dcdb767beb2d0eb18dc83bb50e9927e81fcbd1e43134e9a0ded14fd16bc109c8518365
diff --git a/dev-libs/rocclr/rocclr-4.1.0.ebuild b/dev-libs/rocclr/rocclr-4.1.0.ebuild
new file mode 100644
index 000000000000..46dfd99646dc
--- /dev/null
+++ b/dev-libs/rocclr/rocclr-4.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute Common Language Runtime"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-libs/rocm-comgr-${PV}
+	virtual/opengl
+	>=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
+)
+
+S="${WORKDIR}/ROCclr-rocm-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=YES
+		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# This should be fixed in the CMakeLists.txt
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index fb79b3f6972c..57256aa0ce71 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -2,7 +2,9 @@ AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9
 DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a
 DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
 DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
+DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 227317d3c96d577ff2df352721e3ffcf75e25548bfef29c425a3417af2b6fdbceeb80bc86508a9a510e9eb7f4dd2ff5c6da3c13af122dfb0dff6475d73a5c9ff SHA512 def3774072262ac6e5c836d7dcd23770045765882e76c8de87e21d04515a562ba213685736ccb4e5b01814de846b68aa9db77e40f0d834a68fc4a9b3301aaff9
 EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
+EBUILD rocm-comgr-4.1.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild
new file mode 100644
index 000000000000..5b3f588b3d54
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 4e2f15c1f486..3022088d7429 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -3,10 +3,12 @@ DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b
 DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436
 DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276
 DIST rocm-device-libs-4.0.0.tar.gz 230486 BLAKE2B 17d82a29e03d558a408e39550acd9f7fc76fd79a0c68936cb76e3e14bae6e770c0f581a80429aaa86e1d51491c31ce8b02b03095604678d03aa844379cfa9282 SHA512 a35fdc74c17d87ae52ccc218d5098b50863316b88908c147017c3d378c3892411a3f51737c1d5a4d6c1db87b66e1aacc94361bee28f3cc2e984e6e00db1dd7ed
+DIST rocm-device-libs-4.1.0.tar.gz 230813 BLAKE2B 699c23f3b08989765e90d3168e1369d1bf627a51c1f606160e29867718ce237a78ed7b5859ab60b58bbe9790452e75192fb9407819f25cceffc2af94aa006582 SHA512 b4d7ec17711345de27daae7a0d9fc4bce7a5501cfdade51da41788d1a015a4688d47e60031317b2bcc6c395bb096b2cbd4ba35a07b62cc07fe4779ec531208ec
 EBUILD rocm-device-libs-3.10.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.9.0-r1.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-4.0.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
+EBUILD rocm-device-libs-4.1.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 377 BLAKE2B 70c60c2403ccd85e0aa3ddf762f7b7ac4e4c3f605b02007ec524afec9300c59927916f0169ad9e181bd4ea7491207ee8becde6320663bc5426b255da1941afeb SHA512 8f7ed414a90f2aaf8cf04368c24dc3b1f8360cedbc7474aa1249c29784c6dc8ad350cf47e717ee8c7662f129b8807c627bf825a5ebe8415d665a5bfe8ef15b85
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild
new file mode 100644
index 000000000000..94bddf83d919
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 61e183758dc3..915b098b4dfb 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -8,8 +8,10 @@ DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
+DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
 EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
+EBUILD rocm-opencl-runtime-4.1.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
new file mode 100644
index 000000000000..d3a5d3f5ef89
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocclr-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
+	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 74650b007f9d..f98c10711564 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,11 +1,14 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
+AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
 DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
 DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
 DIST rocr-runtime-4.0.0.tar.gz 691835 BLAKE2B 328f7ea54767294036f435894d63354694447d964753de8b58b70ba5ae5f83561e5cda506890b43c80bdc480b1781d246ee77d5a0b08f74c5eb52d1ac5e8ddda SHA512 c95316cd8f221caee84f644e00b2b08d447b75ae4e5fe1871fa2ac6a879da57def497babfcabcaeb988d92421c165070e47d9fe846640b871249d66c82f82bea
-EBUILD rocr-runtime-3.10.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
-EBUILD rocr-runtime-3.8.0.ebuild 1466 BLAKE2B 263ba0bbd1cde48ce0a07b846e2f24193667766454aa1010e725867818f7becc666180d994143d91d69ab97b78a463f4037519bd8fecd5e61800fa2efc0a3f5e SHA512 b8aa8def450da878b5fafc4b4672f3c154106b5141bfd895bd29731e8fba3ba2941147c9f7ffab874470e270649a0b6eb66057031ae060b6b80671b52088d30f
-EBUILD rocr-runtime-3.9.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
-EBUILD rocr-runtime-4.0.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
-EBUILD rocr-runtime-9999.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
+DIST rocr-runtime-4.1.0.tar.gz 698452 BLAKE2B fb1ca1219d2c59db4d8bff414f40eaf6e7cec899a70ed930ce3dc6e2906a173db4823ac4c445fc57cc297a932f83b140747e35ee3d77fa0ed11cec97718fdc47 SHA512 d2162f431adf0b8f8ae5bbfe43ed389d4d94db5897fc8d1b4eb9b152a74f605fa2cf5d80175e6f9cda45e39803ededef6151aa9bdea99f38a16ca2dea29588d9
+EBUILD rocr-runtime-3.10.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
+EBUILD rocr-runtime-3.8.0.ebuild 1494 BLAKE2B 559ea5454433cf167cb1da2369700ace96729b1b4648f729e251b7e8f41368775766f0c2c288e986af26a5eb2655a9c35115497e8bf3e08e247c2237bca9556a SHA512 32986094590e367f61dc70a2be74716c81a95c03ee063f37321b9b579c5adcc72e1ebbdd71d1b23d6dc6e83a617d2d1ba6d0f3c0e65e6247414d8e7a0208cbea
+EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
+EBUILD rocr-runtime-4.0.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
+EBUILD rocr-runtime-4.1.0.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
+EBUILD rocr-runtime-9999.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
 MISC metadata.xml 514 BLAKE2B 1f7548f78a4a22f8bcef72db68b93aa472b3b72377ac99f087325d7867f6276f9f03ab868cc6e3a2cffceca1ec77f9cfed0f4764955d6f45c04b2a6c50a539cf SHA512 4bdb670aabaff9f29a87129efce22ee5ab23c78c1b1e16534afefd4101e1eaa9338d9319b3b326bc6a7ba7f6e3b54f8eb576284306a0105fc0faedd18a5a5789
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch
new file mode 100644
index 000000000000..18ce75d8b462
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-03-25 22:16:45.466833618 +0100
++++ b/CMakeLists.txt	2021-03-25 22:19:55.025828841 +0100
+@@ -296,34 +296,36 @@
+ endif()
+ 
+ ## Create symlinks for legacy packaging and install
+-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
+-if ( ${BUILD_SHARED_LIBS} )
+-    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
+-    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
+-endif()
++#add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
++#if ( ${BUILD_SHARED_LIBS} )
++#    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
++#    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
++#endif()
+ 
+ ## Set install information
+ # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_LIBDIR}
+-install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
+-  ARCHIVE DESTINATION lib COMPONENT binary
+-  LIBRARY DESTINATION lib COMPONENT binary )
++#install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
++#  ARCHIVE DESTINATION lib COMPONENT binary
++#  LIBRARY DESTINATION lib COMPONENT binary )
++install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # Install license
+ #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
+ 
+ # Install public headers
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_INCLUDEDIR}
+-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
++#install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
+ 
+ # Legacy symlink.
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
++#install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
+ 
+ # Legacy symlinks.
+-if ( ${BUILD_SHARED_LIBS} )
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
+-endif ()
++#if ( ${BUILD_SHARED_LIBS} )
++#    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
++#    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
++#endif ()
+ 
+ ## Configure and install package config file
+ # Record our usage data for clients find_package calls.
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild
index 22be187e6afe..256f7ffb9e4a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.10.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
@@ -25,7 +25,8 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
 COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
index a53ba934d9c8..4c5db671ec1a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.8.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
@@ -25,7 +25,8 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
 COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
index 22be187e6afe..256f7ffb9e4a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.9.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
@@ -25,7 +25,8 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
 COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
index 22be187e6afe..256f7ffb9e4a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.0.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
@@ -25,7 +25,8 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
 COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
new file mode 100644
index 000000000000..38fc7decb01f
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug"
+
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	use debug || local mycmakeargs=(-DCMAKE_CXX_FLAGS='-DNDEBUG')
+	cmake_src_configure
+}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index 2a972d7fd3d0..38fc7decb01f 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.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
@@ -18,14 +18,16 @@ fi
 DESCRIPTION="Radeon Open Compute Runtime"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
 )
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
+IUSE="debug"
 
 COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
+	dev-libs/elfutils:=
+	>=sys-devel/llvm-roc-${PV}"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
@@ -40,7 +42,12 @@ src_prepare() {
 	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
 
 	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
-	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib:" -i image/blit_src/CMakeLists.txt || die
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
 
 	cmake_src_prepare
 }
+
+src_configure() {
+	use debug || local mycmakeargs=(-DCMAKE_CXX_FLAGS='-DNDEBUG')
+	cmake_src_configure
+}
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
index 6a794206f0d8..9a82d46321b4 100644
--- a/dev-libs/s2n/Manifest
+++ b/dev-libs/s2n/Manifest
@@ -1,4 +1,6 @@
 AUX s2n-0.10.21-remove_Werror.patch 1292 BLAKE2B 208aab54784a956003c0f23564d07124476149f9a36fce40c6404ea79956479ba2a589bcb75808adae67c4f50ba78ac5fb72d21429248a515c9c84bf5faf5930 SHA512 4f8cbdfeeb7dfa514750083e1be4481f5ffe1e30ff88915b5c7eff2494ae534c454da51a0c56d720be66b5ce50900135a4e17f66a517ec437a027b01c9fc0fd0
 DIST s2n-0.10.21.tar.gz 6150129 BLAKE2B cf598ef02b4aa9a2a69f11a47b2a691055575b7398ba0a833081da704ebc7564d30abda5f2ad9ff9858ec2f553b1f332e913494b9e195e2a754f008bab5c11d2 SHA512 26957edf36af088af2cb355dad9281fefd9d54ce8c3c2c26f5682aee8d64338a3677aa81f3a07563b27a938cad2c57e0a86a478c9619cc93552674451d501909
+DIST s2n-1.0.0.tar.gz 6211951 BLAKE2B 3714f26ab0dbd53b878c73e0ae0abf9e8a4b85b16a62dd44a3e6264fba1afdfdd7bbffc3b38b494c5cc805b8a9dfe02009d109e308ff13b4752a56594299f374 SHA512 ab5ccc3e73e7f395ef86a5e637b9c2d18110c14b2913990d12e02286f6562497f7e9d45912e9076216e5f595d7932d58a31642e344a5e472259386983ad44bac
 EBUILD s2n-0.10.21-r1.ebuild 1479 BLAKE2B 0c2e33c6e9fc25cf67e3443dd9cc6a6cfd124326cfde164c945ac692fc2a4df1f2c336ea9df285c32c2a90848de0357fbd98ec9424fc48496576c142f943c391 SHA512 f8cdf7306ebfb68d73651b6617c49e011382540c1752b5ffc3449a9fc37b57ec8015a310ec155f8c23dab3430942b4696074a4419459c4f912d946c51684c5f1
+EBUILD s2n-1.0.0.ebuild 1538 BLAKE2B 3416e37c30e9db58f9ec3159b1a81d6e0210590c95b9dbee15a6f80cd116b552d9bbf564defc51f13662454b2b9ee23ef4c46da5f9889a36d0543d3ef71ac8ed SHA512 a322374afc4dd0c277855ccc96f02d8403c57505b002d722a1927f00ae68808a8e94b4fd21433b2cba485180f8139d5142ac0f7069e0ecfac6c487ac7a57aaae
 MISC metadata.xml 1568 BLAKE2B 41ed0afaba38302a1e1c2c6dee42947fb5a3221c0d58635a391193042e1d7589032722c215f3266c6771fa5097c91003e2f07166e794a801a264533f80481279 SHA512 12abec6ad35667aaae299705b1618c3fe173344a3ce4223213a437feef599afc381d7b31e8d2265429af8ae53c396e23fa673e44d666bb8910687d554f88d3d5
diff --git a/dev-libs/s2n/s2n-1.0.0.ebuild b/dev-libs/s2n/s2n-1.0.0.ebuild
new file mode 100644
index 000000000000..e5604e538393
--- /dev/null
+++ b/dev-libs/s2n/s2n-1.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Simple, small, fast and secure C99 implementation of the TLS/SSL protocols"
+HOMEPAGE="https://github.com/awslabs/s2n"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs=] )
+	libressl? ( dev-libs/libressl:0=[static-libs=] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.21-remove_Werror.patch
+)
+
+S="${WORKDIR}/${PN}-tls-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix
+	# QA Notice: The following files contain writable and executable sections (...)
+	sed \
+		-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+		-i "${S}"/pq-crypto/sike_r2/sikep434r2_fp_x64_asm.S || die "sed failed"
+
+	# Fix shared library building, needed for USE="test"
+	# See: https://github.com/awslabs/s2n/issues/2401
+	if use test; then
+		sed -i -e 's, -fvisibility=hidden,,' "${S}"/CMakeLists.txt || die "sed failed"
+		# Remove s2n_self_talk_nonblocking_test, it is broken.
+		# See: https://github.com/awslabs/s2n/issues/2051#issuecomment-744543724
+		rm "${S}"/tests/unit/s2n_self_talk_nonblocking_test.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index c8d5d47d0865..e55b0ba3227a 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,11 +2,9 @@ AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279e
 AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
-DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
 DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
-DIST simdjson-0.9.1.tar.gz 7956997 BLAKE2B b8a2cf899ea8ee074a2d4d94d14fd28e091b5d13cd63dacf774bfc184f9d42703ec4719710a4784bc742dff6d6cbd32722f6acc20606d38f8ed687b6280ec377 SHA512 337b550ee15c19ea7c53a3485e6327b6ac7a4152b3ae4101d63dba2d2510cd5b6cfe4d85a7347318d4d4317e4354331d004dd0de9c98325fa0baf7071caedd3b
-EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
-EBUILD simdjson-0.8.1.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
-EBUILD simdjson-0.8.2.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
-EBUILD simdjson-0.9.1.ebuild 1194 BLAKE2B b59614cbbd18b3f9e63fc598bd1caf725fa0e596d90025855894c27e6805bef35fe34ed15a1e6a0f4f7a8c883ec23c69b2b307cbc0f285f4af1f97405c70e2d4 SHA512 90f1b5012ef9126f6a7ea974057616d8fb18ef15e9f4625b474d140d4634a82830148b813c26d1521e73e7e33476357233b8eefdd19f4cf135079156a28882c7
+DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
+EBUILD simdjson-0.7.1.ebuild 1027 BLAKE2B 4df6580a768cec9c70144946a9b482fcfd339b99838e540d8dcf1a05254e70966a7cb7afad5614757ba0eddfc1fca149bc3589c04682670473308a20cf954079 SHA512 2078e75afd5cfc8970d0a52bed6509670ebfbe8e3315de7e6786e6e358a91d3db8db4d5d5ac6487551502e0d9e98e59c6378c7db587f59940865f9940af4c078
+EBUILD simdjson-0.8.2.ebuild 1136 BLAKE2B cf2d1e06ac050b97552bca05cc93ebfa575e4b9fac4da2a5bfa9b010a6c67c1cc2cc3b401dd9ab99ed8eda032be23bbe9989d3e336bb88b45fabfa7a755993f7 SHA512 5e0731442161b68f7695c433fe72ac6670643be4ac74cf052608ebef1497020a3947208ee7cc60e0c29b6e035ee01b4340be09df9427d37d36fa410351ff2786
+EBUILD simdjson-0.9.2.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
index ed7b3f9d6f58..40e114a8f658 100644
--- a/dev-libs/simdjson/simdjson-0.7.1.ebuild
+++ b/dev-libs/simdjson/simdjson-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs cmake
+inherit cmake
 
 DESCRIPTION="SIMD accelerated C++ JSON library"
 HOMEPAGE="
diff --git a/dev-libs/simdjson/simdjson-0.8.1.ebuild b/dev-libs/simdjson/simdjson-0.8.1.ebuild
deleted file mode 100644
index b97cc2e514e7..000000000000
--- a/dev-libs/simdjson/simdjson-0.8.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/findutils
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild
index b97cc2e514e7..8dd574e4361f 100644
--- a/dev-libs/simdjson/simdjson-0.8.2.ebuild
+++ b/dev-libs/simdjson/simdjson-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs cmake
+inherit cmake
 
 DESCRIPTION="SIMD accelerated C++ JSON library"
 HOMEPAGE="
diff --git a/dev-libs/simdjson/simdjson-0.9.1.ebuild b/dev-libs/simdjson/simdjson-0.9.2.ebuild
index b13f61e541de..ce97a46f1129 100644
--- a/dev-libs/simdjson/simdjson-0.9.1.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs cmake
+inherit cmake
 
 DESCRIPTION="SIMD accelerated C++ JSON library"
 HOMEPAGE="
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0 Boost-1.0"
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/8"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test tools"
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 10b7047a6986..662b79c6cb2b 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1377 BLAKE2B 6e9beb157843701f4b96440cab59492c8c367edee2a1ed27dcd10d8192f8899bcd99a14b94e58107494797d4fa7abceec223e62099939b36bc9ce424f7e71e4d SHA512 8e8a15ab4febeb3e2f0e6417cdea249c3d8719e3d5367313aa290ff50dac3dd187826851e97beecdc7d301d0d329b69afab260a7dce439f8e6aa0942319715c0
+EBUILD snowball-stemmer-0.20140325.ebuild 1378 BLAKE2B 3f98c9f2c6645f8e9e6492da9142837cf6fbf957323e94ee67a801efd1af20617f6b83de602f7900573bcdf6f6397452734329084902c2c773038d19698f8ec2 SHA512 56a42af15d6d581cb3906f7eaaede7869aa1212b6c8bce347838e1880f999f1d49e6afee1ec08af9f737efb50db881687ad7eb2237331cc36120ab427cfd5ea1
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 81ac5051433f..a14deb15aaa6 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils toolchain-funcs versionator
+inherit epatch toolchain-funcs versionator
 
 # The version number here has been added by Gentoo since upstream does
 # not do any versioning.  It is the latest date of files inside
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 62850e74a3ef..8fe7217963d7 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,4 +1,5 @@
+AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
-EBUILD sord-0.16.8.ebuild 1175 BLAKE2B 4e2cb2c54f6b80c968b090d384ebb154d23d8c531cc395644a5933f99a896feab71195b06d67a2946efe4e3b5cc60d4a01a73c3cbc2d9aafd2fb49c73a0791fa SHA512 951e2799df07c7946207332eb18a7c8bc9ebc3418aa9b1c1b2af9ccb79cf853be8f86f1a11b04d05642453a0d31d3e9a813cfc53c8951949a4d525b19806b915
+EBUILD sord-0.16.8-r1.ebuild 1262 BLAKE2B 70ded9e298c379e67972315f2c120e3f073f2bcbe22daac77cdea6588506727c6f98fd8a29dd96748bd1543b33513b6765ddc37273e8179a52fbc1235bb22b9d SHA512 3b162883431e52fef892a40a1f7eda518c8cedd3a4d17a1a36b283537a18aa6b9ba308703baf3ec8a367b5b25c3a3dbafa3b5821749616c73c5bad1f41ce933d
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
new file mode 100644
index 000000000000..c7f3e66c79f9
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
@@ -0,0 +1,25 @@
+From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Fri, 17 Jul 2020 15:38:38 +0200
+Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
+
+---
+ src/zix/btree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zix/btree.c b/src/zix/btree.c
+index 78a5a0d..d830008 100644
+--- a/src/zix/btree.c
++++ b/src/zix/btree.c
+@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
+ ZIX_API bool
+ zix_btree_iter_is_end(const ZixBTreeIter* const i)
+ {
+-	return !i || i->stack[0].node == NULL;
++	return !i || (i->level == 0 && i->stack[0].node == NULL);
+ }
+ 
+ ZIX_API void
+-- 
+GitLab
+
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild
index 26bfc0bacf6b..1b9950ec3e5e 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8-r1.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 "
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index a3d3e5aafd63..9e13955e92da 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
-EBUILD spsdeclib-5.1-r1.ebuild 1185 BLAKE2B d43e14686331ab5c2872a32a4b49676d544d553345d8b828c82263aab6ac6ce77fc5eca3128dfb60efde3ac432a0766b24b9cc48eaa20a9f7e52377c5e66d9b2 SHA512 2006813181849c1dd2a332a10e77ba99530971bfea662181265c25ce837a13eb0c03c4798c0eb47e35c821f9dbfa965b7cc9fdde18be2078f8d0e9a8cf8f45fe
+EBUILD spsdeclib-5.1-r1.ebuild 1186 BLAKE2B 704fb98a7bf8f4f786b64ea5765650a9510dfdfea13bb9c9825c3342dd3817d8c03179cb230845f23f98d4ac9deceb684f7445baf2e1036c11ee4627d9f33b0d SHA512 d40a34762665886dba0e674521e71c3083cb257fabb178cfd81fa16f6d707ba2daec404b11097970f30ee583e6c3da86e0cb6b31008ded2985de45c76c7fbaf5
 MISC metadata.xml 445 BLAKE2B cd513b1151b9d2811bc031b7772ac4ebd3d8fe69a08e2e7f1445db48cbca0556611440e82a42b1e01c8533fb00f62a33da18e535f180edb0bd04843b97db7d3a SHA512 212dc445119943fc6968ce83b0e5e29177f72dd14358e10d7925ce80515ca70093bd23dae7ac4a64890fcc74f8f095f599643113477a2cebd126fe68f93cd047
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
index 2829d62b2f35..8fff26de0fda 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-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
@@ -13,7 +13,7 @@ KEYWORDS="amd64 x86"
 LICENSE="Kryoflux-MAME"
 SLOT="0"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
 
diff --git a/dev-libs/squareball/Manifest b/dev-libs/squareball/Manifest
index b591c8a3ad3d..48a9d2b6decd 100644
--- a/dev-libs/squareball/Manifest
+++ b/dev-libs/squareball/Manifest
@@ -1,4 +1,4 @@
 DIST squareball-0.2.0.tar.xz 231844 BLAKE2B 831952ae3d3fb14abe978b04300b6e365217ab80b2cad863d6db33dc856816121cf2688adb56c59d50db9a62322c602eda57dd1fdeb830b97b557abc1157ece9 SHA512 be039d2e2120e87bb7289e75185c9ad46452fe6ae167dda2b60944d0a32f7ff7e89504f5ddd8343e0150d12ef22d71c51ab9290e90c43a930773bd39576bdf31
-EBUILD squareball-0.2.0.ebuild 1052 BLAKE2B 3bf262a428b7a27b51a928927ed73fea2213185fe83d4bfa1728f2d23656e7e8c33822b381fd3e7e14fea07701db4a91bbb128a4110cb975b25253744c49a77b SHA512 095ed75d8d1518ee50a9ef68ed6f61f3fab1090c61ba31ec00923dca4cec490f9f7f40d28632df569d31f6ccd7d9014140c29fa000de2f816f1f198da8748052
-EBUILD squareball-9999.ebuild 1052 BLAKE2B 3bf262a428b7a27b51a928927ed73fea2213185fe83d4bfa1728f2d23656e7e8c33822b381fd3e7e14fea07701db4a91bbb128a4110cb975b25253744c49a77b SHA512 095ed75d8d1518ee50a9ef68ed6f61f3fab1090c61ba31ec00923dca4cec490f9f7f40d28632df569d31f6ccd7d9014140c29fa000de2f816f1f198da8748052
+EBUILD squareball-0.2.0.ebuild 1023 BLAKE2B e89c104cc59be59ad66a35e392dfe891ad2ab718100b4584e82e0aaefa2fb927c073e151e6352278b395602904049c5115230c0065463c201836139d9cf4c87d SHA512 a140b2a2cffb41e999b844642d00c972acca1c730b4be255779322c87157bc675cea4f0514c29b9b5abe043c39d621f50d858182f3b5325a1789e65c1cbff9ee
+EBUILD squareball-9999.ebuild 1022 BLAKE2B 094597a6c931d6d6231e52679b4f47360b23e000b9324f65bde4b6f599785a3de95ba4609b65e7fb82141273863b58d9cae75ab08df11698de57743b68fd9350 SHA512 155d2766a297e3a1ef7031fd77676899001be75ad95b407abdb12fcabad75fdd4c17c7e8b69068b59dc90bf95242ab719eb7fb9ab1406113993539c865f97040
 MISC metadata.xml 383 BLAKE2B 4e9d61cdfcdb1c7da5afe7d7f4461de640d9fa4e8f95195a87108cb823ad3bdb9d67f42ca0f45274590362c52a01cc61fca92d5e426af9ba8bd09d1f0a1f601d SHA512 8d9eeccdd5b6b77089b1840a52a5acd12dae224483a1af4a48fdd91bb9c0dd7fb16cf4a440970bb6eed3747c28d751be53740c2a27e878e2b97aa359c57d183e
diff --git a/dev-libs/squareball/squareball-0.2.0.ebuild b/dev-libs/squareball/squareball-0.2.0.ebuild
index aeb29384561f..f66cb329826c 100644
--- a/dev-libs/squareball/squareball-0.2.0.ebuild
+++ b/dev-libs/squareball/squareball-0.2.0.ebuild
@@ -1,22 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 fi
 
-inherit eutils ltprune
-
 DESCRIPTION="A general-purpose library for C99"
 HOMEPAGE="https://github.com/rafaelmartins/squareball"
-
-SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
+if ! [[ ${PV} = *9999* ]]; then
+	SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,14 +20,11 @@ SLOT="0"
 IUSE="doc test static-libs"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="
+BDEPEND="
 	virtual/pkgconfig
-	test? (
-		dev-util/cmocka )
-	doc? (
-		app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
+DEPEND="test? ( dev-util/cmocka )"
 
 src_prepare() {
 	[[ ${PV} = *9999* ]] && eautoreconf
@@ -55,5 +47,6 @@ src_compile() {
 src_install() {
 	use doc && HTML_DOCS=( doc/build/html/* )
 	default
-	prune_libtool_files --all
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/squareball/squareball-9999.ebuild b/dev-libs/squareball/squareball-9999.ebuild
index aeb29384561f..28dcbab67e2f 100644
--- a/dev-libs/squareball/squareball-9999.ebuild
+++ b/dev-libs/squareball/squareball-9999.ebuild
@@ -1,22 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 fi
 
-inherit eutils ltprune
-
 DESCRIPTION="A general-purpose library for C99"
 HOMEPAGE="https://github.com/rafaelmartins/squareball"
-
-SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,14 +20,11 @@ SLOT="0"
 IUSE="doc test static-libs"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="
+BDEPEND="
 	virtual/pkgconfig
-	test? (
-		dev-util/cmocka )
-	doc? (
-		app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
+DEPEND="test? ( dev-util/cmocka )"
 
 src_prepare() {
 	[[ ${PV} = *9999* ]] && eautoreconf
@@ -55,5 +47,6 @@ src_compile() {
 src_install() {
 	use doc && HTML_DOCS=( doc/build/html/* )
 	default
-	prune_libtool_files --all
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 46060a5bb8c1..2bf886429748 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,5 +3,5 @@ AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r3.ebuild 3149 BLAKE2B e3d6fd2346e0b98f09f15e5eaadc02124b6be49183c49cd33f1c60b8f519f0a8d8f13460dc4e92ba4a06d8846288f3ee8ba0190d9043d317a0f8dea3b637b17d SHA512 85ba49b78430e97c71bd7034e2a2c16016f3cae4226069ad82e0eecf3b60a56671a252dce094623622b7a4a8d2fda875c065aed85a7d9b9b4adfade901998803
+EBUILD stfl-0.24-r3.ebuild 3135 BLAKE2B 266e28cb632ae61ab52fa68e8007572d412e207adca047c3043c84c9a66367ca788db3d28b739c9fdc83511487c12b4af9b471998b43c5c08eeadf51a16694b8 SHA512 45e9ecf8795606a11199a5964f0a392912c76292eb3d3567c76f2e0b5030b090ae036087a9fad0ed50acebeb507884c2f26dcbc7913cb204c8addbd161df1c0e
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r3.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
index 33ad54725097..fb1a4eb91c6c 100644
--- a/dev-libs/stfl/stfl-0.24-r3.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r3.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{7..9} )
 GENTOO_DEPEND_ON_PERL=no
-inherit eutils multilib perl-module python-r1 toolchain-funcs
+inherit perl-module python-r1 toolchain-funcs
 
 DESCRIPTION="A library which implements a curses-based widget set for text terminals"
 HOMEPAGE="http://www.clifford.at/stfl/"
@@ -38,6 +39,7 @@ PATCHES=(
 
 src_prepare() {
 	default_src_prepare
+
 	sed -i \
 		-e 's/-Os -ggdb//' \
 		-e 's/^\(all:.*\) example/\1/' \
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 3a85198371f2..717b4b7b7ab8 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,6 +3,5 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r3.ebuild 1477 BLAKE2B 8f084e18c2ee2ca0aee9ad3012f2044e75cb456be12a0a39f2e543c6f37ac185285a31702bda2c4aabcfcecd84354632f1f1f7aa245237fc0fb70fcb3750cf4a SHA512 f302775b058965f261b733ae39080cc8e4e1c894ec7f77d1822c3e41d57eabca20ae034d12f465bf8e9f1ebf110b445425b5493a1c31b2e2cd2ced7bda81c9c8
-EBUILD tinyxml-2.6.2-r4.ebuild 1571 BLAKE2B b91d6adce32076fea8777a28441acb2a188c2000032f89dd331a5a8c7f027dfbd7094d0410e623bc618f78713699b717553d1fbd17d6e6825dd0b6f6cb18bf0c SHA512 c721135b9f119f23eb7cfd46812409438b41dfb3ce90a2b1658b8edaf80bf30e8611099ac07533306b74f321eafbb5e8031c928b893df538113ad165de8fac18
+EBUILD tinyxml-2.6.2-r4.ebuild 1548 BLAKE2B 4ce5af5105d0eb838e24846f730ec7d7d77f9c2fd15cc35f727f0d920be3feaa3ac68a35de362b525bf658544ea6f98494ca6df1e1c45df0b10cf35cb4f46549 SHA512 103a615b9a4bbc8c9206a64f3b3394d65200bb65c51e24bf81823824fd9d6b360e75c96c4723ec0e1e7c6d68b2b045b9344dcb34f4dfc950b86e132f7b376c06
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
deleted file mode 100644
index b516cd4de3bc..000000000000
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs eutils multilib versionator
-
-DESCRIPTION="Simple and small C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
-IUSE="debug doc static-libs +stl"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	local major_v=$(get_major_version)
-	local minor_v=$(get_version_component_range 2-3)
-
-	sed -e "s:@MAJOR_V@:$major_v:" \
-	    -e "s:@MINOR_V@:$minor_v:" \
-		"${FILESDIR}"/Makefile-3 > Makefile || die
-
-	epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
-	epatch "${FILESDIR}"/${PN}.pc.patch
-
-	use debug && append-cppflags -DDEBUG
-	use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch
-
-	if use stl; then
-		sed -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -DTIXML_USE_STL=YES/g" -i tinyxml.pc || die
-	fi
-
-	if ! use static-libs; then
-		sed -e "/^all:/s/\$(name).a //" -i Makefile || die
-	fi
-
-	tc-export AR CXX RANLIB
-
-	[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-	eapply_user
-}
-
-src_install() {
-	dolib.so *$(get_libname)*
-
-	insinto /usr/include
-	doins *.h
-
-	insinto /usr/share/pkgconfig
-	doins tinyxml.pc
-
-	dodoc {changes,readme}.txt
-
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
index a926096910fb..59f37c5da51e 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs eutils multilib
+
+inherit flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="Simple and small C++ XML parser"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
@@ -10,11 +11,10 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="debug doc static-libs +stl"
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 006eadeb82bb..225670d1acb5 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -5,6 +5,6 @@ AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
 EBUILD tntnet-2.2.1-r3.ebuild 1900 BLAKE2B 273821b9179d910302c61511a7cd80dff6aeb16091dfdd387776f2953a8c1fc0338ac534d3958e3adf45fbfd9fd2d7742b22cafcfb42f3255bc0cc958d5b530e SHA512 db7ced55aceb5ed38ba87107a5d2bb63aebf3471b68a87592e5bca48bd23301d35ad6fddd2fb095d3371beb8a89c2a55b73a341f474c0cd33cc1186e952a9e05
-EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
+EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 5c76c3354d42c2a76df1fc7143fe499dd7570af798a744b705d3c10a081cfacac1902b723df6de7b221fc90fc621ae8986af25b1c74a5240a567ab4a088d0d57 SHA512 865c94fddabb875f9aea48d2caf9ab44bf8056d0714166ebff613191fd2a263033d583f34b237bfe2a3101da8c996db1b8e511d4f3ebb5cbe1853cee187966a9
 EBUILD tntnet-3.0.ebuild 1514 BLAKE2B 014c4fae89038f5fb174bcee7380a87cea815bb6cefd1d7bd6245064b2db43ccc1e83ad6998259b1c434024c137234a9245874bb2ba159732f9ac82d261a53de SHA512 d6d10e5e59fafaa060cc67c017c5288ef3870f89a19459838e449596b7abc6d844116278e4a4fcd479e84eb9e20d3fdfc010b16d4f29690126bdfafe20a07667
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index 63a7484d2e88..ec2ac1e5af66 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="Modular, multithreaded web application server extensible with C++"
 HOMEPAGE="http://www.tntnet.org/"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 19ba4e556e3b..bb7d2c1c3ba8 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.4.tar.gz 2869774 BLAKE2B 4f39a565d12f2fa0cb3a68c2015fd83a3445e5951a2293e1b37ac6c98c430aaeb1e219d33b11691de2c198b0039dd2319df53ab3be8c136c25a744f1c355d48c SHA512 269a9022f11c153c2dc09446273cc65de3f4fbab7ce2c42605b1b41abc5c98368660f6f10a5fd2deb751d6b9f21cf52a4351fcfec21bd6459be681e16eb2efc0
-EBUILD tree-sitter-0.19.4.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
-EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
+DIST tree-sitter-0.19.4-r1.tar.gz 2869856 BLAKE2B ae010a66f5fd51175b474e1418d36965cea8ed87edb5d186c9a554cc2a193233046148ffd8f7764b61c166e75eb94866115d948b2a367a5e1140f5d41c9f8505 SHA512 cc6adba489f4bbf3348b24f6d0d4039ae8bd80164d6e6bd5ee313bea064ef978d43aa78f7294601f65a95501b4fa0a914af879fdc362e54f429ca2255f70ae2b
+EBUILD tree-sitter-0.19.4-r1.ebuild 730 BLAKE2B 1acefd32f4e55acaa31f04c447f87c0642d509b61fc2caea5b3ebc7d41e14a7abb1f2b4f7055d2f4cce0a002bf425afa1f48706be9164b02943d442b7f38f42d SHA512 fac2eb94f629306a7762414a7d4077e72e2d1855e0249c46e6dcc13d742e4b0c30f6b017570d8622402ceced13ddc090b524f368fe362094918c7cb36c999521
+EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
index 62e7c8355b29..c21aa2ec8804 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
 
@@ -10,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}-r1.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -21,6 +23,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
 )
 
+src_prepare() {
+	default
+	tc-export CC
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 }
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index 547703a2d329..7097ecdcab15 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
 
@@ -21,6 +23,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
 )
 
+src_prepare() {
+	default
+	tc-export CC
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 }
diff --git a/dev-libs/tvmet/Manifest b/dev-libs/tvmet/Manifest
index edb2e4f13c78..40b2b389fe02 100644
--- a/dev-libs/tvmet/Manifest
+++ b/dev-libs/tvmet/Manifest
@@ -1,4 +1,4 @@
-AUX tvmet-1.7.2-respect-cxxflags.patch 1112 BLAKE2B c4d7208d0f2ba6db58ff5d77ec84000c071553b844300443ce96bca10b4db369d5fc297871d9322f1be88398daeeadb805815b2e65fdd5a450aac8c08d6e82d4 SHA512 3ef1ee581d4aec3398c1013b0f10d41d7afe31892996456788e352af8b058d524e4c2126b4e496c7104f971c0f88943b3a4d136ae9efbe57ea19e51832d00ea9
+AUX tvmet-1.7.2-respect-cxxflags.patch 957 BLAKE2B 9d41439dafe4beb00f8e57835835f0f2c0202fdc191a730a31f604be490de9c6ba5e603994564ee5d7630af17248c34763dbe857accbbb5c2bf7dff69a0c6ae8 SHA512 f44e5d0e63594e9e819996df8f437588bc08dfef4a16ca416a7bf2c91d219c131009b4ed1a41cd6fecec8ad5c1ef3d88c64e9640b1141791ac22091186d57792
 DIST tvmet-1.7.2.tar.bz2 532599 BLAKE2B 27c3c37c579ab7bd2fc8153a74389c303df9465b75ef7c9f9d553bd307b5441c1dc6764021cc47d0b108ac317f380db612048404acc7626e33d5479050d9cbba SHA512 0e57d2ec68566d02c09c3d8b35662b3737e6f074271e5e90c1354956636d2ada74859bb867d63684edaa93d7ab6a470a3141d02a04164101ff9d8d14f3d6c5fb
-EBUILD tvmet-1.7.2-r2.ebuild 1146 BLAKE2B c5911d8df069022f01455c8d09905330b828946093bd57dd1b62fd042daea578240ec76797f81fa9f2a885156949ccf6d5caa86f261e3cafb7b9ad010dcf18da SHA512 2515ee19098409279563f2bc1b37cfb2d599e1b933452683811ab43f1cd28f1423caa8087327e25eaa3a49cee9f85369f2c550310cd83ce3c590862a8702a190
+EBUILD tvmet-1.7.2-r2.ebuild 1178 BLAKE2B 29980ef3da009b41296d2dfed06c666c5504de0344d2800e50cd0d8468d320eaa6a6e99bb781e77040a0f3b9e6d58abcb6afd7a565f8148129bd50615a55971c SHA512 fd564428ec749194addbdeed4746897394c0726c20bd7de017f15ca1526525c9194b25f7e104190d27b1362e28af6dfeecb826de35e8ecd51e321eb16dcf8a3a
 MISC metadata.xml 242 BLAKE2B b2f1aa27e63431b25e02985d8da8f1dd90b5224ac8ce4a6a2c450120040e0330892e06456d689b079df5de7f7612e25607feadf581bcabcae8fa24f6b8a1cec5 SHA512 be67932e1a51ecec6ca5b24333af20574bfbf46bb3f294c51641cdee21cb894fc2b20411168a7dc750bf0772ae86667b8af860b201d68bcb814e7a9e848a5fa7
diff --git a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
index 2749c9131349..f2116434bca9 100644
--- a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
+++ b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
@@ -1,6 +1,5 @@
-diff -ur tvmet-1.7.2-orig/configure tvmet-1.7.2/configure
---- tvmet-1.7.2-orig/configure	2009-04-19 16:27:20.000000000 -0400
-+++ tvmet-1.7.2/configure	2009-04-19 16:48:52.000000000 -0400
+--- a/configure
++++ b/configure
 @@ -2659,11 +2659,9 @@
       ;;
       *:*)                   # Simple initialization syntax
diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
index b9927da76c91..17b51a76512c 100644
--- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Tiny Vector Matrix library using Expression Templates"
 HOMEPAGE="http://tvmet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
+
 SLOT="0"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-cxxflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-respect-cxxflags.patch"
+	default
 
 	sed -i \
 		-e 's|^GENERATE_LATEX.*|GENERATE_LATEX = NO|' \
@@ -41,13 +43,18 @@ src_configure() {
 
 src_compile() {
 	default
+
 	if use doc ; then
-		cd doc
+		cd doc || die
 		doxygen Doxyfile || die "doxygen failed"
 	fi
 }
 
 src_install() {
 	default
-	use doc && dohtml -r doc/html/*
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
 }
diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index 523fcba2e46b..53e425bfbe7e 100644
--- a/dev-libs/ucl/Manifest
+++ b/dev-libs/ucl/Manifest
@@ -1,5 +1,5 @@
-AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890
+AUX ucl-1.03-CFLAGS.patch 3992 BLAKE2B 7bff736b3231ddeb3518a49d302fab830ee0d18195f3d0ec7cac43d618c5eb7dfb71efb4a9682bc437709e94ecbbabf3d994a5f37c8823d903d5760a2afdca1f SHA512 87c699479c9d8d3c2e6ecf5e947379fa3132f0cd82056a43cebf23cfb8d39c3c4e6dd40a1c97b159ad3ee7ce839f987efa41ebc1b3fde70cf43a13c4954492a1
 AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef
 DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-EBUILD ucl-1.03-r1.ebuild 1157 BLAKE2B 2400b7b0712ae856586b1ebd4c8963b08b8cb2baf22c82c21a4c5515af5ed0c62f37e981021c82738cc9cd1c673c686e1cfd1861d4b70e67fafeb0bb4e02fedc SHA512 c9211cb26760210e5bb9b10aaeee4104becfb49e32b2a774879451d7abe5239a65ac5e3c09caa0416815480012bf5729d1929b616339cc09057ad19c758e7bbf
+EBUILD ucl-1.03-r1.ebuild 1181 BLAKE2B e7b265deca09cc4484ec0550b167a47b5eae3874a53a7fffd5bb6eca90a5eef83e72155632f7aa0559e096d282d230428f65c7bca0838a5bf90f14c2c2890a96 SHA512 eb9047d72eca0d7ac21cad130a63eafa6acac41a6e6da13100c8f7c7736fa121dc2abb0a852b81d7f54f9f9fa084af34f12c0d004c09cc967cdcc98843faad74
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
index 07c925b4888e..b01a50e3bdf5 100644
--- a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
+++ b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
@@ -2,9 +2,8 @@ From: Nathan Phillip Brink <binki@gentoo.org>
 Subject: Respect CCASFLAGS (which often defaults to CFLAGS). Fixes
 	compilation for portage-multilib users.
 
-diff -r c090ed619e90 configure.ac
---- a/configure.ac	Sun Jun 26 16:00:09 2011 -0400
-+++ b/configure.ac	Sun Jun 26 20:52:01 2011 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -47,14 +47,12 @@
  AC_CANONICAL_TARGET
  AM_MAINTAINER_MODE
@@ -49,9 +48,8 @@ diff -r c090ed619e90 configure.ac
  AC_CONFIG_FILES([Makefile examples/Makefile include/Makefile include/ucl/Makefile src/Makefile])
  AC_OUTPUT
  
-diff -r c090ed619e90 src/Makefile.am
---- a/src/Makefile.am	Sun Jun 26 16:00:09 2011 -0400
-+++ b/src/Makefile.am	Sun Jun 26 20:52:01 2011 -0400
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -4,11 +4,10 @@
  #
  
diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 71e1cac0a157..9f03c5c83fff 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -1,8 +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
-inherit autotools eutils flag-o-matic ltprune
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="the UCL Compression Library"
 HOMEPAGE="http://www.oberhumer.com/opensource/ucl/"
@@ -15,9 +16,13 @@ IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${P}-x32.patch #426334
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-CFLAGS.patch
-	epatch "${FILESDIR}"/${P}-x32.patch #426334
+	default
 
 	# lzo (and ucl) have some weird sort of mfx_* set of autoconf macros
 	# which may only be distributed with lzo itself? Rescue them and
@@ -41,5 +46,6 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 09cb19ea044d..9d79f5d88726 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,7 +1,6 @@
 DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
-DIST userspace-rcu-0.12.1.tar.bz2 527626 BLAKE2B 56fcea0fb81573dc55a0a80064e92ea837efdbd8743879d599424b4f6b140c0e9b0a88ff9a42d9643fa25e914a5fc67e1a26e101c25aa5c67582caa5da4d746d SHA512 c0c14eede77358904dfb10774390fd86b4fa9e0ab25d278c869728d40eb263bfa7e489b20ce7198169e71d74fe41bb5018fc1553a5e0654840c9765e088c83db
 DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
 EBUILD userspace-rcu-0.11.1.ebuild 700 BLAKE2B 34b0c77a1c001de1b7f17576d566f844342bb83f5a03474ec40b1daa7bba38736ca42bf4a4a29d43f7ee5fc94e634387b8ebe35ac44c48d08401776d27643096 SHA512 f1fec987b003fdf73bcc179e96b4a82e4a0159348a52b07cc9d439eda42f608d4dfde931f022889f6f04c9d28c9e7dc828ca7554b5f9129ddf0cf0baceb18b07
-EBUILD userspace-rcu-0.12.1.ebuild 707 BLAKE2B d6df7f445af5b7bf3d541b24650ee6c91c26a45f670d4c98b2cf6bd92cad8b3c1f14582012f4a7c8f429f3224ecd5eb7b44f3aa5bc4e8ed7a4edb4337e54538a SHA512 b9c0462a8a72b9e0590fb77128ae6692ce20ceeb5346bc2f069541d6b8779e4ee5bde9baae9577551dff8552c0a4dd0d4922cf1f96a5e8507e71aa754709eea7
+EBUILD userspace-rcu-0.12.2-r1.ebuild 786 BLAKE2B 10feac0f9129d69be5e4198bc4cca47114557e8ef01bc0eedeeec4444d2deea5a6bb070ce887f42c3b6864dad0d8e535499b5e19de1800e3c3acfb8a3aa3f1ed SHA512 ae2ffce01715203a0b51a5602723e2a049b918bc545bf26ec5b8304f24f7b960ed2c4b7cd6a12c35fedf67738e45da23a283b94152113e4b7c905d610f2fc0fa
 EBUILD userspace-rcu-0.12.2.ebuild 707 BLAKE2B 100a45de2603b238099794018c42c6ebe41e4d35bc40b70a9780efcd1a29c88f2c11a630be02e492827f0f8272e0aeb53a24252d16a2be6b86bc9a227a29af2d SHA512 b79b76dc220840ac7d54385a7f99cb7f8cce799a96c0e534bf3e78572388914f88e59f2de93c26887f4d97d77b007bab8aa465941e20204404b10666462f784a
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.12.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
index f8357c381ab9..3f480a08e886 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.12.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.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
@@ -23,9 +23,14 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
 src_test() {
 	default
-	if use regression-test; then
+	if use regression-test ; then
 		emake -C tests/regression regtest
 	fi
 }
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 5cbce7d13e74..d07ef41da9b9 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -2,7 +2,7 @@ DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 93ad55c113c922e0105b509adf8dc1505e625bfee
 DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
-EBUILD utfcpp-3.1.2.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
+EBUILD utfcpp-3.1.2.ebuild 940 BLAKE2B fdd932461e97f8b3fac2a0bd469ac5577a5e460871b215ece6a231c6d8e6a29009b7928ac15e81ab563267352214c25e4f823f0239f1b3da46c5e2bac9eacc0d SHA512 803a1e9733fc7012fbf116453b5bb4ff2811b9e716205b5e7cb2ace736d0cb62f11145fd3cc6fcecded39be9b3fd7104ec3bfc4f42256052f355f9591e891be7
 EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
 EBUILD utfcpp-9999.ebuild 898 BLAKE2B 3412683e554ceae20d79a57b4487f614175decaf501be0f4dc33f95ab81a822cdef2a3d736442f2fe7b1c8ecba30f62b9db3ed7638300d9fac3ae289dac7ba39 SHA512 3ddbc5569ebe18570ab9f6f437240c707706df91c23851761e8749c6b9efc11abd1ea1393ed2b9dd8bce497939715de56de8d0121810123773fc63f30496b812
 MISC metadata.xml 489 BLAKE2B 2ef430c67b786e25a0957139d366ce549e68050c1d6b3c70e3ca26b5d9a3e0ab636f4db1ae14b415fb21ae8c554a375f7bdb2f2e2d6935574df69893b2158ead SHA512 5bef0ad84410e96db68f4af49053d0046e4e2c606dd93cc6693fa3bf1327af0e88f747c2ea41675d353792711fe4e02d05ac3b74acfc0d5841bf8236ee2bb6ce
diff --git a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
index 14032157c03c..e795c660823e 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2015-2020 Gentoo Authors
+# Copyright 2015-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 3d69de84005d..655643092fce 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -2,5 +2,5 @@ AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f7275
 DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
 EBUILD uthash-2.2.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
-EBUILD uthash-2.3.0.ebuild 660 BLAKE2B 36b753eb27f7512f96727da8ca0267a32b537d27b3a3f4300bc5e2c9f3873add8ae61156bc8078c77b84d39c79ccb686af62b5e9517983340efcc297bd1ea5d7 SHA512 e96c1b2b3ca7b748c98e0005f8502ae6071dffdf0048463871136f59c9b1d173004e5083aa00e4ff6d87def2c06f17804b5c56451c82d5040d09c89c40b5b302
+EBUILD uthash-2.3.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index 5e4ed934d4cc..7e3b5953a15a 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 95a9662650ee..6637152ebe3f 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,4 +1,4 @@
-AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
+AUX uulib-0.5.20-shared.patch 2528 BLAKE2B aec47f6b2ca06bba0161ea94c32dca12b96baa5e0d6301501f9959499f252fe3557f50cbfb016d8a79fe959775db5694d688ad83d58160d097452d043565b2a9 SHA512 4dc386a2d70569ac218d56f1a1b0c0d9ad1f0708a0c975c273d8b18482d9fbb0863540459f64bdbc5415576c616088ea791001a6f3a8f30f0ef01e650de63996
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 733 BLAKE2B b2b25744d1a492c72592b5019db54362325508002d33f19f77ae0ae21b2d3e8c6dca682e9d5c8c1217c57d705bb8cc031816b4127d22a41574c473e880e31a63 SHA512 af651948075d9504b263e4af451c164055faf321a934745e1fd09da9437bc731ed9178cf7df6cb65cd99a1bc7cd66f24c62dedd223e223326c9eea04c231d3de
+EBUILD uulib-0.5.20-r1.ebuild 1025 BLAKE2B c80ecd15486db6f32cdb65ea6d8265a0c39a8362a50f96dab58c0ea70209de8810190b3c8a6e4819f7badc434426b2def3402f798dd928e31932654083cf21f7 SHA512 62ba0ec14cf4e9a4a185c5b2150d8161f65460d03f71c574e18298eff60c0e5f7d2d0433b854148ea39f1ac0cd5b1940c69c1ec34664ba29264a2ca144edb7c0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/uulib/files/uulib-0.5.20-shared.patch b/dev-libs/uulib/files/uulib-0.5.20-shared.patch
index 3a7f6582ef4e..fade48fb5932 100644
--- a/dev-libs/uulib/files/uulib-0.5.20-shared.patch
+++ b/dev-libs/uulib/files/uulib-0.5.20-shared.patch
@@ -2,10 +2,8 @@ Source: PDL Linux
 https://raw.githubusercontent.com/pld-linux/uudeview/master/uudeview-shared.patch
 https://github.com/pld-linux/uudeview
 
-
-diff -ruN uudeview-0.5.20.orig/uulib/Makefile.in uudeview-0.5.20/uulib/Makefile.in
---- uudeview-0.5.20.orig/uulib/Makefile.in	2002-03-11 10:15:46.000000000 +0100
-+++ uudeview-0.5.20/uulib/Makefile.in	2014-10-11 20:20:04.280175737 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -40,9 +40,13 @@
  VDEF	=	-DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\"
  #
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 96c0207408d5..91efcae15424 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -1,25 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=uudeview-${PV}
 
 DESCRIPTION="Library that supports Base64 (MIME), uuencode, xxencode and binhex coding"
 HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
 SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}/${PN}
+BDEPEND="sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-shared.patch"
+	default
+
 	sed -i 's:\<ar\>:$(AR):' Makefile.in || die
+	# Fix Darwin and other platforms with a non-GNU default libtool
+	sed -i 's/libtool/$(LIBTOOL)/' Makefile.in || die
+}
+
+src_configure() {
 	tc-export AR CC RANLIB
+	econf
+}
+
+src_compile() {
+	if use prefix ; then
+		LIBTOOL=glibtool
+	else
+		LIBTOOL=libtool
+	fi
+
+	LIBTOOL="${LIBTOOL}" emake
 }
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index a16c123628cf..25bcc4ddcbb9 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,11 +1,7 @@
-DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
 DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
-DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
-DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
 DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
-EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.12.ebuild 651 BLAKE2B c5cb1a42522cee6afef4cb3827cdea1e4c539aa4ec27e68236344f92a1ca64dc92ffbf380bb5ed95c39a9a80ea1db1c020ddac19726d47991790eada50d1e2da SHA512 d7a58a7e2a330f071481ffab85f64d6faa4a54609e32916342dfd36d6e881eebeb250f28cb65a37d51af5754e984b3704be5cc8c5573a263c9c1eeb428d30d26
-EBUILD vala-common-0.48.6.ebuild 645 BLAKE2B 41f2dc961ad49516633d96a5f899fcc545b50c2632917ce1bb44e96eb5af458db56dce8838544092810ae55b3e4b88070b344d6905830cf5c8a472f3415366f6 SHA512 1edc9583a5e34b7592a4169c2fe3300deeba71015c1ce376d05d71a998e127ec77fa7c558b1b4fb8fdda5cd8c2556e3dd7a752d87647209a7e4cf678d4ea28e6
-EBUILD vala-common-0.48.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
+DIST vala-0.52.2.tar.xz 3573764 BLAKE2B 88340f7142518a0c17ab2347cd76853d18c00f86ed030cdcdbe726d92dc165ce2c83d07301f77c08f839f1d6b0da05c77e19671817483786fa57ed5bbcd240cc SHA512 c30b64f6899c53eb852128b95265ccec99d27a14388525829da1e5f5ff229c695a1e67b9e3bcc8fef751221c8923aa853bd2065ec0cfbc9b19d6c04007ed4110
+EBUILD vala-common-0.48.12.ebuild 646 BLAKE2B 7c7c9e821ba8aeb118e369dd6ea191472a9920471ffc6e728539266a41ac50df9e266f8a54c07d889371083ec55bcdc1bd6acb2261c0d9cc86b3e96a4de73905 SHA512 576d59d76e6835ab67387b707d671ad1fb20f18ba2b24a5a2e831a600c1a20e178715a9cf725e6ebe8f040fc367aa7aad64746c70b6071d25fb03973a6aa912a
 EBUILD vala-common-0.50.2.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.52.2.ebuild 646 BLAKE2B b340fa6592c60b4ef8ded31d3caea68bbf10b3c33e117f5b5145cef2957f9467d15ee64f8f2172d6aee835932d84c92f4f11cdcb48a1747224e4e49cd02e8a56 SHA512 c15f0673dcec542c4269e3ac1c5a21b46ac14ec8bbb6e20a8fcaa1ae0b78bd7957e97f1486cc033150121f3c1fea1ac16125447c71014798d505e677dd3b99a1
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.12.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
index b865eea1db7e..d666b35e44fd 100644
--- a/dev-libs/vala-common/vala-common-0.48.12.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
deleted file mode 100644
index d64b5929db95..000000000000
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
deleted file mode 100644
index 51429ad4aeb1..000000000000
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.48.11.ebuild b/dev-libs/vala-common/vala-common-0.52.2.ebuild
index ee55cfcad100..4a9682cb5442 100644
--- a/dev-libs/vala-common/vala-common-0.48.11.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.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,6 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 97b902ddf8ec..b392914bb2e8 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-protocols-1.20.tar.xz 111684 BLAKE2B 2ddd3d0b0dde94fda4788a1fd6631b6fcf22fb134e74a55f2c310ab4b72802d3b069d294e3d7b68ea6ddfdb0f944ac9011b73a9678e65eec924135822f697087 SHA512 d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977
-EBUILD wayland-protocols-1.20.ebuild 796 BLAKE2B 5f4f23df6c3c68e321f4ea504e36051ce0ec86a077c8164a5d707ebd138d6fcc2b99eb48bc291110593e13f0dc2c3429234310b87c293a92aa4162436df13a31 SHA512 61fcf021f16f35aa01778a6b6e3ed6e507b5ba74a2948155bcd76afec04b18eedc2ae9582f3af182d147a1ab430255d15f3d3609631b49dee763c8f8d6e7ce5f
+EBUILD wayland-protocols-1.20.ebuild 797 BLAKE2B 16760114c9c52faa516fccfe8c4976db8249347104a9484cc1e0db0bfe3b02407bbcc6519e377c367f3e19973bc7ba1102d779f600dd556638f7e8748584af79 SHA512 b3e965ff0e7d2a2566b3103c9310aba101839fb540ebc4c08d4f5810ad343085e1d5d63ddc59dc6c56aa202a285deead877e9c73fd6403072c2bec769081415e
 EBUILD wayland-protocols-9999.ebuild 797 BLAKE2B 274c9c89ba60e38e61dce64166f211de987b029cb4592544063d39c1b2ac3baba8af8b214a338839747b7a59475bcf81fbeac8503ee6446ecd4e8ccdf0a758da SHA512 0d02e092e3257afc3077d6e39ba218ed8614693feca0420557cc0ac1511f62a9cd8b43bc9c890e9e47b889c684e1b3fc2c1e82489164a4940205d87a5d097b04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
index b7cea107f247..923dc813b366 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.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 autotools
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index daff998c2112..cf2dc4740762 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-1.18.0.ebuild 1746 BLAKE2B 4877a6996f909af202d7d8f80d638197a0bc305a6ec6de32a01d099fe9133f211f09123889dc779de1b63421921e45a5a7ba656e093b8d0ee8a9c14df0c10b41 SHA512 8843d5f526a0c142658fa22c0f4b771379f5ce3b48516510790914c11815219900b8697a07d18af44cb5103a86e3c756d9244e344abb5d9976ec11d93eb8fd7e
 EBUILD wayland-1.19.0.ebuild 1811 BLAKE2B 7e03623d22ae15400829b467b44a3c7265ca5544bdb19b5a117851746e7df9f318443361532470254a86a3e527b46110eef5c2b9e47ed0cf41fe1b5c4406e320 SHA512 10b0a43e925cbb042c17be7bcead1d49c7b997651159822f92c0432a0eee804af2f8aaf4e13ef14de7e5d1768dd9c35bbab4f9e3aa7d14d681b7f56cb703ba13
 EBUILD wayland-9999.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild
deleted file mode 100644
index e1e301322771..000000000000
--- a/dev-libs/wayland/wayland-1.18.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-"
-DEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<media-libs/mesa-18.1.1-r1
-"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(multilib_native_use_enable doc documentation)
-		$(multilib_native_enable dtd-validation)
-	)
-	tc-is-cross-compiler && myeconfargs+=( --with-host-scanner )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 8c3f2068b9ae..1d326cfd47db 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
-DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-8.0.0.ebuild 3637 BLAKE2B 1f83a82dabf0a8a983ae5ba19f758fb70523ab165e779d582abc0168136d3b0fdb5d6bcf78fc931dd4d737d42b66811c7d9e74994ba03d4689d6aeb0e352054c SHA512 dd22694d1a80c1df40f47b5162bc452c0ec7c50cc286a92e4d7b3e2ef31bac7b3bf1f74f25e268a72da489c2156027a76f8a7764d582b094c3a42f85accedf49
-EBUILD weston-9.0.0.ebuild 3710 BLAKE2B 616a4cf8651eca3d747b988228bb2d9de249bf8266ead128812459b17a629ac1449c15f4cce1402e9a41acf5b1113caf4d54d230e65f7cc4603b7350142ddb99 SHA512 4f2ffb41f949662ce40a50a3233c1ec0bb1dcdbe960f72d41a36af43110e951ab0ee4d71cd97247890e573f0ccb9af889127dee09122f346c68dbcb315f4e71c
-EBUILD weston-9999.ebuild 3706 BLAKE2B 82ba0bb4bf3889b07f5e77fca64f5ef4a09b6a395b2d2f481864c739a8aa8c67eab59a431e0bc34d499d5869f0c4565b756703ec064610c434124513a367327c SHA512 c4a69d7b0e83b7d29fb70a15e6e7e10bbb0f64185ab45f668f43cd9d44e14f5f8bcbf84551cc3ced92f05cbe9865a09008fce5dc66f41a26c2adec8786ce84a1
+EBUILD weston-9.0.0.ebuild 3696 BLAKE2B e2347bde9ba185d5e11bf712db5f9383ede9e97dfb4b3a35c8d7ffc4cc419ac8d28b34032a3c78cabc324a41258a75b4968faae74d8304cb85b156ff837b221c SHA512 de29d0a2fc75111d9a49aade4991a37705c5dcf2288bafef696efc2a8af60cc07748bff24a8786ffa2c3c3f6de9ce2d8a60ec2df2a427ba35577c138eb618b26
+EBUILD weston-9999.ebuild 3692 BLAKE2B 7932952bee15707f295c7c489c34fd0c2f5d665ba91c61bba818e9a54f6589bf74267833674f7c3e7b98983524adfe1ab24a612da7328d18b0441e1c27bd229f SHA512 4eed0f6064e23485be67450e21cdb42074d45dbdc3c90cda7968983f7a35e282250fae8eed5aa0aa4d585e3b9bb855f3aae5f5acd9b5ccffb1b685aba4245be4
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild
deleted file mode 100644
index 159f8af3b1b1..000000000000
--- a/dev-libs/weston/weston-8.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	colord? ( lcms )
-	drm? ( gles2 )
-	pipewire? ( drm )
-	screen-sharing? ( rdp )
-	test? ( desktop headless xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	pipewire? ( =media-video/pipewire-0.2*:= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( sys-auth/pambase )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use colord color-management-colord)
-		$(meson_use systemd launcher-logind)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-
-	# devices test usually fails.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
-}
-
-src_install() {
-	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index d9ca85977e50..ff6a7c803237 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+inherit meson readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index ccac939f6d31..b37bf79f61be 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+inherit meson readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 07a7a3fc0fa8..f6dea4b76b7b 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
-EBUILD xapian-bindings-1.4.18-r1.ebuild 7027 BLAKE2B f5842bf314b6c310c88614143151e2bbdc63ccbbf9c2c04940be8bb6c901045eb5112a931cd64f0df88ab7daa8e050e84b3d91c637c97bf4f6696ba88b8df6c2 SHA512 5aa61066ec41fbb3680dfd953016c4ee6e1aa63c9c051ddc339931a2c952d3d95174e665b46014f6f1935b23b8537089b3e006cf5b5526bc086515d2c61f8739
+EBUILD xapian-bindings-1.4.18-r1.ebuild 7016 BLAKE2B fd0301d6eaf8343e04e4e21dbeeb5b81eaabb86050429623d939b26494a63e8bc5fa354ea69db6dcb219b17ee54399c9629c7e51c7ac6cc9c1bdfa08dc54d86d SHA512 95db246a513bb9302222d2f2de91c728558a215a9ccbe3cef3908255c531c762c2df3b569d42686c70d07957ff7ec831db6c6ccc04f73e91b4173c1f6ab76adc
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index 81718c3911fd..92b6d26f5962 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
@@ -17,7 +17,7 @@ PHP_EXT_OPTIONAL_USE="php"
 USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_OPTIONAL="yes"
 
-inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="https://www.xapian.org/"
@@ -311,7 +311,7 @@ src_install() {
 		java-pkg_dojar java/built/xapian.jar
 		# TODO: make the build system not install this...
 		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
 	fi
 
 	if use lua; then
@@ -334,8 +334,8 @@ src_install() {
 	fi
 
 	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
 	fi
 
 	dodoc AUTHORS HACKING NEWS TODO README
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a947eec16b0e..73394339889a 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,7 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1847 BLAKE2B a2a10f3a42dd65c4b7f0f69ae49ec26feaad6d2d85c4ce0b235fabc6b053f4dc264f6ff6c75635effc580f18200d4c02f41c7c629c1583dbd048590c6927acb8 SHA512 75464258d2e41411043d53d4d3e9aa6cfb39d44cc4325cdfdc37ef3865ba3ca60cf304c310e898c1bb1789f12f62a4e7ff5aefe4d7b6098c3b41ac83f0550406
-EBUILD xapian-1.4.17.ebuild 1814 BLAKE2B e2929c4a13927bf231d2f8fb353e7847f044ee9f6cbc869ef6621fcd6ed99041b517ce6ab697e03f56ffbccc6f6dfa9e6589733019f062923140662f08ebe90c SHA512 2246efa98ecf88d19280b56f5e872f90d585f5437a56f9a8655bb8dcbe213393d784d90aafe40c871d2b1b00624bf0d6a67334887b01b78d9d6dd71b28166259
-EBUILD xapian-1.4.18.ebuild 1821 BLAKE2B 970eccbdc9ae049fd23249cb46a6d1bd65b6bfa239ff6ce4bfec4d2498405dc489df2465ce9960cb3d4e308e20f36a42d2a7cd685275abe7608a1932330ff4cf SHA512 c4c9de7cbe5d89a84e80fe7dd6c2fe88f7054c36276f97f06ea2e33aebc7fef111bec2b820c3decc3d0c09574c6a9ca200a3361dc5eefce1f6822bd659d6a9f8
+EBUILD xapian-1.2.25.ebuild 1846 BLAKE2B 4ff9216abc501a2f4f517074317d06e2bdc44d2828971c66c6e756b3a03770485eb5788c2cccc1f59bd4370f13712db70d8a33ab11edf67010e9e474e390d2b0 SHA512 63c427797d5d374164f176f60e0a38f42ad2d9b1ae5b0aead552a79302c692424ae788779112f44229b7d32db6d2a9da65af5dc9ffeae70500ee610e122084b5
+EBUILD xapian-1.4.17.ebuild 1811 BLAKE2B 3f94c8906bc29c3bc221616b80578eda444cb3b2f56bef639aaf03a22b86e938aa2b3a8cf66afa1dddc7fd243865c9fc704cef181699af1465a3775ea65a3af3 SHA512 0cf9f291f252f8871229e5e7705e4bf34a1c868de50b8e591ce888897ceeb19af8f75bf0dbb96762443ab6c8855ece59a30b79f4b167c5dc566b95f29ac87349
+EBUILD xapian-1.4.18.ebuild 1818 BLAKE2B 1d0f89fa2f4e92ab049e0e63d2974ecf8e538f2870090164272eae4b2d8df60defaf0e848ce12306d1ab19a31da96a4dadbf8d0a8fc6f688dfbfcac240e97069 SHA512 2f9786eb876caf81b091c3d80eec0a474332e771099bc0926bb84bcec58ea37d2b70ba05d3071619fc4e073d937f97610660031d5a8a8ff8307af1ca023b2e68
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 7289983d3f51..6fb5b4472847 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -42,7 +42,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -61,11 +61,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use doc || rm -rf "${ED}usr/share/doc/xapian-core-${PV}"
+	use doc || rm -rf "${ED%/}/usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
 
 multilib_src_test() {
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index d2e1c0ec8fc4..d78cc9126d08 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -65,10 +65,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
 	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index af91a3119e61..6a4927607af9 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
 
-	ECONF_SOURCE=${S} econf $myconf
+	ECONF_SOURCE=${S} econf ${myconf}
 }
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -65,10 +65,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
 	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index f18ce914fa3f..60fcef1297fa 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,3 +1,3 @@
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2066 BLAKE2B 81fb24b30acd61c0368cebb20a1c48bf9c3d68c4851a3e0747675e2609d606433ee4c411c9a1a929c208c8c948240d7b6294a256f5b17468d8bf74706bb1350b SHA512 99e66c349960d4e7b0614d1abbaba7595e0c4cc505e5ee5ce5c0cb9a4cfd90d8e7e58cfa5e88080c02a5c8d9ba393db1202658a631986c0cb3370e23bd23df70
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2067 BLAKE2B 27d86c5e7121e26db6bea1cf4944502f97029255e7db2f9fc2bd8f7131eb25ec4a58ad3734b9efd5998c7bbb90d7631bee625ab2a64e92e554b1c57879e28dba SHA512 7a7b0e51672b25172015a1aeebf2009d9bd7d70b29da33b27d4a9216a7390503fa69407e6c1d772bebb3c63909d0963ddaec81d7ef75a22a4acf916dabdb746a
 MISC metadata.xml 616 BLAKE2B a37477d1d3b750b6fc69897bf5face2706969bff7aa38cf24a4dff667d3374f9e7469de35fb872a39d0e3d67379075115de6e26fc4052a99adf6b661e35dc4a0 SHA512 59973e62c502b138f2081b7f7284e3e9488d8dde0a75e566398b374f3d6535a8fc3f623a4442d748fd4f88fb47412af586b79d5b3e784d5b7449f471d8bb9c39
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 133b8ddb93a2..29b329aaa875 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.51"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 924b6fe418a1..f74a48ab1568 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -2,5 +2,5 @@ AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
-EBUILD xmlsec-1.2.31.ebuild 1453 BLAKE2B 9587b817f19489d7dacad979a5710781fb2cbf3d9336e248830ea262f81f6364a5be4b95a3afd2ab1c32846b6f67b97f19f603e7301968e2e4689203e4717521 SHA512 c1de5fc015c592ecbce76f77af957c980035c103de1d275467a9ab3217b07c7a9a071a8d0470a11fcc503da8dd5e26c39abb69c7979582f5c9f7e0b76840a991
+EBUILD xmlsec-1.2.31.ebuild 1452 BLAKE2B 0af1c92f644fb43d6c90b697c2e6e166a3382c1e6a694e0351d001acb7b6c4763542e8852272800fb2bc93fd4fee2aca3f8a70dfe03d00982e65507d6dae6700 SHA512 08cb3a0eb27f141acdda42d39eef0203c9d94bac41b53e039bc60c489ae75e5bbd0717d64a18b2eafdfa5a74cbbe3ed28515db0f1213dc4542e92d02d8582e7b
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index a52fbd446c66..ef73f6a55000 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 03f88d6faa5c..7255e792295f 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,5 +1,5 @@
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
 DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d19588a28361f519d424c002345ba76b48d5adc0b600e34e595fed20a1ce8b8c5f22457cb05c4233810e9af9b823 SHA512 c3973b3c98bad44e1d8687ab4f9461aecd1c071bb3d320537a4c50fb7301edd13e990bab48cc6e5ca30536a814c8fa8cac24ceb1803a7e8eca30ef73d449373e
-EBUILD xxhash-0.7.3.ebuild 908 BLAKE2B afb6ab7cdf944fe2360ac959d9cd56444aa655d022e8bbc96418597baba42ae59a4b0aa5f46dff013c3de9b519d41159796493be302f0e525d10c73290d765a9 SHA512 e735864d13fc0ccd3d087f28fb5254d38c764377cb4c490068e986f1f4e79cff8249d97edd086995e8484e1a6c3dcbf150db0661838fc32535a4e83c3728b702
-EBUILD xxhash-0.8.0.ebuild 908 BLAKE2B b3202edf38c9804a7231f6daadd22f8e5b7876917a52cd2b7975493ebcc18be04858d4f341caa90bfd42f80dcd730b513b37d9f34ade610c20f084a26081fbe7 SHA512 474dad37534a5456c804c3d054d8e378d9f5ad1b9b465fef38dede8cdcc61d6b1d37b1a4e148f6852b56690be45881d0f150a8d899b94487d248df67f04e84e4
+EBUILD xxhash-0.7.3.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
+EBUILD xxhash-0.8.0.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index 4c309bb8f6d2..fbebd117c825 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/xxhash/xxhash-0.8.0.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild
index b822e784d75e..fbebd117c825 100644
--- a/dev-libs/xxhash/xxhash-0.8.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 0096262227f3..369e6c651e55 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,4 +1,4 @@
-AUX yaz-3.0.47-icu-automagic.patch 899 BLAKE2B b6eafa42b369a76f085efb0b89424c4c182c1604a68bebd7f8fee47a925fdc859973bfceab912b8aeeef2aab288f326fadc0ba2fb63e6e13d047c9811ea326d4 SHA512 55185162a381ae3cb7a880568b2a0a04c1b2f7d8e579e1494df0c2047d021648bce15d223f99a36f59e8b1a14fea161a128a2c01ea7f0e5b2e167e09cf6f856e
+AUX yaz-3.0.47-icu-automagic.patch 804 BLAKE2B 37016fbe77f2f611f4118ee5995b6f9050cc6e47bd8546bf8b681084a6844b888e084d567f943b5734a0c33cd12918ae5cec5c6b7ab19dc169d8e9950792cb1d SHA512 b0b38a85342045ef68e0b866a6f15f30605e246c7f795402238e68e70aec26ad7b985257879cbba2698d6f0c40a8373b522dd7fbea9253dbd6d2ceed2a0d4dcf
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
-EBUILD yaz-3.0.53.ebuild 1393 BLAKE2B 6dc7470244c53d8d4bba4f911304c970e3b0c274b35dee69a7474cc18b7a76bbc8fce6b0381d7113ae63c7a91f3c0872ee4b82c60eb01471bf4e7e0029738a50 SHA512 e10540ac9a9ead5a2ce30bc2b02de603c040aec505092c7cf1f6f8e327d16fe2996529fd8aecc0bf2c6561280f20ad5c37847bfb87467cb25feba5361d7f5498
+EBUILD yaz-3.0.53.ebuild 1505 BLAKE2B b810f7445c4580f824eed4613a50df7de3c57110126d3a6a6c903b225c71e2de7401bff616bc7a29fef3fe837a6cb481faf7a10549d3cd484c51957ce26ee462 SHA512 66b03d37d144c635621782a9fad5e43481c31ff58aa81dcb4e32aa1b726d2813387dc317c6f7ffc0f40c26aa7fbcccaa4e8624d3cf17daf87ddc6fc0585e48ae
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
diff --git a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
index a0aedfe05105..dd78635e013e 100644
--- a/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
+++ b/dev-libs/yaz/files/yaz-3.0.47-icu-automagic.patch
@@ -1,5 +1,5 @@
---- yaz-3.0.47/configure.ac.orig	2009-07-08 04:58:43.000000000 -0700
-+++ yaz-3.0.47/configure.ac	2009-07-31 01:46:21.764545198 -0700
+--- a/configure.ac
++++ b/configure.ac
 @@ -367,14 +367,14 @@
  
  dnl
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index fa044ba4bf87..847579e85f6b 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -1,8 +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
-inherit eutils autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers"
 HOMEPAGE="http://www.indexdata.dk/yaz"
@@ -11,22 +12,34 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug icu libressl tcpd ziffy"
+IUSE="debug icu gnutls tcpd ziffy"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	dev-libs/libxslt
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	sys-libs/readline:=
+	sys-libs/ncurses:=
+	virtual/libintl
+	!gnutls? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls:= )
 	icu? ( dev-libs/icu:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ziffy? ( net-libs/libpcap )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	ziffy? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/tcl:0
-	>=sys-devel/libtool-2"
+	sys-devel/bison
+	>=sys-devel/libtool-2
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.47-icu-automagic.patch
+	default
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -35,22 +48,19 @@ src_configure() {
 		--enable-static \
 		--enable-shared \
 		$(use_enable debug memdebug) \
+		$(use_with gnutls) \
 		$(use_enable icu) \
 		$(use_enable tcpd tcpd /usr)
 }
 
-src_compile() {
-	emake
-}
-
 src_install() {
 	local docdir="/usr/share/doc/${PF}"
-	emake DESTDIR="${D}" docdir="${docdir}" install
+	emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install
 
-	dodir ${docdir}/html
-	mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
-	mv -f "${D}"/usr/share/doc/${PN}/common "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
-	rm -rf "${D}"/usr/share/doc/${PN}
+	dodir "${docdir}"/html
+	mv -f "${ED}"/${docdir}/*.{html,png} "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
+	mv -f "${ED}"/usr/share/doc/${PN}/common "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
 
 	dodoc ChangeLog NEWS README
 }
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 59a4ac09877b..e15ec1e13555 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,4 +1,6 @@
 AUX zlog_no_static_lib.patch 1974 BLAKE2B 67c9cc1f7c6856b44096648d36085ddf9ee41074a82ff2dfb4a3b9feb13968bb6da53797f7a63f969b3a34dd1cc2e61a36eeb63b9d78512294e8dcb9e0313f75 SHA512 fb4acd9937112bb1bd044db0446618bc098e8cf87156f792dbe98c4c6e3ca9a66f4c047639562485acf371c20d12754bbd6b233d5bdc45c28b99e67779c3d5ad
 DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
+DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44 SHA512 88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4
 EBUILD zlog-1.2.14-r1.ebuild 677 BLAKE2B 1e87dfe72852c91ff3bf2d8d0c84edb3d40502af499fa96ce666e4bc4663c6a86c1e152d44fb9990c96bf0ed487290356d0623707d0bd082200ada3711e9a0e5 SHA512 0741244fbfeb6fd95568268279a6baa0fe543a66cb9448a0ecc810c4629e21a85ed1b8868464ed6601bb84ea7b1ae7f9365c6b8a3d6cf2c35d75e31ac46d81c8
+EBUILD zlog-1.2.15.ebuild 677 BLAKE2B 63d8a4934c1571f77c0bbb6c4704920c7f1ee2c69c04d1ec58efd176c6da152fb8befc218b05c918487a6471f5f44dc1bdb2f42eb39d2def2602d02e57b2335d SHA512 0de0cbd7961aead85d577612a0d0edc6a8f54e0a67e2de700bbff5af9e8896d3772357bc0acf82a6db3dbb035afeaaf8f23caa4700d8cda00a1bb085f0cfdd60
 MISC metadata.xml 343 BLAKE2B 89638546a983a00dbd6d23bd6367b8bfcfddeac9bc5d124711f7504ed5acfeb9fa7783e53dbd48962852b7c2d0a1d8fdb698f40e7a34b8845992ef4f37b1ae0d SHA512 c298ff8a2e20c56ff911c10866ed06ae28a34b8c52902963de0e7a52494cd94732247652d638c1be292d13e207b2c74510a77580e800131022e3118302889c8d
diff --git a/dev-libs/zlog/zlog-1.2.15.ebuild b/dev-libs/zlog/zlog-1.2.15.ebuild
new file mode 100644
index 000000000000..12d8d51008b2
--- /dev/null
+++ b/dev-libs/zlog/zlog-1.2.15.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
+HOMEPAGE="http://hardysimpson.github.io/zlog/"
+SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/zlog_no_static_lib.patch"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
+}
+
+src_install() {
+	emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
+}
diff --git a/dev-libs/zookeeper-c/Manifest b/dev-libs/zookeeper-c/Manifest
deleted file mode 100644
index 765a411c9df5..000000000000
--- a/dev-libs/zookeeper-c/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
-DIST zookeeper-3.4.8.tar.gz 22261552 BLAKE2B 618c46dc891888275166d4ad49fb59c9247f79c9886bdd438297ad682463d56a5088471ee5e0f8935771df9f220108d36cc78d695d6b28820f23344b4623030c SHA512 a5f0eca3c66655e0116aeddd92af228402d3d68350b30f9400b3638ef09610d903b7c87a2bb49a5594b12a4d082048c259ba3da121c1c6da4752dd5f5812bfec
-DIST zookeeper-3.4.9.tar.gz 22724574 BLAKE2B 5792b79068fb98cc0ea8ba53d41bbf7b33556c7c9eb1b042acfa2f8de45381b3f0d42360686386d7254f534639f25530911f668e5aa2dd55fd48c349c69176ea SHA512 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657
-EBUILD zookeeper-c-3.4.10.ebuild 859 BLAKE2B 407a7d16a612179d11342297a2abd5c603ca6dd5f52f2c76161e9b9c0d35ccad36b54b5533debaff5752c28e782801079238f02f8d85d8751703800123301666 SHA512 c515fdb3a4617faf7c6900152c8db1c624fb79b0de9e2c06bf10d362878f1df63ba825559ce196f6500b6504256c97a35e01d054366b2602421b2b6b8231b171
-EBUILD zookeeper-c-3.4.8.ebuild 719 BLAKE2B 14696d54a69ceae9a3f3f390922634a85f4220c798cb337b850453afffbcdbcb51b30841a84d4d665daadb4f2032daf9c57bc1290aa40d38a7dad3689cff5025 SHA512 a0c974d626d27ece43465cf588340eb9598223fcf1521927f47386c23a369b4537e2ac5a9bc98cce556549bec5786b341c889e962d2af09bf833f307c5408514
-EBUILD zookeeper-c-3.4.9.ebuild 719 BLAKE2B 14696d54a69ceae9a3f3f390922634a85f4220c798cb337b850453afffbcdbcb51b30841a84d4d665daadb4f2032daf9c57bc1290aa40d38a7dad3689cff5025 SHA512 a0c974d626d27ece43465cf588340eb9598223fcf1521927f47386c23a369b4537e2ac5a9bc98cce556549bec5786b341c889e962d2af09bf833f307c5408514
-MISC metadata.xml 249 BLAKE2B cf8bde991a84e1daa292ec8a9ab6f76b5ea2c82bdf5375cdb64fe8eee1e5ac132e74bfc315fd22903bf14c74a4e85cc652d5159890513cd07b7d1ccc50d6432f SHA512 35adb9836c7231ecab604ae693f0650dadb8480d719531dbad1ac29ee66974d8abeecd8164e83103d6c1f8fb6a149018be349e93b8a7caa033af44dfc11fd419
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
deleted file mode 100644
index e37688da99f4..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	# bug 652182
-	append-cxxflags -std=c++11
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
deleted file mode 100644
index 41d0ea16403d..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
deleted file mode 100644
index 41d0ea16403d..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-}
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 2433d5b47f36..0db1a8d739f2 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,8 +1,8 @@
 AUX zthread-2.3.2-automake-r2.patch 2383 BLAKE2B 7368559120cd6e3b3a891178eeae15dcb6e3b3705da16ae8cf913aa3d83f01ddc7771e3a4ff416a02bd26006ecb123ce00af6c2d66fe92699c425bdbfee87aec SHA512 dae4fad0d560e8681db8e212888a4976abb67fc8ce85a85cd56d743f7ebcefd2760e91de40a83bd9023173d90f10bdf731b501ad50c09a5e769de6080b9bbad6
-AUX zthread-2.3.2-clang.patch 581 BLAKE2B 70c3005548e8380ca69ac698c4894f70815ca81b8126a206d8fe117cb6288bda1fb6f07797cb6f3f1d19d7e9d84376cb3d937b800f54e03d1281c5a72a55d645 SHA512 caaa4e491563b5a3ce142d242bb5fc7c08ceaffc9fecaf9720b6ffaf9192ef2f8a8ce819fd9f60bc741ffc19b47f0e894017d5f7befd5efb51314a6245938a68
+AUX zthread-2.3.2-clang.patch 454 BLAKE2B 6c3ef1abdcf9c0b71e0eebf733366d46aa6a969fd26f054c024c7a59eb0d8ade0a8116aaa004c770e6dd19873e8227ed791388b5779e9eac91ec2fe3e12128af SHA512 0886849336517b76f524d08462e2604b2cd67203c4b2ded910df01aecf2ab3c451c9433001b655dcf0cdd7256fe88c32a81d1b0050866930121f7bbf2e742c29
 AUX zthread-2.3.2-gcc47.patch 704 BLAKE2B 14031fe0230ba0abff034b894ddfe0e7c4178c65dbef4a2a74f9de164d3ac0d314912210a42a25beedaad098d34d8b03a59a51a7dde4567bf58562fe04743a3a SHA512 2c90bcb07a7063380b1f9f405467cf3d256ae0265d88886483612e7b11ded40a9dc810a9f11a36f2a40e62e30f98c36344b0f002b351980745d0562c1ca81a6b
 AUX zthread-2.3.2-m4-quote.patch 554 BLAKE2B b6c4293796b385d60f8011b3ee1c0436bfec773f40742159dc31eb4c07dd08c5bc0c474664712c6ef5e9a3b5a284dc17866f7f25591c67881f788a6ce7d7d2b4 SHA512 0f1b82ed3955174b16927e36a7dfc549d7cb6243f3a0cd2699a2f3c53fad5cd554140401d59dafd6f5ee4ce4fb689407ccf96ae9d5b9dc4a72a83157583b3381
-AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 BLAKE2B 027c065581a86f6603dd0ff42bfa1446adf3faf514cde7ff5aaa8065fbb8a36779c2d237ffaef74d2af451cef38db5ff7c4520d043feddaeec2e26dc6252b001 SHA512 f5df932dc2a4a20c757ba0781891d53f5c4ad81b904107af0aff84759efd73ff200e9ec890e6e63679a66fc33b74f49ef88937bfb29a2bf666c443c68b6023d9
+AUX zthread-2.3.2-no-fpermissive-r1.diff 1864 BLAKE2B 1975e3e1e5c4202105bec905d5ede43102b347e5c0c17e8922f6be0839ec27f92aa945792c018c6ce86fdf0f8ff6794bf6d7676ad3abdd5d57786be016d91f60 SHA512 f32f76ba5e6063b96b80b4da3bb57dea61cd65c589ede3c93f7d06bbbfcd03c616eef98c9874e91ad85cc89163b9ead3d657aa753e564707204d6ea1a19793b6
 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
-EBUILD zthread-2.3.2-r4.ebuild 1412 BLAKE2B d2d9a68ac26e934f4272033edc48516817a1e38858730e59db803457e630e291672f25484dc73fa54a59fa7d53144abbe954b4e99344e5cedaace0e3958f36c8 SHA512 89fa622d192f9ade8f99757a0a5766fde73084308e598f5d511cf8c11c502af1808a4e2958e4e8a1ad9affb070bca63871aa418219b43bcf538c66010ffddc4c
+EBUILD zthread-2.3.2-r4.ebuild 1386 BLAKE2B dc9fd65f2841275478e69593033975c03475af07f6c3f7ddd3546a129485944bb53c852f8169657ac2f96e0aeed3b60abd99b5baf70a3b0a931148aaf8cb099d SHA512 e1355f5998c364b90c2c349fd1c698d1189d66de6aba8e457751ac38bc35f61c5b658f8156d495b14a1d6c5bef7335fcad49513949379bb2f3e820f22d01fcd9
 MISC metadata.xml 244 BLAKE2B b4a4377cc4333cef7ecdd3e448ef2af4ad16f7bb26913b89e4f3d7dfc97df2d7ddeb39bcd532f015e29e8632f0a993d39561a2b256eb0fbf67bd477c7ec5326b SHA512 6c52d0a4a5ec7d266bbb8a74a87c40d4b6c1fd34abc7c6e5e4026c8708160c6527d81e32fc6a395ebab9f2f8f74dbd1518e8ae244e8d0b674614898568718bff
diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch
index 13dd91ea2ca5..3c0e07b9dc4a 100644
--- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch
+++ b/dev-libs/zthread/files/zthread-2.3.2-clang.patch
@@ -2,9 +2,8 @@ fix compile when using clang as $CC:
 
 Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased)
 
-diff -r 2a43e83684d5 src/foreign/zthread/include/zthread/Guard.h
---- a/include/zthread/Guard.h	Sat Aug 10 11:31:46 2013 +0200
-+++ b/include/zthread/Guard.h	Sun Aug 18 09:46:43 2013 +0200
+--- a/include/zthread/Guard.h
++++ b/include/zthread/Guard.h
 @@ -108,7 +108,7 @@
    }
  
diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
index 94b42eedfbf3..b8f68f59dd2a 100644
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
+++ b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
@@ -1,5 +1,5 @@
---- a/include/zthread/Guard.h	2008-07-22 14:46:28.000000000 +0200
-+++ b/include/zthread/Guard.h	2008-07-22 14:51:41.000000000 +0200
+--- a/include/zthread/Guard.h
++++ b/include/zthread/Guard.h
 @@ -491,7 +491,7 @@
      
    try {
@@ -9,8 +9,8 @@
        LockingPolicy::destroyScope(*this);
      
    } catch (...) { /* ignore */ }  
---- a/src/MutexImpl.h	2008-07-22 14:54:40.000000000 +0200
-+++ b/src/MutexImpl.h	2008-07-22 15:03:30.000000000 +0200
+--- a/src/MutexImpl.h
++++ b/src/MutexImpl.h
 @@ -153,7 +153,7 @@
  
        _owner = self;
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 02af2643693a..9d7decd68746 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune
+inherit autotools
 
 MY_P="ZThread-${PV}"
 
 DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
 HOMEPAGE="http://zthread.sourceforge.net/"
 SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+IUSE="debug doc kernel_linux"
 
-S="${WORKDIR}/${MY_P}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-fpermissive-r1.diff
@@ -34,7 +32,8 @@ src_prepare() {
 
 	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
 
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778
+	# bug #467778
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
 
 	AT_M4DIR="share" eautoreconf
 }
@@ -43,7 +42,7 @@ src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_compile() {
@@ -62,5 +61,5 @@ src_install() {
 
 	use doc && dodoc -r doc/html
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 1984856807c0..676d031b73a9 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,3 +1,3 @@
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-EBUILD zziplib-0.13.72.ebuild 1258 BLAKE2B bdcf7833a983bc1eae81c2da26f6159c80e63d4bce90fc3d64258020eb1508b9236323d263a7f380e86d89033c3b8c0b16c70d565074154053c53f76689e7c9a SHA512 0bddcd8386ca17dc4bf8d49c68d4a9777c0f8cd8613aa10ddc5d862c0274a13e079e5a7dbeae9e2b33ba5f0f317dff6ac6bf6b2a1ba409f2a847fc625af1bb0d
+EBUILD zziplib-0.13.72.ebuild 1259 BLAKE2B 9dc740d1cd956addc822accfd262959b0127d099fff1461107ed0c26d41ad1b0fc6541e5bac0c9807f28542c43cc07b962aa39733bdc92713a1ef731807e7344 SHA512 c173e4f66902997fa88f30e1536b6e64ac629e6b697cb00afb9398ccd5298c3f09c9e7fb148a5d8256583e06030651785171e4721d98ba8027cb896f61d260e3
 MISC metadata.xml 534 BLAKE2B 75453ba275956e63942619a0fa2b92eecb9417deef4576c9cfdf4fad87440800c85a468033b8205ca4b8c62383e103fd6eafbdb2b66b27bc8a705cd66a8784eb SHA512 8cceb9837461402b45ca7cc800a4b52358cc06b6e073a505b69c0fa2e24c8ed7544477cba0e01e855a35c02b45842415a5e63ea640abb98408f8e53deeb98f8b
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index e448080e8f18..b1cf6149a20c 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-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="sdl static-libs"
 
 # Tests require internet access
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)