gentoo resync : 03.07.2021

66 files changed, 242 insertions, 759 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ec2c1c314b5a..1c91c3245c26 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 3344b1c9c4c6..c2792ed9148b 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,6 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
 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 3041 BLAKE2B af20f6fc0d5cfc587cc67c8fffffa5d456123e996910f178059db6902ae6c4f8b21017c6da509f7f53e2d958069274ed59080747077cbe9fc61384a8b2c6a41f SHA512 14a862be4d12e02677507c1c0ba8b7950731da329e5d13b1fa8a1f09dd6923dc5e72e41de104efdc456a2b4a6ca528ec9901a56e80bf6382ac9c96c84428104c
-EBUILD botan-2.18.1-r1.ebuild 4099 BLAKE2B 4e4136635017ce0f72533b39aec098e577ef5bc7c434689f1c0d14c683fce8f6ab53bfe605fd8649a3ec87d03df6f266658ed771c33551e7494885a4d9167ccd SHA512 fc77b584b7d9c90b53eed029138d909b45b6cd1383bce0501b480a9f536e171b8151542b3f4057642456f35306dace346fd13fd38c7337c3463a96ed43516683
+EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
+EBUILD botan-2.18.1-r1.ebuild 4139 BLAKE2B 7a443cb25d91a23ffad72c4df7dfeec6d36823bd477c9c401f16b072a427f4f48f11cbe8270c22df77aa7be211419f08def4086698d07f652152a5654fe67c2f SHA512 1c3cf57e3b3949bdb704c7d1c1eb937fec79effd39c627338533d95fdc0897f6f1dff16b98c50b1d8a75ae1610efdda9176673bfd06f54bdb8030d4d76456fc6
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.3-r1.ebuild b/dev-libs/botan/botan-2.17.3-r1.ebuild
index 2bb63cd2ae79..9900e923b2a8 100644
--- a/dev-libs/botan/botan-2.17.3-r1.ebuild
+++ b/dev-libs/botan/botan-2.17.3-r1.ebuild
@@ -53,6 +53,8 @@ python_check_deps() {
 }
 
 src_configure() {
+	python_setup
+
 	local disable_modules=()
 	use boost || disable_modules+=( "boost" )
 	use bindist && disable_modules+=( "ecdsa" )
@@ -112,7 +114,7 @@ src_configure() {
 
 	tc-export CC CXX AR
 
-	./configure.py "${myargs[@]}" || die "configure.py failed"
+	${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}"
 }
 
 src_test() {
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 5f66e51f3aa3..0e5c78c36a50 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -59,6 +59,8 @@ python_check_deps() {
 }
 
 src_configure() {
+	python_setup
+
 	local disable_modules=(
 		$(usex boost '' 'boost')
 		$(usex bindist 'ecdsa' '')
@@ -147,7 +149,7 @@ src_configure() {
 
 	tc-export CC CXX AR
 
-	./configure.py "${myargs[@]}" || die "configure.py failed"
+	${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}"
 }
 
 src_test() {
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 58079db0b8c0..36fea0ca131e 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.2-r2.ebuild 1495 BLAKE2B 1650f9bf0e3212112a728bf1614d07d2c6329e5682fd803552a6d1b6e3e0224c81a403afbd4386819f17e8905682b3045e86e14028e547688280bbba0555d42d SHA512 3e62f6336908d7728a2af90ac6d792a3d7dd4ee23f1f283a25dd9f99193a4f4319eb69cf65099fb778a06b4539dae5e0d4cbc2fcd4290fff644315ed4379a065
+EBUILD capstone-4.0.2-r2.ebuild 1527 BLAKE2B 1afcf5963366645ae26665381d21655b2445b3a8cb11d864453571332acd48a421d9f9d6a936833fc1c3f80da10d39e70661971bc65d4abf5e8eeca98b2a3345 SHA512 bb6f532018d891fb4155fe869b8ce41b61deb1d84b133507bc42c98217273e6e75aba355708e6693372292de662655951fdd908bcae87c8c891ec1b750261211
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 7e0bcec945e3..893c06164671 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -16,7 +16,8 @@ LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-RESTRICT="!test? ( test )"
+# A few disassembly outputs need an update
+RESTRICT="test"
 
 IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 8eff9310e429..cd901dba21b4 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,10 +1,3 @@
-AUX concurrencykit-0.7.0-ar.patch 3293 BLAKE2B a5e67853a4d6c08f8f0d93d528bd93688e3edfc434bca235ef272cbd95e87430e64596301d6bf7ce366b0faa0892ecaf479aa0b8e877c4c0bb2d04901bb58168 SHA512 6394717aec1c10766aae8aff8f7cc0b0aea1bcad8e71f017c6c2765f2e5fe43f29a1733480fa280dc2da36a50d74f2095a2e51a42b79b27b776e99b4f971f03f
-AUX concurrencykit-0.7.0-glibc-2.30.patch 1609 BLAKE2B 1aa8eb4d29ed2ecb52b1fa942eead2e88a97979c331f2227d05b578505df35d9f9549798ebc401632bc29572f0c12351e2b4485471767b70dd3eadcb2ff010ea SHA512 fe6e25a67025c5f4ef9affbd32cb4fe0c29879af866c2b621be004fbbd3ff8b203f7655aca8943bb8303a318aecd387352256b121eab68487fac0a135ad82903
-AUX concurrencykit-0.7.0-gzip.patch 1553 BLAKE2B 8a164f19cdeab56fd9a1099c312bc04209e24e2bc1798da5e56c6c4414b327801f73e6c222e665bf8299c8620a12ebcf73bbf6839075274cdcb759261b79fe35 SHA512 bef714a6d22ee6ae5a8e70befcfc92a254fbd724646832043dce03ce1b4f922fc8c6bf91d9b37433b8849afc5e276ea5d7510fcff6fdd0e20aa650414766ce02
-AUX concurrencykit-0.7.0-static-libs.patch 3170 BLAKE2B 8884eb8cfffdc5bdf864ec29495e8a209befdd8c7318e49bbee15821c42c7a18b0ed8d52ee07b72974318f57785a7867bd47461a44e535102bfc03c650e85af1 SHA512 52ac965f0876cca54a60ea05e1bcee9a72534368646594b55ced604f425e505bdf39b836c3a19fc5fca49a6838866e0fef4c192ff073bdb864f113e41ba87cc4
-AUX concurrencykit-0.7.0-tests.patch 1104 BLAKE2B f85dc6544d31e39ba9cbcbdfc8bd810763dbed231c23683700743fca4e4d80f88f0129c835bf93aabe71d9f2b63a33923a8516d51fc582638e09e6093b9c94d4 SHA512 1dee5e646e02c84c5ec823c600a2e18270288bc066f67b63b7da38126d43fc8cb92c8d466bf8a160e4689513d021c587d9d607e9828dcb6446c5f7df01602663
-DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
 DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7
-EBUILD concurrencykit-0.7.0-r1.ebuild 910 BLAKE2B f4f7e8209ec583bac7cb84a5c5c14edbab95b26800c3d5f8ec11011a2280452b6db30c5c70b3fdb7da3f212cd09b404f02a33e0d2f382440a963bb9661c8d208 SHA512 30563d6ee87c60b2fe4ec8cabb6d69b3d619d3a3cbb623c0d65488d40cd3cb48243f4f83d27c8381f123ed6f2a8f8c152c33b2f38bfd3ff960ed7a3c8d2fbef8
-EBUILD concurrencykit-0.7.1.ebuild 732 BLAKE2B f1d5678df38b87e13a68f4d28bc4baef5472f59030ed45a70d60a4525a8a38f1bb1a503f6051f78592f79d2f301f6c9f49d1fec59b0b243b7669e9b4ed3d4817 SHA512 fa233516f2b3183e535202d219161aef19eb5fe5ad73c9e0429dc8a98946ea098539b25176be0ed356158dda7cfdc249f0d89023f3bde051a2ba76b6af6ce2d4
+EBUILD concurrencykit-0.7.1.ebuild 730 BLAKE2B 22ac382e83982281ee3c8c0104949fe0ab7addb98307e675b408cad11d01ff83bc6e01b98bc09fe7b855dcbeadc53b2e15559e5a51a8ce84787339d58a1be958 SHA512 a19040a3ff4c709f531e81c8edcbfc36ee5a7efcf6c0f4a995a6093d7fde36a5df2db0f4e86da99274e733721256b6ee9289ba501bb1610deb63181b2ce57461
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
deleted file mode 100644
index fb0bfdf85639..000000000000
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PN="ck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library with concurrency related algorithms and data structures in C"
-HOMEPAGE="http://concurrencykit.org"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-# The 'libck.so' has a name collision.
-# See #616762 for more information.
-RDEPEND="!sys-cluster/charm"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ar.patch"
-	"${FILESDIR}/${P}-glibc-2.30.patch"
-	"${FILESDIR}/${P}-gzip.patch"
-	"${FILESDIR}/${P}-static-libs.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-src_configure() {
-	tc-export AR CC LD
-	$(usex x86 'export PROFILE=x86' '')
-
-	local myeconfargs=(
-		"--disable-static"
-	)
-
-	GZIP="" econf ${myeconfargs[@]}
-}
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
index 489b1bab3ea6..f1b6903eb0a4 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # The 'libck.so' has a name collision.
 # See #616762 for more information.
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
deleted file mode 100644
index 70dd46a113f2..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <ck@bl4ckb0x.de>
-Date: Sun, 22 Nov 2020 00:55:36 +0100
-Subject: [PATCH] Add support for setting AR
-
-By default, the command 'ar' is called. Is should be possible, as with
-'CC', to override that value and set an own AR.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- configure       | 11 +++++++++++
- src/Makefile.in |  2 +-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 1b85d113..78535332 100755
---- a/configure
-+++ b/configure
-@@ -146,6 +146,7 @@ generate_stdout()
- 	echo "           SRC_DIR = $BUILD_DIR"
- 	echo "            SYSTEM = $SYSTEM"
- 	echo "           PROFILE = $PROFILE"
-+	echo "                AR = $AR"
- 	echo "                CC = $CC"
- 	echo "          COMPILER = $COMPILER"
- 	echo "            CFLAGS = $CFLAGS"
-@@ -215,6 +216,7 @@ for option; do
- 		echo "  --cores=N                Specify number of cores available on target machine"
- 		echo
- 		echo "The following environment variables may be used:"
-+		echo "   AR       AR archiver command"
- 		echo "   CC       C compiler command"
- 		echo "   CFLAGS   C compiler flags"
- 		echo "   LDFLAGS  Linker flags"
-@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then
- fi
- assert "$CC" "not found"
- 
-+printf "Finding suitable archiver........"
-+if test ! -x "${AR}"; then
-+	AR=`pathsearch "${AR:-ar}"`
-+	if test -z "$AR" -o ! -x "$AR"; then
-+		AR=`pathsearch "${AR:-ar}"`
-+	fi
-+fi
-+assert "$AR" "not found"
-+
- cat << EOF > .1.c
- #include <stdio.h>
- int main(void) {
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 0b7ae7b6..73788497 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -25,7 +25,7 @@ libck.so: $(OBJECTS)
- 	$(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
- 
- libck.a: $(OBJECTS)
--	ar rcs $(TARGET_DIR)/libck.a $(OBJECTS)
-+	$(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
- 
- ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c
- 	$(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c
-From 866c2af332a075cc83af78b184be0d5e6152de13 Mon Sep 17 00:00:00 2001
-From: Olivier Houchard <cognet@ci0.org>
-Date: Sun, 22 Nov 2020 01:16:10 +0100
-Subject: [PATCH] build: Make the lookup for an archiver report success.
-
-Move the code looking for ar outside the compiler checking code, and make
-it report success if found.
----
- configure | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 78535332..16a8f64f 100755
---- a/configure
-+++ b/configure
-@@ -647,15 +647,6 @@ if test ! -x "${CC}"; then
- fi
- assert "$CC" "not found"
- 
--printf "Finding suitable archiver........"
--if test ! -x "${AR}"; then
--	AR=`pathsearch "${AR:-ar}"`
--	if test -z "$AR" -o ! -x "$AR"; then
--		AR=`pathsearch "${AR:-ar}"`
--	fi
--fi
--assert "$AR" "not found"
--
- cat << EOF > .1.c
- #include <stdio.h>
- int main(void) {
-@@ -736,6 +727,17 @@ else
- 	assert "" "unknown compiler"
- fi
- 
-+printf "Finding suitable archiver........"
-+if test ! -x "${AR}"; then
-+	AR=`pathsearch "${AR:-ar}"`
-+	if test -z "$AR" -o ! -x "$AR"; then
-+		AR=`pathsearch "${AR:-ar}"`
-+	else
-+		echo "success [$AR]"
-+	fi
-+fi
-+assert "$AR" "not found"
-+
- printf "Detecting VMA bits..............."
- VMA="unknown"
- if test "$VMA_BITS" = "unknown"; then
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
deleted file mode 100644
index 77e63e3de7ef..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001
-From: Samy Al Bahra <sbahra@backtrace.io>
-Date: Tue, 29 Oct 2019 17:30:09 -0400
-Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid.
-
-glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/).
-gettid will clash with the glibc-provided symbol. Remove the
-macro and instead move to a dedicated namespace.
-
-We go this route to avoid introducing unnecessary complexity to
-build.
-
-Fixes #147
----
- regressions/common.h | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/regressions/common.h b/regressions/common.h
-index 6e53483d..9cdc690a 100644
---- a/regressions/common.h
-+++ b/regressions/common.h
-@@ -267,13 +267,11 @@ struct affinity {
- #define AFFINITY_INITIALIZER {0, 0}
- 
- #ifdef __linux__
--#ifndef gettid
- static pid_t
--gettid(void)
-+common_gettid(void)
- {
- 	return syscall(__NR_gettid);
- }
--#endif /* gettid */
- 
- CK_CC_UNUSED static int
- aff_iterate(struct affinity *acb)
-@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb)
- 	CPU_ZERO(&s);
- 	CPU_SET(c % CORES, &s);
- 
--	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
-+	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
- 		perror("WARNING: Could not affine thread");
- 	
-         return 0;
-@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core)
- 	CPU_ZERO(&s);
- 	CPU_SET((*core) % CORES, &s);
- 
--	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
-+	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
- 		perror("WARNING: Could not affine thread");
- 	
-         return 0;
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
deleted file mode 100644
index 62477f9acf6c..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cb63256ae2e5fde7a67d7740bb2f4a0eab538a2d Mon Sep 17 00:00:00 2001
-From: Samy Al Bahra <sbahra@backtrace.io>
-Date: Thu, 9 Apr 2020 20:08:40 -0400
-Subject: [PATCH] build: allow GZIP to be set to empty string in configure.
-
----
- configure | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/configure b/configure
-index 2cbdbef3..ed188f96 100755
---- a/configure
-+++ b/configure
-@@ -325,7 +325,7 @@ done
- HEADERS=${HEADERS:-"${PREFIX}/include"}
- LIBRARY=${LIBRARY:-"${PREFIX}/lib"}
- MANDIR=${MANDIR:-"${PREFIX}/share/man"}
--GZIP=${GZIP:-"gzip -c"}
-+GZIP=${GZIP-"gzip -c"}
- POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
- DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
- PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
-@@ -583,21 +583,26 @@ else
- 	echo "success [$BUILD_DIR]"
- fi
- 
--printf "Finding gzip tool................"
--GZIP=`pathsearch "${GZIP:-gzip}"`
--if test -z "$GZIP" -o ! -x "$GZIP"; then
-+if test -n "$GZIP"; then
-+	printf "Finding gzip tool................"
- 	GZIP=`pathsearch "${GZIP:-gzip}"`
--	GZIP="$GZIP"
-+	if test -z "$GZIP" -o ! -x "$GZIP"; then
-+		GZIP=`pathsearch "${GZIP:-gzip}"`
-+		GZIP="$GZIP"
-+	fi
-+
-+	if test -z "$GZIP"; then
-+		echo "not found"
-+	else
-+		echo "success [$GZIP]"
-+		GZIP="$GZIP -c"
-+		GZIP_SUFFIX=".gz"
-+	fi
- fi
- 
- if test -z "$GZIP"; then
--	echo "not found"
- 	GZIP=cat
- 	GZIP_SUFFIX=""
--else
--	echo "success [$GZIP]"
--	GZIP="$GZIP -c"
--	GZIP_SUFFIX=".gz"
- fi
- 
- printf "Finding suitable compiler........"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
deleted file mode 100644
index 3e1d080a5f4d..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/configure b/configure
-index 7853533..4e1ee9d 100755
---- a/configure
-+++ b/configure
-@@ -119,6 +119,7 @@ generate()
- 	    -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g"			\
- 	    -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g"	\
- 	    -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g"		\
-+	    -e "s#@DISABLE_STATIC@#$DISABLE_STATIC#g"		\
- 	    -e "s#@SSE_DISABLE@#$SSE_DISABLE#g"			\
- 	    -e "s#@PPC32_LWSYNC_ENABLE@#$PPC32_LWSYNC_ENABLE#g"	\
- 	    -e "s#@RTM_ENABLE@#$RTM_ENABLE#g"			\
-@@ -156,6 +157,7 @@ generate_stdout()
- 	echo "    LDNAME_VERSION = $LDNAME_VERSION"
- 	echo "      LDNAME_MAJOR = $LDNAME_MAJOR"
- 	echo "           LDFLAGS = $LDFLAGS"
-+	echo "        STATIC_LIB = $DISABLE_STATIC"
- 	echo "              GZIP = $GZIP"
- 	echo "             CORES = $CORES"
- 	echo "      POINTER_PACK = $POINTER_PACK_ENABLE"
-@@ -205,6 +207,7 @@ for option; do
- 		echo "  --platform=N             Force the platform type, instead of relying on autodetection"
- 		echo "  --use-cc-builtins        Use the compiler atomic builtin functions, instead of the CK implementation"
- 		echo "  --disable-double         Don't generate any of the functions using the \"double\" type"
-+		echo "  --disable-static         Don't compile a static version of the ck lib"
- 		echo
- 		echo "The following options will affect specific platform-dependent generated code."
- 		echo "  --disable-sse            Do not use any SSE instructions (x86)"
-@@ -293,6 +296,9 @@ for option; do
- 	--disable-double)
- 		DISABLE_DOUBLE="CK_PR_DISABLE_DOUBLE"
- 		;;
-+	--disable-static)
-+		DISABLE_STATIC=1
-+		;;
- 	--platform=*)
- 		PLATFORM=$value
- 		;;
-@@ -330,6 +336,7 @@ MANDIR=${MANDIR:-"${PREFIX}/share/man"}
- GZIP=${GZIP-"gzip -c"}
- POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
- DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
-+DISABLE_STATIC=${DISABLE_STATIC:-"0"}
- PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
- RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"}
- SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"}
-@@ -717,13 +724,24 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER"
- 	if test "$WANT_PIC" = "yes"; then
- 		LDFLAGS="$LDFLAGS -shared -fPIC"
- 		CFLAGS="$CFLAGS -fPIC"
--		ALL_LIBS="libck.so libck.a"
--		INSTALL_LIBS="install-so install-lib"
-+
-+		if [ "$DISABLE_STATIC" -eq 1 ]; then
-+			ALL_LIBS="libck.so"
-+			INSTALL_LIBS="install-so"
-+		else
-+			ALL_LIBS="libck.so libck.a"
-+			INSTALL_LIBS="install-so install-lib"
-+		fi
- 	else
- 		LDFLAGS="$LDFLAGS -fno-PIC"
- 		CFLAGS="$CFLAGS -fno-PIC"
--		ALL_LIBS="libck.a"
--		INSTALL_LIBS="install-lib"
-+		if [ "$DISABLE_STATIC" -eq 1 ]; then
-+			echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2
-+			exit $EXIT_FAILURE
-+		else
-+			ALL_LIBS="libck.a"
-+			INSTALL_LIBS="install-lib"
-+		fi
- 	fi
- 
- 	CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses $CFLAGS"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
deleted file mode 100644
index 4d29c6bcf7eb..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 07835a3d08d96db30393c235f95649e792883d50 Mon Sep 17 00:00:00 2001
-From: Samy Al Bahra <sbahra@backtrace.io>
-Date: Mon, 30 Nov 2020 18:33:51 -0500
-Subject: [PATCH] regressions/ck_hp_fifo: fixes false-positive from #165.
-
-Add busy-wait barrier before next stage of test. Otherwise,
-some threads may enter it and a non-empty queue state is observed.
----
- regressions/ck_hp/validate/ck_hp_fifo.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/regressions/ck_hp/validate/ck_hp_fifo.c b/regressions/ck_hp/validate/ck_hp_fifo.c
-index 4454283c..5820f1aa 100644
---- a/regressions/ck_hp/validate/ck_hp_fifo.c
-+++ b/regressions/ck_hp/validate/ck_hp_fifo.c
-@@ -55,6 +55,7 @@ static struct affinity a;
- static int size;
- static unsigned int barrier;
- static unsigned int e_barrier;
-+static unsigned int s_barrier;
- 
- static void *
- test(void *c)
-@@ -98,6 +99,9 @@ test(void *c)
- 		}
- 	}
- 
-+	ck_pr_inc_uint(&s_barrier);
-+	while (ck_pr_load_uint(&s_barrier) < (unsigned int)nthr);
-+
- 	for (i = 0; i < ITERATIONS; i++) {
- 		for (j = 0; j < size; j++) {
- 			fifo_entry = malloc(sizeof(ck_hp_fifo_entry_t));
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index c767271077ab..7c92d63a902e 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8241 BLAKE2B 208f26a90e6bbb2492346ded6188249f51ab13648be74c90861edd96624b02fc50e28447630d307fde95bed627909444afb34389eb3b99f89487e9c785036709 SHA512 ac67964d83e52718ee48a4e03a0c5f2fd60ff3527b87ea708cbaaae333b0f4c8885b7d9956c1d0ee036c20275a97034db7e849d1b31002beca6705d2faa2c0e6
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8248 BLAKE2B 722c8a1cca513249de2f055a6772d407972bfa3a866698c0a66c0240c85b0c4f507ce96286bf6c47871190c28bebe5f93a63977509ff03c66f035d7d3be9f95a SHA512 04f897526821ed6630b47b48d7c879cc70296ef445febaff254c5873611f989b3ce95fe81b3827a10b204e4b1e96c1e333c09f0fda6edab11cdb45616392cf81
 MISC metadata.xml 720 BLAKE2B 47731fefd662b4ede2aa37d2eb8ad4dc8cc58c31d2cafd4127f06276023e9f3c9379a780a9b6f064c05f3b8974cf8e389ee9c5ccf85c3d856dcf60b6eb8d5f59 SHA512 4a08ed3009ae32519bc78f4f84f8f50cd04b2ba48afde0528374b38e64f2e4d7d93f6bce97476e9871ba68d18f26f18a00002ccf22d06e8eb1bb9ea4d4dabe1b
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 6da4c0add450..dc7832f55a9c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest
index 06ef2cea6989..2d6266574265 100644
--- a/dev-libs/distorm3/Manifest
+++ b/dev-libs/distorm3/Manifest
@@ -1,4 +1,4 @@
 AUX distorm3-3.5.2-under.patch 216 BLAKE2B 771f718b28623bd41d9ae967dc2f5d17fd575502e250b0b4f24a5b07aa5acbdf9d9b75ea630df57c087eb10a3aa60743f28cb09e5f1a92accdffb1d9df8af555 SHA512 577f7cea69ce350087095821c602f46db9061e0c3b4440fe8f6fa103bd1f42b7ac5a5b118b0493301b877cd91c0a203c4b6a0299529822552b0bd7bca5779f53
 DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19
 EBUILD distorm3-3.5.2.ebuild 969 BLAKE2B 25faea3df10f5f326138125ea5af93168b59621b5761c566d52ebc7beaa2481bf88894947e46d2d34336561c7446e25917cb9cde8343d6fc704375ae16f93c8c SHA512 99b39728dfca121e273ef4ce823ed2c38fee1ed4254142cc771270ac7c68ee079f090f4a27c2f6769ef6a26091f7fa702d688fd932ca195fcdef32d42670370d
-MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
+MISC metadata.xml 429 BLAKE2B 1a1e251c503dc4be576d247a36e86a4d96c487ab6a3ab04695141362eb6ca2a1596501e015a200e5e75672088e76a7d543162b835514141fcfde65fc0d7214d1 SHA512 da10fe9d288f335ddb6d6d0bf71707cb1d0a53e8f941729f3218d00e233df8ffa813ab2dd8ab47059cc4f4d7c2466994a2ebd66924f15ae7035af5a94b179d7f
diff --git a/dev-libs/distorm3/metadata.xml b/dev-libs/distorm3/metadata.xml
index a490a1ed469a..8e8737d4ce46 100644
--- a/dev-libs/distorm3/metadata.xml
+++ b/dev-libs/distorm3/metadata.xml
@@ -9,10 +9,6 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">gdabah/distorm</remote-id>
 	</upstream>
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index cec808917612..67fb6c2b4868 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,3 @@
 DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
-EBUILD imath-3.0.1.ebuild 2002 BLAKE2B 727e5c820b511d6f60995ac402fa9e12ce880b7e3b5731cc60ae8763f3a69de18dd25939db31e7b503b43e0271fcbb73cf84003b39687fadb229f8b45e236520 SHA512 9ffc3c6042e52db7c5747dcfbd441edffa394a0d79ea181b0b54017d5a6f2abaf813267c0f975650d3b6208b46c6eece209fabb334721251fcf6418ff4a7cb6b
+EBUILD imath-3.0.1.ebuild 2008 BLAKE2B b95179dd478f19d9456714f84a06662ad9d3e1226522d5501d3674cc318a76390800d417c78766e27e3493b954622156e845bcac82f8aa449c2bc868dad29ecb SHA512 ebe839ef65e17c70827862abe7ba85391a3549c567fd0f6899cf7cf2f87e3c8929b6d510fed77b9d4d08618cf4f606dc13353615a2e6f9463f8030b6819a4f69
 MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/imath-3.0.1.ebuild b/dev-libs/imath/imath-3.0.1.ebuild
index 5a251808c673..f4401e61cfca 100644
--- a/dev-libs/imath/imath-3.0.1.ebuild
+++ b/dev-libs/imath/imath-3.0.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords):
 # ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index b5859e9c0c25..49520587fa9f 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,13 +1,8 @@
 AUX kpathsea.conf 36 BLAKE2B 5f3ea92946c78a2a4aa336aa38783cf894859e368ec2437facdb9a814ba258097831166df15afc412d6df3fd6639fbca8f2c2f33efa5d69fde75090a9fc7dd3b SHA512 4221eda451499869a3b9b6b5c07e6866df963368481c7169645e0923f674ce6aa7bd9411303bb087fe55d99eea8b187b2a978c9f9ba0e40802f1863268566e28
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
-DIST kpathsea-texmf.d-10.tar.xz 12784 BLAKE2B fcd9b46504c58da90babcbd1e5d4ea655d3cb85f4be0a7430da62758f9b11e68219adcafab9ae26756f3f9dfa97b460db3e8b8b1a27560d2f3a91e612336dc75 SHA512 f2cc6a1bbc7be463877fd57d5351fb9e7bda472f1094f93a6962e14f9d71067cdae87464b615818341728c9fbd32e67f060dc09a3590353715fbc31fe64f93ef
 DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f69519428973fad5b7a734eec269b3cc89fc2ae527a459b4ae4d966a3394d6a95f40fac16841f59f9f6cabf2a07dcdcb98a14cba9 SHA512 eec72ecc35edd47bd9a5762f0d06212e4625eea1ee2ffc36f93885b548ca6c4e0eb65345a1ec050f3f838aed5128bb32eda509b5aadbad6643469b4955441f22
-DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-DIST tl-kpathsea-2020.tar.xz 32324 BLAKE2B bf4365d3ae47ce5344916d6622d40c121a34e722d166c983224f356c75d1b3e10216182ee79a76cf1dc703741e5302d8b427215a72af3060bae05b698ac0c316 SHA512 53887f73784f96528081bf9ce39fdaff3c94b2af1827cc2da7abddf2821c86c45f014ddcb624b24ed6265b7de25132dd106040f736fea180c122c9026f6cd101
 DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575
-DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
-EBUILD kpathsea-6.3.2_p20200406.ebuild 3297 BLAKE2B 77daa60068d648efb1b1c3020d9b78446ee588f478c4f2feb2750b1798d0e18bcb6633c33a75d953879ffc0c0dc1f3f6ef2955bafbd3403b8658a70dcf4bf2d5 SHA512 6ffe280320825ec0228cefcd822347b8f80f70a864b27a777c6615697ed4c11e4dae1e81d6f7dce1c085abd12dfd479c807d7c2358fed6b02b2ab4a81a5db8bc
-EBUILD kpathsea-6.3.3_p20210325.ebuild 3310 BLAKE2B 1076c000da7bd16e06b2c3ae8f30b35e4db70bea99a33101d8bd691bf89b79936f1fa89788aa77d46f7a3b410e6d1f9764b57a86be0f480f9056f97d868a37ae SHA512 34d099988c6f36c5d2c255cd04c7c9e9abaa2313f259b55e28170280ad1e473d4a2c05c794ff5ad62e816cdbb16ce965d2ea1935fcc1a5f3006c5185245d5504
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3317 BLAKE2B addcbb537c136fd153fa0ea9f65806faa4e1ccc5afb2adad8d9f1276f629e436d3560663326b9957fb42630068c4cfcfa1b1d8c33579985ef308d209bb4a2854 SHA512 b826a5d2c10b5fe9ec947a7d936614062f5a65d3952b5ec58dd0d8036ac8246b64bccfd396dc4b98f0989a1de13f074bb1a20dafdf05ded539b3ece363f52154
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
deleted file mode 100644
index e3494ced7f73..000000000000
--- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit texlive-common libtool prefix tmpfiles
-
-TEXMFD_VERSION="10"
-
-DESCRIPTION="Path searching library for TeX-related files"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz
-	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source static-libs"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-TL_VERSION=2020
-EXTRA_TL_MODULES="kpathsea"
-EXTRA_TL_DOC_MODULES="kpathsea.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-src_prepare() {
-	default
-	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize
-	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update || die
-	eprefixify "${S}"/texmf-update
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #347798
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable largefile because it seems to cause problems on big endian 32 bits
-	# systems...
-	econf \
-		--disable-largefile \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
-	find "${D}" -name '*.la' -delete || die
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	# The default configuration expects it to be world writable, bug #266680
-	# People can still change it with texconfig though.
-	dotmpfiles "${FILESDIR}"/kpathsea.conf
-
-	# Take care of fmtutil.cnf and texmf.cnf
-	dodir /etc/texmf/{fmtutil.d,texmf.d}
-
-	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
-	# texmf.cnf
-	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
-
-	insinto /etc/texmf/texmf.d
-	doins "${WORKDIR}/texmf.d/"*.cnf
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-
-	dosym ../../../../etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
-	dosym ../../../../etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
-
-	newsbin "${S}/texmf-update" texmf-update
-
-	# Keep it as that's where the formats will go
-	keepdir /var/lib/texmf
-
-	dodoc ChangeLog NEWS PROJECTS README
-}
-
-pkg_postinst() {
-	tmpfiles_process "${FILESDIR}"/kpathsea.conf
-
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
index fa2ca0b061d3..82053a77e2e6 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 5677ee068429..8eaf60b57bd4 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r3.ebuild 1425 BLAKE2B bdb7b1506adaba7a2c21cc746ca3655dbc327d5bfff197c022df5a845907e4e46380257b5d6abcf22bdd156cef606c689e532fc74ada003dc1971c69778289c0 SHA512 6b3a6dc60cef1f96b5defb327bf2775ca439a68a4098a4ff030ab88a4d7db8f9bf07a4acdefc3bd5f4045c6379ddace377d877dbfaf1bcc693c58caa93c20095
+EBUILD libdaemon-0.14-r3.ebuild 1432 BLAKE2B b8ec451e92fe26d82c4124fa025cb1f6dc26eaeaf1eee0cc97dc8b8a696ff41f165d36cfc3ba75313a49eeb8eb7e6f375d47def70decce0df1a25bc62cad53e6 SHA512 1f23aad5a121eed4331f836a1b3748bc04df5697d0250f5e4e593e4757b7b2babe34836529ba4c6ba0b6975ad35ff987ec81900b7efd46692b1acf358e2ced37
 MISC metadata.xml 263 BLAKE2B ffc12ff3506230708339c526731fc41075c998b49a137ab20123d685a623bc7b1a1f235a3b3bd170c7761ff470a92fa8d7a4b5a5d12d0d9bc6bf487a39f5dd37 SHA512 0d09fd7f66692657dfa07da397338a22091bdca415b13d84b7fb7f21ceba2c3ecccc49144612b6a7c639ff802c01851e7120a62789397ec585c8db497a3ae692
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 62e9be489eca..9e21641bd3fa 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index a7d671abf520..b578529fd4f3 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,5 +1,5 @@
 DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B 4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412 SHA512 2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c
 DIST libedit-20210419-3.1.tar.gz 522387 BLAKE2B 265c7a10905120feb096d147279a9cf7296cf3b19e16ff4a683d7de11305c0d0c7a67fe8652c1b8f16cbaf3e09b7727987bb6839be4657eb41323c0220704969 SHA512 d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9
 EBUILD libedit-20210216.3.1.ebuild 1042 BLAKE2B 322abd1848d37ff9af698b84771f3a59394c513c4e6e05e9b8920f918c23a071d0e9c5d3762993b0c58e6cf91657081f8930cf745405a44859b3f5f125ab5a91 SHA512 5a7476007f620f676971050ae1e0620877e50039d119601386c9281b7b9118b2543fb64897daca5e3e6a525f91a056ac9d9bbee0ed4f2a5ad026c53accb759dd
-EBUILD libedit-20210419.3.1.ebuild 1050 BLAKE2B cdfe8dbc428f92ece8a36cd29630b8ba3237c13efff3fbdc9f7ccb189ba8b169ea4dd1f6639d0fba57b2b48233f6dd79480fa6b8a35f0acd25cede62b3a26865 SHA512 be908abb3e81a7c14383cd14369e98f8b24a45478d5073688adaf6245d6d827336715daf5db978eb87ba5ab6f24a7b7c30c5ce7740bb815a806658e7cb2142ac
+EBUILD libedit-20210419.3.1.ebuild 1045 BLAKE2B 3d7bfded4d0aa9d6482223c104e850c64abc7d60491c990bd3af0b56aab9fcae72881b169698079fb6910d0274e4f789ab2f1f581233b44b8b333dba051698bd SHA512 42e92251f8a05f187f0d72bbf90ef2cb65b67cee256d4b7162b3c12697e4c3b37179f2eccaf0706962755c7496248970819f82313fb11be6989bb891d74eee2a
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20210419.3.1.ebuild b/dev-libs/libedit/libedit-20210419.3.1.ebuild
index 0dd34927e935..3b8db36aeffd 100644
--- a/dev-libs/libedit/libedit-20210419.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20210419.3.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index 0fe672b446b2..acc4a549c98d 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f5826524659
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-compat-3.2.1-r3.ebuild 1578 BLAKE2B a598c484fd4c93fe5b3a41ccbfbc8af4f26b88d3528d016a47fafdf4fe057fb43a3d503249edce3ba15c0e4015b7a4c8c8b302d47cc995743d5198a6a9a0d912 SHA512 5847e6071169ed361876a30783e43c495a81dc89a7311ff04ab9b0a9678f767388026c758ce0c33fdbd9c234ab2c06d78e4c5612cb93ef6fb1fb60cdf3c2c6f4
-MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
+EBUILD libffi-compat-3.2.1-r3.ebuild 1578 BLAKE2B 1c703cf741a6486569641aa4236b4fad5af5c22b29da819dd5bb81d51273f3789ba7fd110d3dd1d329e8784b09f0cf5b19607fe42acc2520e5ba2ea98019e708 SHA512 b7f515de893e823e87a161a030951e69e8d15daaff7693083ff6ea9d00211fcdbe4443b263e61b69e683603fb43e453a9379996bb450f58a7b51a1afb63571ad
+MISC metadata.xml 1956 BLAKE2B 950088c8250c7ef8bdf87ab5ff06a04a2bd96cb39fad1c7a04f4bfef89ea06d75e38b389d3c4425a79c0663da4276b15803d6955cccdcd49c94238530ac75cb0 SHA512 bd173f87493e8100483813d27556ddb86214fcd8870412b0100562c66b02e01fff37dc68e9ada1aa2e5b68bf79b30dd02b1306ff408ed9dace5bfe765880a333
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 135b4dbf980d..179381df9723 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug pax_kernel test"
+IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
 
@@ -45,7 +45,7 @@ multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	econf \
 		--disable-static \
-		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable pax-kernel pax_emutramp) \
 		$(use_enable debug)
 }
 
diff --git a/dev-libs/libffi-compat/metadata.xml b/dev-libs/libffi-compat/metadata.xml
index 6e9a28c5ac88..1c295db12362 100644
--- a/dev-libs/libffi-compat/metadata.xml
+++ b/dev-libs/libffi-compat/metadata.xml
@@ -34,7 +34,7 @@
 		between the two languages.
 	</longdescription>
 	<use>
-		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 7a72a86070c9..17b09f2a8cb8 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r2.ebuild 2301 BLAKE2B dbc462fa7ac8a8591869c2d6a5f0bcf60d9431fd73b2eca3e14118afcc11beef021cd854a572ded04db91a7afad18d89488071ba09b540a3109add47e9e5d265 SHA512 ec3d62803ecde748bf13975aadc9130698dcb46fbeb698b7754f3cbe7f51c81fedc7240949265a9607830a62798b19e01b9e299081836ea7ab920746a7785284
-MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
+EBUILD libffi-3.3-r2.ebuild 2531 BLAKE2B 3641ea628b4739fc65860b02df30e911c03967fbdc9c29c0d3fae1af5e8ff80d2f47cbf4b316b7276695e3acfaaa7a61008e7970d17e714290437adac88dca0c SHA512 4bd62e770641663af4ffeb65a419015e83eb03ca7b5932102204de39cbf26ba15d3f7a64ca9de5270e9adf2ec2d97b172b215671f069739bd8c51249e631e2c2
+MISC metadata.xml 2036 BLAKE2B c2d14d6ad6b019f2d54fa03f5ad058799a334c4b9e868dd84dbe5aaed0fd1c5850a9ebb771f5de58a2c90d278b20e0806ed817b2cb53d330c55a36afde4984b8 SHA512 548ecd3eb1b46dce5c10a74cd8e32118c3424c56732473c9a897516ff82cb5aedb37cb2e52ebb780b643662afb7fc3241b55e40e2b147dbdf178d52561a6b369
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 3433babf3aec..40e5b2deafa4 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,9 +14,12 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug pax_kernel static-libs test"
+IUSE="debug pax-kernel pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
+# If you are USE=pax_kernel user you really want USE=pax-kernel as well.
+# That's a flag rename: https://archives.gentoo.org/gentoo-dev/message/273f5ec9ebc8075f6ee8d8cdda9e759e
+REQUIRED_USE="pax_kernel? ( pax-kernel )"
 
 RDEPEND=""
 DEPEND=""
@@ -65,7 +68,7 @@ multilib_src_configure() {
 		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
 		--disable-multi-os-directory \
 		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable pax-kernel pax_emutramp) \
 		$(use_enable debug)
 }
 
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 6e9a28c5ac88..85b52eeb3e01 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -34,7 +34,8 @@
 		between the two languages.
 	</longdescription>
 	<use>
-		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax_kernel">DEPRECATED alias for 'pax-kernel'. Do not use.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 34b1583390c9..bf9253f4dc23 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,8 +2,10 @@ AUX libfmt-8.0.0-no-udl-define.patch 1802 BLAKE2B 538a9dfe1dec002894db22536de91b
 DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
 DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
 DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c
+DIST libfmt-8.0.1.tar.gz 805616 BLAKE2B b64a4686050a9edb4e5d3ec28a3727a847105ae0b12a89461841e14d6c9c442e391cdcfbca39b2d141d04cdb10d00516ecc8bf605867c792b7d2d6bc99c7b2bc SHA512 643e68d5b2e0e9c83231ab2b0036596a6297b1d9ed6bd7b1172bee4ff134c8af8f09174c06c94225132c1b635b0977ea4ce783748d7bd76a9a0b5ad597456c84
 EBUILD libfmt-7.1.2.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1
-EBUILD libfmt-7.1.3.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
+EBUILD libfmt-7.1.3.ebuild 780 BLAKE2B af4b4c379a2bb637b4602566e46645160ae146f1d6e5f214432a0748eece82c7efcaad8e17796c85f18af7e83a58ea7d43cc654b5a6aaf48b594e6541263b090 SHA512 b81f85a21bc6fccf6970c81132d3c66cf349d186e1fe6041c6a9651463274fd5f33e6d6d5fe39b3fa2aaf4f1b3eb33af762e424030d2475e708a3c80f082f580
 EBUILD libfmt-8.0.0-r1.ebuild 837 BLAKE2B 40ccd08531ed4834cd9b5489a623775a7770e2ef6ede4431d4ee45376f03895e5f1c6e40d9f4204b9368851f9e8d6620dc1c61e5e290d73bd5a3e17e6720f4c7 SHA512 35a204cd36f3b08d328b20c5da367826ce2d27647a19563fc540561226d75bc68c29c9352ea526062c2088010cc02a747fef26e619f554496649e0b140055926
+EBUILD libfmt-8.0.1.ebuild 784 BLAKE2B 1405718d1de07117ec8c9b723680ad1db44cda944190c102dfcb267b6d2d56b37f397474114dfbf87774b07aff75b275b8434840435998821e30c87c8243ec1d SHA512 67d30c62fc949b0b5883281a5727e881e0bd55d29aadfcc455e5174633721ad8e09d816743ec35985eb0ccf288da8655870b45a85c19ce3aa079ba1a471e3d34
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-7.1.3.ebuild b/dev-libs/libfmt/libfmt-7.1.3.ebuild
index 376757b05ade..da84550b5591 100644
--- a/dev-libs/libfmt/libfmt-7.1.3.ebuild
+++ b/dev-libs/libfmt/libfmt-7.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfmt/libfmt-8.0.1.ebuild b/dev-libs/libfmt/libfmt-8.0.1.ebuild
new file mode 100644
index 000000000000..40d16db5117d
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-8.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 0321715d20be..039ff5e1dddb 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,5 @@
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
+DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc
 EBUILD libgit2-1.1.0-r2.ebuild 1661 BLAKE2B 1acd45d3b5aa96e3f7cfb75baed1137a7fbc6ddfaa42d5703e9890a191c4505f4dce87a3fb1f331454d136fcb46db7178436c8820cd7b7ea5e7b2812960d1ce8 SHA512 45ed2fab7ab54597e186def3362ec90c3318859fdc86f203a822e74214bf84275358b359bdf997eaa3e23c02cd014e15b093035ad8470202d93c86fa8c202402
+EBUILD libgit2-1.1.1.ebuild 1678 BLAKE2B 2134014e490abe81e4574141765852c2cddddd9c5da3842e4c25e5f7f76318b072704ea4458a5896b609542a92ba9bf70cf636948aa6dc78594ca50f42b8751f SHA512 a891d085eb8cc2081569c7d0813c3ef8b7b40708126990ed42034a43e7feac3116883747fdc062d51246563a17fc0f23b46576e56a5322c73e22a40f028e1f56
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.1.ebuild b/dev-libs/libgit2/libgit2-1.1.1.ebuild
new file mode 100644
index 000000000000..949a6c1dbb73
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 92e15cf16c3e..573719de6143 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,6 +1,4 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
-DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
 DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
-EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
-EBUILD libmateweather-1.24.1.ebuild 854 BLAKE2B 6247e97b1ed42648cf549413e14ec9dcc850113d53b9de2ef580b4e176aeb7f6962a142ca3ea043a2f3e859a47610b2ba29408c30eae7ac37d92c4dc8dd5e221 SHA512 1548840faddf35b77677bd30b50abcf4cdfd525d066a24eb0210d27e45c859156344e6d67a38d2acb265bf8498a767123ae63b62a43844ca6a401444fd5ff9d9
+EBUILD libmateweather-1.24.1.ebuild 852 BLAKE2B 188d06090c68f8550f57994fb90d3127baeb91aa631fb9be35ac64e7b501190c38f6d55a6a3020a3389011d43ec0b4deeea2b108ec74aecca372fd14154e841c SHA512 3dfafd7cf927ac8f0ab3e7475881afb568d5017712ebbfb33bd2e3a8cd8c64f7f4002a9ab588d966e35af19b3f7de8aa99335c530bef316e0f15bc9e1130b386
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
deleted file mode 100644
index 5ab0dbf7fd5a..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit eapi7-ver mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.54:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*
-"
-
-PATCHES=()
-
-src_prepare() {
-	local tz_ver=$(best_version sys-libs/timezone-data)
-	tz_ver=${tz_ver#sys-libs/timezone-data-}
-	if $(ver_test "${tz_ver}" -ge "2020a" ); then
-		PATCHES+=( "${FILESDIR}/${P}-fix-tzdata-hints.patch" )
-	fi
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
index 2b91243ec874..822b01df8e45 100644
--- a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmoe/Manifest b/dev-libs/libmoe/Manifest
index b66c8f642557..6702fbb8a310 100644
--- a/dev-libs/libmoe/Manifest
+++ b/dev-libs/libmoe/Manifest
@@ -1,5 +1,5 @@
 AUX libmoe-gcc-5.patch 1778 BLAKE2B cda472b2659b12d2225f0064a81ba4aadaf0eeb1ef9c86666d335a6e64120179156dd421ba0e9574c32a706ea710d48033d8627f84cbb184643123265319c6d2 SHA512 f4eff3250af69aa6751ac953047ef23275e7d5f39c4b850f4f7637e17c8cbe85c7146c3aa7412bbdc089ae787b2a49c72b0afc321bef523efd27bbf1784ff447
 AUX libmoe-gentoo.patch 914 BLAKE2B 9d1c4dd7ef5f0fb6153673187948a0825a98fa2e5b7e38743f4518835775be406561f7263eb18d59ccdced328c6426cc810ed17d1c30be76daba92700e961b8f SHA512 a334503d845c2f3c61b2c8cbff966073dcf2b017f00de550f8c024dfe0d4a92ed85f2d065017fd84dda19970cd42b860ae61ddab72b284459edaf61990df640e
 DIST libmoe-1.5.8.tar.gz 1559398 BLAKE2B 14b167d4ee56fd4e448fb7fe006bd0b66c7fbb7709bfe5d124ec7010f1ae087511934e2ce0cd9d3e3360aad6ae096f56b7dc04643edd08fbecfdc2ca2572ca31 SHA512 937e7e0f1d562c5ea1f93ec755d6125f389cffaa2989b4ec4c1c1b42fab927f1884e1dab2c65e1487f4d9fdb0f9ed306a7d32e13e8b24302837a9e7b5634449b
-EBUILD libmoe-1.5.8-r3.ebuild 1073 BLAKE2B 6f0a5a0b6af81f0ca02490b22bc15e430993255f05958b8007be95171a60ec8fb63461ce44a1d4712f1f6538903d043fcfd963e1bdd92044eda424630909004b SHA512 b5d1e9f0a56893f1ecb02ae961bb29f7ba8fa4fa49228e42e8d6eccd22397deae31aae9c99569feb4fabd321aa4262a09837acfe006134ab23460e20c1e9120d
+EBUILD libmoe-1.5.8-r3.ebuild 1080 BLAKE2B c26b67b5f58d58c735b3bc60541b5399902965cf3ef342419c6f0748f3d2c08aa2398f66db7697844f30ada1757dda49c3a94eeaa136c48c970d29b095936625 SHA512 122396476cca3ad459118b172f9409f5fe505a104e03792654e220709ad7e925518e5b8bc90288078e0b76dd714aa75b30c53be0e066dd7d43ba05ac54b5582a
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
index 7d1017ce991b..edda95d992a4 100644
--- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-lang/perl"
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 81a6286d0665..e07742ea01a8 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -2,5 +2,5 @@ AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d
 AUX libnatspec-0.3.0-bashisms.patch 516 BLAKE2B 16bcea9de6c577400bc5e4e5db89fb5f8456270198eb07b2e79434a20cc763a92e708e57983360af6b1ee5e7bb5d259fed0a08b94048cc4ae52b479ba82af839 SHA512 0d0c968a4523cdd9b25fd0129e5f2dbc4561a7e268146910312c9a4a4982f456aecd1eded939bb367c8eef6aad83c487fa4ca8f94a8b718481b998c0c8bcbb87
 AUX libnatspec-0.3.0-doxygen.patch 804 BLAKE2B 6ed20412605783845fd1fed4f8461535b25bcac6f49b8c9bccaae52e3b83184763b313fa050a349fa4f73b1dff6374c0361d370dacf84d90963613f2e92b8524 SHA512 fd68c998fcb5f359b8c10a0f37d8408b28545bb9f1bdc3e4b9b5f8f68066a0705dcdd776329585bbe5b372fc64b2205470c7bfdb60a215bd7d4d563c78e65318
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.3.0.ebuild 935 BLAKE2B f8908766eb137b26c61af13f38a5dbc1a748c6bd67dbf9495873eadb9424dfd9ae3839e50b149ee7da6d85c684387c423d62386d0aba809b9c261246306fc7f4 SHA512 63022f4e7fe8962126f21f0f61295ffed1484384c9dc056abf2c7cec84bf9b825c2e39c011495a61ecbe21f53a60a71516ea4e943e1486b24ca4ee925a6f7676
+EBUILD libnatspec-0.3.0.ebuild 942 BLAKE2B e929ff809f1970926ec0fe9cf27aa4e52f5d62c1f5d738f2ea0b535633856c34b7fa60038b48a8fad75c639a76cab96d5b8434cdfd618861d25a4b70eccd72f0 SHA512 9299816b272928236e0f34efa6bcfa4160a6b45dc2ba2b6437f33731b61335c2649d8b1088a714e38eebbcd2f7727661d496e99e226a2f366a6c28c13f02c726
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 02e0a60d3cb2..0a083fa961ed 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/popt"
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 26f8b0b072fb..815cff0e7bd8 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,5 @@
 DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
 DIST libretls-3.3.3.tar.gz 434208 BLAKE2B 74dd3d4e0a1aff8295b4c5023c2736006c2a8a0dab1e82457c5ec9d4c27ae57816557810b3a714bb5bbb9a560eb0dd5667af1097f1727878b1844a3e8bfa4323 SHA512 21128107ce833690f43400b11c2a841373bbe1f045a6db5ad6cbcbee181ddf97c173bb05ba41805ee0324d7435a52ad3027551f20083df9a3d052956a412bccd
 EBUILD libretls-3.3.1-r1.ebuild 661 BLAKE2B 9006ca31c4da0b05a40d756fe1b186bb956eee04fa2c6ea18992e2c6d9a683b38cdbf37c843ce1b8b5926fea97a97d9335794433d2ff37fc5083626f5e3136fb SHA512 2083dd6887e881a88ced7991b065f405f422429a5d68baf1879abf83c4d2027af12d9db2b14863d63199edbcd5c73127e4c063b846f273689c569712eef00a6f
-EBUILD libretls-3.3.3.ebuild 666 BLAKE2B be3cf83d03c882f096a7ada66fad4bbe4510552d2d4913891f46f6b4ae2a11e95ad7389115a9c36d6d73f85ef520d0af33cfaabd3be0a1dbacb4e62c2538beb8 SHA512 30c8f0c9c12b2f20e7e1d0f2455796d90e911a5439f3f9da07f43a9681cc794969af468aca4da10c150e5f628eeafff436bb9282eec37a6fae72e509123c75e7
+EBUILD libretls-3.3.3.ebuild 661 BLAKE2B 74ae9f410750b3ac22c73364171e77e865e09c9f5ac7f949e1fb0d74124adb28879b8c2f363ef2684adea93f6e10bfe4f0b857cecf504dd86c3b4e239f74dcbd SHA512 c4af5d12c736b1e9216e7b46bc3246215b52646eb2e106276b59ebf1cbc78d30083e854022d7bc876c7fed9c99f1b80567d246215ed7942ffab19e746151455b
 MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.3.ebuild b/dev-libs/libretls/libretls-3.3.3.ebuild
index 1611d59e200f..4f9e2ed51ec5 100644
--- a/dev-libs/libretls/libretls-3.3.3.ebuild
+++ b/dev-libs/libretls/libretls-3.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 400eea29ce87..b3d661416ecf 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,9 +1,5 @@
-DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd7161762456a44f6532462e4514851e6298ade881b61c3d02175a7029b43358e94ebdad558aa82d8210600e35b9a32e30 SHA512 5d3d9f80b53baa3aeaf359d4b3c0eeec265177e47bf11bf2c5bcebf23d339e481eaa14a1ea7f5f686c9c7477fd607095c77d85399df479d297cc5bde1086535f
-DIST libzia-4.27.tar.gz 632660 BLAKE2B 2769e24b628731c4363437513358d7de9a8eca2a49580de2b8b0a791692ef17adc696c984db202e1f7015edd5d5259dd6dc4e9a057e8267b510051aa70a4bf20 SHA512 5022569931a820cfd2c0e76b26021bf07a7c55f77872786b5907c7201be9da1a2d6d653eec3cdb9f504ce43d54207478eab38eaf697ae9dd42f17c3dce6666f5
 DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
 DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
-EBUILD libzia-4.25.ebuild 972 BLAKE2B ea9965bdd007de4a2ec0f7a465b47364fa3ad4c9284373ab326ac8a8e1ef865e150a2ee3e0b0a77aae49b5369d8de69afecda965585d35cc7aca13130896e72c SHA512 82e01a11610e1db6cde670f892dfc45a13bd88318b969c2800b8f769df017c85d696fd62eab8d2cf8c692ea59e9799799fbc4152a4cc6d8994113c93ee90c318
-EBUILD libzia-4.27.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
 EBUILD libzia-4.28.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 EBUILD libzia-4.29.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.25.ebuild b/dev-libs/libzia/libzia-4.25.ebuild
deleted file mode 100644
index d203a987c0e0..000000000000
--- a/dev-libs/libzia/libzia-4.25.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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/libzia/libzia-4.27.ebuild b/dev-libs/libzia/libzia-4.27.ebuild
deleted file mode 100644
index b085977f4099..000000000000
--- a/dev-libs/libzia/libzia-4.27.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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/nss/Manifest b/dev-libs/nss/Manifest
index f504ad7f8e49..3f3e77c032aa 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -9,5 +9,5 @@ DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d049067
 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 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
+EBUILD nss-3.67.ebuild 9237 BLAKE2B bc0ef88598f5eb481470668e32364f71b44ea23c69457a4ad9b5de894d2e0a8632b16de2cea8d233912c7da5c87995224044a7e08b416fde0ac1dc41abd0cf12 SHA512 c38fc9ccf18a4ea0fe7409e1839713b9fe0f95f3b7bf49d7915aa30fa07155c89a275cb914dd852d788e1c6a43026cefd019b535a82a3b857d7e52dd79d50f63
 MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/nss-3.67.ebuild b/dev-libs/nss/nss-3.67.ebuild
index 200e2c3b7bf9..ef875241a2fc 100644
--- a/dev-libs/nss/nss-3.67.ebuild
+++ b/dev-libs/nss/nss-3.67.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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="
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 5ad8d4a12982..9d28e7b7a7ce 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -18,6 +18,6 @@ EBUILD protobuf-3.16.0.ebuild 3756 BLAKE2B df0ebf61c08a5dbb4fdeace2bfd04d1fa9929
 EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
-EBUILD protobuf-3.17.3.ebuild 3763 BLAKE2B 5a298b10e9fb72878982a162f76f78cd958adca0dd8af7f4eafa6c7814b3564a11110aba7345f6a167a196a8f54b1f793bc0622d63ee34c58e220ac84322c927 SHA512 4859760a2d4bfe3b3d01d616c462bc50dcaf431f0f3dcd9f11717e10a77f78d5383b264e5ac5d1cb3e46d9694204490ff09590132b30b1dccfb46363cfe05450
+EBUILD protobuf-3.17.3.ebuild 3758 BLAKE2B 52f79b4404158d6c44501ac037bd82586c875546d655fa89a3ae4814b2199fa9272aaf1a387c11bbd4e2c5c8c23a2d8ca49e21303bbf8ce2c33266caff4342e7 SHA512 833f4de913031dd9afec45a3cab20d5e1f9eb86b7dd802a2cbb5ed8cb21957f8e68450cb7939bb6b11c093a5dc77fbb41b2c32b3b10003e35b7730580c0e93e4
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 194e9d88477eb97f57cb544d733c61661bcd2fbcdb9cd1c1353ba1b9fd1c22de8e3ea291cd5f9bfbdac939afa316c6ca2888a2fc790d5f1113a2c416d9f3a3ed SHA512 c55a151753fe1b845d5566999064640fb3ccea13c222b37e4563eeaa8c09788ee74bb89407f4d68d17288d40ae0fd5761ad556989e8d2803c9317c7626ad24e4
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
index 85c77d0ccf7f..e88b52bf1197 100644
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 629d11c29eb9..4704d6970d19 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,3 @@
-DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ptexenc-1.3.8_p20200406.ebuild 1309 BLAKE2B 0ae99cd71415c2f06d42137dc44d8a5ef23ee8bc11fb262056b6b3c4bb529f0f19a1272977fa6fc5cdc3f385661175c79e53803bd3d8ecbe508cfaae9d125e75 SHA512 07d7ea7e9cba8b47c86d1758d84c189f5a5c8b171de68f9f9383822bd8695dc2ef17f8ea39fa0ef6c1c65b5475c0f2100c0496f8a719f200e60c0adaeff9de01
-EBUILD ptexenc-1.3.9_p20210325.ebuild 1246 BLAKE2B c1ea0d72f61bed46649ab0c6e91f8447c235da3e57e789680d274927e4f7f225ebb794ebd3dff959e28b3786b8bf3ae5bbba5e02420e302a31843754cb3e5f33 SHA512 e2250cd30a429310f540f850ab14709064737bbbea0715c0ac00424b23dbbb968d6cc4126a94fdcb0e587932f1a9f7fbe93573e5d52aaf36a2b73aba3bd1c450
+EBUILD ptexenc-1.3.9_p20210325.ebuild 1253 BLAKE2B 880c9b6ff562377692f06d55de173bea84d3ad25e23aa15d13c440c3bd3f9508467f5e440e9ea61ec4f303ebe05199d7860e03027d0ec98b01261fdb15ed2ac0 SHA512 473243a90a9374247ab6d3dc53a45991bafd665fda786877a48b1b8624260dadfd0c68fdb60dddb3f6188f965f37176bef1c3dfd1f5a6e0fc37ddc527ab5ca7f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
deleted file mode 100644
index b55a38d5234a..000000000000
--- a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
-HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
-# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="iconv static-libs"
-
-DEPEND="iconv? ( virtual/libiconv )
-	dev-libs/kpathsea"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=377141
-	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
-
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
-}
-
-src_configure() {
-	econf \
-		--with-system-kpathsea \
-		$(use_enable static-libs static) \
-		$(use_enable iconv kanji-iconv)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /usr/include/ptexenc
-	doins ptexenc/unicode-jp.h
-	use iconv && doins ptexenc/kanjicnv.h
-
-	dodoc ChangeLog README
-}
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
index 48ca2a23a9b9..b14b9944d1e6 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index c15abb3646ba..bf7584e5f7e5 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,5 @@
 DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
 DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
 EBUILD re2-0.2021.04.01.ebuild 1345 BLAKE2B 895b1d92d1ed990d5cdc63041fe39e2fe3bd10cb7247e28a6461af5c170ea2215f5ffbd8dda0812443379de0f2131d5da2032a33240a3f210a72184b0f9c53bf SHA512 3f65ba7cb020840448c228a03973a387cbc282fb8e605f274321d7e60774dcf33d8e76e854eee9e1e716a428e89c49a748ec8a5b9673f1e605f9d08e1a5e86bd
-EBUILD re2-0.2021.06.01.ebuild 1356 BLAKE2B b32e1a35a9f775c330b7f43b5787e6381ee5eb5bd67287034d8d574510fa626ec9390fe536265bcdbbb58da1195da963432bf062616413cd0df88d7bb764dd62 SHA512 eb9e1cf9f22f47fcaac9cef7ffc3732b082d004c7aa49704dca92ec0fb2aa1b2ddf8e9c902fa0b0b319fbd158f9092c09105458081d45add816fe78765efc490
+EBUILD re2-0.2021.06.01.ebuild 1354 BLAKE2B fc633a6802bd9a8e022ee2411e299b5b9711d327906ce8934e1a960435e4d3652a4c1cbf189a6aaa0954192cc5591a618993f373539f52a9422af31a05e5b930 SHA512 4a3193dca6f6fa29055764efcf1aa23d6121f09fde0a265f2524ffe134afc845a537cc9a1bd5b6773caed224d25860ddec8034feda5c16bc3adb2d24c661abd7
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2021.06.01.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
index 61b3fb2cef81..79f4fce02bfe 100644
--- a/dev-libs/re2/re2-0.2021.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-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="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index d97c4b2e205d..170600789845 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -4,6 +4,7 @@ AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c
 AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
 AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf
+AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@@ -15,5 +16,5 @@ EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830a
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
 EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
 EBUILD rocm-opencl-runtime-4.1.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
-EBUILD rocm-opencl-runtime-4.2.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
+EBUILD rocm-opencl-runtime-4.2.0.ebuild 1796 BLAKE2B 493013e856298206f753e33891220313e106e37faccca7678a2668cff70e25e60f1a8c2b5455f533d28056c86c55c4e57fa1a0a4ff51679c137d73f96821ba99 SHA512 f5dafbe33a855287be71923f0eeb34dac309500af75b71ad8909628611a85d6e856308c4c179dc719a0fc9d0573a4083fe7f648da96306810d1dbd5d51391ad1
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch
new file mode 100644
index 000000000000..14191adb5d0c
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch
@@ -0,0 +1,65 @@
+See bug #789717.
+
+Once opencl-headers is upgraded to 3.0 or higher this package starts
+complaining left and right about missing header definitions for
+CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR.  The correct header for this
+definiton did move as of opencl-headers 3.0 so this makes some sense.
+(Actually I suspect there is a header-guard mismatch behind this problem).
+
+Most of this can be fixed by using -isystem instead of -I for the opencl
+headers. Although not terribly well documented, -isystem in lieu of -I
+comports with best practices for overriding 3rd-party header files in
+system include directories according to the gcc info pages.  Why and how
+are apparently undocumented and appear to be somewhere inside the gcc
+fixincludes rabbit-hole.
+
+This still leaves a similar issue compiling the amdocl files which
+is addressed here with an extra #include.
+
+-gmt
+
+diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt
+--- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt	2021-06-26 14:52:32.446875129 -0700
++++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt	2021-06-26 15:00:30.401582470 -0700
+@@ -19,10 +19,10 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+   add_definitions(-DDEBUG)
+ endif()
+ 
+-include_directories(${CMAKE_CURRENT_LIST_DIR}/..)
+-include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos)
+-include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
+-include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
++include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/..)
++include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos)
++include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
++include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
+ include_directories(/usr/include/rocclr)
+ include_directories(/usr/include/rocclr/compiler/lib/include/)
+ include_directories(/usr/include/rocclr/elf/)
+diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt
+--- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt	2021-06-26 14:52:32.445875109 -0700
++++ ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt	2021-06-26 14:59:01.600778554 -0700
+@@ -121,10 +121,10 @@ else()
+     endif ()
+ endif ()
+ 
+-include_directories (${OPENCL_ICD_LOADER_HEADERS_DIR})
++include_directories (SYSTEM ${OPENCL_ICD_LOADER_HEADERS_DIR})
+ add_definitions (-DCL_TARGET_OPENCL_VERSION=220)
+ 
+-target_include_directories (OpenCL PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
++target_include_directories (OpenCL SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
+ target_link_libraries (OpenCL ${CMAKE_DL_LIBS})
+ 
+ include (CTest)
+diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp
+--- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp	2021-02-02 10:01:38.000000000 -0800
++++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp	2021-06-26 15:40:57.584449532 -0700
+@@ -21,6 +21,7 @@
+ #ifndef CL_COMMON_HPP_
+ #define CL_COMMON_HPP_
+ 
++#include <CL/cl_gl_ext.h>
+ #ifdef _WIN32
+ #include <CL/cl_d3d11.h>
+ #include <CL/cl_d3d10.h>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
index d3a5d3f5ef89..45d99cb43091 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
 	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
 	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+	"${FILESDIR}/${P}-opencl3-header.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index cc55aa27b6b2..5ebd8f780786 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
-EBUILD tree-sitter-0.19.5.ebuild 777 BLAKE2B 43833ea5d0250dd2d8a0fc5cc9b7193b41f4d3f1ecfdcb9c0bb91e950d9e994a2105315b67f3911bf8ec38fb55c8e4fba0695333d2eb8ec7cf7b52913f21b98a SHA512 de14e983bf302da3394594f341f1fdb6e6ffaef60671e68f79a0c6c4b5f975e687f8aafcffb7e544b7fc16870c26e89083ac563c1b7861c351442f78b2e8b1bc
+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-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
index 3ae0a4de6290..3ae0a4de6290 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 676d031b73a9..d402243c43ab 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,3 +1,3 @@
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-EBUILD zziplib-0.13.72.ebuild 1259 BLAKE2B 9dc740d1cd956addc822accfd262959b0127d099fff1461107ed0c26d41ad1b0fc6541e5bac0c9807f28542c43cc07b962aa39733bdc92713a1ef731807e7344 SHA512 c173e4f66902997fa88f30e1536b6e64ac629e6b697cb00afb9398ccd5298c3f09c9e7fb148a5d8256583e06030651785171e4721d98ba8027cb896f61d260e3
+EBUILD zziplib-0.13.72.ebuild 1266 BLAKE2B d481c3cc8ce2bf1c410684815b31b77e00c7f8f1771c7fa0bb6fa3476af9eb3e38d77b24d2f592e52cd66077caa2415897d278a131648110077b40da5630711c SHA512 3a5c1d92c211138d653197683734f6fbf774a9bc629ed53d1dfa182ea63f0a733fee7069e57e77fb1fd97043a3f8732503fbe81ae6b831f07608eb2d47340b74
 MISC metadata.xml 534 BLAKE2B 75453ba275956e63942619a0fa2b92eecb9417deef4576c9cfdf4fad87440800c85a468033b8205ca4b8c62383e103fd6eafbdb2b66b27bc8a705cd66a8784eb SHA512 8cceb9837461402b45ca7cc800a4b52358cc06b6e073a505b69c0fa2e24c8ed7544477cba0e01e855a35c02b45842415a5e63ea640abb98408f8e53deeb98f8b
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index b1cf6149a20c..7a79e6dbded4 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access