gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-libs
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
508 files changed, 1606 insertions, 1622 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fa43415b412e..e59f3e9734f3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 3bff1c6b9480..7f56ff094bce 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,6 +1,6 @@
 AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20f262cbc486d57f6a1669da225386f92ac452ab0120e5095b097543430814827e74af5f9b2a7fdbdb8811f66c6b5be27d45e5 SHA512 4be4f2904ce35f29806432c04cd6c0c23783da1ebd66fb3f091c10a04749f93ceb4d49cdf6963c1f13343dd901a97446b57d39861d7251318feb03625644c59f
 DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
-EBUILD appstream-glib-0.7.15.ebuild 1636 BLAKE2B 5b0eea6311cd40bb66068198302ca52229483a68b65fd3c8ec2b04d9a73f8a7b25d93c0fdb2a7bdeec5870634f1e332b09b400683725884bcc40e076cdea8ff1 SHA512 8b37bae9b37cb27c9ac430fbbfa0b29c5de9511997c4c33d97225e864a204bf4bef74f062126c3c8c1ef8ddf5faafe80898e6691c5d276206d93ddb073014501
-EBUILD appstream-glib-0.7.16.ebuild 1709 BLAKE2B c8085d06fc9044599952d1abfb28c0d1ddb898c1fe48b3500ffa34d2362a1a9c81690424b0754b83d591b84aa01f3b17a2d61364154467f6f864f9d21ecd2d31 SHA512 0154d92b3840d49cc9b0343dd74f3c0cf4367b9868fc80b02f5264023eccf72664c1511a86b8518a2b4f5fa0a47513ae64ae16483946ccedbba9e60e7786a94f
+EBUILD appstream-glib-0.7.15.ebuild 1637 BLAKE2B f7584c0eeb3552da82e3680d944da7b10492b35a30d48ef8f7a8f7f500d7dab451549e1eb6bc726887bad94396c5828c85f9650aaa9825f4ff48c23eae1dc27b SHA512 de051d3e9d3de642477a3e4e5880086cabff72eeb9daca96bcf609a5bc97eac5083510200b5b62653bb72bd679d15a0af4fe22c67e64ab8b1a4e590d18d35395
+EBUILD appstream-glib-0.7.16.ebuild 1703 BLAKE2B d34b784ed69e639a0c69e8bbce84f86d04ea987a60a8b6dad91a748aca3bdd2ba0834ba30967370c5aa7f85a34f57f18121a4459da8001a4d68cb91afc794a07 SHA512 2cad356da1ed17fc95cad7be6e6da8a7d75460d59c5de5acdbc40430e0d3121bc70692a179503002383c91a9315d9d3d6ccbcbf8fb17b6a26739c9ff74345ecb
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
index 093bf90960b6..97f6effaee3b 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index ec8fc78191ff..3f2dd80789d7 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 182c4a10dfba..f6c7d5a0af37 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,7 @@
+DIST AppStream-0.12.10.tar.xz 2045744 BLAKE2B fd8f96bd0b829e73bbbb5ae725feaf8f1275f2ed4a50ad107fddc52cdfd7d7c2e382235fc322513cdfe000789505e7b9998bb4e601e223d673ee65c0fbb55c25 SHA512 5cd7da7adbd035947bde6a6d7655dc2f7c1be25cef102e51ef88e8f684a83b196a41b440edaabdd89da69a9117a26dad30e548b86b50f324f0ba70eef95a6060
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
 DIST AppStream-0.12.9.tar.xz 2023312 BLAKE2B aa5de7936909be54401e4df80363c9b59ad60dc29b3d02ef1ed8203dd480dfb4222816cde5ea6e469039448684142afc028275e619665f15cef99af6745d80e8 SHA512 af3d5e7885ee09fb6ef9ea0a5c2386141736166ce42912e618f1ee04f2b28866b27c7c5e326221574eb78933b32de8db9f76023bf54e528aded1607e5130992e
+EBUILD appstream-0.12.10.ebuild 1695 BLAKE2B 4ebb95eca1abb10ee9ca9f9dbd6ab2c766b1718ffd7f5fa1e08354451493cab0ad9a2a19866582f9c4525dd077c4cd81987c0040990991b41f152ce038877a99 SHA512 e46cf958e89a2f7247f24d36d8baf056b2ce0dc0bba00f0c87d3df7997b3100807c6c82124cff92a8570b17b859486f3e948662941c5ca1cec0720a296954c5a
 EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
-EBUILD appstream-0.12.9.ebuild 1651 BLAKE2B 094685c556ba8196ff701c0a76ea25ad870cc3edd8543f6b9cadd5616af3f4c607895fe1ea74654a7d72acc6aea8c194aaf18c8ae34f402069cd036f36923e95 SHA512 7917b204126a71e1c1ab4cebf4b191bcab86786fb2689e8ef6ed767910daa776201eaf1710998959e8fe7f4c0c0020fc7192caa407fe56c0386c23a3f46173a6
+EBUILD appstream-0.12.9.ebuild 1658 BLAKE2B 89cfed791e1f670d058161b502fac472bbdbd65d72f6a4792545b1b5489af15c3d9d12410a98f4a9b9671d00f750d845f4ac319aa4991243008a561f91b7d5ec SHA512 ea8d78f803e995d52633dc1b2ab5f3f140feb446141cbe89081175463a2978575da29e46c3bac4c51f1e713f8c07995692ccafd02096e150c65488b2904fa225
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.10.ebuild b/dev-libs/appstream/appstream-0.12.10.ebuild
new file mode 100644
index 000000000000..4d3a31bbb3b3
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.12.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/AppStream-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt doc +introspection qt5 test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.58:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	>=net-libs/libsoup-2.56:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dinstall-docs=$(usex doc true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/appstream/appstream-0.12.9.ebuild b/dev-libs/appstream/appstream-0.12.9.ebuild
index 90432b992ef2..cdde8b212f70 100644
--- a/dev-libs/appstream/appstream-0.12.9.ebuild
+++ b/dev-libs/appstream/appstream-0.12.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S="${WORKDIR}/AppStream-${PV}"
 fi
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 9824543a3835..b12cf21e8759 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,5 +1,5 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r3.ebuild 3727 BLAKE2B 48672ffd944893c31c11c036117611d48d28c1588605a5797f38567cb380a3fdfb0c941e7d3c770ae0bfb299e2426767ded858cbef84a7f3ac664acef84e74d2 SHA512 96a21b33cf45af1c3b1f699e84b4ab86ffd54b1975d8506f7f5308877bd324af62cb637af440094a6acb45b316a7f08ddb88154396ec990161bf9924fce7a4b3
+EBUILD apr-util-1.6.1-r3.ebuild 3728 BLAKE2B a13823bef14bfe8cd4b742a92a5f09e80c542cfcc3eb1812a7961f7737c56480826822f5dfcef1a95ae403e80fee84215511bdbfea85dba5a8cb492d1fa940d5 SHA512 963849842b33c972188ddcbfe1b68a24d3e94dc68855f82cc0ed5ca86a55bbac9f9c104a3412c7bb32ff6604fd6a538755dcc5b6718ebb559820fd2846085c82
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 97072c003439..69df78180409 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index bc0ad96d6ebf..2d48a7549f9e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,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 4377 BLAKE2B 4a20b50fcd8f1b4175d999b5756adbc31ecf47b75f4262c6e89b9279445ac8f8b66ed3e05a6044cfa89eee072500d44d34fd9bb14d24a13ea8c9369b37310d77 SHA512 abd824e9fd7f0488c2bb27dd6b0c2d57f9fa9224ebe61ef738822e8a29acf5c3f7260055c3e10c54ea0c425ccfa282ec1573d438ad28bdab31fac596dc44050d
+EBUILD apr-1.6.3-r4.ebuild 4378 BLAKE2B d4af91a4d5bb94a1b7100ff80909adc681e080ea5163f7940dd57d77fbef56dcbba3c34dca3332b475088f90542e10ef24538dc6c4849d10013e6078b894b118 SHA512 b0026aa9d5a635d9d0138394626f07d626bad3dfd727f0a78e953847ab08b6aecf6c0b4c05c9e7840c706d43853c67cbe87016825df75085c6f6ab1d8d6b33e9
 EBUILD apr-1.6.5-r1.ebuild 4327 BLAKE2B b58a4b7c1fe1b63b8a28de11820db0f639328e4a89e3898c669de14604e0fc91c0d4e6c5a329fefa80a8ccf54a254bf5ffdb376d7ac82a7db9068c7f82683574 SHA512 c015285f219499ceece08e233d8663cff5d5e4b85c05a7ff28b78660855fb14fc268764c114528752c775e4c93771cb1b14380e73f899e4ded520b80523cf378
 EBUILD apr-1.7.0-r1.ebuild 4243 BLAKE2B b05aad3b350b3bf974654a23c461f8d3eba70c3b72e354a8bfc41fbdfe95b822652a50ac091d0eb7de4af58f1544466dba8bd480ec0e80dd01071c56878fdb1f SHA512 10c6a49f7f38bd8e84d117cc28a8f9402fcab4259eabd1c97a3b60e8e21d4c8a2417574449e1a62442307ed57dbbd6f98399a2182c8b2eb05bf23f37903d67ed
 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 f020e35048aa..c8dce5d2ba3f 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 b4e6ed5beb81..6df56e01c3e2 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 682 BLAKE2B 5c7d08af795f14ae5b616ab5ef2c950c48efe7a36e2a552591c4c218a7a15a625d2703c0658fce2bcbae90346cb3adc04735e9bccf76e2c2bcc4886d9bbc7e99 SHA512 faec91433a63a61a4897f8e820adb5304dee87f9a822081e654a1c765fcb4710ac366fe506a1afd39762ede76781f6f4ad66497137afb6a24898aaf4fce78d9d
+EBUILD atf-0.21-r2.ebuild 683 BLAKE2B 7984946f05cd1aaac322d6c0a674f2b6b7fc08d4706870b016221d4c4893915cc4c88dd40dddb8770161ad0d990fba92e247a65f9984a5ade1a9f4819b98b914 SHA512 76f569090c8e0ba8af5f6d863b34ddc1add8fca104ce0591d4efdb20114427beea245826572887e048a7b8c66bd5e2b505922c7e5dead2b700835ffa8285a79e
 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 11eb225aba6b..e72dd01ca65f 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 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-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 768cbb9dec08..0c23be3f5364 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.32.0.ebuild 1164 BLAKE2B 691dab81bfaff32036d7dabcb449131f5dbf9e4cac30fb2d99c966e3bb30fabb3cbb27dccc1852763dc05de1909e9d3220686e1cad8e493e07f77d5fb7faf6cb SHA512 1991872e63c0028df601bcafc22f5ba8dc81c6d59fb2b9126d08fdadc948f81811158817e62a8920bb6d6a775dcb99a7461251b8d60e65ac1adc05ba8398a43d
+EBUILD atk-2.32.0.ebuild 1165 BLAKE2B 8d362252a919c1ee58b1ef4de8ea221748423c8d906edca309e2220d1e6dea3ace016567d4c2813beb19c22899b9705f02cdccf0bae5bd2037b55d2dc808f3a5 SHA512 604e5f0807b1685c57cd1a8b88a411a3d9a1ea18bc6d3cc96c3a7e9cb88727e7a08d672ddd32983d1be518e71f2e0dec649dae539da0915c2404484964c802c4
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index aeafaeb7dcae..26dcc8d80083 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/avro-c/Manifest b/dev-libs/avro-c/Manifest
new file mode 100644
index 000000000000..5cd853b6d1c0
--- /dev/null
+++ b/dev-libs/avro-c/Manifest
@@ -0,0 +1,4 @@
+AUX avro-c-1.9.1-fix-libdir.patch 1041 BLAKE2B f6fb235b0e6f4bbf34028168c0822cb1ec320de48e25c58d61b7ae99d8500db21af7fb290fc594a07d1b03e7e13f9321ee2680ad28652fc99d3048701e3d8e8a SHA512 5f936afcedad81f9bd6727e484d0cee3cf3bebcdc111a28b8cd6dc7c48d56ade6ad3d1b4eb96c69c556e4d3c2346a523b12d2ffbcfada864865a618586d3412e
+DIST avro-c-1.9.1.tar.gz 216954 BLAKE2B a1647c8315eaad5af7aabee01b71638261daa82def48227046d05da89ef66e8697d6c31f1a4a7b2b8010e1b471e50e24b85701ad7870e6f1d3495262dfaf00c6 SHA512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904
+EBUILD avro-c-1.9.1.ebuild 495 BLAKE2B b9f267a443eda5c6d491267b375a6971dee3507e4dcaa1fe649b74b64c40fb3d76f405c30d682d5b4ccf3b94c8a91b9a73194c9ec25dbff25b4b730f71c5acaa SHA512 154e8207c4d7aede3353880416decef2937fe48601184ffd14f6d2424894fa0c63b8d36c3552e3625cf76a2aa8fdeae78d23f3d192bb582b0a164020152eba67
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/avro-c/avro-c-1.9.1.ebuild b/dev-libs/avro-c/avro-c-1.9.1.ebuild
new file mode 100644
index 000000000000..52a09b83a88b
--- /dev/null
+++ b/dev-libs/avro-c/avro-c-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="c library for the apache avro data serialization system"
+HOMEPAGE="https://avro.apache.org/"
+SRC_URI="https://archive.apache.org/dist/avro/avro-${PV}/c/avro-c-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-arch/snappy
+	>=dev-libs/jansson-2.3
+	sys-libs/zlib"
+	RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-libdir.patch"
+)
diff --git a/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch b/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch
new file mode 100644
index 000000000000..84843abaa5a3
--- /dev/null
+++ b/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6f56597..c22e71a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -109,14 +109,14 @@ install(DIRECTORY
+ if (WIN32)
+ install(TARGETS avro-static
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+ else(WIN32)
+ install(TARGETS avro-static avro-shared
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+ endif(WIN32)
+ 
+@@ -126,7 +126,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(VERSION ${AVRO_VERSION})
+ configure_file(avro-c.pc.in avro-c.pc)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc
+-        DESTINATION lib/pkgconfig)
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ add_executable(avrocat avrocat.c)
+ target_link_libraries(avrocat avro-static)
diff --git a/dev-libs/range-v3/metadata.xml b/dev-libs/avro-c/metadata.xml
index efcd58fe0b9b..c36c37139fad 100644
--- a/dev-libs/range-v3/metadata.xml
+++ b/dev-libs/avro-c/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 3a8698de0b6e..4968536eff19 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,3 +1,3 @@
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
-EBUILD bglibs-2.04-r1.ebuild 1685 BLAKE2B d30e5e9a9951145377a18f636517b1d83f775a2412e3415f5eca9be8854a6b0865f12361f3dc56fa8c2a4b76264d7b75b5209a7a22d04a82691c94398e75c632 SHA512 da676ec549ba3e42c56545feced2a8a10a0d5889737b5cfe74ef6a62fd70bb02f669c263578f11e39c232b16b24d40da8aed2c90bc15e54d9f4e91d248ce7ad3
+EBUILD bglibs-2.04-r1.ebuild 1686 BLAKE2B 8533b8e5579e0d889855c0fd972b65b3f6af197335732b18ac0094d8fe39b28c5d3dd093b3257877fc6b11b21596b7b19c5fbdceece9757536003315ae1a16c2 SHA512 2702a6bdba16ea094ab8d703e71221392dd2cc58a8ff6c0a32bcc868c4936f3d21358c8e239fead4c26d29d3726bb2afaae02d09ed477a1284bd1f20b64e2350
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-2.04-r1.ebuild b/dev-libs/bglibs/bglibs-2.04-r1.ebuild
index 4b3a3f1f7c4c..2bb37fa3c3db 100644
--- a/dev-libs/bglibs/bglibs-2.04-r1.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index eacc3244f6b1..9188ffe31fca 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 1383 BLAKE2B 894a264bc93328fd84de21ee7d047d3cb21317fdf7f3d7c505e46a51db238abbef0b9cf0fdab346862a2b23436c1725949df0a0cf325580859b1902fe1fd2845 SHA512 d60590235f257796236a46ff9f271cd9edd8553e9fac270d429f3ec18cf315c62a50db8715bb1751abcf93c9063ef10dc5d4bed7a1c530bd5004a5f034c16f10
+EBUILD boehm-gc-8.0.4.ebuild 1384 BLAKE2B c7641b203097368829628dc96d0758c6de792b8ed0b062effa3fc96f6d825f55c1674346b6a1773c577ce14f598066c325ffd39cd0cfdd98224c7dd4b160be56 SHA512 34645c2c2b8990b5205a941976fd8477f02c82f5fc458e631b1084aad0b9cf619032e8da0008fa9993fc0383c9f06325b5387d4badf925e5040c19cd6633b391
 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 99896863371c..cf5ca7c37c53 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 ~x86-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 ~x86-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 811584eeb9b7..6b8e196812ba 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,6 +6,6 @@ AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 10
 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-1.71.0.ebuild 10426 BLAKE2B 9981f0056288a926da95ee05130e99b34506805d049d4b027de2e5a12af21e952606366844990af3d973437b91189539d4f6834188cd669ed69d05b82f3f0c91 SHA512 cdee407c8cd9d71ee115c44ec1801b65a89bf1a595c3d2a069db41c5f1697b9ebb289561a92ba29cf81b3dc3c114450127735e8aa707d8fa5db87a276895e627
-EBUILD boost-1.72.0.ebuild 11348 BLAKE2B 6d0e00dc500f0d5453ffb4df842b9ee817097980678a1eea87d65d5d3434c7f654190e7b5b7fbad60317986edc2a4a3085959ed8bdbb37c0c37e18ccb1caa775 SHA512 86f3a08ec51f0936be91000d734ef64673364e12840f4cdf6ee44459689a38c985fc80b0a0657bbbf7d5076f09353a81d41386fd852cd40c70516135c4f4b248
+EBUILD boost-1.71.0.ebuild 10427 BLAKE2B 92b7f3998fe938569464c358281e5d837132aa194e12a435bde2f0f46252f2b2b8aa2f0e625c549aa5d1df6bceae25ed242a5f1635729ccf1d9bc6c621e8310b SHA512 9c6158a116ccc12901dd05660877ca58b5c751227288e66d62991737d9efca220c7849bf8b98a1b8315a59825625ae5656593aca7c0f103f3bb81f74f86b73e4
+EBUILD boost-1.72.0-r1.ebuild 11305 BLAKE2B 34b28199a59a1cee1e9ec7c254e4c67e1a687de7be41df6e7cf34abce03ca49cdbf241fe2e84c9687e98b34a265cfc92c4eb586423f2510a8778d8c173365f11 SHA512 408834724f5ce4ab9ae1a10f14665345436fc525662162cfdb352aeefa2e56e79ea47532a7649a8f04be323d505025a902eb0ae1fee8e2f834def5ee7e03f36f
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 2b06cb47632a..d4c6da3453b3 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 )
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
index 7646a4403d19..ef8bfc574f38 100644
--- a/dev-libs/boost/boost-1.72.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 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 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 )
@@ -39,9 +39,7 @@ RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
 	python? (
 		${PYTHON_DEPS}
-		numpy? (
-			$(python_gen_cond_dep '>=dev-python/numpy-1.17[${PYTHON_USEDEP}]' -3)
-		)
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 7e6d8d979c3a..6243d85d8109 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20160131.ebuild 1174 BLAKE2B 55cc11c68f68ad09824efffeb92309e9b41327c7a85bf1ed9d9d48fc6f3ac0bdfa37b3a16c721f14cf82870ea059b2be1b70781cd760cfbd2d40eb0e27f5f84e SHA512 fa323d0684e2ad45d15d483dca56dd8436fef671993e4ccb26e444cb61529cc26a7f8dd54319133cd1025631be46488505751ac61c9ff36613f9c7a233cd3418
+EBUILD cdk-5.0.20160131.ebuild 1175 BLAKE2B eb337e0fca01f22b3efd74bc52b95f22feb226127691488dab692c3ab03ff42301013e670dfb10f75f198bd2073e44cd96a568122392740d5dd94966c03def72 SHA512 8e90cfbd18c501f4fb7cdf6d52d69a94beb065847c14e8d389a2325d3ef004efa9841fcaf134a0287b55d649955d8385be3734bd723c63e289b4d86062b632dd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index 0ce34f6ccf76..53be713bf533 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index efd08fe4d335..4136ebc9fe19 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 606 BLAKE2B b17c1f608f88d4f7e230a0f6d37ce01d478a43e270f35ead5c0df7b980c4d10e93de9db5f97cf437935688fd0628ec6c403c06e5c09995d821e6bd9d14474b6b SHA512 db4d06a89ba5f7b9fdd999a2058571db90f350af2b96bb69a8ccf94266e7f34b6ba7f0fa0b93ab0c7617be8b33c422e8a741d07207311662a807665ae60e0b11
+EBUILD cgilib-0.7-r1.ebuild 607 BLAKE2B 6e3d9265c447c089c994448f5be75beaab1003b5ceb7ca3d8571b279feb8d0146bdde8a6dfcf1f9dfe8894690262f34fc2c466c9cffa2171119294c52b7b142d SHA512 83bbac092e45b085f8367d52adcb35b6e82f675709cad95e9112a2c43878e6429e020d5142dfc984b2635c231f03e9ba18c33b1558d6302f9a48a20dba4f0fd0
 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 e137e32204df..698e3f87cecf 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 17a87b6b429e..29221a7270a7 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,8 +1,9 @@
 AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d51b27bcc310c409c054630c5dee7a0d1159c929d08524fc1bd2fa6e596a9098684d5353c111bb5a09e519798 SHA512 f4d6066d194f19ed46c0fe773fdf3d80b833df2d6e84d90d409c43577ee871f400c0a6cd4cae115d64109232384e924d4d8f4fee5ff3b856f1e921cc9b38c384
+AUX check-0.14-xfail-tests.patch 310 BLAKE2B a4b3e9a58ca841cffffa0754ef429db19cf92ddcac1f214ac13d655af505c6e660aa0ea865c3e7fedf993f6ef77c5504301a4d7ad7017e2aba5f6d3785208f73 SHA512 1be74226886d47acae417e5b871459bd96d768115c97576a142bccb8e50ea1b0ccc69b6068cc44743a8e9bfa3341739402342697cde32686ae6cfb4fd413ee18
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
-DIST check-0.13.0.tar.gz 301386 BLAKE2B fbc79ad9f0bacd7c7461cde631a499d92e004233b5d35ba35cb0791195362e12fc21ca059e2019280cbf256215528af239de988755e0183cb6e332a5b145624e SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f
-EBUILD check-0.10.0-r1.ebuild 1792 BLAKE2B 258840e8effd0212bda0d7851ebaf09b8685a479566e8cbb50660b00f133b4b5d129db93e4022297757bba8ff2486353e4767d6279c430bf2f9d0cbc864bb359 SHA512 b058e308c58f2988a63d0b7e4fa0c3c1cac7cb34afbaab74d1b032eb0512420bd0330c20df527e23b5211bf14a1c5212f3e2bb79feeeef89952ce430f3af0dc0
-EBUILD check-0.12.0.ebuild 1783 BLAKE2B da5d9b52a93cb886150e906f778578aaddf923467b4275bb38eb94388fd01b55a16d02ce43309259a349616b1c200b2c2708932a05145cf652ce5e94bd518cf3 SHA512 03b6274c56da34948c52843cadbb610e5eef33a67a6da2203c037d71e87719ffdd9f9f9b76098822b494617689387955b2a1c3784a417dc523a15746e846c92b
-EBUILD check-0.13.0.ebuild 1488 BLAKE2B 104a8ac09018d0f937bbde18e2de13e226a8f2d8e7ffcece5d1dceb49a98578d562aad5bd6f142701bb6cf6fd810039f1918e822dd89090dffdad0431350cd0f SHA512 4b36695b4e7b3dc38c6239924c85e60591bd43de39847ef01584274a9351ecc2a1346306f917ffbc9000d317c2c7751382f55ef2d4f96d03af047fcd2f51ee6b
+DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
+EBUILD check-0.10.0-r1.ebuild 1793 BLAKE2B a9e40976928d69c2b6ef6950846669c38af330590d3d3014cbb2ea1efa01c3f604a0ccc6d6fc831162f6b1f609d93dcb638d51722fd14cadfa44a311e941c2de SHA512 5662ad3ad6a53d95c102c0408904d2d8be495cc9f05bfe5548ae23ed30affaa0a06df070a3f22491f527ed5ddbd8d2fab209ffa359b52c50d72a26bc5c2fa53f
+EBUILD check-0.12.0.ebuild 1784 BLAKE2B d7ed2ca2f62df1d54c0eca850665cbb3dcddd99e31181fd7d9a33ceb2790f9515107573417e68eb53542feb4e12873e5bee28e29109501e0593ea2fb3317060a SHA512 20f5523647256b6a514591c5e67ca901699941a90afb032d4d0b93c44f8a0de2afae953c0f92d6b663d3e8226bcd36a969ff10d9967e6a6544f5e6ef814bbeb0
+EBUILD check-0.14.0.ebuild 1599 BLAKE2B 2a03604f1bbdd9e915e97991c8d8dcf8f5ed28108c1050aa77e9640d603fee88a1890b1acbfd64c2b11df3fbb03d2d6280d4bc5e39bcc7dc9de516772e3f64e6 SHA512 adaa122d38ddaf81261dede3a4dfeb89a0be4a90cd95f8acf47970f9feda3cbe66ce7722120ff82651363bf0d178c6b82bc5d70b686beacce80750a12f4b259b
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index fd4b910c3824..b19d2259d159 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 131ec484ae50..aa0feaf8c587 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/check/check-0.13.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
index bda5701d57b8..c1de319b23d4 100644
--- a/dev-libs/check/check-0.13.0.ebuild
+++ b/dev-libs/check/check-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,20 +9,23 @@ DESCRIPTION="A unit test framework for C"
 HOMEPAGE="https://libcheck.github.io/check/"
 SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs subunit test"
 
-# https://github.com/libcheck/check/issues/208
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/check-0.12.0-fp.patch
+	"${FILESDIR}"/check-0.14-xfail-tests.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -49,6 +52,11 @@ src_compile() {
 	fi
 }
 
+multilib_src_test() {
+	# Note: test-phase takes a long time.
+	emake -k check
+}
+
 multilib_src_install_all() {
 	use doc && local HTML_DOCS=( doc/html/. )
 	default
diff --git a/dev-libs/check/files/check-0.14-xfail-tests.patch b/dev-libs/check/files/check-0.14-xfail-tests.patch
new file mode 100644
index 000000000000..ea2ffe10aa45
--- /dev/null
+++ b/dev-libs/check/files/check-0.14-xfail-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/Makefile.am	2020-02-02 09:33:17.807391927 +0200
++++ b/tests/Makefile.am.1	2020-02-02 09:34:01.267166205 +0200
+@@ -19,6 +19,10 @@
+ # XFAIL_TESTS = \
+ # 	check_thread_stress
+ 
++XFAIL_TESTS = \
++    check_check_export	\
++    check_check
++
+ noinst_PROGRAMS =		\
+ 	check_check_export	\
+ 	check_check		\
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index b1d867cc10c3..ce1aecd9f7f9 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 672 BLAKE2B 052abd5a10b896d68e5481f51fa3eaff8bd50a72e405453bd677387a0b6cc49250d4fcfa3dd26b6e44586a29c4922aaf7d1c7c0578498787502a6678b43e3349 SHA512 0bf187a17ecce9329122ff1706c17903cb7b121bfc5de2ca9a6b077db3abda38bcb24c0b9dd31eb43bd99b3d892cd94c1e3d62041474aebcfb670a37bcf25059
+EBUILD chmlib-0.40-r1.ebuild 673 BLAKE2B d8bb03e38480c25a976d8d4997bf8c28b15fe800439649bf20c73b9ed5201b3238b29b2d54509936a45a73681a94ca17449b84d67b6de51a1ba8099d31ba4a93 SHA512 6ae4bb5edd8430d11e1706d6f7cdf3e0271eb55ab53d84dcfe5f595749cde338933fcbbb6ba3f46cfe0695b7540c398f8bf4da2f49cf6beffa6e3aa24654e68e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index 7ac628a352ce..0bf3b226a17f 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index ad1a701760bd..a393d4319ff2 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,6 +1,6 @@
 DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
-EBUILD cloog-0.18.1.ebuild 956 BLAKE2B c44da8bbbf08d94f698afdcde8df7036afb48311b08ed2d4b621b4ea60fb94930a9d66b932b583cde71f38605c32eece10671fa146575039a8ef6799b4e18153 SHA512 04efdf5e56db932ec5f2d79be56d636ddec2c4e1ab4a0b2bff1d2aa51cecd1baa83421a333eb59c8a518cc692f2730788580c5deaa4449c439d407c1cab8a805
-EBUILD cloog-0.18.4.ebuild 1380 BLAKE2B 4a7a58ae194c707f99604da1f8d414d326d386f08eea555a2f243d8665f7fa34f7307c305ec4ffe0bc26c148aed645f01680b1b3d45bb4bc0e972be71885b0ce SHA512 5d28cf652cb5f9818a39cedde6a4efb420772df45cd8590f83942640e102b8ae4ecc319f2d56a686f40f50c074299d3b03c9d2c2b570c0a4b461a82d15b9f17e
+EBUILD cloog-0.18.1.ebuild 957 BLAKE2B d59ea2a9e4f20b07d384a7fd827c764a612040148659dc35132fcee9d84259a7e3ce9fedf91542204defbfa7949a818c94bc4e247ed996b48e89a52107b0f49f SHA512 da8ec34a6d17b4000fbc36a6dd942a234d2590dc1b1078856c40fc6a79899fa095ab6e819529cb1f2c6a61d54dec8c708fb709e81bcb471f31319d186ee8e69a
+EBUILD cloog-0.18.4.ebuild 1381 BLAKE2B 0e3ec95010edc356c6eb040ae28d625c241576fd8da46e810f8675c0a095433856bd3ee2640e6aa84845981415a6cb88d8af82eaa035695fee208e1cf471a166 SHA512 cabc35470359d8f29f238899c599c77c6f465706ae8b9329141fc9368cbe197c8a2e758790a96884f30db154ecd7ef8a0f18e7b8c48a763d1ea504f6d0652d9b
 EBUILD cloog-9999.ebuild 1423 BLAKE2B d49b09e116b2def2833c51cb36368c4de5a6a93028c4bec106a5fe1b1196db363b621c0be13d1f2183cf45e91e875a41f26af01a62d3c2ec41e1494153453d28 SHA512 c4926861ae72ba72f661140986c2da1fbec32bdc169f7bdc4455ce73e0539741b1f764e94a921aa7061832718d3e33f89384c602dd9338de755613f368adc931
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index a6a8e669c6db..c06e6703e6bf 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 88f667583d90..bafe54805f33 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 23d73870b1a1..0c0a31fdb343 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,5 +1,7 @@
-DIST concurrencykit-0.5.2.tar.gz 212783 BLAKE2B d2e3f28a21236c83835dda06fb4c6182b4ae1fe9e14c66d01ab9ccd2c94c4487d06fa668039f9d7d980a100e88bae570edf193a6955ece88cc306cc1c05670fd SHA512 69b4f8618a52e53f2b7c2e47a9d52773370ae74c89ca1de70c6dc7567b5a46b3f57dafa82d61a89525807672697e1cd75b83c3be56cd5a80c10b819e9d9d07b0
+AUX concurrencykit-doc.patch 589 BLAKE2B e8812a5d72ba8ee3de915f0c52cf44e55d3e2ae52adeac9b80f4788db80b8c8dbbfdfc11c6199ce19edaa2ecaefe1825d2b9ff656aab1525180f349e5a14994d SHA512 5f07ba35e8b0d6bd70aa234592499648839c53c532ce7755ed7ab463b0e415451a7dbacdccc64dbf57b0efe0f37ae4a49468f7af43801b1daa7074714fe18e3d
+AUX concurrencykit-glibc-2.30.patch 1024 BLAKE2B 1e973dfd3b55dde0a187c7b7dc76ee5e374e2ce8bf24028b5b0758c8c62933e566e7c4ac6a9e98a53e7ae7df74856a335e1b7302e3a9bf6f87bc9909f533f1cb SHA512 6702c3c156589c167e36bf81fbd22f7031b95d539c66c700e915018425ce49bffd7aaded210269e4326cd561682e07ae253d13c952bad5eff8832befcc98f82d
 DIST concurrencykit-0.6.0.tar.gz 217198 BLAKE2B 5ba85bd111c06e7be7af5679227350efe187836e5cb2afc19bff4a8f0fbcd97e9631fad64397b0426e8020a6a0f103a0fbe3bf8f83810eaa8a3a1b429a3e8383 SHA512 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0
-EBUILD concurrencykit-0.5.2.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d
+DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
 EBUILD concurrencykit-0.6.0.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d
+EBUILD concurrencykit-0.7.0.ebuild 722 BLAKE2B b415aefe91a091f75f25efac364b4ea4977239a662364c2e3968d57b2a0df7d77d4990b2ae67a85727a70c1352431685d268c114002af2bdacb5c644e4b05173 SHA512 a79060a768ecbad871e36d4285825d7331a424a678d58bf484c07ca388a40c619fd41b07e60c21725c52533b3a4a382a3293f96cb358e4a9998a3be2b231edc2
 MISC metadata.xml 449 BLAKE2B 1567c91f6f505bfe5f1b9b737f6dfb02e8ba4ff8dd7ee1c629e314cc6c646c21b9c870d5bd6fae28551bfbeae8901922821f3c2eb1f1351b8733616c613a7fea SHA512 402d971b138335d751d645cd8face4addcda8f351e95bf8a0826b7fdd946c9cf6a22bb0ae274e51f39ee4d56389887856f84a83451040adc12e29d9740982d33
diff --git a/dev-libs/concurrencykit/concurrencykit-0.5.2.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
index 75b0b9bf0c78..1d7428703ed9 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.5.2.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
@@ -1,21 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="ck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A library with concurrency related algorithms and data structures in C"
 HOMEPAGE="http://concurrencykit.org"
-SRC_URI="http://concurrencykit.org/releases/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/concurrencykit/ck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # libck.so name collision #616762
 # these packages have nothing in common
 RDEPEND="!sys-cluster/charm"
 
+# https://github.com/concurrencykit/ck/issues/147
+# https://github.com/concurrencykit/ck/issues/150
+PATCHES=(
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
+	"${FILESDIR}/${PN}-doc.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
new file mode 100644
index 000000000000..40aa466bb4e6
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
@@ -0,0 +1,24 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index cbad704..f476925 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -1,7 +1,7 @@
+ .PHONY: clean install uninstall
+ 
+ MANDIR=@MANDIR@
+-GZIP=@GZIP@
++GZIP=/bin/echo
+ GZIP_SUFFIX=.3@GZIP_SUFFIX@
+ BUILD_DIR=@BUILD_DIR@
+ SRC_DIR=@SRC_DIR@
+@@ -206,7 +206,9 @@ refcheck:
+ 
+ install:
+ 	mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit
+-	cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit
++	for target in $(OBJECTS); do	\
++		cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \
++	done
+ 
+ uninstall:
+ 	for target in $(OBJECTS); do 			  \
diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
new file mode 100644
index 000000000000..452421c63125
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
@@ -0,0 +1,37 @@
+diff --git a/regressions/common.h b/regressions/common.h
+index 6e53483d..9cdc690a 100644
+--- a/regressions/common.h
++++ b/regressions/common.h
+@@ -267,13 +267,11 @@ struct affinity {
+ #define AFFINITY_INITIALIZER {0, 0}
+ 
+ #ifdef __linux__
+-#ifndef gettid
+ static pid_t
+-gettid(void)
++common_gettid(void)
+ {
+ 	return syscall(__NR_gettid);
+ }
+-#endif /* gettid */
+ 
+ CK_CC_UNUSED static int
+ aff_iterate(struct affinity *acb)
+@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb)
+ 	CPU_ZERO(&s);
+ 	CPU_SET(c % CORES, &s);
+ 
+-	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
++	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
+ 		perror("WARNING: Could not affine thread");
+ 	
+         return 0;
+@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core)
+ 	CPU_ZERO(&s);
+ 	CPU_SET((*core) % CORES, &s);
+ 
+-	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
++	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
+ 		perror("WARNING: Could not affine thread");
+ 	
+         return 0;
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 979d2187d705..6c4cf11a48b6 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
-EBUILD confuse-3.0.ebuild 1137 BLAKE2B dd3f6c9b21cb7de4d283b761e3ed9862b49efca671428aa68fb94c3d8be565393f4f7324fb13e97a307073f22ffbbb0d6355a094eaf9dc5f42f71a00d41c7a76 SHA512 94da0c70730a57e0471dfedf6961fff224afb6d71f62ac441baf055497964916048da099c496e870927a35b73dd96f8da5f58aeaa18a551905bb548c475069bd
+EBUILD confuse-3.0.ebuild 1138 BLAKE2B dfed3ed6b2e32ee28685fdf8a212d9101188f6888c4d07acb04aaee35021b0edd4011f6f2cb239428dd76625efe4bfa536bb0b638687de8e91f867caea3a23c9 SHA512 a08fe94aa3a0cb8d567e69a14456c5aa1916fa1cea8753543e5c620ae401125aa0974aed464be6198e6de8be81113872bb7a0f6906621c26f4b0cacabfdc3119
 EBUILD confuse-3.2.2.ebuild 1166 BLAKE2B d1cc36dc2714940b29af9c75fcfe50b8ffc7ca23fd37759fdecdbf84493098b923c4a03ef20e36998b4babd8d810ec3a398a2b877131bcd3bb8f767c93201bfd SHA512 08013b8392e51852abf619d717eb1e36a76c2d4eef8b3f29823e642cf63bf30c21d049153c07334384c6ab16920e8683c6ef0747130fe924656e53ffeab5452f
 MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
index 957aadb77b40..3e21bc5c9a50 100644
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 28032d245da0..290ac11d15a8 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -4,8 +4,8 @@ AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
-EBUILD crypto++-5.6.5-r1.ebuild 1507 BLAKE2B 4f2893230ded13387853392a152e07d06ab5726a0b375bb85ddd4951da6629fe37848b67ec3d1983bc2dee1a2ae0b00aee95f2cd2ed27d6676b4ebec45f9d866 SHA512 bc32c5f3418b6cbf1a68aa9230f3a1f2313bc030360082505849dbeed69c5e385624c0137381865e760d0b3baf71a5b135db425c6c8b157fe7075e623aef08a2
-EBUILD crypto++-7.0.0-r3.ebuild 1067 BLAKE2B ea668821b86e1ce420bbc49f469526807479a1fe173fdb26446fec8dba74ddc311b5258ada39f3e3dcc92c571d9455762c70fbaf40f6913686ecf2dc1e5b3ea5 SHA512 81aa77ff0eb1468bf6e6d115c062e4493645843ded79840968d7a7276ed1651ffa2b5a11440e3e80b349f90ee78e3edb1b263e5ddf87a77f0096db76069b5dab
+EBUILD crypto++-5.6.5-r1.ebuild 1508 BLAKE2B bfefcdf34289dc086e3b9fa477603ebeca56fe95047734a10ea5ece85e8ae0650733099c201c840ff004f7fa08f021deb3e58b2d613a79697f2838a1d8629359 SHA512 1f926e6f002a4af9709d824478637ad94386ceba4b552f6578ad326f4d35d860e0955b745e7bc6ffd2091d30ed8aff373efbe7a21eade8457a9d470caa5d2689
+EBUILD crypto++-7.0.0-r3.ebuild 1068 BLAKE2B 4b32c073f607a3418e16049795b34564c0554da3d7b1ed966be4b4755408d68959490152a075564ac5ffef6125bda6d6811468e6b1f810fec8d3e1ed2f2b58dd SHA512 996b04a4a081162cbbb91aa1306277733dcd529c42259c26a21133adeb0965e6e1fb30ca2a4fd9fb92e0e234437298ebb62d1c13a8e6a884932f2244bcec0d1a
 EBUILD crypto++-8.2.0-r2.ebuild 1747 BLAKE2B b1942241db59fd6f8681daa9963d86ae740cce43fd004f57de4432af668b5584d5049db6c6eff804673948b4ee9f85e2a3b2865493db42e6a69a6d063967d9f0 SHA512 b31518efdacbf66c0f5698898ef98a4d8dea36809c3d1f84070cd2014920736209852194df0444794ebe1e9e261b2576e97862a78b77743b680e00b060b789e2
-EBUILD crypto++-8.2.0.ebuild 1112 BLAKE2B 60bc4870f0d483abc922f3590681cb7644ff3b2cd4234f2724e8d6b719afa04df730df7405435e45ede1a53e8cf6541fdc30e293a29321a7ff90b857ccd08d85 SHA512 6eea13d6963413a0dd4302ceafaa17d24d6e811f5b2295bdc209fb652aca79f6a699c2367e4921072b3edd5c1564e81c36a87bb827e411a55ea996a4fce81047
+EBUILD crypto++-8.2.0.ebuild 1113 BLAKE2B 290dfd5acef38131e1cd1098ca2f55c56d07a00691b4f0fcf9bafacf06bea08581f6e8b197fea097a3214cb4796cb29beea7ab9f75cc4d8eff494f252333e8d8 SHA512 56bea457eee477e3f742be71833701cb93767d0914d99335ddfd0a2b84b11e5360700f3e037c66cd1a8cfe40923b8a3b434de15e7e230aad65ad2bf756fdffa2
 MISC metadata.xml 428 BLAKE2B 6ca5f3c3550c7f7f20310c7dfeedc7925110a37d7924b2dfe7f34e3e6be5c3f2fa514135490bbe67390a4041bd81b3096dc21993978de631bf45f88f8ebbd3a6 SHA512 3c656067d4fef5353733a2c3ac3ca3798a0c57e8863e4479c304b4c5f4c1f1100f14b1188244b4f5125daf0ba1c9f5dca79e0cd0270cbff0001628511125e18b
diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
index a9e3e6b14bee..7f07d37f3273 100644
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/5.6" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
index b8e97a92fc85..07f232d695d4 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
index fbe99b4b3ced..6481882d6c5f 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 1b3045f8981f..bb9b07974394 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,3 +1,3 @@
 DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
-EBUILD cxxtools-2.2.1.ebuild 561 BLAKE2B 5755a55638a2d28ffc440f556eb47aa7a1a4f719813e9faf989765ff323e42e3c4eb3c769d03c8e1a874afebac4af70bb144b249d7b514b088b802d812716f20 SHA512 5007acbed710465e99cb65b52745150b491e20efd27ab5dfa48a82f1a41bb49e42ce4b2956f3401f6c43e07e940bd3a68ef39f1b9d98bbcb7e1226c85e5a5119
+EBUILD cxxtools-2.2.1.ebuild 561 BLAKE2B 300a09103623db20c927d1f63839d7832d7c14398256ca1fa24e403e0c90e9c755f4b4809c9555686475e7e5543b755f4b8a5c73d0724f351a80da3e8d330df6 SHA512 372a14580f6ac5e61f43ef44cd4485465cd8b249d32e55e60ca49949c3ac24182e2a678c5ecc76fa2da65e3bc18d03adc77af19b590d6ca2764cd7e373f7aa0f
 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 d839e3a06acd..073a9fc92cfb 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ DESCRIPTION="Collection of general purpose C++-classes"
 HOMEPAGE="http://www.tntnet.org/cxxtools.html"
 SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
 IUSE=""
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 08ef56ad2e9c..d54325e605ee 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -16,6 +16,6 @@ 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-r2.ebuild 8118 BLAKE2B fab752538f93a5a09ebfddeb45d8274a25a68f8fb65bfe633503aafdba1e5f8772cb3265a29a9f0c09e9ff9dd0a91e2c186bd5b7c5dd33700968fa7199257f2b SHA512 db586ef972936f3f8d2d007a799cadfb16e00ab3caf076acf06d1b7344a495825d5128cd3789b4e25b513ab48f39ab4eebe586cdd631c28b88511d79cd67636d
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8119 BLAKE2B eb62774cfa14713c3eacd09bb27d7a3c680feda0718cedb968c1c822656c4c49fc468db0bf37bcb69ede4a08112248341597d17f2bfb804bd3dc8070e64f3e1a SHA512 904d040a443c3d965b5ccea8f545cb3162924c71f21081e5b9de44f2eb06e01cbd6b1cfeec9978c436fbee35d8970afb68a00df1f0ecb7734d5ea562027edf6d
 EBUILD cyrus-sasl-2.1.27-r3.ebuild 8159 BLAKE2B 5b2c95bef9d0f8c62fd26e4aea21edcc0eed0158e99cee1c7cf94bc545dbbd9d7a4f50b77a66dda0b52cbe05f65a1b60384fd68134f8f0170f835db72f62ebd8 SHA512 20154ba52f371fb290a7b1104d0ef8e67095dafff0b84aac4a41ba5adb840302ea7d5d2a1ef8a495378c603e69333cc1753cb8511cc302d2bc642bb38adc2e98
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index e35b1e65fd2a..adbbce36ab3e 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a06ab973a168..bd0f416e6216 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 1925 BLAKE2B 3a853f9e2a9cff4b46e859c4efb40704bf550fac5ded70cd9c410d7a978aad8e787a2af04445316e1570ecab19e87fe3174c6e257c54ce9b03a80872e8426afa SHA512 2ec307e2e411d1f5604e452dcafc87d11bcdd2d17afc5dfa58dfc6bf92f01515fddd27584dd801554346aaa6d2d752be7509cb3c8d4be81e6b6f731e530fb33c
+EBUILD dbus-glib-0.110.ebuild 1926 BLAKE2B 196859775ed859fcdd2ea4345167b728a5d97c632e970e8a28a96c0f3d9111f74fc2d2236fed8b6dd7a8b70787f4dead2ed4acb132695e8177e0b05665bf61c8 SHA512 d3e47acc8dbfcdc050ae11929fe84148c6b709948465816310ef21337c5841ec20efb2d52290b6cdfc5a175a405e412a43d7a6369f3e310d04293aef89cb6fe8
 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 3e10ea1cb88f..04d05fbc778d 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 2a47a07194c7..8ae5079a31fa 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -2,5 +2,5 @@ AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c7731497
 DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
 EBUILD dietlibc-0.34.ebuild 1568 BLAKE2B c85a4f1aad13730921275d95c4ea028a43952be3d41df5e66cd6f13b4edfcef220bfa6744b66e3429a3b1e4043a93335ad7cbd3ad7c1a40ed1f9093e9f9d8577 SHA512 7aa0b9f58a6ea45c213fe1cca09830325cc2ff66d467bddcf1e11787a85e0ffac2253705cb5381e79926e0290552ac65eedc886d14aea2f02442db9b585d2481
-EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1696 BLAKE2B 27b3d38a08153c4fe971f1b5a7c0f5d6efa0b375d70d091495b15d03f9b3339b23367b62260b2fd64108ab44ce349ecb6411d48663483473cddf6f75889130b2 SHA512 b1f73f641a5972b96b4a527247715aa608485f3fb05613b92e70eb1e5f5f7de9b64a91fcaeebc74625f33a56294335c79240d48f65287986dcc96ebb203812bd
+EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1697 BLAKE2B efbd1b8b8559d24645869879d87227754104b5b2d1cf1dc9ca5baa25b3e06bddf7e2123e5c73af6e87f31160b259d517c8791ff795cb558222f424c086534e44 SHA512 a3bd5d0f9edbaacb4ae064c8a71a8c97eed13be888fd7b20e58cca7e3bcc2b1aeae917781d38afc059f31a56f10191c6074d120549267c7521285c08700cba69
 MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
index ac5939a008db..0ff058e4951f 100644
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 0ba688d73325..41b4b980b21a 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -8,5 +8,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 516 BLAKE2B 3efb751ee44e75122af233c127090cf3977a4b2ebd0f57c929d18951c8d4472f6de73ced552d10a8667c6e04177e477a5fcedc074fe595571dd5ae0ca33b03be SHA512 23b7dcac84ec3ab93ae0ba3aa8e1c4f649d19b11a093034ca79878ca1415eff62c90f08aa2dcee4400c7c61de5f943b5232ead4c6015b05d208db3aa45380f2b
 EBUILD ding-libs-0.5.0.ebuild 572 BLAKE2B 22afc48844e844a685701124447624136b590047f551ecdeb21f13bb138f293040b8a31c6e6beb212dff62fac6b0569f7b5dd7b16a7cff91fd78997588c1e291 SHA512 fa994ce04f766b88b51ffc7c49e5b711c34a1efb5a048712833c2f964f4e3593604b2ae8bf7f38bd23c0b18982aba55dac2063a9e36a6ce8cd760bb14f9829f3
 EBUILD ding-libs-0.6.0.ebuild 622 BLAKE2B eb5b454fafc7c3e9e94f290871595a1f8c8b4564bc162f45ec28573a298220a25e1ebcd3b11bda16ecccee5e432380d377e523cfebc23e0736f309fb03bd09c6 SHA512 d3e59eb21c02d1da76be75b325d1e9c16fdc80ee9fe98a092069dd94a3a4d84d4168d2332e57734993d2ea6155287b6d007ea73d406a21c08c4b4376841c95a6
-EBUILD ding-libs-0.6.1.ebuild 826 BLAKE2B acba62d05998047772464fa9cb5ce976d7262c6210d0484cf073641556b98c97f10606bf0fb30b6961a77d95c2b8a964a436efcb39d86f980e67c51d7779d38a SHA512 31b3c01de236186b0017da6871eda9090122f6e19c4effbad0254631fa9f1b3d8ff62daf37438b4c9fdabf48c40b2161232c5be7ced389038b4c8cfa6c82c20e
+EBUILD ding-libs-0.6.1.ebuild 827 BLAKE2B 8db5d9a53c0edc1cef62ee4f9bf04c8a895a0a8833ab43c2cac937e39bdcac10b24f44bb34b11ca8c4a46d787306c1869d740783abeb04398c800557e9e8da11 SHA512 5953ff44641070bb2a9ce46c87b870b1fa01b5bed00d102dc1258afe5a9164431aec5dadb58214cf499ea6274d9a94126dc89a0764e1803609b1bfb156c43dce
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index 545d960419c5..37306b6aa8ae 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index b11cdd24aecb..fc9cb782c490 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,7 +4,7 @@ AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53
 AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r4.ebuild 1750 BLAKE2B 9669a1d5b365f1d24c3ff6ca4e3df5f5af97a779c5f046eed3f0f13f8a85325e642872859c3900459120ee29338b9bb559ae73eb7cc5211e91dfb8a64edfc3de SHA512 b9f4531a4db6864f217fd61338b4fcb0111a36ade6a663c65445ca33a6b49cc1188ac73490d2c9c3c3b03b61e71c2aa9f912f63931853f6563261e3b4c31d42f
-EBUILD dmalloc-5.5.2-r6.ebuild 1916 BLAKE2B 431e238b85cb9fbb37a082202a33c715f5249e2da0252302d2b681b14c093b6590d258cf3e0190a66ce905933258bb8d9f802d42d006c5056eb162f4893dd364 SHA512 4bfa2ea6d13ad1cfa1524a1fc20dcfaee27d06153793c7947a6f4dee9a6ff59e2df3c18a6ea11ac2496cdab625fb57e3df8fc04cb16b200abca3846d4d90576b
-EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B b3816e5dd9133d47f2d68f5acc312a596dea6beb69d49aa16476004cc10197477d4a88ae6456ce0c49d0c512871f48df38550b817c1e90f407a0f6003d1c25eb SHA512 0968fed38e6aea52ef7d66737a99e6c0642077eda07b0060df050621d7675368eb251e357f32ad6951ad3e835158f3924bc25ed345f02728c49ff010d942830d
+EBUILD dmalloc-5.5.2-r4.ebuild 1751 BLAKE2B 20ab1cbcf7ef36a0b9f39d0833c1276eef87c245dc368f57cc6fccd1d822fef98d118fc3f193c9bba6d0fb996bdc74b93aed54486ea5d2daae951725de0cd098 SHA512 5f928b8f2f09820053461ec831b46958f630ef989c53deb91988a1bfde68816f73149f89b675966ba5738fc13c75f2fdd1bb702f780c497f9f034941937a704c
+EBUILD dmalloc-5.5.2-r6.ebuild 1917 BLAKE2B d980f68e26716599b285f5cb34fcda0f52060146b3c671723b7c43dfc88ffe43032e9634edaeafbee5b2777ecd5882cef8dc14c659d821571f6d0a36ece56b5a SHA512 529084695792373fc5f6c5e862751a90694314c4cd5c6fd1a6fdbf982a304414420d9c015df8af92c013b269ba1e2ee8cf51741b52fc59a5c46c9fbcb758ec37
+EBUILD dmalloc-5.5.2-r7.ebuild 1858 BLAKE2B 011aa02de5b353827fc61b62cfe4e3793ec85314d3380082957575d7254fa49056539bd7c440f7056af4db21aa66bb7b77dfbaf1873a0cc232dfecaef4fe0a82 SHA512 4030a84dee4c1a58a406fd35bad418ed00514be2fa921837bcb421cd842a3677a84cd2e7f8865f8d32d5cea4914c63948454ea1ceee0a9dd5e2b89ba6bf0f433
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
index e4aec86af70b..03ec36d6300c 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
index f154f33e3ad0..6f4c8bf715f8 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 51717d85c5e6..bda4a27d0c9e 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index f2917a3180af..c02b83eda023 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 594 BLAKE2B 6891826d1397b644032b2eae57d9c5f76193874fd2d46e0a7531f8ef770aa0e1e8b6fa4ddbbaf832c9ea9a0686ccc44d1d2aa3d1b38cb25e24cfa2baf8656d29 SHA512 4a9fab7d2477fac6385574ee5ac7c208cb2495ee480ca773cff563bc053526ad9b2d1b565e6e83141b1533485af2f620940dc22e5d4af5e756dc1ef512ebcfa3
+EBUILD dotconf-1.3-r1.ebuild 595 BLAKE2B 45f275d4e69a0f3da66d891b0fd9ece192bb8c203e1c6c919025870bc3576f1c31aa6a0424dd867542fb7804de89f3f5e246ad8c2b709fd9505fa0c2d34382f6 SHA512 9b9fbbf4eec01ae3af987c54bc001c7d8ca4c9cc4312b33528a63c31bb87159ca42e77f93a8a41be08fe24aedd689003937984cc29170392f0374aa90db64875
 MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index ca952cd3a5d5..6c81a8dd2044 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=sys-devel/autoconf-2.58"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 0775e15f5e6e..9ce401e54be3 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
 EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
-EBUILD double-conversion-3.1.5.ebuild 463 BLAKE2B 4b65ca6b7edc17fecde068b415034adf95702956fb0f39b50a6c3787cc9c2c06f30749e530d060532ee0ecfd88d0b937412cdcf6de5fa1939a17d0df00006c49 SHA512 410c3295c4930671052206a6ddff0f9c6258e19a1d137d0a4c988d895394b10945e77cd3caf73abdde400a5c9218578dbbf0137d3dc6115c69b627b5e413c97e
+EBUILD double-conversion-3.1.5.ebuild 457 BLAKE2B d07c81ac6dbbdb3389d674ebd864bfe2d5949b455b62dc4a5c90566dbd52811ca86c8a54584cf121e55b4a63231827d6dded5b5461b1eb625a67e0fd9917e2c9 SHA512 c4998bae35b178ffe22b889df1061e68f66d84f8ee8b3228d08ef7c44dbf59270af381f366161a1cbb43a9a37aa4f12d80f02cb689ad839fcc5d560f7b0b4aa5
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index f1eee1853367..c55eb82b6ae2 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index d70ce7f50df0..362453598f57 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,3 +1,3 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
-EBUILD eb-4.4.1-r1.ebuild 713 BLAKE2B 1d03edd1a78da8da19e243cbfc0d30346999578e6bfa92f978d8478c7d3d05535d18e5310b15a6d6b8c2adbc436e787286eda6b2ae56c30a89b26cefbc4307de SHA512 807f7d0bb739a6384b443389092c34ee9652bbf0d004c4c0dba88ce79a1b68209b7d840a7ca5266c47a81ef6900d3b795f665974e562679ad9b1b44f0feaa87f
+EBUILD eb-4.4.1-r1.ebuild 714 BLAKE2B b5b949ab71a8b090833a43142dd1b5db3758c412034aee02cbc1868903944cb1f3928a81022504500b457cdbf238398828c1f6ce0d3e8689a024ae0cd068e5a7 SHA512 2afe55f6c78e76eafec02d78aaac7298f84000fa29c41395d83daca8deb808dff33ca3048e0a7f51f7868455a8ff254f20cc06739f69fe0e7d96d03c1ea61225
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index 0942eb7c1545..fee15ca2cfa0 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 nls threads"
 
 RDEPEND="
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 161869a5e298..5ea6631e0440 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,5 @@
 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
 DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
 EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
-EBUILD efl-1.23.3.ebuild 7475 BLAKE2B a75a6ba0f44b7d164fc31150aefb1f5c36fefbb63a96b918d223bc63c0dabcaf5ad58ad642b70c81409679d71c2a6177c2d485f7d52a6dc2ca4ebfb201c635c1 SHA512 ee778fdb8784f1945f73e1b407b7a572504fb696ebee9e1b0b24e04c8f6018440122e88937595f78f960060021961eaf5bb537827dab97a63da9c36d9a837954
+EBUILD efl-1.23.3.ebuild 7498 BLAKE2B afbb8beeadae25c6fcac0f11367e81ad937dcbddc60317e3746bf405822dae7cc57599caeeae63c0614fe7a86f2a31139353b0bfc2712e9c1a867310fdef5f46 SHA512 ea2993c2d5c819dc3ff4fa960df70b03f58f9560c374cf4e7e2dbc092a160dbc2de69274eafce3638dff1efdecf75f61da99b418ba7e97a87c58b192cb3ca663
 MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
index 822a2a5b0caf..982a3b498ff0 100644
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ b/dev-libs/efl/efl-1.23.3.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="
 	^^ ( lua luajit )
 	ssl
 	drm? ( gles2 )
+	examples? ( eet svg )
 	gles2? ( || ( wayland X ) )
 	pulseaudio? ( sound )
 	wayland? ( gles2 !opengl )
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index da25201dbff7..cd6822fde9aa 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,7 +5,7 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
 DIST elfutils-0.178.tar.bz2 9007557 BLAKE2B 241b611dbfac37f35a670fbe80096c21b870e4b26fcddc8af26fba0373c9cd72eae42aabae2803b7b16c3bf649aeda036b1ea1b40952b43c4021ed23fcb51e80 SHA512 356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5
-EBUILD elfutils-0.176-r1.ebuild 1971 BLAKE2B e9ea01a2147d318c75c8c6157c2d830db85cba78585e96d182a52c39c55b97da56bbab955dd34bda74a9e28fcdc49441ba08812b86e055e53f3aabe01723d4e5 SHA512 f73f6d944944730a1b0d389a2b6a1a7dff50c7f1aba0332472180100c4869e5266b78c76f451d8ed00cbc6e58e2bd9d07f50ba9f97c1bae0a1b7940e21d0bea4
-EBUILD elfutils-0.177.ebuild 1988 BLAKE2B 7166420f05ef008c6289c6f23adeaeef1f7d2a80df9b807154d4966b440bb96afef9f2029b24d4656286641f2524afb93e0fb0e9aa6b141c40c3cd41abbebb19 SHA512 8effb6a01bb9d16d0d68cdd731b05ca227347fd2ad94e5473b240bfd410d6c9881981b8637816ddfe7cd7e2bca912863b1f00299347c29b3ec3ff5d33dcb05e8
+EBUILD elfutils-0.176-r1.ebuild 1972 BLAKE2B 9f9fed4ae8d9175f3fb7dc11ad4cb6dc953ca404631d2053a7279b2e6ca2836a71262793d91066a47f2df3ed06091252597b43eacbaaa71db123e2d68ccce3cd SHA512 c0cb456b5a9b9400847696a67978c6f6940d03d6417cf33b47d0e23ae4da7f4017dad1fa12fb49645435eb249ce65c63f03ed0c425600ab18ad15a83069f8f3b
+EBUILD elfutils-0.177.ebuild 1989 BLAKE2B b4a84e327d0cdda2443297d77066b35e152c34866674b466d1ccaece968f19346cc4bb87e40c2b0821018a9a082b659ce3e2673de4e9bd9f107a270a184f483c SHA512 934667672f4bf5f907625ff1926f8f1727889acaa07b73ecec05f1f339e7995d0ac23e0b55a8ac291be593ca3f3fc79e7eb40be5fccf7c7002e22eaa4501a5a5
 EBUILD elfutils-0.178.ebuild 2094 BLAKE2B ed3352adc5be205c5eed92b686704eead7fc490645de277bcdba05ce03c7564a7601f6393a7e6538d25d7c9ea4433a570151077d9cfed733742130cdb2c7dca2 SHA512 e22bb08e2943398310f23be66939fe818594a926de5caef787cef0d6d6d5a0b7e4d6ee21e94590685b46a9ccef0bf118988251997cac92989c18fade7e9501db
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index 986869931b4a..c4822ebc94d2 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
@@ -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 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 618da713a0a4..82ba1fffe214 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 4839cee0e2a7..49ecda8d3646 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -14,7 +14,7 @@ EBUILD ell-0.23.ebuild 1048 BLAKE2B 3ad500373c36074fd147ba65234f25b61ce46b9f1d72
 EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.26.ebuild 1053 BLAKE2B c0cd7bb5e24325b1c318ec0796b05d8e8b74b95a94bb4940d25e7f608bc71dd45ce870809f402fc2886d5b4e31863256029a4b296149245a9b0dbc5cd90c867e SHA512 696af928f58f982b99f7b74351b15d231e7a367a0622bc078d512e0b22347c65ef6f049b57e157e9630f638265fdbd5b62e3dc7c06c26a4e1b3a6f1617eda146
-EBUILD ell-0.27.ebuild 1056 BLAKE2B 758bf1c5e92d3508f6281fc40f8c216c9bb606d1fa9043c410cd8e9a2a5642b7585435156df0bc0574db924a22dead38a81635f119f76f71749693bc6ec1be86 SHA512 7a4e18c4f5777d4ba14eb1b07a69373d9583f0610adc30aae85147a66a138de70f9094539b95512220412cd538a19b1aa5cc68ddedaa4f2b1fdff79267e01b13
+EBUILD ell-0.27.ebuild 1055 BLAKE2B 82bc62ee0f9f22caf0d0aaf85a98ddcc3f543d5150220c514c9eda74ec30dec8ee7bf9490030dfc4d92994b155ddfb40d21aa2b0889b78463d65804b53c2bcee SHA512 6ac6af0784d2c94afb47c6910403c05d21d06d3e76ec95b088c80515f2f1c0fd11eb4616c18e9e4c1fda38650632460e216706c5922933add4708bdc316566bb
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1060 BLAKE2B 66bafb93ce83f0a394e53b6d8293ac32bdb32c42345d4b9078b230ca50b7e287e63266ac924bc96a532bc3edec2f9fb0f9ba0f1fdc7821a7bcebb026a4e1fda9 SHA512 975ddf76ae6fb0dbb8b09907570383c950f0c8956b2ec67e0cdf0aad0c80b70b6ebb780a97be39e7ba6e5e1444b1ac241c25be650430835ad022552a0e2d204b
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.27.ebuild b/dev-libs/ell/ell-0.27.ebuild
index 72f706e9c277..8d17f6e5152b 100644
--- a/dev-libs/ell/ell-0.27.ebuild
+++ b/dev-libs/ell/ell-0.27.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 9f65ff3eabfc..e74438b8884a 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 666 BLAKE2B 8548c57fd4c74e6cf716f9f3c6556d539005411a1fab79acbe87ccca21eadec5acdf1ccaa723823420323505af6084f0be0811e8bf72d4afd13ade314a0fc027 SHA512 2d4990b53ed50ff1e66cbe4ec7179b9c3253d454f0b51cc2cf841eacd947e82cdd37eb2743751fbacbceb2da4f75bafeda597959a52e26f65d83ba086a2b4b43
+EBUILD eventlog-0.2.12.ebuild 667 BLAKE2B 4f151b491aa47427b5a4fa7ede077602c1ece229695d2197b6498ad5039a43e81205bdfdd3abafa1a2d415e64e3238dca5ab4685508551c5d61bd046ad172096 SHA512 fa62a9a55e287022af11b97ddddb1a0e295eb98f247f7fed5ac40add4443091774de145af0d7f1fd01baa27f46750af7a3d66736778b11630071a14943448bd8
 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 fcedef6006b4..2b7253aa728b 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -10,7 +10,7 @@ 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 sh sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~m68k-mint"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index ec053b668e56..c24418655ae9 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,3 +1,5 @@
 DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
-EBUILD expat-2.2.8.ebuild 2511 BLAKE2B e2d4f349316d2df8e84569179b8eb5bf5455b2a8815f9e25b0b727a60b5f218b3f1e818ec94f97d115b7a13b40b5ab7d238c8195d9ef876c7ccd18ae78fe5f41 SHA512 6a30cb61afc656dfc0ba524294cc2feaf6477062d83b498e3561c574e57804cf193b2fd3ce8137b24596ad5173780a72a0cfcc9c56a4f671493a8217d971a29b
+DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
+EBUILD expat-2.2.8.ebuild 2512 BLAKE2B 84fdb0be7d070c50481a6b8174bbec207014be6ef64d5f0cd50b0c49b3072f7677237a3ec937467b71c06d7ea8dea865bb3c27e7b2af874c8e57ad3e232e45b1 SHA512 2a3150d3add2e471df77f2133d6f7c147213e576f66b225a7470a2fa8a3b8e466de1f1c7a3d685412131f2af60948ab7fd3ccfbe8b4e6135dfcf2c6be1ec8f3a
+EBUILD expat-2.2.9.ebuild 2546 BLAKE2B 3d95a770ed8913662c1f23768005bd5acc377cd70730366b52e4370c034ea45feae90a2c6f28087715db0dc4311ef251d0935f5c4998322b2cfe6f0cf042c60a SHA512 e6627e37885a1748074822e758b79fbc571d351839d2e4e65c807fcccdff15bf178c8da630282704ea54489c635654854f1855b4424e96295803976a26ed73ec
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
index 2aadaa894039..571ffeaa4bb6 100644
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ b/dev-libs/expat/expat-2.2.8.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.2.9.ebuild b/dev-libs/expat/expat-2.2.9.ebuild
new file mode 100644
index 000000000000..208b078a9cff
--- /dev/null
+++ b/dev-libs/expat/expat-2.2.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AUTOTOOLS_AUTO_DEPEND=no
+inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	if multilib_is_native_abi ; then
+		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+		use elibc_FreeBSD && gen_usr_ldscript -a expat
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html,png}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 15664831c7f1..f2c63cdd48d0 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 1288 BLAKE2B 7f647fe1df2ffb3a9bab878eea921b18880f5fb0827633aed4287ee162dd8ea2e88228a668f030c0bf0a4456c92c3fc47a59405a7c65cbfff2b199f2c64c8a55 SHA512 f6fb96a116cd11deca091468e6b8dfee5127c1661c1481b569445b4210aa3bdbbcc58eb7d60935abff1df0672775d9e7d0d02beb3b3cebe1f5a3a55b1f31baa3
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1289 BLAKE2B 7a618f42d3bb4f3569e61bc73a7e222bb30e1c6e2faeab657b6a5fde9711c4c4becfe18bb9643a470fc85e6dd948c025feccb58a6d8f5e7113aa0c58da4fe1b0 SHA512 ed9861dc4ca0d168314b7d544691a50b71d7848ad050897709d84156d199a2f69aebc721cdefe7b0d8fcfa9b76990932833eddedd3111b4e8a57576979d4633a
 MISC metadata.xml 322 BLAKE2B af18d8a4fc584c7512d4967123df7e5785e1efde8475c8d73277a244b67c00e0b80b30ddc8de15844beedbb454aeda583bb6021c8d3e2c681ffd529fbd9dd01f SHA512 d4d683173a6acb775871efc762823f186867e446c931714e8b04475a7982845e2d8152d871f123a1c8b08e7af307c7d1453c0309c26f7e6da131f120e1c29c7b
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 23bb5e34f35c..dd374c4c62c5 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 DEPEND=""
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 4a9184e40053..4ba1ad685fc0 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 1507 BLAKE2B 93b1a456c4628781b1b86b0594505a661177051512781401b5440c1372a35dd3290a64c1571c901f4e81f789b32d75551c348289dd92aa4817899efe91048f97 SHA512 c2b1f374638753d3f9d87e60f9337aa052f9efd1f7a942b63a2c8a10e96805c3b8e01e08a746d07005031a83c143c19039d41146a1338003d3b9a4d2c7ef08cd
+EBUILD ffcall-2.1.ebuild 1508 BLAKE2B 3e76dc35c0c1e331532787c0116b49946b089b26ba9512e09800ab5ba3aa1d486b63aedf673766de6d9d021a7160c2427c6dd41c0ed11fcba3476d74d60fa855 SHA512 fce5fb70f53b24d44ae8f6fdb614c3c824b1917521c9bdac4761d0eb817ca65b6bd27fb46bea79e17b4e0d29c68068f1192ed7db4226cce68f396dd890cfd02a
 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 a683a1df73aa..1a4cf80a4daf 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 13d0632dae92..178eed2173e9 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.7.tar.bz2 2074943 BLAKE2B 9f2fccf46073c097ce89ab0b4ba640440b285e538a15a0ec3f8aba62ee5e892431e909c29fdcb793167eaea09fd4673ac33fbe12c7306ff9d26cbf871b9f565d SHA512 c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0
 DIST fribidi-1.0.8.tar.bz2 2077095 BLAKE2B 2b9a0887a02bf6bdd7f285aa1df012e5e8f675fc930b612f53a2cce5ef4ef275610ce9a1aec9debf4c5239164fdab4b175e36f8f07288949adf2496d01c95f67 SHA512 d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
-EBUILD fribidi-1.0.7.ebuild 838 BLAKE2B 29a886910e3751f47bced9de2155e456d9358378dd607ab3b9573f298a3f67fd4bd3064f9d36398c1ac7bf83092e669c1aa56699e0aaac5fb2ec3e694bffcb18 SHA512 9c1543c38b74a50b452a4f37e238008090ed2f797fb304757c3f09632f9c4334e3a93f6e4a5e57e7f71497efb4bf3ebee40ea77ff3cef3516a15b76eea156757
+EBUILD fribidi-1.0.7.ebuild 839 BLAKE2B 5f947437b5bc37327ffc6ac2ba15d06b8e5de9565b8cf4c4cc5d237d9dd49601dcd76c9e17d1b853d5e635e24cd4906eda2ed15d67449fbc20145713f96e74cc SHA512 a82c413dda8e8d5e2aa335c23f72ea5dacf47877d707942cc2babfb619889dafc4732937429eb915059d88d59ac698ee2d1e537260f231d0e041e388c0f01295
 EBUILD fribidi-1.0.8.ebuild 1006 BLAKE2B 3df89a6817664b4818861fcf53456c0e99868f80ea69bb2bd42d6c941495d6bcd16ca49029657e553beef4b2cb4e744a3c74efd06c0956416c09ec9249d08384 SHA512 d3d16c12a225057fbe8f73ac436a7c40a27dd2dcbd293e2e4942e8afaef3f5e33403a06b0ffd72b160941a3435a800bc896eaac1ef8b16e5cf1257888a98b320
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
index 0323eb305a18..132e07ad38de 100644
--- a/dev-libs/fribidi/fribidi-1.0.7.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha arm s390"
+KEYWORDS="~alpha arm s390"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index ab0d2647a38a..459ed6734f37 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,3 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.3.0.ebuild 822 BLAKE2B 1eeca05b7201cd31d03d93cd7d69cddc8fa08fa4f660ca97c94c3db126a64dbab327579d8930cfddbda0afc1105963383d7298c6f284b2efa6483df07a961efa SHA512 5dc820a90d4252e5c31cf252ee2a07621b13c73aab9d4747eea06067b0a4307ce55424b0ecfe6cdaf35a197325e26e64e4eec2d2f06caa3614bb6b3433089f23
+EBUILD fstrm-0.3.0.ebuild 823 BLAKE2B b197dd32180f0577c39fe6a33bc9da6f15233e130623495b389a1a8dad843a0a7435db5249b31a977a7213409085934315d4447952c16b933443738b4938b6ed SHA512 bc40d997c6befc0fed758b44ff09c826a24d6ed562cd134ec1d1e4d44f67f1a20dc4563f679169390c748f140bf34cdaac4f7283cefaba0253d6062a784cd1ad
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index 3a1720c757b8..b608dd594ec4 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index a1fb31aaee2d..17f3a46a6f38 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -3,8 +3,8 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f
 DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1275 BLAKE2B b0d5676966cf3841f269430921d89c09c649c0fb66a1d32a81220d5f3b302885dd59b7cac02578c25cab712696f81eb4f498ce68cfecee8d90cabf22267eb3b4 SHA512 d9d3f89b1ba0278b418fe851ef23af1056c31b23b87dc24fb13d79d7f49765f0908a102b6d5659a7fc1eb89f91c74217080e78f744af78186c2b0dbc9d670582
+EBUILD geoip-1.6.10.ebuild 1276 BLAKE2B 98a8ca215102e65d9d5ab406d345ba57cfbe173c1ba4edbe4c933bba5b7c8b467341e7524cebcaa6753fa2fabc06bb021c09933f3fd4fcb2c31acbe0f2542abc SHA512 c380d130e0d9ebb74db6b558b3410fd1071aac10f2860541fdb9e0fad63960564fc56a51f740e972fc8d5c5d6facb15bde7827459f843f29a0ef5d75dc36231d
 EBUILD geoip-1.6.11.ebuild 1285 BLAKE2B 4bc6c7cd1c076cc91f632157a2bdd9fdf3449d07beb956d010f8fea75dfc05ac812725dd45c9df110fde31688b4ce815fb9732ad4677ffbbc3a533411c0e6857 SHA512 ea6f1d7a9bc2e3613efcb946456030f0726f117f04b9066a745d14adf3a1436e911697d5aa7846533f9452a0ef2a4843d196c12cadffcd1d82d69bb3220ed761
 EBUILD geoip-1.6.12.ebuild 1285 BLAKE2B 7bde34369d32101feecb3a6745af72e5e2a582d6037f4c23f7a222d7ff62fceaf97cc4fd3e7f733cbf060a96c02b2e68f47ff0af06a0524a608bf5e30bd1dd34 SHA512 acc3a658172ce69126694135d7166ff018787739d7203d407bb03d05ae6ec8e2ae17bb91ba9aab95c440feaeaa67903d7b5161e8c3c85d243dfc62abc080c5ea
-EBUILD geoip-1.6.9-r1.ebuild 1275 BLAKE2B 3349f2a841198c5944ef5634563a1a1d51d8daf7cacf24220aafe26d73e989355f70d299be656339f88c907c4cd0c5766d2f5dca1e47ab5f414dfe23b587debb SHA512 ec666f33c66b2991e7d01a4c87a591385d698fb9f1f9b24e781249c49ebbac43c461330903c47512204e929dfc501ac4a39e0bc125e0a26e41a6b42874a03e55
+EBUILD geoip-1.6.9-r1.ebuild 1276 BLAKE2B 9d0dfe24e1ad9e3f7bf0e5f53a5feb7367008964bfe2309eeb720d4f9571c7718839491c447290adcee349f9ae10f44ab899188a4e3208d58b15f69af4d3db5f SHA512 881f3d52ef841bd0008489c8e18461add708bde1c3272459cf1f6bba97be15110a9eaec2919d801535141152560e703a660c86398371b8c2539bab2609d07bf6
 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 78257397c3ad..595c3333cb0e 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
index da0728295bad..4a08190da904 100644
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index dab421cc8853..5a9bb689da54 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
-EBUILD gjs-1.48.7.ebuild 1575 BLAKE2B 9575ca81c0f54cef94269398582a432584989999fa11266e7c7ba76a4429132d2b02993d6c23f3906f3bce08e0fbe040cfda63759ff163c4a36ff94a784293ee SHA512 b3322a094c9c1c10c2ee1693dc0e6532a58f34ac44c41b3ee12247490ada15ffeb4b21888712968f8fc6a38fa779020fc43f4dae65fae9ae5b652332e9f7a4d3
-EBUILD gjs-1.56.2.ebuild 1715 BLAKE2B 84fae82355e32da4da69fcc4a495851b5b8ff29750e00cc565485c3dd01c9e5b56e87c0878fa3640b75c13af02deae814433d03beb78fa243fb49227874c2d16 SHA512 083bc1d5e24cfaec246322bd5fbe5a33b99f489b0e21e724006f44e3bf587f06b3cdb4d2a45d20f1d85a9a2c57d0c628fc59153eaf07733fae87d88ee4ec6976
+EBUILD gjs-1.48.7.ebuild 1576 BLAKE2B a7e8566306694c3104f7f9f4b4e8d310134baae0279bfbc3afc928142fee0a4b1d8bd4ca864d9314402b0aedd256f6db65f411bcfa51bb3d4e386c1045892954 SHA512 11360b926408ea6d218d762e1abc405e14400d76fb89f4972152adef3e488e92a729173bc77c3963062765cfbfcf2d377f389835f30d536b36c3fef815adc745
+EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 8b9abe61a64b..7b38847d89a8 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
 RESTRICT="!test? ( test )"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
index 42e995523e17..b2cf67dc92ba 100644
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline test"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 86a4ccc60338..bfe26b56f60b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,5 @@
 AUX 2.60.7-gdbus-fixes.patch 10740 BLAKE2B 0e42e8444c6308aebdeb240c935969015758bef744a21c4fa9d87eec6e52c0422660ad8ce6f2a2c1caf66369b66e8e7979345449a5322f37bed54f607df82473 SHA512 dbee2969935cb3d24d9bd518c78a02b815ff3bb468d1b04acef50ccd8dd5c38b7121a12f69df51d8a6f9944342e3101fe0bf5b3d87e3ae9e65257238769548eb
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-EBUILD glib-2.60.7-r1.ebuild 10225 BLAKE2B a372327f0c949e571df0c39cf0241676f8135a27137cd9a3dd2870a583e11a78c5d19891ef305036d5743ef984cddca61350fc5bb9775c7f0ec35646c64852c2 SHA512 32bab19ea1e1af187594907f8d64d08f8b06500da1c243d8ec97a3fff457d29c3f9b4332984f13d387a5a56572cca3e88380129b05944841ba0ea8d74006e292
-EBUILD glib-2.60.7.ebuild 10138 BLAKE2B e46475b1609157713a0434389d8e3cbdc1513e76916d09cddb09ec9d6350c9683c4fb5397be2fc7352d51e626ffe2e2bd7cc6eeb80366bc04d656a78df24d704 SHA512 e9169b1ec23bc7283fb70d603e3040a89e0736682862dcd2bd19256aecb0e744d4248102e5e53d735bd5631e99421ad88d1bffe52080f78777e53fdc0bc35ae2
+EBUILD glib-2.60.7-r1.ebuild 10219 BLAKE2B 378749fb1f90f52aa0faf9845d45a189d190f5bb8a868530c5386b998e54a95ff206c830dd26b337ba232244b96739b469a095aa54bc1c0472aa946988cbde67 SHA512 45766dc52467876c1074cbec2bf20c256d66893ae10e9ebd263c6134c45a75ff7cc1e8f7549a502b8590343db610c19a778de0af562260a8229cf81c9390bae5
+EBUILD glib-2.60.7.ebuild 10139 BLAKE2B bed62a53ad8276a891f54acf41ebf6cbced7cd942dd5af0e5a49f3a13057457d9186487a9ea30aafce9c7a04e4d514b3241e41166ef3ddec48a0e580b41f0a7c SHA512 1b3de610aa4102181d8a8c7f0dd47086aa2c51b85a187f002224e5a04d41a0b56510958917c60b3df2f3607ad5f431e322681f1e62ce5b96c1223e23a5eef09f
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.60.7-r1.ebuild b/dev-libs/glib/glib-2.60.7-r1.ebuild
index 1bb3dbb6dbb5..d494f6ef3465 100644
--- a/dev-libs/glib/glib-2.60.7-r1.ebuild
+++ b/dev-libs/glib/glib-2.60.7-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh 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.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index 9c72a2a20206..acac06c0e7a4 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/gmime/Manifest b/dev-libs/gmime/Manifest
index 559cdb84a7a3..032ad4ff8f10 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
 DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
-EBUILD gmime-2.6.23-r1.ebuild 1497 BLAKE2B 5526b533983b0cc9cfbf6787b8e02652c91abdb3b5403d68dbe01b94f150307e549014f924d430c06eccb3e82ec19ce5e6e4b40a16ed04e4f30f683c31b04924 SHA512 20830a222e7c0ea845168c0a76be0efad72474078f93e65f4025a70b4cfebd9fa2a667c49be7d445b50d342e456b714bf6b78040266fbb80778af93ca99e2a86
-EBUILD gmime-3.2.4.ebuild 1576 BLAKE2B d7c1a9f1a66e37324e2351c0da7477dd03643056b2f7273b6262246d381b9d307a375abf15ed3686d2e54c871b61996d60686e2a3591050173c9b9aa72d43f38 SHA512 0a5e469a40da8d76a574d1109a44a274d23d768ef92c2a2b8554e4ca0375f4d1aff9360aad21de64d01646f2be2272d0a0d62a782f4e7e5f84a4f857223b81fd
-EBUILD gmime-3.2.5.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
+EBUILD gmime-2.6.23-r1.ebuild 1498 BLAKE2B ced85c484ae0cd37e055647870d9bab6091d8d45e39a0a679f5edd00235349100f4035cb4f51b8c9fc9341dcd877cd9b5bf41775a82823e677d53b8a3417b9c4 SHA512 aaed5f0a804d17f9f01936044b15cd59b7dc3dbc085839e654893850fb550adcab48044e147294f58f3b83996cbbc6f3fd7e0741af353692e678ec5ba635161e
+EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B 14117f61a5d77077c7c1b6d5a22115cb4d7ccea676a67fd389c1ea6b2511ce5838e296a6aa05d4ee82a5679db219bb135f984356ffca03e7c2fd3e2e920185b0 SHA512 fc64b09cf9e55692ce12574bd8d2a872f0897a627946c5ff96bb58986a5f65e84b8e4e85b8e4383d91f6ad70c14cccde9db25dfc633cafdfa587f0af9acca97e
+EBUILD gmime-3.2.5.ebuild 1578 BLAKE2B a3d05923a75a9c71646388ecad4c3b74ba9adec3231f10485aed31cd881f59e65944a365f78b9c3dd903d09b28f32710ae3f2d326a3d043e940000fbb8b6ed63 SHA512 930c882f8ecf47dd239a7f4c34125b860df464443be4abae8b7ae45c700585c3b7be3924de7b896b2509422488e9edade569dd037a790b077699139140085028
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23-r1.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
index 7053fa2ffa85..975005d649c8 100644
--- a/dev-libs/gmime/gmime-2.6.23-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc smime static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index 343aa1f57b70..847551dfc83c 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.5.ebuild b/dev-libs/gmime/gmime-3.2.5.ebuild
index 3ae7bfbbc5f2..eafa450dd711 100644
--- a/dev-libs/gmime/gmime-3.2.5.ebuild
+++ b/dev-libs/gmime/gmime-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 0b6c1b7e7444..975e60d5607c 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -7,8 +7,9 @@ DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1
 DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
-EBUILD gmp-4.3.2-r1.ebuild 1689 BLAKE2B 4c1dc133268629570eaab18c0a9bc4240a8e310236efb0df5c4ef26fa480c1d61863b996cc4f355fda3a1df4f98784ca6925b7bf0fe40bf54ae50d7345d58fcd SHA512 51ac8108c0fc4c23a6872b1397b7beb21d2caa493a32575776bbc0552adc9adf559b644785fd7047911455beaffa658454770bafd28b610d88dd38208531026c
-EBUILD gmp-6.1.2-r1.ebuild 2929 BLAKE2B 36771ecb0821cabfa6c5d524b0b3acce4350eb4af42e3afd41136f95fefe1540ccc81a6371ecf0727c5f55396bb2722ce139fd6bdbe39f71515960910704d393 SHA512 4ab19dd9122b01b59fb45a412b0ed7fdf4530d5d842167db99a3f2ad583e29caad350d0e3754fe2d253d3b1447970ced168d0622e7f426f47dff0811280130d6
-EBUILD gmp-6.1.2.ebuild 3012 BLAKE2B 0925c290090d5bb587e24170e8feb27d43bf41e84c222bd2b05f4f26757d4bf58de559326835058fa0c41c393422abfe95b00b2c41c2e03584001246ce8a15e6 SHA512 e2f5f9931fb194534d6a4bd01f6c7462ad6f0be3be014da6be1dcbd02b6a8f74a8f180508f2ef68d89a65c41893ebc80910501584c57a142a6f81df8193e1ac8
-EBUILD gmp-6.2.0.ebuild 2867 BLAKE2B 0c2abf1eb803c2c95edd0e28e9ceb4715e83840d6a24eeec8a3ce8279d1e191d6a892145d774341874ce1b19100b3ae0bcc73713a8ef347fe70292a8b154a9e7 SHA512 86cf8bc2ef586611a5469960c83d514cd813607accfaceb26afe5821efb2348ab4296fdbea27daae3cfcf39501bff20e368148a59fa1a1b512d8e4f4a19282aa
-MISC metadata.xml 437 BLAKE2B 74945994e080552031f2fbcf051b5fb638712205d40433225fa010f70376a96903da3945dfafd4594da53624628d1abb9929a854cde7a60fa2e88fd01f0ba025 SHA512 c1d6b6a603472a84703310b3dcc72eefc66858ca397519cc42d06750b57d6f9683c9ac908cd3fc3aa16406957ed23a6ddf12a3cba6b20e97c21758b4ed3425ea
+EBUILD gmp-4.3.2-r1.ebuild 1690 BLAKE2B 6ca27b4d975126c129c07867f93444f4086e47e5b1f243eaab7c2c15ac68d210fba895891372c37a68c8c356ae21777140b1373b86a0dcfc9b169e82d860dcf4 SHA512 c6014e7f9f86f7969eddb58a58cad0c8649b01e49ef7861c487e4d6af2eeedb626a631113231c8b802ce49a69e6c1212b83c48f36f06f3665ceccc2ff9b303db
+EBUILD gmp-6.1.2-r1.ebuild 3094 BLAKE2B 9ce2f6d43548489399e76e8b9f55a1c0213be7bab563cd84ad9839c5c2ba0f77608e3dc09a7346fba16c6544ed21414b605d599b00dec15b84dd6efc3f7fc77b SHA512 bfc950e37b65bf8547f507559887a2ec65b966185e3ce82cd3315f4fcbaecda58b1715dbf7cfa6d317fa310166fefa2b1011298da637774270c69b0e0b390b47
+EBUILD gmp-6.1.2.ebuild 3177 BLAKE2B a0408771484218898589ca7c3c86520e49437ab5e0833c180e91bac4babefdce53674ae0d10459402e4f259de13e78bd26952517a52abb56616b71f5498069cb SHA512 2d1191e382d37c5944ad8da8324751ec79a1d05a8fef5e9fedf20f1c71275f5ee7928e2769c7b7c58fe7e60ac13444a65c6e3e7540afc71b3ad060c8920326d6
+EBUILD gmp-6.2.0-r1.ebuild 2977 BLAKE2B 15bcb068e3a3dc82496578b96dd5a134d96b8cb5c066dc1189104ae6f431af6910c5ad9d8a4b2e969ef711877555c9233f78db493c1209e1083666e1c01b7935 SHA512 d4255917fc12e4bce042b0699b04d5b576e78eb4a392ab952c526de282854e4e8a497280f74944a9bb34fbeb7cf09860ebcfe56f20784d10fae48f52194fa10c
+EBUILD gmp-6.2.0.ebuild 3031 BLAKE2B 90a687d271a8414c5deb7571b2b230fad0aefeab972ff90fd8d3b99a974b001eee919b553dded8b13004434956c2d73821fbb0a245f8f5a2f079f6ff39cae52c SHA512 cc4d7c81749488ae15078203bbe53e5cf3a46bec5a7ede4852be9bc936e35825fc3248559f846b5cd2b6bc51684249c4909878cd9b971efd52e792aecbecbd6e
+MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index 09bff4436b94..3693c7ab17ea 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index 868d521c14fc..31bf8c0b5eb4 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,8 +18,8 @@ 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc cxx static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc cxx pic static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
@@ -77,12 +77,15 @@ multilib_src_configure() {
 		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 \
 		--localstatedir="${EPREFIX}"/var/state/gmp \
 		--enable-shared \
 		$(use_enable asm assembly) \
 		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
 		$(use_enable static-libs static)
 }
 
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 4e84d2eb7d3f..38497f189d2c 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,8 +18,8 @@ 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc cxx static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc cxx pic static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
@@ -76,12 +76,15 @@ multilib_src_configure() {
 		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 \
 		--localstatedir="${EPREFIX}"/var/state/gmp \
 		--enable-shared \
 		$(use_enable asm assembly) \
 		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
 		$(use_enable static-libs static)
 }
 
diff --git a/dev-libs/gmp/gmp-6.2.0-r1.ebuild b/dev-libs/gmp/gmp-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..d5fd3a7c0fa2
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.2.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic eutils libtool multilib-minimal
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+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-${MY_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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc cxx pic static-libs"
+
+DEPEND="sys-devel/m4
+	app-arch/xz-utils"
+RDEPEND=""
+
+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 \
+		--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-${MY_PV}.pdf "${ED}"/usr/share/doc/${PF}/
+}
diff --git a/dev-libs/gmp/gmp-6.2.0.ebuild b/dev-libs/gmp/gmp-6.2.0.ebuild
index c5495e13aef5..e49ac021edd7 100644
--- a/dev-libs/gmp/gmp-6.2.0.ebuild
+++ b/dev-libs/gmp/gmp-6.2.0.ebuild
@@ -19,7 +19,7 @@ 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc cxx static-libs"
+IUSE="+asm doc cxx pic static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
@@ -77,12 +77,15 @@ multilib_src_configure() {
 		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 \
 		--localstatedir="${EPREFIX}"/var/state/gmp \
 		--enable-shared \
 		$(use_enable asm assembly) \
 		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
 		$(use_enable static-libs static)
 }
 
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 84e19205350d..2b4236a14c6c 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
+	<flag name="pic">Force static libraries to be built as PIC to avoid TEXTRELs.</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id>
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 0c69958615bd..fb7650ec6529 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-common-1.60.2.ebuild 997 BLAKE2B d349d5689ac2cabc2ae8b61c2a475a62edb4ea424146db4056a13694056cfdd2c0e4e1485c98e669f5d699668d71ebf9d8b03a071ec15fb8b0c6d74beede666b SHA512 4d88af9502c49e0826967d3b2f4cdd46bc690af69e71c8bed598c9400934dbf80468eae4f2689b421a6f9798b05f997cdd4aa6f68ee8b6f99eeffd38699e6f20
+EBUILD gobject-introspection-common-1.60.2.ebuild 998 BLAKE2B 70cf56ce3559acdfbb5ffe8ada55ae2725ac32b04b9b16d651c6b2f958f8559e37b337b0f5889b2bab16370a81179025f9b8f67534a3492c58a9d39a95ed8485 SHA512 d631e6f720e37452f2265894b08000e3befbc2f180706cdcdbe6fdf672e1971bd21463e8ab862fc1986d1035bec3fa9c56b237fcb7aeac4c393246524d0a6a6c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index 8d65b1bbfad5..88bd1c79143d 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 59cfd4cf42df..d645008e22f9 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-1.60.2.ebuild 2158 BLAKE2B d9690af8c4a6a6b2f0d0c9a31ec7158c3e855105baabfcf64aace933f295b1333265dd481df3c467d71c2b88753a663a4c0d0aec0120beab9da37588bad261c5 SHA512 e477db99d94b884a9186374c1c9a02c3092c831c1de2a70a2480dd29201f1d3e36eb2b7df1792543103dfa4c02a9752049f37689631b4b1330931e408b43db7c
+EBUILD gobject-introspection-1.60.2.ebuild 2159 BLAKE2B ed9fcec2fc965bca3fc726f819bc09de7dd6259648dbb9303607b81e66fc305196fa6ade2dba675b8c4b990da58c0a36f4166a3a9f79fd7e7f77f8d7a8e79e46 SHA512 159fb5e70b7f4639a563a083f664816c2b3b93894309382b1ccc457a19a3124f35fae4ecf43cb03b4b0cb4eb47582df7d1119d9f5bc4413a9660156001f3c565
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 3719359524b7..4b780a3b6c9b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index fb18ac2c4f20..e4bfdad206d2 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,6 +1,6 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
-EBUILD hiredis-0.13.3.ebuild 1871 BLAKE2B b1c3ce67e58e0ea5d1b75ac9dc0c92083630496c9d5043ab80d3cc1e0977236fc6566120b92459eff7e47a8287d9bee55cfe49cc53e432e14f663c9d51a7661d SHA512 49a730abd67884fc9957c1d1ea05aec6e83f5ebf2122af862892840f8dba34336bd1f18318c8868a376a0d3449770954dec53f43a6ed79ebdfa6fc227e87519f
+EBUILD hiredis-0.13.3.ebuild 1872 BLAKE2B fda15070c741dcda0a4696bdafe06d06dfae5552e9ce6da4c75a7a8a1ebd78bfc13cbe95d3167552b38d1e3ccc83c43dcc3061dffa44779192f9efe3f3597e42 SHA512 3e4ce6fb3f440d4e13ab71da8b13c3a1b838790e81dde82e811cc29ad8ebcd0ec8c829c4c173259d15812d3a5c237920f842b9c162ef3cfa7bfd8ae5b5476bdb
 EBUILD hiredis-0.14.0.ebuild 1884 BLAKE2B f4a58ee03ee045213dc4a1fe66511082857c79d2c9bc0e468d5cb31e1696cb5290121149e19f4fc30d9ac9bd58fcaa73cb3acc90a322d61c759bfa7b127db724 SHA512 f41ab5694ae37de96945666f48d86afeaeb1ff161db3a480589abaaabab8779b9405c50fb51be46e55782600783a69bcb484c5d0935839739d4e446810825252
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index e4cb01085872..77e4dc9e8c53 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.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.13"
-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/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index 8aeff7732063..1350298d35db 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,5 +1,5 @@
 DIST hsa-ext-rocr-dev_1.1.9-122-ge5c4efb_amd64.deb 1120322 BLAKE2B 40c60058c2b6d6debf80503c36f6b0ddc72747c7327e411121f99fa2e507e5e9414cb91c80be0acf283bff23a6a029b3ef199577846b694b2e2e11696cc7d225 SHA512 60dad492cc66f249d48fb057b2ecec1719525a871d38f39a403a55de98e8cdea5f00f672fa3ea697490c287ba7e5c3be035f1f2861a7fc97d9b949f575e51ad7
 DIST hsa-ext-rocr-dev_1.1.9-139-g0d1ca36_amd64.deb 1166210 BLAKE2B 3edcc938ec92277a163886df4e83f93f6a38b1ec4e95e719265f7a595d291fe4beef68aeca3fb09f8f56a0abf041a987d57e2469310da8cd16f2352b2af5077c SHA512 dbf7991b404cc371575e5d8c40f438bbead8bfef5c73dfd3b7295d64f800892c1f220a6eff8cc67d99ca4bec819bf1b69e37f85873ec372dca9bdd42542fa320
-EBUILD hsa-ext-rocr-1.1.9.122.ebuild 1161 BLAKE2B f80763569f5f6524de62b94e0f1907d38d53592360fd736d9b01c7800dc89cae05b93f522cf853121295f2016743eb1e1f2a810cec170f1b1ddbf57cdbd1f545 SHA512 dcafb018921d836207078d7a61ebe7b8639738bfc916e6a46e471795781e34172bb978c28c89de7e715f787598aa6506d46445ebd5996c9f82fd6d1c1cf383d3
-EBUILD hsa-ext-rocr-1.1.9.139.ebuild 1161 BLAKE2B c33f99d9e43a38637e29028b8b038e69edffcede4aa6693fa0f464bdab3d55c025b3a560fed2494295cb9bc96db27f385bc55db88df3309d3b9c48415f1a0b27 SHA512 1cea196c49e51316da4b3091e795a74f54bae8d88601907509f2b2968fa3a2e796de62ee4d8a6beafc0830157a8d134a4b9f8f67bbba1f2b85638e673c48765a
+EBUILD hsa-ext-rocr-1.1.9.122.ebuild 1139 BLAKE2B 335b3fb167590be839f0de7751d56b887a00d41ded76456de2194f87996aa27e36a9bebe5f1e190ec8f679f85cb54264dcbfc41d05d59d156e27f0476826788a SHA512 1fc174632d070ff33879a6f593dd878aba4782360b613583a1145aeedd44a921c84dd2e04e47d3c969fc1127310631259b82a9e8dd5b215dc6fc3eace98311a9
+EBUILD hsa-ext-rocr-1.1.9.139.ebuild 1138 BLAKE2B a7d645cd5d5075abdf816700ffbd799d2db700defb24a31253eec6abc0169efe227a699f55014b0171bed0e9f82fe1a375383450196e23357e6080f0698376ae SHA512 de50397b1865d7d34ab171f78b7abe2d63f198201d3be6d6387abe361a3bcace3e8f73abb7705774fbd489a1f7be185ad3d9502e5f3c5ef5c454e1ab69bfa4d6
 MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild
index cb5e5cc16994..f59a78fc872e 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ src_install() {
 	into "${destdir}"
 	for solib in ${solibs_to_install[@]}; do
 		dolib.so "opt/rocm/hsa/lib/${solib}.${soversion}"
-		dosym "${EPREFIX}${destdir}/$(get_libdir)/${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${soversion}"
-		dosym "${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${somajor}"
+		dosym "../../${destdir}/$(get_libdir)/${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${soversion}"
+		dosym "${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${somajor}"
 	done
 }
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
index c6e7178bbc10..ae183be35e81 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ src_install() {
 	into "${destdir}"
 	for solib in ${solibs_to_install[@]}; do
 		dolib.so "opt/rocm/hsa/lib/${solib}.${soversion}"
-		dosym "${EPREFIX}${destdir}/$(get_libdir)/${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${soversion}"
-		dosym "${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${somajor}"
+		dosym "../..${destdir}/$(get_libdir)/${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${soversion}"
+		dosym "${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${somajor}"
 	done
 }
diff --git a/dev-libs/http-fetcher/Manifest b/dev-libs/http-fetcher/Manifest
index b84988ec5f84..96e5d599dbd6 100644
--- a/dev-libs/http-fetcher/Manifest
+++ b/dev-libs/http-fetcher/Manifest
@@ -1,3 +1,3 @@
 DIST http_fetcher-1.1.0.tar.gz 382470 BLAKE2B 6d2c7139d3e9435ff993fd5cd097c1b85b8900e048e6f93fc5e4f61f44f1eb47e0b9cd04c90985c15391ce862356a47acb56bfd8ff16050ca562095c80cb3f12 SHA512 136eceabc317bc4bf9956272ebbdae735ff589012ed0b17210fdb70051389bb7b3c1b43cdfc322a340e5538e9fd60b7b5216d3d46c439ac9df6af29e621bb1fa
-EBUILD http-fetcher-1.1.0-r1.ebuild 640 BLAKE2B b83f426055145eb8417564cbb46d7dbb2107abfff7f9f2eeb2eb88097df1288a8acbc316cb6d4510d69d6c8ee517a7f5e122c33154bb6ef8d38f4f952df4c861 SHA512 b5ce2d9cf112e4ed13a4005fbf04655676d5f3e628c21f82d4af1d0dd59638421a04981ce3865c3be33eb7b0d10017c32b0870c1c042c9ca943427e70846cae4
+EBUILD http-fetcher-1.1.0-r1.ebuild 641 BLAKE2B ca260c0e5986ecd8c4c2f0ee595985b46194c283fe6b1d599dd4a40bb09d335fa85c894f7d72cbada67251c039ea4935547564e125dc01f931345ce5c1ab3b27 SHA512 e8ecb2c96045e0506df74bf2fc1c9e3417b7e79021a7a8bbf6b1053d6be6fc029111385194ccac81a256e9d1cd5752c09a85196fe22e2174c5aa92fb49116c5a
 MISC metadata.xml 333 BLAKE2B af3916f84f1e47250b8a4abac78cd72b5b9deb2212a94de92030c1d5b6f754501e35e267112a51c907d3b97c4484fd5b1a952610dda668aa39ad84be042b99d0 SHA512 0be8b9414e23971abba7606c7332511588a0abadd68cf6f7026bd4a5b729e7bc9c7123af103c3dffa0c6cb04517a5302cbb015c4b6f20916eec87808bb8145f8
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index cf26377ad274..f52d708c41a4 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="debug"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 1cef9141f76c..05e15b5089a1 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,4 +1,4 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 752 BLAKE2B af7fb60bf5f1f5a343c987e00424c8d6c8126be687b25acbf5f8de4b0e205041679dee2c9db2570665e5b5e5ce33fc7ac8465c20dd2ceed8aa1c85342d0412f6 SHA512 3d60e62b7868c9f206950391c4eaeb782d0c02b5953742b3257c63be9325fb5eeee95515b953853e8f55f3acc2f70f16ed0fa0cd7632433d7d824c569f2fa361
+EBUILD hyphen-2.8.8-r1.ebuild 751 BLAKE2B 99e901ddbd3aeb7ab344dd9f4cff9f172f7ce62213079f6576cdf33e6759e56f0c38d8a82bb65e891c7be05d169be5c5dd1ceeb804e39e013ded45a37c941927 SHA512 e12a7f2aeba6afac085fabf4edaadb354bc258b3dfc3db3974a7ed7ab51c7667578ebba1ff25124364eecac19523511a0e35e2c6c402d0fb9e19f36b432d5c5c
 EBUILD hyphen-2.8.8.ebuild 721 BLAKE2B 973906a5054ac995bd0a4c0604050cdd41b4397004bcd224f5b536246fcd902b685aecddd014f97f98c2adf6d131fff66797dcc2a090ab7cd2b59527c02d6612 SHA512 02691d1c40723bb7d559402008cbdf689dc0ba2247ab463e5e628c9edc4651e82c832b9054d3dc7fb428feff92d942653310250e3aeacb032cbc48a89696cc7c
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index c376d8477941..22bb0667ff6a 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 1902ab11857d..888751faec18 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,5 +1,5 @@
 AUX icu-layoutex-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-layoutex-65.1.ebuild 2576 BLAKE2B 5c61418aaa55f4c16fa4548d6ecb8ad90bf9aa82e67f93221f8ab7874f0ce4d78d437461520086abadcc9ddb32777b73fd6585ffd614227b001223a81f57fa9f SHA512 4732ca4b043cf25ea6e6b2cf8e97827d9c01bbe9d4ef271652d68cc9cdd94101ef79aa3e7f417a503b936bbdfc5d23291868a709fd7b678ca71b3f917c7c7067
+EBUILD icu-layoutex-65.1.ebuild 2577 BLAKE2B bd15daa053ad1516c10b68dd619dd6dda78d9afb18ecc19b74102cbbff156770e5c2e228891e2f169ee369b9341793df43fe52f173174886db16589bbafb2be2 SHA512 c0ed2355010cdbb941183f947a16793c278902ad7b290992ee9d9ce10ef1b8d68dd6a6412562823f45ce7a68631abfd7cd6e29f952c6e7fcff17ad3aac0603d1
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
index a517c9eed792..5459f78180f3 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index 75e0c6addec1..0211df464c25 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,3 +1,3 @@
 DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
-EBUILD icu-le-hb-1.0.3.ebuild 849 BLAKE2B 9f90b87071c83eefd930d5ab9cfe18805e83f6189c82578c9294158a7d1d6651cd5e1ddf64f542156bce471544ef9eaa8c4d9a1e6a71aa8f54bc7d27142ccf40 SHA512 4a86ca7907b5b909a897aeb7ca3216e355ae56376e19bb9586e6934f68058d4ed842aece49ecc0a14ad6546ec89360a4acc2501d5a1387726b9e6eee58597248
+EBUILD icu-le-hb-1.0.3.ebuild 850 BLAKE2B 6004d7d61e808b03cafc10abb3d1b70523c395c49108f10f6df303f8125ec43b10ef2be9437c3ee4179f6c020ec2961ca267c8d344d6f293794ca03941f5d208 SHA512 0f99262bf7f2a42f2e32f70ce41e827bd341a4d6449f657bd05d6b5183d3127db257a71d29125719d1e04709522658064985758f915abd0f95cdb3d4e598f563
 MISC metadata.xml 464 BLAKE2B 326f9087cfc3c08145ed5ef2dd2c109fcf1c81ca3a8a4394504045361243c4e9db69fee1f47d67bb7aa9a91e3d6e62cc61f45a74b611d62c389a70e1a1829058 SHA512 40aeb13c0ee32afb9b58e3412bf26806bbf724deebd6b966477412df1889cfc62c90755820381d3622a535ce83ec7bf4e051f85dea84138b84bf553ecc7b84fb
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
index f6029e446bf0..c3e2286c5005 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="icu"
 SLOT="0"
 
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # dev-libs/icu is not linked into icu-le-hb but the latter still needs
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index f5b772cc7f1a..b3080ed6ce79 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,5 +2,5 @@ AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6a
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-65.1.ebuild 3389 BLAKE2B c50e11638de130474229373c97ca1cf7bee5188f10bde06a2ac1d857ad01355f11c70fec05d19a873af644e8d3b433a72b273f3bd68b55f698045d70ee6b77c6 SHA512 1a0f39459656e8f6de59182546079be62107e58da641803b7a1217037488020267de1c89cd64d4e5605da8e304b0a505b6d4ed1a12988d02d36c34dede13cab4
+EBUILD icu-65.1.ebuild 3390 BLAKE2B f7ea8c353e38b2c3d34e753379d27f400299a8bb6bcc35171f99c700601336329831ad8ebd4e45f7656d80e902fbb60da372274048851622b91f6fa9dbc7a9b9 SHA512 05bbc33f707a9f776e69516c8fe170af7459e07f0ffcdcc54fe003f255378cfbb4db3950751570f55d20fe81b11f0677081df9ba8701b85ff7b1e0777fe236aa
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-65.1.ebuild b/dev-libs/icu/icu-65.1.ebuild
index 06bb127ba757..7a70b1dd021d 100644
--- a/dev-libs/icu/icu-65.1.ebuild
+++ b/dev-libs/icu/icu-65.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
index df54d71469dc..b45f3683c087 100644
--- a/dev-libs/ilbc-rfc3951/Manifest
+++ b/dev-libs/ilbc-rfc3951/Manifest
@@ -1,4 +1,4 @@
 AUX ilbc-rfc3951-asneeded.patch 368 BLAKE2B 63ee534e58ce3cb791711e14797942b14bb5295c8e91e90e64891d40469e18fae13729a10b308e101f24eb06fd5afa728889b866cbb5f97fdc1f56ac2a7d1edd SHA512 6450bfce84f5fe9895117ec45dde903cef308bb7e8a24171874091582a67754be380fed534e779b8158c3880319d8ddc774a4a94135b6deb83b425dc430f5954
 DIST ilbc-rfc3951-0.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
-EBUILD ilbc-rfc3951-0-r1.ebuild 754 BLAKE2B 7451087f23e9d937ac67f4ad5e4c0e828df140857eb8408c6f951b1b925ef788bbad6165f1cb4ca5edd78cd035f06f2f05ea8bdb86825ae1b1f90db8c8e3eca6 SHA512 4e1ba5fb3a8c2a7b929b9c7dd24ddecd97f7a5327c0ecadb051af43818f1147394a9b71acbe11c3cdb38d5fb5fafba27d8ec26b6059e43cb371fd1c691939906
+EBUILD ilbc-rfc3951-0-r1.ebuild 755 BLAKE2B 206b003d29fac4c679a70c8099615dde3787d28076d42dbdcc9f2262b481f598f884f98d1d9b5b85b633e4f24bde0979897a2259f5a076b83cda6d46d833b101 SHA512 0f4d9ed24e95237c5edd6e5cac103eaccbc0105530390b92d8998e039a6dd68a4134d2365840d623a12c75a8bb2bb461c99e9fbe6e84b299c8740459d11b7c44
 MISC metadata.xml 239 BLAKE2B 9d90102c70502e3f729b461b00c463f8958602cf2464e9834a5d680a802a46655051b741c47ec0eed98fb758f8a9e388a982c2db65bd644205a4f9bbd6a8d638 SHA512 c9696a97f8ba113ea6badf5fcb179b749639703ddea443d6d8170f0982214e59bd0bbe58b5e99f847c953df2d772d0bac6b2dc72f89b146ba55ea69e177a7615
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
index c93ceda1bb01..6b6e3537f8ed 100644
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz -
 # relicensed under 3-clause BSD license, bug 390797
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index cb7403371742..ef94027cd5d8 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -2,6 +2,6 @@ AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3c
 AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9
 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-r1.ebuild 1124 BLAKE2B 08600b9bf4d0c36f5964d91b66c80c28f5bbd9bcd6791ae5d16553e9917ecd141e8af342cebf9add3ab24970ee2a34717e6dbfe10da081b1a9f7c96080279c88 SHA512 d61590d1b93e6aa993a7cf84df3a0c269e2c57321bb7d725244b828961646be4b000297ef7f247e2dc6025bd369a9f02747f7636efa2baf7d2ca5bdcfbde56bd
+EBUILD iniparser-3.1-r1.ebuild 1125 BLAKE2B f5a53f0bf5a61e2093448144956c534777a256ba1c99ad24c5a01432024ae52d9cfaf05f7b04d0196048a6051f04f1c447356b6cdeca62d616d2ad4dd34fa8e2 SHA512 56e2b8e2699ac336fe7aa1d871797e8a961a36061a313453a53ef739809078797306d8c18e6ef0e4d0c56d500e383f52c5c6fc4ca2620bd736638f72f82e6b93
 EBUILD iniparser-4.1.ebuild 1738 BLAKE2B 20b78bd168542b2ad574eac3c000cefe5ed9c2948285a410980a8cdc02ee8d14a46ceee8a58ba91858a35e64d647eb5a718c232814fb3c718ef728e9dc78eec6 SHA512 714cb972ed91378756de579ab7eee404bcb4965e151c5ea4c9f6c780f3b7d759e0158451456b6c3192f23c12abcbbfbab45714592a4a416f7ab005bf3363e48a
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index a3709bc56f72..54a182183146 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 22f9b48efd53..3ad0c4dff061 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,7 +1,5 @@
-DIST intel-neo-19.38.14237.tar.gz 2480609 BLAKE2B d44b00038009d6fc549f7cb17f248f83b6848d152cbb0a0815a5537b4e6131e5087ec231d777eb425b13aee27954c4526ede4859305e5312ad34cc7ec32b0897 SHA512 5886c1565405410da27fd3f2f38e78e9d7017968ec92a2819206e53eeeace3903c3d14fae9b5a5abf582cece5fe1d54bc1db18301846c668af768fcac5854c91
-DIST intel-neo-19.46.14807.tar.gz 2582591 BLAKE2B 07f65bf191e81a863e840a85c89d7632edfde814da0a00beaac0124293bf44a4d7bc45abdb0d8444dafcdaba24f83194d37df55297e0d0b32c91f622498e75c4 SHA512 fdf37bd51ffbf286d00ec395ba7f6bd53e0555610ed88ef201f2baaf1a03fb73137d0cd502119aba4cb6e146d2cd03c08bd20e004e6be3381104af9e24381820
 DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda9753de260bfc819ee24846bc100021f103d2dcc432a9a8a60d310737470c7a4afece4fef557f72da40470ea950f8198bda0e SHA512 24a5f5306b90c763e803c34d3f20227ae0f22e6ff4192a0550e9e3050173b50f2b2e391250f1733676eca45002a061e2c753e7546db7dd21af7c1ed0857f329f
-EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
-EBUILD intel-neo-19.46.14807.ebuild 1267 BLAKE2B 5c39258b76a32e3ac770caf113fd457039cd255eac71494b3ca33076ab85232715f22ced75f20d08cc77bf6ac300e6d386dfe8065bb8248816f54d57227bfa86 SHA512 01ad25ca97b3a75495a73f6d46d0242aa8f805a17666fc0b444543e752da15c1b095b5dfdf5dd4c31383d0dbf6a93973d5fd4f4a45e6dd93ca9364efb690fd32
+DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
 EBUILD intel-neo-19.48.14977.ebuild 1267 BLAKE2B ba1c0f82596ae418fdf8c38a61039fed601b28f81430b16b610eb2c3f45d8e6a0d2bed49fcffd7b87444b71d0d57e6b710b78d807d63600e165ec740d1386bfa SHA512 ba43a79823c69965de75dddac8e886399e60bcf5fcf282e032ebffff277702b918a8796d781abc3c5ff82c491b098a910074495b23bbed527493b4c727f198a4
+EBUILD intel-neo-20.03.15346.ebuild 1247 BLAKE2B 90cb6ad2d7f1086a0f35fdd64199a467183945f8e7101b77c66102ce547bf5ac2d10fdca2755e3917df7dbb8d7111bc41717c7fe1603c48f55e9679636f64e1c SHA512 1c4f838410125a06f929ed4f0c0b9d23b59f5b85e4318723cc28db89862b5e1af2dd0c316676b50e83f4528764fde17124f19232b381df9d2a29a659c90097b2
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
deleted file mode 100644
index 0209ef1590c5..000000000000
--- a/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_PN="compute-runtime"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="vaapi"
-
-BDEPEND="virtual/pkgconfig"
-COMMON="dev-libs/ocl-icd
-	>=dev-util/intel-graphics-compiler-1.0.2878
-	>=media-libs/gmmlib-19.3.4
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		>=x11-libs/libva-2.0.0
-	)"
-DEPEND="${COMMON}
-	media-libs/mesa"	# for Khronos OpenGL headers
-RDEPEND="${COMMON}"
-
-DOCS=(
-	README.md
-	documentation/FAQ.md
-	documentation/LIMITATIONS.md
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
-		# If enabled, tests are automatically run during the compile phase
-		# - and we cannot run them because they require permissions to access
-		# the hardware.
-		-DSKIP_UNIT_TESTS=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild b/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild
index 843898c5f91f..4f3766cd2d6f 100644
--- a/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.03.15346.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="compute-runtime"
 MY_P="${MY_PN}-${PV}"
@@ -19,11 +19,11 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	>=dev-util/intel-graphics-compiler-1.0.11
-	>=media-libs/gmmlib-19.2.4
+	>=dev-util/intel-graphics-compiler-1.0.3151
+	>=media-libs/gmmlib-19.4.1
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
-		>=x11-libs/libva-2.0.0
+		x11-libs/libva
 	)"
 DEPEND="${COMMON}
 	media-libs/mesa"	# for Khronos OpenGL headers
@@ -46,7 +46,7 @@ src_configure() {
 		# the hardware.
 		-DSKIP_UNIT_TESTS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 50099b414ae7..7425bebc39fd 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -5,8 +5,8 @@ DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de63077
 DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
 DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
 DIST isl-0.22.tar.xz 1676992 BLAKE2B 1cb2125761adec02d9f337e8730faa5bc3a4e63cb7d968f7f4de3a3360b1f9be6caf6a27031f02df1ebe149fb70b6a32bdddbe8ae03032b8ff366f4eac274483 SHA512 7c3c9502ea07e4d47a823841837c3aa0b9d7ba0fe58deaf180734e44c18e53735ec783645da0bdc56b617c9e639b226cc03b40a947f852e1e787166a64f59424
-EBUILD isl-0.12.2.ebuild 1026 BLAKE2B 8757a140cee7104d9907c54bd72836aef56ad58c3b2972f9b130831ca0b2eda1eeee45a896eca8b28b08a22cfc2d11d053ee73d677127fea4450bbde7e6a5390 SHA512 9e40b23cef96116fd7709e8b4e0fe74cf7f54b410bb8676ba95a7d8c87d76e4be5339a68cf7ac036ef3dcbd88a1c711649b0497c015003f78c43fcd9d1e808d8
-EBUILD isl-0.21.ebuild 1237 BLAKE2B 579f3ed0505f6f65bea2de1f430bbd176483601ed209123b1c2f2ea42bc12757fae3f87100b9cc8ad6ffaa52b6bc1e6b3c2e9b2cfc676409c12f95e16238f79b SHA512 875116ea7e07024e08908610c2dcb0bdc8e74c8d55b213c2bd92e897741f72d216e64e5ba0ec5d1dacc6cdb44a47d9594716f9b90f12d6c4677267ae8698a6c4
+EBUILD isl-0.12.2.ebuild 1027 BLAKE2B e50c40e53e71ebb606349e5ff0de7d8e51fda59e7225143d31eaaebcdea2a842d66a678f969078759b8f6302be84601266c3ad8edba2803ecc4452105be242c4 SHA512 80c45fd2b5b5b08011212ac95b5aa1dcea49388d8bae9592afa92ded4235539ec7c02a9ba7dfd2f7e04ea1a65c0b52cde17365475e72179adbb2edd329f793bb
+EBUILD isl-0.21.ebuild 1238 BLAKE2B 95e5a14058f98e979ae19ff007e4ec622ff788d09dee708955c2fa1ed0d2351aeb861d768e8c0f888a9f198cb6687649a69be90ed322ff2ffd1bdd6e9eb1e378 SHA512 5e0b2c226b215fae0eb2b0e54266e0dbca2ea0ddd2e0369aab33b56de289b07c708f45d092558b8adf1859d8f43bf636cfb36a62614dd09080fd41ff676a5f5a
 EBUILD isl-0.22-r1.ebuild 1391 BLAKE2B b2397fc0584d2e7a45e106ccb2781243ac678c68450c3e0c79681189da90ba911392f41c52128f1f9b2330374e6b80549144c65c1403b8102f6667417bd7d526 SHA512 f6c99d205e9c07b11e3dcaecff783eb017baa4679fece494975dd5c6005280d3bb9bb75e8e3383b838c012013e3c756faf5a54241d05377b0bef6395363f9f5c
 EBUILD isl-0.22.1.ebuild 1344 BLAKE2B 174e3ba5cff4fb6c5f59ecd62c31c6c7d6364229172714e8953a55e23c5623e4d522031a22db4f6215031a2b689b265c6c5794ea70f656b5a740d3cffc371d47 SHA512 4ec56732bae1c57ec8b61764ec80af109e288d431f4ec2350ef846db0fa604f824442b69fc31878aa83c45f72dd2cf9ddc641a28c69b7bdb93f356b707e42d3b
 EBUILD isl-0.22.ebuild 1344 BLAKE2B d2cada2dcaa6f46c38ecb0d199d71e0c5456736a17d9acd757aa8fe8c7d9297cfaf0a187d67b2bb0d508ef503020bf164d2b60563dae57a550fb03833d895532 SHA512 16f6e4f0219eeed1108814c6921a4bee91ced76782ecb9dae34423c23b82c3a68246e5955bee6714bb47d8a8b559d940366d427b28da452ebe2f461a09cd2d4f
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index 17e0f4be3378..a9abce8d9b43 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index b801a3c5fc5e..062f8ad1d96a 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/21"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 542ddd31de26..9e580e4a0b8f 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -3,6 +3,6 @@ DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 709 BLAKE2B c101007f21a5ff3c1bbfe36c2382122a571f723e714f50eeb2ef43991c7d2fe622938711d5a80e5eb3a97a0d28297f25aee6e2216bbb867793bf3d9a822f5478 SHA512 a96143d639e6c8165e6e6ecde0cc5c650bdde5ae77f7b05140e02babeddb88b8e4148d9755d53d8983ae94f116a4abf71a291dcde37bf89a579637487ffda9dc
-EBUILD ivykis-0.42.4.ebuild 632 BLAKE2B 415b5532803c9654683af1b81c5b51faf43c1f294d9c45c4a783f08fd2a77d3cbcdafd09631d231b110f4cce8fbc43f2fbe0e4a2593ec6ea69061f4003352678 SHA512 99a30826deb913a49b2e905ecc1e3da2fc1d8dd0b1b18d936047779ab32fbd846b576cd1e7524d1841c86ef6e45bb63e852b0479d8989e18a9208b22a2957b67
+EBUILD ivykis-0.42.3-r1.ebuild 710 BLAKE2B 9c68d5c77daa8db58e9898665b6c3893b1222204d4304a9e267481a06167a46201d1af490eac540fafaba6a7bdaf0224e4f0fa67fbfc43ab53f2c2786ed7861a SHA512 e7daf0a406edda8b9a542cef6a642e2a13db1ba07bf6a515f10744c6317122de7fd179bcaed680978b95cd5a8153915ea006b392fdd905babe5a8f54686cb920
+EBUILD ivykis-0.42.4.ebuild 633 BLAKE2B 17636813905381459b51c95005d56cd19515467e3f23e42de616fbc00d6f067e2e4373db098429c625f82bb6573021644d87f708611f72e404f95575907cd62b SHA512 273bb2556b10073bf655cc0de295e4e485484e6df00d1ca07ed6806e18bf11213ac377b4fccbe5f9111411e92353ad065fb41e628e0d24197d874a3f259e3125
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index c08ded2a2c9b..d377b910927c 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
index 4fa4e85becbb..01f2c427affe 100644
--- a/dev-libs/ivykis/ivykis-0.42.4.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 3a9b3ef6e54f..0776ee9cbb9f 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,7 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
-EBUILD jansson-2.10.ebuild 845 BLAKE2B 2d08b25443056af0503b2e5811079554e4ecc81ef067f636ac0ce1331c3fb502d42587cca60f94f75120e457ab1eedf03a9aafef9f0cd31cd927b7248be4c5ac SHA512 0c59679f112edf9349b313d80deac91d62c4867cb71725cecaaa78002e90a515309c35e0a34da7eb9ff948ec4dd4ddb9106794ed5736353438d1718d4df98079
-EBUILD jansson-2.11.ebuild 819 BLAKE2B 81aa1fb51bb648a1881f38abe5cd991e7beaa0eb06b7680d5401c425fc62107aab6b769ebef708093043a94953d8c0b6b2c3d1db22506bad42169d493b738a30 SHA512 47924bf2c7d0972e948b0ee4bf027465a8c45f1eadbd21acbeb509a997026563db9e7a8c517569d04727d199840ae0e2b038231eefa81ef6447734fb3c072378
+EBUILD jansson-2.10.ebuild 846 BLAKE2B ef1c9324086eee39893d2bec95d4b5e946d2b78397ba567f33558fb11cc63f526b0eb3aff72ac8062c415d9a8ca6a77350fb2c2b989ce37800ee50378add4757 SHA512 9e6da1c39928937757fed0079d728fd92fd4da735a2b85151928eaece22d2a66f5858a69e9fd562f111a7e7e07140bbf8e975b52009835d659a69eaf313f1291
+EBUILD jansson-2.11.ebuild 820 BLAKE2B 8edec5591f68f994ee998282c81b4da46c20bb7a824156443371057f020e60ea1b4ec845e307c5193cb6a5c000abfd211ac0220f878df6772dfce8af85de2df6 SHA512 b128c80518c6fca5d5021de6c9ceca3c109c55f1c4a8348e0c09583e2474e41034e90ad3a8dde5a6380c2f845783674c84dc1545cba3237f3bbddddc354043f4
 EBUILD jansson-2.12.ebuild 831 BLAKE2B 72b0441c823baaf65266bbf5b10f5ad936e545f417b0fe774f3eb4db4f819bda32054fd864ccd9ed5ff68d79a61397b2f567421f49d097459a09c3fdfd9a3819 SHA512 0e1bcbb87ff216fc1d119df415ce969d638f2878011c4638be56dbdc68505ec3fece228201eb44e589c896de26fd5cdf7f9c6a408e243022418efd72170db5a5
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
index 1df25c39588f..e43f030faa66 100644
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ b/dev-libs/jansson/jansson-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 5a338cd89b8d..94b23c318c88 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 27dca1fe3715..3e41c781b213 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -12,11 +12,11 @@ DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff
 DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
 DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-EBUILD jemalloc-3.6.0.ebuild 1903 BLAKE2B 16c2fb0e1ade011c05cd06fc4d5b2e07cad582d563509690950980b05927f98c2d6ce6d0702db83bfcb7b18543f2846ffc3de1807b57189fb191d6e140071ae4 SHA512 2e48b580adbf9d05b1b0abc21af41e7f9ac830856dd5e5dea3ad2353432cc797c78861698537e99dd8b89f60a3b1ecc86cb0501ce81d1f974dcc7f0017899732
+EBUILD jemalloc-3.6.0.ebuild 1904 BLAKE2B 7bbe8adf004baed0c3bd9f193367d5082e703128e5f7a50b153d5ba26319acd8bbb2ec82b3dc7b25c6a7154249ffc26b5bfa16c03572ab0a7b8b34c499a7f5aa SHA512 dc7109e6ffd8f2c3a562bee481580ea91fc13f76564d33b7e2d007eb466f80e5cdb011fb5946013836897234426bbd4c1cf9a44d9ea7c3f6113f855bff62fd72
 EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B e39f6707e796afe8ea28e055d994f17e5f683e1bf1ab4ac67d492740cca2490553bf88685e8458dfaeb197a5b98ee6b58f242afee337d9cf73e9435c84f8931e SHA512 5d3a5d490de405548f193e29178cb41c876e093fb56af071bef0a8fd330c740b826127ea314e844583652380d02364729e3f8a0ab6ed76a97058ee93103e2712
 EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3753d6f40fad5d82509baf76446de952b418c5fed71160a29331398167ceb7c199a872e553555ad6611506e5a4a SHA512 2fbf17ce207095a1948d0180b0769294fb90e5500297152629dc8c666fae1f8c6d182d1d823a2efeaf8b36cd9f9016cc036c9ed3f4be52bc371ab858f9dbcd2e
 EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
 EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
 EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
-EBUILD jemalloc-5.2.1.ebuild 1835 BLAKE2B 8978581f2b47af679036d47c1b22ba9a45ebaec5cbd060f6c6817b04e8c1ceb372d9a59877c38e9df4fad9f0464fba42e51711f9e85f08dab4937230cd53c323 SHA512 dcf8cb71795d6c8a092d966b086844772f76020701afe635b66fcec192f9a245658b5c82a2928753f2c1a0e5e1d6942b5f5fc6c35179370c41eebf1950f586b7
+EBUILD jemalloc-5.2.1.ebuild 1836 BLAKE2B d4ec9206bbbfa04a20c9029baa9cc0db8be5ebdeb56712edd1c41cfd8ed67013b8ceed95060a64b4175d17bef5327a868d7a999b5e12b786323707aa53726c8e SHA512 f05a94f2d368696f696aa0caba151ad5f740c99c25789c77ab3b67bd2844ff189734a3ec492a8663d11a4f49dc0f945c5f7f7993a2a778279935005bef13fe06
 MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
diff --git a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
index aed756dbaa7f..e6193d2e18cf 100644
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="debug static-libs stats"
 
 HTML_DOCS=( doc/jemalloc.html )
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index 9ccad1da4d11..4875cd6a14e6 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -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 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 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/json-c/Manifest b/dev-libs/json-c/Manifest
index cdbe69359871..81e3edb78e0c 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,5 +1,5 @@
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
-EBUILD json-c-0.12.ebuild 918 BLAKE2B 940167a1fcdaa04b450a69337519267b4b632d7233a8f91b05090e3c687382470d6985dcf1b708c3b033096c5243909472ceffa1b97e0695e0ebc03f947d3539 SHA512 fab4cd6af0484b5c6ef117c81c158476e884da62a90db8a9e9c3ba6d6a9598b6c503c2460d7aa971494fa2c4460903e9b07afa8905c04eb7197c75899d4c737f
-EBUILD json-c-0.13.1-r1.ebuild 974 BLAKE2B 6380d485185e1e36eef26ad9338f7a162ece8830795a56532c404990531b422ce31c956d5ed753477861ff046fe7a1168de8a40f8f392f9c81893fd8e6ae836e SHA512 deea7213113780bf598108b6b31e93dd28ad93070f848e9570b5bdd05a7a979f8dc583c725a19875f7210a8a86b6b8ebfb343154c5e8b7c44d286019a54f8b48
+EBUILD json-c-0.12.ebuild 919 BLAKE2B b80f406791073cbc81e63121f041c98affeb6054d3a416c98c1adf72c9f4c99353cefa072e1a1d79ca67c083173c0fcf4e501df168e6f545a58c160e862eec29 SHA512 e5c12facfd22e711538c128b4d0d630f14d100ec7198daf196a7ed0ab646f57390eb8d3d6488bd2728e6c56e09ce9097ae105b9d92143174c8877dde260ce25d
+EBUILD json-c-0.13.1-r1.ebuild 975 BLAKE2B c62eb96331fabf138b2858357b8db3ac783b5e6204d0640c4ad298e1f8305d0793323aa8f09847340f20a850fb48e49023bb10191b077de6d32c6896137ec4ad SHA512 7d0ae8661502c9f5458dd2c40b5d84e4d55159154db72abdd450c10692c6e9bfa98bf3ef5c59addff5ac76864ebc93c6003cf78d1b9527710c02905b117dca2a
 MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index 4b319bc85f61..9022adce8ecf 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index 779611d8dcd6..a26010a32a5d 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 6e5432e7ed6a..d0abac3cd22e 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,3 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
-EBUILD json-glib-1.4.4.ebuild 1531 BLAKE2B 91eb7d4bc20f397f6ed1aa048a11a68ef2f46aff1171ec67a80d3c47f7221aa7948e74498f42b0e95c42c0d0ef5dd4f8e6f7e773cec04d509ae869d5083f5139 SHA512 b3faea3b348d71c380d6881a3fc4c557c9fec75f6a42998e5616ffd34c9d29125a2ebd391f4e2fdf50bd3034fea2c4ae2e67485e4507d0f682ce1435353efc98
+EBUILD json-glib-1.4.4.ebuild 1532 BLAKE2B 354830703616535410a73f6fcea45b364b9a1ca4497cef789ca6edef58c2bc343356aa5a30cc1278bcc1a13bcaaa50d7b03eebeb088a63e1ccbf0276d8706ea2 SHA512 d4e2518f04eec24c5202fae5596c0a059c70d19a9dda23ad8887ff32c827a1ff864f38e454492553becc175b5f75925ca6c76b8130834f095c0e76f808fecf50
 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
index 0436811411dd..22e3aa3fd685 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.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 b8dbe4b76d08..06f2233fcb23 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,6 +1,6 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
-EBUILD jsoncpp-1.9.1.ebuild 1366 BLAKE2B 61aab4ecaf27074ef443ea80b3f49d1c5a7efb5cc8c72534744b83599e0721db7b7b6a836e0241478ea6feb9731799c099e3e39b3b6d5422390dad99a52fd094 SHA512 389464ed9b6b1ae0713673c7937478da5d0dfc896efdbc75df6cbea4a5c5c7c7ff4281adcc8a6f978e4ccf41b9e24dbe75f79b26ad62426eef987323124e3007
-EBUILD jsoncpp-1.9.2-r1.ebuild 1381 BLAKE2B aacedd97f6918bef77c914ff38fc3a45a62761bdca43f6a6951a77517833dc12cf0b9b1759d0cdbe94f24693fc9610601391a3bcfaaef7e6433e6eb387c988ad SHA512 0e47664c65a7dd9a5e5c9c20272cd7d03a977995767294445fb236eb1d36b93a17a16a890cba24ac92198f8641a5f2de04a8c0ac6af1c3134725b85c52ad03d7
+EBUILD jsoncpp-1.9.1.ebuild 1367 BLAKE2B d99f9444620096bd27c6618010c2e2953e362927e447286443a354bca85aeaf68de4223b1cb65be2fe11ba72638f61c7e8271a7f16ecfbcb4ecc9aa2caf9ab56 SHA512 c9ab1d7b1c2029b3f9fbca574f4c7b35bab866877745166fd2502ad6581b184535ff0348aa595d64d4dbdcf03481ca3228e6a1a1b49d3fa7c442a8f9af82cb77
+EBUILD jsoncpp-1.9.2-r1.ebuild 1382 BLAKE2B 6023bb2bc76bede8e7e0e4adef0dbfd349019acdac5981f04ffd1cfebd1e00a396696282ca83734a2b799cefa4a01890c6ebfb9730c3bdc4be3dd54ed866a740 SHA512 c2507dbe67f923f0201d4ebf291c0161d22e5b830b028000027e3bcdf92c949ee8577e0ec783a6d50b6220857efb62018a2d10942b0dbeda031c069619ea16a9
 EBUILD jsoncpp-1.9.2-r2.ebuild 1001 BLAKE2B 6107c074591edc1800dea6e6dfc0d8374e665bbc6e04d9d5c24e85be3934ee45834c3adf5920447d25ee5036ee918c8e5e028eee1e18cba7f64d88831c206ad0 SHA512 96b69f89c2d7c56cad2174029c97de0eef42ef4e48f2032367596c1e3735b928b4e876d7f161a26f3f6bce1564d96ae93895d045e827ebcc2ca97017db49ce1d
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
index d2336272a5cf..0947339b458d 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/21"
-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 test"
 
 DEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index b4b44e740b14..e9a33fb38a9f 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/22"
-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 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index e95692b936f4..185c92077034 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,5 +1,5 @@
 AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
-EBUILD judy-1.0.5-r2.ebuild 860 BLAKE2B da401733b73752c5774bbbe37f82827bea8919e442991e3135ddd5977bad5a35bd8bd3bb7f4cc7308139cad2ef0284d7ba5ccfe1bee5f68182595d1b920c197a SHA512 7d7abd1afd0312f985d6678bda708f1e4e0871df4cef5abba66fc11ba514ab387b0c17ab7b60b4ea658ba5d6df11bf35b229b4ebfa90850550ea2014a7e6b9b4
+EBUILD judy-1.0.5-r2.ebuild 861 BLAKE2B 9bbc7a4b7f749b90da473ff1d7321a40357b5b7d98c90bac088d6ec679207542a84beefa8c06155220ea0395e7d8275a9a7d2b77311ef34373c6349d6ce61c27 SHA512 cf28b78aabc3ab902dc038309bb5dc8dbdac80db32d154cfd1650ca91e47c68decb684d3a69e342d5c55700be9f5f3ec06164a1115aa7b5715e64b11536e4adf
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index e811fb653b65..3d608142f82c 100644
--- a/dev-libs/judy/judy-1.0.5-r2.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 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="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 42a710b487c7..5249dac999bc 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 1252 BLAKE2B 2b00169d7a4c792c6e84e00a6ce043598eabd6014effc7291c454d3f126bcd8efe9560b40b7fa2a57d1872fb87c4c4da3080e2b5a9c4da71c0b27a1964783991 SHA512 a536a4468322f5bd887b2dc03149868e5facd057d618e1770c40d08672dc47a0836c38d71057db89485b93a42c2b069925db6d08a5d63b4715fd03e7750f8d2d
+EBUILD keybinder-0.3.1-r201.ebuild 908 BLAKE2B 9b4f9ecae38e9ba46dea4df59528377a7b07888a035a200f6c22e3ed7586b54773553c3e2a944a58fa044e17918ec933610eb261d267411b4b14a9ad31ce4afc SHA512 cee265807061a943c6889d7b4af61c0f70721265cdac3f9e0a7af6d051c2eec29d2374eee8ccabfd9ce625f48cd6edfd76003359b9a559fced2f2d5534b4811f
 EBUILD keybinder-0.3.2-r300.ebuild 1066 BLAKE2B 472227c6ceff7f18baa4297e8a8c064ea1f2847f11a1d0a3d373ffd63d0ec0b889ab484afcff67c01c6e0e40a1fa133079e32517a498e003b1f02780e2f3349a SHA512 dc1e86e5938a070eda13798e736846f2dfa792725ea5dcf75a86a8efb897a8d39e37a5bbef075abfdb53095e9a36410965e584bf42655c00cd942632bed64d56
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 711dd04ba10d..02e68ac665c5 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
 DESCRIPTION="A library for registering global keyboard shortcuts"
 HOMEPAGE="https://github.com/kupferlauncher/keybinder"
 SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${P}.tar.gz"
@@ -13,32 +10,21 @@ SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
-IUSE="+introspection lua python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+introspection lua"
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
 	introspection? ( dev-libs/gobject-introspection )
-	lua? ( >=dev-lang/lua-5.1 )
-	python? ( ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.15.3:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
+	lua? ( >=dev-lang/lua-5.1 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_configure() {
 	local myconf=(
 		$(use_enable introspection)
-		$(use_enable python)
+		--disable-python
 	)
 	# upstream failed at AC_ARG_ENABLE
 	use lua || myconf+=( --disable-lua )
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 794c339988bc..5669b6193ad7 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -3,5 +3,5 @@ DIST kpathsea-texmf.d-9.tar.xz 12120 BLAKE2B 80069cdb1c8e1edf8ae0b5af2de825afdf2
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-kpathsea-2019.tar.xz 31480 BLAKE2B 897ceb8cb536f2d4a54ead2529da891eba83e4480b9ca527ab99337ed030f680bc25a12d4286e101965d146567720e3bb5fb8ff18a240365be9eeb7471c970bc SHA512 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d
 DIST texlive-module-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
-EBUILD kpathsea-6.3.1_p20190410.ebuild 3156 BLAKE2B 5d356dbed7837d7dcf736d4e8099e07e8d91b74fedeb5af91fd4d816a8e2f093c8cf9be3b4d80e65ed660bae86832dbdad79ebff2f243c3106e4c9c909d10492 SHA512 187247143eaa3a240b3fa4f57e3fe5369f4d3e6ea9ac823d3f7ca5d440f64c08aa71a00ee41505ef7476004a5d34f636636293633f99382b3ee7ed57a1245253
+EBUILD kpathsea-6.3.1_p20190410.ebuild 3157 BLAKE2B 703e8d789b6b043f3f44ec90a244d8618f003cdccd6b0809be39a9745193fa28371a43d03ef1e4664f42c00bd63a91c1824b8b861fd596479e5cfc5e02b66e2d SHA512 ddff49134b704b656b452d7f1c99aa0404b517e037e4b474020865aefc5c1b5185d14cada2516c57a537760cf1f2c91726dc2cba8a039e6b63c1abc158ea371e
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
index 981df0c9a7d3..e866eadd54b0 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
new file mode 100644
index 000000000000..18d88b35f17b
--- /dev/null
+++ b/dev-libs/kuserfeedback/Manifest
@@ -0,0 +1,3 @@
+DIST kuserfeedback-0.9.90.tar.xz 182600 BLAKE2B 8f2d5face65e002ac805013fc897f55099bdbf19e7a4a5f6b26e1c728a2181ae3d11fcdad05417d3c5d3c81ab46958ae8ab237cd849df44f407ff823a066e94d SHA512 a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae
+EBUILD kuserfeedback-0.9.90.ebuild 1259 BLAKE2B e81fbad7a6cba8390efcdd42f389296002bb94c908c30ecff0730adca24a6aec6241c705f09dddd6d0b8cc6ad163d226726eff4bb974bbc026745836c24698f4 SHA512 0ac178c605fc106f6eafb66214b0ef810671bfba603f7894a43c13883c12950e7995617e8c0ab8a8abfb5289f4ac5a51d7a2a566283edd934211d1f84aa4c0ca
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild b/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild
new file mode 100644
index 000000000000..32461ef3c280
--- /dev/null
+++ b/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="MIT"
+SLOT="5"
+IUSE="doc"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		>=dev-qt/qdoc-${QTMIN}:5
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+"
+DEPEND="
+	>=dev-qt/qtcharts-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# disable server application
+		-DENABLE_PHP=NO
+		-DENABLE_PHP_UNIT=NO
+		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+		-DENABLE_DOCS=$(usex doc)
+	)
+
+	ecm_src_configure
+}
diff --git a/dev-libs/kuserfeedback/metadata.xml b/dev-libs/kuserfeedback/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/dev-libs/kuserfeedback/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index 9ec6edb4ba70..33524e573d93 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,3 +1,3 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r2.ebuild 805 BLAKE2B 252c49d63c4a34cbb6fcd8221da8d91e5b77e65ef6efb7896a7a7a059beb44482c42dad531c9510f390239508f3b3c9b97bfe0a603bca97bd7c27bd6716a98d6 SHA512 1e5975945d0cb787045d44be7673cb9b1ae9d7f2fb715ddc275c6179587e938f30e34eda7ff1f880c863c98de8deedff799be0b9cfa105c0c1476aba6abf273a
+EBUILD libIDL-0.8.14-r2.ebuild 806 BLAKE2B e77ecdb2eff2d4c8f0200465d01dc331de54b71cc6d30fa1fa95843124e6515f3834c08a60e329d3460b9cecf2abb742a4df55e728f75affc70e94985377aa6b SHA512 8efee266f3c11cb521dab3bc3f6f536a80b6c9cd98ab33a5a54557d96af018cc245f2478f8815e912361e1271f3ee5c8dd16212edf6e4cfbe74204c046622c2e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
index 20507c13df82..22b29ea4a446 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index a316ecf91f18..f3539dd7adcd 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -9,7 +9,7 @@ AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B 78700ebeae320187388ac19d3d02edce00bf405f3807512f30f72d82324136e1a713e871d059a034530f4a4f3c906d43fbee0338c86231b28d636305b5a243eb SHA512 b13a51ba8d4e6e825c9183e9cd150fbf5b4ca86e52a132082a8d38a22e41cd009b71752c0a51b225598038f55c092390ddea68cf3589edb3421901daec553f30
+EBUILD libaio-0.3.110.ebuild 2251 BLAKE2B 670e566d9fe320e23302d267c9cd4a3d04d3a77331d4d8e78e5c4c15a790810fc8a6617bda2c1f3c25a6138c5c20021e917173249fda1d4acfe858ff91c6fcbf SHA512 defc39e29de8c53644842c90769ccc514fe6b947418ad78e92989c4459afe4abeb41bb4b33074b4d383d2e872b63756b0107db387288840e4fd740840fbc1ecf
 EBUILD libaio-0.3.111.ebuild 2236 BLAKE2B a7f1cb6e36a0478292b32b87f59c62b48c5d97f68a94723694a49639b9498b1f36a344d7a50a6d60194b1c15da8fbc09172b1b218adfd20bc0f10b43f0c6fad6 SHA512 9aaacb90032f48c1765863ac082afaf99525710a9a9cf93439ad216eebc061285e811f26f7071dc21e846b62ae1ee510f7ed06296215cca1bca0ebd7ee4b7696
 EBUILD libaio-0.3.112.ebuild 2137 BLAKE2B c9074524529cf0ffb4698dd019316c252bc4dca581d2a271d876e87edf9c8434e2ad054d5dd73b8d2009ff6f3268e93014b85e3a97202288208dac1fec7353bc SHA512 bf1ec5f7b90dd47b7b25d5a955a1ba8c830e238c97efdc72f3fea47642b9eed684351daa1466882314733d270f7bec7780972d0a1e3285da48193583e4e220e7
 EBUILD libaio-9999.ebuild 2137 BLAKE2B c9074524529cf0ffb4698dd019316c252bc4dca581d2a271d876e87edf9c8434e2ad054d5dd73b8d2009ff6f3268e93014b85e3a97202288208dac1fec7353bc SHA512 bf1ec5f7b90dd47b7b25d5a955a1ba8c830e238c97efdc72f3fea47642b9eed684351daa1466882314733d270f7bec7780972d0a1e3285da48193583e4e220e7
diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
index 3a9ff51ba4f3..f52acc1cefc5 100644
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ b/dev-libs/libaio/libaio-0.3.110.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 986bd7e60591..cf317bbe873b 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,6 @@
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 EBUILD libassuan-2.5.1-r1.ebuild 1262 BLAKE2B 8ceca5ef46b365a25a7b0ecff27e60e9cc6de886d36cad990f9dd2d381f556e6d199d22c8a20d7a4262c2e0917eaaabda1227ccf7fb22654f9452a23adfa181e SHA512 76c40c82283a3eb0da2d8b445b2e8c702552df6618f54e9d656a596baa8785683a5fd721518738a71362eaccdbf3dcd4fac01708698f2ae70280bd5b2842f5c7
-EBUILD libassuan-2.5.1.ebuild 1065 BLAKE2B 15ddd091eb5c4a64f47391ccdf42fc4b07a53e0e11d0ba5874ae0feb3f9b51dd1859e89accf43a198a5e6d3d31c26fe228a098dc240e76f504d7efbf2f105743 SHA512 2e538553eb20f7fc20b8666f7083d647db095df0662ea210392c97dafdab3907df607c59f4589713d4302007cc1592dcce94a73d3090deebcc272f6eabee54ed
-EBUILD libassuan-2.5.3.ebuild 1260 BLAKE2B b9c33c99830ce6b394f4e6e0ba5e9f3a6a4fa79be69afe2df021e7157a6770b3c96cbeeb71380aa7e79f0e75fc728c1689e9159f1c6ef00b9466d60afa2a46a0 SHA512 85b4d86ff63ea5ffa3251a85f15cdeafcd36382687011e028c69f20715aee61c3910181afa4e630c8ff6e1820518fc677fffb520b73a5abbad24c8e00bfae6a3
+EBUILD libassuan-2.5.1.ebuild 1066 BLAKE2B b435e55fc656c3586fceb6bcb590f232088d0abaa9888b14abe0f1b5f4fb56379b98f4bed38e0a9068ac898707bf056f07440fd1bb29d0415e0500e37bfb0190 SHA512 f6849c132f24f9d79d679d951d72263da8890482a23ebc2be26bf46ec3cd943afef47544cde80f4b388fe549cea07050bffe67bb80849b990e6507ad2be45157
+EBUILD libassuan-2.5.3.ebuild 1261 BLAKE2B 82b6ae35b057b48d45f3c47420d47214792d5366cdfdbe30e730ea3325ba0f508a48aacbb4ea9f7bbe3ff16f861f35b04fb58ecdb992d705317c48a8095eb55c SHA512 8f96d13488db03220960aa56c7d0def5332e3a1a3faa104000afd38a397f00e641eae0dc63558bbd10f03d0827ba1f0a6976ad316e7b27099d90924b842e51cc
 MISC metadata.xml 977 BLAKE2B 25e7724178eab058abfa95fff731f32d04a025cc0882718eb5d02c40dcc7f0ef81185167ed0fa72fe050e9637fbcc456208eff1783f719cc2d153854a472781a SHA512 bbcc73e33204de48ae1001d34e4f07b8df9e1828e515da748bbc7d09e68763b7567cdb939a9298d9939e8b2693570fc898a931d080947fa8cfa2517c2610bc74
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index 0fc8f725b42f..25c6c80b2103 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index aca104db0f04..1b0d8da1bfca 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index f8d1420f1932..bc0077d78e26 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,4 @@
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19_p5.ebuild 1045 BLAKE2B a843c53b45e268f58870ab720e59dd4f28324920627b155f61a5f2ec0be79ad2fe2898d6f7201af341c47fc4481fca1144fd380529aad0bdbe1eab9626aa2109 SHA512 cd7264d5dfb49008a9a87e85da1d55bee444a3abffafd15e7c6de1c517abb976f951309dbae359e0ad12b371e7948f3e4582288052727395f0045b6d0f7c1c7c
+EBUILD libatasmart-0.19_p5.ebuild 1046 BLAKE2B 4d7d51d775c6e0ae1d0199331a666e4b3f89f667c35a564d7a49440730aa3e6dcceb3e2975477c4a9227198f1dc047d7c9d90a4a74102f279ef58403c061303c SHA512 22593cc22074f6d5659297b74781ec8deebd1fc419ff3a529d8fa40f6f0ff7d2d4b81ca9486fc9c9aeef535dd679b474fcb452b8c1f01bc8e73de1f8850cfafa
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index a9e0d81fb64b..2bb093583a82 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 9ad3418d8880..88b86f57eba5 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,7 +1,7 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
-EBUILD libatomic_ops-7.6.10.ebuild 779 BLAKE2B 78853a828f3c0d25db918cd76226cfa1bd99c5d33113688fe4dda54b623351db854fa410fb842a5d3fed320450aabe2b59bbbcaef13d7b99d9e9bbf0b9cdf7ba SHA512 18e590b0d6b40b63b34c476cbbac2db26ad8c480cb1b0e1b89e3366d7fb1a0133042b3b33ce1fa50f28faebe8effd097a2c2f0f0604d461b767eac960a92b3c4
-EBUILD libatomic_ops-7.6.6.ebuild 709 BLAKE2B ec85b6dc9c77577877a877bd07116dd47719e1bbb5560c26845e8f993b150bb2053ec73dc3387537030a12dccfcf617c011f27704d9399be748d69d8281de9f8 SHA512 2affa96b868a510997a87a04e38ab4f4e6e5433ba3a0ded3d957db5b693d1a205e47f070ff8842e5377bbe7e73d3172ebe9c987a057cfed6487286fa65a92c38
+EBUILD libatomic_ops-7.6.10.ebuild 780 BLAKE2B 216822458a28c0e7d7f3425678bd90d75a24e2ceaf5df1362cc7b0e918d2a5a0527133b122c25a09de17f5ba410710346086c40bb04cda1d37bb23e95fe3d139 SHA512 db7497e43ac429abbcef941f4a8323f3cd9bcc6eb1e6b92958d177bfb2c9bf3e1119b23b041e66c8df2a2ebe368578fcc1debfaaaa35f4427850aaa0d2a3b0cf
+EBUILD libatomic_ops-7.6.6.ebuild 710 BLAKE2B 8eb4c4fc8629697b82718cba1e5a51a28b753a8cf095c39dd1e96cc26a79ca86e0384a1d9cffe54cc508f38c6fc432a8f5a620d2d18feaee91adb3d6ce1ced40 SHA512 2be8fbe9e332ab9aadd046d4bbe504711d2c5ed9518d5d4ab81302d42ac1d0b8ecc32442c7af53d1c05a43ec2f08e454866d02cb25936aaf467764ceacf77344
 EBUILD libatomic_ops-7.6.8.ebuild 790 BLAKE2B 5146b319d7389ccb5634e1403999524baa208409d30a40f4f31361a0bdb933c167ba6267f50e0977641f0a67b8e5b75256d303cf2b87542e292eb6e985f2d85d SHA512 77c362db68e21e2d47bf0b8d76fb51016e512a53a4057ceeb43846f4d46720ec8ce2df36b93f39c4c0fd8c55b1c82d2cb4ddf94f4a8bbb29c9e2daa981b29843
 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 f62e32b541db..7f741f972185 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index c27817a93044..8479f5efc524 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 7f90c0b4fc87..f0fe9e9c01f6 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 1237 BLAKE2B 77ff730477a4d7d6a0872a12332f385888070e4447fe80c581570afc714b6d4256a1f9a42dbbda5884847c3ae0321043bb94d6df5ec520f1fb856526f344f6e9 SHA512 e9de147aebf18196c966a6e676fbbcbf75e7b9b1a1071f30b254b77bdcfba9a06d5c04c14f20dbb2c17742dbc5ce392011e7810d9a393467c66b1fe59b8a1219
+EBUILD libbsd-0.10.0.ebuild 1238 BLAKE2B ea36839e5459bcee185212c1ff231d2417e24c5bd79e98c02f2125dd8d13851a4097415fb79352257d31ae9a16b43180022b87ccaf5c0a2cbc4d2a0a3a2459dd SHA512 3209770992e9d5db1f8ac3430cea00f75e9705a80609e565ecd735f0586c6a45a4c3d0465bbe56a9414f69046c561c3eea6da693fda57617da018a41abc89c22
 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 b2f7f97646f2..56fa888d3b6c 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -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 c9ea8dcab03c..f3aae2ed6226 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,7 +1,7 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
 DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
-EBUILD libburn-1.5.0.ebuild 837 BLAKE2B 07610778a96cd06a233651aa98cde8e94b058794400b4dcb0d8bc7ce845c42d2702b2eae78a9018900f6b574ef2cfa84feeec70108e0c8cdb1fb6f037310b65f SHA512 6f7964daf2343c017cb88e87b1d9d064fa4e3819e42a3f1fa1d0677926efc0d1ded1d0a53c31fbc515fe82768f82da08824590a71489b56f9ee773d548bcb66e
+EBUILD libburn-1.5.0.ebuild 838 BLAKE2B 70b7534f6d4447cb74844a2cb55559aff2bb2282bf879de316afa41e5d2bf8b38c632052304ce92c6cd8be992a492b766ae3f83bccabfe20aed1a16fe9b6db82 SHA512 647754047a02f6fe370dcba700edc6e6f4a60515e872dab1c0a1c48be1930c5b315cf7df78e3da7f95a99f0318049348078d84689a03f93bd43e106adebe6045
 EBUILD libburn-1.5.2.ebuild 847 BLAKE2B e53346b68d0581aa21e9baf0481789337029f81b470690b49c91ecec725b98136ca97ae5cca990e000cee1031d3afa52ee37eb53ba1a03d941b82636c8bd83b8 SHA512 e6ff684fa8582d58cd3e0753c2fd6bee3939b75dd6ef413039d6af103f6fa9f93f49c6ef9782db7a3e3a97b8d65067d76d3c0fb830b4a75aa48a09362fd7a639
 EBUILD libburn-1.5.2_p1.ebuild 896 BLAKE2B 0c1200d24e2aba3185f53c548970f24c401079e7220b4f5ac6539acaff9c31330359ab82ce452ee20f27f1fd750066d2f8ee375f96d33fd8918017cb5e6073d1 SHA512 e37fbef828e574b6f4518007b4e21c55359e9a7353ab39abb64fe039ef1afc3c40284004d798ade1aa6580080b195d6b5e4bda94c65a9bb9218529f69d6dc5f0
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
index c2d21714b6d4..e25523737c68 100644
--- a/dev-libs/libburn/libburn-1.5.0.ebuild
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-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="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index bf9252774054..b360bac1f8ec 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,5 @@
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
-EBUILD libbytesize-1.4.ebuild 1215 BLAKE2B 40bbbe2518bd33a4c77531a7610ccd63c230afe4273fdfda993f31f8fd01ec1a7ee29b80cb2151a14f91fcd54059c6127e793af016003293bbeced50d89d91d8 SHA512 ae1c0a113baa78f2d08f88f8d690d8f6235b7e32c08a0d8347de0a464489018a01c25e26bdff96ad489512909fce6539c4a2b517170b2e30f71c8bf98c337294
+EBUILD libbytesize-1.4.ebuild 1216 BLAKE2B dfede52acdcc463ddf1f7e5d4a0b6164439d0cd7b9ce9aa9ad88c2636c12e87dd68ebf54e1ab16673d7ca80f4b477ac40c9a64bab00616dc263a5b7f8ebfab7b SHA512 ee59f2fcef3379e2097fdacd583a822839ee0e2c730134b00b3d53f5808b48dffc967d4fb3595414da6fc0cd5df7de4d638ae790e85e7e4826e600e78cfe0a4b
 EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 4c0f28fc2848..326218a5913f 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 42b2e209ee2a..70ebd3de430b 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -4,7 +4,7 @@ DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3
 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 1887 BLAKE2B 486d8344291c932d8ab5ad1df3670e132a0aae21b222f16e2442c7b2f6d371a6f3f4d3bba2c7d17f8f8b20d94054ac7a7eec80dfb440c59e1d1effc58577f1aa SHA512 493c9f9034cf251a52d5deed1d7df08fcd85d55735dc369f60c3e7feccb0e5fa4ef629f7e977a97c2c2b943b4a364ba4610c2139f323389b723b79b9e7babf19
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2118 BLAKE2B 992c2a1a7c2a63a0c09cec05de2a407853df4c3f5764d41fb447e7c299f4c4a1a6ec8944195cebd10edf31538122068e864e5c9786b7531b9637e89358fadd70 SHA512 19073d3edca42a41edcdabadf7076756b5ab3d64f351a1aacaede11fc84f129e701c6389afaa4476559f5ad33259fca13a770289ff39965d7c4777ebb9a75bd9
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2119 BLAKE2B d4db8e063d3c16ac355ac5cbc22fef9d5d8e22af896f0067602f3ac67b826c89e47ec90c0f2c644c90dd9bbe81000c97d255289a87583b1089428d0dff1b57c6 SHA512 bcabb2f273dfb49f186da4315f0971d465477fe36ac41443f078b395168ecd153a5efa4a7ac902f5c1ef7600d7ec8b454fecee4099540515e23b70cae154f2ad
 EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1878 BLAKE2B 1d5f8f1475d6ceee850b85048fc6849e6fae4df9ca8d81b73919971fe3e6cef93c3ce300f9488a590b89642c9a9aa88746d5d0f5cda46d666ff7fb4e8bb9ca81 SHA512 19db40a115b9b5826b2ef0f5b01c4c94b06bf2d561ce3750b8384e2d54a9afa131bef37520f0dce7d0437d68bc5e2c348967ec16fc1e706b2737a766f709358c
 EBUILD libcdio-paranoia-2.0.1.ebuild 1883 BLAKE2B d488c569f2b62d9dfb906ebbd4c0f64816f58c14656d51f07886eef623d5e5999b46200dc80c08884ac96306e70aa76397c9004b592ea92c5de59bf316faf74f SHA512 639a972e99cdaf48cdfc21c672abc424b472402af4d0883ea2a2d489fddfca7ce033e4da5d6c9d7e60573763280f38d7857103bbfb68e240cd36e034130b7621
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
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
index b9ff91670f15..c7213b0a9dc2 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 85e8798f4a3a..15105f4d3cfd 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -5,10 +5,10 @@ DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d7
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-0.93.ebuild 1759 BLAKE2B b229414aa44c93b8f8b3ba15c1f3992d139900b8648eb349417690975a8f2f7ad397a55400c6536aa413217277059df61ba4c43ead7288d6d7b996d4ab9cfc6e SHA512 8f3b66d1458506b729785a9839aea5335f7ad3ce2ea8e6860042da36749c135afa676394b0683be293fa286c61d2b465e479c7e3b5d160fbbdfcf08ba78ec90d
+EBUILD libcdio-0.93.ebuild 1760 BLAKE2B 4b6fee3e97f14dd9dc0e2653f0bf05e92b0d3890c6a9ffc5429bd1d169ce4bacc4ce019c7a7cd677dbec1d92ad10d56db5630b8ff66fda43dd61410d21c3c6be SHA512 3e4832319953d338a342582b1f96d4182cb55d2973e4a02467bc4e386a3d87bd3251060e1462d63ebcc270669f418dc6da97baf85cf584a2fe109bff4c1a820a
 EBUILD libcdio-0.94-r1.ebuild 1768 BLAKE2B d59e89ac540fe5163b847aa8b528229b533c1f180eaf9ef4764eb8e5bf1cf1fa238735a3dd7a854fd315d3ffec39a036e7be81c2de1b97a8dfc9d9e604258cb5 SHA512 7ceff74bcd2a717752afe34c5072c0fa8741f015488e36a29a8ab40ddf19524caf606f6335337a58ce99754730e1fd11c3230a5e54a3278ca822d7e96ec712ef
 EBUILD libcdio-1.1.0.ebuild 1792 BLAKE2B d41e863c7713181b70071475cf222c01719a71b231cb18170a8c3d89a9190c500f7cfdc759394eb98e3bbe0d557d3ae9ed8797e69373ba40626aee79306de88f SHA512 19e2e3c38cc9e10e915e1878d12c3d5f9dbabe8625cc6e1511bb1bcbf08bc1725e6d483e84ec688b051c89a6216b83d0b5eba049375284b26eddf98a74c7ab02
-EBUILD libcdio-2.0.0-r1.ebuild 1843 BLAKE2B 716a61184539754decb512584c4e9bfc29cf8e7eb1f91615df6b391fe2f3429603314dd6b0360273f92c539dab25d810f15aabc12d90379972ec7c4dffe06045 SHA512 3fd6c8687c0f4ddb956116b4e7973d7ab13699fdbbf9bab8f74cd5de07b1ca88bdbe54ae0a1365c371fe9535b9a69b569a33010000e11900f748ed17be53c16c
+EBUILD libcdio-2.0.0-r1.ebuild 1844 BLAKE2B 8f19561110df30e194a35aa4aea9aa8c5391b8c4914c1570d241e7de947e24ed04ec7d66bcb9a1565c4b2634b51f06e1f23b1ac6b49741e5b621d9c2cb8c821c SHA512 6c050acef00c607191f51505df09df70a8d605bcea4be28087fb4cbb9b9cac43788c65e3a1083b6ca45c458d65dc8fa8c0f9f137f2200b1d1a2d38084a280a45
 EBUILD libcdio-2.0.0.ebuild 1791 BLAKE2B 57587ee3d4b5daef555750a90886584e98b6238cda6db9eb5b29f6f20e34121de861d352e02b5384934e08f0f5c0822f51c3e1f1f995da5638410b727947beac SHA512 67fe1ed8e1bbcaf49fe9714343f9a5497792bf4132842142e40bdc2ad2fcd99dc8dcaf0de93e2e1df596ce061d4f769ac5309f48fb1b38394d9af9bcc9702e80
 EBUILD libcdio-2.1.0-r1.ebuild 1818 BLAKE2B d5acaec26526e2babdd81393e8612a93d167bb33845f3bb44e83e7afa06028ddf014ab765b522e710fd55f46930714a06010d264d216b3d6444379cce00928ca SHA512 1703703c9f04c4c3a2eccf5e72116d4c3d55604a2b27b2fdf6839c29e27de53f3fbbb197fdbdef1e131850062d44f9b154f4a6e204cd91162d7b94e42f626f20
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild
index 0dda745a992d..b725e866eaa4 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/15" # subslot is based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index 16077c69bd9b..5f7f4623c007 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 5d481bce2f42..16f365b19431 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 1349 BLAKE2B b1642954a088213c1ed6bbf008ca82653595f9c4dd6153575bccce47bc0f3f5a226f52af772e959f0def42850e9e26802175665ea2a24e87488941fa9b9dd26b SHA512 c3a01abc3cef6f9f38abe2b78079f4438265c949a041fcdc3e339a5eacd155730001ffb022aa89d60cef04c000ddd44f84fe74dfe215dca980991b3d6cda82af
+EBUILD libcroco-0.6.13.ebuild 1350 BLAKE2B b4eea0574be9c5dc973fcc26a2b251436f46c17bc68e936b95a72265031bde795ad292389032f720309c77ec998f7f16f30965a39286ffdb00442c43b5bdde70 SHA512 2e1445dee5edcd5c31de80407465f56c3fe4da5fd62eed7ca626c0d2dca027f83de4f55d5b08e5a74795f612ea445319c23f5807f316f3422ef3d6792dc88012
 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 33978ea9213d..15ba17b5137b 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -11,7 +11,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 5c51087ebfe1..fb2b5f19d2cc 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 1369 BLAKE2B ccd25d19ee559a1aaacee8adbb6d651a8eb7dc8d41edab589122677da195720e511c993c04f3f19f6b1eb50e2d60864e209c4174625535c56e245313564324a6 SHA512 c51e95a69ba90c191b366d641a51836ff7fd0bd44fef58af8ba25597ba7a9b3d1730c62ec0e5f3ec5e4ccf46cc4bf35496a2fc1a98ae2513b5d1c2d491f1ea02
+EBUILD libdaemon-0.14-r3.ebuild 1370 BLAKE2B 8244c57292778891a44096979c26fe186ede3ef9ef8df324dd813127e7d96e3d06716cd16792d8317fdeb5392cbbfce6f44ce46e34229e31b25b57335c46ad92 SHA512 f6a7e3f3b77d6ac43b14186dc8bc052d63a3139f7c4d6ecb0e8d9b88d3e59f352756d08be85083bb3a843f70c7161093200ee0a8193879546038cf0e2d0b56a0
 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 37f673cd1618..2f2044347319 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 5935a81ba620..78624e8dc4be 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 3891 BLAKE2B 2eedacd0431a016f6b34acdf7ba180af4beb01e053cad27e350cec93059fc18acdf29e9581b4567191d2730392705ff7d34cb55d6d90c0e9508ca128b2644ebe SHA512 9a93356a0524f9c6d75cb9ce117be3b675c96256f1c0b6c4b968e3659e5a94c1e4942f26bea7d52c0e03d086253f4194e54cec81ab03db288757cd995e766fc0
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3892 BLAKE2B a5db34ec17ad50459012495ebdcecdeabe57fb21b8743d32266a817d6c5f7f1d2e72250039a458ac06e7c2ad6d892bd89c4485b9e1c23e13720dd03cf37a55c5 SHA512 b3b4edf3aa03a8eb51ef2e4ae3559db042cecfc7eeaab4a4bef99da27d7e583a6a95964c5fb7999826c5e04d18797edd144e7338f758ad9fa0a1ff3a95009cc6
 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 e5b1db2075e5..df36c531f3e5 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 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index f82739b9a67c..6f22709f53ec 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -2,5 +2,5 @@ DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
 EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B e4aeee34c99dfdd55612a982a98026f63f565b48589f63ee62c1db28ae61e4166510a135405e291ca5aed0f03e5ffb434e03d158a1704df1b247aa563cb07ae7 SHA512 52063922be42b93f08eec10fd361cb850f2fc5f5f7aebd3e93ea92f85d5b8173ef92c05c0e9f07e616eb884e9b1172459565d3ea4719f6141427ece602b34417
-EBUILD libdnet-1.12.ebuild 1513 BLAKE2B b362095dea9072d48a29025cd1c6d2b171d66ed0f3e0ce7c13f0e1817f25d7467320fa8f2224f792cf8a9b759e83baf099392ab641c16d08c11f98c33fa27822 SHA512 42aba60863524c059164079a31a6edd8e2942d23a15be57c7e04935480d8fddafd3aea866b3f4017d22607bb8fa4a082ffa97d1af82c44162164217965c0aea2
+EBUILD libdnet-1.12.ebuild 1514 BLAKE2B 4b2dcc1535d5e8c0dbfb5d6bdfdcad987f86280b47f46ad3454028530ac371a796c69fa588a9f93ffe4fab8830dd730d97c28aa13d089426b0e3a275bf071457 SHA512 f07a88490d5db0dfcb5943f370ec3a847e7903f6a997df107f21f5f90ab8db4967bf9e82454f3ad9615a8993bf0b422d8801bc54d324bc7c39d0b5226d5ff487
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index 804cc7277e59..6a0cc98f4388 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://libdnet.googlecode.com/files/${P}.tgz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 python static-libs test"
 
 #DEPEND="test? ( dev-libs/check )"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index d8afac0debea..19c0c753b78a 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.10.tar.xz 69488 BLAKE2B 0133ec041cd2f2aad9e8870d56c4ec8f3f3cbf745cbdbc2470f02f94152b8a236626d804bf8c42c00c6a49cc5e7d691394cffe0a888f26100ff67bd03a6ae2d7 SHA512 c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49
 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
 EBUILD libebml-1.3.10.ebuild 601 BLAKE2B b86e87e70d8802cb2f3c7d1a5670f25f9f2d7167d8ba16b830300ea9e3979d7f0a1b6bf9c1e26055effa4b52f27e326168d885a47933f1a5e094c4ddb742e32c SHA512 5f777da9fe58cc72eb8e354a3d2d59cb7cab7cf411a85805cf368cafd0849ef5ea3a064ae13243670c5de8819f9185c94e6c3088acd15d589a2d2ece33e103ae
-EBUILD libebml-1.3.9.ebuild 592 BLAKE2B 709c14fdfe3dc18a369b27a374633b7e42b367f725278c8486cfdc9988d43e0e548591d36211071e12d37d8e836b3a8f1c901ba4a09c4fbfde7429d6818d9e9b SHA512 0fcf1ac2460079c288154afdfaf1793a909e63b994eeb21cc7f904a70a3189d198d1fa8f4ebabbc583af9fdda2bf176af166c17349ed287c3e385ce49ab459a9
+EBUILD libebml-1.3.9.ebuild 593 BLAKE2B a4e7e65dc9deec181e2a50346f89e28636b4024f675c177a65f285eb776bd4d9e2bbdaab89dd1e51f9c079082a3810ac0f6d91f6eefe18569059aabfc8517ab4 SHA512 037dd7c62fa49fbcedad142a829555bf64fa0dd088190fbc1cd96483a6e8cfa4205fc898286385548b135360ce9b006ef1613452a76f3bf916229eb45197642d
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.9.ebuild b/dev-libs/libebml/libebml-1.3.9.ebuild
index 99829f7ce5b2..343f619e2ce1 100644
--- a/dev-libs/libebml/libebml-1.3.9.ebuild
+++ b/dev-libs/libebml/libebml-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 9cbaa624b6b1..24b8329b8048 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -4,7 +4,7 @@ AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b5
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
 DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
-EBUILD libedit-20170329.3.1.ebuild 1262 BLAKE2B f4e569da5c67c84b3a02d7a840356e63f63bcb55754fd89c5aa5b2c7d355b4ed7698e62800cbe633372ca1f165a4843e84f9d3ae0816619bfbbec8c44696ba0e SHA512 7d9a1c348f1afcef82fd6e28e233eeb84cfe70329b833bb054b67a491799b2c13aa92d3064461cb1d3008b8d80816e42031d0cd8bf18374721cf8d770a1f90db
-EBUILD libedit-20190324.3.1.ebuild 1193 BLAKE2B 5f413962c34c846e45e50bb1553493553a47089e7b63e3156ee12a61072e810fd5ef6ec493e05d2d479a7b20dd1117b6ba9d4a14d1da0b47ea44e0a28838adf9 SHA512 4c72cb7efbb9cfc3c25371ce84ea3dcfb50d10b0a02a5d92e38031d276f9bccee69f008b761cac68d4b215355a00fe933453d747483347d900c040eeb6f909a0
+EBUILD libedit-20170329.3.1.ebuild 1263 BLAKE2B f3733fcab6145b5a624f153a2dfdc662a8caf53372b647ffa1fe0104953fdc11474354192b644ac9d61f643eaff9eca46b227d4ee7ecea8f7fbb7810977daeed SHA512 f561066e5aa531cc36160fa52338cb6950a09565318a8538f325ab8cf3634dfeb850789cc1fc2d64821f179004c022648d5a075fe6fd2b1645a433dffb796306
+EBUILD libedit-20190324.3.1.ebuild 1194 BLAKE2B 14bc529388ed15caea9491f59ac539c0ef2b13c7af57fd0c62ff58ceb625554a384d10a6ed1947202d688e5e0c566430ea2e32af45d16303216c51e23b160f7b SHA512 60fd95883b5e5c423640f3b071101a1428df35671024da18689abb72de19fc72298e718f15a15d0a92f958963c0b35966b86d1e9222c59bfb29285d6151950d9
 EBUILD libedit-20191211.3.1.ebuild 1162 BLAKE2B 571be8db01b101a3110e650c5d1357c2705fb82753ade3c4ff8cedbdd6861aef380aab19240e8c747149b5af505e1c5aab137c9900b4270a4d013bbd262c3311 SHA512 1444594a3cc5157c08ec9e63c4b379bdc289dfbc5df4f86461e421e890213f838b3a9c369fdb5672ff81ce2e4beb379b75d714bdd775e9ddebc375a3423041a1
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20170329.3.1.ebuild b/dev-libs/libedit/libedit-20170329.3.1.ebuild
index bef559eebe8a..ba1cb89cfe58 100644
--- a/dev-libs/libedit/libedit-20170329.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20170329.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
index 74c4924dd3c5..155e3b58af49 100644
--- a/dev-libs/libedit/libedit-20190324.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20190324.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index c7e6df393388..5b024f8c1ce0 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 1295 BLAKE2B 9c8e630c8b8a9392b825ea7e5d74e6796338b0b1fb09e389a9d5ed381530ff8fd4073175be4b7bf61ac162959d77a29f278a2e52040e8e3393d295de4472e69b SHA512 4fb260bf761c72c25cde1fa2889bdb7448a16280f12172382f8e95602d135929f7de770540bbd416a14120d5522c2417d686777e1210dd93b135d81aea8440b4
+EBUILD libelf-0.8.13-r2.ebuild 1296 BLAKE2B babe1aebf62c52143d30e8c218b8daacbfc82de74fbc2a10754709e620784e6eb4f0754b600ff212fb250a7cc3d167b1f91779b024c6bdc69279362fe5f8c2fd SHA512 499e05e749382546e53cb1dda8a73464112c144ce00c6beebde37d2bf4ff71309d316be87a46d3d29955890c24561b6422950bd0449011fd835c39006842a2e0
 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 9cb4e75ff9d0..b8b84b77e76b 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index e70858095259..259262fcd131 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -2,7 +2,7 @@ AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f
 DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01104733c2a9478265fa78908ea26b6594c00f210c86eaef936956c16d3a55cb91a834501da0a6db12caf201 SHA512 83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4
 DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
 DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
-EBUILD libev-4.25.ebuild 1122 BLAKE2B 72a683a63c004ef07500cf7f1f0a381ac862ae2e36eb459c5da2482ac3b784469745810155f4001acc1c63a51ec241bc3b326066ddf89cb67273ad1e8b9adac3 SHA512 9531e11b30ceb7d8992181b93f28e939735d40ad6c12fec3151ee21683f77b6b4eeb9c0338a2f9216fb2f70580c9689484728d7698a7d96af45b230633ee7dd2
+EBUILD libev-4.25.ebuild 1123 BLAKE2B a9a2088b10ec8ccd8bd88acc1d1687eb05586e0b40efc0bb4f61206c971c3790c15980c82e2d896f3a8043f1285739f0d24d8ae91c86b40a8c5e330c9353332b SHA512 f4ec0dc8f7f0842663abf28f33f2f55194a89c1e32082d88bd491d5db40426832287304144e1f4049b805f9f7acacdd5bf51f79df0049ea51ffc5d9d594a7d13
 EBUILD libev-4.27.ebuild 1139 BLAKE2B 0b8c753c1f77f9a3e7b1486efdcd499031a8444d7c41903e5a04fd58fff1160ab8b29640ace1785fe2b7a3c2ab1f9a50ffff682e04702a1b545274551f36e7e7 SHA512 acdc3bd84f41ed391df8e9f6f5d676fe8ff009b0a897820d403714dcf0983caf8d6374897cec644a65b256c946aa4ebb8f7dd488cc063fde470af07725152b80
 EBUILD libev-4.31.ebuild 1139 BLAKE2B 6cd2421f72e2e044df8b7e7e754970d1a8862e93aa6fa455ede39a9b880f5a7d0df14aa3ded2ebb39aa21bb8a1d7d78001e0d9f2adb62924641069f18c7ba3bb SHA512 cd828b26c7b71e7881516899dd1102d475f7ae8a957af3e500390e55d6ac15a46bfdeb676e33eac0fa02ed4171d8a79e89e30627c3d2735c4b28dedce554dcb6
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
index 65e7f7475e68..19f5327a4bfc 100644
--- a/dev-libs/libev/libev-4.25.ebuild
+++ b/dev-libs/libev/libev-4.25.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 227abca2e577..9691bcead432 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
-EBUILD libevdev-1.8.0.ebuild 1104 BLAKE2B 0dd9e6ee63c0caac95b089e2272392c8f9e9a998041c0f48fe5194fa5c2950f9f6ce4ad6f822de57cf57e79a0caee35a05b1e6586723dc670a0fd09aefdabc5f SHA512 062c886b7a0e812c9aa5c46231f1723a579396131508b5ebebdf250ad1f6975af42c909618b759152599264d37c4c000ddc9fb8577a71da44619a72968361e90
+EBUILD libevdev-1.8.0.ebuild 1105 BLAKE2B 9aea6a20ed27760e6c225c81aa6bfecd8b3cc5b16d0c7a178d312e7615490678103bb6c4fbdb5787007486d312caebd4541ca04fd1d0a4dcdcc64ea11ad08f92 SHA512 e4d274623c81502de977ce7c015550ca1fe32412b46eeac86111a1720f4e4f56763395571a899496a4ac96c380b0428d6877a914f6eb59ce534e6dd7e5c5f5cd
 EBUILD libevdev-9999.ebuild 1115 BLAKE2B 834182fa133843b04d4035a81194397dcb9e6c105c6f4f76abe95cd028d2675d98e5e162a2261d8f284a61f258886d2340fd32a02e6c1b3343f38ef42fa88b54 SHA512 9991ad20557ce739693f16f28bafc0c8e727ead20eebbb01ac225d5e8405bfe626512334e818842e075b69a57cbece0ff9e29497eb891166eedfbf4c59bd7e84
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
index 3964807d08cc..82af5e42bc7a 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 8ba6b5576ea9..139bd633a8b6 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 EBUILD libevent-2.1.11.ebuild 1685 BLAKE2B ec8083997c5c5c21306306b00efdf5077d66f7895ef366c19abd00a4f83b1b1150e036e0c3fab2117a0ae8d6f9ea80a95e5fbc621a862a544d665451572878b4 SHA512 377dcc47b403d47144dea3a94950ec40ff626b072b36ad028802453a6095ee19b87f7362e3517de8caa9211d0377e13360487d844ee529d04cf6b52b301b6bcf
-EBUILD libevent-2.1.8.ebuild 1657 BLAKE2B 5f81cdcd7242220aac514bb2c4c5516ea1e478bab1c04b18821a1e2ed2ff136f8582415685f4be3600d3172e16f3efc3c4567abcbcfae6621619e318649ae2b3 SHA512 8f185e5cda9f485fdbc1769891c51793e7ab094e1832bda95f32220b442596b106d4cd233319c3463a7c582fa787d25210b12b9c251d0f653fe31a0c75a178e5
+EBUILD libevent-2.1.8.ebuild 1658 BLAKE2B 4cae138bc7f814cbdbfbd0db9f2daf4e9bc7a6396174657ebd64c80b15006c541910e3aee9a6f0fcecce27f8820bd8feb02bbb412c4a757d37b4620800a0a849 SHA512 041a18c711f5a1c566c0a14364641c53cc133274e39947e8bf448c93932d052f63ca37c411bbefc237fc028546e77ea0172549a30aaf69b20aa87b3a08aefd6c
 EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
 EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index b16ba6c3ed4d..efa8eba27bdd 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/$
 LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 4a67d6181ff9..a40b3ecae730 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -17,10 +17,10 @@ DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa5
 EBUILD libffi-3.2.1-r1.ebuild 2272 BLAKE2B b954d489dbc91b6e96bfd6184c769721c07a5d42b724b28d7302aea956a787a31267e2fd3fcadc76cd4e5f5b987150da7dceef16cb2f8cd66312a8ad0e444b9c SHA512 ed2e6c8bb1fdb8fcfbb6462deb5488aa8551f431c20f96787eafb9e56ae909a3494203908aa79fbb504b8c27a3c57bdb4c085068abd79c14d6e50640a4c17927
 EBUILD libffi-3.2.1-r2.ebuild 2331 BLAKE2B eddb0fbdd95f528bdac1739e7d401eb595bac249d322e3f59a7409869d8a33cf19d29356c22286afec4fbfc2f05d5249fbc265c48f9b3332b87ef87aef43c6a5 SHA512 d802ce84be1a8da75315c2291f97a48d0cdb7f2f1f39b6bda9a1b52623e0c36c86405a7129fb168a759e6834aeabcb87e86a0af9314ebf0b92539901811b01b3
 EBUILD libffi-3.2.1-r3.ebuild 2386 BLAKE2B 5b3e0429fa498c23aeb3950604089cf51f677229085e7d60b0b02c3413ae3328f6cfd78bdc399bf973d4f56412fde4399ede5584357c92282ea003d1f1712145 SHA512 bf4dbcceecce19e59f197383deb95967482f408f7ee02e2a0f32bb3f62a1a73b1115c0c60774376671aeaa51d03d225d481730f13f4688c697ae74417261d82e
-EBUILD libffi-3.2.1.ebuild 1971 BLAKE2B c0f52976c95a892d9537d9834b4b1624f9ad99054990f3cb83548778eb05f882c79483be9ad900397e19c42d05c5d3038effaaffefc4a13f32d19d25ba07f23b SHA512 2d784dc96c51b78238a02de4570ef479aa54bca77e2b704f030c05a3e534285cb4dae44979c2c684b60aa030df5676a02ced2b3ad4e945e58697d8a872e46ba5
+EBUILD libffi-3.2.1.ebuild 1972 BLAKE2B 9ecfef87a44dcbe7915e650527085b36c61fc166cec794e7b1289a85aba4ff6d43d9a00b9bbfd8cbbd4767666ca89787cc82108658351dda58518031c145ab37 SHA512 2ce4ec0ea358241d42900190a0d5eff81120a2552a1134374d1a878ff9e8d39724d6d399a7fadcdf0fd38a9cc612b5188f596afec45bf67d3b57c7c2b34bdd0f
 EBUILD libffi-3.3-r1.ebuild 2713 BLAKE2B b28474075c916f1a0b41069782f54477a277b97f7c171cabf153236e3ffbc635dfd188279dd571a84a7af6dc7982d61b84df0d6bb6c119a53ba07c79707d7df6 SHA512 67adf25a459d4788d917463c3a43bb5f82b22a29eefbe2eb582a652c4fcf2a078afbaba5284765efe8a49d93043f14f5a87535f27bd582aaec9e9469f44c5de6
 EBUILD libffi-3.3.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
-EBUILD libffi-3.3_rc0.ebuild 2046 BLAKE2B ff84c9c3acd60f0fb191c0447987cdb3410e739456c94d8248e0a66b721fa74e5c5518a24a8edb008e1606e2d8b32b251154d9b6a8eeb84edb86c7b9bee9c4d6 SHA512 f8ca97d42cdb4da9c372424f64d4246fc85d0bbd8c2422a0c577e7d1db3759dc68c316a277b7fe6911ea1b8c56135a0297a01a4b59e5f3265f6bc3e79651f6e2
+EBUILD libffi-3.3_rc0.ebuild 2047 BLAKE2B 9bdeaf3c3e57930c497cfb905ab9edffa661966d65fc7992c929248462b5d7b029970742239e08c57fff734a2ff402205e41be915c890a54ac9589ed52b8feae SHA512 fa16e0b57418e1fbb1f498b521ad9048461e5fea7fe97fba3f776276bfede31f5717182aaddcfa59108d6d9d9c45467263da9cf775e9bdae7795be0c276b6741
 EBUILD libffi-3.3_rc1.ebuild 2006 BLAKE2B ed7da466fbf5ff5d0736544ef4d656f869c57472289a4e130d44e4d77757947427c1ae1d603a3f5a972c3bda1cb4b2347d7a1655c70b236fc621275dc10ce346 SHA512 cebfc9c5c6aa0a0b99832d482afcef6f78f12cfe1b7c61b9dd353b7c120ae5b2c2317f5a6b2154d5e886e5f324381bfdfd15f52337732b204f00f4f72a83ced8
 EBUILD libffi-3.3_rc2.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
 MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index f94e70f728b8..a4cd01cc10af 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index e5b3dcaffd89..bc4f5e0a340d 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8e080f088bf5..f4081f09179e 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,5 +5,5 @@ DIST libfilezilla-0.19.3.tar.bz2 541117 BLAKE2B c0015be2fa632cc4bfd44d5e02bdc9e1
 EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 0f9101255067d3dd17f4048716b25ac12e9270db414208ee23911d644140f0d8a1bf446f07a6b67f3aab679403a87a0a3e7c569922cbe4ffcf7c9c0ef9d846a1 SHA512 5a6b773f29312f2b7557ba02404124040c4272328c51df45a00eef2ba8ec6ec72517116d501ddb7307b30b0216dabb94c42690bbc72fd96ac436c8684e423215
 EBUILD libfilezilla-0.18.2.ebuild 1051 BLAKE2B 06f0455b9a48fd2b1eb8f1a6437260efc74ca81b07f18124db2c99311c5ae3bbe416226f70c72f9732c71ceab52041138dd8a64ef3bd923d07658db409330080 SHA512 428fd7bc6c28d76db19f568edb3cd4f3e6528320e62f6da78408a57d34fdb31d4aad2f91da49f33634e29fbc6f7d443b01998a53d9ee599090094bd7940c5558
 EBUILD libfilezilla-0.19.1.ebuild 1080 BLAKE2B d046a5ab623d32c7dfa351fd168e4041650f9248e1099698dd04b8ddaede2eee71ca34078827b4f723d6b2abc02889985e6759073e054f1470453aa96aaeb736 SHA512 b4d226e728d68cbb97faaf22282869d59d506e91a0014a0164a35f1df394e53f58ed91cfbf0a7595f0c32177d3fd618bb75c1085d9260339df9e1228dc84acaa
-EBUILD libfilezilla-0.19.3.ebuild 1080 BLAKE2B bfd3bb825785609a58635b4876081a4bcebf4b3d8fe480277ecc1441b44f1e0fa46834a5940bcbb02122b32cf20a2b6bd5f4f1fa4a76379fa4a5a85af006e089 SHA512 ac44ffed29f86328844bb633b04d711116836e25c881965d24cc8b8a4b823e309e92dccf437b227868d0bb9f25287d55756357da5f6d1513baf33764a38279ec
+EBUILD libfilezilla-0.19.3.ebuild 1087 BLAKE2B 871c89630e89cfb7ae3a45ddbcb8f8037514f435714f95192224c221808717a614f25cd096e42d883f03f88c943e4c9a0e4add6d52581c5489d1aeabf02cdc3d SHA512 de7bee4d4741c7356d0085a7c24454f39ed87da863a9404f0dc0a59906245fd137f40bc3ca126d632c44e8f90fbfdf2ba367a66ef7b29305aa37eefdf92e4cb9
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild b/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild
index 349925b74a35..a34d12855098 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3" # libfilezilla .so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 599b06e05c82..a56e85791e7d 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -9,5 +9,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-r5.ebuild 4019 BLAKE2B fc14088fa1c386ee958aeb7abb235a6a2229ee908b37ecfaede107925a4cac8c3e6a28fc8df09548e98cac2a4fa475b661b42ea01ca4a233ebcba79611d11ec6 SHA512 ed92809c85c8f70b1b6355b5540d66b23d746fd8901d0778b1c89bda184b3c46f44b7414e5c163c7ea1b81c4457409ae05138576ee26a08faaa63a7c76d64e9a
+EBUILD libgamin-0.1.10-r5.ebuild 4020 BLAKE2B acab3fce28f15a48292cf6540e4a0f769ee55b411cde856468739d86fef3fb08b81d24829aa6fe1fa0470a4c6d386158f099b4e9d142ea8d59e6fb0b6deda337 SHA512 c342f8ef754d8d0e27148a1f4e651bfabd878e6b38472b2edd29912200eca1c2c581dc528ab0bb6993625300361c8abe669f732ae27b8aad3ca571b12e6d5b65
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index 3767fea2ce1b..62fcc0958b74 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 8e2975fc2167..071922b3f1d6 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,7 +4,7 @@ DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b28722
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
-EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
+EBUILD libgcrypt-1.8.3.ebuild 2165 BLAKE2B 25870986303679a35795ffaa2c23d4660f0d563265921f4c0d15e6b5ff4baca1ee52bc3cf9890d788c9eb13eb6c3e92d864858e23de9797977b443a5e324b5ff SHA512 c6f7d7e700fde6c596ce88e800e2d3d341c3f98719ab5c4870614772c59e97d5d391e665dbc5434705362a8323f65ac0728b90d40a0d2e915f8f78305d6df31e
 EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
-EBUILD libgcrypt-1.8.5.ebuild 2288 BLAKE2B 83716796b83f99fa246e558e71cc8fbc348c71677dfe39446ac23522801929e0b1412d30d2a057d38cf728b1023b1c9ddf6cbd0b593ac170e0ece34fc8d3ed5d SHA512 f87e367bae547419381d7758c000bd5d86dd7add06336f41378b5db920a5923aeb38b07543f4b163c41e7a05fb42c10a20e5328bac72bd19803b1bd7477e016e
+EBUILD libgcrypt-1.8.5.ebuild 2289 BLAKE2B 0f144c278cd59cae3ca8fabb376e85f7f65d5268ac6da3e1fc6e9103b8b17c1228af6eb6a7d928d522f3a0ea30f75ff3ac80da0c780c4c5989c656805b9390f8 SHA512 1939abacd3186fd8681fde0d186fd8ad8ed3e9d9fb63b9dc2a2b2cf79f879dc7bb3ffc2e268af6d7a9dfef6677dd2f12002cf9b74525f18a396bd7bd5d04e298
 MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 6c3b0aaa8ad5..c5c318b9afaa 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 9ebaaa0c2060..e79df20fc5eb 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libgdata/Manifest b/dev-libs/libgdata/Manifest
index cbaaeb235ccf..86a3fab707e9 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -2,6 +2,6 @@ AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b7
 AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
-EBUILD libgdata-0.17.11.ebuild 1770 BLAKE2B cf75a24efc2d0b566be32c8ee8464c6492431056858c855d96c76d7cde875adaa4b783f8f8b0e8453d546574575722b32681731d7a1736aa550e8645f82f1779 SHA512 51b10ac2b62516a13fadee17c248f128fb0c2de8f35eb4541ee38a19f1091a6e4eea81f8c00f440a7705aa5124ca5a090cb3a8c45b64e9c580b4620db7b7b475
-EBUILD libgdata-0.17.9-r1.ebuild 1782 BLAKE2B e8cb72916b5b9b8a229665c7ee2bcac5b3d644c83b1b3db47e894b673131160a1682f24205d923ca5f1d4aa30bc95008ab9239b8b109c77d6394d6383e435635 SHA512 1eb86ce2b416426cb82b564e85151cf02df9a967b6cf1c119d9f25fdef3d80660bb38c23372d3e75dfedf599a339adfe2db8aa2ef9f7c837b9413d2fd4e0701e
+EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B b349a241ea4bea39ca54817be50fb6c42d458dda0a65659d785bf1c02cde0278f3cc09715a788a2f6e76ce349dcdece372b741e1e718190c73d81bb0da5f3478 SHA512 3a386c1052b2cafcb559b008f58bf8a7b5e86766f2dde5ab292618dbfde0d507a1b42bf8c9471de93449b4e089a4a149e5d6ad8a648cbf32ac987c974211e750
+EBUILD libgdata-0.17.9-r1.ebuild 1783 BLAKE2B 770295ef5ffd64f457d43e473243628bb69a6688e8a323bd1078d42e731baa84219059d91565e5fe3d09c8eb99fad1b4ec27665ef9a587d2fb699505547ff9bf SHA512 65529ed7f972655a787d8a8b2d623df26f837b105ba0b3a3683d87c1bac235fdc8161526778464270b3fc70c4013dda513fd20d3811468aed9f6eade91429ec4
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.11.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild
index 54e902a6fd15..b9e904d63840 100644
--- a/dev-libs/libgdata/libgdata-0.17.11.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.11.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.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index 65e05575dbad..c00287ed11ab 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 833d06229761..91530f8c92f7 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,5 +1,5 @@
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
-EBUILD libgee-0.20.2.ebuild 679 BLAKE2B 56193e06fa6e3772a033390ba6152deb427a71f7f4b9af152480e4537bdd9d691a569ff480014b361201326f63a7f3131dd725d8d2ea5c70f9c1b0e4945ae6fc SHA512 d51752c3130ba89ddd0ebb29c1eabc2c9aaecd8ac1340071fe296697fd37449af927fe276e0c82a94b175a7497bcd0bb67cf433590e1ece9a29e5282948cc275
-EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
+EBUILD libgee-0.20.2.ebuild 680 BLAKE2B e6b692dce51c98800cfb08fd7c8063c66278429c9955c15e3e8ef38b2fbeb5e77fc945022c353396abdbd74ed80b7d70641d943b26b96c915ce0aabf1b10efd4 SHA512 9e81e314de73790d7ce7ec6f5a2e5229245817d05e2d81ef6b2c49cffaed80260eadbbf48d64b2b8518d497a3f711b9e42794c981febf363fbfc55d3dc99a756
+EBUILD libgee-0.6.8.ebuild 660 BLAKE2B 113ba3be0353579d971b7efbbfdbbcb5ff8143e6ea0a7cacd25c09a136b934876f8e3208c912de12a3acb356a7b418282e1710c197715e17766a8013270b0ac0 SHA512 57b151f9b7c3c76030bc00b4050224ca7313c076918157a3c83b3918bdaa9582ab7b5b3147f87e8ec57b864641a9efc07b97a86100393f2bbd99893be6b3930f
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index cbaadaa2aca1..dd9b2a05e562 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgee/libgee-0.6.8.ebuild b/dev-libs/libgee/libgee-0.6.8.ebuild
index bae2b3abbfca..ab288c84fc32 100644
--- a/dev-libs/libgee/libgee-0.6.8.ebuild
+++ b/dev-libs/libgee/libgee-0.6.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://live.gnome.org/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index df98e46470b9..6b51c1328e68 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,4 @@
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
+EBUILD libgit2-glib-0.28.0.1-r1.ebuild 1327 BLAKE2B a7c182d2f1d5fad28b81bbbddade798e41f5a4a555b86c505819833024971e744b06a2901d67862e3feb62201e9fd077a7f470cdc137a36df333f881d12750ea SHA512 1e9cf655d40b85038309cfc2d943e0e1a0f6a83ba796ca3a92e8ab6a4d03e17ccd73d3e959006d32767aa4ae7b93e8baf43ca0f9db8278f602f770cbf43ada0f
 EBUILD libgit2-glib-0.28.0.1.ebuild 1256 BLAKE2B 7246cecc6ae927178611caab2ade6d38a954b041f55c4486e62b2846ad7978a9ce7ebfac2f6b49feb53f771e48813bef38a3a1bcf7b8b31b28ece90ceceb4019 SHA512 b330da636839cc73691f0a33c778dd37c3d9318e470ce90210333235601c030ccac76b81914c02ea4291649392cd52607003aeae1b4b8dafb1e519cf2e21e600
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
new file mode 100644
index 000000000000..7c5113f4ed2d
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala xdg
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk-doc python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libgit2-glib is now compatible with SOVERSION 26..28 of libgit2.
+RDEPEND="
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.44.0:2
+	<dev-libs/libgit2-0.29:0=[ssh?]
+	>=dev-libs/libgit2-0.26.0:0
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Dintrospection=true
+		-Dpython=false # we install python scripts manually
+		$(meson_use ssh)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 6e7f8d40daf9..f34d4b9a9e38 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,4 +1,4 @@
 AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
-EBUILD libgpg-error-1.36.ebuild 1684 BLAKE2B 287b8a3b771b9641836db9a5e3504f4c1bde2a11b0c1df599add83c44a5fadc7da965d8942b7403efc0670ed8ec15f9ce5640084c974ab5d407b0e2ac503585d SHA512 93e3fe36b13f8be8325eafdc01dce35913760f513d8386898ffb7f86bdb2b8ca160f6a312b8f7acce97f3da3bd8e829026c2b01ff9406700cca9c276551ecd47
+EBUILD libgpg-error-1.36.ebuild 1685 BLAKE2B c4ca02517b51a00898bd3aebf08688b6f1a5543086ad9167cb312bc55985d63aa06cee42b39fa92daeb48341a0754e374bd838c6448004ea505b8057e4d7360c SHA512 c21def95376b920b2c2b2cf1c1a59aa9076076932749ed6ac3444b446bee49170fe4eb5b363d3491155c68dbd64e0c9dae3e24fe5bafe272bd1c7ab483c77bbe
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index 973e907a96a1..691a8cda6f6d 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 14d2cc735ae3..7c8fd2a7d1d5 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,3 @@
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
-EBUILD libgudev-233-r1.ebuild 1116 BLAKE2B dee3b4433fc3acf28456465879a354ac9846527570e33b4b60b88ee9654764969746c8382bfa6f3b82e01c3f01833406bf10a9edb924faca368a61698d77eb4d SHA512 8f6d7df7f5af6f7e6db81089df80b9735bb7c486087399cb98748a6ff13a828d910927bc42ed426ab5151637949a832516bb69e3d6ef94071b8968c8752010b6
+EBUILD libgudev-233-r1.ebuild 1117 BLAKE2B d56bba13886f2448f1ad3b1da64fc8007252f3fc0fc717847eb85a4c27dabe02fea10fa8e289eb4dc455e9f1964e38e6ca929be395287d84fd010137013f159f SHA512 ea758bf17ef9b3a9b5bdcb491b5f6efaddfa739abc44886a44fa62c8451f7aebc21c94e7584cb174e7eba1d12bb316551b6716039e72364ed6473cf004e81918
 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
index 04a24ddcf3a9..b5f25902934e 100644
--- a/dev-libs/libgudev/libgudev-233-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-233-r1.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"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index c0bb709ccc93..1f599ab653e7 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,7 @@
 DIST libgusb-0.2.11.tar.xz 291992 BLAKE2B f43065fac0fcfbc3e392b90dc05537746ce1325d623161e93e1a306b87b07012ef4e11242514cd3da0b83a7df6adc052e20fd3336b53d2543ed9e23886a776f5 SHA512 f9c3c204b5f0feaf706b23dd9a174feb36a9f3c8db8ffb5dcdefa66b18ba0ac963c6041d2d91a6a2f6e23036fc6486d142210bd5348e10c026a6defeb0bee096
 DIST libgusb-0.3.1.tar.xz 38568 BLAKE2B d09afae9d210fde1411de5a0b9b8852eef49f88558ff4c434ef5f2ed9c1c6c29600b96dad73f6873027c5ce0987a3fd99691ffd97d90cfba9f63fbb2cc73f8cd SHA512 5c864e35ec64d1e52ec15ab971c75e0ee3e4664223a6b365815a54819f23342889e5f9739b998799a3af3d37ee75f0ae38ee0d8bca4ed1e2d6ff712f65a53b9a
 DIST libgusb-0.3.2.tar.xz 38852 BLAKE2B 72f98e54e9c4716380430103395ad6da830148c7ef4fb3e7e1445fa28c40b6cb1dfc954403896dedcd584d154383c38233abd422e20801a7e2f9165a6b69e4e5 SHA512 db4274b67d775ac0a46df11037dbd4cab84e1128be6d5b579ee5e1f493f3cc9d0950958610207ad5f207423570a86e664a9817885e25f86a858a95f96cfe19c2
-EBUILD libgusb-0.2.11.ebuild 1273 BLAKE2B b974f26b78f2146731af371fc13ae4dda7b7d651aff1174410024ac4dcb554fa2eec7735c6f3156b866a7c218a6e07b77cdfb0c1835dadb15b1713ad0390ff9d SHA512 fab1a7c922c3062e8574a26fa5ac9c7fc430d606f7c0cff684e2fbef33158bc38734c70ddc5f8da016b5bf1940a46722938e9f40dc5433b882647816c68675e3
+EBUILD libgusb-0.2.11.ebuild 1274 BLAKE2B 2c1c8b748b1bff04c5d0976ac125ba508428237eda965ed898d4db331b2250116bb4e8bde8030e6d3a49a7abb92629b7efc058cc21a3b3f515400d7b94312584 SHA512 0458fd41a58329590c700f181c41c5737daa636a213ea285d5c3930ecafe2db29db7b427b575f6103e807fc5492f792fdf9f8d44f45d8beff3129f6e3e52ddcc
 EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
-EBUILD libgusb-0.3.2.ebuild 1499 BLAKE2B 2e7e4dbd2d6ed3616f2c4c7fa4fc603bd78294caece4cfa0daa31985f50c5f59de387acaf150bf42303f3dbbf0f5ebab0c59bd3e3542154b5a596ef612b541d9 SHA512 47fd9ba8968f866a828298334d066054d7ce54544408030d899771f59928ee0b355a9202e6be60368cc16b7add69f020f38eedc954f45f20c422488c1083c53c
+EBUILD libgusb-0.3.2.ebuild 1497 BLAKE2B bdeb19cfcc0b05b846e546b6a1eac91f7cca3acdbf898922f6f8ec7dac36d0ed02d3184e85cbb94eb4c5af2cb55a88fe7ed42191f887cf64f8feb9c682bc764a SHA512 2d5f829dfb61c0a88284676a6e6eb4ef468c9faf17dac39a6da81c27c6ecabf2d8f79e9a2189437b2609a7c83455e9d0dbaf7ef6ee7fe8c50abacce2602a0335
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.2.11.ebuild b/dev-libs/libgusb/libgusb-0.2.11.ebuild
index a1cdcbc2c3dc..fff687584232 100644
--- a/dev-libs/libgusb/libgusb-0.2.11.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.11.ebuild
@@ -12,7 +12,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="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgusb/libgusb-0.3.2.ebuild b/dev-libs/libgusb/libgusb-0.3.2.ebuild
index 87219dfe567e..9734d131a05a 100644
--- a/dev-libs/libgusb/libgusb-0.3.2.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.2.ebuild
@@ -12,7 +12,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/libical/Manifest b/dev-libs/libical/Manifest
index ed39431d83ef..925ae799e26e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,7 +4,7 @@ AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
 DIST libical-3.0.7.tar.gz 881352 BLAKE2B ad256833a69ba2e76301b1d9f732ac22c3d5a0030bb81e2d8ef57471338fc583cf1dd21cccb1301d3fcfbe1905a42bebec7c811e90cc8b10faa6e773fc1366fc SHA512 4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8
-EBUILD libical-3.0.5.ebuild 2040 BLAKE2B e96ad24550d41e7517ebb275851ad22f5f07e70267b4e5162665047c8a1a4b45a9806a58f1120556b1cd3909b92ed1c9389e015c696832f07aab5e436bb54092 SHA512 1ed23ca08758b27a86480f2f8af9b39974a501665d56e06138fcf0edfd4d04a0a45801c29725c0eb1a7f962dfca672c15a71de81d7ed80271314979fa6eeed6e
-EBUILD libical-3.0.6.ebuild 2259 BLAKE2B ded271afe8306f8a3042b3862ceeb27be9cb03b232a4bfa0e86a622ca8a60960014d4de20c97b42ec0af4699cc78fd12c65948f9ef24d63f9b37c6b7f150e8c0 SHA512 2d9cc9caf082b362f2b15250bb2509dbf5c063aa24914d7c69ae82d8c7c55f62715131d077e930fcbbedaa464ec1ae673c7f967527efbf17df39841bfe62d183
-EBUILD libical-3.0.7.ebuild 2264 BLAKE2B 9b5cb35307901451a06ef5e421da7eab6394ae89e412cee3b6001f6ec0263b5a94558b197a45bded26962d34f0578ae9076a82fab455e73388534261ddb56753 SHA512 5704173fc0dadf9b032be81fb28e58608ccfc6752fac9b10f14f210c820eb2abbfab36f2f8ff9db87db5cf3e6c2284c448c396d9695368ce9505c54dc64dd0f1
+EBUILD libical-3.0.5.ebuild 2041 BLAKE2B 4b84677ac53d6d9b3b470cf71b9e9e6c8da2157ed2601298d16530763ce563f59c16635a67a7a85715765c26042bbd0ef53e88c60143f57915cd8c55b1b4b704 SHA512 7a6836d1da1153d1389e7273986d51fb658704103b54dee4176eb8d8e8f53f17894a5fa551446432529daec327b55918dd910c0fb0f834392fcc21107cc3b9ca
+EBUILD libical-3.0.6.ebuild 2260 BLAKE2B 53d8e1e40e4b81c3a2106a7509426c9f670e35ddac5cf806f28a1862963223d6d95830349d2dab142f7fdf71afcc1e75bafae1e466fd9c535506a8c7070607c0 SHA512 7f76624daae75bdb57e82aadb8e3bd44e72c73860125a1de8e705989e7deb004259a90c06e7860130550d06ec134e61e9b00c7e0152c5a7cdd6e3c5f195dedea
+EBUILD libical-3.0.7.ebuild 2263 BLAKE2B 82a804349bd087b7f567d8633f4507eceb88d650780a08e8344be2f9d1852ac80976dea2af59cebbfd8d5343706adfbde000e3438821f5e3b940bad7ab6fab49 SHA512 6a6352ecb36c041908d5d70f2cf036b8b8d9465bf6e1cef718a539715e62d70e6801346e2d2070b3c7784b55f8dde9919ffa30de28f5fc94705b9a625a176040
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
index b977742f2cd4..5fed6087ffa0 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -12,7 +12,7 @@ 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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples glib static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index 6f7ff1a942ac..9be59cdb1257 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,7 +13,7 @@ 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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libical/libical-3.0.7.ebuild b/dev-libs/libical/libical-3.0.7.ebuild
index 1c481ccc86ef..725cc5327f81 100644
--- a/dev-libs/libical/libical-3.0.7.ebuild
+++ b/dev-libs/libical/libical-3.0.7.ebuild
@@ -13,7 +13,7 @@ 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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 1e0cf5404c67..3c16fb8a603f 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r3.ebuild 1722 BLAKE2B 8f3b29499a3185819a032f04ee931b565fedf65a1ea67dc579c13d36a6a7a1f77215ee32cab7f7f646d92fa57900f54126a350d2c1e8e2468cea4d2ed4b09aca SHA512 10c84de5011de720281115addd1e5e0fe4ee0406be40de54e1b0a4f89f7f758678d61ab8dda388a3f4acf82e5c2ad5ca9ff2dbcd7ff2b2c997ee9be520f7dfe3
+EBUILD libindicate-12.10.1-r3.ebuild 1723 BLAKE2B 7adc69611ad2015e42a6f45b5f7a8469972e9d759f54fe1c0f86b1fb3a795a20c87e53008805a9b6e216daffa106bbba0b75bb4fdb947cc70ec3d99154d7992f SHA512 a007b7fd5d91d1156d41da2cc3d45d0d5d960e32d29fff1622047695d579c9374756aa2c05c35ca21c40372b43882a91e70c30fb41b4c3a1f241f74170713c5f
 MISC metadata.xml 246 BLAKE2B bf90acdc36bc8aa411c24dc044144d43ea688be2451d7aeb1bfd3d7cc047e9fb9f59ee60389b200a43bc7fbf9b35a235d41c0866d2d894b989cf78156652ecd8 SHA512 a7134844aead376dcfe05a2d3eec66ef246a31a970f0d0b3d6acb2b31da13e67d28c94f6126e214384e5ad712b0e5bb1d0ddc946468639c000cadc3e79c19f8c
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index bdb26096b1c3..32666cea7362 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index a6dcb1f02bb8..6a6305af97a7 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,5 @@
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
 DIST libinput-1.15.0.tar.xz 573364 BLAKE2B 521e5775fb98b1b3a281d1002bd41fb0cd3e7dd3d7c1f11bd32773fb8651cddfa7db1fa2ca686a213ecd726f2f0fb475cd3f40a7a7290101286a334fa7b0086d SHA512 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6
-EBUILD libinput-1.14.3.ebuild 2067 BLAKE2B 8f5270d7d2caa9aaccf6c9179f9c70da2091c43dd483439918863e18ad4cb9d470531327dd2b660fb993e5c26696a5002ccbc311ff0f00ccd7af30a7c2947b6c SHA512 eec289a1cf8fc1ec9f2cea3e2021549e3cb2f49124ae27d5acefe9c60e3db40b0fa249c6447936f1a919e81e87ff3c48069012f3e72100a2aa74130255a3f49f
+EBUILD libinput-1.14.3.ebuild 2068 BLAKE2B 9c8389061e1dc228e7a871110ee821ba79a012692738ad556000a15b5476ff27a8df18570059c76a113db186cd64ffc1e94aa28756e82c425e99a5cc8e8d56d6 SHA512 d23d2a0fce2e1fbce84e8c98c0646e62af3b1a8c859a657d78654cc1ea5c5105bad060b5c1ef78f4a040296f7ad5a6e305a4755c017bd878b2d49cbfea424861
 EBUILD libinput-1.15.0.ebuild 2111 BLAKE2B 8ae2dcf29df2fb409f8cd1609e9fd82ba9fbba8d7fab64512ef99ca22d6a2d814819426e3cacef11d493c00f9b14667d689969e6205f1906fa583ffd2de60939 SHA512 9f59464f1569e7d7634d042cf60ac8b927a38d14b330491c0119bf5f2162c282ff479381c8732baccec3ab7a84b189be0ff8ed168692ad9d9d942e9067698992
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
index 5a77b346bc06..23c60db47803 100644
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-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="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index dd8ad4d97ae6..8e6aabeceded 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,7 +1,7 @@
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD libintl-0.19.7.ebuild 2091 BLAKE2B 5e46d533a6d4da1fbb3bb50df802ec2dc5c8dfb42b284dd4c595f5251bfc91137c825e9651e2460f05730425b0be9a3c7291cb57aab6e1944da28f2c196d652f SHA512 09dec6d6e3803bdac6f6ca8d234195ef8a6ed0730c432e7bf93198837ca48e942630db8e6c4b92833da51bfb5d4aa7bdadbc1e8b31756349e98fc9001a033f56
-EBUILD libintl-0.19.8.1.ebuild 2090 BLAKE2B 5ce391612348ea51cd407d92f440385b43be99d3014d07ad23dedeb3083ffebaccbae108167ef0f3073d18c27c6ea70ad73eeaedd8c9fd175d4086cbd6d68b02 SHA512 903a9c2ddf3226747ac9aaadf124847f0bbd0fd7f0787edb88953ad9a9eb42435144706ad6107c7ae0562145039343321b02dd575e90c2efc857e04795bcd047
+EBUILD libintl-0.19.7.ebuild 2092 BLAKE2B 013998d24274e0dd3e59aa4c7b4e6c058ca8c016156244859762f3054a6f7c4fd31cb93e94a9a3f4c359be70c967177f03c13359e739f0b138797c2f0b870ac8 SHA512 722204467911b0c1ce4a45fa08ae604fb07fa5550d8b83bbe0e7dae92e185a75dc405c1eb7451a65e9c98e51af33b114d410c078698d37e5c3677c9649909723
+EBUILD libintl-0.19.8.1.ebuild 2091 BLAKE2B aba2847691012715b822adf210577c214ab7f94d5de42295437f9119bdd3feb8512e8bc21ccb9f5b815007aa5b6b36dd1c23927e99c35032f630043623b73a59 SHA512 5d11fc7d2a28609a754f0246aae194ee3fecdbf22719c6403c4cc5af78b6d2cd878cb76dbaf62c70e06602d94dc0a89de038fd42742a941e6ab1a04eec316a88
 EBUILD libintl-0.20.1.ebuild 2113 BLAKE2B a3b780f97ae721bfcfb65508051e1f1a21d8a3715e1091a24c5a6ab9f64112a82469a2b1920a92afd1640da6b328bd56295e6d87a6b2530608c16b8afe6633cf SHA512 c785ddb9d4cf4d9ac3e57949a3dc23de0d83c3dc50e8f11f1357e6a78a779ac9702aaad5d2f8809c935d9295e530497b2f5ba9a51cc4997ceaf55fd7936861f5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index 65079b693fc4..fb978b7c0339 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.ebuild
@@ -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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 4aca7480b3ce..600e5dbec942 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 3b6baf5d3714..bdba272b887f 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
 DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
-EBUILD libisoburn-1.5.0.ebuild 1831 BLAKE2B 8668b61a0732dfa562df9362afcaaa6e9c00938211cfe4e1b6efa91a968ad01aa68b7f85debd6c25946f425cdd976f5b2cdb4a36f9ebe72fc3aea6fc532e04bb SHA512 1c23c13158803e6fc631a2efacb66f654269d111dd36b62fc5d8e48ead6745d8b79670f60158b4c190cc4fe3a52eaeeb5fa74f40accd5d1da4e50e8077ee1bd9
+EBUILD libisoburn-1.5.0.ebuild 1832 BLAKE2B 2ccf32d31dc56aa5a83ec48e193b776309ddd2aeb994c5aa1b8a4cad42f4626dfd3676fe935897d18074b2731270a6fdc302b10aa9a0426efb0cb4c96570c1af SHA512 3c617db78b403588e829c46e0bb35a91a4c568ecf22d1f8565e800caa41f8ae1dc2509b0b39a045063fa006623ee19cdee43e77ab532de41f90e4b41478b6cbe
 EBUILD libisoburn-1.5.2.ebuild 1840 BLAKE2B 05a5666b81d848ee6c841bc7e82bb4768d76f7f329e9ad5af8b0a523d423f9ec52d5b0ebe4bd87ce4a0569a71279e16f91c6db9e4d4be1bae95426dc9bd9519d SHA512 26b28195ee02de2afb5255876befd7dfc78664a191986f9a131b292f9d196bfac6299e471e44957286aac40a2601de8daba15a8895890909b8aacf722efdb6a0
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
index e8f60b6d0dae..c9d836e80344 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-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="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 07d4f0d997bd..d5bf978b8902 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
 DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
-EBUILD libisofs-1.5.0.ebuild 958 BLAKE2B 4621b9fa67538fb5d88f623a97fbfaafec4240cd634bb7ab85cdd0bc3e81d1af2264d9716f1274e6f83e73d53285e4e9ee9c74c3a4da53c8eb2a0f021e785365 SHA512 f1173bbfb7f3def135b7eeef2cd68c9286234727d7392b2a3616564f31b12acff805e72225060d06d037f07110fa8832cc2ea6dda0c6e45d2fb6fc12d83e1c14
+EBUILD libisofs-1.5.0.ebuild 959 BLAKE2B e829cc4c8e341a4976c8fc674bd19d2581c3da60413d33fdc1be48f7e45935d0d3202d7358364cdb8f084d69e5974e1b142656585e777d8f44c82a9622d14c24 SHA512 53374f5d5bbe3d79ca325f968c0e72e9a13c05cfa26f23bf2a3b9d10857c94475234e260e4256651c0523401aebfe83a103d8119ffcedca53be34a5578b032c3
 EBUILD libisofs-1.5.2.ebuild 967 BLAKE2B 77cf7ba476381df2d7b6eada717502fdc36ebd059327bd86f18467f35bf67bdf0019f6f16d11037261f8ff50f5c1cb3895c298ae23cda61bcb2dba5f87d6c47f SHA512 8516bfe16db4eb5df427851096f0ed27fb529d3cf821624bd8fb8d59ae1fe8c0197bb0dad9dcf099174950bc1946f0b58b50c9a403b2493547d5a920b56ab337
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild
index b098d713750d..b70cd434c9d2 100644
--- a/dev-libs/libisofs/libisofs-1.5.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-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="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 1b452716dfc9..6ee90010e2fe 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-EBUILD libksba-1.3.5-r1.ebuild 781 BLAKE2B 4dfb790e19472c505855b8d725ed3c8e7538f232115e4e02703a8504daf2df8cc3c940d98aeeca609d2eb5d736576a3c4ec2aaec671153209d2beabac1a020b6 SHA512 f0c4fa8ba02eb54738a96cebc27c9d8abf30a4c64dc5dd572ba6c082d5c18fb33f08192c81051eb959b9a8c5c41b05ec54acd092d13647c60e4c827a444f5909
+EBUILD libksba-1.3.5-r1.ebuild 782 BLAKE2B a84420b7bf2d0673a2318d03fad1d6bece1469e1b5b4ea6ad834e024dccf96c3437f2d76a6ba7beb63a3d0a7ff18d6bee70a70b8c13c3ce2be1bb8ed74cd8aaa SHA512 13a33b82748946793b63744c68ffd150c0c3fe4e9187ef035da5178c5c6e141d9df901a704a5ee1dd297631f18785ef797c3db64e5f6cb4c8d05ae83bb6ca86e
 EBUILD libksba-1.3.5-r2.ebuild 1044 BLAKE2B e86f3050c500aa5b68b5a1c095de9e8ea96095629d728962bb8af31d33e0764f6e7f16174cdee4e65fe09791a45e06fc7de1389dc3d532478bda9680055dfe68 SHA512 a5a820aa03c920579cba25358847cfacd7f4c26c56f62aed71ae7e3a9a479184b2831c58871bd3e6c6875b48a876048326ac43aaecd08e3223c4ebab96481e18
 MISC metadata.xml 363 BLAKE2B 47525d43d5882725cae82a4da39f6a4e3f5dfb9918fbd2cc869af4016a41db7768120db58dd68b2fdf6b433b4f571080c96642af30a3399023bedfda72f3cdf8 SHA512 3bda082ad019aac69218fe9211a5a36a43f9f4db2c0017669fd1a4ce73d24f37798c1f3368562e6bb91417fdfff0ed795e1b2684e05a83100a18cd809cc0e396
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 1e60c2c7b3cf..ad141ba9afc0 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -11,7 +11,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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 588ce0140d4d..d2b53af4c3e4 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,7 +1,7 @@
 DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
 DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
 DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
-EBUILD liblinear-210-r1.ebuild 1167 BLAKE2B a0d1764c3ddd712031f95177cb16b98c7fdecfdc27e2a79ced241341586d69c20e440bbaea33b3cae6473339f5f2016cdf82e8502302c4e5d53a834a949109d9 SHA512 f18c6e659ab04373c64aef5391c94df494306ca4d919137869bbc8db98c0fc52a857dde3c011c00f977593f4b2bc2bf76ad2952e8fd352524185f6392c84a18a
+EBUILD liblinear-210-r1.ebuild 1168 BLAKE2B 9449b3206fc5cd24abfc4995148a85b99e95495918335e278358d4af4a9fad27ab0646302b5153cf7a965763ead8d6ecfc715c8a2c5e4d0e49033eb40b544301 SHA512 96ab13a72ccf5b65e3c1240f305b4e0c41bfb97c1ca1d9e63a248dffc29384a1b9f0e5c8f9423270d8c3807b142a251a8c4a9d95250efe64e3b7d85259ca1097
 EBUILD liblinear-221.ebuild 1201 BLAKE2B 81693678e4ee3c03203caa7b111042f6b8e7d82b708bf9d3a0f5b585c76a6bbace7691d270caf2f3046ff9653ef948903fb30789971eaa40ae82249cfa618c71 SHA512 a4ddfabe8b35fb1e0eafb5b9290aed978074516e4e2a5998a211bcd4d425a8cbd0800a7522f884e341cd8eaf7cea1d5f869fd7a3c107bd02d16816499e051ff7
 EBUILD liblinear-230.ebuild 1201 BLAKE2B 81693678e4ee3c03203caa7b111042f6b8e7d82b708bf9d3a0f5b585c76a6bbace7691d270caf2f3046ff9653ef948903fb30789971eaa40ae82249cfa618c71 SHA512 a4ddfabe8b35fb1e0eafb5b9290aed978074516e4e2a5998a211bcd4d425a8cbd0800a7522f884e341cd8eaf7cea1d5f869fd7a3c107bd02d16816499e051ff7
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index cb9a44912d2a..d56becfb6d52 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 src_prepare() {
 	sed -i \
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 3cbbe55300ed..da92597c3ef2 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,3 @@
 DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
-EBUILD liblouis-3.10.0.ebuild 1518 BLAKE2B 088499489ce96d49e52d363ec4a2a746cb1ef0c7c86223dc6cc041703928ef4c76099af991826ab24e8cbbcf151d22fb11fc5ab9a5e28d7580eb8a00cf9c33a4 SHA512 af44cd1a03adec90d08089e21b4f7a48b67e2365edb1280e754fa425fdb038f63222537fc7acfc3d620d68100e7b1092896550735cef95fdfb519eedd25ceb9f
+EBUILD liblouis-3.10.0.ebuild 1519 BLAKE2B 721482ff09031647c05c698bb7bf3cdcca3ab61b0cd13d9df844fa49d656d2a84b60b1b13788f51f240c537b5efc2677ebbd1348e194f348235ef1f2dc3cc655 SHA512 2a500e2f973b70dcad45d98f94b7b70079e6db3defd9238297a613c32899285c2343d2cd8b4d13f3cf7b4f5f8fea93ab20a848cc70341f10811ba9a2908580a1
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild
index e414be4e8e05..47fb7480de86 100644
--- a/dev-libs/liblouis/liblouis-3.10.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liblouis/liblouis/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="python"
 BDEPEND="sys-apps/help2man"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 9d1a4d8854f1..4ea6f46cd58a 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 1120 BLAKE2B 120f5a7ce5097f3435635603aa80c7c8472ded3930dcbe2f0fedd5c507fa7c154d448be20e1bc330a70fd4030cbab77a3f0f7d5ba2de04b7d3cb464f55020774 SHA512 02625a3a25db9dae09ea8de1a46f6ad4e6b33801e17313bb0e2ee35126183ed64575829b4c3210f49e1b47dade56efc9c5e3b55481ec47019e1524115830005d
+EBUILD libltdl-2.4.6.ebuild 1121 BLAKE2B cdaaa438c9dd2c83258f41fa43dfab277c25dedc244da2bd45700cf72daf82794171a406af759d2c3752ba850952e420da336a06691bcb224aafa4e2eb8eb48c SHA512 aed367cb90dd66f0e2714ba03ca378a492efe903341f8b9b70309b2a5ab94d5bd74ae1257a2f6da13bb2d2c22205e5fad5cc94fd3f3d00a8a82a06164abc1721
 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 3e3877e3a03a..36e8b0749131 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libmaa/Manifest b/dev-libs/libmaa/Manifest
index ce1d585c802a..dcdcbfadb8aa 100644
--- a/dev-libs/libmaa/Manifest
+++ b/dev-libs/libmaa/Manifest
@@ -1,3 +1,3 @@
 DIST libmaa-1.3.2.tar.gz 287198 BLAKE2B 62432f7f21e353c68a0e9b8f843a5a5acafba5c0cc8e745b07596d7dcaaf9adf723342474b95895fbe1cf003d87d856892ea52196808937b4befdc50ce6d0155 SHA512 dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176
-EBUILD libmaa-1.3.2.ebuild 578 BLAKE2B 836aa13a6f522e96f705ab137ee33a21d8cfb2b14b4880ed35cc3bcbfce97b26fa9cc863af874ba0250ec8669b90b68e969f884604837e42673e664fee469937 SHA512 9b13b915cdfbac1a2b11935c7133edfe58aa751c135adb0362b2a119a742a64c8dd5c7b9a7edad90edc8b038a677e9c52fe40e1593df6877fdcac67a344cf4d7
+EBUILD libmaa-1.3.2.ebuild 579 BLAKE2B 47d629e2ad1f679b64f2b4c338dfb2621885448bf6ce0962560171c0b21ab949ee8458d5e2454a104a580083e606e8f90619a2a9432ac28186b8e5185c30fadd SHA512 4973d99601c53269cf1302aa0308ff7941ebc63a1bd24d423a88328fd2187b58eefe60ab389fe8cec204ce4117e2b63a716972ef85ae3bb0a71d850abcf0733c
 MISC metadata.xml 786 BLAKE2B 45e7e06a21ffbabe58b1b85578d99ccf57ae8e312bb0412237382c0afa8aab9a621fad3bf9f767f9a42de741c144c6c55901da6d3c52f80d5b1d20ad0d461c0f SHA512 b3fd174acf49685a7fa9a3a99f9281b6ed03779223984dcbb8237a2da2c738b132e3cbecdf57c0c7b31581c2ca18d0c08e8bbe322cc01a7b41f8345301f1e729
diff --git a/dev-libs/libmaa/libmaa-1.3.2.ebuild b/dev-libs/libmaa/libmaa-1.3.2.ebuild
index e1c047b6af42..553ca92e621b 100644
--- a/dev-libs/libmaa/libmaa-1.3.2.ebuild
+++ b/dev-libs/libmaa/libmaa-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_install() {
 	default
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 0b97a27f8b62..017fd1d2174a 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
 DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
-EBUILD libmaxminddb-1.3.2.ebuild 583 BLAKE2B 1bd9fd65540bbed1bbabaed1ed2ed0c005b57208adf7377ab3459d0aa2b7090dfe26355a6d88aa420b6da6b4ad7ab44dae07b80804a51d403b374726d17c922e SHA512 7fe5e57942dda1e93b86545157c091dd17ae6582e44d881d0ae1a11fb536dd8da14bafb893e7d6595482fd3bfb4ec513513877db97c62ea691c8ce667b23ac0e
+EBUILD libmaxminddb-1.3.2.ebuild 584 BLAKE2B 7ea2f3c0bf1b0d0091c036bfefece5e55f7ca360cfad8068634026749ec74fa1a69d456a7b96ee90ac1e8129edad8855b3c8623d4269562cdb8b5e71ea3a6875 SHA512 e24eba903bddbb93d5b83e14e50258c09a431f3d72a7477488f24c3bea3f0d50f00d005502f5b9ede4e987c2746ffe4d9f05cc46181d1c736365eb66ff97ec37
 EBUILD libmaxminddb-1.4.2.ebuild 593 BLAKE2B 19a07c359071ecbeadeb97a0129ebb74720ab7622bafc83571beb12dab0ee1326cd0eb78d97e1eae1727d3644c89ef6135bf4b72c2df94a450f74e2e549435cd SHA512 1ea29c3bf96f26d00ba3bbb02469bf4ec812431a1f922e74ee42fe2df880ea94ff233c3a010bb0a804e776e65d410b423c971b4c2cd865434e91745c4c1eade5
 EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 0383df3f9698..1b5c2483f67e 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-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="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index cbdd41e9fe1c..fe4f8b349c45 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 961 BLAKE2B 6545ced5e7c5b68510cb6d97a80a4382933ff67d0f818db9ba1c485fd63697b6e10c11cd23193052ac3432bf8fdfbcf68924b9d59b2fb43e489969ef25792c57 SHA512 59a3b4aa4bc4debe6126ee436507cb19de4e34882207707387c18914309112fefe9d892d3c869cf0812ed217df07042598109f9428d6f6aaf83a874c2ad04dd4
+EBUILD libmcrypt-2.5.8-r4.ebuild 962 BLAKE2B 0ec44b4de37ca859fe2466d07eab47f8ca0b2f6addd9ad49ac2d45c487e7beaf1a238e03a579b9aa557962c2c7221d03119fc22ca91f46c2523e0ce474f6bcc7 SHA512 196822afa44fa10f8ebaa4fb1ad994b2e5aa77934810af133d91ccea0901b1cd97b42510655b72711c409e4f90967673ee586ed8838aff3892fde6571bb1d4b0
 MISC metadata.xml 248 BLAKE2B d2f70b047cdeba6294940f0b4f8c4426c9b7eda93baa14e9bee35b9807c8b7ebd991c7aa726bcfeb17cc68960d335145e857f49d83d1db265935d81e9c5b07e5 SHA512 03ae18ecf8f19984fc4398e0e972bd2a52c033d7d94970d661015c76ede0c81191d9a297dfc7a04a58c1c4bf1cdd0b158236a1255c17232c58b234aeb26653a0
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index ccb711f7eedf..d8d52b8a99d2 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 629a15f848cb..79a0ccd0281b 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 1618 BLAKE2B 7d9377848d3ee3ec1f8f4da04355891e7231d948ae39f7e124245a8e2cad19e7e07cf00fd1183e9adc66f3e5f7dfb5b2e910a6845c9c6bd1eba59bad70fb9f03 SHA512 22ef0f21b669491ec23698626e25f4c5d455a6f1fddc3aad77c136d94ead297cbe7a3b79c5036c08fe6395506a61960ace274dc2f911b517899ee18a99b0eb47
+EBUILD libmemcached-1.0.18-r3.ebuild 1619 BLAKE2B 3b5661eb852a93efef3d430e8f19d09ee2891aa0eea57317f9505b92d7ee04f8c666eb6c216e6bbdf2feac36d3d8cce4f99de079faee80c6fe92642669f94de8 SHA512 2aca0d5dfafc4daf61ff36f5a67ae003879f68bce573798a75ef6ae581616cfac4b08e64ca5cc3aa439aa13517a5ff4a3d61a724d33bd03ce4cb969256e50709
 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 b47a7317d344..7975260b7f2c 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index caf66a806725..ddf0809bf64f 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 854 BLAKE2B 667d9d2bd8231459de080e59f7cdde3e2a3cdb961d0a8277f2ede94d746e4368742e06e6a0af51334753b97d50123024ae652ed83442a942290a691fd4e6812f SHA512 f274ff1c900ea4b9b22e1ae487989526951984707c0acd047d00e7aea7f93876d54640dcd326cb478929bd2ce09c1c42a439040481f683961bf2c6547638e14a
+EBUILD libmix-2.05-r7.ebuild 855 BLAKE2B bfe60cf2561c5d435b40d681e8476a243d3b2ea7aae59553d1e93c9ddeb730c7dbf991d2d120700bd4b297909335079c00ce4e24d55af6131608796ece27cc9e SHA512 9c50f8ed2f83a86808a9db81622619c66b9e371d972e361cfdb4e6e67eb963f6c94747f5a4ab7fba2114dd8c58622e8a8bca103192d17e7f10ff7bae47955082
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 8dd3c98e69b0..e7a2cb0f0d0f 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mixter.void.ru/${P/.}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}-v${PV}
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index f5044953b2d5..08e97840dbb5 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,6 +1,6 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
 EBUILD libmowgli-1.0.0-r1.ebuild 486 BLAKE2B db77100a9b1cb80ab0ebe85361a3cfea16ee3d5b6ff2e88c177d88012bd10ea42efbfee56628edff10a397b2c446e18578ecb647f0608309a0de3cf324363a7e SHA512 91ab512aa3ca354f648c277c67728bbb8a5c4fa151f26989e23b7aef96058bdea4a10c7b6ac84f20df0873b339621f75ec5a20a2a953f2df3d941a4b81b877c9
-EBUILD libmowgli-2.1.3.ebuild 783 BLAKE2B 89c3731f23d31108b54d8f66ba0286799ed32b3558c1c24e41a4134a1ac66fe0fda8a0456a7345383c6dd411bfba16fc12c93b7274811b86deb8c765760db0f9 SHA512 bbd2acee9653faaee639ad4a2ac5a509f5c538cfbc998a4375e8f0cacb3b8d906e66534d94804d7b5c30ac2e039efde72ac446d5286a00de8a1e77f18590174e
+EBUILD libmowgli-2.1.3.ebuild 784 BLAKE2B 827fef357db84b041d43fa182e80a69ed6667c1a9b04c05589326b1a208596ee072ee7071297b171b011a52e46b55acf514ccae9a515c2ce0d9030e603328611 SHA512 bbb1a6add05a34c50da425c82927189c776d8bfaf1f1a8adf81b72ec26532a33365b059434308b67e3af390c007f59ab9d4de2d5883f068f120778d55ab8e1d4
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index d3dda9979bee..a5903e16fced 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 18d39981d4bf..8f734ffd5cee 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,5 +1,5 @@
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B fc48503df10aeecaca484155caabf708372a69e5709a6eae8e4fa694b407cea658786c102fb0307422db1280d61664d77f20a41fe33930b16fbf9972e1fffeed SHA512 7a40f910584bf23849f8b6c079a06878cd4d8efca11ee8db29abae5da989f5cb13c7ef1b8749a393da36887cf5f7d5ac49db817d77dc37ee88a1229c253ae8be
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1681 BLAKE2B a4cfaa14f0905fb300c4e0ebf6df92b4cd410e35f9e75c09e5f0e7a5a03b6aa0ca47d1fde348d31e8e6b96e0f64c14a31977c15f86f40349ee0db027ab6a220e SHA512 2191619f66d31f445250d40631d7888ea0e8807da3a04cf6c6217d2cc562db9592409bce1a4d2f451f2c021a0433f1bb51046fbfe3250ec6ee0360ac509e55cc
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index 95d59ca90db6..fdf5ee9550e4 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -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-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~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 43a6244ab267..27a503205d39 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1051 BLAKE2B c5fc3900556927cbfc4091e4d60a08bbc5298eee8247e35f68c9b31f35c0043f97a3b2f3ad3e11749befc95d123d6d75a3f74e0e6e9411f393af6c6dfb784fe5 SHA512 3a0c0d252e1c7c5be239c94aaff3c78a111fc92c74d646e957f5e92a6af5855312e0ea9db83bfe5daffa35744e832769ec10749293b94f67f4dff3e078352c0f
+EBUILD libnatspec-0.2.6-r1.ebuild 1052 BLAKE2B a436e87e1290a39dd1d1736bbb12527dd072fbbd0bb5d5a19dbcfdd351f2ef16661c5ed8775590aa6c5eff8d13695e85fc5924085948f9ea008bff66d188ae60 SHA512 d5310556d8439489f9ef1303fce43ab2f5d10427f39e224f4a5ce9ac874a94837c926f7b74bd9a21a40b0ee8bc431304d5ab1c039f54e056d58b55fda14f7c70
 EBUILD libnatspec-0.3.0.ebuild 1079 BLAKE2B edb96e466e5499074635f53a9dc6852148d5f3acbfa1615f0fd92b7e2b2a399dd6b5f85fc2fa4cb89c31361ed500e3769a280b7020c9db94d82617bb9c788e25 SHA512 f37b42da70c292de98ab1fffe537077be2af6a794f8c670e2b2212c06fc61ff68cf606b30bee9d28b6ac9958f8642b77baa6faac7b71c4b3ba14f7000f158870
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 6d8c0e4be2bb..fb1c6946042c 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,7 @@ 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index c0a69f5e4eb8..3e51261f3162 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -5,9 +5,9 @@ DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e5134
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 EBUILD libnl-1.1.4-r1.ebuild 1158 BLAKE2B fc2e62c2286a6c5d5ea686ef638a6f29b458f8fc7806ebb29679da77fbc660c086d7122d8e02d732f1f5bd1e5cf073f817d8148c5e0f58abdee8cf35b0b96ee6 SHA512 3213fbca3c960b4d5088f2cc8fba234a1d49a3da4ce617aff11c9ea0207776dc2744143e1989ceb0368c2925318fdee16b9e191183be6ab212cc19ad854f83ae
-EBUILD libnl-1.1.4.ebuild 1134 BLAKE2B b65fee4f8cf8cdce4b923b1b8e0eabfe722e0ccf8fa856fb737a236bab8041c4cf5d3a05213a5c4264d9c1b432584121730cf8d55bbc3486255dd99d0a048b5d SHA512 95ef3ec713c5a739dec59512c597ce983c85db0535075db0245084a33a66ceb59867dc8b935e941a952d581c3b6396bdb11f211f42c45ba277c41710539c2bb5
+EBUILD libnl-1.1.4.ebuild 1135 BLAKE2B 0abbcdb64a714c130b6988c47090a8f3d04968fcdbf3c7c8522a2c2f0392a24f616e59aa0d72ef15e05df4be1150d1ed2ff4460525e7646df1d9d83e858dad52 SHA512 4b68e05f2a68b6fd1056a65009a539b782c76d0895e57f578a8fc376fb0f8b9f255f67fa27049e9e32efda5996f3d3c0b272e7802117113b10a2f70d8880c9c2
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.4.0.ebuild 2405 BLAKE2B 78a44c2f938c8b3e59320044dbc3ec0b14215a0a13158d0b0125a30015bdcc7b68b7de9227b9ba90f01bec65064dbc1b25e50b8204bc8fdc7847d15c46be4369 SHA512 db5970c37b389479a9f378e3cad23bcd306cccf64af9f082a03ab347ebe1b3e9343712ddbfd26939f64da83a1f13b061d87598820ac588554d7f89d1ff2ccfc8
+EBUILD libnl-3.4.0.ebuild 2406 BLAKE2B 798cb45ceebf364bbc7d51939a22168796f698b73527f2043ff94100546aa070a82a13982aeb990406b45956afc11c63319eed8a9ab442007af2ce98c51e0f74 SHA512 ce43df6325d2976b0640c685919907c79246da32a68b153dbffe4fccb00da890e7e1a205a4978f02fde19098d5f38c69339271495682607073c2f4410ae46cdf
 EBUILD libnl-3.5.0.ebuild 2413 BLAKE2B d9fde7267cb94fac78a9de3191535f54883a97c43bc7f6f7935be1ff2d1442da4ec2df801d1ef8ef35de34e38b23cd760f65961fd62e801703b530b4f8693da1 SHA512 97834e8ff162145949046177b2d64bb65c4eb6579f6fb4027acf952b9d912497f58afd6d4e3ec2525188f7e4f70698031fc5f52485654b3447675ed96722eb2c
 EBUILD libnl-99999999.ebuild 2169 BLAKE2B ef7568eb493af030d4bc1d9bd2433a618b10ee3c41a9dd7600a02d7ca98d969a877dc5755abc427ca13b996747121ada7393bbbb520c7d614e0613dd51dea0a3 SHA512 c2cc7ce9a2a57722a2076e879e5852b500ca0340ed71c197bfa129f3b51e00f8a91883f8297ad90c58e009aae80a389305ed5bff68bf8524bf39da4d46a0d724
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild
index 8fc958567840..814efe2818e9 100644
--- a/dev-libs/libnl/libnl-1.1.4.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://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 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 2f3f38680b69..9c7beffb4e09 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index b5563c9d76b4..93f51d8c260f 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,5 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r2.ebuild 1615 BLAKE2B 368382f816b2a2a52d1044f1e031dbda8a8ef350e2d7d21c8df0fe17b873b784f64332baeec9fa6d23ffdc206595f863c218467c7f07056df86a3003d9677477 SHA512 7a53997129988696769781939bbf260136ed750ec180cff1e09ce817ba04a8b9a81514ce072f68105d76b754e679e6f3470b11d86e3d4cdc7fbb7aecf74b60b5
+EBUILD liboil-0.3.17-r2.ebuild 1616 BLAKE2B 93d37ed12729d06be00224c9989925cae95935310cdd8c3468c664b5a8ce82096d7da0006308382e52c24489a07c2325bd76f74b4e9c22efb8f31cb108e11a50 SHA512 130736d3256bd9e04b2e76948d2b78d91d618c984bfc660af6b0b4516cd7d82e241cb4c8e1b3010f622479cb9ccd5cb288af99dacb9026fd367c8fd56737b2d2
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
index 82cffebe44ec..06f6258781f1 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/liboobs/Manifest b/dev-libs/liboobs/Manifest
index 417b3e413f70..4a35b1ddbd0b 100644
--- a/dev-libs/liboobs/Manifest
+++ b/dev-libs/liboobs/Manifest
@@ -1,3 +1,3 @@
 DIST liboobs-3.0.0.tar.bz2 344118 BLAKE2B db4bcee51d6616b5d1e53fae964ab882db5d38fbae2bfe61a154dbc39f0f7b67d7f6ac939f01aaa64ad71e8be2ab170fe7cda56afd7ea929794dec7199b81e8f SHA512 67191294059fc6669bcad0d7e07669b1d9f1aa59e8a56ba8697051b901829bc8ef0ac9efe654160ad722884c9a0a80214e4bc989a8a77269bef0999b3fbaad9a
-EBUILD liboobs-3.0.0.ebuild 703 BLAKE2B 885141a10bb88a5e51251244059df67655a15c4b616ab51f19a908e0789541ee91563367ee610105849bfc1e034bdc87d15a58fc0e2ecc6c5a2e94b6fed939f4 SHA512 6c3fd180164119876bb2fff3ba081a6508ffd9adfb44f6909ee85dcf103e3920983fb8cf7f9266442f4285c841bcfd7b36ae20b3b112a04e98bfd9d78025336c
+EBUILD liboobs-3.0.0.ebuild 704 BLAKE2B 58e6edcbece071acbcbbe020637c49c57d386d48ec7553bb045af7fe97b6ba8e7787288747240fa58a8371a348779087df27a6a85c1d1178173229e9b8735ea8 SHA512 e919e1eac00e2f60b9a8d17d803800d20d1807d819445bb84985320c4372d5c2dbdbb3141a45ba9fdd2d2a6a2e8871cc27c3f3eea473d2dfd7daf5a319cde2eb
 MISC metadata.xml 535 BLAKE2B 2feee3a77b39936313044333627b9772ebac8adb4ce2a971a264dddb4b2215676973a0a7e1447326c4016cfdf6a761e5e4d6dbe9ad7ca377f9d43b6bab5ca9cc SHA512 ec23567687491fd8b5ba96288f01c8564fedcedcf732e70806caa6e2b067d685af611fd8e8d1bfa33222d1d9f8882cd85c92b2dcdf9449a1e407d7b514257efd
diff --git a/dev-libs/liboobs/liboobs-3.0.0.ebuild b/dev-libs/liboobs/liboobs-3.0.0.ebuild
index 803da83e48d1..dfca30dccbde 100644
--- a/dev-libs/liboobs/liboobs-3.0.0.ebuild
+++ b/dev-libs/liboobs/liboobs-3.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/liboobs/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc sparc x86"
 IUSE=""
 
 # FIXME: check if policykit should be checked in configure ?
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index dceb63de74c1..6a0dd31c1df0 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -2,6 +2,6 @@ AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b
 AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
-EBUILD libotf-0.9.13.ebuild 872 BLAKE2B c84fe715f0059b3324a335f5a1533299abcb36630950bdd4d0afcff7960705c7a279d66dc24dc7747b2ecd6dc025e032dead2db50c3d5ba9d45dc812fdb0af6a SHA512 a7182039e276b5e02ddef22e88196d28f02bd0282e007cd7ce636ca5310b1bb5daeaacbfcd5350584a71c35ebaccb94365a76e787c7aa908df22cf8c4ee48dc3
+EBUILD libotf-0.9.13.ebuild 873 BLAKE2B a4fb3f71859a92854f850ffaf29577752e1f5f76d6f3b83b95625d2f03d1c166bd644575c175eba46c2ba7857accea7d72eafaa7e69cd4354b3211424ca9c4cb SHA512 1f7903b4899eed624a15069d978f611de3bbaf1713c2837279324ba638f17d6a3509cfe7cb70bbb8b26e199c6aba6ec2f0efd4a5367caa76c603642a7ca8ea2c
 EBUILD libotf-0.9.16.ebuild 995 BLAKE2B 8f490dd96b182f6adafa3c25311f77d0b960106dd0e063ba2fc7286560c68b82600caa245dae681c321a027808e8980dc6ed027701c29625f8a286c619a42c00 SHA512 abc7511dd95fddb7354bf5ccbf2308d1569b751a000564cafcdeaeae0cd5f3233d47f279763f2e23e1f6bf29c93aad723a208afe2b7a3de10bdd1e99389ec4d3
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild
index a0b9e00c03dd..36de2a57b80e 100644
--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ b/dev-libs/libotf/libotf-0.9.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 38a82b8934d1..159f71551474 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
-EBUILD libp11-0.4.10.ebuild 786 BLAKE2B 9a8f418682368369a9db4a8e98f51f28a4034d2ca4c9e7d5f431fc966390f99c9a5c2678b9f30b27c2bdb0b1111a6b3661d229366ba20951ca26d8a9e2ab1863 SHA512 9ab3cd1b4ec99218d14d6e8af3ccbec6fce882bf8eebc84b4440f55d9e27b2137197ea94904e0ae17fc15dcab8bb015fe9bb6371ce0c3ffb5c594adc64af7ad1
+EBUILD libp11-0.4.10.ebuild 787 BLAKE2B 464824ee7e604b38e424b79cfb9749ade429cdf7fb93464464b35656eb51229aae08442d1fff14e25a18c1717dbf93fcfbe30b265e924b0caa78cdd4bf446a3f SHA512 60301fe8927bfd54cc095a2c5f37ae99be99bfa315f4cbe420816fdd3ef349898598924f1bb407adaa6cd24568046bb37d096fe6db890fbf25624f2d1367f5cf
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 0daf45af4454..19ac8e7da79f 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index a1582e822b2f..b3ee52fd515f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -3,7 +3,7 @@ AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
-EBUILD libpcre-8.41-r1.ebuild 2736 BLAKE2B 49b62dbb0d85eac69d400eed16a2f456c01b701dc50e401aab892e81cfae531cc49a6ab6e9171e92c2c1766674e7d1d80e174866e171b0303fc87ae8a174e023 SHA512 2e69afff8a471cba66990490fdcf6196188aa5f48fc68d4f0121e2776d2617843c3644cdf433702a080b7b63bce838a65468d8c96ef8ad20c9903d1ae846b6ff
-EBUILD libpcre-8.42.ebuild 2555 BLAKE2B 0e115e7d3f8bff89be9eb49f7bcbcf4ffde0f04a59bc06fb443100c4d4e482f4d86b6a05bf069977d1b5d3d2be7037ee9f7d16adb154bb7f7b0b25ac4d1a2987 SHA512 33df88a158c4b04069758f941c676a2890acde8b77966269d2bd9b9efae0598087996c22fdb79317ac8078e40e1d9d194a99e68268da3e3015475be7872a01f2
+EBUILD libpcre-8.41-r1.ebuild 2737 BLAKE2B 1e93f80ba0b9943136c4765b6d07b06bcafc6dc5d6e94d36ea305ea533b6a5175159be96f31a55fa82b3fc79981b093f69de3db8ffd47c4c7c0a77c1f0d97f6e SHA512 59eaa361592778f09385823666bd1114cf576cf493bc33b01d5a2dc78c77ca061501a99e1d863ca6cc7ec9855b6d51e629c266dd6a9820e9dae94d0e98655688
+EBUILD libpcre-8.42.ebuild 2556 BLAKE2B f3c6c001bd86fb8e0d9ca0536747db2cceedd75b3bb7be1dcfbdda0bb5677112befa97ffbadaf5312830e09ffcfff8fe42dd94640c7cafe2f75493421446e17e SHA512 f08b1fc9e1b1653b7e2ff3cadc3e00f14e05b1c0a8909baf1a57f161955dc883e096dad789e2d7c5d87efaae3a3a4d6e74c869ebf979e2d9e37cbf2b0f31390a
 EBUILD libpcre-8.43.ebuild 2586 BLAKE2B 65c6ea1a968a802bd7c104c20e18bdd866b50c8c05ad62b3db3bede2181c873b85e961602c5a678c0e53f3edb6ec8e8221abba637eaf4f5ba58b76fdc47d9e9a SHA512 fe4f3bb99cc99726f38e8c51bce11cc2d4ed7aa64a866efe7dd66a30f100c08c31ede92858ccf992017708a5b3ebd0342fe7590cf58e5becd7b7d0c501e0fa82
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index 0c71e46a0c11..54d07b8482cc 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index c5c986a943a8..5572dd9d553c 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 06bc31e3e84d..0294e882abd8 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -3,7 +3,7 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
-EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
-EBUILD libpcre2-10.33-r1.ebuild 2511 BLAKE2B abcd065375574623703679dffbb248dab0262e04a6a664f34443dae45865be1785611107cc5e58d9f76777cd8a87d74be6e785709ea89d0bbcec73a8a3bf8f99 SHA512 01fb195504b20e6fe88cb066fcaecfae1d133958d60ddfd5a9b3c96f16770becdee5e95d8230356e62c8200e2d625c8331068c20cfa3fd57821d82a37d466f10
+EBUILD libpcre2-10.32.ebuild 2338 BLAKE2B 90502de361070db4558eeaf7c53e392a2ebcf8831da98a64406d8e81776e176819e0cf11efc817fc13d3382c983efe52154a02904e95866366316ca4901cd918 SHA512 5f74f8c5ec7d56c6b8e67a2797db9415eca498ccf2a762bb6f902d839f5286d85b8e6e71fe57b90b66b047bef2e3b2afb7bbf4cc4f0ab773030e7141b12feb01
+EBUILD libpcre2-10.33-r1.ebuild 2512 BLAKE2B 194499c1f5e6220536454e96dccfd47abb33df48275b09e2cd4b6943bc922e9132f10fd84bde14d861e755d54edd7c98a02dacba64b2b35c7689bb699ed75c40 SHA512 032e0eaa9f69bd8481734ad312a0f0452a46fd9aacf76731635359d97806a176674e5515fe00081ce002ffdfb435208ddbbce024a8aed5682f21f7851fc3ebfd
 EBUILD libpcre2-10.34.ebuild 2596 BLAKE2B 6991aa2b8ce4b55a4ff30f2f1d8524ed920c4a457d347bf924b6049b5fddc48383364c5b08316f6aa3612606f8f62c161d073f4bba219f720e809159202a7c0b SHA512 0f45498bb09c8675acdf671bb1da9973ebd75014109b48e01422bcc8fa062a5fe676ac23c3a690b722ca61a45accc63e7fb76f48d9fc3992b9f7c05b5c25207f
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 38335b7f2127..d2ee21e8af57 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index 3d383639ccad..7e070f4de920 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 03c82f8863fe..d27e087f4d71 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -3,7 +3,7 @@ AUX libpipeline-1.4.1-gnulib-darwin-program_name.patch 687 BLAKE2B abf27acb9ee56
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.1.tar.gz 987822 BLAKE2B 672da75a22aebf28e953a9a399d641bae8fb97da20527eb1f72f248d9e0afca10da7426bcbceb50f5bf2574fa7091e7ded5080c4a731327a09cfa74fde3a6c10 SHA512 9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
-EBUILD libpipeline-1.4.2.ebuild 680 BLAKE2B abae079904818fd5839482e328afdd876e41864fffe23746286f82fd8f8c812b1f17e6f33bf47b407b565faff62ce9afb1756cde81648aee7746bf1f04924b21 SHA512 403051d510032f9dec461cffc71cfe1b67d83fa9da2664582434e3c7797d6bafbe8c2e7080a3313802484552c2aae1f2d60f5270fd6ec0eed360f750812cdf65
+EBUILD libpipeline-1.4.2.ebuild 681 BLAKE2B ab37e67267e49f6d64fc88ec6c69be5a4be95197954e33f11debc8ca86ee6f100abf1ffecd85187f8ce8228d84483f3d638d1a0e9a41a640a2804ba519adf48f SHA512 a0b5646d8bb5744afc1c8a13e547a795aa5760be005b27507459568221e69768a75e6442999b5a072a822e3f5eb1d954d4d3ec616752ae4e25320c1b713fb7e5
 EBUILD libpipeline-1.5.1.ebuild 666 BLAKE2B dc816140ab676a875944fe36051d9b02e1b8c7815392b44c5ac1a7caebabba1e38cde6e0482138c0f93ee16944cbb3085770103c73705c8c55ca931d1691b938 SHA512 dccc099da343be2639cb409c5bba5ce1a920092a7e44fdd302ec0202b910e077d8a221fe4806199431ab108befc2d140798fcc2424d297530fdd8c73052fc4b1
 EBUILD libpipeline-1.5.2.ebuild 683 BLAKE2B 1821048d7a209acd10e0f14449d3d0769d54691164a6a750ba327e899dc84df3df34ef63ce632e8b4f93760083a168b5d8da9fbc613bba0c19d8fe8cb183c1d7 SHA512 9d1bc1a889109b68908dcb21880b60da4c7e6e9f87747e29d1172e8775425f5c3be5f1ac58c540dc0aea721bf739733ade9ca8f2c10556d064aa20d0af598928
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index a034d176020b..4db29f1cf06d 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 703df6c6cde4..4d54806490cd 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,3 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.4.5.ebuild 2165 BLAKE2B d80cfb785949df8f5164cc85de8516f41f85062dfbdb67c0b56b03f7dbb38775e95084b81c00617d4d601b2b55b9a90ac139ca1d83eb3b7638166020765d9873 SHA512 be3f45d52b89551cf9448100b7722c48c0487515d27fa0f13ab69aee5e0ab5fa543961b71853bdaea8fbd4706e8b5f3bb3219f0342605b7d4a52c1763c3ff7d0
+EBUILD libpqxx-6.4.5.ebuild 2166 BLAKE2B f7053fe86073075eeae79d9c9e71975641049476a858e086e0321e61d38d95239d4e54d85ea4d35d154e0e3707e7900403786cf1b642366ba4f755f05d616af7 SHA512 5e9138f44bc74c5025b84d67020fffaeac27e4882b962bb02abce643fad7b10df338652ceadced91909b3a1814781d405565cac3632304201ee8ec0affc6c58d
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index b2334ecb8f0f..45ec518c2990 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 4a57df9e6025..51f9eaaf5874 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 833 BLAKE2B 84d628c512d1a14d7e860bddd71b34fe5d5b83f901c0c51e8e3f8b26c12d59844e1c41bc20e2a43a41b65abeaaebf89ffd98942939947d7b004439e712d5074f SHA512 3ae3948d90961540078d54f1750d7ec0ea14b2434f9645942c9c0c36796a5d0a6d6e771688e36863bf6be03c6eb6d96825d276cf6a7663ebc81b3af8a50941d8
+EBUILD libpthread-stubs-0.4-r1.ebuild 834 BLAKE2B 0c68ea5aa6deb5d1b4b333a83583377498c3dcdca7e4359fa1c7a2e13b8b75266886c94f4e919c33a69cef129a0503652124c4f1ab2e8bc7c5c7a4734c29696b SHA512 cfc62f9cc9519968e815835a8b6e594b2abcb76693bdd472309187b4f5b58e49a17d4940c1a5fc684ef272ad75043d94646f69a50ec15a02765e203959b4ae4f
 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 958ae57859c1..03b2aa62b70c 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 27f6508bfac0..6532af4814de 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.1.tar.bz2 423053 BLAKE2B 305dbad6bba47d489cc5af7a362564cf9d8800e72d2e77cdbb2ea6fbf4d6888ef07ea93a4af474a60e6c25df417d0222ba54ebfa458894508410cec1ffbae654 SHA512 0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
-EBUILD libpwquality-1.4.1.ebuild 2007 BLAKE2B ae4222f4d3d4bb1f9af95caed3308210b4032f88bafeadcd287b75efd21e11ba493d8cb340107eb2caafab36f57ffb260b2b6e71294078509b790dca90d8e31e SHA512 01781514a50d9296c2de51b88a87fea379dbfa4190160fe603f52db90762dbcd78f15861e70e5d888f295a9dda06ff0504b88ce630040a5f7796fe9d7fdd83a9
-EBUILD libpwquality-1.4.2.ebuild 2027 BLAKE2B b9c0a7598f7f6f1deae68bcaa371ce45183273eef9786b7c51f8fb4211f092a3fccbcc30c2c281322bf9f2eda9d1dd3a475abfb356226b6009f7136cc4dbd03b SHA512 b042bf39c6da73bc622d1ad59f28f23c82e45bdcaf1a8e5f7c5991f232fdd7f50ed0eb38cd4e7d9550685a714b60a52016f7f3c3ba090b5f293bd981bb3f2701
+EBUILD libpwquality-1.4.1.ebuild 2008 BLAKE2B e91d709fc3740f41cd6180d7010d2b50f104aa9b3642fdd74d566d54aff7add08a14f7d56f3c2b5b0105fc38afc070d76e2bdbd43dc2603d24eba24df6ab14bc SHA512 fc90659b98c41b55d58a0999d46defe0db48513305ac7209de765c9cb8ef982dc897d4b9c0b3176b18aac133937e0e4a6073e03b883795697b2f50fac7c8607e
+EBUILD libpwquality-1.4.2.ebuild 2021 BLAKE2B ce5504e17b00228abc65969fd9769ba282bce0fee32a01785eb2f8f49d3a7e1efa15bd691348950be6ceaf37740e7a53fa6875f79f6108223fe74ca8eef00b9f SHA512 588b2b432c43760026b181b1d831952386f477e2a1a5c91d579c5799fc92e69fa094233b1c0c71ff44c7238c973e067c7cc719da18eb8dc6f1330a5eca861098
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index b636c419f030..bc7e79baf3d4 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -12,7 +12,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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index c0df7acab5f3..8aed1de4bcdb 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -12,7 +12,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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index cfffddc17860..ef838edd5852 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,5 +1,5 @@
 AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71
 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126
 DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d
-EBUILD librep-0.92.6.ebuild 1496 BLAKE2B 62fb6bab1f1b8177c5d4ffc9bda898c235bf9927b5cf131389a0c4cb84bce5cc1d175a48dfe74a94bdaf3572876defb594325c6bd200af3dc2f6461658025c42 SHA512 a2578c98f57c289c8d9d7f749e640fc53cfdf8ffd5c507b8fe0c6fa80a41fe8c4bc9ab3c90481a13d182fa3e84ef88bdcbd83a95d053178f9ac155c82a0aa62b
+EBUILD librep-0.92.6.ebuild 1497 BLAKE2B be4d5b1de0743149e9af05ad8234b15ed9b890b6ba16ef85518e0f053f09404ae1d6f486e7f65045c1cd78d5a661accaf655436eb5bebfdf6b340dad333e080c SHA512 3c635a9dcb5af477df84b69a7c10a528407ebe121c8b3084098ba1c8cb00c755ac24bf7cf77cb91cd9179d393946b1f49184e9ee904910759fd0667df0c0a4bc
 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411
diff --git a/dev-libs/librep/librep-0.92.6.ebuild b/dev-libs/librep/librep-0.92.6.ebuild
index dc666e5c3538..2b7ded211b17 100644
--- a/dev-libs/librep/librep-0.92.6.ebuild
+++ b/dev-libs/librep/librep-0.92.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="emacs readline"
 
 RDEPEND="
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 14343898097c..701a234652ef 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,3 @@
 DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
-DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
-EBUILD libreport-2.10.0.ebuild 1942 BLAKE2B adf7184972a3a926adcb01d0633a9aebe2f0c2fbfffaf4aa06861a6f1a6c0bf908d1b01fe1f19ff0367dce54058be4edb10fffd25af388f6b58da8d1b765c6a9 SHA512 56f4d0d8a655beb8cf349ed95ae34161e43d15f058ce7f89eb0ded399f087ec3fae4d641f4b4ac3e65fd800630f6c3875c3034c5c9a33e9f1e6298f0f84b5064
-EBUILD libreport-2.9.5.ebuild 1931 BLAKE2B 3af1a4379d0b69953827807f5c2670b9fe85fb052fcf6780c0b4d3194af4856c05a400151de09acfbef550b91776a16c0280d0b484a57d8df4106519555600e8 SHA512 cac7b2de2722064f6ce08e8e79b2a24464a9c82abfb1e8bccdadf084b1645718571cf94409d114781db6642ba3c50183c93916fecbf3bfab1102a2eb0391149e
+EBUILD libreport-2.10.0.ebuild 1940 BLAKE2B 93d61e530d0160f88733545e2283c7af8e421311a6c8665b572739acc7635aa90ba69d8b3aaf45fa59dc3d76543203dcdd1b9edccd334ea1b6fd67d9b4951c29 SHA512 cbaac321369f9a593ee2be582d0d7cd6e71b2326a825e7ef7b9afcecb73523172a77007b1e24b96e5293299cb770f99381373b16b22a2399d818687b7c1a4a34
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.10.0.ebuild b/dev-libs/libreport/libreport-2.10.0.ebuild
index f44fc8f3ffbb..16e818b499dc 100644
--- a/dev-libs/libreport/libreport-2.10.0.ebuild
+++ b/dev-libs/libreport/libreport-2.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+gtk python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
deleted file mode 100644
index ff234bf99f20..000000000000
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1 user
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+gtk python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	>=dev-libs/glib-2.43:2
-	dev-libs/satyr
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--without-python2
-		$(usex python "--with-python3" "--without-python3")
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir \
-			econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	use python && python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	use python && python_foreach_impl run_in_build_dir default
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0508455ac617..303fe1d76fb8 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -11,8 +11,8 @@ DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb03546
 EBUILD libressl-2.6.5.ebuild 1477 BLAKE2B 0be2a9690082da8103f087e750c1a8d9768f6fd9fe4e1afe9fd160d5341fca03e420513a7023acf1d0c3e4287209cc48cc74797451793431ffd7f96cf8113ad7 SHA512 18060e9bdc894167d13683aa7aaaaddf49096065960779c0bb7561fbf0dfd7f71db87aaf9abec94b2f54df7bcec0df27c5aa70067ab93b8b738c0036f8419f52
 EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
 EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea53545b5a4dd3c58a8ecbf962a9ab1a8aa6f82868994beef87c6940ac3b5b6999083b20b5641a337d85f11867e4 SHA512 220f19943bb1a1d2951f680128f87d4dd31d8bdbbe7279e87f6e629af326f9117c1a2ea56c5d2ef4b8c803fe1d88f62b11cf62e3ff4ea342ab912d2e1f4735aa
-EBUILD libressl-2.9.2.ebuild 1740 BLAKE2B 92a1dac4b986486784683a9ad72f7278631610dafb59199b6418c816a9edecb1449e0c6b89c9a9c026e9e42a61b78a1b94ad838e8d8b4831f4ac65daf4880e16 SHA512 09d0a042a062a6ab8bc163fca7e9961861c33b485d0cf0ba2231ca05fc5ef3b87ad9785b7707c96cb3589dbb9f9a44adc0418c07b2a1784ef51e9393d216178a
+EBUILD libressl-2.9.2.ebuild 1741 BLAKE2B 3ff5a7daf910176ae42a6ca9ed12f385d71045531bc8fd06dbe48b33d4578d8152f2f9eca2b89f8c072bb834fe68e8eabbe9e315609a7beb38bf6671032c1427 SHA512 bf8c33252b6a914c5c6ba488803fe5640c29351166747e78fa7b062f26a42916d7a3d4ee95f708804c8c5c4940f073b5d271be27e00777ca7f86c1d2c057ebdb
 EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
-EBUILD libressl-3.0.2.ebuild 1703 BLAKE2B 660f735da20592dfe2e70a73f2f4042fe9e8f58cdd592e5dae76c6306b2bbf4f798c818999082e59b3536d7bd0e010d77bd89228ef7708c005dbecc54e1d42cc SHA512 988560b349052c7aa145cdd70d929ae46865d9ce25e8dc032ed48fb228cf79bec8edfa7fb1251e75314e9055a9627be66893f5604a6e7b66e79537beadb173c3
+EBUILD libressl-3.0.2.ebuild 1702 BLAKE2B 5d0393573ef69a6dd5cb814a95ff8025f431fdb0a0332c52cd6f6672ca71f9b0a89649ca790760e865e80f5d6f8172c24fcb2125e048b82996fcf56e6d4d9acd SHA512 594900dfe0fee806a35842f0976fffc833bb9c6788a569c7d7d0cbe74e987ebbdb7f2ee39afe38925d861c5cc81a0435da153bb0bedba365ff270e3eea88ef70
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
index 69d160be52bc..9c10556fcd4f 100644
--- a/dev-libs/libressl/libressl-2.9.2.ebuild
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
index 72024dfe0f6a..58ef921f2581 100644
--- a/dev-libs/libressl/libressl-3.0.2.ebuild
+++ b/dev-libs/libressl/libressl-3.0.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 201f9244a03c..df03f953e626 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -2,7 +2,7 @@ DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10d
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 DIST libsass-3.6.3.tar.gz 331301 BLAKE2B 9e25994d19bd93fb53be32f69cafa40204d5892bd676fd7e9a3fcfe4cb6e84d21e9c53043b4766b602f811617f4eeb8bc5719dd7977657ccefff088d418c4e5c SHA512 e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-3.6.1.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-3.6.3.ebuild 1133 BLAKE2B 7e4ad9c7f8ea73ca19d241f5bc52fa17d85ae2238aeb95cac73f637c82afc665291ac0c104bd8b5c9591d38806006857b78b7b78be988943f14e82ae30354fdf SHA512 396978da337c973d6ce96c5b913e2542243b2f75c7167bfe2bf40031861a22d1b76b559de80e9bddf99ca9365f2650ae94d79df0e593403813d1f44fdb41f38a
+EBUILD libsass-3.6.1.ebuild 1127 BLAKE2B e694d6f57a7ba2d23f1f1723af32443f42f5057820f404dc981fdac6983b2366785cea7e4eca7ab3032bf04730eebd74c7f72416fb90999a9caa2ab21e1cdd6d SHA512 13b7ebc727b1941fb2d4d61b940f603967bf23326bd970e3bf38473a7a85e7bffef0f0b84ef23ae81b606f6c4838022ca083939fbcfe0ded9d29eca8cabf54c7
+EBUILD libsass-3.6.3.ebuild 1139 BLAKE2B 31071ab603883a07527cf4ce67dce875d181dcbddedbdf94339b8433b0144331c830083cdf04567cf2a43f62366726752708948dd4ca81837818d6b55b74651c SHA512 0194ace9ef58fcd1edbf25c21960b2ac36b5fe3a85514fa0f019f5d929ea25a38e164e5925d32b77d9a712093dc73679d31048d92941a2957c7df5e21b07603d
 EBUILD libsass-9999.ebuild 1133 BLAKE2B 7e4ad9c7f8ea73ca19d241f5bc52fa17d85ae2238aeb95cac73f637c82afc665291ac0c104bd8b5c9591d38806006857b78b7b78be988943f14e82ae30354fdf SHA512 396978da337c973d6ce96c5b913e2542243b2f75c7167bfe2bf40031861a22d1b76b559de80e9bddf99ca9365f2650ae94d79df0e593403813d1f44fdb41f38a
 MISC metadata.xml 763 BLAKE2B cd9a87ffa0ec968701b492d614a2183df763b8bc36ef0b4851d72ea8c162d6c1dec3d0fce2e8bd95e38d606b6cd3fc958a25e91d5fac69d11a680fa75ff2523a SHA512 be3333cf53d2704b1959fe6012837d9220a8d076a5287795a802961b044dfed989b337014b938b96755a89b23e9c66b5f760f97f31d1a54c144cc34cdf19a94b
diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild
index 1ece89467a74..1d1364419272 100644
--- a/dev-libs/libsass/libsass-3.6.1.ebuild
+++ b/dev-libs/libsass/libsass-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsass/libsass-3.6.3.ebuild b/dev-libs/libsass/libsass-3.6.3.ebuild
index 206e7040d5f7..70fec398bd24 100644
--- a/dev-libs/libsass/libsass-3.6.3.ebuild
+++ b/dev-libs/libsass/libsass-3.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libserdes/Manifest b/dev-libs/libserdes/Manifest
new file mode 100644
index 000000000000..7dc9f8780730
--- /dev/null
+++ b/dev-libs/libserdes/Manifest
@@ -0,0 +1,3 @@
+DIST libserdes-5.4.0.tar.gz 62331 BLAKE2B 01f06004e1af2374a9d5d039b9d0a8d53bc1e61bfd4bcc6ae1a4794553903140b73373d7e9d8799069df7369219c579b30b06dab07cbb860b4d42d2cc7e9c0a1 SHA512 3ecddf59c069a4d9ff2b8e718f700e897cad762d0858e34bb4a6a63030226b7e6fe8956431149b59678240d590a2a04f026d49c2052a22f2694fe61037f2e1f4
+EBUILD libserdes-5.4.0.ebuild 471 BLAKE2B 367cadd4237c3ed031e34c5a90c4f8bb5ac5655f196ea16447d74a7b248f47451dc1cabdec8ccadab9a471279affe2f12d3e88dab1d2fbfecca957f127d59115 SHA512 1d11d7b568dcc06997aa8d35c10c16dbbf3d64da2f89af704d5b1cc7353260c6c03d6508773446dbc857217abc2ba25910f7ce8b7842f426895c49409a81884d
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/libserdes/libserdes-5.4.0.ebuild b/dev-libs/libserdes/libserdes-5.4.0.ebuild
new file mode 100644
index 000000000000..6ad4b367cff7
--- /dev/null
+++ b/dev-libs/libserdes/libserdes-5.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Avro SerializationDeserialization w/ Confluent schema-registry support"
+HOMEPAGE="https://github.com/confluentinc/libserdes"
+SRC_URI="https://github.com/confluentinc/libserdes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/jansson
+	net-misc/curl
+	dev-libs/avro-c"
+	RDEPEND="${DEPEND}"
diff --git a/dev-libs/libserdes/metadata.xml b/dev-libs/libserdes/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-libs/libserdes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 8ecb1961aa3a..decf0e61c937 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
-EBUILD libsigc++-2.10.1.ebuild 1526 BLAKE2B 650dfc5fc90971e098336186423d89830acdcb6412ef298f82f797de8d9866277d9146c7fe1784630518428ea219d054a41d4521fe4bd87fc1c36f31001fa34b SHA512 b8f861f560c0f226b9a7c4d642bc4efbaff32f1f5d9566c4b9c83d4bebca7704d8d629237f6e7cf93a9803ad1d7d1ef8255d9167d89dac8b2fa9a7b89e5d738f
+EBUILD libsigc++-1.2.7.ebuild 954 BLAKE2B 087c8ea2ebac461afb3b9745d4a256983ab27d769d3a5292b2ff2dca2a1ae98e0224ab194c5c01a6f0aca3e7142650dce9a5c6224be4f5f7fa16ef8a09f18e4b SHA512 14acf4a84564513dd5a87e1cac5f443a2cf61aa338424a80ec60a00d2252fde0722a2ad0a6e3240bccdec1d86f946a585a5b2f8e631faf9c7a3a002cba87bc7e
+EBUILD libsigc++-2.10.1.ebuild 1527 BLAKE2B 95ac07f17cd76346977102619047399bddaa1e2ef2c801bf3a228d928a056acfc50bd8dc4f60068939db62cc3ec23d6ace81673c98427d22f63ed9614a1d8470 SHA512 11f0313a5e63d55e080ca2682847f39718d991c758e7fd0cd3165be41117ee58c532a3fc9ef0fb793afe0ea68659138157542cab466b55c6577ca74aded9ca0f
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 3803cde8634c..15e624033e42 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index 1e56f67a566c..916e7b1054e9 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 2cb82433b803..842b105af2f3 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,7 +1,7 @@
 AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a538a7a2d9c04e777aa49bdff15db9439f4cf835a42f2c7cafe6d560ca4c957a0d57cdb00b3b3f68432ff8528ede15927874a62c6b64e027 SHA512 9bf6ff64bff1dd8550b97bbcabb7ccae24bae7af200dde7c296a237c4c149cb78e42bc7fcad3c76554ceb550ab39ce65134b53ad1e521dc6229f0141ab047cdf
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
-EBUILD libsigsegv-2.11.ebuild 788 BLAKE2B bc02e09832bc8dd195fa8e583126d035f1a9f0600b6d9c218490939c58c1c4628c2d83f8946297c4237f82539f268686073b5816c7d97fb2aed1be5a834e04e4 SHA512 fa165b6ecf29ed87c8ae2430493426eef808ab596a32ec4f9ce4599a6e7e6d6247fd3c5fdb006618bcb9eac602f1bc99a9c776414085d387d26c7f6f34669bb9
-EBUILD libsigsegv-2.12-r1.ebuild 776 BLAKE2B 9e4ec8b807871a966173f56c6483caf6fbef06774dae9ab07b66f7f09137a877a0999e76ff73dc376dc896cfa5bf17d874c0783a3a388dead6e72b7ff4cefe33 SHA512 25155fe9d642dd196538294f98c24f44efca56fefe0ab7d48ff6663233429ff2a16af1710103067d34598e92b156610e7c6226496b057ad0513713da0f97f611
-EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
+EBUILD libsigsegv-2.11.ebuild 789 BLAKE2B 7a92ba5be07ad2629950fabde92db3396042839b5b85185dad5fd47f9a317ee373a7d9208d99c86c217cec3264ee5cb16845ff472aaef9616e1e0fa13a33f79d SHA512 7415ebccdad0e1c14ad7f9bed5baf65558364edec24d136ab36d37ad894481ead00e70e0794055110b176119e4fa915538ac6d6989014c84f363a03c39c6efef
+EBUILD libsigsegv-2.12-r1.ebuild 777 BLAKE2B 7ab8f6b3e663e5e84b6ebb001a3a9ad92b4c99d372fafce0434a4f4f23e3b3ea2d072aa5edd361c9d8d97f76a7183bea193192692cbd0fc4e0667d471c726625 SHA512 85024d3c8ff2cc5f9fdfc32504acbef4da65116ddcd2dc757c92476120e8351e267225679334d827902236ef0bbb747e76319715211f22cd551a3a7d25016e4b
+EBUILD libsigsegv-2.12.ebuild 790 BLAKE2B b6a5003a3f49c9c1777a94b6a70c3f3eb768f5dca861af22c2f7cdc599b16b050987523e3f28df87e2df722fea1450e79b32f677e552a31ac34fb3185e186d9c SHA512 8ace2d228b79e9d88cd74afeebcdba86b50b1a757fa9075e7f883f5a64b8ba8246a4917dd02a02ef77c21d5de58ad1081f788b2a0947c2f9d78abe4f7dc4c682
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index 3acf972b408d..af0602bd792b 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index 5208e446e1e0..a32d7b9f1dc3 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index c17e565a5c63..6e2fe29695b9 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index f8b5633e7a87..8f13d09c5cb6 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,4 +1,4 @@
 AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
-EBUILD libsodium-1.0.18.ebuild 1291 BLAKE2B 90966094f2c5cdabf74cfd125153092f98ae4af365fc7654f185a46dbe36ceabcfcc589df5d2b923f0151bcab32f20135b304a65f5b71fdfece79450b4ec41a2 SHA512 98fa0e6cd66258c6e4aa4f5ff18d128dabc101aff6141c36f321f858b87a47ce70295aae265d503b721934109a829e8f7e3d9254260d65c738badef77eb6d72c
+EBUILD libsodium-1.0.18.ebuild 1292 BLAKE2B fa5f52d6dae7cfebb9ff4bcebffbaebbcf86851b590b0b33d9b43f2144629c2e34ca0fb810f1c803b4a20c400e9392207b3781bbac3ad989b70f80f016176243 SHA512 d2208b2abff711e8988cfed30ecfcaeb26a20aadf5affa494675caf7ad2bf68583b15a45ab0ce31a943ce4941e8b99cf5ba5975a78418503d1b0fb5da9fa8f25
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 66b613a2b4c6..d24aca86547b 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 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"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index ec461f0f8972..3a708cf5e034 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -2,6 +2,6 @@ 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-r2.ebuild 722 BLAKE2B 6cc6605f6371007890cea96193166233a58de89e6465045f919be3e3d78927c7a483c7fdf9363845b9de884a9d56b732b46ac307aaba3776c15aac56eaa2df72 SHA512 9d5b8c0e54db911d474f461a9a000793afc5867e45677c7d2944f6f752196ee14341c4e8402f29ae86098d1ada364c362886b50607fb9d0e26d99570baa8dba4
+EBUILD libspt-1.1-r2.ebuild 723 BLAKE2B 824789dc8d5f70af6c5ea42adaa743741b9f0763adb86aa53f26c7f84926b86d0cb8e8feccd3c4361d85f3fb6b1c300e33ef17ccdbc713934786da1f238bb833 SHA512 d96ff669d478c2d14d02c8e6cc0a7d332fdf11823fd6692832b34b93b6646d1902cbf7a6171cbe3881bf614706a6cade4919a937eb16999be4a88574f0b31ca4
 EBUILD libspt-1.1-r4.ebuild 772 BLAKE2B 26baacbe890186df7441fa3b74f7a2a54c1038358ed2c9a7dbc65c76509354fe27e31d9e029e2315a4b7c7421ccf5ec038eea3c49d3fb2af7f57be5f9acd5aa5 SHA512 97eb80fb1a122982cf83233c463d68ec5c5c1990d6ffddc7d65701686b10ad5e1e7bf3e6a7746301c5e7589af92c0ea60b27f1ed2f8f5bb95a7f9bb5e541964b
 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index a2bbec0ed4d9..acbcf43103e1 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="+libtirpc"
 RESTRICT="test"
 
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index e07c69b5c103..2e6864edab3f 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1-r1.ebuild 701 BLAKE2B 960e732f58528ad34b5af48de682662699e4eb97e3676b0f54ffed08bcf49875d5488acfbd3473ed5ed5c00e3f7f57f626a5a263f5e18b84c58c2b6ecd3ef90a SHA512 f5657c406550e181708e8acbf5d8585ea3eb4f2876a8a86061a88b2675cd2affd466f9780fb28d4e1b7f78477519ea6fb4f21eb9549cebb15079d6e90a7e40b1
+EBUILD libstroke-0.5.1-r1.ebuild 702 BLAKE2B 5399ddef68ad390886b0d1805d6ad12630cdf6a7d8d9b4a5edf3feab01c8cbc41852c841697323feb645915f15a1c5905350ef0092a90f837504d0d610ef39d2 SHA512 2dbca0c80db051a406002a88c4b4d7df2c344c5edf73e6872bf0dbbd0596667c39001489b6f99c0bc546102798a65aa6ab8bb20b3e31d6696548db925045c110
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index d800a7013d9e..83e9ee1af196 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 34619ed890a1..d43d8561d93d 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.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
-EBUILD libtasn1-4.13.ebuild 1175 BLAKE2B 7915a9b1316db2bbf9ce6a618d9bedbe5b677c64119fbd73066149ee50d26512ce56adf8fe976d496cd7ecff6225678ac82a67e166395c897668435c8cb3c676 SHA512 a680eb1537c92555aac3b00add8d6fe65014906d357ddaf1596aeca9e7b0288df06f8c0908e03b4e4ae2287946cc3020d467545135ba26f7153c2ce189ff79c0
+EBUILD libtasn1-4.13.ebuild 1176 BLAKE2B 1a652e984ba4178bcc24291f56b87ae03a71c823e9233302d90c45a4955aff0f2ba519ae22ed48c4d5bc5c625ee3f661df7808ad323c195660c9351d0cdb6e87 SHA512 a7964013c6856734947d51573aa17c4d50cca48f70ae38ad551b5dcc1590dd879fe5385ff7d99b73e27f74db0b8ffdc0bf86fcfbca81e18dfb90101ecc0e63ee
 EBUILD libtasn1-4.14.ebuild 1198 BLAKE2B 79f5f4e71758e7e019a8342e0a2e78ae8862d17b2cfaac1b508e09ba00c2379ff611bc6738293fad2c2194a08b42be1ac0a464f44671f705ed535c9938c4ada8 SHA512 a1b4f3a55a866fe4fb5f87b4567d4be7c5779c560ca7a925b4b44ea17e3ee964d2108a41c909f603a46971d025bc4b5fc2fe354adbe818aad30348f73f236de8
 EBUILD libtasn1-4.15.0-r1.ebuild 1296 BLAKE2B de75957eec71b3b4955c1b7109372f4b59c57a000923ca57327891f3573edaa037765e19dd43de13b927010b9eb6ffa4a843fe8f7e279838bd7d9eca97799868 SHA512 a2d407306a86b1562c89c489bc72690c0c2d1514591f725e64a67d0c919738bf78eccf6bceab0d6cb964ffe3166b2a3a41d5e2f4a62df949c77c77fd772cadd6
 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 b15bae173759..18d73d8b11c2 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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test valgrind"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index f8ddab266319..846bab950efa 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,7 +1,5 @@
-DIST libtermkey-0.19.tar.gz 43148 BLAKE2B 652745171dded4a26c9c6557b8e97b390922a0ba9ed3e2f82d1d6255dfd7e73508ccf3581e2cd2b96115d4778a7b2c28477ae2e8795d14eef51d763d0a23733e SHA512 052ea6bcc7e440808e90e2f4912370985f3429866539a01f28676f1deb29381176bfa43de4c54ec1fa2682b399432c7a85c236c9de648a3c0f60087d2908e2d1
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
-EBUILD libtermkey-0.19.ebuild 895 BLAKE2B 1c68afb92e259a7de42d2d3bd48ef26240ef079037de7e2ceaa21e0a7fdcfef3ea47dda13462addab9440298c723e5ad372559f4c3ae805b3e31a08e844c5d6c SHA512 7b7fe1baa9b808c9e6a4da1ea635de605dc6ba958bdc937c29153f2ed1eeb67d0c253b15975a6dcf932340c658807605ae7ab9bd2eeefd6b6b4ce3ce49888553
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
 EBUILD libtermkey-0.22.ebuild 969 BLAKE2B 078e9ce4fab1b490f7d9537448609b7761a1abb93a4ee802e71085a903b5bb9f185fd83d75e374a004cff3510b70475d4123726d4e81ff7bc3d3496f6079435c SHA512 7cc7b3f2da87558b313b52f9d9aca6ec960be077dfa6ccf96f1ce722a1e29f456919df27725c5541bbafc8669cf8e3ce01abfad4d9d3a3f810317cc32cd21957
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.19.ebuild b/dev-libs/libtermkey/libtermkey-0.19.ebuild
deleted file mode 100644
index d66e3a7b4049..000000000000
--- a/dev-libs/libtermkey/libtermkey-0.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
-HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="demos"
-
-RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	if ! use demos; then
-		sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
-	fi
-	eapply_user
-}
-
-src_compile() {
-	append-flags -fPIC -fPIE
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 5b61e8463d02..b75ab8bfa3cf 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -2,7 +2,7 @@ AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55
 DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
 DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-0.42.0-r1.ebuild 1414 BLAKE2B f3562f4687c4f1fc12bdc332935706069858b95a496cb99fc7b492f6e0205beb22bfee04896fe3866a7572043e122c3b51a35fd42ba0b5cc3a7d9c16fd32995d SHA512 de700d60f6df294d40f177f31cc0673df7d6687db8ae199cf97b1e15e197940827b2c75c5e47964e5bdae6e997106b0daca7c9305f1e64378103e8b13ee9b169
+EBUILD libtommath-0.42.0-r1.ebuild 1415 BLAKE2B 8a60c97932394540e696c4690510f5ea7b61649c04bee0e1df526ec460344ad693539dfe4fa8fb1a48095eb76faddd7a7a0d64908a0416ecf11f61dc84ecb8d4 SHA512 9df0399d9a9aaf4206ef2074efa02e84eae6c957fc3342203de199b74548f554f930eeee2d759df36baeb32d2de5564f5f0c533b024e4fd4418d7dcb74db898b
 EBUILD libtommath-1.0.1.ebuild 1485 BLAKE2B 0b5c4ba53bfe781804588a997a4cff542c269fdb6c0044fa2666b0eb523f7b6ab2de82e8ff8600f9331d2bf3c869eb1163cacf5eb843a5af4a694af6123df0e0 SHA512 be54807025371e26e1040e50b6b29a31ec1de08e4b0c4da0c85507ee8ea6410237633b4cd735ad9c6e7e830081fdc93a147ec4a43a4b2d1c7c58abfa1e76bda7
-EBUILD libtommath-1.1.0.ebuild 1514 BLAKE2B b2cfb5d25cd2d02112d06b22a07ddcf8e84025b52983af713906f5b7b5886174b71f4137ede6821da98c1b582e529809ca0424d98fe720ed9c43638bb699ef42 SHA512 84042a717f4926af0adaa2b3c6fe5d40de8acb33059dc389f971fc785ef5ba77babca0c319f47b9bd789a8275203f4d7c570c112433a8a04e1c30eff8a4d43fd
+EBUILD libtommath-1.1.0.ebuild 1515 BLAKE2B 394980d8ee01eccd82a3f9b49ce61570cea348ac4508662489a0918c2950c4d55b749e32b24b17c52434d9b249abeb112e2c35898e8041abb4c4d2f59375dd5c SHA512 be507edafbc2b683a80474aba78516a7e3475381d9dbc74a62c2e3b54f5275d64572b639c32e53d17a2d1c4ddd3f54300decc424f01fd203d09472c9352414f4
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
index c75cacd7b6cb..a1596d889e30 100644
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index 11edee2c4032..9f0d02e970ef 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 528dd23058b3..1be2baaa38f2 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -1,5 +1,7 @@
 DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
 DIST libunibreak-4.1.tar.gz 642497 BLAKE2B 79a09cc19e72bcf98605f3c49649c2d0753774825e737e0682ff4b67d4908be748b81b6ba79827ccc2032b7c5284fc2dd932d61d6775cae841888d6ee4a77b70 SHA512 f02a94b1c1757c0321f112ef9b44a17fc9f73c9ec6041f263bb55fe8ec44e5599c6061c4e1f6f92ca9069b282e5a8e40d90dcceaf04b6e2ed6ae948f104e1ce2
+DIST libunibreak-4.2-1.tar.gz 643399 BLAKE2B 620e904113730078a8e74a09594b9e18c63768a926df433b4a251767fd492ae11c0954e97a4d94db577956a621f075bc6743535bdc67f9c5151243f304b33bf4 SHA512 26bbff1203dde9ffdc2b9046727ab7698f5693c1eb898c819ee83d0c97fbfd32b9dc7c4406dea29fff6642b2678fee74a1307aa5c9c3279f65484eb080ae1e2d
 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
 MISC metadata.xml 614 BLAKE2B 9a68d6b1935c236312fb74a18fe8d417c8e11970be97aad071d04b5a2c57cd18df55e2b48a855ff81a3287636af6afb4abf1ab0fa84c6391c013500f65585061 SHA512 bb9c9c2b2264cbb2c7596146c1be2b51a1e0d710432b86b3f68dd7fe9832abe7aa68ffe7806e58b6e4d044d269f86a533b1b9bc437eb5cb80bac39027989e62d
diff --git a/dev-libs/libunibreak/libunibreak-4.2.ebuild b/dev-libs/libunibreak/libunibreak-4.2.ebuild
new file mode 100644
index 000000000000..cf949d1c77a3
--- /dev/null
+++ b/dev-libs/libunibreak/libunibreak-4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Line and word breaking library"
+HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
+SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(ver_rs 1- '_')-1/${P}-1.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc +man static-libs"
+
+# Tests require internet access to www.unicode.org
+RESTRICT="test"
+
+DEPEND="man? ( app-doc/doxygen )"
+RDEPEND="!dev-libs/liblinebreak"
+
+src_prepare() {
+	if use man; then
+		echo 'GENERATE_MAN=YES' >> Doxyfile || die
+		echo 'GENERATE_HTML=NO' >> Doxyfile || die
+	fi
+	default
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use man; then
+		doxygen || die 'doxygen failed'
+		pushd "${S}"/doc/man > /dev/null
+		mv man3 x || die
+		mkdir man3 || die
+		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
+			mv x/${h}.h.3 man3/ || die "man ${h} not found"
+		done
+		rm -rf x || die
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use man; then
+		doman doc/man/man3/*.3
+	fi
+}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 0efc388afb23..9144eb35e13e 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1561 BLAKE2B 898dc5b76a8b8c54180b4b78d06da0bc2b18e814204596d352e3bd061c3c1d814390ac225a8e7f0a98a82caa890a4028a258207cf7fd4fde0c8b290a05af3133 SHA512 80284d90494b066cdd0634d2a51809fc60fccdfff1eff75e53c4b15babab16ad797ebc9a41514df9e119d59c21a3813e1e3082926e87617a3e6dc0868b339be1
-EBUILD libunique-3.0.2-r1.ebuild 1120 BLAKE2B ef51d6c6d770900f2906b9e21f86e73bdc6145603e73081a2418fb45d059a9781f9454f74dd9f50ea5e236bb419d42deb33620379e967c760eff3f11ec5d669d SHA512 d89a30ce0648ae99bac445428a9312b16a87104ec9a2caa4b1ef4173dbc251f90343e0d3b714c0b4ce19111572e6c516e547cb3192576e56d3c4061675e7ac23
+EBUILD libunique-1.1.6-r2.ebuild 1562 BLAKE2B 61cbbafddd7ba0d2eecf06062162d00275a34451316ba29feb9123ff42352640c7361274cb8a9a9c0c8241afee75ba6f6ea82857ac62919f5a2a324fe494654c SHA512 bd9976f31cbfe67733ec0fa68e5d47a23b2f16707818b38956471407aa211dd50472c066bb2cdcf1365dc1335aa6d332d301ebad10e0ab772ceb023c0830d8b7
+EBUILD libunique-3.0.2-r1.ebuild 1121 BLAKE2B 285ae340dc04a072dcdba9381cf0d0f45e5a5535543ff15d8d0e75e041d4f99d9099ca91df01357b1164c6dbe7c379df737b393258df845a808f01670d9a1076 SHA512 8b6da2120fc6a42f33e4bc1406388cdcddfdc3d52db783a64f3f2e3735fb6b671a0b4361cf75275400d55dda7960aac21ae66d7992c72b70ba27b494d0c64bac
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index 1c40f78874fb..ae2f2abfab91 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 24b9729876e1..0538409e7f89 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index fdc867daeb8f..54a6c99a6a8d 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.ebuild 990 BLAKE2B 6947679c9fe95c20863d0380915122ae07c93601ba241872e41300fb996f285697ef85ca47ba427c1860decf16278554efe064b79bc4e45cd407fac21a2dc86e SHA512 c6e6085ac2cd4f5daccd00af1a310a82685c26e899734d5a4c3de8f9a53ad29a1a808ae629a83b8830da4b3ed9fb54b7937db22d21b5a936bad0c43c664b5882
+EBUILD libunistring-0.9.10.ebuild 991 BLAKE2B 718f11c776537fc36adab3943fd183ee16ff88914bd6b2b589123bc89f2540113e6182e1c4f481f37df8ee2290583ef8f7d1028937b23f6b3ac2d8bef1eff2f7 SHA512 ff7d652eff50463bc23065f1b49fcd3ea82f8665400b5946c3185c9f6c15b3d2f85b15b3ac07b3a5ea5b35be3649c02e86a5e1bd56b41827117c91d6ad313e60
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index a2b5e055201b..faeec9120b0f 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 20252759775d..1540a897c2c8 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 1146 BLAKE2B bbee76a637cb2ba7f8d0a2dd08066101d11d5573f767d2611b486d2bfb9142fc24772f0cad79b38ef9b40ff5f2dc7bd05c0833f17ab3753dd3c3ae72fb487ec1 SHA512 4c71952bcd6239d5f754342556d06002d5d58d6a80867981b626de2b049a946f56b84068eb39c5372a602456d62dafb0036af42b9d2eddf13d5a724e1c7d01f0
+EBUILD libusb-compat-0.1.5-r2.ebuild 1147 BLAKE2B ae72ffb3e0a3e4c7e6325028ad2f94494008d9d579464a917bf918d3466d99c08ad88c2a2345c2ceb55c5eb9dd983caf9a61a34452770abbca03047422b0d29a SHA512 f198fa957ad8eb78b443ecaefe55cbc28ca7445e71a1b18d65d2c9dc336e5749f4e4b2a567428d5172a9618756a7046978418e51ac8271588e78fcbf678f6c15
 EBUILD libusb-compat-0.1.5-r3.ebuild 1209 BLAKE2B 013b768afb428aecae0ca0c530b90ef510d293c23f647da9ddc9d394fbc643695490a2618f4c4ccbe4077f3e6527954e6ee6f65671fb491766659323da14e160 SHA512 a3cc53d1446102c6cae59d30c081ec72297453a5ec6acaa31ba1eb6ca1822cce5134390dafc36e4f92ea5d073351fcf1ed82648fd4b13bced768e1ccd3e92958
 MISC metadata.xml 552 BLAKE2B b177713b8523c97bb9cbe9044b69207060489656f4369ebfd44051530f45eaac3500df7c3ba085a015ae8de96cc95777fa9ad1b900cdb3b1fc87395cd865feca SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052
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 ae1358a73624..014b595f28d3 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
@@ -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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 4219f9c995b3..e24e2bc8640c 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
-EBUILD libusb-1.0.19-r1.ebuild 1579 BLAKE2B d4e872b714ffd2a72d3bde90cb2d702d66bf1b9f744baff3a9dc5f204e8f61ef89952d01b1a8ee713ad2bc2178b92c2dfe8b532790bd92ea4cb3e5ac00e6b392 SHA512 b21908ef3e38217ee26810fb887d7b6ab507ab739da2a9e86a185a6f6bcf9d6cb55d66d118a06acc2abe79c8fb5034cfbf8568d0aed619daf27c69db082a0aca
-EBUILD libusb-1.0.21-r1.ebuild 1611 BLAKE2B b93b98d4e4680bd205a7289d6618888e097d6369cab8db1c18b97b1a65e517a4dbd0fceb0ea3bbc031ffd08fd16d712df6d74eec7215bd2a1af7ec6e0132116a SHA512 91b0977607ae11252403285648b264c5302463974f2696b5a89d02fdf70b8a74e0406348a63be0401f4172e02e4e01f069c8bae5bd1eba14862655150fe9cdeb
+EBUILD libusb-1.0.19-r1.ebuild 1580 BLAKE2B de192ee96608b21f81690a9496886c2faf28984c2c79d1fe898153b93f8f137132e6378903369d0f3989840548fc8f118e1029322b88bf13aab40afa3edca972 SHA512 3adcae28da97d9fb444f8f4ab2a8f0df94df9a67a68cb141b27fbb8eff8eefab97f8c19ee4665f31655674f02286b5ef9080573035b302fbb576a752a3d894c4
+EBUILD libusb-1.0.21-r1.ebuild 1612 BLAKE2B cb2a6754fcb6e326b3e9335f35a9d23a779f0f1e17011ef9463a1d441e37fc3aac680f99966d4da600347e1f3a9495be0e899a5dbd8956c341e02ac13e17462a SHA512 d656122331f24c30c77e4c69125f2d13ae694c4759f6621ee793b728b98e5ce869280258e14b3470000c35decf20faa182cbd8cdf1ae8d3f423f1445191d6e72
 EBUILD libusb-1.0.22.ebuild 1605 BLAKE2B 97a29206f655576002df1f053b858be2ece2bfb2bd559faf070604349210c72aec312cbf2d268e1335f025ab37b9f3dbd2d7b53fb57b748ea9ecacce0733f0df SHA512 d1f421722a3e692a8580693de931ee0b5c54dbf40b3142d4196de2ebf9a15ceb056d1dff371a97ae5a61868b53724767bacb487ebd43501e5dfc8d5f4646ce52
 EBUILD libusb-1.0.23-r1.ebuild 1669 BLAKE2B 843952c929c89316d26aed743846d41a88ca34c891068c9232e451f19a621706b1500bcf56e481fd332b5e5efc44e0582db42fd2db7fd28f4ed6d172270741f3 SHA512 eba8003cd8b67df3e638b1c11aed44f646009ee3fe1cfa5f085355c88b7eeeaab5b6fca47b6a9eb2e77da84fe89d8fd169f8fe8d3003340d87fbf474645ee6dd
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index 5704cfef558c..edc651ad93b0 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libusb/libusb-1.0.21-r1.ebuild b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
index 5b427e81e0cf..839f31fa1150 100644
--- a/dev-libs/libusb/libusb-1.0.21-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
@@ -11,7 +11,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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 984c694aae20..5d9c6b521758 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -2,6 +2,6 @@ AUX libutf8proc-2.3.0-no-static.patch 859 BLAKE2B d461d31600b3ff46cdc791f058eb7b
 AUX libutf8proc-2.3.0-tests-nofetch.patch 1229 BLAKE2B 501fb727f371975792546eea70f4b178983eaad5616ddad51b9de8476848d5f507f083d61eae86f2b23a6e4caa8ed871e2d033d920cd802717bcad4ca1dc90e9 SHA512 ec2a51dec3570d0846436ae29ea7776967284abe11c0be77a8a2515017a2588ec9f943e31e0836167b0c614183f30c32b51c2b172a39c4880c5241d32de72ab7
 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
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 733 BLAKE2B 68dd96f0621c780c63571ad0c632359e4b37c3b63afe0c3c8b1b88e576a900432dc08b9d85bd950dbad9ebf67d6c25b54fcd4630a88893e00ab664ac33795372 SHA512 d83d9dd9e8adeb9ccdc017e3c006bf7eb559fdbe2ec91b6250962f80333652819d768ecf8834c71f600254fbb29b1c4bca4ca4758fd9e1f6cca5584e002ebd6b
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 734 BLAKE2B 0a34466817e703653b9c8b84c161e497da80c634d9dbc8bb56058b6d93095a24cb89517b56f59f7d845158b3f2d44dfb0e7d5478c9c40b2fa011736f20df21e5 SHA512 287fde1dec1d20e9c72d624524362206a3abf2b6e4d414cfeadff3f1729a607f2160d0d96080b61dc35cfb95e97cd719ffad8d28b64c9d1aaaf0588dd1da2fc9
 EBUILD libutf8proc-2.4.0.ebuild 1478 BLAKE2B e724ba48f8e15122e8f47a5cf771f9c7c9d237e7c75c3b93c4511114815057f96e5302ebf49497bdcdb895c3e4c4ab64c9057c33ac240a5c73646e3795439e61 SHA512 df275cba446c3be93d13e9dcdae9321855e1a81344fa5ce14b0d3c9e21cced9fe4d1f2acb643209f34e79affa08954a1c700b2322b3e61c019f3cedc9991aad2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 53c0c268cb1f..3de5209dc0f9 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 8b7ef0d2b7cd..8aba58d67be1 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,7 +2,7 @@ DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4
 DIST libuv-1.34.0.tar.gz 1253950 BLAKE2B 3317709603409e009e24b5ff419bbac03927e75f0c0a37f0c6d8f558d027a25e883eec60a46928bb3533308a6f77a9834841e62ad9162df3c8cca1c3ae24a75e SHA512 30811311268179984fdc44209eb0e9ac4c6df08fa30790b75916ae838b23c2578a8a043340fbde86bcd5a373dcc335dec5fe88209560613876ca3272fd99c9e8
 DIST libuv-1.34.1.tar.gz 1243096 BLAKE2B c6c786ceacbe3387a27455a413507cfe69511f88cddf150e98b21520e247a6825ff23506dc7fe1aa8c830772db23085d1b2c496ace11cde8405e4e204ce93f57 SHA512 95212bdba326a22edb2663982a4abb95c420d287c67b20e57d6acdd4c40d40956ad28c599beaf10fbc941c6e50df94261d84abf8ac25abceb10f67d9de5ef3d3
 DIST libuv-1.34.2.tar.gz 1245374 BLAKE2B 500857cac1d714b43ae71c0f85e1cc69aab1735756f402582a6814c4d552a80097e76fe3cf4b74a395b5cc4340156c9e8abef2ad02000d2a5565ee8972062ab4 SHA512 7e7a54d2d1e0ed76654ece9481f02177d201a4590c5d9b5c8b4edf6f795a0d7c30970b907481847930a524a0f06c15c6c73b3ce73a8afa2f836e33dbd54a7249
-EBUILD libuv-1.33.1.ebuild 1236 BLAKE2B ba46888b2a06bb73d4fc16c5489251bb799f62cd4ef099bb809d8060d39ed9c8ba17ec576ed7c3cbd53fda04bbeb1ed3a7fbce50d27edd757275156c990ce801 SHA512 37c1075d5257d67260aa6ffdc9680a7896e90470c6a30d57953a638c4ee691586630d985e4bd3a648c31e3eb66b78f7aef3d5773a9f0b433e8ca9062fe64ad17
+EBUILD libuv-1.33.1.ebuild 1237 BLAKE2B 80c2cc5469951d07fa951d94e23c06e257bcaa6626965e991a970421ac8aeaa2834fe3652cbc2bbfe62a6b4573d529b80c06ecb4f1eead5c4cbe08e3ca727795 SHA512 6f172fd45db44e26b972df6962fd8aea299389f4ba4ff2301e2039ece7bd9780624dfaa02ce56e0e37c21f25d11af548bec956f1f55406ec3b9d70950ac17ba5
 EBUILD libuv-1.34.0.ebuild 1241 BLAKE2B bb32340e87699031eefa1a9363a49a32c578298e8571e2deb903cc8dc9a191d217abbe562613cee6d2c930afa556af7be028c4f5364b641a612ea7d6e3d11d0c SHA512 320cf98aa1af1b7f945f5032a251914a7e6a11e93c6c4a66983a2b43584b64f9342cc8aa1b747cd6f980f2528f819b1a5c856e1b9b7badec31645a28b4d91c3c
 EBUILD libuv-1.34.1.ebuild 1241 BLAKE2B 43f659acccd55da78b53643b5fb0fdf67a9b44f9a11f9ab36c0ee9196be737b5fb6e4ba9577b18d5830e7f3b8165a02a76ea026c0d7da0f44e58bda3ae9b59c3 SHA512 32bbf78f0f34df62b609bc244072b18fd54fe4d2debff3b597596cabc0c3be129daf705a7029479e53693e3ecb054cd6a30fdae2a0d1c95a4dd30578d3f2e7fd
 EBUILD libuv-1.34.2.ebuild 1241 BLAKE2B 43f659acccd55da78b53643b5fb0fdf67a9b44f9a11f9ab36c0ee9196be737b5fb6e4ba9577b18d5830e7f3b8165a02a76ea026c0d7da0f44e58bda3ae9b59c3 SHA512 32bbf78f0f34df62b609bc244072b18fd54fe4d2debff3b597596cabc0c3be129daf705a7029479e53693e3ecb054cd6a30fdae2a0d1c95a4dd30578d3f2e7fd
diff --git a/dev-libs/libuv/libuv-1.33.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index 17dca8f7cccf..849d6f385212 100644
--- a/dev-libs/libuv/libuv-1.33.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.1.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 ~x86-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 ~x86-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 c5721c887bd9..e11d4de73697 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -5,7 +5,7 @@ AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21a
 DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
 DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
-EBUILD libverto-0.2.5-r1.ebuild 1500 BLAKE2B a977607384abbb6fbc95638a6bcdbbb3a4d9bc73ed3ea07268f67ee5546827d477ef881d031ace9366a9f855cd18a2a274c1c7392072233b99d5af85d06de4c6 SHA512 b2fcc86e3f59c3155c684e29b8540738f745052e4755f1f47106372be053638c5c9bcf60268bbbcb1248ee201ec22ec90f39be30fb7261e3257e5d5d614dd306
+EBUILD libverto-0.2.5-r1.ebuild 1501 BLAKE2B a72b4afd7fb9c79e33954ef5f72960f5a7eb1a4ab377fadf05fdedd39e02938307b33a6f5150f9b6967e72b4530b58917b7260e7435d1970b081d05f81957c75 SHA512 1bf80b3165f4ca5eae57e1628c8e4cd4d5e4feddb1379dd6f13aeeb594b7277c817589f01586afc155ddcd7539562b8bcd53a5ba069aafde06b5f7a2b9c553ff
 EBUILD libverto-0.3.0.ebuild 1732 BLAKE2B fa43bdcd7c99fecaf1f5d0ae062568df8ed31fa2943dc33ed1cf5ea67d080edc19b5b1fbc08dd6b7c9f9c8396f5662866fd136340f9ce7ffe50f3b7365f28b21 SHA512 75a9d850e8f90957996da433f8b4c74853d848560d7dcc17f9acf6102cef4d72d70855f2b198e2b30086b78ca11395e77483702291e2bbca78122455ae327b03
 EBUILD libverto-0.3.1.ebuild 1456 BLAKE2B 01e5c3578c9450467a2f17a59ee3aa35765b551ff266cf9629b3e7e588c53d42e401fffafe9d363332833e9928e77419ebe6824f31b38f6d710cb764d54e48d8 SHA512 d2f47ed7be67238fbb1071b6a61c1fc5e3d90fa5286af874a1919918e86f3bde39fab4f501510233fd171e42b9ffef7413ec1955c1909d4abb9203e45615918d
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
index 0e4d61301cad..9b7b234d2d2d 100644
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 # file collisions
diff --git a/dev-libs/libvformat/Manifest b/dev-libs/libvformat/Manifest
index 2e9bd0b4492e..91756e2aef52 100644
--- a/dev-libs/libvformat/Manifest
+++ b/dev-libs/libvformat/Manifest
@@ -3,5 +3,5 @@ AUX libvformat-1.13-str.patch 561 BLAKE2B e914d003a99449eb3c1b85c7385cae24eb4aea
 AUX libvformat-nodoc.patch 225 BLAKE2B 52c6e0487043ed5be2bcef3bd15fb9d325a2e468e752fc90e7b09564420bd2ed6c7fb15557e28e9e6c960851073177141e24bfc46139e3e9db231c1e26c705bf SHA512 92d1478c8c452c2de5780dada50d716f612a944ead5cf5d803d277d549ef83d6ece7339a051b8764a97132dc1f34514027db095f1325be40ae97bc3ac7e1c0ca
 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 823 BLAKE2B a86fe2f53b7c92ac6a45d3924fdb29d7f0b0193907e18fc25d0f356ca11c4b1933e38165d144ba27238b31fc119a84c4ecd95f87ed37f0ca8e3bd76ecb9cdfae SHA512 540cdfcefa6247f73e421b6daefb01816bc8c4a98c8bd6bc7deabcf93891cf504cc45bd8b5abcd9757f895eeb48f6cbbf7e2e3e240b5ba96f636924b98ade079
+EBUILD libvformat-1.13-r2.ebuild 824 BLAKE2B abc9cfd36aeadcaaf03c199a59fbb07dadfef2cf8c8c47116da6f5508e29426e7f84683296cfd2049320d11e28cb2ccb0c58881e4991c043fbd1d68ae3b78d0c SHA512 02fddf4a51b60fb2ff3d2ebb0812f5fa52743ee5738b7c6cd8ce1570c064a055b3824f28182736ff813f9984c02ef60420991633e224ae25beeb3b96b740a567
 MISC metadata.xml 244 BLAKE2B 86616d2746ad8e10c8fec5f671a9b222cf1beaa800872b7d844082b915997eddf7c3791a5de227e0d23e7af580149a86e3b5bb50dbfb4ee8cdb070778182f1e3 SHA512 3d993814c475475ebc27bf08f0695a156d5a3380d23f4b3c782304ae2cceb7d5c4d0695ee07451abffb516ce5237b889bb8daceb70912d94653572698f0332a4
diff --git a/dev-libs/libvformat/libvformat-1.13-r2.ebuild b/dev-libs/libvformat/libvformat-1.13-r2.ebuild
index 45b7ef932415..0306e670f085 100644
--- a/dev-libs/libvformat/libvformat-1.13-r2.ebuild
+++ b/dev-libs/libvformat/libvformat-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${P}.orig"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 4834eeb955ab..29515e7f161a 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,10 @@
+AUX libwacom-1.1-configurable_docs.patch 1281 BLAKE2B 33a4ed7776580f3146351e552fd8fbd26ad4207d612596291272fee2d6f85aac36fc0fd2d47b31c1dffdcc58a325bb3aae28122a1e7cc4dab96d10efdc2fbfcf SHA512 d1d4aa074f8b3d14f7b59f66db86b132c1ab152324b8191a2d99f61b4283ced02f2d931a725c71a92427f31f89a14e323e57c163efbb1a3d71bafe43f5b2f0cc
+AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c1619b6f1af45f6c9543e35f2722a114623480de7391a2cc3f99ee62ff214662ce61c3d0dfc48ff163173bd138cc433b94a43c73078 SHA512 abab5526cc4c9190bc8546d2c4c590d8af41d86a180ef87aaea8509c061837dfb81ba6fb9d34348c9ec63ebcb8736191549feb921b2f6702ffb2184a783b887c
+AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b
 DIST libwacom-0.33.tar.bz2 503217 BLAKE2B 034b06495209cc88e9a3131a8a23b35fdadf8bc038ff9db62d4dc05b31657d1cfbe4856cf7b1a6112c97d47bb532b664e4e59c3b00a2aebf14dfacbcac141063 SHA512 de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d
 DIST libwacom-1.0.tar.bz2 502457 BLAKE2B c7de15e8e403a4778662c711a4318ffd46c65fcb895e50181b14f6f9c4169493fcd14a78bae62cfad8af0e4d762b5babb06df21ff257994b1890d5ec9078e6ef SHA512 43a8098ed06c86edc647d6a6b0ee0b465bcb6089df77fd361909271aaf5f18ae2fecfa34062fd4a9fdee6983ff1303b99636485ebde6a75a669307bd19c2b313
-EBUILD libwacom-0.33.ebuild 1175 BLAKE2B cf9dcbb372671ba9e4f76508bca2eacac88a4c26b9ad4880e14fc5139bbb04af18cbe8c514fb644f1d91ccbb0f4164ab1399e07a8194d9be99fcb37b38d7c9c4 SHA512 fb7252999e9007c551f6acfdac650157832913b9d4942cdbed4d13134eeed0854cc43bfb8f1bb08adc02863cb89a9e2fa53a2258a27066c53116f28a3453512b
-EBUILD libwacom-1.0.ebuild 1039 BLAKE2B dbf80df3a60d3e3a670ec62e95bf65f75eaeaae944c449bccf61f6fa585374615e48e2d8ba3f2f29281351eb04c6426b6c1bc6da797b4bf6f2d5b48a5eb8d9fa SHA512 25b2de42c9a6aefc428d7350f5fa7da4dcef578104d3549d322582e875cf5c23b4dd46413fbe07d3e3776d226d1b0db743860461d7c3272d7ade0fc930d038d6
+DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b
+EBUILD libwacom-0.33.ebuild 1176 BLAKE2B acdb336190e555a0078a813f44660653428c49b4aa52f98942b5d556b802e50412249a682c5ab23bcb96657f5df23e8a36a0bfc200461ae25f27fdf3a8bbaf13 SHA512 409187fb02424346ea1d925b96d0b3699a4337bc532c99bf3f7c5faa0cbb73de85f8cc693661063bcf3f15857f46e2f862d349730f1fc4bc40164cc88a8245c2
+EBUILD libwacom-1.0.ebuild 1148 BLAKE2B 3999f45892c620cc1e1263b0d1cfefab431122b14a1ec308a80d6d72426885b74cfd4aa785984ec46ef6117ae4b1b5d56e0331abf60782a7327e20970135b3df SHA512 c99a4f68900a5efca6d743138e583a15317da2401384ac17f8ef281cb698d337c3cc83971d9fbd18b38af54255b8b17172d06f9b0b368beb3c37678aa2e67b82
+EBUILD libwacom-1.1.ebuild 1020 BLAKE2B 115cecd08add58be7186676e5595b9f4d60b685049ebd9d122853ccf17e8e2b5142782fcb3458b72283dd5cd1157616e0cb310dda5a83eb2b1338433869f07c0 SHA512 af1cc00cf112066c954e92fb11924baf382e2fd4e62b531478fe7658492f5533993dcccc2d0300879e2b18e03ca0f9b6a819035796407464947b49df520b2773
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
new file mode 100644
index 000000000000..47eb27d54bf8
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
@@ -0,0 +1,39 @@
+From 18722d30b9eb38d0cd22609e076ad45c810f137d Mon Sep 17 00:00:00 2001
+From: David Heidelberg <david@ixit.cz>
+Date: Sun, 27 Oct 2019 20:34:55 +0100
+Subject: [PATCH] meson: make documentation a feature
+
+Nice to have for distributions, which needs to have predicable build.
+
+Signed-off-by: David Heidelberg <david@ixit.cz>
+---
+ meson.build       | 3 ++-
+ meson_options.txt | 4 ++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8283613..be2fcb3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -460,7 +460,8 @@ install_man(configure_file(input: 'tools/libwacom-list-local-devices.man',
+ 			   copy: true))
+ 
+ ############### docs ###########################
+-doxygen = find_program('doxygen', required: false)
++docs_feature = get_option('documentation')
++doxygen = find_program('doxygen', required: docs_feature)
+ if doxygen.found()
+ 	src_doxygen = [
+ 		join_paths(dir_src, 'libwacom.h'),
+diff --git a/meson_options.txt b/meson_options.txt
+index 1d75434..84c92bf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,7 @@
++option('documentation',
++       type: 'feature',
++       value: 'auto',
++       description: 'Build doxygen documentation [default=auto]')
+ option('udev-dir',
+        type: 'string',
+        value: '',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
new file mode 100644
index 000000000000..06858cd36ad1
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
@@ -0,0 +1,24 @@
+From 07753990d7476d52cfd34fb7558c077bd8b44eeb Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 23 Sep 2019 09:29:45 +1000
+Subject: [PATCH] meson.build: match the libwacom.pc file Name with the
+ autotools one (#164)
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 13459f7..3e0cc07 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,7 +81,7 @@ dep_libwacom = declare_dependency(link_with: lib_libwacom)
+ install_headers('libwacom/libwacom.h', subdir: 'libwacom-1.0/libwacom')
+ 
+ pkgconfig.generate(filebase: 'libwacom',
+-		   name: 'Libwacom',
++		   name: 'libwacom',
+ 		   description: 'Wacom model feature query library',
+ 		   version: meson.project_version(),
+ 		   subdirs: 'libwacom-1.0',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
new file mode 100644
index 000000000000..e31df3a683d0
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
@@ -0,0 +1,21 @@
+From 6953c5a9fc51e286134cb977b3fdfe0999f3503a Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sun, 22 Sep 2019 19:04:58 -0400
+Subject: [PATCH] meson: add private requires to .pc (#163)
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 0ae03e1..13459f7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -85,6 +85,7 @@ pkgconfig.generate(filebase: 'libwacom',
+ 		   description: 'Wacom model feature query library',
+ 		   version: meson.project_version(),
+ 		   subdirs: 'libwacom-1.0',
++		   requires_private: deps_libwacom,
+ 		   libraries: lib_libwacom)
+ 
+ #################### data files ########################
diff --git a/dev-libs/libwacom/libwacom-0.33.ebuild b/dev-libs/libwacom/libwacom-0.33.ebuild
index cfdfa6692595..c281d67ae4f9 100644
--- a/dev-libs/libwacom/libwacom-0.33.ebuild
+++ b/dev-libs/libwacom/libwacom-0.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libwacom/libwacom-1.0.ebuild b/dev-libs/libwacom/libwacom-1.0.ebuild
index 358cf66a884b..eea01082ec86 100644
--- a/dev-libs/libwacom/libwacom-1.0.ebuild
+++ b/dev-libs/libwacom/libwacom-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools udev
+inherit autotools udev toolchain-funcs
 
 DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
 HOMEPAGE="https://github.com/linuxwacom/libwacom"
@@ -24,6 +24,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+}
+
 src_prepare() {
 	default
 	rm -r data/foo || die # duplicate dir in tarball, bug #693434
diff --git a/dev-libs/libwacom/libwacom-1.1.ebuild b/dev-libs/libwacom/libwacom-1.1.ebuild
new file mode 100644
index 000000000000..0496e24b9b6c
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev toolchain-funcs
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-meson-add-private.patch"
+	"${FILESDIR}/${P}-match-with-autotools.patch"
+	"${FILESDIR}/${P}-configurable_docs.patch"
+)
+
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_use test tests)
+		-Dudev-dir=$(get_udevdir)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 2814192dfbe0..2468ac3b846a 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -7,6 +7,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 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.9-r2.ebuild 6826 BLAKE2B 0b9bc73d12ae358bfe6208f141c0106f300f60f0c6d7bb4e4922cc58bcda7512dd2d7f6646c63e3e510d8dc0beaba2f2b0f733422eae92c8e9ff93ab93c355ba SHA512 51490a2ccfdf5c7a4369b01da082998f833c2fdfbdef87507826a7647109c08f7b473e082cea7582f05639b018fa3a3c2e024edde5ed21d09fc52b16482af2af
-EBUILD libxml2-2.9.9-r3.ebuild 6946 BLAKE2B 73191057fbef2bfd6372d91ddfae8cf6a692c7822358c97dc3ee9d0846e6ec147b325f58ba423489ed4cebf60a47152b37565585214c2eb7e45be2c75a8facc9 SHA512 16e04e2d22ca6edb0e4ca634a8ffdf4708029260f7eff0f02817dc130d47db291b30ea047cb01655e704cd78d2fbcffbc45d3a0c16c86a320e12425e8effc21f
+EBUILD libxml2-2.9.9-r2.ebuild 6827 BLAKE2B 357de15d2a7a2e57aed2350202e9f006d45f3c6b6e49af190481cc4188cdad0eefb98b1f33a325deb2c5ee246bb7b48b3e40556ea399fdc21b45af20fdc0b20e SHA512 3c7b2b1051e43dd9a89822cabbf6ff75b2431dc4ccdb1ddf630a3a1f3406f2ef2fafa284e6f1f34421baf870dfe22d30f08a328fa050e3d133984a266f94db6f
+EBUILD libxml2-2.9.9-r3.ebuild 6945 BLAKE2B b6d04268da2d7c09173a3a6af0c452669d1108f3c027270e328f7c151c9115cacb579bf12025a3be5091fe2f78d7c5744ea7607e41e5342c03fb184b3262aa3b SHA512 f2ab0ae5410d9a2dac7950864f428822ccafb7f630fdfd5ce0c2265b9562bb0a52352c8ac8a82f6d225c7f011d568583962c94a455f36bacb4a5fbd8913a9c9d
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
index 6e94ccde699b..2084604da2ad 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 )"
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
index c6bf71a36b0d..16ff46e3a084 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 )"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 789b184b6075..daba8463af3f 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,5 +2,5 @@ AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba173
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
-EBUILD libxslt-1.1.33-r1.ebuild 3445 BLAKE2B ee72692820bc1dac9aaf4417d8ed7e236206cf62f40ef6948896908e74df6ee265c2537603e0e617fcec93d6af763263731aa7bba0598d882f1379cec82458e1 SHA512 f0eb4bc0ec56b02cb36396fd55cdf2da21c99497a37bbc06dc202c80ee2d94e8ecd972b2249662fb8f434baacb55479e2eb16389282413ea5614cc6c464d22f8
+EBUILD libxslt-1.1.33-r1.ebuild 3446 BLAKE2B eaf0e7774ea3b81a1fa41181d04f7cc7b0f77b39c948e3b1f0bb0b66d338e6d3e53299ac5b87f5550b5fc94cd7c12350519fa49bf683e493f9bf2d7a602d7dca SHA512 1e4e0f1f3e256b1fbbec9d3a878b1b79c92aa1cd0f20e993439a48a9c8d4d7548f543c2c9b4ba8c054b3376863c2e9f3d13e6d06a049d8f8435fdd5d23441f05
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 32849d76e7c7..14d56224d0d0 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index fb4518036a95..5033fa2ffd8f 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
-EBUILD libyaml-0.2.2.ebuild 1029 BLAKE2B 186ad2b672123c8a6110f67656a2f978667861dd6301b5e6bd822e9a44f51c9d2fd8f4bf00282e87a7bf58974605846f8fcc91db5f8a7b59aaa7e75373fcb703 SHA512 ba4854c4dab905915fe5fd24540e44fc3b395cdb056ec5b1f5af6c56b4cbadb02446fc28acb4f5e27ddd2aa5809fe476cd6e965afc8192b3dcc29e3b9c7a9305
+EBUILD libyaml-0.2.2.ebuild 1030 BLAKE2B d413abb3a5d24f8c0e9eb464900499cdca963f5b4e816e1e609e203a4ae4f77db3a37a2396583c3904217a85c553296aae686509c9af7c089f50cd7aba20b6e2 SHA512 6dbfa54f8646ceb5cb33daf4cc23bedb582644dc7370871d91c4ce43e2e527bddb063c824bd02379b55408acf3ae92257c52eee4b0674ddb8d4e4e105759088f
 MISC metadata.xml 396 BLAKE2B f55ccf30afa81617e23963e2bb96cce1db4e06982320b1b53213736a79c15431da54a7ba2312c4b60226b881553d6470c0fa08a1ea88152789254208f302b64f SHA512 a373090c8dc67e0bafec51ee673e9a3c15821c7079061335ab95ec2c87cf629f57fc172fb8e17989a709b4770ab42537f87c22ac065cd24fcc1ca88a2c80bf76
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index a1c3a126a29a..6786e6aedcf7 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 b8ce803782bc..040439427db5 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.18.tar.gz 623928 BLAKE2B ff7f4873f77c1782bc704ff11f0fcdc2a479404cf0719d9156fad2ad01634241f7f556699d778fbd6e3f4bfe108b1735c65def859d56cefcedd6a3c760200a14 SHA512 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489
 DIST libzia-4.19.tar.gz 623995 BLAKE2B 55bc17854614af92873059e741179d9bc4f35000c4fc29cdd56854b85cf059d422ec49cee9d07056cf8fd18f7a6bf15aeb98a3f3dcbee44420ca1862175d3938 SHA512 65b7cb87740a3288c186f30a10d29824f2b725e54290d4c56ebfd9aa6902ff2e1e48725ed35e3ff5c2d144ccd6a20384df470c1b615c99da8a14c7e0647b0f6a
+DIST libzia-4.20.tar.gz 624009 BLAKE2B f0342c144c3e0b9dd7720466b24d79632de6dc8597786ba22acccd4eee20cdfb4f941da5717fde27a7ee0097f4f57b20a93455c123fd518916c1552cab801bc2 SHA512 0780eb791fdd85778a074eddab933650d4fbb09a9b441432cf6e63fe97978d47c75155caa251820f283badb16ffa5ac2d323b1f98ab5864caaa020511ff856d5
 EBUILD libzia-4.18.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
 EBUILD libzia-4.19.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
+EBUILD libzia-4.20.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.20.ebuild b/dev-libs/libzia/libzia-4.20.ebuild
new file mode 100644
index 000000000000..63b54d9c6b89
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 1c39105423d2..59fa3431987e 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,8 +1,6 @@
-AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d
-AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
-DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-EBUILD libzip-1.5.1.ebuild 1906 BLAKE2B 1fa9eb69305913a45f96969003a415bab5c74a3abd515930e681fd16d5597ff378c55207182170e153f5d49b7d82e24b35f147b752fb21ad978d82eb796368c0 SHA512 f01ffc83940b6f3e9d3eeb96a21a83eec834c518d7da80c631a63673169683472c0e48432dce759fbb6ec17e3fee25e52bc9af94d787806a74fc14f83c96a04b
+DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8
 EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817
+EBUILD libzip-1.6.0.ebuild 2269 BLAKE2B 69fea9eddb814fe679679ab4ca3aca249c61a883a72c9a61d5586d55ec4ad956271cc8cca3fb090c9c3f00833aa2029bdb20e68af6689f6f06789c2370dd133d SHA512 338e80c3e39f1cb15f93c770271d27eb5bb6aebe3a394cf9290097b68c10030b28d4a53431e5b144dac1683d5f40adf55e71a5d3cb1fc993b906101f924c3d03
 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
deleted file mode 100644
index 9b70eaca8e87..000000000000
--- a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Fri, 7 Sep 2018 23:12:36 +0200
-Subject: [PATCH] Add an option to disable bzip2 support
-
-The explicit switch is still on by default, but this way it's possible
-to explicitly disable bzip2 support even if bzip2 is available on the
-system.
-
-This is useful if bzip2 is not needed, but would automatically lead to
-an unwanted dependency.
----
- CMakeLists.txt | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73a34855..879e0f21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,7 @@ PROJECT(libzip C)
- OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
- OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
- OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
-+OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON)
- 
- OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
- OPTION(BUILD_REGRESS "Build regression tests" ON)
-@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
-   MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2")
- ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
- 
--FIND_PACKAGE(BZip2)
--IF(BZIP2_FOUND)
--  SET (HAVE_LIBBZ2 1)
-+IF(ENABLE_BZIP2)
-+  FIND_PACKAGE(BZip2)
-+  IF(BZIP2_FOUND)
-+    SET (HAVE_LIBBZ2 1)
- 
--  INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
--  SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
--ELSE()
--  MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
--ENDIF(BZIP2_FOUND)
-+    INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
-+    SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
-+  ELSE()
-+    MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
-+  ENDIF(BZIP2_FOUND)
-+ENDIF(ENABLE_BZIP2)
- 
- IF (COMMONCRYPTO_FOUND)
-   SET (HAVE_CRYPTO 1)
diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch
deleted file mode 100644
index 0cca187d90a0..000000000000
--- a/dev-libs/libzip/files/libzip-1.5.1-options.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001
-From: Florian Delizy <florian.delizy@gmail.com>
-Date: Tue, 7 Aug 2018 22:09:32 +0800
-Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC
- options (default ON)
-
----
- CMakeLists.txt | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69e6548e..def25607 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
- OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
- OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
- 
-+OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
-+OPTION(BUILD_REGRESS "Build regression tests" ON)
-+OPTION(BUILD_EXAMPLES "Build examples" ON)
-+OPTION(BUILD_DOC "Build documentation" ON)
-+
- INCLUDE(CheckFunctionExists)
- INCLUDE(CheckIncludeFiles)
- INCLUDE(CheckSymbolExists)
-@@ -234,10 +239,23 @@ ENABLE_TESTING()
- 
- # Targets
- ADD_SUBDIRECTORY(lib)
-+
-+IF(BUILD_DOC)
- ADD_SUBDIRECTORY(man)
-+ENDIF()
-+
-+IF(BUILD_TOOLS)
- ADD_SUBDIRECTORY(src)
-+ENDIF()
-+
-+IF(BUILD_REGRESS)
- ADD_SUBDIRECTORY(regress)
-+ENDIF()
-+
-+IF(BUILD_EXAMPLES)
- ADD_SUBDIRECTORY(examples)
-+ENDIF()
-+
- 
- # pkgconfig file
- SET(prefix ${CMAKE_INSTALL_PREFIX})
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.6.0.ebuild
index e28826e21828..71e055e5470a 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils multibuild
+inherit cmake multibuild
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="https://nih.at/libzip/"
@@ -11,28 +11,30 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 doc gnutls libressl ssl static-libs test"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/lzma:= )
 	ssl? (
-		gnutls? ( net-libs/gnutls )
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
 		)
 	)
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-options.patch"
-	"${FILESDIR}/${P}-bzip2.patch"
-)
-
 pkg_setup() {
 	# Upstream doesn't support building dynamic & static
 	# simultaneously: https://github.com/nih-at/libzip/issues/76
@@ -45,6 +47,7 @@ src_configure() {
 			-DBUILD_EXAMPLES=OFF # nothing is installed
 			-DENABLE_COMMONCRYPTO=OFF # not in tree
 			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
 		)
 		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
 			mycmakeargs+=(
@@ -61,30 +64,46 @@ src_configure() {
 		fi
 
 		if use ssl; then
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=$(usex gnutls)
-				-DENABLE_OPENSSL=$(usex !gnutls)
-			)
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
 		else
 			mycmakeargs+=(
 				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
 				-DENABLE_OPENSSL=OFF
 			)
 		fi
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	multibuild_foreach_variant cmake_src_compile
 }
 
 src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
 }
 
 src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	multibuild_foreach_variant cmake_src_install
 }
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 222683d1b122..896f6f747b35 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 1021 BLAKE2B 7faeb906973067f3f3b1993f70ed287d04e580ae63cefef6483a4a6f282902ff470c9b02e3763f1467e6b9178f553dd87992d6f088ff540e19320679b8afad78 SHA512 b18f7aae9a630e37a689e1f17f5d28aefefd0ea08b4f3a85067844350847d38fd3d15ef367e2229f533564331d2bc1e529905ca7898bf0ff9b781b978330c1b0
+EBUILD lzo-2.10.ebuild 1022 BLAKE2B 58a73d6e60204641dbef751736d7e3ba973ddacea8ff4f49adc095dd7ad3e69e5cecb41c4eaa8e432527faf29d8462a6f6cf489ea3d38880f57bfe30b7569ebe SHA512 74667ffb2ffd2dcd980a9adc92f41391f3e253d06adc986ee8d9fb774520edd267bb41b18cd089fc80364ccff62488469739617a9333cefdb71dd0542bfffcb2
 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 ae3087068d05..128ab2099ab7 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 4df2068aca69..16e5697a807f 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -6,6 +6,6 @@ AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda7
 AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
-EBUILD m17n-lib-1.7.0.ebuild 1753 BLAKE2B a8bcf69784e1b39a969135a927df3b8c9fde100fb4c87b29eaa7d8a2edbb8ecc88212b6fad65fd304e6ada9447a5356775255c2d17caaf436dbc46e22885b9f2 SHA512 86918215b2ec7fea17e0937233897830ca844746867a8e9138156b8ede5a3b52df80140b847150500f0951eb26cfaafb910f82f1186419b43e29ed3009de2bcb
+EBUILD m17n-lib-1.7.0.ebuild 1754 BLAKE2B 3073cfdf72cce7d6a672bd5b131ac7e1be6448fdbcad6891dd1ce796a1a27b6a08b2c71042be447544a977851921e79dda5461a62fc9b9b5aac1ade9b7e77f25 SHA512 95c7bea509afd7149961e3d0c4492d9e1368557219471624570060628ff6fe6cdca48d03e11120fe2b345988a91d983b0db9dc2bca210094c5adea468e853c0e
 EBUILD m17n-lib-1.8.0.ebuild 1840 BLAKE2B 0d84d47d4322331569a9d1be081980f64e975e5b8e0d835cd313a3c1aaf7a723631967e9d898961f8709161c5222869e8b8454bf5d01c314bfcf81129e99c1b5 SHA512 f385a0b6f80f0cd8f688f61a119101b4d4d6619291051aa4c47b313a439e80fcab039142c2b4da8f2b2ebc5fd5f66d92408fea86064250496d6e70db3fbd83d1
 MISC metadata.xml 810 BLAKE2B a17dd171386fee0a400c07e5dc5008855e68d15a048380714c35355551fa40aaaf6e0dc8fb4b28f7a89553c9482cbf40b7b13117506aac007cf8e6901dda4acb SHA512 d5530380b5ad05c6dbdeffebf310bd45985301b62b2ab11757727551522bc45c3b00d0e751503d8ead750155fb857125b73f14210df6fd3a2f85af48638f0f88
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index 508286fcd976..d627ec297d49 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index 7c6ffd756733..b81c0773f09d 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 679 BLAKE2B a2df0c623b5225e44d3d0f1d7d55f7b52097e2b34a26d1ddb17818aae8004a1b2fd1ad743703ec61f1bd857fe4a29fffd2df6d07d4cd0d4c1e72d571964d2656 SHA512 13df26b5cc8590325796c12e9d68e87712ee9579d3e5614d8ea44c65296b19150a3097b75648b22c5e1a0090651cb759d3022da15df106e1b638a250343fdd6b
+EBUILD mm-1.4.2-r2.ebuild 680 BLAKE2B 032f9dda5c30c4d26aff68abb898d3d553256492c9ad54f4591756af2f77b90afb4a8a5493228b6bd7b7d7afd77249edfb96f6c991835d0efd4c951bf7205465 SHA512 a63937e3c588e3b5c9210af83612b698db28a58b535d07857e1c8268dc0c6f7ab2f6237954a04b3cf83ac74a963db57d106f26a8f42af5b72703df54e4426207
 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 498cfd3bdbed..f9e3bc887ef3 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index cbf9c79d8bc2..44a7b5b3aa0d 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -23,8 +23,8 @@ DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
-EBUILD mongo-c-driver-0.7.1-r1.ebuild 1268 BLAKE2B fb31f03aaadd1ae781d0a61724de4d2a829f2502084e7ff0a58c01ca459b5eb6ec36d0e1b615e078bc569c0e1caf820011c5cf730a91e4680a37e05407396aeb SHA512 374908c70bab6fd56b24de7762ccead366a06354b5c0ec7f0d47126bb74b040d8f8628927fa295f3e3b2b7fbf4abd6783d71ea02885648818804c7d677983a64
-EBUILD mongo-c-driver-0.8.1-r1.ebuild 1207 BLAKE2B 30cc1e8458715268163499488bed324e0aeb525941c7a19b8b06799aa21af93e17209afeb5485624511eb12c88cd145808f475925b4374b978f2a28099bfdb12 SHA512 00ac5c82565e5cd2ebc3442acf5a32160119e4c64229647982087b564b3d1866f8e3ab96d3136c351180603b039f0450e79c406c7c0c37e0f50388fb79effdde
+EBUILD mongo-c-driver-0.7.1-r1.ebuild 1264 BLAKE2B f9cdabde748800e33723555e9483f78fbecd99307e12e40a88ef3dd06a5a044397e3ab46ad5c4e297c8a3388ab6ff58e581e606ada70bd66822b955adbdfc5ea SHA512 95956d579512660f08586fa63974c3aed1feb78492165ce788af73dbdfb8ce6bb296e371fab3f0c54cf9cb9c425943dc344a0fc6daa435a249765d8a40f5f3ba
+EBUILD mongo-c-driver-0.8.1-r1.ebuild 1202 BLAKE2B d3809ea9f7c1119fbec4bbe3d21d90adba9f899435de0fb5ea2562e5bc81a0eaca3501d585b816a68eededca5e96a742183565e017eabf36e76656694d8f5ac0 SHA512 b8327aac14996385e6f6bea686407854fdd273728f34943921769df6c8176efcb23fc76f3cf736b3cb6a526242829be89a6d605dc48f68c439a91555df33dc91
 EBUILD mongo-c-driver-0.98.2.ebuild 1840 BLAKE2B 2fb16cd97763ff2af007e76670f3d424dafc90c56171be4afca356811a2df7f9c2d6bc21f99d7195f4f09344b6910ea8003807ca9be006a6ce443ba662c9344c SHA512 9c3a12d619c20f018aebd9585504621bfb18067390c5cdfe1a61f3ea449377905718c5bcbd98c2fdbae4c0a8266d79b5482ca3eb8884a47512eac36d591b95c0
 EBUILD mongo-c-driver-1.1.10.ebuild 1951 BLAKE2B f2b3a15a6aa9a0887ae6ab52d7ee1e79d7b3fa06bb1b3684657719dc69f10894070d002ce0f06abad742ee753daaa4dd85e586785e29bf84e7bf9a2a4f2ec46b SHA512 7226237c58d4b94fa052ac455e7b67aaebac2bc14d285f74829fab289eb4d3a0dc4f3b7e5fdbc6ee28b6eeea59dbe0bc0cd3511c959844f0915cd2b1390875f3
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1948 BLAKE2B 65296d043f84794efa8d8c69c174211097c73f14fbc945f81d6068663c2b23cd2a0b4eea33b5832a32d0bd1adf05e051c481625f767ddf708dc2b2851a5999f8 SHA512 9c8b583be17df5d3a32ab71483c69f2974e6c3634285c1ea6ddf46ab305ffe8852bff95b26361efeca0b0051632b69b267c40041dc13dc8f90a0f766ceba486a
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
index 3530dfaeb047..7cc15fd70e13 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~s390 x86"
+KEYWORDS="amd64 ~hppa ~s390 x86"
 IUSE="doc static-libs"
 
 # tests fails to build
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
index 846ae840b0f7..4e6f6d780c6c 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~s390 x86"
+KEYWORDS="amd64 ~hppa ~s390 x86"
 IUSE="doc static-libs"
 
 # tests fails to build
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index c48be88a07e1..51ad98b2d4a8 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -3,6 +3,6 @@ AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8ee
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.3-r2.ebuild 1045 BLAKE2B d633849f8800b5ceafa524fcb2f01dbaae5eb04898667f902303af6bd439da3f7acad1f95946e083e90b41bdf4c1d3095d9ad76ecd748a8fb9035fe7c6f8cd19 SHA512 2e3af6ce3b2c0cd2dc670bb689087ffa84eacb31b96f373e8e621b6a628e4fffa3ca9386e81c93b07c19343e9cb7f9806198ba7ad7265a3dae3f7c6cef10b7ca
-EBUILD mpc-1.0.3.ebuild 955 BLAKE2B b81c6d279157a3a47c6e78cf40b625d29226b79ef587c22cf1e25095bd1605823c94207cf75b8a0271dc988bd8bac1b6ebb2915080171322e0ba50f4b55aeead SHA512 aed001c22031eca558034bc9deac4d235c9aba28e9c9187a75b71bfcf91f65d7be18d722b29abebb781df72ef8442febe7e40ed5241c1ed3c768d2bf9d6e5509
-EBUILD mpc-1.1.0-r1.ebuild 913 BLAKE2B 6b93f0d4020fd5b715f4c1f6b3b6b50fa1c9583def3e10981ecd1d29fb8b46574804f0bd716f63ff466ab890044ebe2c58d9020165c598fa8c54fbf1f37b8ee8 SHA512 3ebb63aeff24a0cdb44fa51e2d50b9a45e7cf155903cc69b7f9495ee55bd40cc5cf9610c1fd3366289afa41f50aeab9f4e10e1a17ba0867c31c862370aa432e7
+EBUILD mpc-1.0.3.ebuild 956 BLAKE2B e155526a78a4ae2674ef468fd0f128b533bd40416f1bc3fe29895e0e8a59defa744953f7f616da922fa689f5d35dff09db6765aaaf367ce76506037636111909 SHA512 b423e05dc563625f505721a2c49b53761c995c0fd3611309ac63d216c32c8deeee6a6ebdc7ba1951555fb9a1321e809f9dcc5173eca5080993b995959d122c9e
+EBUILD mpc-1.1.0-r1.ebuild 914 BLAKE2B a940c6be0945ac042359503f3a922b2bb1d32066b1a75041d27d0335a05e95726ec8226898ce4e7ca53375bdc7541a0f040ab797f3f585b9306f5d4e45049383 SHA512 d535eb13caebeffc79e6eb349655f1bad8a689676a4100f2699f96075558812a4e235d298201bdd92963c337e6475d0c0c53777f17695d91274324af974adf5b
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 846b31d3ca10..b7a43224b39f 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 4282e9245588..d21836b9b47c 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 8d5478c5a87f..36fc7b7f9d16 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -11,11 +11,11 @@ DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d7
 DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
 DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
 EBUILD mpfr-2.4.2_p3-r1.ebuild 1487 BLAKE2B fff9daf8465e44cb1975fc83cd502a664e65a801b1a96fdf9de23e4d336bd27be7fb5c85243e2361460ecbf13e472c8c900fb010b730fe28b54605560ccc82e7 SHA512 169d8d6d97ded0b04b918a06baefb1bb5dc194c9c0b4f0e343b03954e26d21d503b66d8470b36d460cb099b622ce7253da3567ffac56a266f33b2d6121b466c6
-EBUILD mpfr-3.1.3_p4.ebuild 1788 BLAKE2B b224a802b46ca93c13eed74c7ec12b815ce2d9901bbebf75c24cae051e7d0b68d1a8b747a0a6bbc357817fc390e1c1bd8961bc7f53ca5c411bf1458197e62000 SHA512 a386833cb4f651dbdfe82a7efef974007c474d13af7576f0dd1bb4ae90069d552eabb53244035926598c4e15fb55fb243e6e81bd7e0ffd3c929805494dce3d22
+EBUILD mpfr-3.1.3_p4.ebuild 1789 BLAKE2B 08c1f9dd3598863c11545cfffea41b055fbdea0835c6b7045533401a7bd5ddae926799cbda72594ff1a2e398c3518a45cf7ff60d1ad6a3fc640600c0bbef712c SHA512 1a0e6b1c4f1a48471fbbce3663d3494271e2863f1525c3fe7a62431ec886abfd871c0fe2436ddcd3584428750516c17b70346d21a7a75ab114c50b1cf89b258c
 EBUILD mpfr-3.1.4.ebuild 1610 BLAKE2B 557aaa3ee1253dfdcb92c784840f8244a7e618df289b01d274e19c8257a64a71a1f6e510eb11f155fec82a84726a7727cc253554d7c7ff697c624f7cbf692b44 SHA512 50ee30de97dadb782d165584234d3ab37ef9e5876f7f755b57ff1af3971fb88f948915dd0b280ee6d5884031946d19e1edd22bbf356af7784fdabfd397b01d9e
 EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0a376e0f05ad8c7e05fa36213738a754c715d5c14b07182b7fe667a7465492fd4c9a64e34a8b46b53a606e5f57 SHA512 2f12a3322a252cf29b21189b8456b4e429165303e123d4e0c88b0c96eadd8a8c34c1f94ef2c69e2bd46169454b9cd98525e34e6bddbed8cdbf5b953a1402ecd9
-EBUILD mpfr-3.1.6.ebuild 1591 BLAKE2B e83822443f4cefba6133397afadd04771cd4e5fb93598bf64fa9d94bde0bed823bc61114fe315488dd82a03c969ff78825d772a04e2fc643fd41f1d03a4f613b SHA512 3e2871fd594f7799f28e67e25223febdadbfec6fc96928d13ef1e0a394d69a88634a8ac490f22df9ec6827b0aab7926e377f10830d7bd74d87df163d64fd106e
+EBUILD mpfr-3.1.6.ebuild 1592 BLAKE2B 0e3758e3c51f6b732826129f56730b79b0525ca47769199df76d64da6cab4a234219360a53a6d6673613cd82a81c1c285be8d8e015b0ab2b2022c1c550001c89 SHA512 567b1d03b3c0234697c1ffb7cc64747173d1396a0da02f9266fc6461de2d312c314b8831c0cdfdca3f74372bfa48228eba0fb52ad5f14886ed9e28b9809df377
 EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
 EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.2.ebuild 1691 BLAKE2B e239cbc030ec4963fd12314c9e578116b72a8f828729fab526f54f515f128d2d4d1bf929d206b026489282aae4ad8a0ff6752829d895534f94cfddaa26d05a3a SHA512 ca2c6d4f25d9e54fa586992dc391214070f4535e37affafcee530504344a4ba566bdc6b34beffebe097c97c503a45b395955f5cfe51860936e8c69c5bedd2c3a
+EBUILD mpfr-4.0.2.ebuild 1692 BLAKE2B b9534ce4fd257463bf3866fc4cf664a447df792e070e714cd771c6c78a1267f33faeee4c93dc385555690f33f9863ee99634e24a7974bae75a9fc9624f3fd43f SHA512 af3f59f8f7991509eaeeab8f40b59d83e1ed73ba8290b07a007038c022ceb866e33339204c787297f8a31f2adac07af749a21b3a95465c5df1a0e39d20b89637
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index 6784eb0171f7..64293856d60c 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index 8c19f05b58af..f0d89e6723e7 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 9324c6acc82f..dc5b362ac390 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/nettle/Manifest b/dev-libs/nettle/Manifest
index 217231135ff6..f11b67370496 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,6 @@
 AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
-EBUILD nettle-3.4.1.ebuild 1792 BLAKE2B 5b861f64d91824bc3e4e6529b8b590fee0d60369db9e65b098bbdfab5d059552026d42fb0794ff827c60e2b5aad1e7f78176b5bc8a84f2d90e22f0923a911a38 SHA512 263df01a86b7dfac2bc7f02a2782acfa502c785923060bb252f184cc6a68e68eb600265dc72c0241cd66168168581e4b065a3db91f35e2d4c5e8621ae3a86027
+EBUILD nettle-3.4.1.ebuild 1793 BLAKE2B 44edb3a38371ed5abcc4da28fe295e0ee27902a613835b92e6ce0566ea28ca01be56d8397616d49b5bc58cdba40661170529898597bd630dabaa0fa8dbf106fc SHA512 42906a902c9b9427f1ec2dd1af4b230d4ad045807388c8647b9f418dcdf5981e92c8dfa45751662e0ed5915804cae70f2ffc684d7be50a3b34fc7ea5c6b8c177
 EBUILD nettle-3.5.1.ebuild 1699 BLAKE2B 7e15bb54acf48b15dba1fe06ccf58f02ac6aacab97623ed301c9bb15cb7485978da589c9a9fbb3c465e40d1d9d317ab6e99d7679edeba8724ab37f6f161c0579 SHA512 892f4a42faf586b7f171f05434aa90c9607ea4bb0057d72b7ba3a852093bb4d2ebd783822eea3cd5237e20eeb0d72f4ae1aa296ff7dc34cf51218e102585f290
 MISC metadata.xml 347 BLAKE2B 0a9102d605396d04414dc017572cee25f9088959b268f0181c09f345e0b0c835242c64ecbd83cbdacc3c6014ed7de418ee486c1f22a59a4a698216c3a364bb5e SHA512 c4f9b5c16edb448e4e9ebf49bbe89d1f84afad45b68d19b3d5339aa11ac118f508c62c7fc7cb264868be28a3ce2f3785423b4a52b526d8dd20f2fdb9ab93617c
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 60f774b7801a..e4569565c8d4 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index be58181d46ea..c021cd0c6d2f 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -4,7 +4,7 @@ AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efb
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.20.ebuild 2008 BLAKE2B 8beccc0ed4c3b556355510661a11ed726fd992ab9cb2bf4375f1bdd69d1a98bb3251c7423604ea69df1617c7d69617fc89c70e7cd7ca0a963e8ad8b336cf390b SHA512 d63ca6a5279d5e0d42d5023070bc9dc7d886585d51b0290db94205a47e49e76a4ac6108aaaf7b3180e2ca2eb4a8e0539e0ee9ac72f77cb57b8d03d46717a91aa
+EBUILD newt-0.52.20.ebuild 2009 BLAKE2B 3fc81942c3e576dda6b6eb79d83ca4ea19527c8ef563ecddb6105a1add388911b7c28ee44f6dc4081c7e930ae79abb470f51488844586ff71fb72c9d38074b20 SHA512 be42f87c8224b93c6bd974fa8e5a5d797a6f68141fb7a9feb7cfabd911c5cec88a10f450b1685ed83cd1d0ccb01453773d68bdbe789f4203bf7777cc51a83251
 EBUILD newt-0.52.21-r1.ebuild 2251 BLAKE2B 014fcf469062678e8b364689f068815f0860f239c75b5f8406c1c7db53cf46946ba87181e035f90b2fdba1be57c392feb50954571d1b89cbde462dbbb00dc0fc SHA512 e43837b60e366651dcea78df2fba74a0cdd6111dd22d30bc842521829330826648bd87a9c183724b08c8a7010e9e17b270040e86917233c99a50dbdc3b3ef0ee
-EBUILD newt-0.52.21.ebuild 1961 BLAKE2B bd72e5e906fb39ed64fc5fc78da6f52f0e363a02e7475ef27a4000ba1de75b33c8a5e5e71ed45ad51986ac8966c051a2a3b61d79e30e03e411f983474c1b099c SHA512 fba77c10680efd0886c040576659288a2eaec89ff2ae8d34c2e28a616e8a5343c03e7988ef7154033904a01e897f142eb21a0b896c0b3a34afd0038a16af9e76
+EBUILD newt-0.52.21.ebuild 1962 BLAKE2B 2fead7d51597b524e23767f966e305dd1a88eb9b1d06b792a8518ca19dce0167c71ca42cfd483908fac6598397c3aef22c6f4216999edfbc559aa3007ac4136a SHA512 fe3fcf08662945cec843b0452995f867ee83d5b9ad94410935531515d5ce600f204e1090687da9d527735cf81f2a642417bbc57fdb8439d23118763a5798ffb2
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index ba389c9404bd..4697a414eaea 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 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="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index d5e46133364e..92451ee575a8 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 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="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 7388dc954264..48145f337660 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -2,7 +2,7 @@ DIST npth-1.3.tar.bz2 295998 BLAKE2B 25c0176439a5be3766df15526b06dd07f318dca8b72
 DIST npth-1.4.tar.bz2 299106 BLAKE2B ba5186de1371d08137e86ef1f6ad12a610a26b7ae3ca50d6fc49f685083380803b245acf01110a28ab25427208bab82de73f16d6f21011b1a0590d16c7c85cf7 SHA512 649009b4fbd2bbbb8fce2911c2f9070a758d037be0d147a63754e3c1f5a9ffb73b907cd09c79314fe60c25084ca7a7b3b387139dd83cc0e11a7e7ba64630ae1f
 DIST npth-1.5.tar.bz2 299308 BLAKE2B 1a3cef4475ad5440487151026889ef321626b372d1c6970c7482df92a702d02860589f7f1f541b1fccf0e8f39b194476ef91507e33a35e05ba3713465f9f11d1 SHA512 20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
-EBUILD npth-1.3.ebuild 675 BLAKE2B 101174fbc1293b04ee1b227560213654c2dbe7488dbdbaeb8de89fed9ab4462e22aaa7885f296f7188a7215f599adb82b73ff23e1af88576fbd44f5d93c4be30 SHA512 3a699b2874058b7fe4614d9d6853b10178565092f68aed700f12a79ea7ec7ba28e7e30e97f5e0c766066223d224c58cf14275986edf6eef1b521ff1c270504c8
+EBUILD npth-1.3.ebuild 676 BLAKE2B 9bbfbc5129957c2c8e39ac76b85e420eb08bc541cb4074923ff6a58637ad730fed0920bb0762d1c8eff6bdc2a8d724127eb436e356cd1a5a3d6a9bb3e93bd130 SHA512 e9d8654180ea8d9c47770a85a1d38ab555658d3ad4831f96dc8d7fe1063d333816c3c5373dc6658cc7887bf4ed78656c4304c8e252afd2142797a93506be5992
 EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10ecfa7b3930e9b11dede9212f46109bee83baba3afce807105abaae322f4bb825197d7466b5dc60b51a0 SHA512 c46dca3ea141e43649d01408d668ab3619fb06c1ca2d66eaf8c44d250f983886844e20ec79aedf3731c257118c3bee96d2f3003de55559cf5db399adb0697006
 EBUILD npth-1.5.ebuild 744 BLAKE2B b295e9fab3993c50016fc78ae09f6305e834f63eef5dd7daa03f0bbfed990047be2608863396d710f2dd4386cca395d78dc7b7732fac6789ac59ff06b4946484 SHA512 8bf30e3270ea4ea618fd194154a9b37736badab99a7d90c203e0b2ee1622dce399dbd906edd55894e91d8132311c4dac4d9e69276060a325280bf2612a84b989
 EBUILD npth-1.6-r1.ebuild 767 BLAKE2B 992634d18793140c4d9a8eca7d971db7c49f23d6c3f6235b4aeb504544e5a68f52a04937e5dd9b59127acab9ca6deac4a123a62bac59911ea1758e806bde4ebb SHA512 f1d11f181710ed1522ef7fe3e14f2c998143dce46a2aa303f1583f3357012d92e16471cac7de53ddadd7d1211c35348c07e7c368c69a006137eb8807c6272277
diff --git a/dev-libs/npth/npth-1.3.ebuild b/dev-libs/npth/npth-1.3.ebuild
index 1b6b254ae4ca..8d30bb4c314a 100644
--- a/dev-libs/npth/npth-1.3.ebuild
+++ b/dev-libs/npth/npth-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 85b4b3be6d38..f1ce8923688b 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,7 +9,9 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
 DIST nspr-4.24.tar.gz 1078825 BLAKE2B 3a773768c31334fa4f3f406d838d430dccfbcf5f7bd34dca422b199265f17fc08ef3d5d1e6df5468efeeeace8b5f8a38ece518e6bdbcdf811c2642d43be80c6c SHA512 b020031ed7a8997099c11e0772779c7b10d15b4f6b14e2b1832732943e8b8224afa952ce04a1914c1553af9d3973a6d9cacf08058ee6fff35102e3b2ec0943c1
-EBUILD nspr-4.20.ebuild 3770 BLAKE2B d27554e938728d5dda0bbd6da5223b994bb106b2bf9af1631c4f0f66cfee3eea384f4f665356bffd5b1cb87c82f475c9099e767235cce02c06408e5987b9cd09 SHA512 cc0067760312e923bad46dd322ea193decb62f8deb6d50519f3373e837d1c0aaf8cc75f28b8b0439f9f89566ebcba1c15837713535446abef7b583b7b2680af1
-EBUILD nspr-4.22.ebuild 3865 BLAKE2B 69207a7090aac468f09ac874cf1070e33fef8338ad3c7900373ca39f29845cb3f0fef1c197c3fb90ab78c7d1efcdd25edc5185a9ef84df82cf2414c96c9fd69c SHA512 9877374a313c217c8c17c17434ae243446be9ef1beb20c58683207135f2a18c1085f4bff0d8b8ce20bc57cd730825fcd97f59813b91dcc081c15277dcd839826
+DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
+EBUILD nspr-4.20.ebuild 3771 BLAKE2B bb3acc31dce12797676844a0d4becab46e4096ffb869baf9856dd3bf5453b40a03a79b8fce932aeb1f0da654eea1654a6aee06dc81a95add08076a3c47ded5c5 SHA512 49cdd10845eedb22d151ca16319a99781d71c02d4a4b1ae0f86424695d181449ba375c2136b6778f7e1ef08e80c8d813784c53d10b5d125b1bfd68381b6fe9ad
+EBUILD nspr-4.22.ebuild 3866 BLAKE2B d06d5802bb4cf147eef99551cb6dbb9727efdd8cf3ec202b17cae8204831868433b632d0270b1e83a82656bb7c6af12281db86ade223198a5042ec8615474dc0 SHA512 4d2fa3d9b533fc990d824a24d2c71345611409a5c205de5bf0f5dc3ed3d413b1b5fbe94ce115e75a3891e6960ce53b1eaa85eb8ae56e8996b6da38239767fd23
 EBUILD nspr-4.24.ebuild 3943 BLAKE2B 425caf054f7b308e6c9a6a9b911bd7f594959f566fc691dd821e8d6fbdf3e98a5a0689dd3fcf0772da6989e1ed69b615fd86ec394ac963ab7cd58002371ffa13 SHA512 c01b2d44c50bdf750daaaf53647b0423865c8e72f80ca6e5feba4cf77f81b288421d1fe54f34ead168ccbf3aa87da82d64d02a4e2db3a1ded31b10bf9bc56ce0
+EBUILD nspr-4.25.ebuild 3943 BLAKE2B 6c7c97ffa992259f8af3fccc2fc4442725aaa072fed0132360eb20f7aa7302f84de303bad4c73a7db0b510c7dbd3bc8a3e569f35d338f9e9817c10fd3c9ad8e8 SHA512 da462495bd77b6745170a3da6dc891ee6ae4c59847f9bef3812d576628cdf848bcede1e18b70f577d7f369d71c7039429c9fb2fcf01fb2e7c26b43735683017f
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.20.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index 19ed970007c3..44bbbffaf876 100644
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index 8a508486ba00..a4d3ed14045c 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
new file mode 100644
index 000000000000..c238ea281780
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.25.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~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/nss/Manifest b/dev-libs/nss/Manifest
index 5061036e11c7..87457b4c532c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -9,7 +9,7 @@ DIST nss-3.49.2.tar.gz 76489641 BLAKE2B 844a88984fde45142093ee6df2934d89cb4911d3
 DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
-EBUILD nss-3.47.1-r1.ebuild 9421 BLAKE2B c68d6f35beafa76d0a661d05d3f2588f42749d8ebd66611330763a1e3d6877dc7ddef88177cd6449c1dc7317ff37f1b5ab4c085eda7c5ba79f655998c5bef78b SHA512 3f501ecda5ee130a4f26eee0dee1c00e951892e9bf20b09908e1684d823eb47d8779957afd2bea6deaf5f75c8c6a3aaa0638c4786edd883179a6e3c35edbfc8b
+EBUILD nss-3.47.1-r1.ebuild 9422 BLAKE2B 890a152a86404e751dd3f7655d980f5071ba98b2afe7491dda5ca353f32311cdaf830f8d7762df5054cdfde4e61cd2881142e1c52cd0c74e0cae53ab5d45c664 SHA512 eca35b5d30baa1ad7694ce7d1a57f9befe3e5e0ef4c72b43af49a2d7ad843d12f2d17395e02eeeff9254859a4867d7968bb1954474a62d37e71263420691d494
 EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41f975d5562a166c69d30cda9d4f15a2f1e8e85533faa4b511186670138e63356b93ef34fc13df7ac58955534 SHA512 32a79a4bb10a5b60ff8fbedb541e72ac248b0b5cdbcb98b6a7371b984420e735838ac86495e058c937a593870b0f49053033dc999d1ac3879504433ed5885b64
 EBUILD nss-3.49.1.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 EBUILD nss-3.49.2.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
diff --git a/dev-libs/nss/nss-3.47.1-r1.ebuild b/dev-libs/nss/nss-3.47.1-r1.ebuild
index deb76ced6d58..a320764a7c4a 100644
--- a/dev-libs/nss/nss-3.47.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.47.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 BDEPEND="
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 6136ced7be6e..fd4fbaf973a0 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -2,7 +2,7 @@ AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch 454 BLAKE2B 8ec384d2
 AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch 777 BLAKE2B 06d47037678d7e6bf757f879e319545a434d9301ab31045132ca3ae112e8f86f2797c544533b031536d40646859a4a3bc5d66abafb963b931b32b2b3aa8ccbf9 SHA512 03ea9386547b7f7c19d1067b0ec4dede30c3656d2403ac60338d6aa3bf1ceca1a80eb19a08fa83bbc4766ffc63c4871bd91c37731b259f2395839e724f3314bf
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
-EBUILD oniguruma-6.9.3-r2.ebuild 1112 BLAKE2B fde34ed55491542010421c2b6510edb7ae7d00d88234202cc527de6ce8b73926d979a049577215f63975a7c02da48bea7fb832ba8d5821a9f23664ab21374c13 SHA512 ec78dc10570e912890d4cd08efa9adbf1e4a1586a005930d536faa71db67adad17621770c073c925594d70b6bc7b0e2c9a4435ea0b224b62d581fdde961bf193
+EBUILD oniguruma-6.9.3-r2.ebuild 1113 BLAKE2B 30751f1b12b22f76fa0b2ff328802a54025e5d83005a6cfd65f0daf67b0d979969aa1e660fa12a20a1118c0a39031bb2aada872c77a74a7dfd6ad065d47ae599 SHA512 22939a4861d26409849f5e95ba2ade632af6620c5ff0dc734e5d0abbde72262951d21f1e476d1f58e4a76b5619d844492d7a4cd5a2422899b22046ef75a163b5
 EBUILD oniguruma-6.9.4.ebuild 1509 BLAKE2B f21a70eafd15561a3226c866647213ca704c3c8d9d9a041f34b4cd5c81b4b1fc691b05442043bae85500ea32f079e13f6e0935ae29582776639640c5665a414c SHA512 1a5a515e58ee041fda0748e1aa844f970dbf625da5023a2226cc0a2ac69bfdb24426ca296ef29679cf56b7e2267d3c3e37c845c3c759c813a54a0ea7ecdb4146
 EBUILD oniguruma-9999.ebuild 1103 BLAKE2B 82646a83124feadc0ff37f9cec6f9664ca188814596bd2c4b739abf7055a133be7025710fcc195b4940d9637a552f75516f84a4054fe058b2af0bbaca982dd00 SHA512 65e62e9721012a8c8f582f90680246bbaa9050767a085ff0a87c809f818f2f5e7f501ae6e48a19129feb9279b884ce5bbebe9d9f691229ae8c655f66a9d908b0
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild
index 8a716c7a03eb..4bcc9151bdfe 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 PATCHES=(
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 46778c03f11c..03514973feaa 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,4 +1,6 @@
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-8.0.1_p20191001.tar.gz 41402 BLAKE2B 0ab3cc4f84a9e3e599d4e0995f219b94761b882a6290d9c1e399bf820074b72daab935a9d48d09d3e02d1b46659fc8c00613f35e88f0231234e31f93ca6e4d7a SHA512 87f3855bd2cc9a416f317afc98ad7cd1cfcb5bf4b2ebf7401837c1734b1c8d10e07843aab78735bf48888523b231db1911014a6468c0b4c461c43a5434a31ada
+DIST opencl-clang-9.0.0.tar.gz 23345 BLAKE2B adbce64efb2c1e4e96d4aff585c0f18bd06036a60b35164681b9f5b4a6c89933e5428e9959ddd3cec89b93a5c350e6b0f9b15b8be2be42cd520ca55852352df5 SHA512 126974d816e7f2a90ddb2faa4e8e95841d8ae15f24e77013ca8894ce75ad5079ffe942fb40731030363a10e470e66f2ad1794c2fe31aee6f8608304b492b30eb
 EBUILD opencl-clang-8.0.1_p20191001-r1.ebuild 913 BLAKE2B 812cdfd7ca1d00e2fe0e6456260723ba6a242abc84c3bfc737f56961c94ebdd805091503e21efe05cf00d3e6d3de58744ca2fb52a4205a0e56085423b209b349 SHA512 123e5cafa2491543016f850e941da71c7a0b8e3d75c6371ba4707f7a2f81abd7bdf230613538ba5acc94105d5647a6e44207060230775732ba03bb8f9b78c444
+EBUILD opencl-clang-9.0.0.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild
new file mode 100644
index 000000000000..076afad8c68a
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="9"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-vcs/git"
+COMMON="sys-devel/clang:9=[static-analyzer,${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	dev-util/spirv-llvm-translator:9=[${MULTILIB_USEDEP}]"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=9
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 0bdd220b2c37..f253e77f6bd9 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,4 +1,4 @@
 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 1805 BLAKE2B 6faebe36e660b15fd98c49cb2e1b5a3b423278e205f84b652747b62ba89a1f2b49f3172f9a365a442233677324ca3e183038d25b7a4f453ece26d8e04600ce1d SHA512 9886983cab35370185aad4560a66000a15277bd47961692870e8aece959133e1a869f825f01a6f72b898e59d3607703940930ec5564ac4c329ad907296f7647f
+EBUILD openct-0.6.20-r4.ebuild 1806 BLAKE2B 955da8500e49c361af41694519c4e6f56b12f8a94c815e31d78d66d7c5a5f583170c6ac926fd38be7f8ad57b97b1cf81c12c6e46d40f3341ddf26d212452874f SHA512 5a272a0d8461e842a47a6391e541610b63112ddd831ebe00ef665fc73a9820d9049153417aac1b87588b4da898f268c66c185795cd861ee6423e9f0b3531e132
 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 cb39d7698bf9..09602f862b64 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -9,7 +9,7 @@ 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index c05af27d7c96..4ddc36ba95e2 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,6 +1,3 @@
-AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0
-DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
-EBUILD opensc-0.19.0-r2.ebuild 1677 BLAKE2B 979c4377b0c7ad3e53315b39200a35d52b3dab90f1e5ee399103730f142110b3958904042147cf07825bd45c2b8b94d51a9ef92d14608b30585f9c5217f8472e SHA512 606d3341d01f6c471cc4e8f979ec5a9811ee245ff8996bfbab96925ddf857bfbcd69de9eec91968503307ac75557b28f1dccfa067ee74b6f39ce5b79b84426aa
-EBUILD opensc-0.20.0.ebuild 1599 BLAKE2B 7adada7f2482c75a245f1300055b0e10ad917764c04add7fc03ed4876089d1619ff3451c5b462f51fa32b5392d58a15df7629aeed558b678b76e6fe0a50e060a SHA512 e964112db9cda9a939f9e842417bfda8f113ff2a68bb56acdb6be596169fa6901e2493b750d52644cd0a361ea9ab1c36a9834648c6e1a4862f83c96663e84ee0
+EBUILD opensc-0.20.0.ebuild 1598 BLAKE2B 86cac33f591e526c802d8c3af9d0bc1093f1aa9ebbb7fa7510f00de4b669b8dbdbf0e2848c5e55604a4afb5aef5f1e657bd4d88d57d8e1a3826aee4a4599576a SHA512 8fb48d1c8b6f5d67f1351a2b515c931ff4a86ecd8e202882eefefee0f09b61c53278dd718f6eaee7df60bd3e0d9583b46c3ee199465a54e27524b6795bcd601c
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
deleted file mode 100644
index ca27c70245d7..000000000000
--- a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 15 Sep 2018 11:04:13 +0300
-Subject: [PATCH] missing include
-
----
- src/tests/p11test/p11test_common.h | 89 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 89 insertions(+)
- create mode 100644 src/tests/p11test/p11test_common.h
-
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-new file mode 100644
-index 0000000..d3ca304
---- /dev/null
-+++ b/src/tests/p11test/p11test_common.h
-@@ -0,0 +1,89 @@
-+/*
-+ * p11test_common.h: Test suite shared declarations for PKCS#11 API
-+ *
-+ * Copyright (C) 2016 Martin Strhársky <strharsky.martin@gmail.com>
-+ * Copyright (C) 2016, 2017 Red Hat, Inc.
-+ *
-+ * Author: Jakub Jelen <jjelen@redhat.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef P11TEST_COMMON_H
-+#define P11TEST_COMMON_H
-+#include "config.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <setjmp.h>
-+#include <cmocka.h>
-+#include "pkcs11/pkcs11.h"
-+#include "libopensc/sc-ossl-compat.h"
-+
-+#define MAX_MECHS 200
-+
-+#ifndef NDEBUG
-+	#define debug_print(fmt, ...) \
-+		{ fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
-+#else
-+	#define debug_print(fmt, ...)
-+#endif
-+
-+#define FLAGS_SIGN		0x01
-+#define FLAGS_SIGN_OPENSSL	0x02
-+#define FLAGS_SIGN_ANY		( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
-+#define FLAGS_DECRYPT		0x04
-+#define FLAGS_DECRYPT_OPENSSL	0x08
-+#define FLAGS_DECRYPT_ANY	( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
-+
-+typedef struct {
-+	char *outfile;
-+	FILE *fd;
-+	int in_test;
-+	int first;
-+	int in_data;
-+	int first_data;
-+} log_context_t;
-+
-+typedef struct {
-+	CK_MECHANISM_TYPE mech;
-+	CK_MECHANISM_TYPE hash;
-+	CK_RSA_PKCS_MGF_TYPE mgf;
-+	int salt;
-+	int usage_flags;
-+	int result_flags;
-+} test_mech_t;
-+
-+typedef struct {
-+	CK_FUNCTION_LIST_PTR function_pointer;
-+	CK_SLOT_ID slot_id;
-+	CK_SESSION_HANDLE session_handle;
-+	CK_UTF8CHAR* pin;
-+	size_t pin_length;
-+	char *library_path;
-+	unsigned int interactive;
-+	log_context_t log;
-+
-+	test_mech_t rsa_mechs[MAX_MECHS];
-+	size_t  num_rsa_mechs;
-+	test_mech_t	ec_mechs[MAX_MECHS];
-+	size_t  num_ec_mechs;
-+	test_mech_t	keygen_mechs[MAX_MECHS];
-+	size_t  num_keygen_mechs;
-+} token_info_t;
-+
-+token_info_t token;
-+
-+#endif /* P11TEST_COMMON_H */
-+
--- 
-2.16.4
-
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
deleted file mode 100644
index 38f37ba9dd9a..000000000000
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.7.0:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	notify? ( dev-libs/glib:2= )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-p11test_common.h.patch"
-)
-
-src_configure() {
-	econf \
-		--with-completiondir="$(get_bashcompdir)" \
-		--disable-openpace \
-		--disable-static \
-		--disable-strict \
-		--enable-man \
-		$(use_enable ctapi) \
-		$(use_enable doc) \
-		$(use_enable notify ) \
-		$(use_enable openct) \
-		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable readline) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable test tests) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index 625c0206a763..3a0f653e208e 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 61cca03655a9..4d0261f6387f 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -13,7 +13,7 @@ DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28
 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9718b74b30afa9be2397ad80f88031920806b6603b6469beede02b6e7a742abf5f82ebdd7c9b8e69c1ffe223e4860dc9581128 SHA512 9e4296326852010d5cebc204d1a34a34198d8d65460bc91a2bd37c80be892a5ae519513e4b0109e6b51b6faab0e171ef6cdae868868c158711558d147083c06f
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
-EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B 9ad826e8194143ac02469b02b35e8f4a7cc49b65b3159947b85bc74395ae0ded9a2f2a4677e98af87408f42b7b859a67ab914e442e11086c36ef42465194509c SHA512 65a56030a42e4f9c64fd1425a1690234dd2b49b3821208793bf1da4e7506fa62bea0a106a99ab1b643ba0471b47ff4e3d9b8f64e68b34300fa41d1df56ff0cab
+EBUILD openssl-1.0.2u.ebuild 9866 BLAKE2B 1cae2b67bf0ce3644b82a5a1c069f8192740ec31f9588f876fd5601dcb46d633972e48dc2a21be0b185ed760fba640551db11e9713c90ee101dbdbc60f551f38 SHA512 d12c2f167b7cd4769b72fcadb797536fcc57c596cf0a1a23923e91c655fdf2c237da9c1292c7495b8d0a67482a1f53d2e1697ef5b33de68f301ca34c5c721f12
 EBUILD openssl-1.1.0l.ebuild 9596 BLAKE2B b90dab20cb55693a944efa1cd6a2e9422fd7f01e618d50ba74f7f2c46c7fdf6d91621d1380e000ea9e531997dc43c38324965d1abb3c4f668cfcf0986e599c8d SHA512 699210aeaeb1796c2cabd33c917a9dec91f1d0ae7a6fd8ed3ce62f90b02e9001722615eaa767d4d479df1c3e79e6c69025f65a4353a5800a0003f36a886d9f89
-EBUILD openssl-1.1.1d-r3.ebuild 10378 BLAKE2B 43732766ccd06933805c3b5133f0a606a57340e975b10768ae044beeeaee67ecf4e4ad469364a9257b05d0dd567f602abc1b703862b74b656811ce33b20dfe75 SHA512 5caba682680e1c877c1fbfbcfdb1a8513167aacde4b2be1c96ee1026b82178d4685d1f8208616aa15c30e5b65437f294d28cb22d326e3a8adab25f3a3d43cf83
+EBUILD openssl-1.1.1d-r3.ebuild 10379 BLAKE2B 47c57fd82f3a8f1d77f5474999a8269d9ec1982b767c50201894fdeb1198710c7ce1ea4e3d64c58f8d4ecd89febc22edc48180107116a53f4346201e3b48e78d SHA512 768b941d90f203dcc0b82ce04cabe0f005aa6083abf29ba55d994581b7e64fc93710e7f8bbf6ca43070f4344cfae993bc7f81c807fb73901beb45fd38871b2f9
 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 11e934c1f7a0..74f92d2e307f 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -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 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index 774605b4bf1d..257f5a2f13cd 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
@@ -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 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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/pakchois/Manifest b/dev-libs/pakchois/Manifest
index eaefca91d569..4e7be16b115c 100644
--- a/dev-libs/pakchois/Manifest
+++ b/dev-libs/pakchois/Manifest
@@ -1,3 +1,3 @@
 DIST pakchois-0.4.tar.gz 371126 BLAKE2B 41195807192f077039d7397bcaced2f3def57170135cf53f9addf23bae8f742ce76689fc5c4fa7a49ebbf182a38036dc0f7012e676d7c4906e8cdc7af664a501 SHA512 b4322cf58124aa05b6f34155a4eea753c6eae2fbbe57436491caf0549d79598c95f4d4fefa4a823ead341ab66a9e1a3f437d5278e449ca0d088a4a971d244160
-EBUILD pakchois-0.4-r2.ebuild 489 BLAKE2B 66041d61616f7b9986068b1aaa5f1211762630720d5ef33f8eed32b0d129df8bbd7b356ed766cf80a71c8150de34fd35d22da7d2609828989580b20d66036f6c SHA512 b251cf56c2c677d6dfc12391e35721b4280f3d9929616c36a521f1b2fe1767de20ef0a5415390a05690f0c9e0098fe0e275209424f8e9db8b64d574d4d9f3d73
+EBUILD pakchois-0.4-r2.ebuild 490 BLAKE2B 5590dcc4a8167e968de4a83f25580fca408652bcfca04cb31b711a0c0f207e944b747dca1958378c824d71a266ffe98429b288ee2a1f1b39d2d747c7ecf61e62 SHA512 02345944aef289c42e968f408206772b82ac69251bc22025361c4b67c75b97531167a5e0bc4b0c70b54c3788e879e2fe578a4d4ae0af860488712970b467b3cc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index 217f984dc18a..c1488a49771d 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="nls"
 
 multilib_src_configure() {
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index f2a63a12d9b6..75578f5acd6c 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,18 +1,9 @@
-AUX pigpio-67-makefile.patch 2074 BLAKE2B 7f8d9e294992301d64ce0c0f6d6446ca97b790057cbe5eeed67a12d91966d5fa9053cf69ee284a7d2a3a39c8c53ac4599ad38c7f47bb630bf5e0ec9fa10e63e7 SHA512 443052a0db49c5a5b9fa4be6e01a7b78efd392f157de6a2855e66fe3da9353f5dfce2f30aaed86ea6f05e0fd2b75e3c0f51c8b9996561db968f160cc3aba3d97
 AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
-DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2393d79a3fb52d1fcb2513559d4dfeea84c4842d6281936b6e116bd81cd63e4542bbcffaf813ee356ee0d1 SHA512 9792f8402ee0dd204f4a975ab0513099a1fe3d398a28b766f412c08d7908e8e307de4cc92b2a2519b6484f15a043bd40008b7707486015c08bda5f97b1e7e00b
-DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72ce28f207dfbb827f97f538acd82cec2af11590e59985b77ef08834d55b3ac7578e1f6b6d1a0b5d5d594632 SHA512 125364eab9dd33c39fda148c6018679ac91b099914d7f0c6362f61566a9c957065189ace03ad4668b29f25d4d542b81d42c0befe0712867b48977b755dc03edc
-DIST pigpio-70.tar.gz 374569 BLAKE2B a2caadf0e1307c8c3ce936d5fd4d31e18185aa53900f6b2cf8b92a31f423b9a82bf4d2b7212fa8cd5b2d26773598a138ef8331884410f3f418542f43ca1fe2d4 SHA512 00db37b9c0f9751e6179b19e7018583abd9e11d78d01ff9f99b713004cf4e6a224e93644206599378a34dd46fd75c08557021b706015b0bc2bd8b34e363691db
-DIST pigpio-71.tar.gz 374952 BLAKE2B a79a408915285674211e50e30d3cafa433a9ee364cacced501e109d6c31a3a03c14f9d25c3c18e3df252801de65c60ca67cd5f1a8e08f05be8098ad591a14fee SHA512 c3bf029bebff9a7ee02b48597f624a5dcdf277c5c1a7ffa2f6cb83885a93cd6713935d9502127d11c4e9c11e7f6f6be49c8af367707eca2fff469728b5248e2f
 DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
 DIST pigpio-73.tar.gz 385233 BLAKE2B 5b58b399ffccab456d64decea4190e326c70cfe36b5513d0c69aa68c5ebfe2667ec5b4a028d19ec987d948c7b94dd23d67903bbae901d61f751dd606540324ea SHA512 bc6d2bbc2f2067c851a74a6137913b9abf2a7424bc2f78cf4086a1210f5c1116f71dcfa94a1268c137f4181e2db39af0bd2025caa1a7f98374b2043a166af746
-EBUILD pigpio-67.ebuild 1082 BLAKE2B aba391ac188117d9e95c2223446bac6fcd3797cbea50868e890e19c9cfe4533171804fbaa8132e7dc794ccd7203b6c0d899c7d6477876ff10c9c47d585e3abd8 SHA512 59d02a031c667ed37af7621527384a2210f8b5502c49596c696d22412b32e9a454d3a3e1e7f6c7dd964f1e1c3aa93b98ecc3b0037cd64bb591b7772b16b1b245
-EBUILD pigpio-68.ebuild 1097 BLAKE2B 6fad414ce0285932dd875fca1e232f954b69ca916554439b242fcb7a0686156386fbe13f75a6eb9ba3e631999993f62da4d4048c23dd801a9283f224a4d13a71 SHA512 0db21328f2e896d04db86f4e64e262311400647b997b3287fd7c4b36e862051ac4beaf1c79eb4a1233c5c09d628198f57100bd9d6cffc1a656855710575aa8e3
-EBUILD pigpio-70.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
-EBUILD pigpio-71.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
 EBUILD pigpio-72.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
 EBUILD pigpio-73.ebuild 1093 BLAKE2B 37fa60cb0c9194f07feafaa953d3d21629ed48c91fe5fce67e447f5ee6e12eef3c7d1d9ecefb648aece77081ed40a567c542eef584abc2872c350811a4143d72 SHA512 4ecf45c2d6a9f798b23ea7c24cd07e011028b1c3c090e49bd0ab0fe82257423ba478492d458c580e8571e3d01fa379979e5d5fee40b3ab87d43e7dca75ca10ed
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/files/pigpio-67-makefile.patch b/dev-libs/pigpio/files/pigpio-67-makefile.patch
deleted file mode 100644
index 1df4475eb0ae..000000000000
--- a/dev-libs/pigpio/files/pigpio-67-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile	2018-03-21 19:51:11.711880972 +0100
-+++ b/Makefile	2018-03-21 20:51:46.341684595 +0100
-@@ -9,6 +9,9 @@
- STRIP        = $(CROSS_PREFIX)strip
- SHLIB        = $(CC) -shared
- STRIPLIB     = $(STRIP) --strip-unneeded
-+LDCONFIG     = ldconfig
-+PYTHON2      = $(shell type -P python2 || echo ':' 2> /dev/null)
-+PYTHON3      = $(shell type -P python3 || echo ':' 2> /dev/null)
- 
- CFLAGS	+= -O3 -Wall -pthread
- 
-@@ -23,7 +26,7 @@
- 
- LIB      = $(LIB1) $(LIB2) $(LIB3)
- 
--ALL     = $(LIB) x_pigpio x_pigpiod_if x_pigpiod_if2 pig2vcd pigpiod pigs
-+ALL     = $(LIB) pig2vcd pigpiod pigs
- 
- LL1      = -L. -lpigpio -pthread -lrt
- 
-@@ -64,22 +67,21 @@
- 	$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
- 
- pigpiod:	pigpiod.o $(LIB1)
--	$(CC) -o pigpiod pigpiod.o $(LL1)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
- 	$(STRIP) pigpiod
- 
- pigs:		pigs.o command.o
--	$(CC) -o pigs pigs.o command.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
- 	$(STRIP) pigs
- 
- pig2vcd:	pig2vcd.o
--	$(CC) -o pig2vcd pig2vcd.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
- 	$(STRIP) pig2vcd
- 
- clean:
- 	rm -f *.o *.i *.s *~ $(ALL)
- 
- install:	$(ALL)
--	install -m 0755 -d                $(DESTDIR)/opt/pigpio/cgi
- 	install -m 0755 -d                $(DESTDIR)$(includedir)
- 	install -m 0644 pigpio.h          $(DESTDIR)$(includedir)
- 	install -m 0644 pigpiod_if.h      $(DESTDIR)$(includedir)
-@@ -92,13 +94,13 @@
- 	install -m 0755 pig2vcd           $(DESTDIR)$(bindir)
- 	install -m 0755 pigpiod           $(DESTDIR)$(bindir)
- 	install -m 0755 pigs              $(DESTDIR)$(bindir)
--	if which python2; then python2 setup.py install; fi
--	if which python3; then python3 setup.py install; fi
-+	$(PYTHON2) setup.py install
-+	$(PYTHON3) setup.py install
- 	install -m 0755 -d                $(DESTDIR)$(mandir)/man1
- 	install -m 0644 *.1               $(DESTDIR)$(mandir)/man1
- 	install -m 0755 -d                $(DESTDIR)$(mandir)/man3
- 	install -m 0644 *.3               $(DESTDIR)$(mandir)/man3
--	ldconfig
-+	$(LDCONFIG)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/pigpio.h
diff --git a/dev-libs/pigpio/pigpio-67.ebuild b/dev-libs/pigpio/pigpio-67.ebuild
deleted file mode 100644
index f948a8845cd9..000000000000
--- a/dev-libs/pigpio/pigpio-67.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: libdir="/usr/$(get_libdir)" prefix="/usr" mandir="/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-68.ebuild b/dev-libs/pigpio/pigpio-68.ebuild
deleted file mode 100644
index 7829fd488067..000000000000
--- a/dev-libs/pigpio/pigpio-68.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-67-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-70.ebuild b/dev-libs/pigpio/pigpio-70.ebuild
deleted file mode 100644
index a8d29809f882..000000000000
--- a/dev-libs/pigpio/pigpio-70.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-71.ebuild b/dev-libs/pigpio/pigpio-71.ebuild
deleted file mode 100644
index a8d29809f882..000000000000
--- a/dev-libs/pigpio/pigpio-71.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 9a0cde04d251..5d5628556a59 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.25.1.ebuild 1055 BLAKE2B 5e83f9c42dbffa5885adc476992aad7b54c061c029a4c97e1c5af9bbceb6d58a4b3469168e03e222ac144017cea5d7baa739cd5f876d5325f26dac4038a36c0e SHA512 0214f6b86769f6de54ee219dcb211ef6adfc4b681bd907400d253e642c98dba21f94a32cc3700089b3b80cf34a40e3e6343e8dc7a267f4ceb8476f36ebb60e35
+EBUILD pkcs11-helper-1.25.1.ebuild 1056 BLAKE2B f8e7a9b2db111b7c91aa4d0fc6f4f5739efdb389a263cc3a4faedbb61c2a141c4d8d62c36bc11a3696357e1d2b0e9bfab8cfd59b8b770ac562caeff4675d3209 SHA512 a8707fa5c0d229eb7b42f3790cddc191ab4a80076ba8c9f1e826d9a76fdddcd2fcdfaa04741a2e4ca501f269f7fc73272da2b6ba7c92e374f082a71e57d24f9b
 MISC metadata.xml 434 BLAKE2B ae95013cf35b04c9c254de1637b1de3b755bfb57a053f789e5ff8875412a5be2db2e348471ba938a9752c3fccce023a86cc0e8c13a8f485a0f3717defb81c1fc SHA512 1699017823c013e6b053b316ee538de24a498aa790da27fec0181b05c4ace43569ba90a2d210e433f3ec9bc8f260f921adf609647fcd8e12ec58d084accdf2b6
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 14dcca9b8781..729d12644803 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index be32ddab83a7..3ada40c95345 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 900 BLAKE2B a6fac4e8dbaf4832c95ece59c3de49d8ad4560bc4ee1cd2891cab57801344dcbdacd12f6556d5b8881171b9e65be5392d5870ff04901392921e90366baad518f SHA512 af417eafe70d2576f860cfb351db8c0a56099c3ee946de41b7e8b2287fd9bf4bbe05bd30a2c0e638d12475061c8a57f8e799d2f89b568bd866740f5e6ad9fcaa
+EBUILD popt-1.16-r2.ebuild 901 BLAKE2B 54c6d9d571b379ee4d25dc56938c09a420fac0bab5022d5dd53781021aa37c245ff8f2407459c62d2378e72c37e4b4e5e77cfefb17e00214397cb1a207218845 SHA512 618fd208cca4a0a7c7f029b256b35e571fef7feda5c157c9a9e845071f8018cc2c16ee948f50581a1c9421b6f3fbf97c50a40c049f8c5b427e5beb88fd0e4c33
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index e5c34f2d0c40..3cd5cd47594e 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -10,7 +10,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 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index b58d5c4344d0..d2465c5ed4b6 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,6 +1,6 @@
 DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.1.ebuild 1593 BLAKE2B e40f20ac2e1d0a84f39ce36f6250e1cb90e98f95ae682105ee2faa4db0191fc068f5335d7d704bae3a9ab665129a9845c440328afb3d683685cfa6095b776c0c SHA512 98c2fabbd4c254fa4ac8089def203a944425d3d6516e7fd345ea69734fa4c1b022b98313866347f7354a3e635926cf8ff19f838bb89f17af9008d069c0c3001b
+EBUILD ppl-1.1.ebuild 1594 BLAKE2B af46c39eb61721442cfde43bab0ada1e960beb0a4c4348b1304db8c01387a80d7d7fa05226a9ccdc9d8e335a16ed01653f8bf1a662049287146e93b446b6edf2 SHA512 5a703bef5b8cdda06b57a9f816a9f711d8c36ca3e5404b2032d641d490e3344e4b8fb59f9dab87516237fa99d374cb368340846e5fba09cbf7ff28699cc07345
 EBUILD ppl-1.2-r1.ebuild 1305 BLAKE2B 59322ae53b8692ffbf0e19322790db29c669cbaa974a1f53330abdeafedc1b12b8ada729cead24fbc4ae8bacbfddbd47e2b58d4b3f6c9ed2fa45b9a5be513944 SHA512 aa9991b0c96ae26b59be875c3bfc36566bcf021cec2e8aa5bd158354f7158224dc4b847469532b8374718323f3d0a7f4c7150e5dba650f807b27c428c35d9ed4
-EBUILD ppl-1.2.ebuild 1597 BLAKE2B d10d1eac0c5a0e9d4ddbe84f9538035dc5ef6276b679d17e92851401bd9fee6b6da61d9166d7d6797ed36830bfc6c9d7889e53693b147af5e623b4e5735eadc2 SHA512 d92a3cf5ef73e721fe0ccd8dbaa85cc9c6a3c686a33917696b22b9aa0bd1fbc6d1f3bc0d02b8b6683fcd3426999905ccefdcf871bf0064bd09c76c16f385b0bb
+EBUILD ppl-1.2.ebuild 1598 BLAKE2B a0ad54e31ca1b3abbca6c96ad9c8ff75f9551b6a022223b54716365a3cd36f1c6c9c307b41b71413334dd21ce4ac6859c820234a4316d492fdbe73631fcfdc78 SHA512 34f8d472d6262bccce10c334172f73e673400fb46bec841506f232f63b38dff1c89fa3156b699136d358f5e79404473bcc738dc3bd889e46a225cabe1f4b8c80
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index 2808c73b96a7..7b261cd96c53 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.13" # SONAMEs
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 8805f55b2eab..f3d880a4758b 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 4ebe5032b0c7..016a3a1ddc81 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -2,6 +2,6 @@ AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc9
 AUX protobuf-c-1.3.1-protobuf-3.7.patch 562 BLAKE2B 4319e91d94a0f3f47bba3dfca74e5a9b7813480719c64e84c011483f3fca03f629083d4493567c0da83395adf969a8d9b08af42c6886eee7556c989c5f7d0e67 SHA512 2ff16a126b751a2faab7d1585c898cfeb07da46e8c636dc4cd44f25bb70575358943ee3e4a6ed316d93714a9668a6dec27e5e7414d458d606ab67c809ce215fb
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
-EBUILD protobuf-c-1.3.1.ebuild 1044 BLAKE2B 661b1aec34516657130cc0183d429ebf9fe9f2bea1d56afdfb454c1d4137346067dc3da500d7202998e6a8397eeba79d2e2135f9a1823152e2048aa0011962e2 SHA512 67463e441eaf6e2e13a7a92f6d53675ba1877529d78ecbda8a9ee1c2dcd94beb21fa15b1f71802be684650836ea121e2c88cd0265b4d9db187aaaa31df3d78fa
-EBUILD protobuf-c-1.3.2.ebuild 996 BLAKE2B ca19872d0c308dba1f960d5c8fdff2e84d1b1dade9e877493348431c283699deeb9647cff8a5a34fe92ffb8673b587a20ec51341fd3972ddcb067602c25af944 SHA512 f8e639254db6c1c7b8d0b3e537c24c20b6c4dcddb7650299c05a1e5d34aea5a44231890a21f3d8dbe6eb58a0bfbd2ea207159ce7ce096c990bba1b94cc0934e3
+EBUILD protobuf-c-1.3.1.ebuild 1045 BLAKE2B 9ad619c70aade683ec26c85427302087f8c607a601dc9a98691936e3b7c59f6249c69b67b2f4cdf1b03a17cc7f0f6ce5b7040f1d89aff893d571f5efe3a005bc SHA512 ad8bf49f7dd92516c97665ba60b95341bc9f03760f8f4fbf15427feac9f0f2f71aced5a776ed314e6c4fa5fb035afac76be7b0e9882d201bf6c93299ffc959bb
+EBUILD protobuf-c-1.3.2.ebuild 989 BLAKE2B 9a1ac99450d314014beb8d416535ee4c7c05e10b590a24b01d22e70172ed0ce23f2516b32f7c964e2f956ca09775640e3ab0755120f5f02a2d588bd99b130dc6 SHA512 68a35e10250bd76ac1525d8c0f8b06aa9b13a4f18987f5063151fcdedb26edd1c3183bf6d1b00bd527334b793ae253dddd3c391c8c9fa5d430c47fb109823fd2
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
index 84e9cb58fae1..5b5b1e3a00de 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
@@ -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-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index b53ee8f1a856..41fe7fd76f2a 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 537efe9f9356..7bcb0e1bad8a 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,7 +13,7 @@ DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
 EBUILD protobuf-3.10.1.ebuild 2912 BLAKE2B f03633d4aa609b62100785e666d39f6fae99ebc14ee3d3232b9de70fb8ef87f11d1192d7484b76680e7572c9d3a0f396fe14d9a81d1322fb46e74144068a4bc9 SHA512 3764390c03ec926610c81df59aab2a9a640be538efca7d37c9d525ff434b4dfb9ff384b7896f7d16e2930cd3d0721b195616a7b8759349ba77f0bd06a94b1c98
 EBUILD protobuf-3.11.2.ebuild 2911 BLAKE2B 164600f1f1a218734f12a8b3c80e320504354621c35d16e3cb6542851a56ba5dba7d07c36b29ecb3ea745708ca237bdab5fe45dbfa353c257cf281387fbe66d7 SHA512 a7e1ce67a99f373c15f62b221fe1b3c97b829d172bb207e53b1fd4e6c4306c70ac8d974689bf539af87acaae5f5b8342cc01e7445964df80b5799d0339542f9e
-EBUILD protobuf-3.8.0.ebuild 2911 BLAKE2B 0d5303acbdc4e3a7c2b70fc559854fddbd9d106cf326a5d66492b288286abb364c210804e34cb07f2b0ffe3575fd4ebf349e687aa573afbe5191cd59d2498bca SHA512 e4099152559f5807c33834e0368d1e61270bb5c654c7346d7863a9d23d141aa57f3d88a8a25012105683ac33b7e751ea50129ec2c09b7d52cfba2e8865be62a0
+EBUILD protobuf-3.8.0.ebuild 2912 BLAKE2B 25f7d4f30f72c9a5b322380adb5a16faadf57d81c7b450ccb59656d9583ad2abb542f3ef828d95ae3c5efbe4d72187a640151ba09ec3e90e4a2c792ed22072bf SHA512 89c464a0db249fa90c06a88e5d5cd124bb18134cdb901d0d6977092a386da9f4b03c460917dc4923f229acdaa5f53df59c518eb320c40c1d61528986f5f2b0d6
 EBUILD protobuf-3.9.1.ebuild 2922 BLAKE2B cc0cf2c4dc486249651fc3fb86e9fcf446932938cdd601d19b7cfebacbbb8117ec2809beefc0f8c374ecf08e5023442aa69aedfdabe833ea3fd495795ea9e709 SHA512 2b20b6c8ca86d51635f324c34c395c32041278a63fa260591e3a833b96223ca36121b366e46ae16c874ab6a2328e1883092f0ea2ccb3af935283e44676e42a6e
 EBUILD protobuf-3.9.2.ebuild 2922 BLAKE2B cc0cf2c4dc486249651fc3fb86e9fcf446932938cdd601d19b7cfebacbbb8117ec2809beefc0f8c374ecf08e5023442aa69aedfdabe833ea3fd495795ea9e709 SHA512 2b20b6c8ca86d51635f324c34c395c32041278a63fa260591e3a833b96223ca36121b366e46ae16c874ab6a2328e1883092f0ea2ccb3af935283e44676e42a6e
 EBUILD protobuf-9999.ebuild 2679 BLAKE2B 86ff0785f236a285bd2f01a95546791a05528a8e45612a76c149f90a807ba292211bd5950b5f97530f14dffc69a78b17fd7657b9f2dd2c5270bf78a5f0ec71e7 SHA512 8f50fce8cca5c71acfb026c50c561de922c9f4bcdeee6559f1d01ed840c80d4922a777e854871501006cc743928f563b26e8b0c73691318a7a097cd6f615b5a0
diff --git a/dev-libs/protobuf/protobuf-3.8.0.ebuild b/dev-libs/protobuf/protobuf-3.8.0.ebuild
index 9174c0aebabf..87b7cc58a546 100644
--- a/dev-libs/protobuf/protobuf-3.8.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.8.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 7c170d862057..2b114108a1fd 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ptexenc-1.3.7_p20190410.ebuild 1280 BLAKE2B 116d7d773756fda30d30f169743416f9b8526309052f4f29e6a64abd9d3245b4f32ec31fce83c95d7ca5fbb4ded656d7ab8a5c9f39442234b66ff0cc4daa4f6e SHA512 720b6d5aba97a73dfbf11181c2903c5a06cd58d00358db5db6618824dd27c1eacba9a9a6ad2cee06c56a5082fdbd7cdcafad44079d767d69f0b61bffa50eb816
+EBUILD ptexenc-1.3.7_p20190410.ebuild 1281 BLAKE2B ed563eab8a97de9c82bc49f082330841c38b55d3d3083ac8cce60b9b117a1ee57bcb5f2249709eeaa13e01f66667cf42cf04cedd252fa110f67e9d2ce67cb3fe SHA512 30bfa39b72cd4c88946ca5c6dc90c6f7c80ccc9bcf9746cfe0bf3ac798847f2336e4e4996c3aa48385b05b07173b39c114c358b4ab7752e2bdaaefbcfd31d3fa
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
index 06d57c340097..4487cd3c480b 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/range-v3/Manifest b/dev-libs/range-v3/Manifest
deleted file mode 100644
index 9113f6470037..000000000000
--- a/dev-libs/range-v3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
-EBUILD range-v3-0.10.0-r1.ebuild 809 BLAKE2B ef051678d2f3f7b0bbfa77ce573ad00cec1ed9573d04ac8f8d9a2198c0c44e9892fb1adcfc834de48ada13e7c82d454f773ba0c1b4236486f38540a383e7c495 SHA512 a0a321be35b07c2d25e8997b18831feb2a8b7556a81fac5f0825b182946323e3e349fdfd980efcac16bd3d785c061bab899da0d0635273f86c7f2065bf940f10
-MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-libs/range-v3/range-v3-0.10.0-r1.ebuild b/dev-libs/range-v3/range-v3-0.10.0-r1.ebuild
deleted file mode 100644
index f840e1baee04..000000000000
--- a/dev-libs/range-v3/range-v3-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges"
-HOMEPAGE="https://github.com/ericniebler/range-v3"
-SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE=""
-
-src_prepare() {
-	sed -i -e '/Werror/d' -e '/Wextra/d' -e '/Wall/d' cmake/ranges_flags.cmake || die
-	sed -i -e "s@lib/cmake@"$(get_libdir)"/cmake@g" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DRANGE_V3_EXAMPLES=OFF
-		-DRANGE_V3_HEADER_CHECKS=OFF
-		-DRANGE_V3_PERF=OFF
-		-DRANGE_V3_TESTS=OFF
-		-DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-		-DRANGES_NATIVE=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 283661308878..0bd1581afa61 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1714 BLAKE2B f48c2fb0759020722f5c0c2db98703232c599f4e33c4aa7ceff2e763d7a7a09dab05ec50915bf850147a80e1541d3026a0a32cfb7e46c25a34ae204db0ce607d SHA512 9f1fe9a31c38aaec0d23a651032b08d2e0a829117fc0fb84f61dad7d15cea9f3a3c40ff60123ed50243253aca63c2492e24f571c80c1752ecfd0e9f60d7f6cc5
+EBUILD rasqal-0.9.33.ebuild 1715 BLAKE2B 8a2c0e79cedce60ed838693d55489149b59b3d3be8872140dcef894c6c46911462e2fc1176f254c652f90a016a27e7db3e44a80918d894feb7897bc33eb774c7 SHA512 b28f8e90123fe4fa30c8c61909458607530a03535af1ae130dfd43d148eb454304446e864c3a1ad065d82546fb0e8756bf726c4dcbb654f86dd5f2f10ce0d5f6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index fe950c90110d..fd5628e284cd 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index d98425ee8d42..9f0864b7a823 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,6 +2,6 @@ AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc8
 AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.14.1-r2.ebuild 1331 BLAKE2B d275c6df8aa46588a6019fbe5c0a02cf52cb50a04ef58e0f581fc3c2c47d91e4feea2654e8d735d50d39722f19115436e033caebc3bde73c9f04477877d53c0b SHA512 a05fc7daa0b42aade87680e5fdf4705da2efaadcc5b20d283839cca038e5e45e3f81520f210b8559f311ef5442c23655ad95efdd58d68c11cba3a41d253bf3d6
+EBUILD redland-bindings-1.0.14.1-r2.ebuild 1332 BLAKE2B 3218194f6fa4fa51b1763fac7d99b3045611a0caf4c76e44155dc8b9cf6580c2441c7ff8da0fe5a0dedab79b20904bc2bbb24f103ff26a57d15b8938a66185ff SHA512 7f5ee15f40a9fe4ada7f218f23725b4143b84cc98680cbd8205fff4dfd2342aa37d271b4f5ac3585656ac21834dc24665f30d23a904421d2d4e7e745302e07b5
 EBUILD redland-bindings-1.0.17.1.ebuild 2653 BLAKE2B b3ab9239ec293e96940efc94ff0a1d0e9bac9d7067b578870642d979d9e46363f7d4099c7051149bc191f64810cc741a50239841135379fb9276c6d33b8627fb SHA512 90c5e62338df3c1918f234256428201fa548387a4a9f4ce652a878a1ba8d28eeb10418048a147a172ea55aa9eabddb40705bc6b5dffd1f200427dc822645dac4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
index c6c5e9ddee67..084ab7d018ab 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 5fc1abcb5f15..8acd85c0a456 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,3 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2476 BLAKE2B 132ab8fd87e64523f94fa0700b89cc8b1728281c30e920322b301f6b9ff2caba25e37f53be6dbb2da95d77740f805df7aace393ae6899d00ee06b3e771f2a502 SHA512 a4e15b87d109e27c797aa24984ca538aee99c57769ea78681e8034bb88cec90ecd656d8a28681ff6c54947c41784ca99ab6b3e6e88af7eb90fae4e42a5610b35
+EBUILD redland-1.0.17-r2.ebuild 2477 BLAKE2B d1e7f8c3871222eece634283cfc5990f9c20b234d5ec9d3a8ad3ebe0e4147126bf52f7e547096aacbe9fa1bfae04036338b99790174db566c5b4c1ecd3d98ecf SHA512 83b18ea013cde873ebf2ef93574b7412e647b3d22a38eb28ded416a30de762a1b24b3ed2f1cbb9fa2847df06e73bc362c2d8aa04fbbf6371988b908acba9d661
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 03249a1ce220..da0f1fa99800 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index 1e954914cd8e..037d3cd2df73 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,5 +1,3 @@
-DIST satyr-0.26.tar.gz 434820 BLAKE2B 4463c69e6ac2eb8237f599bfeed308265a906c6e3efa154b14eb6ee7acdc65580da9baf5ecb99e4efa4f8c00f7656ff2a747e607f2293b12a513ed680986fe08 SHA512 45dfc42e05e93fa0417c8c5d6811097cabaa0f4dcfb79df13d3840d789cfd41c84382ae84882ca120b1a3120987123a306656324cf39f306046a5d30547db656
 DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710
-EBUILD satyr-0.26.ebuild 998 BLAKE2B 08132e235be3f21deab7abccc2ddb5021851839f4012d985144bd89a7078a09bcf0e854e6e6c4626f9817c20a2aded73303892451e26001792b812b1e007dfaf SHA512 4c8108312645f67c1da4aafdf5693295d4706c7ca1c2f63fe7933c2283488411c30e485d188b64eb9ccffd3caf5c0927608218de5075429309cd82e06d11388b
-EBUILD satyr-0.27.ebuild 1000 BLAKE2B 2b1cb4e87e8659fa52104afbef990723f885b42cda56cede10da9239f1c5f8e7feda8e1aed6580fe9205c836e71105c93f91f45c9001334587a5a58e0b7d453e SHA512 e981c58278d065912267460d28e0eecf3b37475ef873b4b40a343617a29fcc504658ae6e182c0ceaefc60ee060155b82c193c9c8338c394e4522fc3cdf685000
+EBUILD satyr-0.27.ebuild 998 BLAKE2B 08132e235be3f21deab7abccc2ddb5021851839f4012d985144bd89a7078a09bcf0e854e6e6c4626f9817c20a2aded73303892451e26001792b812b1e007dfaf SHA512 4c8108312645f67c1da4aafdf5693295d4706c7ca1c2f63fe7933c2283488411c30e485d188b64eb9ccffd3caf5c0927608218de5075429309cd82e06d11388b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/satyr-0.26.ebuild b/dev-libs/satyr/satyr-0.26.ebuild
deleted file mode 100644
index face20cac54a..000000000000
--- a/dev-libs/satyr/satyr-0.26.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
-HOMEPAGE="https://github.com/abrt/satyr"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/3"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="amd64 x86"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/elfutils-0.158
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	./gen-version || die # Needs to be run before full autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-rpm
-		# Build breaks without and we aren't supporting Python2 anyway
-		--without-python2
-		$(usex python "--with-python3" "--without-python3")
-	)
-
-	econf "${myargs[@]}"
-}
diff --git a/dev-libs/satyr/satyr-0.27.ebuild b/dev-libs/satyr/satyr-0.27.ebuild
index 8293ade15b76..face20cac54a 100644
--- a/dev-libs/satyr/satyr-0.27.ebuild
+++ b/dev-libs/satyr/satyr-0.27.ebuild
@@ -16,7 +16,7 @@ SLOT="0/3"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=dev-libs/elfutils-0.158
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 99a1a870c038..53ff88f5f11f 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
 DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
-EBUILD serd-0.28.0-r1.ebuild 1146 BLAKE2B 537cb27f4ffec82745703470f0be2dc609ab926b6436a91e8322c6eadcb8b294aa072dc5ec1a3c2ef6745af45a3068a33cf8c8a5b85a06928b166740e7039e05 SHA512 eaab6d8887bd979bf6985d23723b7d76c18e83e1e8ac5700f5191dcae1c116e85ba8962e9b33e532a9e105510baa28caaebc13203815296b215282d0fdfc00f3
-EBUILD serd-0.30.2.ebuild 1150 BLAKE2B 179367bad79d276b89aad63fe6caf7500db7a52da982c16141162c6517e7d174f5ea0f13909a6a5d3da3483b2a775a0b2f6e4694b5ded5eeb6806c0e57181a47 SHA512 66887b751f59114d7d2d840fe7a36e8933260424c83ebde5218da3b523a5c947008ecef7b9c168e066be1a19259b78da48a25eca628dd3b4aca12e2126028f25
+EBUILD serd-0.28.0-r1.ebuild 1147 BLAKE2B 8482d16dc393f5b38e612622d0e77c3d27597d19d4c0a28625a4af23a99d0ed754f7b1de2438733ad2f97662104c3f611faca35e14dff1e5a00d2d188ec1185c SHA512 9f442c744d41f252ed67c8d606d13774ecad6f6492ed0ff0b6ea21cf01e91aacdafd71b8fdcb8ffd70be99ab6fbb759db2b11867b20d710bbde449ed83bcf08f
+EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 083af72a17803897ab655fc4b42d6601ccde1d3383c1540d0dbe30dbb1898f7090c34f34684ea0bea5d06771dda1394a0b054e19390f7b5c8b72df6363082cb2 SHA512 d3bec2207e55c829e0172c7dfd9143e9b789986f88ab94ac23623f3727183c36eb5d73b878ece936af4af66628c404b6f92a568a20f4397d0441de7b4939ada8
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 2549676afb5d..2674299b05c9 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/serd/serd-0.30.2.ebuild b/dev-libs/serd/serd-0.30.2.ebuild
index 848568b4f7ae..0bda81d3f71e 100644
--- a/dev-libs/serd/serd-0.30.2.ebuild
+++ b/dev-libs/serd/serd-0.30.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index e2ff2c09b133..e837324c26b4 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -5,6 +5,5 @@ DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb308
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
 EBUILD serdisplib-1.97.9.ebuild 689 BLAKE2B 046e5cbc15c905f6e9ce98cd91798a7b08e93f0ab5409d3ca46a0f52f2cf5c600d53521720e584146c001dcf1a414ae65c98f469cfd203a89b427193cdbad07d SHA512 f1d713fc3c1005ad81b074a4b75638015f06b57141d2f83e02c4cf11a2b2cdaac56b89f1c3fbfc1b3e38d33f2c48e0e22a7ac6af31c47e50b1d4431231c613a9
 EBUILD serdisplib-2.01-r1.ebuild 2558 BLAKE2B 0556b6f2ac51a53ae8160cfbbdd490e7ec0f0f65ed177d457a84f865c541c9ddb953d3d21700719f404dc8ca4bb8488e21ae3e15126fbb882417344c33b67720 SHA512 29036de8863534cd54ec9f72f7bcaf131d5a2b0c3ec63c5a3908481f0f946e3c339b92dc6bfc037d8ad67e4af46dbb6f5cceb4ec9848fac1a4c8ce7eaccb227a
-EBUILD serdisplib-2.01.ebuild 2508 BLAKE2B 4efd666b305375c65be803c8e79d91b9f8caf72cc74d2f655a6ccd790e80099fb44749d46749a8504b0f74902187fb2501402c330301e01d3de62e9b721cfe65 SHA512 cf3279873e09b74ef7c3c357c94fd8bc2a23840d4f606011c2cecad5a3a3972337c4f5ae4c9ca93afe1200aad54b0f8b958e9f80aa2591c525412286c1b9dc26
 EBUILD serdisplib-2.02.ebuild 2559 BLAKE2B 9d19520bb7762b794b49c6c0e110f680f1340b8b1cbfe8bf9e914a58f025f99b62950f95b1a56dc05e382e571bd903067df58d29d85b10ebbcc1edcce9482a6a SHA512 e0eb83121bd6e33b01c67f286733bd46aa48dd7fc3c5352b11be786e7f15bb7d72393dec569b15a791c18097dd3729e72846f41975a67acc7e45b1365c93ab96
 MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/serdisplib-2.01.ebuild b/dev-libs/serdisplib/serdisplib-2.01.ebuild
deleted file mode 100644
index 0a3e778a8d1b..000000000000
--- a/dev-libs/serdisplib/serdisplib-2.01.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit udev
-
-DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
-HOMEPAGE="http://serdisplib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="threads tools"
-
-# Define the list of valid lcd devices.
-IUSE_LCD_DEVICES=( acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
-	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
-	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 )
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
-REQUIRED_USE+="|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) ) "
-
-# Specific drivers will need some features to be enabled
-RDEPEND="media-libs/gd[jpeg,png,tiff]
-	lcd_devices_acoolsdcm? ( virtual/libusb:1= )
-	lcd_devices_directgfx? ( media-libs/libsdl )
-	lcd_devices_displaylink? ( x11-libs/libdlo )
-	lcd_devices_glcd2usb? ( virtual/libusb:1= )"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
-
-PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
-
-src_prepare() {
-	default
-
-	# Fix Makefile, as it will fail, when USE="tools" is not set
-	if ! use tools; then
-		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
-	fi
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
-		if use lcd_devices_${lcd_device}; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local use_usb="--disable-libusb"
-	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
-		use_usb="--enable-libusb"
-	fi
-
-	local myeconfargs=(
-		$(use_enable lcd_devices_directgfx libSDL)
-		$(use_enable lcd_devices_displaylink deprecated)
-		$(use_enable lcd_devices_displaylink libdlo)
-		$(use_enable lcd_devices_remote experimental)
-		$(use_enable threads pthread)
-		$(use_enable tools)
-		${use_usb}
-		--disable-dynloading
-		--disable-statictools
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	udev_dorules 90-libserdisp.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index bb4b830da2be..d4b4d2ab8d3d 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 1369 BLAKE2B b209092a79ee2c12cdee431619c82881564a40277b69d6d8a7c03f26efabde2b36d1709308b51c3c040e65f7a41c9909b08d265aef9704338283e48530c39a57 SHA512 215e38e4421c9de4ab9511bba3a5477eb07a53b1a3d2385ab360890f77b096fb0673b29620e4757b69cc769d04deeaa6ea3b27dfee9f1aed859f5d4ae0be822f
+EBUILD snowball-stemmer-0.20140325.ebuild 1370 BLAKE2B 9ba97db3f8e5e13d286e49267d6e8d8afdc1a98dd0d796766971ab02a759e6866e06cba16cb9a0788df7d36369459d3274009458af65f73851d7632791dbdce3 SHA512 fcd455d958f30f925b05a5c53a50863f06844c81123ab2ed87b5b73b1b440d37a2d8ecf545b81d6ebc10abd847e4dc842ce78a9beb25bb5f3e49d74d63a3fa73
 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 644a3a6f436d..2f35da68e87c 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-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 adc3c2738a7a..2add49422dcd 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,5 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
 DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
-EBUILD sord-0.16.0-r1.ebuild 1148 BLAKE2B 40e93c48be33c0eec86de3f1793062fcbb939bc4d816e3623689da93cb2562bd1ec2c07e81829d40b38d91c453084f64d9d5ee1fcefe069c6ff5cb1e5ae5d1c7 SHA512 0b03a9df9245fa0a7f96bc43077f1e9f4962fb301d623e45617e688b64e5a0c2e23dc3fc8cf32f889a6117377bcead920abe0f109d522c5680bb5bc0ef14785a
-EBUILD sord-0.16.4.ebuild 1176 BLAKE2B f6c4397cf569ab15cf4937f8d44133051c7475bc221ac1272072ef9be824bed2b1c29d818795aee6db4cf02124ea4de55cafd455d983ff029b06ed28212602fa SHA512 56702afcedcb95de1a7a1a60f121e37754c67c69f2cd0ced25b10ed69ab9df21001e90813c9cdf62fdfee9a2a090d20811c1d7ce02a79f70aae6b8b4b2c522a8
+EBUILD sord-0.16.0-r1.ebuild 1149 BLAKE2B a441f86affefe2eb7402f28e8f63b4c01f2f002db6fcc81aaea7bf0e4dc89ab868d2829107f063dcd0ca846694f9e27891687f023e39e50b799aad2d5dab2a7b SHA512 1c2a3988d047b2e2e8ffab2b7fa5cf28a55963c16a74dbd222b178dc178a9a9e99132409221143b17aa5e29e6ea143a8c2fc3e7f8b815f5eeff9ca6bc1a94812
+EBUILD sord-0.16.4.ebuild 1172 BLAKE2B 4e93146d8552fa99ce7b6d2e388987175851ae16ac33cb555ccaa3b98c28e4fa1c31573e26c39c16fd75e93b8bb4e6f99c638fca52389e97922f3b22c804d5bb SHA512 fbf328befc121bba84c79b24fbe7f83bcb38608e190cca0150bbf8978578309c6f32e33869a792887c3cf55fd812216465031cc8766e4dd4f78c44629a25c6ac
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 22f72b49ad8c..09d51dc13f1c 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4.ebuild
index b46d695147de..3cec2a537b6a 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-0.16.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 61f2fdc37b1f..45b988cb1d8b 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-r2.ebuild 1260 BLAKE2B 4bac40d16ecc7b9317b74ab35c1d886074b51802c4cabe0296c99f406264200f3d9f6028806a2021fef98e0008a248ed640e8b579b122e9a0d901aa055d5be3f SHA512 5d1b14a173074853b6864f603087ed7e5165e9a0a4b9bcdced139b4d8a0d969a1ff31449ab05ae34b92d00ed95cd237134f678801937feeb7c07760daed33bdc
 EBUILD tinyxml-2.6.2-r3.ebuild 1486 BLAKE2B 4309dbc198894a9364c55a165e6fcb323730a02f405203dddfeb6295b46eddb2f3b44e50d8417e90734543b3d6e484dfc909009376a9cbde0949b87c8193036e SHA512 af2bc02a40bedf0ce019f4ed7b7851a73a049476c03a15a731361f0e1f9e82df8e53d23a06ddadf538b65df46e2ecb65dcecd0cf6a2f5487cc11546a13fa2c4a
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
deleted file mode 100644
index 66c6e75140c9..000000000000
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-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 ~x86-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
-
-	use debug && append-cppflags -DDEBUG
-	use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch
-
-	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)
-}
-
-src_install() {
-	dolib.so *$(get_libname)*
-
-	insinto /usr/include
-	doins *.h
-
-	dodoc {changes,readme}.txt
-
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index d3b01019880c..245704b99ee6 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,6 +1,6 @@
 AUX tntnet-2.0-zlib-minizip.patch 1432 BLAKE2B 137e4deaa5c2e6bd57695e19d643657c932c268adfb22f3c593e2bfb312fa979ecc87e14195bf42690883c1fdcde773e91af33823a3abc5ccd592a1cd705bac8 SHA512 13909d58fa2ea73c074816498faaa94dadc3fb750179b8f290600eb8a1adaf6a45464d0ee412ea9d038ab5e524a13da0e44fb07424388f28f16df538845dda07
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
-EBUILD tntnet-2.2.1-r1.ebuild 1868 BLAKE2B e1422014d363fb713ce03d9839a0f7ecfe8db08ece7dbac8d0f530d899f957fd0366444dc5021da43ac38093c921e68e31275825e253e7bc348bacd890ef3221 SHA512 21a748990f78e1ea45ec5664b9928c81d5c11118cc9138355c5cc4c81117c5d47d3bafe3b327f959bd735af3131eb09a62a5b05d0eb867af79e23fb1f8b398a3
+EBUILD tntnet-2.2.1-r1.ebuild 1865 BLAKE2B a1bc3297faa896c4ac8e9c08a11bacecb066dd15d28d1419f0283ca54780eb1d9d79b0f017e7d2e8452f5b9682bdad3eed071f40c44c4e5fa38463475b4704d9 SHA512 1232d5e17c10d5218dca0c38a163d6a16b9d0f03126fae9760fe74f44f7a81ce262064aff60fcb5c04a12a1c1080234079bcc614215ac7cb86c76d9d9404fe2f
 EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
-MISC metadata.xml 239 BLAKE2B f2ef9bcdc2a3034a37a49206e8f14b7cd40fbd0305562d1c642c37a55587e9d23bd32eebf28985ebbbb7553f57100fd09cbc107f5f66cb5300da6c2cd2b56edb SHA512 e6905ccc2f98e4c858d49f5e54b4de2762488fc33b9be4edf3d2419f4f1b3ca0db6ba64086198c731cd9e71df816a05ae579c2612d2751bcff808e3c4d3644f1
+MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 77d1be7cc249..dec3d3816a18 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Joerg Bornkessel</name>
+		<email>hd_brummy@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
 	</use>
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index 0b0c372cdd83..50046a85221a 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 2401e61518ad..6fcfa93d8eaf 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,5 +1,5 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
 EBUILD totem-pl-parser-3.26.3.ebuild 1930 BLAKE2B 840f460efe1d98b7778751a6eb5692ffbb2609089dd74269e1a8f578a7dff0e5402ab8d2690c22c6a6dfc1ceb3863c9038bd244b6f26f0ebb560754410389dd7 SHA512 adaaba47806b4d525f8920684dfc7baec49eb8ffb11e1d7aa745f761b3cdc6ec28187d0315079494e22fd80b606d4141e1b09b852ab3c0f724b3358c32053592
-EBUILD totem-pl-parser-3.26.4.ebuild 1933 BLAKE2B 25da8ae56556bae1667232135678176aba903748a75a79f407a5bf74fd71c214ad061fc7440db1807e363b4400f8273d249e34ed62df2f736397745cfdd92e92 SHA512 222711531c4c216ef4b8185cc4c12a63409cce94c2a975d074219b910558faacf88c1b110e0a4f7e7988b3830d4ae460fe6d819b3e6b42c73755ccc759011535
+EBUILD totem-pl-parser-3.26.4.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
index c9bbdbd5fe9e..5d2ffd44e4aa 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index db6ad36ad9a1..7a6e16c77479 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r1.ebuild 1410 BLAKE2B 99ec1a1207e0de4dcedda5f804bf46a17c5387cb3dfa1e6074b13c61dec775b15f93d7eee5404b632ff05a31c23a599c70bac0f4bbee5102c94ee7cdade8d29c SHA512 21c764bfe33bf57323a301a6b98d61b117312900b889d22eeefa83c0a2dbc885168faf7d742ef0b86730239f35db808132789a7b04ea2e8438eed663405985bc
+EBUILD tre-0.8.0-r1.ebuild 1411 BLAKE2B 0d3645b6a55cbfe62182418a7f6ea238a34d4bd2ff28d789be5dc13a8eea85babfb1889208adcd73e53ae29de4e4b211624453ea27e7ce54e74d35a51e059e02 SHA512 11a602d2961214ff9a364cb94bf1ec98c9917ca05f5d52a6087f73d2dd0099668363c8c4af136c440159bb03d01e8fd8e335ab1f65c82495e919740f3f0ac864
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild
index 943b4a42eb9f..1ac7ae895721 100644
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index 4877bba722d4..54741b241a97 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-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef
 DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-EBUILD ucl-1.03-r1.ebuild 1137 BLAKE2B 7d6686123d2cb978bc4924a9f9589a0404b513bc0820f778b8ac0d04faffe69ca2f4ff388046fca56abf01dca41b28e46a4ff9c1e2e713700823cd6cbf04f15b SHA512 6fa67a453257cfe30329dc8792c6fb29870de5ebc323d2bbc4b7731c2c8d38782b088de230f3ce500888d117004c0b3c65e40e8865a8172e373a77f1263cc2e2
+EBUILD ucl-1.03-r1.ebuild 1138 BLAKE2B a7acc5bab84a54d945506593ad551ca0af6983769f560db76bcb645fb43b6c31a5af455d4abaf7cc8a4ea50cc70ff3cd5d2389e5dbc2e4c7a2bfac2dc45e556f SHA512 12624f0a6f6262b921173f2f39efabe7be7cdbd21b286fcb4d07c772cf72f9ad302285a7a53e0838d6c439f096bd84bd6eefa91a9cd0154553cc6493d0f9c8d7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index a0a0936287cb..8551d02efb8f 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index c0eb65cd048f..accdd5037d3e 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,9 +1,3 @@
-DIST unibilium-1.1.4.tar.xz 50828 BLAKE2B d680696e463323092693c277c972ccfb914e4c5261d54d912e4c5a7d8cab8c8b65a052b94c257dd63a6008cfb0111d052e0c5ddf8bb4598c236c88a0af19ccd8 SHA512 fdd5c57d0b2e3dac7f2a19c4d332e0d6bfc2378ca6aeabb4504ad0cea6ff7e78d87d2ef9f4b5187b038cb4380803b7ad72105e4da7769b35fdc694882b4cb61b
-DIST unibilium-1.2.0.tar.gz 88488 BLAKE2B 47615a1c9e5a7f2e03c5b5f852b8d53bce047b1cb64aecc0dc0fa88ac7481589bed4b390ec007dcb65056bb8e0de56bbea17dd0a5c014968c224c60944a4767d SHA512 7aff79669200810c2910006aba657ca2276123ecb3e6e0ba01fa2d1c3cdf838c391594e6035ef150deb6185c4f1e43fe1b0bfb59b23c6697d801a5bdee37a0ee
-DIST unibilium-1.2.1.tar.gz 94966 BLAKE2B d449accb3bf4a24049b0e4878ce6953c9082103ff40e9f79c59a848651e9595b2eca508a29d51a60eaea5ea38de9189b990e36ca77f1986ed87beeaff96db56b SHA512 2a3e92051382cd427220f6994a49ab10966fd13e51d1ccb437d695d5556ede8ee8d1dc0e0f92871ca48c559abd6f229599df3d1c1a2d2f80fb0820686280ce79
 DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
-EBUILD unibilium-1.1.4.ebuild 672 BLAKE2B dfd5dbea39d0f3b49faf9a81b5d6659af1c10d0d8fb50e1dfd81c99b81340bcdbf08259174d486c5ab539400e2c207955e6710bad83f284108e10432f9fcbb4e SHA512 286bf13e85c9c719caf3c004ff2a6a9f5e96533c4a6496af7365bacf303872bd77d1c687912e07a29c4e4123dc98d6c0cda6c0678ab224b6edf0614bdcff169b
-EBUILD unibilium-1.2.0.ebuild 777 BLAKE2B edfb4a3eff49280a9d192482dbec092c2245b7ba5c78b1bbb314116a8b9dd03c886fef53ba3820f8a845c7af79f025dbecb658b4ad214609c214df54cf9ebec3 SHA512 9861c12d38def779606ef9b1c3bcf06c6c266dcedfc11b6107ec4596c91c5b13abdebad0af3cd1c82bd502cb5d7cbd9a7a188c8fe57fdb5e3c4dd06b84f4fedb
-EBUILD unibilium-1.2.1.ebuild 774 BLAKE2B cd7373f901fd4994bbf761389a8a04be3ee90d07b6a7e0fa634e46e2e1e031744a723c68b6511d1726218ef1715bac696a9242ab182974f579b0f389a1f043d2 SHA512 7865158eb602aaf3fde2f29b38b8f3f6b38c77033e442c84eff4d4136c15075eeb40c613b93303c405d33e9057c4c49453ceadaba2a83d8a077aded42a52ee50
 EBUILD unibilium-2.0.0.ebuild 778 BLAKE2B a85109b80a66817587a79c6d3ab8499e8320385a245baf56131af1183fc978064aa4cc09665c444f9a6ae494dafa2e9aadda8a2168023858016b13d8df9952ec SHA512 39a0ece2311404cd21a528d38a3838910a4b2464ca1b6913ceb5d63c801735958a0f395a4f011e37ffcd64feb9fffda5f97975dba6de55149d0b2b405acb5a7a
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/unibilium-1.1.4.ebuild b/dev-libs/unibilium/unibilium-1.1.4.ebuild
deleted file mode 100644
index 9a9428303ce2..000000000000
--- a/dev-libs/unibilium/unibilium-1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/libtool"
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/unibilium/unibilium-1.2.0.ebuild b/dev-libs/unibilium/unibilium-1.2.0.ebuild
deleted file mode 100644
index 651c9d14afe7..000000000000
--- a/dev-libs/unibilium/unibilium-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://github.com/mauke/unibilium/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-lang/perl
-	sys-devel/libtool"
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-libs/unibilium/unibilium-1.2.1.ebuild b/dev-libs/unibilium/unibilium-1.2.1.ebuild
deleted file mode 100644
index 727acdee1e7c..000000000000
--- a/dev-libs/unibilium/unibilium-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index db21ab3ecd18..14064db256d2 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
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 764 BLAKE2B 4b4de6069b5983616b8b0364571ebc6c106bd82f8193625af2b1fd41e9234dc21df15d707ff4abfadcb4c3047e8ecaa63658f20ea5c395f90f7763bc99236078 SHA512 03c05b23b0c19b3122fd735db43ea309636531416272b77d34319dfedc891ea2c8a6590ef88517170a9c37fea3a47d7a32790b521b976708f65b6b65c323a8d5
+EBUILD uulib-0.5.20-r1.ebuild 765 BLAKE2B ca5b0c2ba3a352546f75eb38b410516690bcdfa3b4544fed03b7eaf4018bbc12a49ebe6f2a3ec79fc32d4d75406bb49e9793712c0e2eb297dfdf0b5d01ab4cee SHA512 8515aefeaf711e1b5774e8f6fefd2cf26813d3f9c229c4fd19f43511f8d1e35aba7617d7a422ea9d9c706e2e8c926aed2a0dc2b64e461f24104931ab5e7d4e0c
 MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 226d799ca390..451b84726f0c 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 9e3742cb66d0..3c2a18830ab2 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,7 @@
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
 DIST vala-0.46.5.tar.xz 3375148 BLAKE2B 22bf169159d4f4e23398789e46c39d98a7727cd02e6539104963d34bfe569bad25338b3455ffd32413a36f5cd6061a29bdbbdb275f225f1408d6b34967b64a6c SHA512 eb1763d9c4bfe74441640f7228d44ff7cfd9a379b24b8aa906bc59be4514b319598ffee616d3de1db101134bb163715f33dd1d7a0a10ec03246c7ccf62a4778b
-EBUILD vala-common-0.44.11.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
-EBUILD vala-common-0.44.9.ebuild 647 BLAKE2B 4f9f76c9ad522291baba17c39b254cf7f4612d4c19471f53d53944f470acf6d304d2d30f17668b10d98dc42a5c61d6431f688fbf8b7d298296652b81eee48baf SHA512 23c8e4d929f1a5b15616028461ee1f4059f72542754c6fa6823168fce74045e4862be1a475cad728b35f406f88d24ea6b525cbd8a7ff7fe107b52d2d3835cf3b
+EBUILD vala-common-0.44.11.ebuild 652 BLAKE2B fd51ad44eda17fe22dec3e14b0eb67fd865aa340c6d1cbfd06c58567915f7043cbbce79d76763edff144537cf0a78cbf6b0b4aeebef343cc4a1e0a9ea223c28d SHA512 bcbc09b84762d9a3d0f19477fde76b7d93d926ca22387119362c7dccea717bb770f7dc7f9b2256ffe27779dfc7346265521fc0328c2890e4022d91b3f70ce4bf
+EBUILD vala-common-0.44.9.ebuild 648 BLAKE2B 686c55e0db5a97ab597fa96b60f53c7edb20d2ea4afbbfb834d28f7cfb86e5f3504dbb602a59edbd040c9afe9af2ad340f87fe912c48e226e31f017d1a848eb5 SHA512 db9f290ec792189cc5f5b720316ac67181324e00f06066edd85121e156aa01d467a3492681176ce4f71a8783c4f6fbeddc1e17dce6e2d045179388ad7bab4e93
 EBUILD vala-common-0.46.5.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.44.11.ebuild b/dev-libs/vala-common/vala-common-0.44.11.ebuild
index f66b34153af7..7019532be24f 100644
--- a/dev-libs/vala-common/vala-common-0.44.11.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index 1bf75e700cbd..96c1966d1bf8 100644
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.9.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index a8c214d27aac..9b94bc688ba3 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 881 BLAKE2B 296861ed721b3509b048996612728e41b65fbe2645c31a4a550234c446200aa6815cf5d1887a702400187ca9181707ad7660834ecb6f7aef9c83abcbf1978d82 SHA512 12bd4c524484722fe9f86ff429ab37a31fd1315d87dfa0d9d3ac784a3456ad9d6c0a61ba725b6d5d0a99d30372cc64cbd94dc57c2267777b94a01a17331d3987
+EBUILD volume_key-0.3.11.ebuild 882 BLAKE2B 4689995a9748a7010e433292ed977088dd3d60b590f64cd12d9ef1e8f2739eff8c9abcbf19435dacf35c0b0b2080e7066b99e04cef13cb83e606949b257da6ec SHA512 a91fd248163bedf97e2bdfdfe493385dcce41c898cbcba7ea688999f49b6380e66cb2679d9efc30eac93fd51f799bb9ce96f88d17629e1a691f0de49822e8cf2
 EBUILD volume_key-0.3.12.ebuild 947 BLAKE2B b265e341c848f807784c03d85cf10c0a008c03aea734a2665a95b9c7b61fb3a22c602c9d8c9566190f09d90bb91564adb73c0f6d496702c6991cd5840ab3e944 SHA512 63828dec89462d2cce3592613e39ccd317105a128961655ce4af62e6010de2202231f47f50c16af38900b5998afecfbe123a02424df4fca59e812d120b580c2c
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index e8b891e427ec..1f6edc21c76a 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 1d49ff3a489e..7659c0450ba9 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-protocols-1.18.tar.xz 108344 BLAKE2B 7e770bafa364ff96441354246801d1c6cbe561eefe864673610dc2d47e3aa5ac7cd22a2fc2925aa1060a261ed6df8b6b5ef81c33adbeb374170821feeecd651f SHA512 166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483
-EBUILD wayland-protocols-1.18.ebuild 790 BLAKE2B 5253568398253d1c3e5823f6c74cded510b6c19dd7093925e4305bdbfed345d770073f4be74de3be5070e0929337a1c32ae057a8f7f03725a979ceca40d46f15 SHA512 86535082d672b5bacedc6e63cd66e9aa161612a2d3aff883fb1a527c1404a3185cfe665582f057b88f57a1956cbfb24c1963ee6ba021e8e3456ec9e4a8b6a6f8
+EBUILD wayland-protocols-1.18.ebuild 791 BLAKE2B b5a6b27118dd4d8143b56082019af2d9adca9ed5f8a6852f3c08066ee39059b3d74e1974fdca5d313d03628d004ace12a028844d1ae77d0d048b532aa42a6009 SHA512 a1838992cb79d7c526f558a1c6129bebd81d68c2b114deaec08baed2d23030a1a1cee74c937c4e57c8a835914b5fb556b8f5e178fac9ae82d2483e6061930bb7
 EBUILD wayland-protocols-9999.ebuild 801 BLAKE2B 47c2feac8595a08e0cb05efc517caec202f5181cc62c3271c691ea8b018e9e62a109b5fbe34e4c3c880821f3322de41a715cdc347c5edc912f1b364b4c868da9 SHA512 4a9f7fa800c47e7db184d2b9fad45704ac8c522fcc7b409a0679d0f470680e4ebb5d175db889bc3cc1579588c966fb9c9b73dcdc33bc4f83bff586c82d1fd684
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
index 27c304558373..86d40b9b085c 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
@@ -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 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index bd8adfb27a06..263eb893f365 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.17.0.tar.xz 437680 BLAKE2B 2f4eb54c5ded90453b4e2812f7b5086aa211196ec9f7333d316cdb829269d55db570ccb45a67ee07a039633245e630ab54da6403ff4754d59366f3c13fb87549 SHA512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
-EBUILD wayland-1.17.0.ebuild 1751 BLAKE2B edb2345394d9fd735c7f7b37c15fba9b724984d145bd44bbb9d45b0e670ed9b73ca9687a899977153f1ac027902e4aa0befad1377772e199ce2fc4b605659a4d SHA512 939fe57aae3ce03f24fff4b7ea3a04ccd59122466b44fdac5e258eaded90d2dbf2303d20b1b0c8ee6a23cf043bf163005b6ed258aae01d3c7baa06e615e76f75
+EBUILD wayland-1.17.0.ebuild 1752 BLAKE2B b87c63425a873ff7f65a7e8337b798b132cf9a53b00043fe7d66f1480b56eb1ae189ac64af607caa882171b1bbc77547e3f8bbc2273d71405519b9a88ad54d2f SHA512 983714327330e65b2489cec767d88e247a54be1240ec87ea3b909a0c05394834cc26af117a0ec2e8d044350dc018fec8142f8fb156fd9a08cb60707847a213d5
 EBUILD wayland-9999.ebuild 1762 BLAKE2B 0d2095e219140a146b77577335a5115082a4aa9fea73ef8f888465b003c728e8ef489183a732dc63cf136d5f8f6da904b1fe256bf360ccc76a6239f5fff70137 SHA512 1ed70b02e14978141de7013b9b1750699555cef55b36840857f9e1956a49d85e3769ea70940f1929915bde9170209094795989e6fe3720a3df74a683887b3974
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.17.0.ebuild b/dev-libs/wayland/wayland-1.17.0.ebuild
index caf421c61858..33a3f2723ecb 100644
--- a/dev-libs/wayland/wayland-1.17.0.ebuild
+++ b/dev-libs/wayland/wayland-1.17.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	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 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index e0228b42ce1c..13cd54a5328d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -8,14 +8,14 @@ DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b197
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
-EBUILD xapian-bindings-1.2.25.ebuild 5544 BLAKE2B b31bf668d490c25a227a75ba0f3406b5d89f876ba0b2146c6a524255e4ce84500aef0edf5ea27ff151e284c2eea5c43b34864cea229e15395b94277c49b2e570 SHA512 1345ca0d02ec68ec62ccf59526724c83f36c928c43a34b7fec55e342390c9edac1ebfc23363d5386d9f59561b59a085c38541749c5b6245c1543370178b2b859
+EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B d4fe43fcc1937c2a4a4c10c74cac6efb46e4ba249d632be140304f7491a0f375d48aab77b7760f9fa5dd2b9e526d78265831e56e6be077ab84809d8d6649f82a SHA512 605fea5ad80768d473ae9401460e1aa6bb0584bd0c92a1efe7db5b5e8e46cce7494e1b1b8c35c051d49f936c22b780ac2dc7e6bf0a0573937a7fea30cec6b519
 EBUILD xapian-bindings-1.4.10.ebuild 6529 BLAKE2B 81b8fcdc400147e6ad5a30e9a0492e941b96f995ee8ed1aa4e747ca2996f45366b0a152e58f09f5d002585381be5d229001cc7b501de5308ce38dfda153351c5 SHA512 82a698624c1ebd05cc87865320b77b002c621581197157238f961980e06a6ead84b46b6c7d0728fc2eb606a9df32844ac72c70517421b3a8e6fde9eacd660db6
 EBUILD xapian-bindings-1.4.11.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
 EBUILD xapian-bindings-1.4.12.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
 EBUILD xapian-bindings-1.4.13.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
 EBUILD xapian-bindings-1.4.14.ebuild 6532 BLAKE2B c92664d24a7c29e5d49668016b79f205d8dfc2435899d0af49844cfe5573a8425d71d47050158331bed9c5c804fe9018453695bb3fae528fbacfed437e48e9b1 SHA512 5835d4b35bc897182dbcfd178037b65c45207f6ec428ede9b0eda458ff2c9723e6e33a02bbb19ce378615632ae845e61209d7c1a10a4f69dff6c8aa2fea0b012
-EBUILD xapian-bindings-1.4.5.ebuild 6487 BLAKE2B ad98b5d5999be1813ce9c871a080ce6f685e13268fe573cfabb5081586a0fb2fd15316a3f56eded41061e68e3eb0285a08097dab7f5007cdc9bc43eb5813670b SHA512 5ac14de2e3e301001e3390725a19686deffc276c8ed8493fe0e7253f40d4dacea1ff5268db4ab948c5c4a1152c18e2c53da99ed4755a804fc9cae25d1ceea2dd
-EBUILD xapian-bindings-1.4.7.ebuild 6488 BLAKE2B 49f8a45077fb2c97367485fbc07cf14d0032a1a6a2caee710f03bb272271067c19e44b54332b3575d1b7bc2f1e2fc6a5a258d014dc7285568c739f7038104f93 SHA512 34dd5cc5d46227bb54526b85eea8ce1e6b62f9547aa3ccebe8c9fcedaab41956936e7ff78758f348a0bbb3f89af9c32b334784f694aa5eb2f66ba17f17d8bbec
+EBUILD xapian-bindings-1.4.5.ebuild 6488 BLAKE2B 91a53f5c9d6f0838fbc84996fd55037f1bfb4ad42e2211d23a60d952058ca561d5850da14ab394b69b93006dee4164789f20c56cb86c88066bb9a104f55a3c61 SHA512 b2418d0a115344b208dbe5072dc522ca175e1dd310708612cf8f619dd437916b14989cce0d939ddc9af8908c35713f9633e4efd947bb05c0354def79cf6240b9
+EBUILD xapian-bindings-1.4.7.ebuild 6489 BLAKE2B 94770e51a275916282e129ed72a16d82da59adb4433e49ae3b4ce9bc9685ac0509f25a8888a9cb91003544d17b7d099bba3a2e17160478244059afc9cd982221 SHA512 8d480a1bfce0593201c914acdd5e0b56814dda1e88410e02ad04945dc8b337eba743bf0c292c737528975030b2d86c42a6c4b4fb0cf2a90069d981f916650450
 EBUILD xapian-bindings-1.4.8.ebuild 6494 BLAKE2B 910de7485e9209ec103f63b9d0991d2e071e34803246aad1ca03356630bd4fa2edb751146ac704d48c1cc59ae503c52abd3abcd63a5bf09e6acb86ffc418cfd7 SHA512 b058d70d790e0f20ceaaef4d4487b3234fd5ec46c33741596a3d3bbccc81f6e24d6e895fded320318f4be522c4c176d14da11ca08a4aac83e186c99bc71280fd
 EBUILD xapian-bindings-1.4.9.ebuild 6494 BLAKE2B 214cc496f8d71ffb56dfb0041612298999bbb51960e1c6b4d99eedbb5cb13258ba1064169e4ec261c545e6bcb6793d837eaa2e616fccc0b0e4f1b961d6fafbae SHA512 b18adb4c8aafcd8a0a1919c68d171083dc6779fbbf358db89f8a76cf32b3938be36722664f9f3d3666244f82f5dbb91e4cbb984ecbb4a2fb08d65f1be69eb38d
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
index 7ca2f39a07ff..d3a25cc40126 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 #IUSE="java lua mono perl php python ruby tcl"
 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 IUSE="java lua perl php python ruby tcl"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index b92f1b74b466..0e8ab7449276 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
index c0844b70525c..14933a5455f1 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 8e9af0d06c32..473474e9e255 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -9,15 +9,15 @@ DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde656
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
-EBUILD xapian-1.2.24.ebuild 1580 BLAKE2B 381e09ce792274d6142ee236e0f1422a7bcb4947cb9efffb3b2e65bb44f5f879d554f871551b02e5482549eebff8b094f242b0399482eed984db6d8aa6b87ed1 SHA512 b9db357b0eeb6d2bfedd9641df740aeba2d435d1618aa6f46dbb2801cf69136d308b5c0c5a41bcfcbdc10fdd09dafa15af1dfac4543ee22de19908b21bb24cb8
-EBUILD xapian-1.2.25.ebuild 1848 BLAKE2B 0028cbf5dace715b4a76600027f98180432d32c6cd2eda10ad62be72ab14e55855069f2da9b96999086661bc49a7cd17af97a68b2f97d55bdb76b6d04fd72ce4 SHA512 b7a0e0f8407c3068fd3eacb04bae41403283fb3a538a15e875fcf6c994bcc9d2c2c62c685a6e6ac679d00cd60408be72a5af8f8170afc9fc040867df3165c811
+EBUILD xapian-1.2.24.ebuild 1581 BLAKE2B 1fbb15c2a7fb4ae7d7d2797014b3a8192db06aba2c9b673bda6299289809c35eafce51eabce4745af9ff8c93f8b0b5bff87266217c6eba4c0c19a75d1eebb8b0 SHA512 2a160be9be825fac40aac4276de7873a5d95a86121a49ea066a859983dcae4efe63cfd79f324838c57723689835dcaa7df7d1af68ee7f4b0f9696b6e8368238e
+EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d80aa67fdd21bd9e2c36a00f170634a41b639d5668964426ad07083be30de1c86ad5028e33a137be7d651916af7a922676d497ad8a9a57fb6582805f73201754 SHA512 22ab125320142c15fb947aa6affc6c8a17de41d88694ef12cb7456417e5cfdcb2e06e7ec63b541a1f64892685a8292f7fa1f9bfd1d9f727fe1ea96b2ba2ab247
 EBUILD xapian-1.4.10.ebuild 1880 BLAKE2B 0bec305e70baf1405b213aa35fb2be9dea8dbe364168484bacfe507d167777be73fc4897a8fdeb9b7e5443f53a31069d11ea2a11e7139607d2c7d0a196c32e69 SHA512 a007af7c24801e6f3c928e0a50224b0fbb6503c343d6fe6a71cafdd255dbfd9c2ce79370a0ee65d95a790b9db06a38ab07e92531f9273fa32dc718e02bc8ce2d
 EBUILD xapian-1.4.11.ebuild 1844 BLAKE2B 0ef54276319620157c37d20dd624ec50245d04f46d480e54fc1306491ff7b9989f426ae0659095efc0278e3114f19ab96630896e0ca6ac0f4c1059b1c915f33b SHA512 58d8597e88cb312251661f469c3ee5711e19ad39b6c7de0e0ca6756b2d1105dd3894229c854d8f59dcd39d61c58b17294d90b0904abbd18b7f60a85834f6ad61
 EBUILD xapian-1.4.12.ebuild 1846 BLAKE2B d4a59440e986bfeb590a7176d829f74bfdf6778046e9a5a9274f29cdc320125283aa0f78febbddc18a45312a37be86182b69d8ad660e1e3d9bba050aeab26b18 SHA512 559b4ed1ac024a7cf3095382a245cc1b21aa40e57c0559a3bdfbb19a4678af6b6d3b8881e3c0bc874545b9bf056fc57cb85776c6ca476f1c636332d1fe9a7c7f
 EBUILD xapian-1.4.13.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
 EBUILD xapian-1.4.14.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
-EBUILD xapian-1.4.5.ebuild 1852 BLAKE2B ba4dc37a4fcbfd32bd26a02c38dce4fe10667335c54b06184128b2fa9d062ddca7550f9e655b487f66c49c3ea9990353c7998e632de5d851499268e29388bfa5 SHA512 d7375562ddee64ea9b414eafffe3dbb168497000aa6b13613dfd2163a6bb1c05658afa85d4c5dd1177edd2be8af7f82e6ea289542a4e90896fabaaf37d9e7a92
-EBUILD xapian-1.4.7.ebuild 1852 BLAKE2B 93870ed32f50edc597e5a3afeb92bc98ec9f6949fc982b6eb44781af4b24283a1f2d8692f87de4325b12fe800d02b9727dfe440509c2b56c9e00f293c804c7c2 SHA512 c00dbd979852c37078b2752fb0372b5761578cd9318c884ffc834d58062ea298471e872999c7f392b9f4120debbb1c8587957e11b82d426471ffaf75ea88e25b
+EBUILD xapian-1.4.5.ebuild 1853 BLAKE2B 5da8bed73d4af4fca3ff7c92d9398b58786460e980051f85aed30013e28eea516adeaf73dcf4601ac49c22fd1388887b7b338004eff4f3052ed4bf8534cf7b5e SHA512 b5323d83d68d1ebb57c843595ca5b536cd80cd36c930e432f274c264defa23806c7e7edea41a5e89974e4c6b6dcb5e6afae4349db1d1167e8e7335b2591aca50
+EBUILD xapian-1.4.7.ebuild 1853 BLAKE2B 9d279e9c3f13b5f74dc0915064ad2985c6a647ed61ba3398bba7d67536a62fc1c18afda9d8a9fb8a80ddb52a7346c0b101cd08b858d55a79eb4d983f6622bc82 SHA512 31e03d942c316483fc4c12ed8fc808c70ceda743a283a5d0f2b8e090e68e58063410866a30c069745807482bb13b296c09b407fc9e21d1b529e87f604a27be84
 EBUILD xapian-1.4.8.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
 EBUILD xapian-1.4.9.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
 MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
diff --git a/dev-libs/xapian/xapian-1.2.24.ebuild b/dev-libs/xapian/xapian-1.2.24.ebuild
index 0b512fb717e1..ce75e33180d1 100644
--- a/dev-libs/xapian/xapian-1.2.24.ebuild
+++ b/dev-libs/xapian/xapian-1.2.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 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="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 04d4850d5a24..01bb84a0369d 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
index 7012501539ad..ba08a989896c 100644
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ b/dev-libs/xapian/xapian-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 4e5400562092..45c899231780 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 17d6be86c55a..68c2fe21fcc3 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,6 +2,6 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
-EBUILD xerces-c-3.2.2-r1.ebuild 2973 BLAKE2B aa7e34197069af717b12de5d2a6b50454d3a71838718a32a4232454736f8bb076ae6792c2aa1800205768c044a35b5070895ea6be05d74cbcc42d864a8bc6e1b SHA512 3d10a580f5aa3cab581b6b766d5c15140a7a5928e008a8cd8780e71ab58b57bec988f206a6d1947fed5cb7ab2bb02afd6501eb38d8fae8de9b1c88b2ed923e8b
+EBUILD xerces-c-3.2.2-r1.ebuild 2974 BLAKE2B 5c6dee56856ad8bff1bae9803c3ab4b2e62a701ca9b90304725147bde64ce9f90b87e3c0a44263c6182604ae7be2c0d420d760e174d2cc3dd9b8025dedb07f49 SHA512 66785892132cf5538b604e8f4deae1863f4c68b4c0d19386bd0169978a345a2677409d62da053a2c156ffcb0ec1d386db61bc05f6737df34cf13c92a32a85b1d
 EBUILD xerces-c-9999.ebuild 2885 BLAKE2B 9c708f9ecba39d4c466a8a461169e58404acd4967855c4d5c2e15baa0a0f4ca5d52b00f935cfd4696bfba305d8d7d8ac67dc549b421c98eb2add67641ec433de SHA512 bcab58b4292237e7d71b284d058f0a3fa1b50c1a4b9c7d26f7b4458fa9ae75a6ec6313baaa9ce15885c65d12e6a43d428b26cdf3e73f133a23e9e7a56a1b82f0
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index a800f146f65a..90b9dd2a78e3 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index f0a41fe540b6..bdcdf8e0f3cc 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -2,6 +2,6 @@ AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 BLAKE2B d26e051b264d2db4c52e192a5a904c4
 AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb44367fab1082340162e9d9929f6b829c612071b8535b36fa41a4f22488e0717febaaef64e4c51e7abf4fc46772aead1278 SHA512 b5182181f7c0ffa150c977b6e206c2fbfdcd979369dbf55b2c4197378edb7136629df02bb7cc5f89df522451fef3c04a7b901dc3f34bc895f55020f8d5e03ef6
 DIST xmlrpc-c-1.32.05.tar.gz 769040 BLAKE2B 6c7475114ed299ea924a4fc8da4c01a6153d03a5106c812c8e0c6cae56478b9ce4ec57a41c858bf807f7a86b2053492d9c7ea47e4083870e0606cdf320cac0cb SHA512 40813ad97010684e346ce4f286d9d7314547572f8681cf99d4c3c36cb7aa38b1cb72b84d63ab46e44282dc2bd95b85dbb022e3039700caa939469c6f7bf08d1f
 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
-EBUILD xmlrpc-c-1.32.05-r1.ebuild 2942 BLAKE2B 162c3f394f78068b2c2fb7f7b6b853362400942a364c036aa00271a8b60ee525b5abecae37ef4f8fb6f3bf415aae2ed029d636de7b5fe9e8e3f640cecf0aae7f SHA512 86078c6d993ef5075893a882467b05b13fbf61ad79a7123b0652223fd3cafaf779960b367f99c3bf47d44128ebf20916abf56fc088841218e7e02d6b604ab5a6
-EBUILD xmlrpc-c-1.39.11-r1.ebuild 1920 BLAKE2B d0144f58a2392e63a877ff9bbe5eaf78efae97c8adf5f369e4012edb72a033c52cd908e37eabc232ba0ce79666601a0aee13490a11a25d014c8313676bf9786c SHA512 5b44df9a75b8b445ca79edb90260dfb5503201eb379e9566dc56e11c4c5df2a7abee92a983001a92602facc39bfabb435ff6315e699bf8a742e254f859e80c90
+EBUILD xmlrpc-c-1.32.05-r1.ebuild 2943 BLAKE2B 4bbe25c071ce8ad312313c2b72e9f70708e2499b5dce43e97526bbf3cf735667f7c000cd064a25b1e5e762147e347f0fdd1fdbaae2706e939495331a8c0bcc5e SHA512 5c944f7029750befcc100afccc1a354d0671cc0b86ace1e7dcd827fa9007af0b88cbad3f7d17ea4d0f2b29fb2ae11e55b5c8af94af7538a405ab446b1edd030f
+EBUILD xmlrpc-c-1.39.11-r1.ebuild 1921 BLAKE2B 0c1af7037f66ef99e019cede86cef71cf2eddc95678195bf3e485521e85b50d484809660d16a6e3d7bc37a5895f4dd5e359be1e0616734165e403d71488e78bc SHA512 c42d1ac30c0eb4b054cae1ad2f78a14e7b20ed80bf53a0641dbea3223f9a36262d18138a7e26621f3c00bb9624681bb5b8826b685e62d9cbf5038e6d55a8f87a
 MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
index 25571d06bc68..a5464e290bcc 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://dev.gentoo.org/~maksbotan/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 6179400429a6..640ed4d0b2d6 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 746c80d41ddb..7c1b8682a9ff 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,6 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 907 BLAKE2B 62b6c9bef36a8e61f170b24cb251b8d5b6c0259ccb1db2e42d278644d0f29db9d727877a35bb919f1b933d1427b4160c5870128bd928d55d6858d6d495fadcc2 SHA512 dcbbff601234fe93c38b3b926b078dcbc6be470538081c155c7164e7e6d733d1cbc4cb373594295bef0fa20403691f46e74a3f974cc26c2dc5b627fc66eb7245
-EBUILD yajl-2.1.0-r2.ebuild 942 BLAKE2B 45f2069b4321e5994cae8c65d61c8dd625a0868d89b1b2d6ce8c202905c9a6dbfc78f37dac5c1f79b985f19efbcc309a62b566dcd025cae1684cf0390008cac8 SHA512 f5f403466b3e332fa56c0fb7491aecfe29dfb090f237d886ebd8505696ba025c8a72b572285a39ae39ae344b7703a0961327479bb79f4646c775bc61e37afcbe
+EBUILD yajl-2.1.0-r1.ebuild 908 BLAKE2B 9d20aa713302d419d91000d566ac35afced191b4406c708c46b4abc7cc5849a6445a370516e477f312e417d11523b9af38b9ab8bcf4335da6fa00ea1902188b7 SHA512 32607a6cebf575715916db28cfa97cad3882d747731c702a50c7ad29f276378fed86a0b4c1aedd208bde0b2f22e7121dba941fc98136d9ba3a9de8d4995dd3e3
+EBUILD yajl-2.1.0-r2.ebuild 943 BLAKE2B 52d80bc6aac0a59d5e66218a6be02ae38579126e20139186259bf8f633cfc237277dc03c9af5c6220d31769f7a2e34d49c1888268430a93e3321c3fc4c5eb059 SHA512 61db2dcbaf41737e4dd97ee672d9eb7dc4efcf6b05b1ae1541c38f1a576a31c19d782acd005313e75d04b9565d2a6308fcd1cd0418737464d989e0cbc44296b8
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index d4d16b2f6956..5f532dabf8f6 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 79b944be356d..31629e567e84 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 94716349d684..cd55b38f57dc 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
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
-EBUILD yaz-3.0.53.ebuild 1391 BLAKE2B 80f8d7ed06350257a5d7d8796cd238df72cbfcb0393d7f3348f1c7114581486ed4731cdc97679d1e99e3c20a301b288fb8feabc4cfb0ae9be4726e4a0c3ee281 SHA512 b744dfca8224b9c57e244fd919584419feb6343a4c217a9b982e04681947beffe322b2fa68925e2cac9437f3046a517082989f76614c9093b5d42713d5c1c28e
+EBUILD yaz-3.0.53.ebuild 1392 BLAKE2B 30e451b18d50e11b1ba0b9027335f40cfeb7fcb3f41b87905b8bb94e10642341c2386fc1b6582457d13a0bf0ae555dd7d401f10e0b1944ab0ca8c00e157daec4 SHA512 49f8b59d3f3dddce15cb853d6c8398c83c42d865ff4f8b01e0816f247003fd7b37dfe1f64abba5fb5aa6513ee6458ee356d21f1fa1d12eff556c0f9ae6bba60d
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index 028369d37be8..220790710c38 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="debug icu libressl tcpd ziffy"
 
 RDEPEND="dev-libs/libxml2
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 47d187f584ed..7616bcf0ba78 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -4,5 +4,5 @@ AUX zthread-2.3.2-gcc47.patch 704 BLAKE2B 14031fe0230ba0abff034b894ddfe0e7c4178c
 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
 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
-EBUILD zthread-2.3.2-r4.ebuild 1403 BLAKE2B 23fa2617f0dbdaa5eb12fd0b3a26316b438b47ec98e24bda4d23a0bc90d832c29fa5bd396e4b9e101f2b932766078264dd36755ea6461e382b2121dcab0476cc SHA512 90e87cdbe058eba6e45a40b2863b822796b7b286a780020d95fe0379ac5b2169c0d95fca292074f7dd52dd253e44306c933b60d096370a00b85a76d305af2c68
+EBUILD zthread-2.3.2-r4.ebuild 1404 BLAKE2B c3d8c501a8554a2504e2917ca1de935dd3a30ec1cfd98257c3231b0d4b801faac21d85f1b81b6a1efb45dc79dcba8ba5309926b5cba380ad7db395ce50323a8d SHA512 746abb29e29a349d777abc0578dce07c81935dc7beb6a0c0ddc3688013869cc375236de3c777f664c05cb5a51affe8fe84a550b3792ff76cce28edec145fae03
 MISC metadata.xml 244 BLAKE2B b4a4377cc4333cef7ecdd3e448ef2af4ad16f7bb26913b89e4f3d7dfc97df2d7ddeb39bcd532f015e29e8632f0a993d39561a2b256eb0fbf67bd477c7ec5326b SHA512 6c52d0a4a5ec7d266bbb8a74a87c40d4b6c1fd34abc7c6e5e4026c8708160c6527d81e32fc6a395ebab9f2f8f74dbd1518e8ae244e8d0b674614898568718bff
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index fd36ce8012ac..65ebdd0f9237 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
 IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index dd97bb5a30e0..5c2a1e62ea51 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -4,6 +4,6 @@ DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc161422
 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69-r1.ebuild 2371 BLAKE2B 1596a6b8b257f099926fa9a4334f12746251767fe84b652888ac1bce8a1a8f799263fb77f0b047bd045213381fdd8cf47e1c72e9826b97f4f943a878d3e8c414 SHA512 5fa0a17db47ffb517a4dad4f401eab345876a42ffe4a269f322c786df9ce4c52d4537ec0f8a1a9788ef95c6e4c21a3532b8c732439accc0c9478574c5f80a3c6
-EBUILD zziplib-0.13.69.ebuild 2320 BLAKE2B 86d2e5148cfb1b89a322c611d9240d59a303b2433a767718e7bc53ef1e5db6e3d7867a8e28bbcf32b610b34576dbeb0dd3f2817c5b5d1960f7e95dfc94351f38 SHA512 aa7fb89b20dbcabcbcbc800bbf07058538d30eb5de9fee6f8e6766645ececf2691ba5ab4586a6494f2299d1abc9760b780841ffd65c7ea05253e87984f7c9e69
+EBUILD zziplib-0.13.69-r1.ebuild 2365 BLAKE2B 391f285ed2defd290ef3bb2a399d0ecadf353c4fc95e6eb9087c6c802b5b75a5cac17d588e2dc5f5734423019b4f51e78656534527e89a9e9394b0ed762f513b SHA512 b9d8552ff972a391050f2c6ec02be81010c2fa3773eaf255756af742344d7afc77a08c1cbd653b89f3e04c1ac63c063559e6b10fdce9196e70735dab89890f61
+EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 70b2339cb6a663bab224a73258c433fb2bff1f20d2bb380a5f34ca54d40b43bcaf1d479bb61cfd5f02527c332cebda6ccc1bd87a68aecc0d6fbb6d250879fbe3 SHA512 5fdecae3196a733820c06bf9107edf51825d0401e7b95521793d0000d50a3f3b099e56cd611b7f9ddb5d252b7c5a1c184a50b0443f069c85410c032a048426cd
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 582884e002c2..9ea820e6eed9 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
index 1292bc0fae04..c4c753fdb45a 100644
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69.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"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-libs
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)