gentoo resync : 17.07.2021

70 files changed, 1188 insertions, 413 deletions

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 56dd843d69fd..7a584459e1ec 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -35,6 +35,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	dev-libs/openssl:0=
+	virtual/libcrypt:=
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index e7907221b189..f64f3093821d 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,5 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r1.ebuild 8460 BLAKE2B 4449caeb6e00dc506f2ba9fb7329035adf38cb6f1320c37e81723465ae4b1157069b7587867dae095a5553f21cf896042b674723e5e58981661cbddbe69b03ab SHA512 23530dcb82ead69074ae03caab0ddadfea367b458230d358999195d2794c30be15427cad63b5d76e91b6872d99ac5354b3d4ef5c72bd3c25770d0f7cb4937c7c
+EBUILD Ice-3.6.5-r2.ebuild 8480 BLAKE2B fcf14091f13c1c1d9e560b0a458be74ef63b348636d5aab8c199f820d04b29470f3de5234d48deb0850e1eed25d02c78bc791d6fb03f41d5f58110b2e8c91d01 SHA512 288435a80afe3179ac4a45f1d7e6e399d98273f3b55739f9cb5036d010afca9b5fa30987631d579a8ca43e9d207f4479be6abd30fa3aace0b70694aef5cfd713
 MISC metadata.xml 470 BLAKE2B 0a0f575d2237b74f0f369c49745408308af92797e19904ecd07a46cb56cf6f45366155318f727045448e3bb9639868672b4c55de224703803216d12b5b920262 SHA512 f0e959732e6800280277c32606ea6ba67947d071f17dbef5ced97970879e10198476ca3ecba2099818e3dbb2ded079dd2a1a9c5517cdd233455869e3d816444f
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ea1d041fc529..ef227456bd56 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index c2792ed9148b..faf64a5a0ecf 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51
 DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
 DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
-EBUILD botan-2.18.1-r1.ebuild 4139 BLAKE2B 7a443cb25d91a23ffad72c4df7dfeec6d36823bd477c9c401f16b072a427f4f48f11cbe8270c22df77aa7be211419f08def4086698d07f652152a5654fe67c2f SHA512 1c3cf57e3b3949bdb704c7d1c1eb937fec79effd39c627338533d95fdc0897f6f1dff16b98c50b1d8a75ae1610efdda9176673bfd06f54bdb8030d4d76456fc6
+EBUILD botan-2.18.1-r1.ebuild 4140 BLAKE2B 6019744db3afa681660ff7f254357b05d02b9d3f108704b72f9b0c50d45fe8e0dd50fd7222c782f8dc62576efe5911b90b1b9edce877cd5e0570d89148d13d44 SHA512 519711a85c71389287a791583ba0ecaebee8008ff8fa25e0eb7e2a710f201365ebdc6812fff4dc78df980bf423e89c463ee5f07178d575de0d47302549ef1d48
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 0e5c78c36a50..133a2313d2bc 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
 inherit python-r1 toolchain-funcs verify-sig
 
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 45eafc20131a..0e215a8dbe62 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,5 +1,5 @@
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0.ebuild 759 BLAKE2B 1b9268f24e82771c5b42096afeacf20763e0d0d0415b61c88d3ae2104795ede987de4e4cbdae13db50942ba3f6a1a4b8812396a35177bab59daa22c0fbe1b7ed SHA512 110ab1efc0e4f3e6c1b41862231544a504021b1a7d71a4bdc03b5f18d188f0362f7bda306b0ff88dfb471f1ff131ef07307ffe62dcc4937bfc807e62132a63ce
-EBUILD collada-dom-9999.ebuild 763 BLAKE2B 426b2a43291d81d5db8e5b43517af4bbb41a1d4d737abc6a4328e5cdb3d949adc0657cd9594818a5a0812488b4625f017e46b8fedfbbb783a5e28bd399ce9f59 SHA512 1b27ccbc469f19699587b8bae8267029cf01b2d5a268815bd12944fa685f9ef8b2a202b523134ef24a6f781e1aa75e62217d1bb599e59c38733e7f34971b1c78
+EBUILD collada-dom-2.5.0.ebuild 764 BLAKE2B 56ebf126c5ef4afdea1cf16305fa663248ccbb43a6994ee43cd0e4025b9feccb348bb127f5a3be93e82db8d622a2f4d57012283c2cd269b080910966ef736373 SHA512 95a2808f91c2d6d639ed63f3c5a3a578d39dde0bec657ecb30a32498c292bff8ebfb90a93ea77bdb403cfff8a9b5f290f50438220bc59b73732a533c0c03e8e2
+EBUILD collada-dom-9999.ebuild 768 BLAKE2B 445d45af488bcb04be8b5bf919826d6196eca8166c6833044962fa523a73efce07e5e9f13e1e8f171d6d8d05a3926138947b25e32053eb5db729abe788e789f1 SHA512 eea520b3c82603ef29d117a127b7055c27c48880045704f43e070e90a1bf0bf2270880926c5299489351773910bda245a7533b9c5981e977b42e24bb4cc1ac45
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index 0c48c4d35580..f6d4152a5a7a 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index b81931fde2aa..e9f30a02de0f 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 532cd010085e..dd89a3bb01e7 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,3 +1,3 @@
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
-EBUILD confuse-3.3.ebuild 1148 BLAKE2B 33c7de154ec7e06627fd9c0c6c04003d0d7ca7406ab33556b9de7d75efa3307809c7da82a9bec8cc51e4df601bf70107619c84eda60826fa86fa82c35f83e514 SHA512 789e489c79c406b72d04ab9e11ba8c32cc627cbd0469b1d2dbe828328b9f63988303ea4bec41f98dc0d6770a945d0285396c3186dd005316b9a2cc3624ecb53e
+EBUILD confuse-3.3.ebuild 1155 BLAKE2B 91debc5f0cf0cf0a609c64fa413b263e4feee7bce74ac26b49f6ebca2e3159b6cfad154f1f6ef5b8782bdf1531e5a699337dc4ed574029412edd9e0d495d0bd0 SHA512 3fc53680d57c338128efa0d303c597a0122507db33c99d2944c11971c435a9ce9c33b572cdc4bd10dd609565b194b97959753ade9a490ee1981c798fc4a548bd
 MISC metadata.xml 403 BLAKE2B 5727ddc37d600cb102f7e9cabe85d7331c3ae1d6a9ccd23cf278c36140a9ef044f4d5da75bd4bdbe8d21921cc8dc6f192c2cbc2c285a05ec072ab35e9084630d SHA512 83f6b89426a65efcba3fe250300faffd05d6fe647b36448d947d15d257e5acbb9b4e8034d745d51095eea141dba06ebfc4e0ae6e285b087c6815c51a6eb1d859
diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild
index 9d2e44cd6075..1c901130ccd9 100644
--- a/dev-libs/confuse/confuse-3.3.ebuild
+++ b/dev-libs/confuse/confuse-3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index f0da11c25103..377adfb4c512 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,4 +1,6 @@
 AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
+DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e
 EBUILD dbus-glib-0.110.ebuild 2536 BLAKE2B 0371202a4ec7de8de93db1c50c9d038aa430a5080a79b255c395015b36e81e0df5b11fa83240fc65fdef175944af22b594a84f321f662dfb1f9e4465393c400d SHA512 219d236d22ed666f7d8109c940101b2cc44f86d352a2f2d5d17f4023c941f7c90766ea3e7deef12724f4bbb7a851d9eab134614f3551483e7dc3bb4def5546ea
+EBUILD dbus-glib-0.112.ebuild 2482 BLAKE2B 7e00520bfacac9e50c25013e35a063a5569c3d5d876078f6044e851492d92644672108a52c023456cc47b454e51dc287944b6e403d89ba3a310158e4fd50b854 SHA512 ee519a4ea27097bd44867a27ceb21e2d7a0882166df1e86e89f954787fed70a8bf150dcdd266554b9f4caa75c0ea4f409b3341e7ec19779519517e9357d75008
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
new file mode 100644
index 000000000000..91540650ce90
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="https://dbus.freedesktop.org/"
+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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/glib-2.40:2
+	>=sys-apps/dbus-1.8
+	>=dev-util/glib-utils-2.40
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+" # CBUILD dependencies are needed to make a native tool while cross-compiling.
+
+DOCS=( AUTHORS CONTRIBUTING.md NEWS README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		--disable-gtk-doc
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+	)
+
+	# Configure a CBUILD directory to make a native build tool.
+	if tc-is-cross-compiler; then
+		mkdir "${BUILD_DIR}-build" || die
+		cd "${BUILD_DIR}-build" || die
+		ECONF_SOURCE="${S}" econf_build
+		myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" )
+		cd - || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+multilib_src_compile() {
+	tc-is-cross-compiler && emake -C "${BUILD_DIR}-build"
+
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}" || die
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}" || die
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
+	rm -r "${ED}"/etc/bash_completion.d || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 35bfb8e1d68a..e42ba2013df8 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,8 +2,6 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
-DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
-EBUILD elfutils-0.184.ebuild 2367 BLAKE2B 0a3544424f08f2fc6cc603490b24a3be0f981f5ea459d97db81ee6b212fbd130d0acbe2556f6f33accd3b0a3812c10a1ba4aa5686cfb4e9174b43e9a0795d133 SHA512 92fc6617eb49b7f3e8952357497a3430a6750f28e4b4e8543e568cd1a17127aa296940b9ee7b366a0919bf3d065fbbd86273d09e04dc92919fe68a11252350b0
-EBUILD elfutils-0.185.ebuild 2416 BLAKE2B e59b6be97fcbc278f0713bac6c79d09ccc48655293337239e1b8ddd3d20c93e41dc69d4de550f12254680ea75de13eb7fac72bb2ccb9773a89201b51c384167a SHA512 82f28d2d1fa3eadb693a00da64baad0f79012808f293f94e864edec539065c17348b1580f9b834a0ffcc59a55f8b1c2f36ec0633ddb41521003cdbf61c6abba3
+EBUILD elfutils-0.185.ebuild 2414 BLAKE2B a24fd2616818ffff4813543cb90320c8d127b36f5afac5c2ab8617d8e6f7fe6c988782b36797160263b132df431b59ea99d29afeafa709c9754e648a18b3e8ab SHA512 77b9b6a7fca2a31ad74854d67455751ffbf366124458a98cb10c8f9ef6ba0a12d130ac788ff5afd3a6a9f02b2e868eba611bc1640b03b5c8744fbfd9bd817249
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.184.ebuild b/dev-libs/elfutils/elfutils-0.184.ebuild
deleted file mode 100644
index 38450aa6bc21..000000000000
--- a/dev-libs/elfutils/elfutils-0.184.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	!dev-libs/libelf
-"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-	"${FILESDIR}"/${PN}-0.177-disable-large.patch
-	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-flags '-flto*'
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		$(use_enable valgrind) \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma) \
-		$(use_with zstd)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index c02044855553..a4f1cc565367 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 95275ec10981..cfde982c3c61 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.41.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
+EBUILD ell-0.41.ebuild 1255 BLAKE2B 2f1cab8b6a2f77c85d80dee309aab8c74984638556a7eb88142dddff5c339014046bc981205c70b6401e5181ea3b8134356e2fd831a315822db894bf3898e03d SHA512 908ecb88433c7ddac197aafe986edac040a944a73bc46ac9c0c4fdc56c6f0a029ec15b1974754a9295acc91355ec22c5be520ddda8ab8a18cfdbf3a27a3efe9a
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.41.ebuild
index 752fd7b7e630..1275d91a1a22 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.41.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/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 183e64d2b6e8..2df55cbacd84 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,4 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
-DIST kopeninghours-21.04.2.tar.xz 62824 BLAKE2B 1bd346fc46894199fd0f80a5cb35768de4131d1c0daf4594f4500745f8b0e79209fe41308b8e005fa1b0c6424d1776aeece3dd39b065e6ce0159f9a094679df3 SHA512 566550704a1ffe92249a026ffca10ec52514e2460da459df6dbf457065cfab5c9462ff1b9a90aa9c35637121fdff00ac89986764b5c77b519f5ac5c2174faf85
 DIST kopeninghours-21.04.3.tar.xz 63212 BLAKE2B 8f16566559b529ca44aaa0cb6b8267cc4d253c82e336d210cd240191ea5b60e029d6acd914053707c010bf94628cfb43e9fa0cc5625f275808426f75ecaf8e6a SHA512 d368cdbfe9dfcd82a847b932ddd244bdabfabdf1d44dbf6fb371f3af294f538d77d9f955fdbf1d9a34a2f18e84e649ac32e4b6e296cd7a8cc84d0238ca89bd6d
-EBUILD kopeninghours-21.04.2.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
 EBUILD kopeninghours-21.04.3.ebuild 1270 BLAKE2B dfb8a0fa97a7b193fec15c3576fff63bd2dc253c31dfa44a10852b1aba57e95e3df170a518df482b46c929eb5f25644756f61643de4005a04a65e1badf0222e6 SHA512 b8c2fd7aa936f4d14eb73208d7cb5362786cf7087c3b333adb990a723638513c3a12254395045612a873b30adb01c5d4d1dcb979fd7034448541700f44aeb861
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
deleted file mode 100644
index 405678cd3d3d..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
-HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
-https://invent.kde.org/libraries/kopeninghours"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package python Boost)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	python_optimize
-}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 1691af278d46..c307d324bf7f 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,3 @@
-DIST kosmindoormap-21.04.2.tar.xz 336984 BLAKE2B 723fbd372e14cc6d731dfccea933ba923fd804b8af4d463fa6eb78fdda8a200d67cf6bd780ad65127d93e44f44c237aa8e84987e7c2df972aa1c2ad731c0f319 SHA512 1bf6513577f0033009deaa506fcddd4407beaf0d8e44e2661b76352e851e154ce3a99e9f1e78c33428f2cdd7f4ba6637dc56882f7dbf97e583140a7972e82449
 DIST kosmindoormap-21.04.3.tar.xz 337008 BLAKE2B d1bf349a5b4362fe3cca6a9003ccdf17eb9425e1e2525f3bda39c962658fb9265f7f9f5206c6caec7f26fbdd876f4c9b06ab5662fd2061d1059a51ab089ddcee SHA512 08dc32bd07cc6653f2f12dc3060b102d5c94505f6ff539cdbcd0ed1972a7bec774df55d74f2831b1e6c537167a15a241c0875c6abd73c626718908a3d9f21a2d
-EBUILD kosmindoormap-21.04.2.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 EBUILD kosmindoormap-21.04.3.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
deleted file mode 100644
index a16f08aee91b..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 621005b35342..0a45e3f43d77 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,3 @@
-DIST kpublictransport-21.04.2.tar.xz 392464 BLAKE2B a06eace8fb1c1ab1e753d4042868bba520b5e5692186097ede5f2a92d3deb2b139f0552d0dba7d306ea0738f2f1447c876dd3973efa3aba7857cb8f7cb8378dc SHA512 6b5f945349e0c0d460bc1e7d797de688370200596b0b60fa51cf7d815fdf692bb6e9aaa4be290ca78b3fcda12605a6b881a40c013640394a5c966bd52eaa423e
 DIST kpublictransport-21.04.3.tar.xz 392532 BLAKE2B 203580f29862dfca34406b250907bc1bc320524212cfef7830aa6f545c012c4bb94976f77c404c1e488655c54e1c724b10d8b38c0a15271b81a4707af25d943a SHA512 a952f11719dfc7223ca2a94ec59ac158f95a4034ed8c37918ab5b03cb06d5d0ad6270912e4823fcd535c745baec406e2b0f29360591d32ddd3b7591ad71c8688
-EBUILD kpublictransport-21.04.2.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 EBUILD kpublictransport-21.04.3.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild b/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
deleted file mode 100644
index a5fa8262d790..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing public transport timetables and other information"
-HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
-	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 48cb79e9dde7..19ccdfda5182 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,10 +1,8 @@
 AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
-DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
-DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 DIST leatherman-1.12.5.tar.gz 818066 BLAKE2B 9d30fb224d3f4389f398294712dc85af782eeff877dd0a214fc60ee67d4a70467c1d32255cf8814f0cfc5428c660a315c24a9becdb1aa05f4d5c43ede8552af7 SHA512 dad1ee67f98a4cd12d9c6f022ae2b8c748e4c081918744030191d7c33f84983691f6bcfba3ddf5c0e5b4c36109ebd757325d6e42d88c74caaff942e6603d333e
-EBUILD leatherman-1.12.2.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
-EBUILD leatherman-1.12.4.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
-EBUILD leatherman-1.12.5.ebuild 1301 BLAKE2B 18a2b2846d2e251b1f7f7e00f2febd27c0f113ce61a3a4b489b2723a3bcaeb7ddebcb37d10aed0ec37cfd598f407f7c5e155e253b6428769c4e82b18c4c8ba91 SHA512 c2e05d17884a9a296b4cb5d4db242c16b88d212e02d7031e0bf35661d4a3ffdf2b2015b6ff4797aec8ff1a2a0c2e5162c320fd72adda97764e19d79815c72346
+DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
+EBUILD leatherman-1.12.5.ebuild 1296 BLAKE2B b9fb0dd761cec0c7826b1b1d2df2e60c8e675203f393de328e0384a7082e34404f806e4d58faf45a6d8853502f4b34c10db2421aa22a924e272c4b7ca1ab1bbd SHA512 3eb3d524ad470786a1e5d3c2be3989744e8b1a56d1b5fbabfad634427352e3ce0110bdd033625788e1383ff947296f43991b0cb2f8d26572a3191c07a449b392
+EBUILD leatherman-1.12.6.ebuild 1301 BLAKE2B 18a2b2846d2e251b1f7f7e00f2febd27c0f113ce61a3a4b489b2723a3bcaeb7ddebcb37d10aed0ec37cfd598f407f7c5e155e253b6428769c4e82b18c4c8ba91 SHA512 c2e05d17884a9a296b4cb5d4db242c16b88d212e02d7031e0bf35661d4a3ffdf2b2015b6ff4797aec8ff1a2a0c2e5162c320fd72adda97764e19d79815c72346
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild
deleted file mode 100644
index e41dffc8583c..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.5.ebuild b/dev-libs/leatherman/leatherman-1.12.5.ebuild
index c105fc67cf23..93aeee4fe225 100644
--- a/dev-libs/leatherman/leatherman-1.12.5.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.6.ebuild
index e41dffc8583c..c105fc67cf23 100644
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
@@ -27,7 +27,7 @@ PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
 	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,7 +49,7 @@ src_configure() {
 		  -DCMAKE_BUILD_TYPE=Debug
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -57,5 +57,5 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 5dc691266d32..002e67a12342 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,3 +1,5 @@
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
+DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
 EBUILD libbsd-0.10.0.ebuild 1240 BLAKE2B 8fd9398aff8163c5651bd1ea4edfc1afc6e0a1c0309be8afec21dc719d5259b3931975f713e86e1825af00b2bccfe64b19fa69c7f7958739a0eb966c330ebfd2 SHA512 1ee29cd1a6175d09427a1d56311dad8b341c5094c7a24f8dceaa5e7114941e91ad9dc014153a57009ac79fe5851140def2e9cf0a3a238da654be87fce3640eba
+EBUILD libbsd-0.11.3.ebuild 1271 BLAKE2B 1316524cc5d92f4303183956851709019a73a017dfe7f9368b50dcbcb377d0d2e26c136f19cd118277678f91fbdc657d4e51a2931bcb0f2a0248edad9d8db8b4 SHA512 d1f9d9b6e2eeec540beaa4c89f0c039089cae47a499a38ebbce35cc07aa4c86922cb059519f23155a0d63d7d0bf4bfb8c7e59a22bd448f876feca5e10c25714a
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/libbsd-0.11.3.ebuild b/dev-libs/libbsd/libbsd-0.11.3.ebuild
new file mode 100644
index 000000000000..d9667f872ea7
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+
+pkg_setup() {
+	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 05a973e54bbe..fb7640139672 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,5 +1,5 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r2.ebuild 1549 BLAKE2B 40321bca56583e9edfc1f768b9566e1b8be271deb98a8db56457c64bf345bdf8308d04523fa30ad8b96457c3a65097a3f5fac9920e0f430a28feeda3957b97de SHA512 dc14df9d1d60dfb35cd2118dd632d07b174915c5e728c1bebd2e511bc204cb997b85d68f227b550b0124e5e631bdae94fd400bb39cba72a5ab0d2aa485ae7705
+EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B 96aaeaf2f329d8fa1c099de16890346f8c68ef2f9a7f6119f3ecc2798e96786f8981cd94c4c0df4bab9eecfce475dd4472a28677a12c4cbf297a9721b3bc8dd4 SHA512 a75d48bd6088a332189f633f49d9227f8d19ee67002c53fcea32225ed899898e897d99de194dc5e14792ddd6741090c2c4b07d19fa1a9046b222faec84fe584a
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index 88c4acfad33a..f8a7f4031b69 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 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 ~riscv sparc x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 6b26bec3d752..fb76d10ddaa7 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -8,5 +8,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2961 BLAKE2B 9ed05b546592db1e1bc05c4085a0d0ac2bfd5fd592ec0f5654261274c4733f5febbe032472fc086224100f259ffd9ba0dc6a2f5f524717a96aeafbb9e35b1da2 SHA512 011b3aaac7e72db57b186e37ffd505c697e96ee0befc46ba75929920e2b145006a34895b2be42591fd85b962639adf9848722f9eb12a9e173ef6e2878f7a05d2
+EBUILD libgamin-0.1.10-r6.ebuild 2968 BLAKE2B 27b484eee03a933660abf532ec0878f9d369d7347f0bce84bedf6ef3f7ad8149f6fa138c4c628525b482e847d1d745d0c67a0040d15e0ae94cfc0841b229b18c SHA512 db519401cf52505a8b25de0bb33fd6db569d4c5d85c6b7f723afd71c3b65fdb1e612f34b80d31a023dc4a3573944d3e3c26e5493b81571c5fcc63a5aa7015573
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 786de79b0ac7..b861b0d7a072 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 3dd26f4e1dbb..e523c0a1df16 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.18.0.ebuild 2243 BLAKE2B c77ceb508066d2386668906388adabeca3506b38363e49e1a263a8e75d4cb1b4fdefb825cc4770faf1d078117b38cb2cf929315cc59664326d5be2a291528724 SHA512 5d6580cbdfe2549de9a35d80469d9e119e54b5ef76449e2356d3757414746115cf47042485790f34faa731b009ee6898fc324ef05441d325b4a69a663cd6b38e
+EBUILD libinput-1.18.0.ebuild 2241 BLAKE2B 14f411a26e778392c441c2dce4b7cf53e51f3098ab69b8a28244b4ebbb413b8b557158b4e7b38626d1d5ff6233b7e96219b9ad5756482a9d8c700855e551349d SHA512 4bd4aa63c5c3d0cae88bb161613091094d58ef7aa86f30b07f0460a7af710f92a31ade7d76660d61ffd496ab1075d3eacbfe76920473ea8e7c7c00eadf5a41e3
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
index ccbd8f520e5d..47c3c7362ce4 100644
--- a/dev-libs/libinput/libinput-1.18.0.ebuild
+++ b/dev-libs/libinput/libinput-1.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 5c80731693b5..ee3a40abcb28 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 843 BLAKE2B a631e0daddd86b3c257aa51a6621d21c1840656fc5abe193f23f84c5c149b015367ccfac486cb37839b3b8a1d292d15ad2311531603c0392ca90eae332ac68de SHA512 76d66229e9292b2021c84e09cc204d0ae61c60061d7c2569cfc327b0091b42e1d77f7061a132b34175edc5f70593dc7f5618ea2d288e80404cbd1f1b8da1581b
+EBUILD libmix-2.05-r7.ebuild 850 BLAKE2B 014e98420d34bc1eba432cf9be9f81bb9ff0ac198e5cfa9795b182c1c1ee9295461cc2c3e764d4f5aa690af42acc5e6a7853c6097b661689325b14fa399b331a SHA512 bbe23b629500dc68d9f45dba2f1e428bceb00098e582ea1a2f7919d63bc013aa60532f98511edce246477974ce69ba660b807e2e15dc9e6589cb40827644d818
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 0bedbeabb8a3..5e01c439716b 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 2223d4568217..cae407c7fc1a 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,6 @@
 AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
 DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b
-EBUILD libtpms-0.8.3.ebuild 1192 BLAKE2B 7468ce6ecf8f88536d3025e84fdfc1d1dbd64c7417aafd7990e909a0fb7d01cc6574f0070098e757a5a7acd9e26f196a8d6bcd4eb5d4119b3f08b78365e35495 SHA512 71057c0acbddeb2ef39045e5b0c5751478be601242994103a4a20380aa29701e2300058a8120ee4d742f6520e1aa4de967e68941745438db6d0ffe3ab4111bb7
+DIST libtpms-0.8.4.tar.gz 1255255 BLAKE2B 0786b19dc8f3226508548ab16544ee8ac05e8d9de057eed840a0cb7577c1d1386d83af1a725ec91e64344e2459f9d4836268e2c9a097136cf76d59ea8e23b0c8 SHA512 58244a774cb6ec5dcbbc2d795628fca9eb64936874c72b169ea8288f2bf0cafa8127b1e89ed3ddbf5694df5a5944a7d61254dc729d75b63b3e4f9346b2f0a7b5
+EBUILD libtpms-0.8.3.ebuild 1197 BLAKE2B cfc4d452f26351fa66f744a42f1f24e2c2aa9e464f9189848ef24a01dd94bdbac7a609827407e0e062e90c6bd36646c4bca6aa76a2c52d3d5d7af93f8ae869c2 SHA512 714e720d1895494a214b86fe534f26c7bd28ea5bac0c0eb381e770952bda0f0edaf46bb7eb9cecfe11e5d2a6f8a7bc7c3bd97c00bc2cc8f2fb4656c3fa24f9a3
+EBUILD libtpms-0.8.4.ebuild 1289 BLAKE2B 5721991eb5d0fa307c854cb59c2666be4f4253817d0c5388da44e74ca4089ed32f681429cf45c571659781964e213bf0a0d44bc8f317a2d18e46efb21aec7881 SHA512 500846d4211cdc5d294d56fd4ec6db837bc7e6196ed0252763c1eb3eb1f32cc08f3fb5bad1220d08a64d4595a29c9704ebde5971d4d65ec0a2afd44e253975ea
 MISC metadata.xml 535 BLAKE2B bae20f8be44e80b54b497276a1913da891e9c1bf3e61d3ecc41c0db089ba78424dd470d2b3d9e6475f772d786c44b390cea07dba2498521fa5316144622bc4f7 SHA512 ad2c131b3183613382d1ecfb0b24b02ff3f1d2b4901ad586289298816ef39d4604e82ea1065df54f35883e0cc4052c0510f6971220df8196fe9477a105e50f68
diff --git a/dev-libs/libtpms/libtpms-0.8.3.ebuild b/dev-libs/libtpms/libtpms-0.8.3.ebuild
index b7031ae9a4d7..506699ace35a 100644
--- a/dev-libs/libtpms/libtpms-0.8.3.ebuild
+++ b/dev-libs/libtpms/libtpms-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc"
 
 DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtpms/libtpms-0.8.4.ebuild b/dev-libs/libtpms/libtpms-0.8.4.ebuild
new file mode 100644
index 000000000000..3eab05684d98
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.8.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library providing software emultion of a TPM"
+HOMEPAGE="https://github.com/stefanberger/libtpms"
+SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.0-Remove-WError.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-openssl \
+		--with-tpm2
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
+		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
+		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
+		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
+		elog "TPM state file must be deleted and a new TPM state file created. Data still"
+		elog "sealed using the old state file will be permanently inaccessible. For the"
+		elog "details see https://github.com/stefanberger/libtpms/issues/183"
+	fi
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 10f27c167825..6135454b88ba 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
 DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4
 EBUILD libuv-1.41.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.41.1.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
+EBUILD libuv-1.41.1.ebuild 1365 BLAKE2B 2d2e5fe8270f112838f5b7c3edadb6163c72da25eba3169b388133d5484663213c044b5915bb7173d2c6d60edf42822774081952ac08f8194f508828fd843585 SHA512 4d0219d5b8e895de69b20cdf3e0c30c9f4b246f502ee6d183c8e95510a214431e12c7246b342126b419dbd94098706415e44cf5eb6cd1bfafec8e1aa50f85ce4
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1429 BLAKE2B 78cfbe0bb9f028975aaf6721f96efe4e79ac0e14563a32bffcc4ed5509928c76ea28d5b7513290cdaf062c9edfccd8f8f1ffd30922739176a1919303a60e222b SHA512 c429cbb18602a7681a1c2bea6af32e889e33d788c5cdd1f1f5a8b99a9c533c5603bd612bca76ec37bbdc1eeb9bcf5ffa47018f71aaadf66785a3da06667661b0
diff --git a/dev-libs/libuv/libuv-1.41.1.ebuild b/dev-libs/libuv/libuv-1.41.1.ebuild
index f1d10ed56e94..94b9af4782f3 100644
--- a/dev-libs/libuv/libuv-1.41.1.ebuild
+++ b/dev-libs/libuv/libuv-1.41.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 7f79295a9f64..471fcc0da307 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,5 @@
+DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
+EBUILD libwacom-1.11.ebuild 1367 BLAKE2B 952152d17625523859607ef17eeaabe11f946a56271b2602160ae304417af250d54517c14bd4b1f30eaae490b6852f00038fca28a5f77400c810c4466d32c3b8 SHA512 a16aee39b8cbe77fafbfb30dbec6b0ee66ef799b364c563cf5dd4a2459662aad0eeb16617809a7050bb3c07716a6aa3e241675fcd2eed9fc53d50b22ac82b3ff
 EBUILD libwacom-1.9.ebuild 1362 BLAKE2B 9362fa7a2ad34ac1c6a35dd056e34c5bfd821d92e8cfc1e593352088c3d8be6c0bbfa73e8ea9edd6a4baf5eec109db2cda72c59d366f9f5b463f011c18aa0593 SHA512 d89258d47923070b4b1e40ae689c7f473e28961d9ba068659bb5b5b4985a746b95cbdf0eb4f6c6910b486210b9d0db2ea498f097eb5fdaac1f2b2652c4d2ce3a
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-1.11.ebuild
new file mode 100644
index 000000000000..de40b8c9ca0d
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 toolchain-funcs udev
+
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 3ac96b1fe53f..5cea0804428f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -9,6 +9,7 @@ DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
+DIST libxml2-2.9.12-r4-patchset.tar.bz2 7006 BLAKE2B 64225a16346bff60f2bf3b6d32dffeec6887c44d308dd816d6de3b92ee7f7dd5599b5dfdae0b6ca9e056897c17b659ff36d170f972e1b6043ca3ec8de9c65050 SHA512 ca0734c894afc264851107c22a606b9094941a4452a946b769d6f7161b3301425da5bd3e26eeceb4e31e9721f76505aacf73eeaffa6699bb7395783915eff111
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
@@ -18,5 +19,6 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
 EBUILD libxml2-2.9.12-r3.ebuild 7098 BLAKE2B 610470493d1cbfb4094e1c8c2466fde0aeb9026b29c31d6f2790ca99c90361017a4e857b82e9340c6402554ca024383c08c165ebc8ab3aa54a368420a9bfeba0 SHA512 707f7efa06e4440be182a8ed3e16ace92c5869c272ebde85d14f9209fcf935375324ae0989b7a192b0dec57ca582696de4355c89aa7f8a3a75fefbadaa9b0805
+EBUILD libxml2-2.9.12-r4.ebuild 7293 BLAKE2B 2eee9e328543a0bcee103ccaae3035ea42795358c867c0db8beee383ca4b3b036c21d69217badcf1d1a75d83285e02ed6a16b4c3012f33ae1b11160dd9ea2a87 SHA512 a55bbed4a4de87318b83f1062338b70e5267945f07c7e4a902cb5153bde2cce9c4a9ae873b99c110e97f34b831d06fa6ec57992b83d8ad993a157c90ed9b7685
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
new file mode 100644
index 000000000000..6027333fb815
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PATCHSET_VERSION="2.9.12-r4-patchset"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+# Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
+# bug #802210
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+
+PATCHES=(
+	## Gentoo
+	# Patches needed for prefix support
+	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Avoid failure on missing fuzz.h when running tests
+	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+
+	# Respect LDFLAGS fully
+	"${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch
+
+	## Upstream
+	# Fix lxml compatibility (bug #790737)
+	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+	# Fix serialising empty HTML documents (bug #794733)
+	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index b3d661416ecf..dcc46fa8adf0 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
 DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
+DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
 EBUILD libzia-4.28.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 EBUILD libzia-4.29.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
+EBUILD libzia-4.30.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.30.ebuild b/dev-libs/libzia/libzia-4.30.ebuild
new file mode 100644
index 000000000000..b085977f4099
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.30.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 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:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index ca8c311e519d..a53ae0239352 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,6 +1,8 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
+AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349e6880b1439c3376f47cfa742e2b236b2072e3420120e1c6858437e1921295b752d63389aeea27eb5b22d39967d88f4894d153e22d42 SHA512 2e4c4c68add4a6ac107efa08fcff20d4a557252ebf246d38875d2f428432ba739469ab4200d94d3dfaf7ddec28e0b029e628e3b18678fad0cc2af731e7477032
+AUX newt-0.52.21-makefile-LDFLAGS-ordering.patch 1201 BLAKE2B 58d895ba0da3a1ce139a7257035ff41279c3432d002e57261e0d9051b6c6baf8044e774329bb24ed6807f42099817a4ca7cb2138ee3dbc37e3c3dafbf1d7d816 SHA512 e1f9e54238e2e6c700d301cb3017797b7dd396691528a7007bf4b316684269d6e4daf1f6973389e0403341bc650ffbed4b01ffa890e8d53af5a761941e93a03f
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.21-r1.ebuild 2257 BLAKE2B 1a37298bb31eaa7c1dd2c9f7c84ce4559ffac24da3daf871fca504a27e31acc52e6025dab949f5b8bf16c8a7ae8b1f9375461367be926b0589a09e3c75e8495b SHA512 dc4bc7d10254340258012c60ea87315abbb7546715daacf4261d8b07a708df302d6388becd54ccdde8dda46501203dc43d8effc3da0b20793f737fba72dc467e
+EBUILD newt-0.52.21-r1.ebuild 2369 BLAKE2B f1cd44617d3daee421d3c8c9d9ba8c9e2b070b4192334967198492dc70a1f690f24cff6d7e457aff35484c6fcca5348410847989556d7b2a991097dcb30753cb SHA512 7a5b8d178f6129d0b2eb2f9ac33ee75e5bf0f2d5112c328e5964b35886648ddf826bb038ca85a2debeaf98cfb9a89c1c4614c38de39e11dd5b92dbc0c759ab7d
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch
new file mode 100644
index 000000000000..3d6b87030dd6
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch
@@ -0,0 +1,27 @@
+From a37a8c15f4653b4edea414f42a0d76f3b1f5652c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:19:25 +0100
+Subject: [PATCH] Fix non-POSIX backticks
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb2b940..9ba4c64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,8 +23,8 @@ AC_CHECK_SIZEOF([void *])
+ AC_MSG_CHECKING([for GNU ld])
+ LD=`$CC -print-prog-name=ld 2>&5`
+ 
+-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \
+-   test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then
++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0 -a \
++   $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then
+   # Not
+   GNU_LD=""
+   AC_MSG_RESULT([no])
+-- 
+2.32.0
+
diff --git a/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
new file mode 100644
index 000000000000..f05075adb371
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
@@ -0,0 +1,30 @@
+From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:12:32 +0100
+Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS
+
+Needed to respect as-needed.
+
+Bug: https://bugs.gentoo.org/798945
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1047efc..f0bc417 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -97,8 +97,8 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
+ 		PLFLAGS=`$$pyconfig --libs`; \
+ 		echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ 		$(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+-		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+-		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		$(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+ 	done || :
+ 	touch $@
+ 
+-- 
+2.32.0
+
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index 4eb95be86239..b2727a258f8d 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -29,6 +29,14 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.13-gold.patch
+	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	"${FILESDIR}"/${PN}-0.52.21-makefile-LDFLAGS-ordering.patch
+	"${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch
+)
+
 src_prepare() {
 	# bug 73850
 	if use elibc_uclibc; then
@@ -54,11 +62,7 @@ src_prepare() {
 			|| die "sed po/Makefile"
 	fi
 
-	eapply \
-		"${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
-	eapply_user
+	default
 	eautoreconf
 
 	# can't build out-of-source
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 3f3e77c032aa..1ae6a8ec1ce4 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,9 +5,11 @@ DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70
 DIST nss-3.65.tar.gz 82386222 BLAKE2B 4e1876a12d042b67c6654a8396611ca33d5257b07c75b55201de229f0a6860577886f38d640837d6512b30a074d05b917bae4e34263d9c0f6f4606c80b369a04 SHA512 6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
 DIST nss-3.67.tar.gz 82402188 BLAKE2B 00733c3f3b47e9dd5d5492ecc67baf2507b2bb446a7245422065f1ff28fcfdca25b6e93854ab5b1bd8b2706821a143b5d1d33273008982416148a8ced8e5117e SHA512 1d3fa3fafbf3e54c9c3b54b0b3c291aebb48542380a1b704fa07359d3cefab93f166b31928c9db190ed58118e289e67ce8aa1619e4219d69b2c098484a22bc9d
+DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103 SHA512 be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9222 BLAKE2B 8c6ad2c1156913b3a21c056524ebde104e2b6d2d8422eb5f3ae8c9782bf671ce70f8e6ccc527201e7d4c6ce3e7a703d00fe349c719368f6df0d96a36f0be06d9 SHA512 e5e73cbf0cfb93d4493278e8ec93faeb704196d5ec19aaa3e27c42518c611605b87118f2fbfe546575cd549a98c2df2b09da42bcf4a26eb86af56678fbd8b1d9
 EBUILD nss-3.65-r1.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 EBUILD nss-3.66.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 EBUILD nss-3.67.ebuild 9237 BLAKE2B bc0ef88598f5eb481470668e32364f71b44ea23c69457a4ad9b5de894d2e0a8632b16de2cea8d233912c7da5c87995224044a7e08b416fde0ac1dc41abd0cf12 SHA512 c38fc9ccf18a4ea0fe7409e1839713b9fe0f95f3b7bf49d7915aa30fa07155c89a275cb914dd852d788e1c6a43026cefd019b535a82a3b857d7e52dd79d50f63
+EBUILD nss-3.68.ebuild 9237 BLAKE2B 3f37145dff053702335447f0034f45920c7e3ba828e38dbd59cabbe44dc41c1c8ed41079c225d56deeeef69a3545f7dfbf02d9b9d8c5af3509a3678211340a28 SHA512 ad5d2e8c3e4e38aafae17514a7e9f4e215d45111d995562c209e50b6061b4eb6c3a07842b3dc7df2897a47f535a57c291fd5fa4f2c90297ed0f58040edb7b967
 MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/nss-3.68.ebuild b/dev-libs/nss/nss-3.68.ebuild
new file mode 100644
index 000000000000..6f5630e89284
--- /dev/null
+++ b/dev-libs/nss/nss-3.68.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index a10bea38e1d1..e6d655704325 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -4,7 +4,9 @@ AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
+DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
 EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1263 BLAKE2B b84ef38978e43306f5be92a6c138b4aa704d77374e70b8f2c3275168f0ae24bd3a303d87ebbbaaee04f85aaea3f8914493863171ee8ef874b429fcbeb31b6d5f SHA512 3879464f9d72f46bbd6dce799a63d1c62e174635299753df2d1174a4c47cc97ab8f3d698c06c2e636ca9f76ce564f55ee871852fa4aca40786fd3a1a925fc918
+EBUILD opencl-clang-12.0.0.ebuild 964 BLAKE2B 374605826e266e1d26621d4c8161f3adf523a6cdaa62ab75e82c52c14ddb935cedf88c51a4e443ee2f37e80436f950f61d56706bad9090521c3e4e0689666cc1 SHA512 c6bf4c8b449f2cb181337b7848b416faab498f6643e8aba00997c7680b1e5363751dd93839214725a7268b2f192f1d13b492a3eff85f2697196adf784b4a8b11
 MISC metadata.xml 250 BLAKE2B 7be2fdb3efeddaad6369a79b3c29566a4a6d596bb6ee9408bff4c82c1aa151ea3ee99f30d2b6813caa9348c9d7809b38c017a43c6b49251b75c9d7b365f7c5b5 SHA512 5e202e141a05c33cb2a627e147dc3439d344db0a04529fdbee7c0d164a40bf0a847818fb94f21f3a45f1104fb6be421fb16442db0688d50eef8b4771ab0e85ff
diff --git a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
new file mode 100644
index 000000000000..506fa5f64d2d
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="12"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-util/spirv-llvm-translator-12.0.0:12=[${MULTILIB_USEDEP}]
+	>=sys-devel/clang-12.0.0:12=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:12=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=12
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.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 64afe3b7e273..8d09639ea026 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -3,5 +3,5 @@ AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f17
 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 1868 BLAKE2B ebbf993782fcd0d9e1d8d355a7896a85e26660e516c856c33677db34424f28a737f8d30ddbbf3ff292c16cb404247d02d6dd8b3f3d54140e1ba565d4c0fea6cb SHA512 1680b4bcf2ab446a6998af48a5a3abff32860620784403ec240e1962a2fee5163e810e67de601439720ea613f9de5433c007338a6923ee3a2889b440db240dba
-EBUILD openct-0.6.20-r5.ebuild 1859 BLAKE2B 87fee515cdcc320f0e10fbf1b071af52f8dd72e8547670b689a52fe6abcf82a0213c77977c0a4b4d6a0e0f52629a9b7b8a783d5935cb31bff7cfff3575e4f47a SHA512 a26d692b9d2da8ccea128beae188590fe245f8239e9059fad47da1a15a54568aa76c9d0d8852e99dc4866da0cfe470f5062b26661f130edd1deabf3fc26e4480
+EBUILD openct-0.6.20-r5.ebuild 1855 BLAKE2B ba2a8828594d5784ca5af3ea60b36a7eb634b4cedda257b471d46da4fa171b7bd3b0e49eef192481a97480d229a36141708425611cfd89a11b73d9906bf4d777 SHA512 b71aed457d41defdfac52b1a98832dcfe38b9fdb5bd92148aee8baa2193f97b8e0d57d309fc62b7bb598007877c6e6c3ab161a033e33d311b2e947eab3f86533
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index 6183a18acb12..d72b32674b28 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 25fd06e48637..6d1ae2ad531c 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
 DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
-EBUILD qtkeychain-0.10.0.ebuild 912 BLAKE2B 341affb568d1a6d996ff9406b5b05ceff59a5d88b25c8e036836ea322dbd2f69877ab0dd86f4e14a7ce9263ca583825823ef2f7d62c1753cc61b7c04497b722e SHA512 63996a4ee7e2bed0f7a9f47db4f7815874dd4e85dbdc2c171794795e72afa57674db12132e94ade8a12d2ca84eaf30f77b1dc4ccaccba1e3235eacc84dc9d778
 EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
deleted file mode 100644
index 4c6ec3117e35..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD"
-SLOT="0/1"
-IUSE="gnome-keyring"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	gnome-keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 3866c36cb0fb..5f3eefebef0c 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -15,6 +15,6 @@ EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a0
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
-EBUILD rocclr-4.1.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
-EBUILD rocclr-4.2.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
+EBUILD rocclr-4.1.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
+EBUILD rocclr-4.2.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
 MISC metadata.xml 511 BLAKE2B d2b374303172e793b16f6cb1dcd569e4f112ed2a2396f8ee85d053411b31688c2fac0c20ddf43205ad04aa36f910edcbc0de57b4e972615953b22e2475b3fd7e SHA512 349b4d3a8bc6414c5d015f8f50d4b09869e04dc67fe8317644cb148752dcdb767beb2d0eb18dc83bb50e9927e81fcbd1e43134e9a0ded14fd16bc109c8518365
diff --git a/dev-libs/rocclr/rocclr-4.1.0.ebuild b/dev-libs/rocclr/rocclr-4.1.0.ebuild
index 46dfd99646dc..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.1.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.1.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/rocclr/rocclr-4.2.0.ebuild b/dev-libs/rocclr/rocclr-4.2.0.ebuild
index 46dfd99646dc..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.2.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.2.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 60ef596f65f4..38fd0560f825 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,5 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6-r1.ebuild 2219 BLAKE2B 8ecb15979996b37e5a1bb7bcfbf74cee8b18e386e1784000a85aa645f23a547efc6952f8241f0de8034bd561dfd93b0c54983755d34e0b8eb31c39a8729e6efd SHA512 43a764ff2d24978893584e0935156539fc59df453b9783a71b907ed7334a48843d28a407f0ea971c53954bb88d5c142d5959cf995e7c99254f6c56ab9885acf8
+DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
+EBUILD starpu-1.2.6-r1.ebuild 2235 BLAKE2B 48d84321048eb6613e0c87e2ce8405f4c30b473f35e3e111eb9ec246b0c19a2a50a00217a62664cd195c626c9e52078968f6f28f568167a121f649dd27b8917f SHA512 ebb30e1b5e50eefdcd333d30c1d9ad1eef5942550b5b9ce4434aa59b0cd389926419c59c2d4bf1bc0f6a808bbdc3d1a28e346f1f764e4cb9cc9ab8613d0ad46d
+EBUILD starpu-1.3.8.ebuild 2267 BLAKE2B 3d3f70701dfcf6ec74ab39c75b7552681e31fde47557148a80db8e76efc902a07ea842a27f7be4884c440015bc0efbdf70cd65a0c00013afeae029627d250b86 SHA512 7a70618315d6c3fbcb675ef2e5e17e4af383aa58facbba1c7566019ec148ab390a51a12e6477dd24c7d973474049588057a6889f5a69543aeeff0b16bad3fd61
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 8a4a7251ea18..641c60725b3a 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 FORTRAN_STANDARD=90
 FORTRAN_NEEDED="fortran"
 inherit autotools cuda fortran-2 toolchain-funcs
@@ -11,8 +11,8 @@ HOMEPAGE="http://starpu.gforge.inria.fr/"
 SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
@@ -33,8 +33,8 @@ RDEPEND="
 	valgrind? ( dev-util/valgrind )
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen virtual/latex-base )
 	test? ( gcc-plugin? ( dev-scheme/guile ) )
diff --git a/dev-libs/starpu/starpu-1.3.8.ebuild b/dev-libs/starpu/starpu-1.3.8.ebuild
new file mode 100644
index 000000000000..748f3df483f0
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.3.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD=90
+
+inherit autotools cuda fortran-2 toolchain-funcs
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="https://starpu.gitlabpages.inria.fr/"
+SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="
+	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
+	openmp spinlock-check static-libs test valgrind
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-mathematics/glpk:0=
+	>=sys-apps/hwloc-2.3.0:0=
+	blas? ( virtual/blas )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers )
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/freeglut:0= )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+	sed -i -e 's/-O3//g;s/-D_FORTIFY_SOURCE=1//g' configure.ac || die
+	eautoreconf
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
+	econf \
+		$(use mpi && use_enable test mpi-check) \
+		$(use_enable cuda) \
+		$(use_enable doc build-doc) \
+		$(use_enable doc build-doc-pdf) \
+		$(use_enable fftw starpufft) \
+		$(use_enable fortran) \
+		$(use_enable hdf5) \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable opengl opengl-render) \
+		$(use_enable openmp) \
+		$(use_enable spinlock-check) \
+		$(use_enable static-libs static) \
+		$(use_enable valgrind) \
+		$(use_with mpi mpicc "$(type -P mpicc)") \
+		--disable-build-examples \
+		--disable-debug \
+		--disable-fstack-protector-all \
+		--disable-full-gdb-information
+}
+
+src_test() {
+	MAKEOPTS='-j1' default
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
+	use examples && dodoc -r examples
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 5ebd8f780786..16b039e38d4a 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.20.0.tar.gz 2876764 BLAKE2B 058f62c2067ce5fcf9440f281c63908f93fda09a6b3604d7196b9c56a15ba88ded7d75f9c21b4c5c4209f587fb5f326ae655cb5f5d84b46bfd783b2147048568 SHA512 a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
-EBUILD tree-sitter-0.20.0.ebuild 777 BLAKE2B 43833ea5d0250dd2d8a0fc5cc9b7193b41f4d3f1ecfdcb9c0bb91e950d9e994a2105315b67f3911bf8ec38fb55c8e4fba0695333d2eb8ec7cf7b52913f21b98a SHA512 de14e983bf302da3394594f341f1fdb6e6ffaef60671e68f79a0c6c4b5f975e687f8aafcffb7e544b7fc16870c26e89083ac563c1b7861c351442f78b2e8b1bc
+EBUILD tree-sitter-0.20.0.ebuild 769 BLAKE2B 4b002ef473d20d7b2baa617cd5b336e58280d56b8f3386fa919750586cdb5493ae80e594e2f4e30f2bf3b6b4156c08dacd59aae2fcda9edd1c8cd32d1d7a9afa SHA512 f7a5d6b7df837e1cb9014b5870b1877a5f472809cabb97a464d7351c14196d454d89d0867769ef81b7fb02564574f96126210a037e67b0de11ced60b543174e7
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
index 3ae0a4de6290..1e6295e06d4b 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index f432c36bc3e5..06d5f394b4b9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,3 @@
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.5.ebuild 1410 BLAKE2B 34585430e663a8f5d2831271d16d2653688ee8924df945151a93e37efcfdf5785f077f872cd91e1e6b61c27b943615584da6c94d28281fa6b6fed4fcff7c002c SHA512 6581fee2794970dbe2f34542b51d3cfba32a94578b5797090a85e3de1ad876e5705ae7a829bafbfaa277cb47a7db6c5b16debf06556ab535d48b665a3d0e043b
+EBUILD uriparser-0.9.5.ebuild 1409 BLAKE2B 0e43acbd9931b5e77508787d3783370949ea8c8dfb0291888ae6d77d064d05a0a4a8bfdf2cc3c32ce8a856c34df39bc0f69b52d42499fccf19dde0afff2358a6 SHA512 42e5a7f98eaf9d9ecd831fc0c2c967254840aaf37367635d5e9820bfb7573f2a47517375898c3da634345acefe1e7aed2153b61bdbecd6792b79c5a82d1663a1
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index 9c4bfee7c144..ffb70dceb648 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"