gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-libs
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
141 files changed, 1956 insertions, 1715 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7cb2e37a6352..e2a02f794d8e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index b56849842c12..9c0f5447f03d 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,3 +1,3 @@
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
-EBUILD atk-2.36.0.ebuild 1126 BLAKE2B e5ab4a729004e3c017d84796dc76efe1ee5e6129b57e7c3b5ccadfce043e91b3775f53ba2ad02286d543da2fe742be1130a074b7afbaa96e27b4bb066a65eb51 SHA512 11f6106f7abc65e9e37a6a6a2807b05a0b1bfce50ba0c3b3a63be4937fea21cf44a7f83861fcb6ca0f5d775df7f23dea1e3f20ab509dc8e490be355142888c29
+EBUILD atk-2.36.0.ebuild 1133 BLAKE2B 666cf40573a78cfa1d6f45b94b91b475beeb91e3ed31a7eb96af8b95dcd347fa3d5e8bd0ce156158fd804a0bb75d953cbe42263089040a1c35d11eafefd15b26 SHA512 924fc8b448d06d0e2c03fdcd78d81c1cd15258dd2ded9199c80960c464cd83697e72b1a8d340e2ce8d81afe36093d8b92036c05e98f14702ac3e9e983ac49c61
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index 9f1c1f60cd2f..8359311321a5 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 679a4c066ba1..59832ec67111 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,3 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
-EBUILD boehm-gc-8.0.4.ebuild 1375 BLAKE2B d13298d2d295a08eb8c81da159626f0bf76b6fcc3f179f3499e344ed0fbca55471f9cef0d16d473f62eab1f88654f82bb39ea688a77df171324aa1cb66d5ebcb SHA512 0f15858d9ac606d270862aaf321b9375ef725b789aa91b2ad6cd511e8ede91c3024581576bb345c75bd5a5c23a30c8602ee33b374e2b6bc6deee74aa0f862000
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
+EBUILD boehm-gc-8.0.4.ebuild 1417 BLAKE2B 0a0d40849a901b436928f336c1e897ad6731317767d396aa0b606db1f8c1f21ab4a28e3e9730b5bda2772547903df19950fbbb228e688892b0475664af14d70a SHA512 2fbab201dcbc7eb60c4331f512a1c44947a5be15e70ef5de535cf2571a8bbb64f4a1aa571bcb08c8c2bb8c84eec336b8f01ef1320e08d303d4bcca724e2d3116
+MISC metadata.xml 365 BLAKE2B 8e57ef6184dc784b5f1431163ab12ec8234f81a2c4a7a7b64c4ec5f274eeb23ff0cad869a42352d1b82a6e03a7d48aa96ab3e5d105aae135206fbc6091ecd70b SHA512 76e9d949d2e5449abc987beea35b6393ce07741b44df214336f4b2f698a128d3a588cf29932d5f5aa4ed27e3b3161df419af12d792ae8575aa766ef39f059eca
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index 7211307e2d0b..3d27a52ef739 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="boehm-gc"
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs +threads"
+IUSE="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -36,6 +36,7 @@ multilib_src_configure() {
 		$(use_enable cxx cplusplus)
 		$(use_enable static-libs static)
 		$(use threads || echo --disable-threads)
+		$(use_enable large large-config)
 	)
 
 	ECONF_SOURCE=${S} econf "${config[@]}"
diff --git a/dev-libs/boehm-gc/metadata.xml b/dev-libs/boehm-gc/metadata.xml
index e396f3755977..b4ce36b139c1 100644
--- a/dev-libs/boehm-gc/metadata.xml
+++ b/dev-libs/boehm-gc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="large">optimize for large heap size (also increases max root sets)x</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 369e179c9301..df00acb24243 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,5 +7,5 @@ AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-1.75.0.ebuild 11103 BLAKE2B c8b74a302e399613bc23bc8d3e78977113721dd64554db1371f58a3f36d47933c09903ca94fddaa7fe81af0f45105059b51da9c2b6fd3edc6e4a4e9684d8f3b1 SHA512 b1eb508b1f1060bf5f5e91b1c43492fb1374880290d0874afd9e3a4c7cbd9dd4f909ba1b7b7cb40fe447b15eba19cebbd5da9d8263c26209c89661d513a629b5
-EBUILD boost-1.76.0.ebuild 11090 BLAKE2B 157af6674fad5c4c687f531eb1c1eab06b6b4fa2a9bf2dbb8f5aeb909d90b58c985f341ff82665e8ba02b859c94219ae85b8a9f8446ced615c30c31e7fa6242d SHA512 6cac57f9c9cf1aa0f7003a347bce8b754c1d6970b0f215141e490f19b8fa4543b56eb7ca7040093e218dcd2ca6f05da0efe952876bfe17efeb3aaeba58ad98a6
+EBUILD boost-1.76.0-r1.ebuild 10885 BLAKE2B 72cbb61ad8b3b6d853f62704148a02d3127772c7007810740ecaa095a2f71d77ae76b0f868757b396babdbdbe5cab2e78380d42a9f75d77e7bc27fead3cefd16 SHA512 197f6916e438ce242288a7fc76e224e5ecf50e7fc9f098c6b5b828cf45f7bed03240a78ccb1b7cd3563560cb5e44b4dc35ee1b11336f8bdda5d7adf04e3c087d
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.76.0.ebuild b/dev-libs/boost/boost-1.76.0-r1.ebuild
index e75b93f8476f..d760d92ea5af 100644
--- a/dev-libs/boost/boost-1.76.0.ebuild
+++ b/dev-libs/boost/boost-1.76.0-r1.ebuild
@@ -171,10 +171,6 @@ src_configure() {
 		--without-stacktrace
 		--boost-build="${BROOT}"/usr/share/boost-build/src
 		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
 		# building with threading=single is currently not possible
 		# https://svn.boost.org/trac/boost/ticket/7105
 		threading=multi
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 8cb9d79cd21a..31e8b0dbabfe 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,6 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
-DIST Botan-2.18.0.tar.xz 5941536 BLAKE2B 2a4182bab5e681fdfeafa113462bf5a31057d7be97d71d0a6e60975b84432dd3932498f42f0b879e216727df4bbfcbf0d844e971df95eaf9cf922280f32858b4 SHA512 8613412e3e2fe8b787db7a4d4dbadf60b8fe6b68a84408c600c37cd0b5dbdf3f347a49f5bd88eb8d4f658e927a8b976884146551bf7d256fa80e9675297c0f09
-DIST Botan-2.18.0.tar.xz.asc 488 BLAKE2B b9a9c98e11eae227fb900cae2dca3aecc2114ecacd87336cf5cdbe6fbcb9676514f11e365e94dbfecf3b9edc1a9a3398ff2c66f34a77d7b4d6b0f87518af6d9a SHA512 f2e1689e10b0706eed5a3cf08dfcb163874d3ada12968ac739eeff259ae81b1329fafdae4d29290195276fe3bb1cdeaf3f302b8df53a377c5bbdb7964deaa044
 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.ebuild 3038 BLAKE2B b239da11047cdc690d35356cdc0abcc899275cb19fb0265e03b00377ee41b085e030844c9223af0900c3ef15c4e265005d4d24adb6aa6694829acc3f5325abbb SHA512 ffccf93568dbebe4963029a2e46fa6dfb6acf4ed70d81aef3695b97ce34cfb884d6e3020712c3dd623b0a72abb197aafefd947c90249c41866f7a66eaa322508
-EBUILD botan-2.18.0.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
 EBUILD botan-2.18.1.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.0.ebuild b/dev-libs/botan/botan-2.18.0.ebuild
deleted file mode 100644
index 4d9fc251745d..000000000000
--- a/dev-libs/botan/botan-2.18.0.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
-inherit python-r1 toolchain-funcs verify-sig
-
-MY_P="Botan-${PV}"
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
-
-CPU_USE=(
-	cpu_flags_arm_{aes,neon}
-	cpu_flags_ppc_altivec
-	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
-)
-
-IUSE+=" ${CPU_USE[@]}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-	verify-sig? ( app-crypt/openpgp-keys-botan )
-"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	if use doc ; then
-		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	local disable_modules=(
-		$(usex boost '' 'boost')
-		$(usex bindist 'ecdsa' '')
-	)
-
-	if [[ -z "${DISABLE_MODULES}" ]] ; then
-		elog "Disabling module(s): ${disable_modules[@]}"
-	fi
-
-	local chostarch="${CHOST%%-*}"
-
-	# Arch specific wrangling
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*)
-			myos=darwin
-		;;
-
-		*)
-			myos=linux
-
-			if [[ ${CHOST} == *hppa* ]] ; then
-				chostarch=parisc
-			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
-				chostarch="sparc32-v9"
-			fi
-		;;
-
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	local myargs=(
-		# Intrinsics
-		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
-		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
-		$(usex cpu_flags_arm_aes '' '--disable-armv8crypto')
-		$(usex cpu_flags_arm_neon '' '--disable-neon')
-		$(usex cpu_flags_ppc_altivec '' '--disable-altivec')
-		$(usex cpu_flags_x86_aes '' '--disable-aes-ni')
-		$(usex cpu_flags_x86_avx2 '' '--disable-avx2')
-		$(usex cpu_flags_x86_popcnt '' '--disable-bmi2')
-		$(usex cpu_flags_x86_rdrand '' '--disable-rdrand')
-		$(usex cpu_flags_x86_sse2 '' '--disable-sse2')
-		$(usex cpu_flags_x86_ssse3 '' '--disable-ssse3')
-		$(usex cpu_flags_x86_sse4_1 '' '--disable-sse4.1')
-		$(usex cpu_flags_x86_sse4_2 '' '--disable-sse4.2')
-
-		$(usex hppa --without-stack-protector '')
-
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_enable static-libs static-library)
-		$(use_with ssl openssl)
-		$(use_with sqlite sqlite3)
-		$(use_with zlib)
-
-		--cpu=${chostarch}
-		--docdir=share/doc
-		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
-		--distribution-info="Gentoo ${PVR}"
-		--libdir=$(get_libdir)
-
-		# Don't install Python bindings automatically
-		# (do it manually later in the right place)
-		# https://bugs.gentoo.org/723096
-		--no-install-python-module
-
-		--os=${myos}
-		--prefix="${EPREFIX}/usr"
-		--with-endian="$(tc-endian)"
-		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
-		--without-doxygen
-	)
-
-	tc-export CC CXX AR
-
-	./configure.py "${myargs[@]}" || die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan2.py
-	fi
-}
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index adbd7f3527df..58079db0b8c0 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 1490 BLAKE2B 330dafeda927ff4c67507dbdb2491c7cb0d47957a4dc207a82755cdbeafacc4e493f875227683ab3f01e02691c1c84050a25fb9c3e33712e9cf164109889a0b7 SHA512 2718e30856604ae4983af8669639d54692176c8c193740173fc99282d3928145957bdd18b9993737ce410b7ef6ff7000689b36e03d19480e65f4e34f5e72f98c
+EBUILD capstone-4.0.2-r2.ebuild 1495 BLAKE2B 1650f9bf0e3212112a728bf1614d07d2c6329e5682fd803552a6d1b6e3e0224c81a403afbd4386819f17e8905682b3045e86e14028e547688280bbba0555d42d SHA512 3e62f6336908d7728a2af90ac6d792a3d7dd4ee23f1f283a25dd9f99193a4f4319eb69cf65099fb778a06b4539dae5e0d4cbc2fcd4290fff644315ed4379a065
 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 5597a9c44c0b..7e0bcec945e3 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 15131e20141a..c0ee3a70243e 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,6 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20160131.ebuild 1184 BLAKE2B 488c718eedb70b6597e407d66e340c3bad3a65e681d3f369023d7ebae446ae6c99b01be83398a95190dc30233609e4866985634acc45f0b1ac3236e67d1c52b8 SHA512 ac97c4bbf62f60f1c79910f19d3b5deb48adcf8fd421b46df35b9525de5534ba3a5028d7f714d0e54701e3bde54a7040ed394b2486ecbbf47b2fd00d6f628fb5
+DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
+EBUILD cdk-5.0.20160131.ebuild 1188 BLAKE2B 8d21e272edf3f5f2aaeabbad9cfca3c109f29f97cc3a5e32c1a944d0313aeaa058ccd1f9920112c2771619574f15382e368ed967dbc719e328fba05c86e9dd95 SHA512 e368a257d963bf96b67796306abff10d9d2c3a0812b04e35f6f0be2d8302890c450d4c38114bf2431fbdd0d92d3f6c9c9689aa145159bd075c789ae94c9ef488
+EBUILD cdk-5.0.20210324-r1.ebuild 1371 BLAKE2B e11d215408de731a943950f9ae1c9c40e41f4c72db57efb7b13a82877cf96f1ee0165241d6eb90c78cd100e6215dec4063ce6b58851bd5851e44753213f0d4c7 SHA512 b272b94c8843b79243d6ec30d7ea6e49af6c0e070bc0cfd5a58e5e2e38a1a9bf3c4a169253eaa8fbee1753b70a7e36337cc264e2d706b36c7a735fafde6c4f65
 MISC metadata.xml 257 BLAKE2B 79047e3de318b37a708a9b29a4f029450dec552f2fa99fc580cea6050eb164eabb0abba972a6fc77bfe21c1c2f4ae437b4753239953c9af1875159c6a39d1519 SHA512 2406cd8512460b934f3b6caa65f52b454fb3946491481e04ba3e11c45206dd9dc38df1d8881c459e9e518e19dfac798388dbb11339e274e75f88b3e3d5f9d057
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index fb5cd7e68fd6..de65e39fe0d5 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit versionator
 MY_P="${PN}-$(replace_version_separator 2 -)"
 DESCRIPTION="A library of curses widgets"
 HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
+SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild
new file mode 100644
index 000000000000..6aee2fbce644
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
+
+src_configure() {
+	if [[ ${CHOST} == *-*-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	# --with-libtool dropped for now because of broken Makefile
+	# bug #790773
+	econf \
+		--disable-rpath-hack \
+		--with-shared \
+		--with-pkg-config \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	if use examples ; then
+		local x
+		for x in include c++ demos examples cli cli/utils cli/samples ; do
+			docinto ${x}
+			find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
+		done
+	fi
+
+	find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest
index 69c80cb2badf..bc5b804028e5 100644
--- a/dev-libs/cxxopts/Manifest
+++ b/dev-libs/cxxopts/Manifest
@@ -1,3 +1,3 @@
 DIST cxxopts-2.2.1.tar.gz 89561 BLAKE2B d7fb74cff9b9381d90827fd3e3bcc7dab8b4dc100b9ff12d98ff4c73400c187c04c270d8c5a019c88e553f8c46c59eda1e5076a1aec944e7d8af5ca6de2326db SHA512 bad2928b4e06efcfa09728dd946426e4fd39715b687c0a5c7b6308dd366cb490fdd8491c9a9778242d97d5be4a383bf9d1c209efe298c6c43bb1eb9daa103f05
-EBUILD cxxopts-2.2.1-r1.ebuild 735 BLAKE2B 0b90b926e4bf2d169759507d25004d8971ab64963c804f94b0f1d3aab375f9fda38a5714517a39c948d274c40a447b9e2691b145ab8bfcb7b3f3792c905707d0 SHA512 af70b42fd7b122d05101475be7fce5e8c4a209c5d49a109875d6e70134f012455482baf7e723010a6989dcaf6290ea36b3173d82d8a15cd69e6f744402f9718d
+EBUILD cxxopts-2.2.1-r1.ebuild 739 BLAKE2B a2bfac6b66d5dcb52a3c600a70f6db44d435426456b6788af57e345c90ff50669a5f38a59c637f180b9145dd8a82b41f28f22f71d29d0aaf50f443642c382530 SHA512 47462252ee046feeaaf5d20a2ad76d7f36c315427c569b5c30bf166b4d826f32de5b75716ac4babd56c90ca4111834d0fbbba0a4f47a30606c04576ba2e92f17
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
index a12d45e45ebc..96b57b0c39e8 100644
--- a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
+++ b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 42d1cd9770ed..f0da11c25103 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 2529 BLAKE2B c6dd69cefc578851654563776f84097817eaf615ab3a2e017ec216f80d42f0fc228bb6ca7a4237b0bec319aa0856a17866636f1c9f96c9fb4fa6ef76cedd4d28 SHA512 a1470a80a5711b505ebf8cc6a643636e239677614c84ce917ca6c1167999fb40778eee35a66a3c50d117fdd5fc9a7d20b00c76c66e71f0d36a4b11f3b3ed9b88
+EBUILD dbus-glib-0.110.ebuild 2536 BLAKE2B 0371202a4ec7de8de93db1c50c9d038aa430a5080a79b255c395015b36e81e0df5b11fa83240fc65fdef175944af22b594a84f321f662dfb1f9e4465393c400d SHA512 219d236d22ed666f7d8109c940101b2cc44f86d352a2f2d5d17f4023c941f7c90766ea3e7deef12724f4bbb7a851d9eab134614f3551483e7dc3bb4def5546ea
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 7a4c8e0d4df1..39943cb7eb12 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest
index 9c37682f5e4d..771333634122 100644
--- a/dev-libs/distorm3/Manifest
+++ b/dev-libs/distorm3/Manifest
@@ -1,3 +1,3 @@
 DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19
-EBUILD distorm3-3.5.2.ebuild 528 BLAKE2B b554e285b744047f91468cb9a4c0132ca0179cb354251d0d9afda88c2549594cd1361a6bda4dae48ad0b5b15188d8d461b910ef11268177dfd4fcabfa97df466 SHA512 75d186ec72e5c5e873c07fb1c40e276223d349e9a9b7a6bdef0cf0416e6b32f47d1a2da9ac2c3e41ca6dafe156197c777d79157bb97797858be8a054a9638bf2
+EBUILD distorm3-3.5.2.ebuild 531 BLAKE2B d3324e35aaff4aee8644473a4e742711d18a7470d3ab21fba35201e1e212037d1976eb29b60a7b0a3d4734ab861dd753bf2f6a9113a2ba9aa68f9b26f97e7625 SHA512 3abcf8bac7f73609c550fa86cbdfc663e950c65c232954b957c25f23612ca84dd7a6d37cea5329a9a1f9bfa13dd31ba29c7e8566336e51c991fb6d0f88d84464
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm3/distorm3-3.5.2.ebuild b/dev-libs/distorm3/distorm3-3.5.2.ebuild
index ca0ec447e8d4..ae5d013926ab 100644
--- a/dev-libs/distorm3/distorm3-3.5.2.ebuild
+++ b/dev-libs/distorm3/distorm3-3.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index d44263ac02f1..332e40f9e07d 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r11.ebuild 8230 BLAKE2B a3cd86b3802d1d6ae29246702551ab953a364aa921596449b36c414b2187b515dc3e1ddf8c79ace78158ee21bbfb63008d79eafb899b0f56810b538cdb203c26 SHA512 a0da02c6c5c7d4a9ae33757f877c8c264fbb266c45b0daebaf7fd05fe8f68584b27ec8287af265d2218acaa336cef53849e1f233b63db5a8c8a6ffbe9c40d300
+EBUILD efl-1.25.1-r11.ebuild 8229 BLAKE2B 627ff25dd5608ff83987f9ffad68216d51356ea2109ff188ab7e17f3e0c5d93815076d4d51e1fdd0d9b74da8bd880000c357c3a196cddb7ccad730c7eb86bef0 SHA512 e1f4a143ac5099c11a5fa218d2ee92d6087a651d9d76830477449e006d783cceefe03aa6ce81ea0ada1b3df22f2816acfd80fd3b681f0382513c09da9a12f179
 MISC metadata.xml 1888 BLAKE2B 4c689687387fb09a2387587bc32e5cb4f09b94264fb1b594d8dc0c1c214eaeb6cf5f39110ea3dde72acdcf328da25bfcd2756dc85c8b060ad64aa321b8dc8a23 SHA512 40289f8c6e10786c8c9d5069b775c7db5695910a33593e706d3ed0f623bdb8b6149161a25ad55deedd479fbc214dac174d6b99151e5167272fa464f5115eece1
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
index 59f6f41ed9a8..868047febef4 100644
--- a/dev-libs/efl/efl-1.25.1-r11.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -8,7 +8,7 @@ DOCS_DEPEND="dev-texlive/texlive-fontutils"
 DOCS_DIR="${S}/doc"
 
 LUA_REQ_USE="deprecated(+)"
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1,2} luajit )
 
 PYTHON_COMPAT=( python3_{7..10} )
 
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index bf6e28043e24..5ab7655d6818 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,5 @@
-DIST ell-0.38.tar.xz 520744 BLAKE2B 24d552ed1bdd55c78aef7d427c40cb391ddedf8f06e77ddd188509a9eca71135b9fe282377bec1a225cb617c7a8bcc4efe6da6eb1dd86596e03ed6ba790b9619 SHA512 e482df8d810b866479c97a096efb8d2badb903bb7fda35ee3bbbaa65652c63f8058188a5ab9f477f835f6a5789a7c5d2eb7db2d9e30493ecd75bd7e71017b6c2
 DIST ell-0.39.tar.xz 523932 BLAKE2B de1cb68347ed9047bb1fe79dc91ed1db7ab466a5610647660a4eb50519c620f8ea28767538d0cb79e3c3de17f884227f1dd957453c56df322ffff2c5856e94ee SHA512 ee525268276aec13bd8004c8211c768c682fbbe4b50d5dfa886a76cfa20be98e867cb2b1850b23fc16cf47b942e21ad272f19ae3d5cff36ce856ae8811938dc0
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
-EBUILD ell-0.38.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
 EBUILD ell-0.39.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
 EBUILD ell-0.40.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
diff --git a/dev-libs/ell/ell-0.38.ebuild b/dev-libs/ell/ell-0.38.ebuild
deleted file mode 100644
index 8d87287e5656..000000000000
--- a/dev-libs/ell/ell-0.38.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/dbus )
-"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1a2520ac05d7..0a347b881ccb 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,7 +2,9 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
+DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 EBUILD glib-2.66.7.ebuild 10440 BLAKE2B f73b51d8b515c8068e1bfc136a10f1ee0d2506002b1d807a5536fa75af8e767f99c740eddd4edda977cbb3395e7c880ace4a05adc5f29600004af7bc757191c0 SHA512 5b6bfcef44dbc7d87cc059df97dda2e57df512811934a85ce753602772952889f62ec046579986f0adf5ad95ba14b7a40b29510f0131cc07a35585790fcb5a7b
 EBUILD glib-2.68.0.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
 EBUILD glib-2.68.1.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
+EBUILD glib-2.68.2.ebuild 10221 BLAKE2B 822070daa1f37db364fbc4b4966f4fde8f4de20375db353c36947a60fe7b80cf85eba329abddbf9901ce84f5bdd8a4d75a8e611494d48be19802c36746d366ec SHA512 e0ad56a716b5e1f870562287f993224f6ad0c2375d4ad75d3490b05003aae99df337bddeeadc737e1028fddff1fd53467f64045bb09679fe734dbcd64c0b7ddd
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.68.2.ebuild b/dev-libs/glib/glib-2.68.2.ebuild
new file mode 100644
index 000000000000..8741bcf271bd
--- /dev/null
+++ b/dev-libs/glib/glib-2.68.2.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		-Dlibelf=$(multilib_native_usex elf enabled disabled)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 6f93213e3eec..4b790641e56a 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-1.66.1.ebuild 1978 BLAKE2B d7f800483e3ab052eb7145aa5b75f77c638d18e2fa157f1fa6688d15c4c8eb5fec5c38d794501a68d594f954d9086ed045ff7688ba8d1ab11e2c005a0090a64c SHA512 3a07d8938879607fc037572828ad66f4e2330b41c9e2ce667ad523c7c6d9855ffced9f731720a70e5f4dc0c75017b6c207ed7613b7818bd8cc0d9df4376a4f0a
-EBUILD gobject-introspection-1.68.0.ebuild 1986 BLAKE2B 59da2442f58a0c2e334031fe5eaa24b138b9f506ba5a12787a31c9b57ef3bdf24721ec43943976d25b948e73fa6679240f306a916681cdfffb239151c3ea4523 SHA512 0e7907beb30ee32fe16c399db6feb2cfdfdd5efedd4f0dfa7db211560e4e2b970281ecd90fb9f3d504ab2058654a16c8f55bd0ff0b676f0a142a065adf7317e1
+EBUILD gobject-introspection-1.68.0.ebuild 1993 BLAKE2B 19e5042b468228bdbd88bd63563dac1ee21d46eefddefc55bde120bba1c3714d3fde11f87fdefe17210ea9684f21e7742a766715655870bf7aa08da5236850e5 SHA512 71e85f8ef705196a0dc10753c37a40c8618f4e24619fea983cc0a2cc2e3df57940c7fde5e7c274f2cd4d1fac07e0a8716a12efc3e06ab39fcc572d6e193b78db
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index a573126690d5..e9c40e78bf67 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 6ee2281845ea..ce8c12a35ebc 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,3 @@
 DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
-EBUILD json-glib-1.6.2.ebuild 1541 BLAKE2B 6c9b9b98a35497cc1358f2548882b64499b41f015502e5d6138d60eb30d1627171b4af6181b095438c3297689c63a2d2af388a4a3225d28928152196ffa008ca SHA512 ec2ef89c5d886b0070297b03b62d1fa99d22278be55cb813233928a8fefa5530051a46bc546e50f9553be4072d6da2b9353c4dfbd63e5f88c42c35bb9fc4f6bd
+EBUILD json-glib-1.6.2.ebuild 1548 BLAKE2B f583b5f61033006655b03cab59a34bec4cf812249ed1e4886f39c4d9c548107a2c9f66c963292dfc4688feb35cd619fd5f8442f33b0a7e94bf6978dea8848931 SHA512 3d06ef0d000063054846e712a5e04b4eac08fa83e35e6d9b726402360c344d8d17df5071c294c9ed14bce8dcd597738511a90d050ec6f1351f45759a21b8f398
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
index 7041eea07b26..1c8aa914c62e 100644
--- a/dev-libs/json-glib/json-glib-1.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index d8e2c013bc2d..2889dce55817 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,3 @@
-DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 816 BLAKE2B c596dfc37bd7857c0079da3da6ccfa1bf0eeae992a442cb7c57dd2e50034d94da1b3639d698c2cb52053a505d48388aa5f03b1a509ea8eb753f2ee2d20decd29 SHA512 b14989000cd7072fc675cc9b87fd7dbf8ea4f00092962b3540d5b8ac5347d9577447e2d51c5b1dca75bc6439fdcea390d20ab08cc1450a2c0223e661d986bc14
 EBUILD keybinder-0.3.2-r300.ebuild 1076 BLAKE2B d62530a41be87998e0e32901852bb08797ff6457774cd49e9fcf6e582a4ca89456ff2d7b35a5cfe09d393a90dceb9039ab454050ab0addf1acfb9f9c03ac06fd SHA512 1142db1016034ebafdaa85765df21e35380bdf127d0a2311494f0cea73d1972a4314696890e9262b1a88877375d7d04e39311268d215681da8ef0839072bc6ab
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
deleted file mode 100644
index 4b3a64bd613e..000000000000
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A library for registering global keyboard shortcuts"
-HOMEPAGE="https://github.com/kupferlauncher/keybinder"
-SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
-IUSE="+introspection"
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		--disable-python
-		--disable-lua
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 5969f007c5a5..ec5bf5c90e64 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,4 +1,4 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
-DIST kopeninghours-21.04.0.tar.xz 62144 BLAKE2B ae90c941716f30bf36cdf46bf0d2d28eb17793b7c9b81773ec6694561e1254bad40dea64481f871ea2dc9f91765cf18a174c77d07113844d3088a1dad8b85550 SHA512 a074c5920439fcc18a4078dbb0df410555725f20d06bc8d9fb4f9c97613a55ae74077c600b77260d7b699e50badbdd0c086e43500e182ce25b1466ce00135b96
-EBUILD kopeninghours-21.04.0.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
+DIST kopeninghours-21.04.1.tar.xz 62176 BLAKE2B c0b8bbc747fdc947eb05980796a0b8c2f6006cff4278ec5fe941eaed66becb8904e05b599a7562680bdfee79ecdc6755bbe4afdd8dec928b7ef404becbd9c3d1 SHA512 dd65c0ef888e5e8b88109eb9e873203f190ca657812d4be72ac59d2ac7910fad9342a47b185af1c6949cd9045f15e1deaae0ac95eebee64d10e702621a8d2fe0
+EBUILD kopeninghours-21.04.1.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.0.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.1.ebuild
index 405678cd3d3d..405678cd3d3d 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.04.0.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.04.1.ebuild
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index dcbd2692f8ea..ac76d0598e71 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,3 +1,3 @@
-DIST kosmindoormap-21.04.0.tar.xz 332056 BLAKE2B d433a262497c1331c4bfec603e0a8707bb47f10534928b2367729bf6aeeefbc9ec830b78432262cf314f8200984445ed669789272710fa3397eefcdc1319d1df SHA512 dda7c38cc586239fa2338e48371262b44823ac25bd5d95e0d1be787620899bcfb0b66cf28cdef6571b9169538057b2b3f2c6af56b0d7d20b86160661a595a624
-EBUILD kosmindoormap-21.04.0.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
+DIST kosmindoormap-21.04.1.tar.xz 333772 BLAKE2B 0b58671308c5d1c69a921212913d82b32bdef4b86455c4b8b25e23fb0ae75da5886df1a50b1e0c97f9eee327ce58c438fb7bc6905dd24ef03e7f3f59c35c5381 SHA512 6645b4718e864edb6208c8fa0651e0c429cfaa1b46b5d77547e01e2935e3e73302a84eee79183fa9122f6d86fc2074db3b9daa73c97cc8bd13683f1ae94f0766
+EBUILD kosmindoormap-21.04.1.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.1.ebuild
index a16f08aee91b..a16f08aee91b 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-21.04.0.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.04.1.ebuild
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 5745eb547e31..5b8c97274534 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,3 +1,3 @@
-DIST kpublictransport-21.04.0.tar.xz 391620 BLAKE2B 745068bfa85f07f87da196d936ec138c8be1fb15e0fe2bd4cbb3364fc3db64b1e0ec1f63ca0eb4252ea90250e6a589f2837da5864e1b39ab51db774cd206abe1 SHA512 0761d2b26fd4cf46c30a8b4aeb69c8d304791184860230f2094503246b3a146deb86b66639e2f0fd1e90ddaa085c7bdf5badc42fc9f3af3b1a56c6920dc5f5e1
-EBUILD kpublictransport-21.04.0.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
+DIST kpublictransport-21.04.1.tar.xz 392072 BLAKE2B c4df8961c8df3299231079b060ff9238091f372a15d0aba05cb62ba914b2f9d52151bddd6d1ebdb6269d81bc45e2363f09804935545557ccbd1382a3bc5fa737 SHA512 3dc4266f296737a8e1d0a7c4792d1247b0feef3038c580d62e065d122494c87fc60cb79babbb9a0aafcc7b9c55bb0498771c572fef2ac767cfd487cbb06cf6c0
+EBUILD kpublictransport-21.04.1.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpublictransport/kpublictransport-21.04.0.ebuild b/dev-libs/kpublictransport/kpublictransport-21.04.1.ebuild
index a5fa8262d790..a5fa8262d790 100644
--- a/dev-libs/kpublictransport/kpublictransport-21.04.0.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-21.04.1.ebuild
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 4fbfd58f0b90..58ecff4e69a7 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -4,5 +4,5 @@ DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200
 DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
 EBUILD libcec-4.0.4-r1.ebuild 2018 BLAKE2B 36e7fd1cac2551febd35fa3d0533bf9e06d8d5c8981283c6948acb78c1fb2ca405a80113afd3b31fecc315f271442a4c589d02ad300c0461a4615a0e456205df SHA512 619a8dec29e7aaf7daee20f79ccf8d330a4cf199054568f4be98e9d23f09d20a0aca4c389d0b41036acc1d53f0bfe749d70148cf22efd9aa6502d27f57a6ed0b
 EBUILD libcec-4.0.7.ebuild 3271 BLAKE2B cec8de0c00a3976c3eff2e8631846f5a175ea00129b32eefc37dbe9d3000c594aa653e4cd6f5f673bc2eb0db6de1bb18a3ee16f258871c826afa43cd1ff9869a SHA512 79ffd559dd8a0ae22622571ceeb73616574fa0fcf1b0db876ec0bf92fb9d22ad5460e5119abde10bb977e51027609fca6989f372173e7e3aa72960b503218a58
-EBUILD libcec-6.0.2.ebuild 3266 BLAKE2B be938ad3a2f57a01a66015df0d2c5529ce950dc1583b8fc34414932902f4cd30c1dadc9f254c003bcd52846301b41a9c6ca93fe3b4fef348866cee5d71104ab3 SHA512 b2e4302d25d1533fd60cec507472c8a93d40aea7257fca4dd090a2223f4e9723229554997b33246132524c33b09c45926f3e1467512882374b4433617654e2ad
+EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B eae8545464fa0f273c00b69a1e44e5a8fec9def4d29595da76524f50ef62c37d6fc078bc73cf69b506d5414cb4d5753fd3c702d4a94444d5f78d745b4a9f32a5 SHA512 0f28d398a4e87f7d412f399600522a963e31e0ab9bec01b525a82e336c859231c3b737516321d3955ae49728b6db3f5780fa3d41af34734d38f6960166329716
 MISC metadata.xml 911 BLAKE2B a1c97593e181f44ae3c90ba70e8d36344272663b3d7090ca9b2716df532903ec821009321b0183dfa82b6c881349f559216ff040ed1f45e78c214c8601ab67d1 SHA512 7c5dd62ea6d854fdc4e7083487e141c703543d7220ca98fb9431279080ead371a42ee386d1c015dbfc3ea96e183cf4b8f810d8a6a5791d58aca4b3cdb38a7dab
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index e4f03cb101b1..c118e5234689 100644
--- a/dev-libs/libcec/libcec-6.0.2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index dcb3e905bf26..097e50b7f425 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,5 +1,5 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
 EBUILD libfastjson-0.99.8.ebuild 798 BLAKE2B 128eb7191ddb61e58a1fbf7a0d3628c7e2be7e75b95b177e9052c41f29eea8fe0f286a6fb9e3980b0896ac0626bf05618e6b5e51d7166113f758f20401fffbb8 SHA512 9609f897070f08b031ff226023afe58db45cd34b2200c5f636d71f1bc1665214e054004e3117edd5bf0f01fc1c30cb4542e0fbd9c2b24c91bab5c29b6945526b
-EBUILD libfastjson-0.99.9.ebuild 797 BLAKE2B 879d9774b9fa08110cc2f2a4d5b93c8b8838e310b0d6d7af66c70610bc4bdd99980127753bd1016315403c0dc5352a4a938165120b933f0fc1168113ffebfc1e SHA512 99455fe6dc1f5a25fcfd54a3c7f5bc716fae37b4e2663e1048e47faa7aade7d43ad484db52b625737459c769f3829f816dc006b11a3bc515dce338d4baddb113
+EBUILD libfastjson-0.99.9.ebuild 795 BLAKE2B b57d5436f2f39e460fa6634aad2a15849c59add08702526cf896cd676c7a16c40b38c95c65b85742c93852bdd69ea5ab7a3cdd0dc2701943a231d01419a1960f SHA512 3f15bfcd722b95943d5279aebb79e16fd592a279cae859fa2fae75ac461fe574b865a78079ffa35680ff6d28b01836237d035fd456598481abf5005ec2c21fab
 MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
diff --git a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
index 5f1435d24f4c..e398fef4b3d2 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.3.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index ed3bfd3deb09..8aaea10d0383 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,4 +1,6 @@
 AUX libfilezilla-0.27.1-gcc11.patch 220 BLAKE2B 5743c8ed2df0d117aee62975bed5ebffba16d22c6eed428fd9f87538197ae7c567108c3176fa04d22f83fddbead71243316d2ac983430d7e32691779f8cf3a38 SHA512 4f0fb68280d4f2ab583bfb7239451449b4b32677c3294bdc21d68565898c003939441803b5ad3a002e2bdbd7224e014ece4ce5f3d68d47ead09d18933ba63d4f
 DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
+DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
+EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 MISC metadata.xml 1135 BLAKE2B 403d46fc71d4b6e9bdcd741cbf6ac8f911e35f998253495834db8346fec1fd58066949877e4d14e1bba895db0d05690ad9e499d5772a82fc08e99ee7ae8f23eb SHA512 87e61d89897246499ad56b231afcb9beda85d6b1f67c5c9dbdaa754e82d556a94a6df77836c11c5d5fd7c0a6926155d0cd77f17acaecd2e279fd9a63fc915404
diff --git a/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
new file mode 100644
index 000000000000..f0acd4e96389
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/13" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index 6bc6dff3d204..927d7248652a 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,4 +1,4 @@
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
-EBUILD libfstrcmp-0.7-r1.ebuild 938 BLAKE2B 287360a9f02417cf53a022c0536ad950a28056b462f5dd4bf640c45310c8e0c1ed01a56d14e4d40b656ef9be719fa49f105a4f69f499725a12a1e425c1147116 SHA512 a23ee9fb8b64391c14c8252f4390bb9d9791991cf0c81be637438cf3cf8871703f1821a257c583b53538616b62721cf7a7239d6de4f0c58d531fdf5fd996cf24
+EBUILD libfstrcmp-0.7-r1.ebuild 937 BLAKE2B ad6be66e45b816a6782a94bf6d0480de43a7ab72161ff484e759ed0d2cfc7ae4bad14b685609edaa63667c60a4a7415fab1245681ca43cff5e106309e13f7e02 SHA512 ccaabc3f5c1144b11ca602aeeb888ce8c0bc561e5026a88a3f6da1e025512b9e6d8c272e4e167b27b00fa0b71e08bd2a25cffeac13cf901f6a206e32980fae9e
 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
index cc5b6fe41c0e..91b138c2f406 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 x86"
 
 DEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 2c9a77c194a5..d8443b966cae 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,3 @@
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
-EBUILD libgudev-234.ebuild 1081 BLAKE2B 26c021954778132e9f1cca77f2a1bdf55bf322579ec0bf5ea7a547661c1ca36d17aef91fa50694f86f95e50cfbdd117f04f17eb6dde89e1987071ceb08659479 SHA512 e9c13dd47f24324f4d13754cdb4540d341abd27d457546cbaba1d0003e513db5c52e990915ea4d9cf2744ec261f07506250cb4ac560d284ed6654c1006fa2e70
+EBUILD libgudev-234.ebuild 1088 BLAKE2B fe5aab5e9c54d398446439680fbe90c11e1d8a4372effb36351b7b756c770591ac2c7526fe1007fb885dd461e761590c02d6c2ee9742ce1defd980d2ae88d3b2 SHA512 4e471b21732297933f8b6e48b658135a5b13f05d866059d0585c6d1b064c9f4a817c4d1c6429900f3191fb98f8ed192405281784c64b907ae36a825881fc88d8
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
index ad003efac93a..0bfe45d3f9f5 100644
--- a/dev-libs/libgudev/libgudev-234.ebuild
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection static-libs"
 
 DEPEND="
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 5b4df4799c9a..b3be6a8b420e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,10 +1,7 @@
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
-AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d765cd7968ce148e42cf3cb13cbd3439d6d802352101a4b3a07f4a8f82b7e151f2239fbe8d792ab536707db75347dd SHA512 98b0b685676e7aa54e49050ec8adab4bb6cd3827fcd3977c156d841a527268cb47b3227852036f4bb195931ae8295fa6761bc96f4d4042f059193ab6f75aa27a
 DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
-DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
 EBUILD libical-3.0.10.ebuild 2426 BLAKE2B e6ccd11cc43c019987229a1a88db9d9f41aff869c18d1d457ef7793193ae0144fb58071cc12d1bbb10b59142a094f89fc5c8c126af22146d601a622e328429a7 SHA512 05c59f5fbb58bfdcb1457af1b75debfd7fc0f55ebff929661d981822c8e928dd228dd4ede47477498f6c795a5f4d25d148154be5ac6c8f21ac6513f5288fb207
-EBUILD libical-3.0.8.ebuild 2329 BLAKE2B 072647dac4c4201e08c647feda8eff2a57810055beae2074c3d05bd249d708d1b64609304955fa270991c154bfdd9a141aca47e00b49c74f2f4d8ebe149900d9 SHA512 6bd7a557255734399a525bb9b0f47c834fd711ec2f27368d5e6c6374dfdf13ac5804caa8656f74c1283bc07cc5a6e9a4291d78ce36ffc3f64393dce9c1d52d9a
-EBUILD libical-3.0.9.ebuild 2422 BLAKE2B 097a119eea70c4f138b7db60bb038bf1559ddc5b09ed11427eacd6c2591690bedf707d89caf962fd2265fc566ebeeea513f6ea15426f2df6fe43bb79bc03a8ee SHA512 556de64fddf6ef83cdcdcccd5c023ef15a7ad131de754e621af15e101596608a67080530567c60f5485dd6bd19e3136ee7211a96c9ed67662ac5edb90dbb2f18
+EBUILD libical-3.0.9.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
deleted file mode 100644
index 1974db76b0a5..000000000000
--- a/dev-libs/libical/files/libical-3.0.8-icu-68.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 11:24:34 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/libical/icalrecur.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
-index 91522161..159163c5 100644
---- a/src/libical/icalrecur.c
-+++ b/src/libical/icalrecur.c
-@@ -143,6 +143,7 @@
- #include <stdlib.h>
- 
- #if defined(HAVE_LIBICU)
-+#include <stdbool.h>
- #include <unicode/ucal.h>
- #include <unicode/ustring.h>
- #else
-@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
- 
-     calendars = icalarray_new(sizeof(const char **), 20);
- 
--    en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+    en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-     while ((cal = uenum_next(en, NULL, &status))) {
-         cal = icalmemory_tmp_copy(cal);
-         icalarray_append(calendars, &cal);
-@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
-         }
- 
-         /* Check if specified calendar is supported */
--        en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+        en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-         while ((cal = uenum_next(en, NULL, &status))) {
-             if (!strcmp(cal, rule.rscale)) {
-                 is_hebrew = !strcmp(rule.rscale, "hebrew");
--- 
-2.29.2
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
deleted file mode 100644
index 0c4155a9bb51..000000000000
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	introspection? ( dev-libs/gobject-introspection )
-	test? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-COMMON_DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-	glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/timezone-data
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DICAL_GLIB=$(usex glib)
-		-DGOBJECT_INTROSPECTION=$(usex introspection)
-		-DSHARED_ONLY=$(usex !static-libs)
-		-DLIBICAL_BUILD_TESTING=$(usex test)
-		-DICAL_GLIB_VAPI=$(usex vala)
-	)
-	if use vala; then
-		mycmakeargs+=(
-			-DVALAC="${VALAC}"
-			-DVAPIGEN="${VAPIGEN}"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
index c90785b00456..5ce88999e056 100644
--- a/dev-libs/libical/libical-3.0.9.ebuild
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index f78819fb2228..ca77d4d923f2 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,8 @@
 AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0d1eaad48c1d5b40e774d368923f764b6030a090e414fcb9851e32a9d582691dc70fc04da4d67386db53489db2feaed6895 SHA512 0318b24af8671043ee9e5c547734f6f768ef21b122b23ab95f7d1a5dcfe6c2c9579db87633a765e9bc83915d2097d3e2f3b6320cdf094106e3bf87b72d05d461
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
+AUX libiconv-1.16-fix-link-install.patch 968 BLAKE2B 29d67eb01de00f68b1245a8fe521caf3da262ac0d78da615aeec1e67e08220e6366e1cf708775217e94e282a7b6c236edc322016c3ebdb37486f5e789e4655a1 SHA512 fe5b5376f491df5ef2d01496232e56742b86d52ef043dad21993cb4f463b404c0b8bfaf46ef7fb0d3d8f19504af9875b5096c6a4392ec0666416e0389b1d1923
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
+DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
 EBUILD libiconv-1.15.ebuild 1883 BLAKE2B 6465ea829fb9c274e600dec8d0b8f382f20a09acd096e25a78ac1935ffe0e1660fdda712605939e88d3b36edb059f9169af00e2fbff77ed8fd2bf5ca4d88b092 SHA512 185a8b821546553392393034c8b926792db378668b88b9756bda5716c949edd49f6eac2315e408ce7e0cc9e6be875ccbcc7a82d235824db035aeec8dbf82a745
+EBUILD libiconv-1.16.ebuild 1731 BLAKE2B 0982de773367eb76cb0a3af53abeac7ec008900070311eec938e8854a4e374a483cc9c4fcdbd86eca68ef8d34254a3f23d7e24721efa7a1f5295b3e30a097e8f SHA512 7ae0e738562c546e6b02a595b43114c0efe685165e92969360d30746fc8fa62d87b50bacf90191de4eae14226d01021e2778de369d9eff93ec64bf60136b3747
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch
new file mode 100644
index 000000000000..022613463a7b
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch
@@ -0,0 +1,12 @@
+don't link against the libtool archive to avoid recording ${D} in RUNPATH
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -113,6 +113,7 @@
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
++	  *) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild
new file mode 100644
index 000000000000..6962ed176257
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.16.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal usr-ldscript
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="LGPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix static-libs"
+
+DEPEND="!sys-libs/glibc
+	!sys-libs/musl
+	!userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15-no-gets.patch"
+	"${FILESDIR}/${PN}-1.16-fix-link-install.patch"
+)
+
+multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+	ECONF_SOURCE="${S}" \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
+		--disable-nls \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+	# If we have a GNU userland, we probably have sys-apps/man-pages
+	# installed, which means we want to rename our copies #503162.
+	# The use of USELAND=GNU is kind of a hack though ...
+	if use userland_GNU ; then
+		cd "${ED}"/usr/share/man || die
+		local f
+		for f in man*/*.[0-9] ; do
+			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+		done
+	fi
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index f4c0e5d8fde0..6f4c39025943 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -2,5 +2,5 @@ AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef
 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
 DIST libjcat-0.1.7.tar.gz 64818 BLAKE2B a39bba9f82316e26f2d758d0ded6260968964404cc4401afb34cac2e74aff9649fa16ea28a9aceb72ef7d2d6ae45d25f8db333b212460f8e2e1c2e5649b76b68 SHA512 b22e4aee1e5bb396375ec50fb0a28544a52423116fdb81ce886638d56ee3003d3756339a4965aa0f27cb51759180f51075bd6eee6ced54b295a931c8cab0c519
 EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
-EBUILD libjcat-0.1.7.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
+EBUILD libjcat-0.1.7.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.7.ebuild b/dev-libs/libjcat/libjcat-0.1.7.ebuild
index ef894f74d4c7..5ba6f9393cff 100644
--- a/dev-libs/libjcat/libjcat-0.1.7.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson python-any-r1 vala xdg-utils
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 2c890e3ca1a7..335ab85f731c 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1,3 +1,3 @@
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
-EBUILD liblogging-1.0.6.ebuild 811 BLAKE2B 8da3ee3747ef3fbd718ea07bbaa00642bd2515c4897987a714958f681b8329c38d2d6b5c9b79a3d9535d8fd111cd57c3a175cdef4f5b42675522dbf3b1ab572d SHA512 5857f7acafaf7fcdfd07ca4962e57f2587e018d0d0d65829855558ebdb84c1abce2ff4953320bda7294516c3445c6d8571c8a4388e154046b7ed492658e5299a
+EBUILD liblogging-1.0.6.ebuild 810 BLAKE2B 4015df99b46b43fad2befc7d5ee3b12902f42e11eedfb1ac804951d0947dc2d1fed913c4b618b6c35416f498e226289dffd9f5a8e9c204ec1cb1c715faf67075 SHA512 8c06267b26c322caa53260dffe886aa074d69bfef0509e179a206f9c970001112c9895197b91e96dc8d95d231c1ceb1647c8114753d3a325a716cae12bb6abef
 MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/liblogging-1.0.6.ebuild b/dev-libs/liblogging/liblogging-1.0.6.ebuild
index 984f20ee1e7e..0ec4b2bf7fa0 100644
--- a/dev-libs/liblogging/liblogging-1.0.6.ebuild
+++ b/dev-libs/liblogging/liblogging-1.0.6.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://download.rsyslog.com/liblogging/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 arm arm64 ~hppa x86"
 IUSE="rfc3195 +stdlog systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 4a8428f11be7..7a5b89209931 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,3 +1,3 @@
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.6.ebuild 1521 BLAKE2B 82fd6c76b213a4b25da93b4861f5ec3031cea456a475c0b05bbbe68030488999ef6837b09d9fbf998c53e93844fb077e894b6787cd062c8baec8c5a6272861e6 SHA512 6b29928192b90f1105d38327e6ed33e5441f6a5c7bcefc5f65752379a8aec5016c5caed4e05dac91628be09b88d459133bdd48c4eeb5e24768d2cb3d0fb900fa
+EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 7c09269c28b58b3683cd9797da9afe33c4aa386819dffba2170907e6951eb193ddfcea204d880b69ce5e21d6aae247e141544a46cd7a14499e4490c6853a346b SHA512 a2d8cbb5a80101a40d1fc77d2852cf8fbfa3bdb30c0dc6ba296b23101e628f63fc88b82de467a5b6a6c1f26f561c08451990936986ec871ca28cb8c7b90e9c53
 MISC metadata.xml 472 BLAKE2B e24cba421828553b07e63523915569f3d14267154fec093e0efd8aa7d7ccf374de0fc11d7e97760e40fc84702ef7e3b59c4a25ca79ad3c5dea8ecc00b7fb387a SHA512 6396b38b17ae624fb4836c838119a40784a5473debeec8c933997aacd40b97e224a361892b5f20e9fc173c85e20d45a9721fcae485357d6775dad68a822339ab
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index 0ee542364f3b..ad0b574934a3 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a5fdacd4970d..3b5dea0e21ae 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,8 +1,4 @@
-DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
-DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
-EBUILD libpcre2-10.35.ebuild 2482 BLAKE2B 626d4e8b07d220fc5da8640fe180b60636e037057f083e4ab47b69d036f93b09de7fb4f5c83578fc7f76b74c7f2b2e42c03c4d7db6e237b623d18f7d9f988019 SHA512 9fd07ac07bb685bb1355b02bccd9755fa2bd1dac3f3879e1ecfd2772088c0b7827e7f6a76e5ae9d78c7bb6cdb81354e01cbab2eb219465dedb4d5b1c9e10562b
 EBUILD libpcre2-10.36-r1.ebuild 2482 BLAKE2B a569108de5f728ff394048a43b3b2fbe4dd0007da77d0edfa04a5fd973822658e138cbe48ef700a07b8a19b2993e44fce9fb0aefb50cabe285338a63f7b23bc2 SHA512 33af5c3113fadfd29ed6d9d56110be92b85d5cc905e4cbcf69606ef1b797285558106b72135b8abd07e720c0348b1ef7e17dc82ae0243590a5b5ffd314f370a6
-EBUILD libpcre2-10.36.ebuild 2489 BLAKE2B f85a42c119e96bdec00f6e3a74141e670e9da7a0db2fd9328068c647a16a934b589907b05f267ad5a574f1b0f32048e3ed461849326a789c13b93ca56bacaf4f SHA512 37436173e30d3ec421c37fc1793bdc1f68f5c126f511255b7710ba654b2972b42b1de0f5c53f1d7575a629c50ac66b1ee36f024dc60b760d9e55d0ad253e7c82
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
deleted file mode 100644
index 1dd456dbaaa9..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal usr-ldscript
-
-PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="https://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-if [[ -n "${PATCH_SET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-BDEPEND="
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-"
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
-
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
-		$(multilib_native_use_enable libedit pcre2test-libedit)
-		$(multilib_native_use_enable readline pcre2test-libreadline)
-		$(multilib_native_use_enable zlib pcre2grep-libz)
-		$(use_enable jit)
-		$(use_enable jit pcre2grep-jit)
-		$(use_enable pcre16 pcre2-16)
-		$(use_enable pcre32 pcre2-32)
-		$(use_enable static-libs static)
-		$(use_enable unicode)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.36.ebuild b/dev-libs/libpcre2/libpcre2-10.36.ebuild
deleted file mode 100644
index 7e73af9f5258..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.36.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal usr-ldscript
-
-PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="https://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-if [[ -n "${PATCH_SET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-BDEPEND="
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-"
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
-
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
-		$(multilib_native_use_enable libedit pcre2test-libedit)
-		$(multilib_native_use_enable readline pcre2test-libreadline)
-		$(multilib_native_use_enable zlib pcre2grep-libz)
-		$(use_enable jit)
-		$(use_enable jit pcre2grep-jit)
-		$(use_enable pcre16 pcre2-16)
-		$(use_enable pcre32 pcre2-32)
-		$(use_enable static-libs static)
-		$(use_enable unicode)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 6b828a05acfb..7a771958d661 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,3 @@
-DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
-EBUILD libpipeline-1.5.2.ebuild 660 BLAKE2B 3e25748545e8ad9ede9fb984ed0268fb1d722330812e56dfc050afd19ded2cef7fc44f3c54412753ee46600027cb1086c22659452e659ef4b0e1d6b53d07e8c6 SHA512 da522a788eeaee490856730b7aaf739f28b56917f8c96a734201791b0d74f5401ea05bcc1c6b70a9a068a11f20318f5bf2b6afb25dabcbe5c7c934528b71eb68
 EBUILD libpipeline-1.5.3.ebuild 718 BLAKE2B 94a758c2901b0f9eed957679cbeb2d57e9b12c6e99c6f2ac32ae2a4a52b492780e210ef9ff4300ac43a8d077b54ea840236aec8dcc9e925a175f38aab892604c SHA512 6549cc511528332a602e48e7469a878cd6352c54ebcb562cb848395ec1b7990b9b1779d8eb260d2c3714bf92ff229e25ad95f1b722937732640c2f42cf77f5ad
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
deleted file mode 100644
index 49a89ee95a4e..000000000000
--- a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="a pipeline manipulation library"
-HOMEPAGE="http://libpipeline.nongnu.org/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="test? ( dev-libs/check )"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index a4b3dbf4b0a3..e7ae98069743 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -10,6 +10,6 @@ EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.6.0.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
-EBUILD librdkafka-1.6.1.ebuild 1960 BLAKE2B fbecafccc3028981e5820e6e2a59d8c812135f1391b6e64d6bd4f201bdfda58dba274aa3b8aabcb33a05a4630ce947d5bfaf2ba4c39fd004116c7f1b9c6c4ba0 SHA512 7031c0242ce441df6ed5d26c6b5cd5d3d13732e6b1ef64d19e1d8a79e2c8300638d710e42b392815b3544715d5496f2286bb87be45613fccadd37239e5afe34f
+EBUILD librdkafka-1.6.1.ebuild 1958 BLAKE2B 246694451625e1ca35789379fbb921d58dbccd6deec96ac1ce535dcf53aefec352b2d945a3f85dfbb8cb99da44f3bafb7401c500cf990ee7a32cbdd98edf9b63 SHA512 58c9f3868b6efd6a6b7d2b3f16763756cdbe6021b8210be63a8bdfee5ab363c6532384e1d9dd13f0a75da81f92c137f54309908f5f1fa0c33c5285ad8f495a65
 EBUILD librdkafka-1.7.0.ebuild 1963 BLAKE2B f87cc24c5f701f0347fbf6dd9092652a51159d514cd905adf3220370fd2673310dede62096fc2f7017f5a4fe9cb58c15061c95bf4ac014ca91f051919217314c SHA512 79693522afae010ac530d14a8155007933b5e30b0dc0545970973bd1c846d0d9ef3accce80d993e164bc49b3d2e905193d82cf3ebe0e55820aa705b6e6687765
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.6.1.ebuild b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
index 34c76012da45..ec837b5e0617 100644
--- a/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index ddaca8e415e6..e640ffdf2d29 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -4,7 +4,7 @@ DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5
 DIST librelp-1.8.0.tar.gz 539467 BLAKE2B 3d1d396059955d2b83a21a42838b56c6a18cde296e6b7c4beb79ba9a8d222d7e5d738419b87b24ed05da553cb16fd827e8820c4c81c50d5a3770ad745efe3ef5 SHA512 aa3e02010cdd4587ff28987f00291708e752b2e2f5f37f5a5239bda6992f55cf428cf1b6e06847062be31844cfdda6b654bcbb9024dff943d140b405ec93c0f4
 DIST librelp-1.9.0.tar.gz 540477 BLAKE2B b42e35e2f3e310cc4a978a6d2f0a127317414d93d87bede5e1bbe69e3031482b4d895bba2256668d383911e2ef55cc3086a44d8bebb15ea56c6ebd28e64e545b SHA512 3cb8cf2707cff662bd0b9100c737458b6b96820db7e362094c77cdb50455fcb944d7760921e0b758a3a6cd15d685f488a976fe909de034c289635c660caae723
 EBUILD librelp-1.10.0.ebuild 1349 BLAKE2B 19b0930033e0bb71badf684b5e48db6c92fbf70ce9ac7edd7817b1555e5ba6c9aa603d54696c2e7d1eb63168e9b9bc18cdd9a519f68593fa812dc8200d09612a SHA512 10439fceec27a98cf6698028404a3a475f0b649218b9038ed496ce47d76b32a9ff5731596499f6275201521a73ee45711731d1160f0a81696289a2b7a37a9b30
-EBUILD librelp-1.7.0.ebuild 1400 BLAKE2B 1660351b5e7e2a635b15a6328211aa4441b4e3f06b1670a6860f749fe833fe61f7af034e203572cce34fd85c2f890d51a56aec7c3ee72e61de6fefd7c0741fc9 SHA512 c8e6d135836926a4de5159a837a4ae3ea13f3f041c8ef050c3226c05b0bff52d0d87f25fab462a99cc295f09c7fc2c6abc2bfef3f34a250625d55f0969820355
+EBUILD librelp-1.7.0.ebuild 1399 BLAKE2B cca3ee429679bbb3034b7ffaacee4a33e2e44c53ae8ef4952700a41d9e90404d756f56ee5aee581b44d2b61d2187e931c4781ded32ba87db81ffa71be8daf3e2 SHA512 b56657e77d6b8d8a35d79472b629c0eb44291cf5c887200592c267fa7a24ba7d109110f15002f75001c1c4aaf2249ac3bd48fd8f0bb6ed5372f169a642227478
 EBUILD librelp-1.8.0.ebuild 1352 BLAKE2B 095e292659e768b89a6da33ef46deff039b51eb90958cef597841be7e185b3276422f2255ee78af5295c4d73171536c8fcc36c7e877d218fe07f1825f4a7f12f SHA512 e37ffe38da9bcb306832066786f26116629182c4071257fa6ce00e43d6ed86d319bef49806db30c2bc5ea8cdc107246ab47f2d9ddccecbd7a12dd140943d97b6
 EBUILD librelp-1.9.0.ebuild 1352 BLAKE2B 095e292659e768b89a6da33ef46deff039b51eb90958cef597841be7e185b3276422f2255ee78af5295c4d73171536c8fcc36c7e877d218fe07f1825f4a7f12f SHA512 e37ffe38da9bcb306832066786f26116629182c4071257fa6ce00e43d6ed86d319bef49806db30c2bc5ea8cdc107246ab47f2d9ddccecbd7a12dd140943d97b6
 MISC metadata.xml 348 BLAKE2B 2af0e4639968ab3b7e549bd57d42637cf2f6938a1e00d78f90b1697462a76f92adb1396ab3b6966cd1dd433870c5eb23cdf75e8ee9b022b4504d1b639ec39007 SHA512 c294b01d94ab0b79a0552cbb0208dd02dcc022ae8a3b8b8ebcebe4ede39ab9ae01a53af1b5bf28133ba9fde4962f874f351b21979d50e058bd9fede0c5c46f96
diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
index 63acb047a4e7..5b9aa08070f0 100644
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ b/dev-libs/librelp/librelp-1.7.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="debug doc +ssl +gnutls openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 4f1c3f122025..d28a7b8ac9ee 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
-DIST libsass-3.6.4.tar.gz 338519 BLAKE2B 9d312e36e1ac40dcce3aa29728e66643de28da7f2244c8fc987c9a1de7fa0fa72fd5bbd4b5a218c9b53652bd0de469141dbf1b4ddecb7f98405965df946cf333 SHA512 1f79553be31949d45adf440dcbcf4b828a7e4f71c6f63f288f99451fccc490ebf0c68c58d91deabede37962e35a8cf9af8b0d60d89349fd0adea1ac061c8c2c8
+DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
 EBUILD libsass-3.6.1.ebuild 1116 BLAKE2B f1174691608a060b863409ac34e986c11bb93b2c303065ea39dde346b4b4b5305629f52a1c6ec1c9b76d602610148d51a8c3a2b9c4115ba6b9c342e46ad9a8d6 SHA512 3d47a99032af3fbdcd6542675c896d330c68c8d36f1844dc5425b3fc5601228a22283812fc0b0743a261e103dabcfc2bcb5b0fd4e30a2bb5ff6ca8812f93ea1f
-EBUILD libsass-3.6.4.ebuild 1128 BLAKE2B 33dab1e807300f7a942697f794b08fc72d1568cea92737eefbccdb878159e9eed49c091ca6f6045cf4d40c64bee1705033ca43bf844275febb08681af8ed083c SHA512 e0f1d76a0c2794f7b15d4d0c34d2e9a67854930f32ab4d02bab78ef6acd59f32e601dbbc3d2103c6325ff0735157af2968ba284c2e2d77c97c51e5aea2f91164
+EBUILD libsass-3.6.5.ebuild 1126 BLAKE2B bbefe2fa8209883f070511b083dea9c288882a8f310016999cf89d8bc6684ecf7b98f7ddded6422f202a24d326e09246c0d6625481e1020bc415f66a026b51ea SHA512 7cbb23f3110bf0f77d8c9eb5f340affd585765b608df598996e9dae2150a244f537ee2eca21dfd01f165437d7b384be680003e06e36034ee40a39a77d837e837
 EBUILD libsass-9999.ebuild 1122 BLAKE2B dd8f690a7536279a14bd0bd839c7db6d19e7b64d6541aaae28b546754039b77dc1f765f40792e4e06b5a12439a827da9b0f46ce2fa1ae026a718d9c4d3b26122 SHA512 4015051e835f2f73e19f78d2d6d65146d904cc1683432065fc13c68a3860767102e11aa5be5f13dd17260718e47ebff4bd92c0908a72bf95eea7966c433bdc13
-MISC metadata.xml 793 BLAKE2B 9d318616476b39f9f833b523007453f4c8671157a2ea3387b51d01f9298ca01fdd58e31031549c587eeae8e4803753358716c02308219c6f37b0b4ec2c099f14 SHA512 8f746615d9a4b24721d8bba0964a54f15815866d9e1bb6b5890468a08c152b332fd02e81ac45eb3ef0c0b292e892f48d3db3789510bfcd500b936800d270be43
+MISC metadata.xml 646 BLAKE2B 7dbc39b7729868f912149eb31c37836ed36f5547ec1311a203828425eb3c2c37fa5e03d5e5a8a66bc8f043b58766a9482b2b2582a031f0c2f8adc2c3543d5646 SHA512 f9b5434ef5ee1fedf1ade9bf69193729c9e9e66763c772fec3bb597fbb1149462c82eb5c4a6ab7376c9cc58a050931a8b2d4a33c979d38bc8ef06a86b42d5780
diff --git a/dev-libs/libsass/libsass-3.6.4.ebuild b/dev-libs/libsass/libsass-3.6.5.ebuild
index 14f45c1d6db9..073da665f7a0 100644
--- a/dev-libs/libsass/libsass-3.6.4.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index d97f05d217be..e76a60721873 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
 		API. It is coded with portability and efficiency in mind. You can
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 2eb30b82b927..4e552b466d78 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,5 +1,9 @@
 DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
+DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
 DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f36ee15eedd8d2ed0ad1b19933600d04669f9082053ba20543d2195e8833b46a2056055da23fc2ceb1784d5c96cc9 SHA512 4ec5319eda5c0809f1971044152ec7aa142742941644f43ec3944b248667d5694b97a30de8ea0e2260265bbf26a2ffdefbfa8cac5016799d26b92b02411b1c51
+DIST libsigc++-3.0.7.tar.xz 790604 BLAKE2B 2363fda42744c3c4a2c31f236a2160f8dd63bae098e8190e2ef20acc23296de26cb7c275b928785c99c33d23f15709e411dc51f973d4fdd6a0556b11b0031512 SHA512 0ce4b56d85ccb0041096e2241523b9ca5bf0fd52f9655d2216e2280d5902075a4685023aa60058eb8ee9b7ed0ffc945d652940b0bda73f2fc7ce4de7371ca984
 EBUILD libsigc++-2.10.6.ebuild 1377 BLAKE2B a98f755e46f8b2c9c7e6618e6701be08905008bce599f3351663af2bc642c6a1e7b196a3803badfe2254380fe470ebe4ce03cea0fdae591012aa95f2674e3d7b SHA512 014c99c199e16540c482d2d02af97b6a5380b2e45c9cdfe63a122ef668eb53bd41c4e84074c1efb9bf1a5084eec348ff93caf566efa1c0c4f8f4914f8face3d4
+EBUILD libsigc++-2.10.7.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
 EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
+EBUILD libsigc++-3.0.7.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
new file mode 100644
index 000000000000..444e6596071e
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic gnome.org meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+BDEPEND="sys-devel/m4
+	doc? ( app-doc/doxygen[dot] )"
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local -a emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dbenchmark=$(usex test true false)
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	if use doc; then
+		docinto examples
+		dodoc examples/*.cc
+	fi
+}
diff --git a/dev-libs/libsigc++/libsigc++-3.0.7.ebuild b/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
new file mode 100644
index 000000000000..9915fc5555e0
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org flag-o-matic meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local emesonargs=(
+		-Dbuild-examples=false
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	use examples && dodoc -r examples
+}
+
+multilib_src_test() {
+	meson_src_test
+}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index dc875122985a..d3df7de7bb0b 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,8 +1,5 @@
-AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e333932a5f17e6fa289bac4f014d71a8acdc89748a30018ed8fadfc7e9410e30dbed70889ea2227ecb8e6e30b2b044f435cd44d3d6199d SHA512 be805ec8b11ad97a3bacdcbdcb80bc22a3be8fd1de9d512b7dd44ab207d1cf3f7db1d60af2e4c4634dcda37031a754d678ea8dab76cb23dcaf7d7bbd9683ce86
-DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
 DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
-EBUILD libtasn1-4.13.ebuild 1163 BLAKE2B 4934861cc72fc43601fe3fd74a8457281b8026cb71e8b6352464c7065762d4e66050da9dfaaf816cddbd34ce4aa56c4ceb891931b5a355a1f61d0d1eace8b07a SHA512 457f57d65320f2c6844eab613026cd1e1133b70a0312b224d186cf52fbfac9e5267357b9dfff190681e40acac5a7e877bc4cb2f9fd034cc6cc2ddc1fdb2a0057
-EBUILD libtasn1-4.15.0-r1.ebuild 1273 BLAKE2B af0146a38efec40a6eaa823d595172df9ec93d88057d32e8a56e1005be8134226b4e59a033397ac2b8b2caa5c9619785acd46b83ba314bf6078cc5f8fab55922 SHA512 a184b48b49f1d7ac25fbe928c2eb7f7aecd54658e0c91875f72cee5c0dcd736789675ab7e3fe46378ca159ac10b519572f806cb238dbfe09625c7e8113a8efa2
+DIST libtasn1-4.17.0.tar.gz 1906654 BLAKE2B a76798bdb8e68f2ca2337fa2648ff42adb7a9a51f27efefee5b9856e56ac09672237bd9a5b2afe808298e462eda31f2e8d3601c35ac00b84935f307ad981b2b1 SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
 EBUILD libtasn1-4.16.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
+EBUILD libtasn1-4.17.0.ebuild 1223 BLAKE2B 4cf24abf2d407b9c8a3c8a7ab82fa62f80fd014e7b9ff22782f08c10bfd30419b95186f3cf5b704c8f0e691e93157d0a6917eb92f638d00a6503adefe6d32b4e SHA512 93136d7a2a9bd1588251fc15204f970f702b7ee02b227717f62ec8d45b2eab850879790e0ec1cd77d6027208aeb05605c0ec728da0ba4e72f491c766a80e0d79
 MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch b/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
deleted file mode 100644
index 45360ec8f822..000000000000
--- a/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 49d6e3f0a4b5fd4da31228d23ae9efabef20c1ca Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Thu, 21 Nov 2019 16:09:20 +0100
-Subject: [PATCH] fuzz: do not install generated fuzzers and tools
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
----
- fuzz/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
-index ae6616b..aa621ce 100644
---- a/fuzz/Makefile.am
-+++ b/fuzz/Makefile.am
-@@ -38,7 +38,7 @@ FUZZERS = \
- 
- if FUZZING
-   # fuzzing mode, enabled with ./configure --enable-fuzzing
--  bin_PROGRAMS = $(FUZZERS)
-+  noinst_PROGRAMS = $(FUZZERS)
-   AM_LDFLAGS += -fsanitize=fuzzer
-   MAIN = fuzzer.h
- else
-@@ -47,7 +47,7 @@ else
-   TESTS = $(FUZZERS)
-   check_PROGRAMS = $(FUZZERS)
- 
--  bin_PROGRAMS = corpus2array
-+  noinst_PROGRAMS = corpus2array
-   corpus2array_SOURCES = corpus2array.c
- endif
- 
--- 
-2.22.2
-
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
deleted file mode 100644
index 0670215fc266..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test valgrind"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/help2man
-	virtual/yacc
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README
-	THANKS
-)
-
-pkg_setup() {
-	if use doc; then
-		DOCS+=( doc/libtasn1.pdf )
-		HTML_DOCS=( doc/reference/html/. )
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable valgrind valgrind-tests)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
index 0dd7f7bf3a2d..116fa06d177e 100644
--- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal libtool
 
 DESCRIPTION="ASN.1 library"
 HOMEPAGE="https://www.gnu.org/software/libtasn1/"
@@ -28,10 +28,6 @@ DOCS=(
 	THANKS
 )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-noinst_fuzzer_tool.patch #701928
-)
-
 pkg_setup() {
 	if use doc; then
 		DOCS+=( doc/libtasn1.pdf )
@@ -41,14 +37,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	#elibtoolize  # for Solaris shared library
-	eautoreconf #701928
+	elibtoolize  # for Solaris shared library
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(multilib_native_use_enable valgrind valgrind-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index 8acfba8466b2..dc160585f7f6 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -2,7 +2,7 @@ DIST libudfread-1.1.0.tar.gz 33506 BLAKE2B e7fab72ebecb372c54af77b4907e53f77a550
 DIST libudfread-1.1.1.tar.gz 33546 BLAKE2B 2a9781d2db569ca5787b0fa27b75b790d21b78454727f7377fde511abe2426912d44fd14fc6954b59e8a6b152a1f4ca95dc0b4759cc7472490f42c0158e1f418 SHA512 7c7a4553f2cea82a4496799376380ba75285b82cdf37e701d28d723d760e936b7e625223cd162bccc5c65aca3ef721c6af839bd4c75928237cb3c77eaaeb23db
 DIST libudfread-1.1.2.tar.gz 33744 BLAKE2B 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61 SHA512 3069feb5db40288beb5b112b285186162a704f0fdd3cf67a17fd4eeea015f2cfcfbb455b7aa7c3d79d00fd095a3fd11cffc7b121dce94d99c3b06a509a8977d2
 EBUILD libudfread-1.1.0.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
-EBUILD libudfread-1.1.1.ebuild 810 BLAKE2B f49028a3629713c2b30adc41b2d3a0077d8e2d04d929ddf3fd63eb92e55af7bc90c27953d4746dc2315121490086091cf520fb0b4095798834ec4a9613c83d5f SHA512 521ee13434baae3b1f6211980f27a99d64aa2f033251239ca8c156c38d3acafc47464f600b7327e6dc560d36f4b0312bbefffcbe5211768410982b00e58dccba
+EBUILD libudfread-1.1.1.ebuild 809 BLAKE2B 09b9f9c4276f1e5a47d9ec3eee61dccd8bb5ad08766836dcf383a1b64217024b865c5b6017ac12261f7b6939d2a7eeaf2bd48634eb573af62f2a3c49362c532b SHA512 32da6f506e59f8cf2554cff5e464d9450a10c73ccaf01dcde6150e99702e12164455fa23457710c7095785639b1a49097a41a4996d7fc758d69aaf88cef0828b
 EBUILD libudfread-1.1.2.ebuild 830 BLAKE2B d5828d070d851547b349e1310cf41e687b85c9fb58e7fbc074446c1da887e1219a24d62c5c0d367d0224a81880d2ef4a436586f88d0760ab61719dad63cd421d SHA512 fd98a3ad4f49d38f286e17094358c38bb3f557e2a56d13cfe43cb86bce5d251b47c349fd444379a50f6f31d82f207b737b56447db7fe1c382888dfa62b1c3c5a
 EBUILD libudfread-9999.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.1.1.ebuild b/dev-libs/libudfread/libudfread-1.1.1.ebuild
index 929ecb363fe2..ce7a757f3ad9 100644
--- a/dev-libs/libudfread/libudfread-1.1.1.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 9c6845599a6b..b3524a13510c 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,4 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1119 BLAKE2B cac1767551107388bcaec8f195c2f27004b4f3595b6f3a5c26cca94408d0277e49135376b6fd47d299b0a527cccd635aa365c6fb9752895f0188e1cae5d33e2d SHA512 1a289d196dcbaa89e071c853d46d2835211bc9d998112b6a1c4a6cc7a84451b84f5d61109c0ff0826e6621e84bc2e3913306799396dbe0f1522793a23b9abd76
-EBUILD libusb-compat-0.1.5-r3.ebuild 1169 BLAKE2B 9091b1e63697a377fc9034d42c206f8a5d9f3959cbd5b5cdec3ada74c5be3c4141f1b68aa7f35d2bfaea84dbeb688b4ac2b7461618a77f1bc30e28267277a3a3 SHA512 73ec3df96ecb5192c276dab63b1a76cf13d8dfd0355b1a2c3eca3e45a49de4900ccaf5202cb7c4c4f23487f2d3bb579f8624f0dc746bae69b1b820b71c641653
+EBUILD libusb-compat-0.1.5-r3.ebuild 1090 BLAKE2B 7caddb67a8b91c8e58d81e4ef3a098780a0e792ca72614a91c510ffbc98b742054d83ec1636e1420bfb0e64548150c68c67fbc1947fda059f5f88d85ad47d2c1 SHA512 490e1ebc486137b56573a2db4b8f0cb07b7f2661f4f2438ba7bbf7102367e6e040152b0a1768a1a087cc52f604599a7941003f25ba743e0bfe6b062f160ebac9
 MISC metadata.xml 333 BLAKE2B ee2452df6eb77285ba7e918f882c543d413656aaf0a199ac369ef60d25b8790fa37e320101f9645d5042ed04826e00922d5d38752b31492deda2cc78e7c41b49 SHA512 10f5333485c01d415c73f195e22785a9584d9dcf9662317605d9c6f14507863be5769457d2080137d31ad79fd0e825b9f02ec4160c40a5347591726843148705
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
deleted file mode 100644
index bb832fd04764..000000000000
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
-HOMEPAGE="http://libusb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug examples static-libs"
-
-RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug debug-log)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a usb
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index d2650c1bb749..caafc1eefa13 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib-minimal usr-ldscript
+inherit usr-ldscript multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -12,27 +12,23 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug examples static-libs"
+IUSE="debug examples"
 
-RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
 	!dev-libs/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-)
+PATCHES=( "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch )
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libusb-config
 )
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable static-libs static) \
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		$(use_enable debug debug-log)
 }
 
@@ -43,11 +39,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
+		docinto examples
+		dodoc examples/*.c
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index b2712666e3ae..840a7c4aae44 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,6 +1,4 @@
 AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
-DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
 DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
-EBUILD libusb-1.0.23-r1.ebuild 1597 BLAKE2B 05b9fb4d16f65f021d12b7fd1b80fda65daea7c235901df41ae34ea8daad6e8bbf83adf5b60dcacbfe8381b16c3ceccd1fb14dd84963f14f20efa1c60eb07bc4 SHA512 bc52490ef3e10480be59c05023dced2e4ce4f7587af2b7257d5fec93dc791163bfd0bfd6dff12ed6b1799ab34b2de17428955bd47a755feafffef35dc3e0ab56
 EBUILD libusb-1.0.24-r1.ebuild 1612 BLAKE2B 8a3c2959232ec0eb9b550f54ae1740f4fabd773d8ac16f1358e711218871827df88834279a16c26a0a2fa23a6137cf78bbfe250d9111e741a84f212b7874aaa0 SHA512 a12a0d4b510c097c1a818f01e504d32813db4fd1ba05844b56c1127d24d43ca02ba38d61385d21d4a7e87fd9732d720e63e3a963310d1e451117fbadd590d47e
 MISC metadata.xml 335 BLAKE2B 8d1673cd194774a9e68e0f7458cceae03774fc5601925758a96406da4c41e9a399e42117b31b2dd23bdaf8626bfad3deb3c0a6c9b8af882aa3b4724a5bf017cd SHA512 e1040f513f81c769094c6b10e3b9bc4a64b55d281d9d97c8f3d33f1e95681b4f85070fb9731567629636b83243420320d63afba64ec7541c605f91d693f76ce0
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
deleted file mode 100644
index ac3237f1c821..000000000000
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc examples static-libs test udev"
-RESTRICT="!test? ( test )"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
-DEPEND="${RDEPEND}
-	!udev? ( virtual/os-headers )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable debug debug-log)
-		$(use_enable test tests-build)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		use doc && emake -C doc docs
-	fi
-}
-
-multilib_src_test() {
-	emake check
-
-	# noinst_PROGRAMS from tests/Makefile.am
-	tests/stress || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a usb-1.0
-
-		use doc && dodoc -r doc/html
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h}
-		docinto examples/getopt
-		dodoc examples/getopt/*.{c,h}
-	fi
-}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 7a09f43ac82f..ef073179a561 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,14 +1,20 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
 AUX libxml2-2.9.10-remove-TRUE.patch 798 BLAKE2B 9dd837f4d5a9a9fa6a499c369df7ee707d6614f045c734d1a2d99393888d854f47c434782c779d788225db06df527c42ad8c3c4429d3d90548941348ad9ca1b7 SHA512 b3f1a3a59dbce6cadbf6c749b98f32fc31bb577a26531bc83048e7d4b2d970ad6caa875e20f3f39f4be997dfbe7696d9ca7cdc439b76ddacd5b43ec7333f1334
 AUX libxml2-2.9.10-xmllint-utf8.patch 947 BLAKE2B 77bd91eb6c5763b7f4d0817bd54cc6b2dbac919a0f4766d7099b50cacf70e5fad6d5ba3698a4a2272798b623fbab4fb9500096449a7f580dc9816826f9313858 SHA512 70c3ba767e7dd5fcaf72f41eb7ce01970fc7ea49774b39fc222d3e0d14e40f0d8303d78ed8c31278611f80e57b869a1f067d56ab2cfa8c4c1f87c1a3a1978fcc
+AUX libxml2-2.9.11-disable-fuzz-tests.patch 1014 BLAKE2B 40efeb32f8893179b0cc2ddadf88ddf8bb6a621fdbcb942f346b3c5f076de728e3e7779995c5f038c4146141258f04e7583353c5984b8c079a54ef85cc69bfa5 SHA512 dba8068243f9e92538adde7d076b7c35299a64ae9443023b5a7ea62207d992c78a2ad84e6fadbd856d7f5a59d1c441dae322fad5756f163047d1c32ba568ec72
 AUX libxml2-2.9.2-python-ABIFLAG.patch 588 BLAKE2B a2f6b67478a7d284dc318c1495833a51dd3e7d1f0d774f644b58e733bd5823041258750231b1b6e19e14fb210188a3bcdcacbbcb46e3b0130efcbb98492ea5e9 SHA512 ed9fc4c732f3c7f6a71c2cd6b1696995b6685ab231937a589da432e1fe452549d4d38b8761acdcc5a7145d1c721907d65d9d6539b3ecbb0628b7e2efa42d3b30
 AUX libxml2-2.9.8-out-of-tree-test.patch 1113 BLAKE2B cc257e20d3bad841e6afe220e895d15b0b83acbfeb2eb9d5d181549a954749c9b44bdf926346cb1c2ff3f3dbea739246a3ecdbe06cc98739b5ab132f46a7b36b SHA512 0bc18eb059685cfdfb6e30c995d6d43a83af37c8cc702467de6bd339515edc5d580cc22819a5612766431450fec59d37a28c7d5f24be3fb124c31cdbcc806b41
 AUX libxml2-2.9.8-python3-unicode-errors.patch 1156 BLAKE2B 15d58fb615aef745ac6aa4dde01823f3e0d2c39cd86ca9369874d6c4ae01d2a95e804e34b125ff77af612906397307cca1489b93d331d0f87dd9651a3ef1869c SHA512 fbe89d3ab0d4915782752d6de8a0b057cbe78bc5372a2801556bb521f1c64bf14e641af71b97d98377dc8b65cdc520938d144758ca50ce6fe628883d8bfd6411
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
+DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01 SHA512 469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df
+DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
+DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
+DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r4.ebuild 6402 BLAKE2B 101c269a5cbdfc142a37c1a794e68d7c60f2ab964c6b936fc6964df89b04c1c0e12ecd46f7a1dc04c15b49319db2c7efc89c95d81a105681f94602a68d75b355 SHA512 cbd927cf0ac16032fd14d328ad71d1348247f663bdf001d163715217d36c0d7dd77d999291fa6c722eecc600df457306b9ce9c7dd719a920b656a8965388c59a
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
+EBUILD libxml2-2.9.12-r1.ebuild 6952 BLAKE2B e54425cd42be49d3c87b80de56dd2c36fcace1b4dfc98d51b18a99ce8cfa3e7908ad03ceb1efe0563948fc826a65fa5552c0e3acde4802c47004832f7da0f627 SHA512 ba05a253a90080a17dcdc841b74f564b29c5ff78521d858015234db392ec94b899207dc3ffab4671b6ceaff63b6fd2ab2180f59543b7902dbe96dfd75f2f9f30
+EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch
new file mode 100644
index 000000000000..7f6fd4ae8266
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/libxml2/-/issues/252
+
+From 5d6403682a3463f29a1f7c27aa54ecb5e3971547 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 13 May 2021 17:40:22 +0000
+Subject: [PATCH] Disable fuzz tests
+
+Not all of the fuzz files are included with the dist tarball,
+so disabling them for now to get the release in with most tests
+given the security bug.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,9 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR)
++SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
+ 
+-DIST_SUBDIRS = include . doc example fuzz python xstc
++DIST_SUBDIRS = include . doc example python xstc
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
+ 
+@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
+ 	    $(CHECKER) ./runxmlconf$(EXEEXT)
+ 	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
+ 	    $(MAKE) tests ; fi)
+-	@cd fuzz; $(MAKE) tests
+ 
+ check: all runtests
+ 
+-- 
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
new file mode 100644
index 000000000000..8ae91f42ff0c
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PATCHSET_VERSION="2.9.12-r1-patchset"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+
+PATCHES=(
+	## Gentoo
+	# Patches needed for prefix support
+	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Avoid failure on missing fuzz.h when running tests
+	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+
+	## Upstream
+	# Fix lxml compatibility
+	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12.ebuild
index 07ac3c9aac1d..d21164e6cfc5 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12.ebuild
@@ -3,35 +3,44 @@
 
 EAPI=7
 
+# Note: Please bump in sync with dev-libs/libxslt
+
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
 XSTS_NAME_2="xmlschema2004-01-14"
 XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
 XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
 	test? (
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
 
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+"
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -40,25 +49,44 @@ RDEPEND="
 	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/xml2-config
 )
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+
+PATCHES=(
+	# Patches needed for prefix support
+	"${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Avoid failure on missing fuzz.h when running tests
+	"${FILESDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+)
+
 src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
 	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${P}-r1-patchset.tar.xz
+	unpack ${tarname}
 	cd "${S}" || die
 
-	if use test; then
+	if use test ; then
 		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
 			"${DISTDIR}/${XSTS_TARBALL_2}" \
 			"${S}"/xstc/ \
@@ -70,28 +98,8 @@ src_unpack() {
 src_prepare() {
 	default
 
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eapply "${FILESDIR}"/${P}-remove-TRUE.patch
-
 	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
 
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# bug #745162
-	eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
-
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
@@ -103,23 +111,22 @@ src_prepare() {
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
 	#elibtoolize
-	#epunt_cxx # if we don't eautoreconf
-
 	eautoreconf
 }
 
 multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
+	# Filter seemingly problematic CFLAGS (#26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
 
 	libxml2_configure() {
 		ECONF_SOURCE="${S}" econf \
@@ -135,53 +142,76 @@ multilib_src_configure() {
 	}
 
 	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
 		run_in_build_dir libxml2_configure \
 			"--with-python=${EPYTHON}" \
 			"--with-python-install-dir=$(python_get_sitedir)"
-			# odd build system, also see bug #582130
 	}
 
-	libxml2_configure --without-python # build python bindings separately
+	# Build python bindings separately
+	libxml2_configure --without-python
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl libxml2_py_configure
 	fi
 }
 
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
 multilib_src_compile() {
 	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
 	fi
 }
 
 multilib_src_test() {
 	ln -s "${S}"/xmlconf || die
+
 	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl libxml2_py_emake \
 			DESTDIR="${D}" \
 			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
 			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
 			install
+
 		python_foreach_impl python_optimize
 	fi
 }
 
 multilib_src_install_all() {
 	rm -rf "${ED}"/usr/share/doc/${P}
+
 	einstalldocs
 
-	if ! use examples; then
+	if ! use examples ; then
 		rm -rf "${ED}"/usr/share/doc/${PF}/examples
 		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
 	fi
@@ -192,25 +222,19 @@ multilib_src_install_all() {
 pkg_postinst() {
 	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
 	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n ${ROOT} ]]; then
+	if [[ -n "${ROOT}" ]]; then
 		elog "Skipping XML catalog creation for stage building (bug #208887)."
 	else
-		# need an XML catalog, so no-one writes to a non-existent one
+		# Need an XML catalog, so no-one writes to a non-existent one
 		CATALOG="${EROOT}/etc/xml/catalog"
 
-		# we dont want to clobber an existing catalog though,
+		# We don't want to clobber an existing catalog though,
 		# only ensure that one is there
 		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
+		if [[ ! -e "${CATALOG}" ]]; then
 			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
 			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
 			einfo "Created XML catalog in ${CATALOG}"
 		fi
 	fi
 }
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 55b001a09abc..9b8c4282d383 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,3 +1,4 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.34-r1.ebuild 1683 BLAKE2B ab30c33121afacac6d62c7eed3ecc19a0abd12503240280f834df8388ebcef884858560778163df87bdb3f0f64cdc4d02f3c2cdbf147421ffca4c2efdea77ef5 SHA512 52652130cbf3ded34298371dfe879461bceb708c479e88438fb904ae47b2893eb8445c57dbba4e87f1aa63cb359c412233248d9ad9a755dab220b032a366b1cd
+DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
+EBUILD libxslt-1.1.34-r1.ebuild 1888 BLAKE2B 4b010e456cdf28d3eab61f0e0a7302006d48c89e5eab4c7ae0d265c1e904a6ec204145a9e9e2027223517d1bd6d3d4eac92e8b799bc1ed49c4fd403c3a15825f SHA512 2fbaa330446c3c7c621c226c0afecdeaa9b32de0cc98523fda20b4b9417185cd08244a46d4876702e6882e75d4431e67e2c9d05c4d883cc988a04fcf5f8d0d09
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 91f4f334349f..c0f4775812b9 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -3,19 +3,22 @@
 
 EAPI=7
 
-inherit libtool multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit libtool multilib-minimal verify-sig
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt"
 SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
-BDEPEND=">=virtual/pkgconfig-1"
+BDEPEND=">=virtual/pkgconfig-1
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )"
 RDEPEND="
 	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
 	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 6cebd7b37250..3827560efde3 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,4 +1,4 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.7.3.ebuild 2331 BLAKE2B d1943fecf041fd8f8a6931b4207952bce0c7f5c6950e57b5d8d92781dd6fcd0ba4967bad58518e3cf384cf0c7bc1b8ee6c2f8bfe76b1cd7dbb2deff0e4184d37 SHA512 2919624a2a6f13af1a585c5b1a5c8f841518db194039e08b9433fa1e1bcd4162cfd66beb09265571e304d0358a9e64d74b8b182c0c01c1ecd54bb58f1a3f03ea
+EBUILD libzip-1.7.3-r1.ebuild 2362 BLAKE2B a6abf14b651094f901fec91e009d8bee5929eb9e9559c5bc3fd1c7a7f76549ce79308c33043bbddc6b93085268e39970a454dbd50ef2cc09c5fe0291fffee0fa SHA512 47bd0d59f32c3c6cd45f1230ce9f312d69d9625ad7cad6791bac76fef69e28349f6e3b674170c593100b78f9a7b6bb581a64f52893f9f8615b5998a61e2202b9
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
index 82713f354e13..4426e7855d14 100644
--- a/dev-libs/libzip/libzip-1.7.3.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake multibuild
+inherit cmake multibuild flag-o-matic
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="https://nih.at/libzip/"
@@ -43,6 +43,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	append-lfs-flags
 	myconfigure() {
 		local mycmakeargs=(
 			-DBUILD_EXAMPLES=OFF # nothing is installed
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index cf9c579dbe6a..9974760908a7 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,9 +1,3 @@
-AUX log4cxx-0.10.0-fix-c++14.patch 4599 BLAKE2B 34422a31ef35bb74bc8554eba0c116c06ec12c44cedb09b6ce56a0428a8959bce6c33ef99c887291a482f610b5b338ef242b5722a7402c5b368fce39776176e9 SHA512 584bd8649b08be9867cef0af9746d9648e35d2438e7225c5435fd9820251958839bbf61627022514f5a96ff930ae5d07f637435ed15ee5bdeeba313e6b099b2c
-AUX log4cxx-0.10.0-gcc44.patch 357 BLAKE2B b70ff78b141b6952bc8a5f1eca9e251a7dd7b5d8742d875cbadbfef6ef625416c2ba368b5d2b1d2792e835446775bc11231974a356d4fcd2595e1d99211dc04c SHA512 425d10d3d92d57269f447d5afd93f3302681c36f99654461a8377ea81c5d0ebe97fa60e54be169abc366d99c97ed6484626b5c1886f7996292d110e396ace97d
-AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4af43874c2640a0e7b0e0ed6b85424aa2e8d4d54d13d7eea1361c5b2d2d57f33cdc2260d6e3f5d6afd6b3d240fecc3565aab9f29f SHA512 8fb9017206bca39fa4481707cdb13b68195cc2fce66383a601bc8c7cc20869ca356f2616459b5f10615d5a40f0759c24058f22d7e08c02fee1ce367c34b2d707
-AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
-DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
 DIST apache-log4cxx-0.11.0.tar.gz 1145075 BLAKE2B 786f3374923a5d47172bdaba7edb1725bedc766cb310b7b1237cfcc2fdd84cf2e390b47d55284ad0ce65631798e545523723090f4c0f7ab262f6cbe41a03e327 SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd
-EBUILD log4cxx-0.10.0-r1.ebuild 1529 BLAKE2B e992a65f67e822180f2a47c1571fc62e3c4118ddd379c36436dd877852170f3a7f4a77d03d31621fd8b3cd82806b7356c4426f4ddd953229430aae38ad52b22e SHA512 8d392b861093fffc81624fe7331a5cff8ad9771a0220aeb1a3884509272e15e45c85bb39e88a89b2b3e7b01bdfdc999483394459e8442c53457797782d866a52
-EBUILD log4cxx-0.11.0.ebuild 1267 BLAKE2B 9d89e8a6e742da46c4f50f4d9bdaa1e9c187ed82b6ade046efe3beceaf3ff1c30af9f418f709e4320e87be8975f9bc884bfdf813bbdceac9680eed7b7018506c SHA512 2fedd3994d6fabbcd341a6dba7ca4741eb08f90260cea648a516f23e9bd319f450a7c5141a013da1b437512a927e8d5ef08942ab36bcc05b3b1239668bfe64c7
+EBUILD log4cxx-0.11.0.ebuild 1266 BLAKE2B fe4becd93c715d6b2c43ce49402e1b1b72d81e0768beb0b868a86dfef8b619ff499c5faeeee683d4c61eef293808064f199321333fa7ad67cb356f1a0d7b2634 SHA512 8ccff6eaa7058b7127a1f75b9e6d20b2f3853fc53cba4a482d2dfd57b21663d05b515ff7014de42f37f58efd6213eb42ff858b00b7437e9b24c11c008fa30321
 MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch
deleted file mode 100644
index 86ebdcccd5b8..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Fix building with C++14, which errors out due to narrowing conversions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593874
-
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -153,8 +153,8 @@
-          0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, 
-          0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, 
-          0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 
--         0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, 
--         0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, 
-+         0x6E, 0x49, 0x6E, 0x66, 0x6F, (char)0xED, (char)0x99, (char)0xBB, 
-+         (char)0xE1, 0x4A, (char)0x91, (char)0xA5, 0x7C, 0x02, 0x00, 0x01, 
-          0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, 
-          0x6E, 0x66, 0x6F, 
-             0x74, 0x00, 0x12, 0x4C, 0x6A, 
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -242,7 +242,7 @@
-         0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, 
-         0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, 
-         0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, 
--        0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, 
-+        0x74, (char)0xF3, (char)0xF2, (char)0xB9, 0x23, 0x74, 0x0B, (char)0xB5, 
-         0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, 
-         0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, 
-         0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,7 +36,7 @@
-        objectHandle(0x7E0000),
-        classDescriptions(new ClassDescriptionMap())
- {
--   char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+   char start[] = { (char)0xAC, (char)0xED, 0x00, 0x05 };
-    ByteBuffer buf(start, sizeof(start));
-    os->write(buf, p);
- }
-@@ -85,7 +85,7 @@
-         0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, 
-         0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, 
-         0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, 
--        0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, 
-+        (char)0xBB, 0x0F, 0x25, 0x21, 0x4A, (char)0xE4, (char)0xB8, 0x03, 
-         0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, 
-         0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, 
-         0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 
---- a/src/main/cpp/synchronized.cpp
-+++ b/src/main/cpp/synchronized.cpp
-@@ -38,6 +38,9 @@
- }
- 
- synchronized::~synchronized()
-+#if __cplusplus >= 201103L
-+	noexcept(false)
-+#endif
- {
- #if APR_HAS_THREADS
-         apr_status_t stat = apr_thread_mutex_unlock(
---- a/src/main/include/log4cxx/helpers/synchronized.h
-+++ b/src/main/include/log4cxx/helpers/synchronized.h
-@@ -29,7 +29,11 @@
-                 {
-                 public:
-                 synchronized(const Mutex& mutex);
--                ~synchronized();
-+                ~synchronized()
-+#if __cplusplus >= 201103L
-+	noexcept(false)
-+#endif
-+;
- 
- 
-                 private:
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,9 +190,9 @@
-                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
-                 LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xB3, 0 };
- #endif
-                 File file;
-                 file.setPath(fname);
-@@ -209,9 +209,9 @@
-                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
-                 LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
--                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
-+                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0x3195, 0 };
- #endif
-                 File file;
-                 file.setPath(fname);
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch
deleted file mode 100644
index 854d34a17492..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix for gcc-4.4
---- apache-log4cxx-0.10.0-orig/src/examples/cpp/console.cpp     2009-06-12 13:01:06.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp  2009-06-12 13:07:05.000000000 +0200
-@@ -15,6 +15,7 @@
-  * limitations under the License.
-  */
- 
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- #include <log4cxx/logger.h>
-
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch
deleted file mode 100644
index 78a57916bde0..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-04-01 00:34:52.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,8 @@
-  * limitations under the License.
-  */
- 
--#include <stdlib.h>
-+#include <cstdlib>
-+#include <cstring>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2008-04-01 00:34:09.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
- 
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
- 
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2008-04-01 00:34:09.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
- 
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
- 
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch
deleted file mode 100644
index cedca2ccdf42..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-http://issues.apache.org/jira/browse/LOGCXX-299
-http://bugs.gentoo.org/show_bug.cgi?id=254920
-
-diff -ur apache-log4cxx-0.10.0.orig/src/main/cpp/odbcappender.cpp apache-log4cxx-0.10.0/src/main/cpp/odbcappender.cpp
---- apache-log4cxx-0.10.0.orig/src/main/cpp/odbcappender.cpp	2008-04-01 01:34:09.000000000 +0300
-+++ apache-log4cxx-0.10.0/src/main/cpp/odbcappender.cpp	2010-02-24 14:39:37.000000000 +0200
-@@ -167,7 +167,8 @@
-          throw SQLException( SQL_HANDLE_DBC, con, "Failed to allocate sql handle.", p);
-       }
- 
--      SQLWCHAR* wsql = Transcoder::wencode(sql, p); 
-+      SQLWCHAR* wsql;
-+      encode(&wsql, sql, p); 
-       ret = SQLExecDirectW(stmt, wsql, SQL_NTS);
- 
-      if (ret < 0)
-@@ -237,9 +238,10 @@
-       }
- 
- 
--     SQLWCHAR* wURL = Transcoder::wencode(databaseURL, p);
-+     SQLWCHAR* wURL;
-+     encode(&wURL, databaseURL, p);
- 
--     wchar_t szOutConnectionString[1024];
-+     SQLWCHAR szOutConnectionString[1024];
-      SQLSMALLINT nOutConnctionLength = 0;
- 
-      ret = SQLDriverConnectW( connection, NULL, 
-@@ -331,3 +333,31 @@
-       }
-    }
- }
-+
-+void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p) {
-+   *dest = Transcoder::wencode(src, p);
-+}
-+
-+void ODBCAppender::encode(unsigned short** dest, 
-+    const LogString& src, Pool& p) {
-+   //  worst case double number of characters from UTF-8 or wchar_t
-+   *dest = (unsigned short*) 
-+        p.palloc((src.size() + 1) * 2 * sizeof(unsigned short));
-+   unsigned short* current = *dest;
-+   for(LogString::const_iterator i = src.begin();
-+      i != src.end();) {
-+      unsigned int sv = Transcoder::decode(src, i);
-+      if (sv < 0x10000) {
-+	 *current++ = (unsigned short) sv;
-+      } else {
-+        unsigned char u = (unsigned char) (sv >> 16);
-+        unsigned char w = (unsigned char) (u - 1);
-+        unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10));
-+        unsigned short ls = (0xDC00 + (sv && 0x3FF));
-+	*current++ = (unsigned short) hs;
-+	*current++ = (unsigned short) ls;
-+      }
-+  }
-+  *current = 0;
-+}
-+
-diff -ur apache-log4cxx-0.10.0.orig/src/main/include/log4cxx/db/odbcappender.h apache-log4cxx-0.10.0/src/main/include/log4cxx/db/odbcappender.h
---- apache-log4cxx-0.10.0.orig/src/main/include/log4cxx/db/odbcappender.h	2008-04-01 01:34:09.000000000 +0300
-+++ apache-log4cxx-0.10.0/src/main/include/log4cxx/db/odbcappender.h	2010-02-24 14:39:39.000000000 +0200
-@@ -279,6 +279,10 @@
-                 private:
-                         ODBCAppender(const ODBCAppender&);
-                         ODBCAppender& operator=(const ODBCAppender&);
-+                        static void encode(wchar_t** dest, const LogString& src, 
-+                             log4cxx::helpers::Pool& p);
-+                        static void encode(unsigned short** dest, const LogString& src, 
-+                             log4cxx::helpers::Pool& p);
-                 }; // class ODBCAppender
-                 LOG4CXX_PTR_DEF(ODBCAppender);
-                 
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
deleted file mode 100644
index adc8b749d16b..000000000000
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=apache-${P}
-
-DESCRIPTION="Library of C++ classes for logging to files, syslog and other destinations"
-HOMEPAGE="https://logging.apache.org/log4cxx/"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
-IUSE="iodbc unicode odbc smtp"
-# test suite fails
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/apr:1
-	dev-libs/apr-util:1
-	odbc? (
-		iodbc? ( >=dev-db/libiodbc-3.52.4 )
-		!iodbc? ( dev-db/unixODBC )
-	)
-	smtp? ( net-libs/libesmtp )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( site/. )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.0-missing_includes.patch
-	"${FILESDIR}"/${PN}-0.10.0-gcc44.patch
-	"${FILESDIR}"/${PN}-0.10.0-unixODBC.patch
-	"${FILESDIR}"/${PN}-0.10.0-fix-c++14.patch
-)
-
-pkg_setup() {
-	if use iodbc && ! use odbc; then
-		elog "Please enable the odbc USE-flag as well if you want odbc-support through iodbc."
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-doxygen \
-		--disable-html-docs \
-		--with-apr-util="${ESYSROOT}"/usr \
-		$(use_with smtp SMTP libesmtp) \
-		$(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \
-		--with-charset=$(usex unicode utf-8 auto)
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc src/examples/cpp/*.cpp
-	docompress -x /usr/share/doc/${PF}/examples
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/log4cxx/log4cxx-0.11.0.ebuild b/dev-libs/log4cxx/log4cxx-0.11.0.ebuild
index 4345b2b1b986..a03ea1c0a647 100644
--- a/dev-libs/log4cxx/log4cxx-0.11.0.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="iodbc unicode odbc smtp"
 REQUIRED_USE="iodbc? ( !odbc )"
 # test suite fails
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index aaaa64326f19..2b6f5191d252 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-EBUILD nanomsg-1.1.5.ebuild 805 BLAKE2B ae4b62ab7fa6ca8e8fe532d22d3ec2e6edc72a1529ce40a721774c6d354e5e20ac3fc17c6e33cba8157fa55b5e150df70b879007d5aab9f8a4d5316a8b381cfc SHA512 4747e6a3bff09f7fcbe217caadeefe3a9cc1adb689889d6178e7bd5948a3e5544b05fb335d6f303c90c2915140ce3a4201e971b732e175fc2f0a1ec1eb4f5773
+EBUILD nanomsg-1.1.5.ebuild 810 BLAKE2B 72a312d607828372b768a925ed710ab0471759b261618814c886ca727f2d54483454b0acc4de406f35b16e4f6614842ee0906a719497a510687e20f348cae1ef SHA512 e65fe9cc16172ec905f60ac0f9053a717c5c493ef1063202a24ebce70cef5d236e3b3ef1f7c222ceb228561e95ac0d7124c4d7a62d4ab8ccefde03199680da56
 MISC metadata.xml 327 BLAKE2B 71ce5ebb7000c112f9e49bb621a5068f18619b04dea3fb556daabb0fdb9f6e9cb587b5809bda561e9bad6998f9866d65de6e367cc33a9f3218580b4d192fe591 SHA512 210c2febfa6cc50563269e1e386917959d24331d2226262084b19e6b7d24e49c38e79f31bb21d3c237ff4f9971135136007e33e99f1a9f37f1abd1419e3f85de
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
index 06f2ea0e6c57..004a080aa242 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5.0.0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( dev-ruby/asciidoctor )"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 6ae48b5b344b..9d8f640ce7fd 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,8 +1,3 @@
-DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
-DIST nettle-3.7.1.tar.gz 2380974 BLAKE2B 2dbc0204623ca9d42d4e4fec0d96e3d1aa164ac63f046198c2827a9eb8946392cbf5dd48a2a77cb98d52591eb83b48092686e3f5eb5dc2ee5f5e92cfaa335f26 SHA512 25567c0546b68851a03741ea69a2959b07cab660a723b193a9043faf1fd9eb4cd7aea72de150bb0717fd2db28e417f03ad31b14e98aec40ad316f1bcf0caf50b
 DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
-EBUILD nettle-3.6-r2.ebuild 1773 BLAKE2B 02d33ac86c7654a29d44d8f4be02e4e59cac3f63cd3d0df5d3ca37d8a0e3aa77b2b68648f02607e11d94ae62f0ee1803702ba7cb13311df7db5d31dbb7ce3b27 SHA512 f9598e6f64b7f935709a3f7ae81385e1e5ac2df0653cb818e264b99601e246c1ed75652852e08bf3896b70850793375a0e8d3a1b66c06e80112fa204680e78a1
-EBUILD nettle-3.6-r3.ebuild 1823 BLAKE2B 66ca5016090aea3337c8069f4427111c73a549d2180c2f71dcd5b0385b07fb33c780b3f0db6821e379be26097e03c973df9ae7a6093d8e793f2038d5473e145f SHA512 eb61a6a68470eb65b1f7786adff4c12bc5601fc8a3576532e54ff15ddc6b2f39d18f84a1f29b4eaeef9ea2772b2a85dbde4ec31cf664d419734d5bcaa93512ed
-EBUILD nettle-3.7.1.ebuild 1844 BLAKE2B c1488108e31969da2e7cfacef25af839eedb8b93a4d4d7f53c9b6e0236415289e2c475d6fa069e6647c769282fb22e49c7a52e597cdb51e6970f4f6bcbb213fa SHA512 29525e4cb2e5f88bcd013157a24dcd796bc662f3f76534838daf89169b2811db35ffc5343b323cafb2a8d09cadb5fab03f6c1bcc5cdf38cdcb5a749a85857096
 EBUILD nettle-3.7.2.ebuild 1836 BLAKE2B a8109c4bea51c922c1e23a706c33bba6faf27e58931a058a7051b172e7dcbbc244f2589e57ac68bfc47b6f3ddefc1b092462fb764c45506e7dba5034aaa84de6 SHA512 3d112ed3d24c410c1768974a9702a468c3320772aca3565d7d7e9777969bcc1165f5994518d04966ae92f0adc27580348b369ccfd3e3c1cc721c56d30fb796d8
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
deleted file mode 100644
index 2ee080ecf97c..000000000000
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
-RESTRICT="!test? ( test )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# I do not see in config.sub reference to sunldsolaris.
-	# if someone complains readd
-	# -e 's/solaris\*)/sunldsolaris*)/' \
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable cpu_flags_x86_aes x86-aesni) \
-		$(use_enable cpu_flags_x86_sha x86-sha-ni) \
-		$(use_enable asm assembler) \
-		$(use_enable doc documentation) \
-		$(use_enable gmp public-key) \
-		$(use_enable cpu_flags_arm_neon arm-neon) \
-		$(use_enable static-libs static) \
-		--disable-fat \
-		--disable-openssl \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/dev-libs/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild
deleted file mode 100644
index 9443850346ad..000000000000
--- a/dev-libs/nettle/nettle-3.6-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
-RESTRICT="!test? ( test )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( sys-apps/texinfo )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# I do not see in config.sub reference to sunldsolaris.
-	# if someone complains readd
-	# -e 's/solaris\*)/sunldsolaris*)/' \
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable cpu_flags_x86_aes x86-aesni) \
-		$(use_enable cpu_flags_x86_sha x86-sha-ni) \
-		$(use_enable asm assembler) \
-		$(use_enable doc documentation) \
-		$(use_enable gmp public-key) \
-		$(use_enable cpu_flags_arm_neon arm-neon) \
-		$(use_enable static-libs static) \
-		--disable-fat \
-		--disable-openssl \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/dev-libs/nettle/nettle-3.7.1.ebuild b/dev-libs/nettle/nettle-3.7.1.ebuild
deleted file mode 100644
index 38e1726fa6db..000000000000
--- a/dev-libs/nettle/nettle-3.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
-RESTRICT="!test? ( test )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( sys-apps/texinfo )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# I do not see in config.sub reference to sunldsolaris.
-	# if someone complains readd
-	# -e 's/solaris\*)/sunldsolaris*)/' \
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$(tc-is-static-only && echo --disable-shared)
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-		$(use_enable cpu_flags_x86_sha x86-sha-ni)
-		$(use_enable asm assembler)
-		$(use_enable doc documentation)
-		$(use_enable gmp public-key)
-		$(use_enable cpu_flags_arm_neon arm-neon)
-		$(use_enable static-libs static)
-		--disable-fat
-		# --disable-openssl bug #427526
-		--disable-openssl
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 4b6c38506aba..ca8c311e519d 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -2,5 +2,5 @@ AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca05
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.21-r1.ebuild 2257 BLAKE2B ae56147b1d399ffb67502d8c19d47346cd1e4eaa3c7db228ec5eb409f977d63139a2ba5e4d5191d171a3eb8da09bd4092b3d28719c7f4cf187058d4b89b8e5a7 SHA512 308e5308812c8d7f0a946db5a56d2677ce2107c7871fa132f35dbbed151cefc3cd15accdf9373f11835a130f0125623c7b5283fa5f81d9d32b1bd99715e0fcf8
+EBUILD newt-0.52.21-r1.ebuild 2257 BLAKE2B 1a37298bb31eaa7c1dd2c9f7c84ce4559ffac24da3daf871fca504a27e31acc52e6025dab949f5b8bf16c8a7ae8b1f9375461367be926b0589a09e3c75e8495b SHA512 dc4bc7d10254340258012c60ea87315abbb7546715daacf4261d8b07a708df302d6388becd54ccdde8dda46501203dc43d8effc3da0b20793f737fba72dc467e
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index 57bf3e815a07..4eb95be86239 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index a6379d034c46..5f610aaed192 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,7 +3,9 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
 DIST nss-3.64.tar.gz 82173054 BLAKE2B 4786a1ff6f4e47dbb6bfef6a2bc47ffeac51aa37f12168872d23799b8d6ca440578acf512e9ec7563ef64331d3fd84c387f17e41afa2ee30d8623c6f66207631 SHA512 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
+DIST nss-3.65.tar.gz 82386222 BLAKE2B 4e1876a12d042b67c6654a8396611ca33d5257b07c75b55201de229f0a6860577886f38d640837d6512b30a074d05b917bae4e34263d9c0f6f4606c80b369a04 SHA512 6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 EBUILD nss-3.63.1.ebuild 9222 BLAKE2B ef1afc1f6d05c0b1797759b093a1e5baa00d75371f6260302d2fe998d0b5d4f7dcfbb0ed05f21a122b5a9ed210d5e4f520353ff403d62c80d6cedc225a08fb94 SHA512 f7c24d8da1afe3514c4019b054d710061d095a808ebca71b1147eff17af1b62fb22d8853692a6820b70e3aae24e617f029f2767395b8fa1776698d0c6593f003
 EBUILD nss-3.64.ebuild 9230 BLAKE2B b75b7ae2b93705d2d87560a4307ef92691c5d9e566e3fd5c91362457a083a20f188671478f8bb03eece5ee599ef9725e67fe00a3d47e5dfae3d22d616f81fbf5 SHA512 7cc7697cf96188d5eacd43d849e9df72ce16fdc60f9e8833411941ffb653db68657aa57fa9ccef82936fc09e947a55d983c2727deeba0510569a03502631e7b5
+EBUILD nss-3.65.ebuild 9230 BLAKE2B b75b7ae2b93705d2d87560a4307ef92691c5d9e566e3fd5c91362457a083a20f188671478f8bb03eece5ee599ef9725e67fe00a3d47e5dfae3d22d616f81fbf5 SHA512 7cc7697cf96188d5eacd43d849e9df72ce16fdc60f9e8833411941ffb653db68657aa57fa9ccef82936fc09e947a55d983c2727deeba0510569a03502631e7b5
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.65.ebuild b/dev-libs/nss/nss-3.65.ebuild
new file mode 100644
index 000000000000..f05b462f30da
--- /dev/null
+++ b/dev-libs/nss/nss-3.65.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.29"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 44795e0ca09b..a10bea38e1d1 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -3,10 +3,8 @@ AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86f
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
-DIST opencl-clang-11.0.0.tar.gz 79487 BLAKE2B a5ec89c68dd31f53881a002fda0fa9f83b6355273a6f2085c6794a0c9a74ba44b8ac21175854a87427c30523f2dd024006050b77d90bbfa7041e4abfbf0bb9e5 SHA512 bd27d15d5e6f396f0b0a79fb1f2081033e26db1df701a37558f7b9976299e17cfb383beff8fb0f1a5ab63601648cac2a33e4de73100fd1ab8706161c52aabe3c
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
-EBUILD opencl-clang-11.0.0.ebuild 1146 BLAKE2B 0b2455f22a68726583b9638b8a20db67efde7a9a19c2879561f5614df99462375fcc453ab6c638bf72d0056325428698976b213a271338f8fa449145c8148e14 SHA512 6297e9bee27415679474b922b31ae1f3b1a5df7b7ccb7954993bd5f6346e7994a5b2e89794ebffd18c306abe48644691eaf764b844532d3d1744a715da8cdcb5
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1263 BLAKE2B b84ef38978e43306f5be92a6c138b4aa704d77374e70b8f2c3275168f0ae24bd3a303d87ebbbaaee04f85aaea3f8914493863171ee8ef874b429fcbeb31b6d5f SHA512 3879464f9d72f46bbd6dce799a63d1c62e174635299753df2d1174a4c47cc97ab8f3d698c06c2e636ca9f76ce564f55ee871852fa4aca40786fd3a1a925fc918
 MISC metadata.xml 250 BLAKE2B 7be2fdb3efeddaad6369a79b3c29566a4a6d596bb6ee9408bff4c82c1aa151ea3ee99f30d2b6813caa9348c9d7809b38c017a43c6b49251b75c9d7b365f7c5b5 SHA512 5e202e141a05c33cb2a627e147dc3439d344db0a04529fdbee7c0d164a40bf0a847818fb94f21f3a45f1104fb6be421fb16442db0688d50eef8b4771ab0e85ff
diff --git a/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild
deleted file mode 100644
index c359b97d9e13..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="~sys-devel/clang-11.0.1:11=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:11=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index eda0f6351969..37c3bd85c742 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
 DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
 EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
-EBUILD opencl-icd-loader-2021.04.29.ebuild 902 BLAKE2B 3b7b796b20d0b6b72e61e3d70ce54c37dc7310279de952cd775fbc7aad1c7183fc62101a9fb4ccba203845cb61341a010ef375043ee716e24234150978888e26 SHA512 d398f787b041735c93eba3d62ed5fdd04ef1fff4062dec8b20fa5156d43f0388dc3d444822a548a4940af8a6f152cd8f0a718899ff9e4160c84b55c5449d32d4
+EBUILD opencl-icd-loader-2021.04.29.ebuild 889 BLAKE2B 96cb7dd1778980f57c7c21f84614f9c571827567fd0aa6048155dbfbf484baf8935df3dbd10f1100ada0920c0fc6e68dcf59639a1805a0e10992fe1288cdcb45 SHA512 0f2523f6784f5635ce67650eb242ce5a7cf54bb54190a522467fded0eacaffda7df54bcd57179296944e866a1f2ce153bc214a36beda7fed128eabef61e54d55
 MISC metadata.xml 340 BLAKE2B ade1ca3014eb1b6b36aa11078944e4b13ecdc02ee889751c1c69bf85d320a75dc70c5f74bd24aa69ed4822f966ad218f4742c3249e2b2aa2f51f21ab9cf07064 SHA512 599a65843a54b48228a37ee4e8219e5b128bdf2e6f998fd397292e0aa6466a5b0b1ce3977c1aa8ce9341778975cace7ffb890ba66a2c1c7ac44934ce9891e906
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
index bf54d78a8604..e52197a47873 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
+inherit cmake-multilib
 
 MY_PN="OpenCL-ICD-Loader"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index 4a8d54628a1b..ef209f7d5f34 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
 DIST plasma-wayland-protocols-1.3.0.tar.xz 39052 BLAKE2B 4024ac8c31c1620eb88b027084e9219368f570719cdb53ccff30594de7ebd5e0c01c8baf580d9c19115aa4632bc960fd8e44fd6bf97919e61faf24c1a43fbfdf SHA512 4c0466bbbe07399d4c54d4f04d7bee92826a6009c61fd7e6898c04d12e906c68fce25c520583225aef18737071b71b85814070a769a4f00e2a71b709568c1695
-DIST plasma-wayland-protocols-v1.2.1.tar.xz 38716 BLAKE2B cf651ae6511ac8c2c00c71cc9d3cfd3f76132adc29d143cbd71fd0d22b5cebe221aeeff1db534e62515a297b07cbd6b705752a0da0498b12635455cfba8f06b0 SHA512 7c94ec6e1a6e47651ea3194a238b2a2e28452c541095c17b0d7cf240a939bebb854c2acbff1ca56cc5a737ba2c802bd04674c7a3b0be623e3bd4328741374306
 EBUILD plasma-wayland-protocols-1.1.1.ebuild 455 BLAKE2B 9072fb9f96bef5c5e3733242fb648b295f95bafe31d79a3142aca781765e5b05e73e9b9741e5de50179c0bf8634c5146086a41d1e4826874935ac8529c290d75 SHA512 b5c9738c1215e5bfbc914137b0746b880fecdc54024a88464254ab97e0311d34ac6482453ac74edbdbb6807df4ca0c6033c5d1f9fc477e834af709480cffd3c6
-EBUILD plasma-wayland-protocols-1.2.1.ebuild 489 BLAKE2B 7e4d525ce58897c1c9f7c4a3b28129f44f454454260744443d3efe9796f1f8d42874739fd7c75e818581b0d7ce94da953d5e0c27f86ecd6787d1c0ad9ad318b5 SHA512 57feab76f5857bba8917901620c05ad6cd6681c323f5d2306674e06affb65b7a4d4bb1c2174f700d83d3b9c4c26aaf40d262a91907665c11ee76812b053cb031
 EBUILD plasma-wayland-protocols-1.3.0.ebuild 452 BLAKE2B 06d8de96518f95bd1561b1b7e35f6c8f0e81c454dcbd2266953a7e91a501f33bdb30b8c5a35b3d566f6ebe3b09b4a957f131acc29eab9c3de08cfc5c9e077968 SHA512 290955b71f01f6de8b6e59f4730c624dbe3b910c98b93d791de9fc5227204f697d7cc6093acdeb5306367ff27cbcaf6af8fcb11b502bd596ea74bdb84aa59d58
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild
deleted file mode 100644
index 9a8b42d6b9d7..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_NONGUI=true
-KFMIN=5.74.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PN}-v${PV}.tar.xz"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 7abdeb5ca809..a6e9f42c59f8 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,7 +19,7 @@ DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f
 DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 EBUILD protobuf-3.13.0.ebuild 3200 BLAKE2B 1f4ac4437cf047b4f840fec6fbff8e8e909dfc6fab90262e2892856b1884c0fa9762712cf965284c9e059014a47ce4926a12e7d35fd2dc508a4e159e7c15e1f7 SHA512 dbfa8ff4355832fc09465e6cc78a12fe99d92daee74930d86ed4cb5848d51506012cb609ecfeddb21f2ef3ba7f7251a9afede1bfde6fd3b6976121564cfc961f
-EBUILD protobuf-3.14.0.ebuild 3177 BLAKE2B be70e69c5cdd268a57703f3cae7cf65213f59b5b00e5ee2094c9a28fa120cce21dc5f4b56fb3b0731e2f8a67e2326bad1b8ad210a4f6e7bc2f929ab0f6038b14 SHA512 51f186dee878884e6c1918de30c3e42f5b46c386a52eb8df0158db14d2961b2f82cbabbd0c21f8afd31315f3f003eba66dc0479c4dd314073a37fa03e62db796
+EBUILD protobuf-3.14.0.ebuild 3176 BLAKE2B 765c1a7c6063367b4bd85ed5b0f8b64129adbaf799278e2fcf3c2434c5ce212090f2a4e90c24e084fc8f1504a2944b27b38d8d8dcb47439e5512c9bba417d809 SHA512 a34746f76b263295bb9a8bddff816a388b1eaaad55634268fcf5cbf8e2f6f67edef675db5331c2fd20929c252f77cdf620659d0c4633bc2037042f3125c42f21
 EBUILD protobuf-3.15.0.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.1.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.2.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
@@ -28,6 +28,6 @@ EBUILD protobuf-3.15.4.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e59
 EBUILD protobuf-3.15.5.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.6.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.7.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
-EBUILD protobuf-3.15.8.ebuild 3181 BLAKE2B 6f0823f268356f55eeaffca71594104aa53d3f7f612744a4359cf227274005466bbf268166184ae0e58faa3bc5b90a3d2a3813c5887a66d9c595a7e412a09a2b SHA512 27b97bd974e55091ac08e06d8c7148f748e31295323e587c28aa52095f64f795bd53b0805f7c614c72717bd096d2f509a4dbdb410acdbafe14f539035ef0b0fa
+EBUILD protobuf-3.15.8.ebuild 3179 BLAKE2B 7f34859c4bf21a509bb58fa39eab8a5ffa157aae30fe87aebeae8fe519bb672c6a626dffce7c0fd4c0ba0ca12f69f940ccf84ae293850ffa7801d2f63e4a6d7e SHA512 d6ff8fc8c139438fb9854e0a0b2fb993fe9d274a2dd0f4190b5f493c81a2cb2078c9ff95c83e274d67001779a271359afba6e632399be87704ffc0e8cf7c8f3b
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5cbad9cde8198ca2113451c4c5683ad1af8e645b939d8794edf8e85a10e223e3a736de4073fa8452b2453ff458d2c148d8ceb2618aee354b2de0d6803b221fe4 SHA512 30f97c4b2688602289bf1c73fc6e742394bdf51fcfdbf76b8e34f5bd9d7c92ada0e6de220919903ebce05b84cd5eaf30dd1d49965b0e654cff8b921f4db41034
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index babe73b00d69..ef5249f79dea 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild
index a761c4f71215..7fff0e4d377a 100644
--- a/dev-libs/protobuf/protobuf-3.15.8.ebuild
+++ b/dev-libs/protobuf/protobuf-3.15.8.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 7f65c6d1ba26..67f4a20d6ef8 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,7 +1,9 @@
 AUX roct-thunk-interface-4.1.0-append-flags.patch 1229 BLAKE2B 9901f0ee86b164e18c7ddd00bab50e84e7be133f0b52149a57a0f75039f91938ef3c7414235f1a821ae0181239e82688768289e32ee17a434211c5e139d3740e SHA512 3d145bc46282b17489886ad6fa3c720fd71b56f46aaf5b9c04de382109c01da7e356c1bec75e86e5ad3c5c315af7b81ae030e68993edb9b7af62487d640ad869
 DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71d444a467bdd0b39ce0b487c70f1f68180fb4b564b10a65e26e41b71d5e66721c3086ec834aee2550246172965f2d611ce9a644a SHA512 cbb45c4372ce2620fce6ccbf94e8e7600256d12acf6721da9d22aeb619cec9d4e4e25354649b83fb322f8d369347c251ebb7242ff8fc3976cc3983de0d8e30a9
 DIST roct-thunk-interface-4.1.0.tar.gz 2697077 BLAKE2B 6d5d35c57d73c7d23fe28f438421372c1dcd51b1bcbf8720dfc993ce56a4afb3cd2c5d14185f4424436db4ce6d1d48dd5f802d0fc24ea1dd78ceb5cff7604103 SHA512 adef8c6c8f375d6d402c1066859fdb45f1e938578011fa0008ad242e1365d3672c5cb02a50f98b6f2d760269b4ef46b33a77f237521b76afe42ac883c71ecd86
+DIST roct-thunk-interface-4.2.0.tar.gz 3162877 BLAKE2B 48196c2334a5514c17a5b6ca122f0beaf964040f1705bd60532e4379a01d8d6a9b462a7f74916d80841caa9d3a57d5b6e2fb030a9556a1305b879036f9bcec5f SHA512 007cd64e33bada7707f340bffddf6eb9531b0bd5227a5da522c0ff4f0e2efe4a113fc50bf52da19d58fef73008af70a352aad8b41387b327f2ba19b54ede9646
 EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
 EBUILD roct-thunk-interface-4.1.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
+EBUILD roct-thunk-interface-4.2.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 673 BLAKE2B f78ae2fd3c7a17761aa74600340903bb39071bb8ced6ba5015626f28ea472b815e5d2880bd91b3c9509204eabfa169166297edcca464582d2b0f181f8241847e SHA512 143d0032c62e1acb1d0cd72cd5be335954495a1afc6b79a6490afd5f145a8c0d9458b6ca36111faff9b310e3e40bde182ec8222faca7d48b4945719686f4e50e
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild
new file mode 100644
index 000000000000..16e23a2d974c
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/roct-thunk-interface-4.1.0-append-flags.patch"
+)
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index e55b0ba3227a..ab880480eb84 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,10 +1,7 @@
-AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279ea70c06eba2bf69ff881577326c90b037ac538c4e0c75f156a86406b7fc357eaad7f5211bc255e885b57419c88af91087d519561e54 SHA512 77901d87773b2469011bce126520d33463907568991a1f2192492ac52331789c1e1cdc8251e2cf413c6493bb97a5e8737799ed3258616cb552ee038e9be65d26
 AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
-DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
-DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
-EBUILD simdjson-0.7.1.ebuild 1027 BLAKE2B 4df6580a768cec9c70144946a9b482fcfd339b99838e540d8dcf1a05254e70966a7cb7afad5614757ba0eddfc1fca149bc3589c04682670473308a20cf954079 SHA512 2078e75afd5cfc8970d0a52bed6509670ebfbe8e3315de7e6786e6e358a91d3db8db4d5d5ac6487551502e0d9e98e59c6378c7db587f59940865f9940af4c078
-EBUILD simdjson-0.8.2.ebuild 1136 BLAKE2B cf2d1e06ac050b97552bca05cc93ebfa575e4b9fac4da2a5bfa9b010a6c67c1cc2cc3b401dd9ab99ed8eda032be23bbe9989d3e336bb88b45fabfa7a755993f7 SHA512 5e0731442161b68f7695c433fe72ac6670643be4ac74cf052608ebef1497020a3947208ee7cc60e0c29b6e035ee01b4340be09df9427d37d36fa410351ff2786
-EBUILD simdjson-0.9.2.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
+DIST simdjson-0.9.3.tar.gz 7957869 BLAKE2B fc47f26843defaac5879f2e8b9d218df503cdeab9cd23820548e8797fa59d0bc4a715bf386a4436b807dd3b0c8100415c408bb7ab5908b1b1eb237712d9a66ed SHA512 d9c02d00832853c166c952755796838d09f8b096613bcb5f41eb4ee0b7db237cabd4839dd739231f0aa0dcd8c937cd63dfc79da19788ff55754c9466a7183d32
+EBUILD simdjson-0.9.2.ebuild 1185 BLAKE2B a3fb6be762829803a2fe3822452c19ffc93eb1e33711d02f61467d95dfc60fed93c24db58f86f868a0ffd842a8ad6e54e47dca2e1d6a00ebdd20273ce65c2c87 SHA512 cd5d0a75e28a315ffeb03f2c0716e5fe82b3fff11b506b0a45d4b05572a16cad19ed91ace2d78056d2a0ed1572c157ec541c1564b79613bb178fa733e4c95feb
+EBUILD simdjson-0.9.3.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
deleted file mode 100644
index f734a65bd891..000000000000
--- a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 51ab3a31..d3d5e86e 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -105,6 +105,3 @@ endif()
- set_off(CXXOPTS_BUILD_EXAMPLES)
- set_off(CXXOPTS_BUILD_TESTS)
- set_off(CXXOPTS_ENABLE_INSTALL)
--
--import_dependency(cxxopts jarro2783/cxxopts 794c975)
--add_dependency(cxxopts)
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..5c36d994 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,10 +1,7 @@
--if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
--  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
-+  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
-   add_executable(json2json json2json.cpp)
-   add_executable(jsonstats jsonstats.cpp)
--  add_executable(jsonpointer jsonpointer.cpp)
-+  add_executable(simdjsonpointer jsonpointer.cpp)
-   add_executable(minify minify.cpp)
--else()
--  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
--endif()
-\ No newline at end of file
-+  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
diff --git a/dev-libs/simdjson/simdjson-0.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
deleted file mode 100644
index 40e114a8f658..000000000000
--- a/dev-libs/simdjson/simdjson-0.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/findutils
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.7.0-dont-bundle-cssopts.patch"
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-0.9.2.ebuild b/dev-libs/simdjson/simdjson-0.9.2.ebuild
index ce97a46f1129..98f7465e5ad0 100644
--- a/dev-libs/simdjson/simdjson-0.9.2.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test tools"
 
 BDEPEND="
diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.9.3.ebuild
index 8dd574e4361f..ce97a46f1129 100644
--- a/dev-libs/simdjson/simdjson-0.8.2.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.3.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/4"
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/8"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test tools"
 
@@ -31,6 +31,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
 )
 
 DOCS=(
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index c17a6c44cbb2..84fd2e5a40ff 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,5 +1,8 @@
+AUX tinyxml2-8.1.0-meson-typo.patch 659 BLAKE2B 86b0bc38802f42f90453c729d15be74bfca836f173a1c10f27849a06c5fcd964e7daa6c095f91ad6ad9ef58b079bf8e060ad0f889497369e76a80297f685a392 SHA512 d0a16ce826d1f6744ccc48240dbe7e0a627fc61e9f91599c9d0807431177a38e2f91f85183bc44a07ad9ad4e55b7f92ccf0c5b42fcccd60ec2e25ff5c1842451
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
+DIST tinyxml2-8.1.0.tar.gz 619733 BLAKE2B 7a7e1a250bc8944614ecf578183b41340e7519ad2181e8023244d82e83d9a85fc600e5f00051b7f6f8ebda760a1ac11cb8bfe381fc9f6432f315aa6fdb310a83 SHA512 1ef50ee2648d423f38b6ebb3e45ec3798b87cf73a75aa0e49ae697a2006517d05c8298b325de70ee2aa706546235860f01541ff753c8a1bd97fa862a4ebb5c09
 EBUILD tinyxml2-7.1.0.ebuild 607 BLAKE2B 503cfd0921e8cdaa93e6455267b4d5ce3b385de81507bb8d8d95562ffe05a23956283f6831af7877649074552eecf81674f0840956e27eca0941ca5cf2359445 SHA512 ab1b4b699b9251bac89c2d416d3d6706468fb1c21f57ebce68231f11737599c435fc6b63df99f7d6140e39b46a6df9232772c89d8402a66e9fd1a56df0c1f4ba
 EBUILD tinyxml2-8.0.0.ebuild 607 BLAKE2B 0a6cd9fddf8c97db19fdad657bf52cb0a8a089e4997d9046c8441486844f83a29c3255401ca4e1df04fb79f9e9e2178f8c71d172776da3ebb4126dc7841e4769 SHA512 55a49d33644a136883bc37e14203fe02a3d3ebb4c0c1ebbe803a97da6f82b90b637b0ab3c787d05385fc9c4487179f20e3cf7c7bbd5db3c2a17f9aaf8d0cfcbc
+EBUILD tinyxml2-8.1.0.ebuild 864 BLAKE2B 0133f461779e4fda1de03bea737dca0057d62a6e6f911a3f0674282d759524c637bc7d971d760b885f872683add0080d7a28de863f421aeb636357ea9628da2a SHA512 f02eeda15c31dd927d7e7f92f9447f628c1ab45e4cf449d18150af527288e88e6dc2dce7b5f78bbdb8e45457ff0c0853314560f4bf8f51e6f6f3a24e1177a4ca
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch b/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch
new file mode 100644
index 000000000000..b13b27af7928
--- /dev/null
+++ b/dev-libs/tinyxml2/files/tinyxml2-8.1.0-meson-typo.patch
@@ -0,0 +1,17 @@
+https://github.com/leethomason/tinyxml2/commit/0838dd11a3d7a122799298d6556cff501b88421a.patch
+
+From 0838dd11a3d7a122799298d6556cff501b88421a Mon Sep 17 00:00:00 2001
+From: heitbaum <rudi@heitbaum.com>
+Date: Mon, 17 May 2021 15:14:01 +1000
+Subject: [PATCH] meson.build: fix typo
+--- a/meson.build
++++ b/meson.build
+@@ -58,7 +58,7 @@ dep_tinyxml2 = declare_dependency(
+ # This is the new way to set dependencies, but let's not break users of older
+ # versions of meson
+ if meson.version().version_compare('>= 0.54.0')
+-  meson.override_dependency('tinyxml2', dep_tinxyml2)
++  meson.override_dependency('tinyxml2', dep_tinyxml2)
+ endif
+ 
+ if get_option('tests')
diff --git a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild
new file mode 100644
index 000000000000..1ceb8e57aecf
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-typo.patch
+)
+
+multilib_src_configure() {
+	local mymesonargs=()
+
+	if multilib_is_native_abi ; then
+		mymesonargs+=(
+			$(meson_use test tests)
+		)
+	fi
+
+	meson_src_configure "${mymesonargs[@]}"
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index ceb246c5a75a..d78aa3421ed8 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,7 @@
 DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
 DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a2371604d63cd7092e2854dbfdb15169ac74226404ca572bc8ac29d5262c6e39346271704003138b9881bd99b30 SHA512 50c4c257e0be020f45270b07fef3646712dc1556dd43ae9d54f164b97056b26779b3559deab9fe96afa11e2e97a13aa2cce348a34cf5d72ea6a3be4a8d7efc94
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
-EBUILD vala-common-0.48.12.ebuild 646 BLAKE2B 7c7c9e821ba8aeb118e369dd6ea191472a9920471ffc6e728539266a41ac50df9e266f8a54c07d889371083ec55bcdc1bd6acb2261c0d9cc86b3e96a4de73905 SHA512 576d59d76e6835ab67387b707d671ad1fb20f18ba2b24a5a2e831a600c1a20e178715a9cf725e6ebe8f040fc367aa7aad64746c70b6071d25fb03973a6aa912a
-EBUILD vala-common-0.50.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.52.3.ebuild 646 BLAKE2B b340fa6592c60b4ef8ded31d3caea68bbf10b3c33e117f5b5145cef2957f9467d15ee64f8f2172d6aee835932d84c92f4f11cdcb48a1747224e4e49cd02e8a56 SHA512 c15f0673dcec542c4269e3ac1c5a21b46ac14ec8bbb6e20a8fcaa1ae0b78bd7957e97f1486cc033150121f3c1fea1ac16125447c71014798d505e677dd3b99a1
+EBUILD vala-common-0.48.12.ebuild 653 BLAKE2B d9bf714e1dba1d434be738da71300a84588f0d60c82404dcd55abd41369d92c5b936b2e9f62bbcb93d66ba861adfb3bc7ae4375d9b2528a8ffbce375fa948710 SHA512 1654740c9cec31d743809f37e41dfd4f0f2d0108def37c6ea76f6a819dcc75e4d396e827cae8f213f5672150e32f850c927ed84bf0a233e7e625c0b3135d002a
+EBUILD vala-common-0.50.7.ebuild 661 BLAKE2B 16dc4858ce7998b2a2fcee77cd6547f7c5cbed76a73ca1d1a858d2d8731779976b988a3549d6a496f209673d6312acca629db115790af3a797be737cb1c1a94c SHA512 458bfd820271e520b7a02e29bfba7df0d9ed14cfbad6b240ddd49f8d2e0a69c87c83eb365cbb168f8361f97c5bc8d3d0c840290c3ca842732a2dba819a6ca5f0
+EBUILD vala-common-0.52.3.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.12.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
index d666b35e44fd..82c42780ac27 100644
--- a/dev-libs/vala-common/vala-common-0.48.12.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.50.7.ebuild b/dev-libs/vala-common/vala-common-0.50.7.ebuild
index ee55cfcad100..91b80ebdc38c 100644
--- a/dev-libs/vala-common/vala-common-0.50.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.50.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.52.3.ebuild b/dev-libs/vala-common/vala-common-0.52.3.ebuild
index 4a9682cb5442..043fa5ecbb04 100644
--- a/dev-libs/vala-common/vala-common-0.52.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 1d326cfd47db..3bd9e430be34 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,6 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0.ebuild 3696 BLAKE2B e2347bde9ba185d5e11bf712db5f9383ede9e97dfb4b3a35c8d7ffc4cc419ac8d28b34032a3c78cabc324a41258a75b4968faae74d8304cb85b156ff837b221c SHA512 de29d0a2fc75111d9a49aade4991a37705c5dcf2288bafef696efc2a8af60cc07748bff24a8786ffa2c3c3f6de9ce2d8a60ec2df2a427ba35577c138eb618b26
+EBUILD weston-9.0.0.ebuild 3756 BLAKE2B 1b543d591c30fa7e3929b5873090e8e0e337f41d5f8c21c01499ce5cc293a4b875f08e3cd19f08d9b2d216e03992ec80e7659591c9a95288e2b35492c738822d SHA512 498658504d1c64ef95db55e8b876f3afb5c8ff542a573b6f40918afd7562f15c544bca66e49e02146224be1dab7660211656d3da5bf6b62033c6b38e26e2124f
 EBUILD weston-9999.ebuild 3692 BLAKE2B 7932952bee15707f295c7c489c34fd0c2f5d665ba91c61bba818e9a54f6589bf74267833674f7c3e7b98983524adfe1ab24a612da7328d18b0441e1c27bd229f SHA512 4eed0f6064e23485be67450e21cdb42074d45dbdc3c90cda7968983f7a35e282250fae8eed5aa0aa4d585e3b9bb855f3aae5f5acd9b5ccffb1b685aba4245be4
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/files/weston-pipewire-0.3.patch b/dev-libs/weston/files/weston-pipewire-0.3.patch
new file mode 100644
index 000000000000..a38250d8c8f2
--- /dev/null
+++ b/dev-libs/weston/files/weston-pipewire-0.3.patch
@@ -0,0 +1,373 @@
+https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/456
+
+diff --git a/pipewire/meson.build b/pipewire/meson.build
+index 67db61f0777325695864db2bc6cf94145ed5564d..944b2259f146e07abdbd4773223f4bdb76dfa45a 100644
+--- a/pipewire/meson.build
++++ b/pipewire/meson.build
+@@ -5,17 +5,25 @@ if get_option('pipewire')
+ 		error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint)
+ 	endif
+ 
+-	depnames = [
+-		'libpipewire-0.2', 'libspa-0.1'
+-	]
+ 	deps_pipewire = [ dep_libweston_private ]
+-	foreach depname : depnames
+-		dep = dependency(depname, required: false)
+-		if not dep.found()
+-			error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint)
+-		endif
+-		deps_pipewire += dep
+-	endforeach
++
++	dep_libpipewire = dependency('libpipewire-0.3', required: false)
++	if not dep_libpipewire.found()
++		dep_libpipewire = dependency('libpipewire-0.2', required: false)
++	endif
++	if not dep_libpipewire.found()
++		error('Pipewire plugin requires libpipewire which was not found. ' + user_hint)
++	endif
++	deps_pipewire += dep_libpipewire
++
++	dep_libspa = dependency('libspa-0.2', required: false)
++	if not dep_libspa.found()
++		dep_libspa = dependency('libspa-0.1', required: false)
++	endif
++	if not dep_libspa.found()
++		error('Pipewire plugin requires libspa which was not found. ' + user_hint)
++	endif
++	deps_pipewire += dep_libspa
+ 
+ 	plugin_pipewire = shared_library(
+ 		'pipewire-plugin',
+diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c
+index fe7eb1d654d5ec67f7a3287532bb21c19ad9eac5..2c65f502c2917c23290a51bf1c24eac8d50129f1 100644
+--- a/pipewire/pipewire-plugin.c
++++ b/pipewire/pipewire-plugin.c
+@@ -34,20 +34,27 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#include <pipewire/pipewire.h>
++
+ #include <spa/param/format-utils.h>
+ #include <spa/param/video/format-utils.h>
+ #include <spa/utils/defs.h>
+ 
+-#include <pipewire/pipewire.h>
++#if PW_CHECK_VERSION(0, 2, 90)
++#include <spa/buffer/meta.h>
++#include <spa/utils/result.h>
++#endif
+ 
+ #define PROP_RANGE(min, max) 2, (min), (max)
+ 
++#if !PW_CHECK_VERSION(0, 2, 90)
+ struct type {
+ 	struct spa_type_media_type media_type;
+ 	struct spa_type_media_subtype media_subtype;
+ 	struct spa_type_format_video format_video;
+ 	struct spa_type_video_format video_format;
+ };
++#endif
+ 
+ struct weston_pipewire {
+ 	struct weston_compositor *compositor;
+@@ -60,12 +67,19 @@ struct weston_pipewire {
+ 	struct pw_loop *loop;
+ 	struct wl_event_source *loop_source;
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	struct pw_context *context;
++#endif
+ 	struct pw_core *core;
+ 	struct pw_type *t;
++#if PW_CHECK_VERSION(0, 2, 90)
++	struct spa_hook core_listener;
++#else
+ 	struct type type;
+ 
+ 	struct pw_remote *remote;
+ 	struct spa_hook remote_listener;
++#endif
+ };
+ 
+ struct pipewire_output {
+@@ -100,6 +114,7 @@ struct pipewire_frame_data {
+ 	struct wl_event_source *fence_sync_event_source;
+ };
+ 
++#if !PW_CHECK_VERSION(0, 2, 90)
+ static inline void init_type(struct type *type, struct spa_type_map *map)
+ {
+ 	spa_type_media_type_map(map, &type->media_type);
+@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
+ 	spa_type_format_video_map(map, &type->format_video);
+ 	spa_type_video_format_map(map, &type->video_format);
+ }
++#endif
+ 
+ static void
+ pipewire_debug_impl(struct weston_pipewire *pipewire,
+@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire,
+ 	free(logstr);
+ }
+ 
++#if !PW_CHECK_VERSION(0, 2, 90)
+ static void
+ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...)
+ {
+@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...)
+ 	pipewire_debug_impl(pipewire, NULL, fmt, ap);
+ 	va_end(ap);
+ }
++#endif
+ 
+ static void
+ pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...)
+@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd,
+ 	const struct weston_drm_virtual_output_api *api =
+ 		output->pipewire->virtual_output_api;
+ 	size_t size = output->output->height * stride;
++#if !PW_CHECK_VERSION(0, 2, 90)
+ 	struct pw_type *t = output->pipewire->t;
++#endif
+ 	struct pw_buffer *buffer;
+ 	struct spa_buffer *spa_buffer;
+ 	struct spa_meta_header *h;
+@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd,
+ 
+ 	spa_buffer = buffer->buffer;
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header,
++				     sizeof(struct spa_meta_header)))) {
++#else
+ 	if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) {
++#endif
+ 		h->pts = -1;
+ 		h->flags = 0;
+ 		h->seq = output->seq++;
+@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level)
+ static int
+ pipewire_output_connect(struct pipewire_output *output)
+ {
++#if !PW_CHECK_VERSION(0, 2, 90)
+ 	struct weston_pipewire *pipewire = output->pipewire;
+ 	struct type *type = &pipewire->type;
++#endif
+ 	uint8_t buffer[1024];
+ 	struct spa_pod_builder builder =
+ 		SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+ 	const struct spa_pod *params[1];
++#if !PW_CHECK_VERSION(0, 2, 90)
+ 	struct pw_type *t = pipewire->t;
++#endif
+ 	int frame_rate = output->output->current_mode->refresh / 1000;
+ 	int width = output->output->width;
+ 	int height = output->output->height;
+ 	int ret;
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	params[0] = spa_pod_builder_add_object(&builder,
++		SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
++		SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
++		SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
++		SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx),
++		SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)),
++		SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)),
++		SPA_FORMAT_VIDEO_maxFramerate,
++		SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1),
++			&SPA_FRACTION(1, 1),
++			&SPA_FRACTION(frame_rate, 1)));
++
++	ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID,
++				(PW_STREAM_FLAG_DRIVER |
++				 PW_STREAM_FLAG_MAP_BUFFERS),
++				params, 1);
++#else
+ 	params[0] = spa_pod_builder_object(&builder,
+ 		t->param.idEnumFormat, t->spa_format,
+ 		"I", type->media_type.video,
+@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output)
+ 				(PW_STREAM_FLAG_DRIVER |
+ 				 PW_STREAM_FLAG_MAP_BUFFERS),
+ 				params, 1);
++#endif
+ 	if (ret != 0) {
+ 		weston_log("Failed to connect pipewire stream: %s",
+ 			   spa_strerror(ret));
+@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old,
+ }
+ 
+ static void
++#if PW_CHECK_VERSION(0, 2, 90)
++pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format)
++#else
+ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
++#endif
+ {
+ 	struct pipewire_output *output = data;
++#if !PW_CHECK_VERSION(0, 2, 90)
+ 	struct weston_pipewire *pipewire = output->pipewire;
++#endif
+ 	uint8_t buffer[1024];
+ 	struct spa_pod_builder builder =
+ 		SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+ 	const struct spa_pod *params[2];
++#if !PW_CHECK_VERSION(0, 2, 90)
+ 	struct pw_type *t = pipewire->t;
++#endif
+ 	int32_t width, height, stride, size;
+ 	const int bpp = 4;
+ 
+ 	if (!format) {
+ 		pipewire_output_debug(output, "format = None");
++#if PW_CHECK_VERSION(0, 2, 90)
++		pw_stream_update_params(output->stream, NULL, 0);
++#else
+ 		pw_stream_finish_format(output->stream, 0, NULL, 0);
++#endif
+ 		return;
+ 	}
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	spa_format_video_raw_parse(format, &output->video_format);
++#else
+ 	spa_format_video_raw_parse(format, &output->video_format,
+ 				   &pipewire->type.format_video);
++#endif
+ 
+ 	width = output->video_format.size.width;
+ 	height = output->video_format.size.height;
+@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
+ 
+ 	pipewire_output_debug(output, "format = %dx%d", width, height);
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	params[0] = spa_pod_builder_add_object(&builder,
++		SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
++		SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
++		SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
++		SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8),
++		SPA_PARAM_BUFFERS_align, SPA_POD_Int(16));
++
++	params[1] = spa_pod_builder_add_object(&builder,
++		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
++		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
++		SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
++
++	pw_stream_update_params(output->stream, params, 2);
++#else
+ 	params[0] = spa_pod_builder_object(&builder,
+ 		t->param.idBuffers, t->param_buffers.Buffers,
+ 		":", t->param_buffers.size,
+@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
+ 		":", t->param_meta.size, "i", sizeof(struct spa_meta_header));
+ 
+ 	pw_stream_finish_format(output->stream, 0, params, 2);
++#endif
+ }
+ 
+ static const struct pw_stream_events stream_events = {
+ 	PW_VERSION_STREAM_EVENTS,
+ 	.state_changed = pipewire_output_stream_state_changed,
++#if PW_CHECK_VERSION(0, 2, 90)
++	.param_changed = pipewire_output_stream_param_changed,
++#else
+ 	.format_changed = pipewire_output_stream_format_changed,
++#endif
+ };
+ 
+ static struct weston_output *
+@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name)
+ 	if (!head)
+ 		goto err;
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	output->stream = pw_stream_new(pipewire->core, name, NULL);
++#else
+ 	output->stream = pw_stream_new(pipewire->remote, name, NULL);
++#endif
+ 	if (!output->stream) {
+ 		weston_log("Cannot initialize pipewire stream\n");
+ 		goto err;
+@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data)
+ 	return 0;
+ }
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++static void
++weston_pipewire_error(void *data, uint32_t id, int seq, int res,
++			      const char *error)
++{
++	weston_log("pipewire remote error: %s\n", error);
++}
++#else
+ static void
+ weston_pipewire_state_changed(void *data, enum pw_remote_state old,
+ 			      enum pw_remote_state state, const char *error)
+@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old,
+ 		break;
+ 	}
+ }
++#endif
+ 
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++static const struct pw_core_events core_events = {
++	PW_VERSION_CORE_EVENTS,
++	.error = weston_pipewire_error,
++};
++#else
+ static const struct pw_remote_events remote_events = {
+ 	PW_VERSION_REMOTE_EVENTS,
+ 	.state_changed = weston_pipewire_state_changed,
+ };
++#endif
+ 
+ static int
+ weston_pipewire_init(struct weston_pipewire *pipewire)
+@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
+ 
+ 	pw_loop_enter(pipewire->loop);
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	pipewire->context = pw_context_new(pipewire->loop, NULL, 0);
++#else
+ 	pipewire->core = pw_core_new(pipewire->loop, NULL);
+ 	pipewire->t = pw_core_get_type(pipewire->core);
+ 	init_type(&pipewire->type, pipewire->t->map);
++#endif
+ 
++#if PW_CHECK_VERSION(0, 2, 90)
++	pw_core_add_listener(pipewire->core,
++			       &pipewire->core_listener,
++			       &core_events, pipewire);
++#else
+ 	pipewire->remote = pw_remote_new(pipewire->core, NULL, 0);
+ 	pw_remote_add_listener(pipewire->remote,
+ 			       &pipewire->remote_listener,
+@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
+ 			goto err;
+ 		}
+ 	}
++#endif
+ 
+ 	loop = wl_display_get_event_loop(pipewire->compositor->wl_display);
+ 	pipewire->loop_source =
+@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
+ 				     pipewire);
+ 
+ 	return 0;
++#if !PW_CHECK_VERSION(0, 2, 90)
+ err:
+ 	if (pipewire->remote)
+ 		pw_remote_destroy(pipewire->remote);
+ 	pw_loop_leave(pipewire->loop);
+ 	pw_loop_destroy(pipewire->loop);
+ 	return -1;
++#endif
+ }
+ 
+ static const struct weston_pipewire_api pipewire_api = {
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index ff6a7c803237..85cdf01cd444 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
@@ -92,6 +92,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-pipewire-0.3.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index c918e1c2d3cb..b8c0c38bd3c2 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -3,6 +3,6 @@ DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514a
 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 DIST xmlsec1-1.2.32.tar.gz 1989258 BLAKE2B a1325f682efec42dbcdb066d3c242fb435daa721349905564b05829153e5337b772fbf6b996f4d249d669d76fa584055f8bec1630c4936c27fd330cda439522d SHA512 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
 EBUILD xmlsec-1.2.30.ebuild 1339 BLAKE2B 35fc887e954129bdeafd206a7bab29a04dce23b7d27b29b92bf0908f16a0393cf806423a932a8e0c4676d1b35c0f0d8ff3040cecbafb31aa4754dcbfdab517e2 SHA512 8f8680ef311ab24b814de101aeab5805f5b1da155bf799a0052334e516d301d22bbd2d33e51044902dee1f53a2dbdee840b6d6ac4e68315cef7a7c4fd68d0f82
-EBUILD xmlsec-1.2.31.ebuild 1391 BLAKE2B 1b0ae701f069e4826f2fa16244d286a39b97ad9b8a8a46025e19d6293acf99025779da6007d6e002f634f63dbbf399c92cff223cdf07f1c62e995cf5ed235d17 SHA512 2e61ab618f7c2fa7e8aa04c60af61d9728096b39dcdca288d1f2bace8108f5aa66e7b4e46204ac7ff0ffd78bd255606203c45f29ee6d80f9a7f3d6839c117176
+EBUILD xmlsec-1.2.31.ebuild 1390 BLAKE2B 80c4d0d4d9940651dedc1ce3f50c023b61422ffd686a14110f68470abad796d57ce0e88608cbf0f306ec6c8382ec5a7f2739503281bdfcf53388f803c04baabb SHA512 7fd7b30b8885c611a88df01a84bdb9924c60d376defc1126778ae5052947a6e58d10a118cf670836ad8eb52eeb79e22b792d151642bfc3aa48c15e309a76038c
 EBUILD xmlsec-1.2.32.ebuild 1344 BLAKE2B c2fd02ace7be596f7f836b20ab1e12c91396dbb5ff8a146ae99dc8e65ba4587ba2051051a8719a987ca633d54bde5500a7962042e5616e2b60313656409af44c SHA512 dcf6c13a8f83d9222bac78406f92e11cdbefe9e225d10368a214706058abdd4c3bd626642588b554b3daf39a9234971ff7c3d0cac4fe6845a24d23c45c4d9c61
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index a64b175e170b..625dcba4bd42 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-libs
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)