gentoo resync : 27.10.2021

31 files changed, 198 insertions, 33 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 797cfa904acc..91ab92210696 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7447452302e6..8d9f8d28b5f5 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,9 @@
 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
+DIST Botan-2.18.2.tar.xz 5996928 BLAKE2B 5c5ac1e8e2de16a012aa5716138f4c2d2b8178f0a811993e5e297aa5ae9e7f6d5a4f182d50566f5848a4f93a88bcec622291a15370c4c017361ca65d3bb189bf SHA512 ccf9286ee891fb201065a0a6a991ce78ef7f5dd0caf04010527cd524b824ea470e5ce302853c1839e999a1b3dafb2e82eb298036a37d11f0cf3df5fa09529d9c
+DIST Botan-2.18.2.tar.xz.asc 488 BLAKE2B 03744e95f52031295162b63dc34d7e0fd9a6b01ae751a809eed5f24c46017fca253c8d42c88b568566f393f0e6dd55d488ef56223d164941386690e2accdf296 SHA512 6764bcdb52a3a28672bcf22f8c364c926511a7b7c9bc227ba15f1e4b2feb9b371a9a4bd9bb1ee43e85faacbef4df5ce39a158357b4ce3706a00f4220bea8d926
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
 EBUILD botan-2.18.1-r1.ebuild 4153 BLAKE2B 2573fb8a14539b3bcccdfa1be03d83565266b0c8e7bf741615ddebca84f59f0b23f3228f61190655a0f9e6268da6ca9ba34fcb128b858f230e1c775e9809ed1e SHA512 79212f1525a920c0a28149f9a1cc81d23c1e99aff1565c3b12dd91e424c9dc5cbb441df7344032d272f00719a2ae2eb2af439c9f3d6f3d030aa428f053f662a0
+EBUILD botan-2.18.2.ebuild 4127 BLAKE2B 0b04bca088c2d29fb241a0e68eac239cd3c36a81a281efa43fda18206357357ae706b29cbe4edf64d2eb43b7f4972f250b2410b34a64702c282f7c2463a85c47 SHA512 ca20e7a7a3ef71bf50701eb988559041f9142519ebfca3a1bab8915c245e34149159562929055e84f00463f019cf8df3b6443b368c241f47bbb8abc127f38d98
 MISC metadata.xml 519 BLAKE2B 78e28054a5c35b101d1f1b20ce1095a8a4f0ee8cf312e8d4f3aa711310d34d48878040ffa2a5a7a6600b071cfb5898b69508796aacd3f1d7658c2f30cbda1200 SHA512 9b039acb51f28ad8f21ed310e34d0d36fa7c5dd763fe8661a7ae21dc8dcc08c55d1eb9f1d0e519773697fe18600ffb3424811244e6f7ae243f6e675988006142
diff --git a/dev-libs/botan/botan-2.18.2.ebuild b/dev-libs/botan/botan-2.18.2.ebuild
new file mode 100644
index 000000000000..d33373a7c38a
--- /dev/null
+++ b/dev-libs/botan/botan-2.18.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/botan.asc
+inherit python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
+
+CPU_USE=(
+	cpu_flags_arm_{aes,neon}
+	cpu_flags_ppc_altivec
+	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( dev-libs/openssl:0=[bindist(-)=] )
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+	verify-sig? ( app-crypt/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local disable_modules=(
+		$(usev !boost 'boost')
+		$(usev bindist 'ecdsa')
+	)
+
+	if [[ -z "${DISABLE_MODULES}" ]] ; then
+		elog "Disabling module(s): ${disable_modules[@]}"
+	fi
+
+	local chostarch="${CHOST%%-*}"
+
+	# Arch specific wrangling
+	local myos=
+	case ${CHOST} in
+		*-darwin*)
+			myos=darwin
+		;;
+
+		*)
+			myos=linux
+
+			if [[ ${CHOST} == *hppa* ]] ; then
+				chostarch=parisc
+			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+				chostarch="sparc32-v9"
+			fi
+		;;
+
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	local myargs=(
+		# Intrinsics
+		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
+		$(usev !cpu_flags_arm_neon '--disable-neon')
+		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
+		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
+		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
+		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
+		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
+		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
+		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
+		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
+		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
+
+		$(usev hppa '--without-stack-protector')
+
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_enable static-libs static-library)
+		$(use_with ssl openssl)
+		$(use_with sqlite sqlite3)
+		$(use_with zlib)
+
+		--cpu=${chostarch}
+		--docdir=share/doc
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--distribution-info="Gentoo ${PVR}"
+		--libdir=$(get_libdir)
+
+		# Don't install Python bindings automatically
+		# (do it manually later in the right place)
+		# https://bugs.gentoo.org/723096
+		--no-install-python-module
+
+		--os=${myos}
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+	)
+
+	tc-export CC CXX AR
+
+	${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 273e878fb4d6..3f0136ef7181 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 1527 BLAKE2B 1afcf5963366645ae26665381d21655b2445b3a8cb11d864453571332acd48a421d9f9d6a936833fc1c3f80da10d39e70661971bc65d4abf5e8eeca98b2a3345 SHA512 bb6f532018d891fb4155fe869b8ce41b61deb1d84b133507bc42c98217273e6e75aba355708e6693372292de662655951fdd908bcae87c8c891ec1b750261211
+EBUILD capstone-4.0.2-r2.ebuild 1525 BLAKE2B 16c321f533f509a6076d2a93b00f93120699e1d87fb9d4af9fd5b21232b21fa02b5f26015fcbd27aaf173f4dd71d851054b5c7284367660cf84bfa73bdd5a37f SHA512 d4e2e6a7d9b474671e8967924b035b36f65837e07f07fc26dc2e5229a112b66f8a6b1e50807c04f03e431defd895289d67fe33fc190434bc9de8e76ec9a6e0e4
 MISC metadata.xml 248 BLAKE2B 2c6af7e659f89e2bd3a5135307aeabf50cbb2e42b12249cbc44830e24a5a68a0c76a5cdcff8dd3f29f444b1bb7ad974ed43b56a3dbfc1b5b664782ac124b46bd SHA512 b136db16e3c8059d1872514738d599dee1a8db086a40061b77058fd6959b2fa603c0c3ac3566ffbb5304cbd8a705ac2fc5ba642f5452c61d5a16fec88fb90ee5
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 893c06164671..c6854f19510c 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # A few disassembly outputs need an update
 RESTRICT="test"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 08b884c5043c..09c442b03666 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd34
 DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
 EBUILD glib-2.68.3-r1.ebuild 10213 BLAKE2B 3b1abda925929a3ec3e40d002557371eb55d9fcfc5dc78bcc73cf827f5aaf2d73fccd921e27f181012ee7cb8967fd7c8efc613672101b4c6c7e140e9f0a3c31e SHA512 255330126e7e730b1887226b0fe348aa175c380078aae81320f80991081dea2db3515f148d49749afca538c7e583a2097accc194ba3827bb92ab2ca1f788c766
-EBUILD glib-2.68.4.ebuild 10162 BLAKE2B 0f536bf3d3daf9e2f577efbfe76e48b6e6952159e736333a422a6ced4571a8b124e70bb66a1fd920e2c7b41a3ad82d78f3b242de0fee4d93c4b6ed10a6969b80 SHA512 8130afbeeabc98f3cd394b3f178b020ce2a94d65a4719db2837dd20a1969bc69e072afc489ac58d3935552b0361544428189531464bee56fe1269fa70f7f4f04
+EBUILD glib-2.68.4.ebuild 10161 BLAKE2B 99bb5882a830168df440470ecc2674ed8d35e12a28bdfefe6378000c4f0ccaa06d268ac0b9b761aa56eb8043feeb30dc852a12a1baa16023856447003f33b652 SHA512 dfc2f0a37a4799b3e909f6851ed57399a157f8eda8cf536b6f974ed737ef03598b029be15bde2a00e6b72700c0373fba962d13fb52ea59b99194b8dd8b205a7b
 EBUILD glib-2.70.0.ebuild 10140 BLAKE2B 791776ba23adf32fb10defb74aa57479715f48a19fa3417db10697e06e17f281d42c864ad6be1ac8294fd7021c5c8128af36b17e4b69bf058098d85cb1be1724 SHA512 80c442c11398e951aed8001a30f6eabaa8d317598fff33643d5b719ed10ba5e680d1442d50ec296985869d8f65765ad656e9a5c2e0ce8868ad429c12c0bb7a62
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.68.4.ebuild b/dev-libs/glib/glib-2.68.4.ebuild
index 851d925275be..9e85a19531c5 100644
--- a/dev-libs/glib/glib-2.68.4.ebuild
+++ b/dev-libs/glib/glib-2.68.4.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index f5abf1e5034e..243dde6349c7 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -6,5 +6,5 @@ DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa6628
 DIST hiredis-1.0.1.tar.gz 97937 BLAKE2B 476bb3607aabe2147eead61c98de325f4dbd2d7c7439513ea0cd98980fc151a64798647757e46feb61e8914e47b42963bf128c938c94c42c448369065532166f SHA512 87909f78171cf4deeb3d030484b55fbd1a7f7f27f33636f90e169a900ddc5c5ec447d2df34739ada3cf35a50d647cb4fcbe2754f4521d18f770f1cf8ed962909
 EBUILD hiredis-0.14.1.ebuild 1897 BLAKE2B f247584df6ce3646f5fe5a9e014910d0a1392679b596ab54bc0879914ec63e45a9d0e0e8d27c29ffc41143bd7f033cacf24ca3103fb56cec816fd0e2455bbe87 SHA512 4a2f9e9f98f842a30051744892647fa3b2c9e91b0a8c117215609ad4ffd66a599c2b6603b3b4fab5815b21488176d103d9fa29026b9f1cf437ffb30c1db67167
 EBUILD hiredis-1.0.0-r1.ebuild 1957 BLAKE2B e0e88f04089350f05de98d3915dc9c361607478685dde2fe414e961c0fef22c16ba7035988aaa08dc7a95ed4b376b42602763c42f94af3bce928c9103e1767ff SHA512 0a65d34ba42f6f1fff3b8166f17957dc39a6f12e198a312a5a482dd4bb3863aba25b33217ab004c793a35533d10afcfb69cd2c936c165778a7c484c19ae63677
-EBUILD hiredis-1.0.1.ebuild 1964 BLAKE2B 678595e8dbfc09b59fbca1c1d152619b1ac63aa18cf36863de833d08b1b26068c267c76465180d39d4cf4441a55371bc7e3aa761c166ebb9778679b8a388a425 SHA512 692a83fcd5317b7e5cb96dc91fd22d00bebac9142a0ed628812ec6165d5ddf4e6f989756a6ee350d5fd6f10941ea07eb08f6f8959b1f49507bea0637adc20433
+EBUILD hiredis-1.0.1-r1.ebuild 1959 BLAKE2B f281f5597ec73a7df2fed2a63ec968f31115ac1b21fbccc38e70e3f2991c872fc6f642c8a49e12340de660aecdc7eec0db5a8902916c1cda18b79ad04c19ccf9 SHA512 bcab38dc1522fc2c5d064f47706721df75cb4e19d3d7d97b5b51102188a8e3f031c06d04498dd30d8c13ce9ebb839791d3c608c1c10f57941970d7dec96f3ec7
 MISC metadata.xml 404 BLAKE2B 3872a9946b2a134a1c55c2b0aa6a77d83df6b3e48a6bfd017e716ec0eb8400bc95476088d8b79de5e23d6638397b5a0d41bff556c076e607a6f1d0dcd668c7e5 SHA512 ea90d8e7a04ab8929bbefce3c78adb610c7e22d2c9ed44483e16dd4530f04baf160d372999a5de9ea52850336b4d9ca13fd70fb719c2db18f938360262761a29
diff --git a/dev-libs/hiredis/hiredis-1.0.1.ebuild b/dev-libs/hiredis/hiredis-1.0.1-r1.ebuild
index 29725e58a6b9..b1397aa2a4d0 100644
--- a/dev-libs/hiredis/hiredis-1.0.1.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.1-r1.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="https://github.com/redis/hiredis"
 SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+SLOT="0/1.0.1"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index e5620258b83f..b1a281fbe01e 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,6 +1,6 @@
 AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
 DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
 DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
-EBUILD imath-3.1.1.ebuild 2246 BLAKE2B 952a2801dcad6d79c53bb5375f391e9f4e0827b1f0b9c2837a13e77df08baaeb101ed8532ec30012ae2fa05d71f75ff18a9a5e239a148358e19225058a444a2d SHA512 eb9ac6c21b0c8ce528644999da28e0beb6653b860c160961def13f933c7e0af9f3b1439b8224b916851815a6767b0b8ee2fb063a0baf41666f26328c24175e66
+EBUILD imath-3.1.1.ebuild 2245 BLAKE2B f67202853862eaf9cdb432a28cf82ad5aff63715c67e6623cbed805aeb6ba8b290e1c26e4e9032dda2b8173b6b663acc2f2444fb535abc33e8a8ad0e6bb5b8ea SHA512 fe86a5cb22780fe54be8d55ce322b437a7d2fbbfae294c84af27b5d42a4b0da8752ef3727475d9ba4698cf6b1c8ec4d93afff2cc607984dd2cf82ea8f2342404
 EBUILD imath-3.1.3.ebuild 2020 BLAKE2B a2e3fe8154387da1b3c4da28b5ee1bf398d55ec51a7a079b9a35b5bca9ad1f62a4268d639f4615c7bb563f81a68fcebdb37ac5a860ca527f2393e1e0b914ce3a SHA512 142571ae60baeeec6004a4bdf304bc60a27b25d8ffc744fa867cb51db049019586742cdeb78a0d95c036370c18fc5ff329658291370c81eb13805cf284f42dfc
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/imath-3.1.1.ebuild b/dev-libs/imath/imath-3.1.1.ebuild
index 3ebea9d135f5..c9510fdfb569 100644
--- a/dev-libs/imath/imath-3.1.1.ebuild
+++ b/dev-libs/imath/imath-3.1.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):
 # ~mips ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index fbb3eb09b379..70d81641f3a8 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -3,6 +3,6 @@ AUX isl-0.24-gdb-autoload-dir.patch 1577 BLAKE2B e7d7fad85d194f2e55a319ee7cd8038
 AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
 AUX isl-0.24-respect-flags.patch 204 BLAKE2B 34d028a22ad608fbddf7a3909000351f7cf9b7e75cf3b0f687fafc35554163a123467053433c96c32764b155c02f01a336e92e67e25726bfd3e109ba18de42b7 SHA512 0d72d99266d181cef9fac1388c254f1e85c64aa394a672245013be17f2f4117c3f23252bca42746fce91fb2b266688245c1747cf21a69afe82de058cdcb600b6
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
-EBUILD isl-0.24-r1.ebuild 2179 BLAKE2B 9da3c3903e80c0727ba2c3bfda463b57ec95cc07c48899663e616a0ef64163831bc3af76443ef69eb538f89b047e8bb5ae83de29bf0d905a1cd6b79db9377c96 SHA512 7c25d27f7b95bc669dcf30b14916190d415c17bab7c2ac8a7f6c9d39681f407489bd856e04713735c5458550918298a5f6fd9ddbd182b1012e34218b3a17481a
+EBUILD isl-0.24-r1.ebuild 2176 BLAKE2B e3dc0b6f6640ddcebb037d161b28854e61d1e7da3ce831f520c660ec4a84233a473ab461e59f7efa1f13423a4e2ab9086151aa6979a985ee9e586ccce731167f SHA512 8f9f53eb019ead6ddff4ac94bf118ee06659ac249e701c78f0adef2350c582c231bb7597dbf7f2c63740e784d890bda89f0e16724af16907d4ba514d8a03fec9
 EBUILD isl-0.24.ebuild 2065 BLAKE2B 3e9a9474be627c9832a3347f9a6fc96371eda37f017be6770b4a60061185afac16d5479e8bb0d3cd0dbf56bf3d042a86aabaf9685541ee4571466a16843a6ae9 SHA512 226512b08c6d26de9d624ed0fefd38613e2cf1675f55b7bee31b666c4c17b1d54843808724825c9c42f31d8b146c49d2195eac49439501dd7c476a66184c1b75
 MISC metadata.xml 226 BLAKE2B 99dd52557be714400c2d45f1621a6ed5e95b38fee6c6812b4681e5363c84bac0e5a55026b609b0ec9196348fc1ea5f55b4763220ca16cf45c3b61a20dc0fb745 SHA512 df6b46a0133ce8106a367f43e477f044f06a8411b9164ed4cc8543289ec78c5e3f8d4dd3fc36100f39f5c9928d1100c0f5a25cf457dc7048dd37ccc3fec24f57
diff --git a/dev-libs/isl/isl-0.24-r1.ebuild b/dev-libs/isl/isl-0.24-r1.ebuild
index 71aaf3b34155..62216f15ca4f 100644
--- a/dev-libs/isl/isl-0.24-r1.ebuild
+++ b/dev-libs/isl/isl-0.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 92a66c9d6103..5475f45988c0 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,5 +1,5 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.12.tar.gz 506313 BLAKE2B 8f80773390479a36e06447594c8558ed337eef5b18ae0b0779722647dcde49b61b23e656acbc935714245d80e40c5cde1c164f0524a97dcc53972051d5891239 SHA512 bbf98a38a80c8fe6b7eab773967edc55b8d48be32b36ed827fb835ee3dcd96d5ec1dc97149714e015e93a0a5b9fc03595797663fdb5a0f673869ea8bfe640df5
 EBUILD libatomic_ops-7.6.10.ebuild 738 BLAKE2B fecc2d908f130bb635c358cb321a292bbc64ff11faef11c4c8c692cace88100caedd49f4101d6e30e35dcfd5d88c7ae1988975e47aef1afbfa3392c2eabcea33 SHA512 2a1c470638fd5306e70154c391ae17aeefdcd4f504fbe079a7d2a79c2575ea819a8f506cafe0f449685f1875c4d2378a741da2f160c7f5e59d1c09851d13a5f2
-EBUILD libatomic_ops-7.6.12.ebuild 741 BLAKE2B 4fcea1563c1a13f338ac84d02e6d984fd03dc0abda6b044ee24e652d4aa2059eff915909d7b68dab243b452d5ca226efea307fb010da32f889af0199c969840d SHA512 018fe918b8bad41f604ae9a58aec382ff6bde60d6b30d21e4be4b5dd02fbf2bf05162309cd559ee1ee95d7ba3fc576bacb74262d2c9f9889129eccdd8acd755a
+EBUILD libatomic_ops-7.6.12.ebuild 738 BLAKE2B fecc2d908f130bb635c358cb321a292bbc64ff11faef11c4c8c692cace88100caedd49f4101d6e30e35dcfd5d88c7ae1988975e47aef1afbfa3392c2eabcea33 SHA512 2a1c470638fd5306e70154c391ae17aeefdcd4f504fbe079a7d2a79c2575ea819a8f506cafe0f449685f1875c4d2378a741da2f160c7f5e59d1c09851d13a5f2
 MISC metadata.xml 476 BLAKE2B ebb64fe1d7008e89803b62789927ba37fcbafddb2758c0dbd26590335466cc3e35515e1a00cb3331db03041ca28354641b9fc3f37d29a4cc8bfb53507bb3d81c SHA512 28c2f2d8c5abcf72abd825be52584ca2c9e08674caddd28333e90ebfd3bae4f8d52100f2b887efdb0ccf6eff6314dcbf99282589db0c6dca7dd9a91dd5a0d066
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild
index 1467a410ac0a..9216699224d4 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 09e6caac7cbd..a0155328b138 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -6,5 +6,5 @@ DIST libbson-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8
 DIST libbson-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 EBUILD libbson-1.16.2.ebuild 1105 BLAKE2B dbf2c09216d0b1d3cabc583a80f2d7f4f67519eadb8d27709c46aa6dea3eec658f3fb3ee8dd78972ab1cca25ce548d93328d7e4e53ea5597b338ba5405b05a7b SHA512 4e31f2d52cf21dfb17a067fc4928f918433e26b1f535323861d92f7dca6805a8c0a142a5c8b069bcc29146d419fedc0e4632717c0aeea72d634b0c2634f85490
 EBUILD libbson-1.17.0.ebuild 1040 BLAKE2B e46d4b49d5e9a5cbc938f43cea74dc42ba7449552554a891cc95fb82c83414c0e69aa0a5e76c1e9cab37c87c7ec5209890b0b0cd517f5aa90b1a46ffc622a005 SHA512 5d04ebc113ec3176c5216e19c451750d554f9eae7c61bc7b3fbfaca647de5085b0201dcac316083bbd1ce9c5339a3ee3b38aad1e636e2d0492b70bbda61fe5d6
-EBUILD libbson-1.18.0.ebuild 1006 BLAKE2B 911c31e140509b7c182a378c28f3dd6aa0e95fe35c83a5651d67c706cad5b2970164efadd5f36ef07a177d82bab964717af1c18ce0e773ecb1075ae24c9cab64 SHA512 297ef85825b996b95d9a254ec9bc9723d3559c2f46089b4931c4f2ba5cc2401b051d5736ae083f70e4ae0d8fa55ad73135b69c3188f1a36df5bb1b5e2c0e49b5
+EBUILD libbson-1.18.0.ebuild 1005 BLAKE2B 9d59195db86fb67fb0fde029ae6122735194202f5a162109b3b1d057c41c38ca707e0d0257cb596dcb35106e6094be45b917b57f4a70f97ebe0d78e533829b50 SHA512 0c3c10e7cfe8912ba15530855899cb834c67214f7f4720e0137af756b475a21db91b71e79192e33aad5511a2807c5a5fe0b6db78c5d7c9ac22a2a6662df04da2
 MISC metadata.xml 334 BLAKE2B 1ac3657fbaff07b8c50acc95b9df44493770dee67f965a7489b3483d0038c0e5c41a7ca689c7005d2f766993fa1747d0bbcd6277dcd5d68630480e9d58beb323 SHA512 e71f29845e2f49c78bf3f515c601eaf6e01b4fba2c19d78cac11108e49c7f0eb85f24e374843553ec9b139c60fa31d3a9574f30d21225c848fedcf4b317fb6f5
diff --git a/dev-libs/libbson/libbson-1.18.0.ebuild b/dev-libs/libbson/libbson-1.18.0.ebuild
index a7c927ed4330..117a1c46f965 100644
--- a/dev-libs/libbson/libbson-1.18.0.ebuild
+++ b/dev-libs/libbson/libbson-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~sparc x86"
 IUSE="examples static-libs"
 
 DEPEND="dev-python/sphinx"
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 7d951e7e8079..fca2f70a167f 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,5 +1,5 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B 96aaeaf2f329d8fa1c099de16890346f8c68ef2f9a7f6119f3ecc2798e96786f8981cd94c4c0df4bab9eecfce475dd4472a28677a12c4cbf297a9721b3bc8dd4 SHA512 a75d48bd6088a332189f633f49d9227f8d19ee67002c53fcea32225ed899898e897d99de194dc5e14792ddd6741090c2c4b07d19fa1a9046b222faec84fe584a
+EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B aba5cb0562c56bd846bfa6a3c42d465c8685dd697f896d845500c5b4b238223d0eddbaa4b6d7eda48b4d820effc0450e5de4ef30c5bd04ea8a4e85416cb03249 SHA512 b4a021ba7509f2f36cb81f7fcad709119c55a2275137bfce5f2f764a122cc3f41c3da01a09f75f526d0ddff39580f6576a7bebf80a82caf8c7f017853c301113
 MISC metadata.xml 413 BLAKE2B 91e8ea8dfe7585b6bcce394bc63e466cd7094b8b12ecb4f6b03303b37575387250f81c85a3be03cf8b36cbe10ef724794c86afec5decb5f042d0cde5db2bfdc6 SHA512 af7f752fa0811cb6e57b2398a86f5c57bbc0af1e3392ff3c26af27568ae3ed5232f765558f5e3b01cb6a6e3debfe2b0b893fc2c3598776d94eb6318744ca6fce
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index f8a7f4031b69..51b423043d2e 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1
 
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 4e78f6e25012..9b34be60b9d8 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,3 @@
 DIST libgee-0.20.4.tar.xz 684068 BLAKE2B b40d37f5d90abb8d96d5e90c67056573960bd54cadfb1cb5daf7fc07147a9e1706e23bf0240b84245c7e1ffb814c5e358f12e974a0d8a038b0179be25f271d90 SHA512 9a4b1db47543e80a6191054fa8fb04a8c07468befe05f738409ede317e64a8b884157bb488b330cd27f3dce3af5eeb7aefb74a180c2913ed8c834d1bde8fe9c5
-EBUILD libgee-0.20.4.ebuild 684 BLAKE2B e6eca0ae6b527a34017b2a8fd046ef2ae7ebaa4614c4a44970318435880b48ca6d04aee8f9a4306bc782d58efcb5114f0ac8770ff995afe23d302b87823ac53f SHA512 0c070474fdb513622e7a06453ec70a49d6f03a7b902334c0579ea601d4988d4e8b2054243a44987a9435971c7647689e5f1fc579415427d4e3f550ba927702d4
+EBUILD libgee-0.20.4.ebuild 691 BLAKE2B 7c1b2521c3d22409d287f97fba56fe43e29c882b76679d597f7949ffe80545e63b780a79a90c2dfb3a15f78657aef525dfe7f104580cd7ec9c4b5eb6b55219a9 SHA512 0678e1dd5254068b1eaf4d3094398e2967c2881fa3b724d97ac5a4673912653b1616c4f210880f2fe0bd48ca1331d52904e0ba3b1de78fc989a4ea86a1e6885c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgee/libgee-0.20.4.ebuild b/dev-libs/libgee/libgee-0.20.4.ebuild
index f4051af8a733..34b8acf67c9d 100644
--- a/dev-libs/libgee/libgee-0.20.4.ebuild
+++ b/dev-libs/libgee/libgee-0.20.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index de6b405df7b7..a1ab59629da0 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,4 +1,4 @@
 AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
 DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
-EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1296 BLAKE2B b8d590c0feaaf8ff7434db439a4b98d1037a8fb5c187e583655c21ee2ec47da87a4173f190540fc7be6ae75c9706f2b4838fb524fc0ecf9be589760198c31188 SHA512 c6f98dea85899ffd87fd63c207162570e682de249ddb68a30c91d6ae4fbeafc32a8ed38e88af83706cc14a518334c3dc076b1f347afbcb14a1bde2f49f28ccef
+EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1303 BLAKE2B a78542a2d8b2f822d1624c5ba098ea681ccad65feeef0db9f34648925e1d41cbad9e7d4f799a957e650fae3b5789f67e3c9afee6284d1dad66237f0d5a0dc2e8 SHA512 1c177814b210279e7d82e34f452d24dee5a959d3a05c84f10ab5aad2cc36c37ada017974b494332dda1c20fb75fbab52a01422818e7af9e0ab54ddf3a94e8dd0
 MISC metadata.xml 432 BLAKE2B 69d6aa326333089515925cd4c8cc5c2d86318cbe148349f2e2f1554afd8c659a5ce3aed28ad02562d8552317bb010f866e10e3793e47f5a7a5c82d11d8702e51 SHA512 bf228fa30f58c6d860b7648eb40e841c72398390539980fd48e35860f6874e141c3b81c373ee3ca1cb8bbbde5dec36a94c5381b102e1ec33e91962455d9fa8ee
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
index bd885efc1975..24d9151a5225 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="gtk-doc python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index c498dd05736f..460ccce529dd 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -7,5 +7,5 @@ DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207
 DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 EBUILD mongo-c-driver-1.16.2.ebuild 2453 BLAKE2B f18643407983f1fe8316a774496038b21a05812fbcc81927ac895ae42d6e0ee5ad7c4c8894256546f51de185471d2f4480336674c8ebd6239078b722948aa69e SHA512 2d6036e5715c35d56bc7470bfbe1ad40310bfc0e416326ff0197f71721ffec1747c26a7bd4d746117cc945c06e8f578805389bbdd6eefa0c336a97ad03c8cfd6
 EBUILD mongo-c-driver-1.17.0.ebuild 2383 BLAKE2B a9e95ad7e0e00b4732512c03d1ec176499ef99572d1a940604f455280e56388fbcda2568c00976d8496ca8bead4928247d296f916eb06f2d3fe8be3b493f64f3 SHA512 c8a29735a595fc40e919b47bcb6442accf25dd214bc9eb3e4c6621ba6dca6a07fe7e039bac717fde489aafb3b34419a1622ca72973e30c41bc59fd499e1c6131
-EBUILD mongo-c-driver-1.18.0.ebuild 2349 BLAKE2B 222b28928dfdc7ef65a137a926a05f2544e71040ea957398978764afdce777de70af5228f707df0790a14c81fb12a23ea49141d9da2003d79796fd1b92c9c9ea SHA512 a9c6beaf7d8aa7126ab63ccd31ae1bd8906a6864f148e9cddebdefbfd8c3982c0d8f3c3140f00761eb5382b6f7de7c37f09b52bc8dafd9d33fccb317b4e12d5a
+EBUILD mongo-c-driver-1.18.0.ebuild 2348 BLAKE2B 97726ef54d3ff2629b18fdcf17b9e072710b48e79700b2624b09e01c4aec291e8f7660391e114e262a6ee7129b50f8ad28c7f41a472d9ea2fe2c8502c133c7b0 SHA512 068408831d873afbb044fd3d18ceabfe8ef654bf91928a1ca2aaf7aedaea143db117472c32a79a1eb849ade04b82a1dd973c7182e20b109475f93d5bec23e06c
 MISC metadata.xml 335 BLAKE2B d7b8f44f6698d86dbad1ae9fc535f6c75acb827b07d32af1ba02c94da5196f00f1c3c2d2f519ca388d586867c6b033a3c53d3e3f5856ba32efed730c34316642 SHA512 7c0bf1f1f5065e82ebb03a00b68d41888fbdf4b92c67b116e46016490fbc74c5a44ca8f8245217a7926e85f5d53bc3bcab7499d5ceaf4d4593ab9953e36fc2a1
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
index e1858e00758d..1a2be6118fd0 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~hppa ~riscv ~s390 x86"
 IUSE="debug examples icu sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index ee11d90680bb..1a67f5e96e41 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -3,5 +3,5 @@ AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
 EBUILD ocl-icd-2.2.12-r4.ebuild 1212 BLAKE2B 8b39938a7bc2b83e4e3b04021f2d913d1e894ef8b89b655f93b56009ae0ed05b0e66144a5089d8b38c6f9b0fb6e6fd8bc606504f9cf10ee5c090fd941d8030ac SHA512 c2b9c70e2a62d6b6bc8974813715d1e6754e716d5eef7adb314a5f334d9c7ba748d04de3c25177231b0a74e5afc4c43e549af340633646627268af46eaa9452d
-EBUILD ocl-icd-2.3.0.ebuild 1526 BLAKE2B 05d8c1ca540428b0131a5b09a090a1d2d9c2e18ec6548bcf34f94a32bb159a7a7a4895ed8de8452547690ae4e34cbdf3c10c7fe8e5029be052f6e01cf85da65c SHA512 a430f6108f48c20a0590e84fd94888743daceaa091a716136b6f17d69fb3adb8a363c4963d57247b58af6f929e8caaf63c52ad10a0877f0db328134d37682036
+EBUILD ocl-icd-2.3.0.ebuild 1524 BLAKE2B e738dd830515e756ddcc34bbc3aee067ac118e5d88ec07bafa37229cd7f1fc798576061e72570a63b626ff8c92d652fcdd80cb78e3afa6c1dfc9aa739d72e234 SHA512 16991b86d0d3be933f226e1dffd23c3d388b6c524426fb43a12267ee19ad681a4b6911798a305420ad65c4c1df1a8c51618b6136f1dac862f8a8c553ca8db0f1
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 3a274d0c1685..341d58d9a219 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
 SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index c2ee24c62f34..f651d2a6d746 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -4,5 +4,5 @@ DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9
 DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAKE2B bffc7e9f8fadbaecf9a7d1a2b8ee7a9db0b1dc1d5a6304a9c8d60b6c24a0947307b8780a99d2349b19e5fbcdfe819cc400ffb0b8b1df9748bb401ae1dec7b9aa SHA512 b68567d3e59aaa870251f682988b52a89d82767e954adea6b7f6247a6d432c29c8373c95a5e49df07110d4cb396aafa64ee6c71af2c0680d383ffe22491e50dd
 DIST snowball-stemmer-2.1.0.tar.gz 220324 BLAKE2B 3d92a2f5b4bd633932d681f2555cf1cc1a2c1a1c71fd0272f09bee17628d034a20649450dd90242c155ab7b262e685913d5ad4034bce6e7a41d76f0dfc724137 SHA512 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
 EBUILD snowball-stemmer-0.20140325.ebuild 1385 BLAKE2B 60345fa1c792728f58e41442873dc885fb44305760eae707e3789dbaf745b65be96df80d5e59e52aed4e3faafa068b524001a07cfbd74922f8fef840e2a1a095 SHA512 640a977ef2a2f862a1c286590a8963cd2597fe8ffb740b6e2c607b24a9222ad9992e72ccab81da0634736666fe337c63c5363526f3eca3f00f861e8311480160
-EBUILD snowball-stemmer-2.1.0-r1.ebuild 1358 BLAKE2B 20f2040111b5e39037012d1ea783602623589cbceae736d73e251388d6abbdfc62a0c8eea9cde31e3b9034154d1ef44cf2aabb2330c6a290db3a4e2c67d3446e SHA512 63521e5aa0282fb2d9ef4079097379aa1ea72a4f9e4ab652902b169ff38a71859991b22e5643e56146fe9a3b7dd60429ed614b092b39a92eaaae5053d7e2d742
+EBUILD snowball-stemmer-2.1.0-r1.ebuild 1353 BLAKE2B 7a818c22eef93bb715d69c876021ee7c0fc8d6eff350d409ad26f27eb077344a8a53b21a7c99282308f9380ce243eb51d2cff20a755afdb392fe6e5ba0ac9c1f SHA512 46b004e710747f302d66844e2138339346f91b461dfa3f0a33ab948aed376992d5e40dbec92504e212b32bcecf30a3d3225f064d0f88518efa5d77683bb2a3de
 MISC metadata.xml 216 BLAKE2B 8ee3fc474431bb5216c1bf008cae233e6710753065ef303f86c694489d511571a7de860e785a1bbbbb4a1fb709ac3800e13677c75c9d312447ceffcc834d3b7b SHA512 f058726d4f2f98447c6df082db3b9f966ec23819805b9a6d340aa6fc7f96e0150058b55c1478b5e41dc3fed90753a188e3c6c362db1e551feb941efef3f63897
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
index 52b680a45998..ac52042d5149 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/snowballstem/snowball/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="static-libs test"
 
 DEPEND=""
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 7ef51d149402..17d7b849c499 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -2,4 +2,4 @@ AUX tntnet-3.0-autoconf-2.70.patch 2238 BLAKE2B 65b5cd276f35ce4b046dc1b6ce4be086
 AUX tntnet-3.initd 550 BLAKE2B b31fd930b69c62c3439096c8de229a256d3f77cb18be752902b577950bb757cb06bd0f19005b25405c263f64d0d8db5d18b0b914d552a25875620c8c44ce090d SHA512 1be6437278de9319806a7fd4ef8cfb7674e4c04b156c2342f850d8ee9aa33c4c490cb64243592f1d6605e96cb51192216f859eac2a59e7aaea8d2730a9dedc0a
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
 EBUILD tntnet-3.0.ebuild 1450 BLAKE2B 699723d62961e3947f071f77dd1187e208b0bf16843c423150dd434de3601fb5e03d990dbac66ef11e5cfd80dd4b4f7af30255e0aec395ccda2316c766bb3d1b SHA512 dff4d70ca22949d77d0a3badabb1a932c29e357b3dfec27f8918d6fe13ef5f0a2a3157278aa125923799e1283f88935583cfe37ccb5ca7fdce3bc9c2ccf616a3
-MISC metadata.xml 325 BLAKE2B 897b76e9685c9789b0c18825d2e8a633a88f78491d2da1e8ee11b638ad03abdb5ac2c0d2d6f2d12d205088c14bd157f4aa6412bce0103ee75bf0152325ea8368 SHA512 d2aec4511475f16168f9101f910e933fbdb2fbd428be8d586ab2a4298294a8f3b7cff47e33ec035cdf817f42952f3a928404635d4c8e002ebd3339274108ffd6
+MISC metadata.xml 240 BLAKE2B 43a057a50b017443033b45b0352b2139fcfa48d7cd9f401e489e96cb54a31fe6ce794f64d7a54021bb0b2775670d8c993a72395d13a7a897d6696dc42da32c5e SHA512 d698acaa1870f83ca3efa2b4c95d86652b8b772bdba9d6fe68e21bb2dc5ba33f2ab5b51513b63b4965ac6d007315260c5b07c6e17e84a7d0c2a0e39ed753586c
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index d44818a4832b..e42430b1bd39 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Joerg Bornkessel</name>
-		<email>hd_brummy@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
 	</use>