gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-libs
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
229 files changed, 1808 insertions, 4662 deletions
diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
index 15dcb235df99..56dd843d69fd 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
deleted file mode 100644
index e9232fc67c06..000000000000
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-4"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc examples +readline mono php python ruby test"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	dev-libs/openssl:0=
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby25) )
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	readline? ( sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings
-
-S="${WORKDIR}/${P,}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	"${FILESDIR}/${P}-db6.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		csharp/config/Make.rules.cs || die
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
-	# Glacier2/staticFiltering requires network access
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
-		cpp/Makefile || die
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	MAKE_RULES=(
-		"prefix=\"${ED}/usr\""
-		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
-		"install_configdir=\"${ED}/usr/share/${P}/config\""
-		"install_mandir=\"${ED}/usr/share/man/man1\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex readline)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED}/${SITERUBY}\""
-			"install_libdir=\"${ED}/${SITERUBYARCH}\""
-		)
-
-		# make it use ruby25 only
-		sed -i \
-			-e 's|RUBY = ruby|\025|' \
-			ruby/config/Make.rules || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/config/s2rb.rb || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/scripts/slice2rb || die
-		sed -i \
-			-e 's|output.write("ruby|\025|' \
-			scripts/TestUtil.py || die
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"GAC_ROOT=\"${ED}/usr/$(get_libdir)\""
-		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
-		"install_libdir=\"${ED}/usr/$(get_libdir)\""
-		"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
-
-		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-		for i in *; do
-			mkdir -p "${ED}/usr/share/php/${i}" || die
-			"${ED}"/usr/bin/slice2php \
-				-I"${ED}/usr/share/${P}/slice/" --all \
-				--output-dir "${ED}/usr/share/php/${i}" \
-				--ice "${ED}/usr/share/${P}/slice/${i}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			mkdir -p "${D}/$(python_get_sitedir)" || die
-
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" \
-				install
-			python_optimize
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index acff097f9aa5..e7907221b189 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,6 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r1.ebuild 8462 BLAKE2B ddb7f24b6ea232655d2536a35f21a0d0ae76daacb6abdb94c2e9fab887530f34ead180bf846ef35ce1e4bf3aeff033e7ba63e6e3a729a338d72d0c079e936f61 SHA512 323207c6422c111e7899f29a1e2bb228efb1ebbf31ac8e64b9af6a865ba8b9fb4d2e67c9fea455a7af6d3321a0dd204c0a3e749b05c78c15507dc3502181dd0a
-EBUILD Ice-3.6.5.ebuild 8460 BLAKE2B 85643420ea423430cbdc2dad7e9c412326bbd10939186ff0a4378446cf8619a8437d32e9c5dbc22eb9052fc82de2c8ff155e53e1bc01b4eac93678bbd70aecce SHA512 a4359fa9123a22359aafc4515e2a360999dd7bf3366449ae3c7ca92dc0f5805156fb5f41f04793de9fe62b705717724f8f4d3b5ff7f8a3b85f235bd0edd50bf8
+EBUILD Ice-3.6.5-r1.ebuild 8460 BLAKE2B 4449caeb6e00dc506f2ba9fb7329035adf38cb6f1320c37e81723465ae4b1157069b7587867dae095a5553f21cf896042b674723e5e58981661cbddbe69b03ab SHA512 23530dcb82ead69074ae03caab0ddadfea367b458230d358999195d2794c30be15427cad63b5d76e91b6872d99ac5354b3d4ef5c72bd3c25770d0f7cb4937c7c
 MISC metadata.xml 470 BLAKE2B 0a0f575d2237b74f0f369c49745408308af92797e19904ecd07a46cb56cf6f45366155318f727045448e3bb9639868672b4c55de224703803216d12b5b920262 SHA512 f0e959732e6800280277c32606ea6ba67947d071f17dbef5ced97970879e10198476ca3ecba2099818e3dbb2ded079dd2a1a9c5517cdd233455869e3d816444f
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7762be5ebf95..924102eeae54 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 78fc187409f6..2c2a7dbd831a 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,9 +1,4 @@
-AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743a3d958d8f86f8165045a4edff60d1c8c3d41eb8b705572843b3931f075c567fd3a6734d60dcf58133a1997ea841aa57414f50f4c2b36a SHA512 457f4cfcb2ab775bb5d64b239384fe2ebfbf99591fe38941c8208accedad1728c3bbabd637161d36dedda39b992ac8277b1d1432f117cf1277de469227e2f391
-AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b
-AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
-DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
 DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135
-EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
-EBUILD appstream-0.14.3.ebuild 1774 BLAKE2B 0aaee1797ff87ea8680803357e95bc262c837d73a77b2b60dcfac87a364f913e8d618a1c0862f5b43dc615c925879b06fca5130fb6a0be826c60e42016499cc7 SHA512 9058dbe92cc16fc1227b224a278225f51cec5fb969f90183783adc8ecb1e0e1f9bf4bb99dcd5c396305b7c5fd3a0558cd52dbb4d8ee9b1b547ccaf480065bd8f
+EBUILD appstream-0.14.3.ebuild 1771 BLAKE2B e54b4904abf50fc210cd18a1462b0d1a0d97df38f81bf94f86a55dccc3ee32b3a0dadde3e5919ec5edea7fd1c4a03f6d0f4da6ff7f3ebd55fb8c3b9db47a5393 SHA512 28f8bea8d0f6899fef3458202bf80d72c9b9425d6f0965b025d3b4cb7635853eea9a71924ebf314b612363cdbdc160ed85ec51caa25700a7d06fc79d1604a1ef
 MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
deleted file mode 100644
index c6f2bbb71f20..000000000000
--- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}/AppStream-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
-RESTRICT="test" # bug 691962
-
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.58:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	>=net-libs/libsoup-2.56:2.4
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-highlight.js.patch
-	"${FILESDIR}"/${P}-qt-add-missing-provided-kindid-enum.patch
-	"${FILESDIR}"/${P}-disable-Werror-flags.patch # bug 733774
-)
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-	rm docs/html/static/js/HighlightJS.LICENSE \
-		docs/html/static/js/highlight.min.js || die # incompatible license
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.14.3.ebuild b/dev-libs/appstream/appstream-0.14.3.ebuild
index 7a8b4e4420b5..163beaa684e4 100644
--- a/dev-libs/appstream/appstream-0.14.3.ebuild
+++ b/dev-libs/appstream/appstream-0.14.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/AppStream-${PV}"
 fi
 
diff --git a/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch
deleted file mode 100644
index 0f887432deb4..000000000000
--- a/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/meson.build	2020-07-26 21:29:04.621544863 +0200
-+++ b/meson.build	2020-07-26 21:34:06.682233266 +0200
-@@ -52,9 +52,6 @@
-     add_global_arguments(maintainer_c_args, language: 'cpp')
- endif
- 
--# a few compiler warning flags we always want enabled
--add_global_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c')
--add_global_arguments('-Wno-unused-parameter', '-Wno-error=deprecated-copy', language: 'cpp')
- add_global_arguments('-DAS_COMPILATION', language : 'c')
- 
- #
diff --git a/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch b/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch
deleted file mode 100644
index 66b388061a45..000000000000
--- a/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 5ddf424d9b5713bd71c34b5ab6bbd10ad7b74bbc Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Tue, 12 May 2020 20:00:19 +0200
-Subject: [PATCH] Never ship with an embedded convenience copy of Highlight.js
-
-This should make Debian happy.
----
- docs/doc-build-helper.py                 | 10 +-------
- docs/meson.build                         | 12 ++++++++++
- docs/style/static/js/HighlightJS.LICENSE | 29 ------------------------
- docs/style/static/js/INFO.md             |  8 +++++++
- 4 files changed, 21 insertions(+), 38 deletions(-)
- delete mode 100644 docs/style/static/js/HighlightJS.LICENSE
- create mode 100644 docs/style/static/js/INFO.md
-
-diff --git a/docs/doc-build-helper.py b/docs/doc-build-helper.py
-index ce46303d..c29cce2d 100755
---- a/docs/doc-build-helper.py
-+++ b/docs/doc-build-helper.py
-@@ -29,10 +29,6 @@
- from pathlib import Path
- 
- 
--# additional JavaScript from system locations, we use it if available
--EXTRA_JS = [['/usr/share/javascript/highlight.js/highlight.min.js',
--             'highlight.min.js']]
--
- # additional CSS from system locations, we use it if available
- EXTRA_CSS = [['/usr/share/javascript/highlight.js/styles/routeros.css',
-               'highlight.css']]
-@@ -64,11 +60,7 @@ def daps_build(src_dir, project_name, daps_exe):
-     shutil.copy(os.path.join(src_dir, 'images', 'src', 'svg', 'appstream-logo.svg'),
-                 os.path.join(html_out_dir, 'images'))
- 
--    # copy extra JS and CSS if it is available
--    for js_fname in EXTRA_JS:
--        if os.path.exists(js_fname[0]):
--            shutil.copy(js_fname[0], os.path.join(html_out_dir, 'static',
--                                                  'js', js_fname[1]))
-+    # copy extra CSS if it is available
-     for css_fname in EXTRA_CSS:
-         if os.path.exists(css_fname[0]):
-             shutil.copy(css_fname[0], os.path.join(html_out_dir, 'static',
-diff --git a/docs/meson.build b/docs/meson.build
-index 1ae5fc46..d4543fdd 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -101,6 +101,12 @@ if get_option('docs')
- 
-     if get_option('install-docs')
-         install_subdir('html', install_dir: as_doc_target_dir)
-+
-+        meson.add_install_script('sh', '-c',
-+                          'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi'
-+                          .format('/usr/share/javascript/highlight.js/highlight.min.js',
-+                                  join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js'))
-+        )
-     endif
- 
-     # add an extra testcase for documentation validation
-@@ -114,5 +120,11 @@ elif get_option('install-docs')
-     if run_command('[', '-d', join_paths(meson.current_source_dir(), 'html'), ']').returncode() == 0
-         # install documentation, if it exists
-         install_subdir('html', install_dir: as_doc_target_dir)
-+
-+        meson.add_install_script('sh', '-c',
-+                          'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi'
-+                          .format('/usr/share/javascript/highlight.js/highlight.min.js',
-+                                  join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js'))
-+        )
-     endif
- endif
-diff --git a/docs/style/static/js/INFO.md b/docs/style/static/js/INFO.md
-new file mode 100644
-index 00000000..6e95673b
---- /dev/null
-+++ b/docs/style/static/js/INFO.md
-@@ -0,0 +1,8 @@
-+### AppStream Documentation JS Directory
-+
-+You can place a minified copy of [Highlight.js](https://highlightjs.org/) in this
-+directory to enable source-code highlighting in the documentation.
-+
-+In case a system-wide copy of `highlight.min.js` and its CSS files exists in
-+`/usr/share/javascript/highlight.js/`, the buildsystem will automatically detect that
-+and create symbolic links to these files when installing the documentation.
diff --git a/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch b/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch
deleted file mode 100644
index e96b2a3856dd..000000000000
--- a/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 36f71e78f033fdb5bb880825b878b7dab31c0a73 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 1 Jun 2020 13:25:25 +0200
-Subject: [PATCH] qt: add missing Provided::KindId enum
-
-It was never added to the Qt interface
----
- qt/provided.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qt/provided.h b/qt/provided.h
-index 1e3ba317..8e350fb0 100644
---- a/qt/provided.h
-+++ b/qt/provided.h
-@@ -59,7 +59,8 @@ class APPSTREAMQT_EXPORT Provided {
-             KindDBusSystemService,
-             KindDBusUserService,
-             KindFirmwareRuntime,
--            KindFirmwareFlashed
-+            KindFirmwareFlashed,
-+            KindId,
-         };
-         Q_ENUM(Kind)
- 
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 9c0f5447f03d..a9dc305f8ac1 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 1133 BLAKE2B 666cf40573a78cfa1d6f45b94b91b475beeb91e3ed31a7eb96af8b95dcd347fa3d5e8bd0ce156158fd804a0bb75d953cbe42263089040a1c35d11eafefd15b26 SHA512 924fc8b448d06d0e2c03fdcd78d81c1cd15258dd2ded9199c80960c464cd83697e72b1a8d340e2ce8d81afe36093d8b92036c05e98f14702ac3e9e983ac49c61
+EBUILD atk-2.36.0.ebuild 952 BLAKE2B 391b17e8f0f1385147032cd18cfcb904a1eca0875817db3c3ab028ab49a4cbf74fc7a4abbddaedacb1a24fc573e3adf74efc3d5566c20db72f87de7fc780137b SHA512 4a19828763418b370acb8bed471b19f9ca6fe0ee3afd2238cf20acee02c0c0915e0023bc4c0397f845d74666d7d1e72060d368fbaca54327ad4ea79b91e5df4a
 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 8359311321a5..b9a6459af5e0 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal xdg
+inherit gnome.org meson-multilib xdg
 
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
@@ -28,20 +28,8 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 863cda9d3575..e309466a9b72 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -9,5 +9,5 @@ AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20
 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-r1.ebuild 10973 BLAKE2B 46cd022843fe85fc5bd91fab4971cfac99973258bff1a4aaadd8716766c87f15c5a84f6d5259437374176799117d06e47201ca0aa9690aa8e4ea440a79fdb166 SHA512 921f8b868ad529d8388ab849dfa6b8a0f8b9872648ae9212ddff795bfc193d108715ae5919a83ad136267407b1cfcc770b84d588111c4a20fcaf75b2d5ccfafd
+EBUILD boost-1.76.0-r1.ebuild 10967 BLAKE2B 3ef87a872fad7945d82e1392013ea4bb2ab7526d816034df3e5b9e2f44412cdc4ebc5a6e7376631876b3f876ecc9593651d5407cabf703720e953b7ae05e883b SHA512 0fe6a80c702416eb1be54199e2c479478d57813f2114e1b5f90f6377081b872e25aff166872c7a009be328072dc97e89118d605d8318843e056fc19505c56a0c
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.76.0-r1.ebuild b/dev-libs/boost/boost-1.76.0-r1.ebuild
index b6944ffca6c6..83a1e70616af 100644
--- a/dev-libs/boost/boost-1.76.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.76.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 31e8b0dbabfe..714a10396c10 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51
 DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
 DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3.ebuild 3038 BLAKE2B b239da11047cdc690d35356cdc0abcc899275cb19fb0265e03b00377ee41b085e030844c9223af0900c3ef15c4e265005d4d24adb6aa6694829acc3f5325abbb SHA512 ffccf93568dbebe4963029a2e46fa6dfb6acf4ed70d81aef3695b97ce34cfb884d6e3020712c3dd623b0a72abb197aafefd947c90249c41866f7a66eaa322508
-EBUILD botan-2.18.1.ebuild 4100 BLAKE2B 388b70639710cbdf6505461e1acd287df83b87eb900f8b5801063790cf4f35e2d613b530575cf82edb6d1e93477731be9c8beae8831dfcaa908b17ef414fcf8d SHA512 0dc9b8f915e892a9d93e9374668f1df49bbdb7f6aff04f3fc3dea54d93df307428ae1a491b0f28e579716b8d796680ce0dc084185ad71ac0932aadfcb8cd29a6
+EBUILD botan-2.18.1.ebuild 4096 BLAKE2B 13fb5acca64256ef6e17b1a723fb553a735cea1c8b8a15f49a4d13b1337c4557e2355c00c2cc984dc2820d36d18afcbb5bcfe45a827dd4a7b804d2f5373ad2a0 SHA512 796e7258ec3d58a1c8273bb73ef897f4c87ca56088560da3d796de201e6e4dad3a2161a5f43e457ddd43d5e3cadcb5bba5f7c4098d98e10964d0b7082ecb7e73
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1.ebuild b/dev-libs/botan/botan-2.18.1.ebuild
index 4d9fc251745d..7b1dd5d7ceac 100644
--- a/dev-libs/botan/botan-2.18.1.ebuild
+++ b/dev-libs/botan/botan-2.18.1.ebuild
@@ -16,7 +16,7 @@ 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"
+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=(
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index 3dbce6e3e349..660351ff5f42 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,3 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
-DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
-EBUILD boxfort-0.0.1_pre20200110.ebuild 954 BLAKE2B c1ef5350723e0f9e902185c0fb4af1eb6a135efe3b02a139c9a8664254ae08405b29bd816732d03b9fbcf19ad2e6eb5352ef78d36105860e5f345419c59ebc39 SHA512 1a1dd166d91b25c6f9230995abbe70ecb6f65e236bfdc58a4b20333ef2e3413aa4d42b61a686649a736c13150d82256d0c569ba64fba39796e8e5da75c9265f4
 EBUILD boxfort-0.0.1_pre20200902.ebuild 955 BLAKE2B e2bb6d346fdd0287d95b370035067b320720105e6c082d98fa28552df6339fd3b00323ebe531bdcc30d551bf8ced1d87c5e80d029ec67f9d49469ee0fe31c4bf SHA512 fc62cf164a55fce91e97b8cab102951ff33d51ea2f19bcfcbf28d400a29a7d3059dc17d27770b00704c5271b2c6c48e41dae8e86597c5dc1f45c11e707d3a5f8
 MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
deleted file mode 100644
index f7d59bb7efeb..000000000000
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200110.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit meson python-any-r1
-
-BOXFORT_COMMIT="1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57"
-
-DESCRIPTION="Convenient & cross-platform sandboxing C library"
-HOMEPAGE="https://github.com/Snaipe/BoxFort"
-SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> boxfort-${BOXFORT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
-	)"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
-
-python_check_deps() {
-	has_version "dev-util/cram[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dsamples=$(usex test true false)
-		-Dtests=$(usex test true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 81fd568d6203..8eff9310e429 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -4,5 +4,7 @@ AUX concurrencykit-0.7.0-gzip.patch 1553 BLAKE2B 8a164f19cdeab56fd9a1099c312bc04
 AUX concurrencykit-0.7.0-static-libs.patch 3170 BLAKE2B 8884eb8cfffdc5bdf864ec29495e8a209befdd8c7318e49bbee15821c42c7a18b0ed8d52ee07b72974318f57785a7867bd47461a44e535102bfc03c650e85af1 SHA512 52ac965f0876cca54a60ea05e1bcee9a72534368646594b55ced604f425e505bdf39b836c3a19fc5fca49a6838866e0fef4c192ff073bdb864f113e41ba87cc4
 AUX concurrencykit-0.7.0-tests.patch 1104 BLAKE2B f85dc6544d31e39ba9cbcbdfc8bd810763dbed231c23683700743fca4e4d80f88f0129c835bf93aabe71d9f2b63a33923a8516d51fc582638e09e6093b9c94d4 SHA512 1dee5e646e02c84c5ec823c600a2e18270288bc066f67b63b7da38126d43fc8cb92c8d466bf8a160e4689513d021c587d9d607e9828dcb6446c5f7df01602663
 DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
+DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7
 EBUILD concurrencykit-0.7.0-r1.ebuild 910 BLAKE2B f4f7e8209ec583bac7cb84a5c5c14edbab95b26800c3d5f8ec11011a2280452b6db30c5c70b3fdb7da3f212cd09b404f02a33e0d2f382440a963bb9661c8d208 SHA512 30563d6ee87c60b2fe4ec8cabb6d69b3d619d3a3cbb623c0d65488d40cd3cb48243f4f83d27c8381f123ed6f2a8f8c152c33b2f38bfd3ff960ed7a3c8d2fbef8
+EBUILD concurrencykit-0.7.1.ebuild 732 BLAKE2B f1d5678df38b87e13a68f4d28bc4baef5472f59030ed45a70d60a4525a8a38f1bb1a503f6051f78592f79d2f301f6c9f49d1fec59b0b243b7669e9b4ed3d4817 SHA512 fa233516f2b3183e535202d219161aef19eb5fe5ad73c9e0429dc8a98946ea098539b25176be0ed356158dda7cfdc249f0d89023f3bde051a2ba76b6af6ce2d4
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
new file mode 100644
index 000000000000..489b1bab3ea6
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="ck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library with concurrency related algorithms and data structures in C"
+HOMEPAGE="http://concurrencykit.org"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# The 'libck.so' has a name collision.
+# See #616762 for more information.
+RDEPEND="!sys-cluster/charm"
+
+src_configure() {
+	tc-export AR CC LD
+	$(usex x86 'export PROFILE=x86' '')
+
+	local myeconfargs=(
+		"--disable-static"
+	)
+
+	GZIP="" econf ${myeconfargs[@]}
+}
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 768e94d73daa..43eac4827f0a 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,9 +1,7 @@
-AUX criterion-libdir.patch 977 BLAKE2B 4d8c3510563d32a0b9bb8d61d90379173403f51046b87345e41f3f85014c8f88ff90b8c15fa0de1d99f4440c4d6d1a6f2735f73bf3e2f49bb87e6618ac16a97f SHA512 ff63aa827deb529c8e87978af9646cb52cc632edb7cd31fe398a989786303fef3830af3fbcedc59b1aa09268abc6c697f31355d084387e28067ebd3a1ad2c792
+AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
-DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
-EBUILD criterion-2.3.3.ebuild 1068 BLAKE2B 75f224ac5e583fca3bbcc50cfe73d95e42ad170d1693c31ba599c1218751613f239a54926bf7763a479785f71d87e5ce6a199fef3a71cbc8d37ab82947608f96 SHA512 1256d827ed9165cb3db614351881875ad00ee0539f7c2353e47d4ee4946a5628860240f4398eb1446bad739c4be6a43211ec37d01b60e55c3fbe51f38531f8aa
-EBUILD criterion-2.4_pre20200110.ebuild 1872 BLAKE2B 7373ea105be2fc03182d11133d5c8885a278fde1919ba61e2a0ce275bca4798192da7c4164d61ed7f3421320949e1539fb8c6a629859c115970669c4a4cc9cdb SHA512 8f96b4b6b975cf069ac35fe7d72a753eb29ca78f4f9445393509f809e3cb986e95b28ee14bb702e8db80bb387fe747a40974cc47a777f1622a49930d4e87ee3a
+EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild
deleted file mode 100644
index 808455b3876b..000000000000
--- a/dev-libs/criterion/criterion-2.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake python-any-r1
-
-DESCRIPTION="Cross platform unit testing framework for C and C++"
-HOMEPAGE="https://github.com/Snaipe/Criterion"
-SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/nanomsg:="
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
-	)"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${PN}-libdir.patch"
-S="${WORKDIR}/${PN}-v${PV}"
-
-QA_EXECSTACK="usr/lib*/libcriterion.so*"
-
-python_check_deps() {
-	has_version "dev-util/cram[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCTESTS="$(usex test ON OFF)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use test; then
-		cmake_build criterion_tests
-	fi
-}
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index 169702c042ff..54b81b96c9dc 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson python-any-r1
 
@@ -37,6 +37,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
+)
+
 python_check_deps() {
 	has_version "dev-util/cram[${PYTHON_USEDEP}]"
 }
diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
new file mode 100644
index 000000000000..c99e03af6f19
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h
+index 3b6de3b..2063d87 100644
+--- a/include/criterion/internal/assert/ieee.h
++++ b/include/criterion/internal/assert/ieee.h
+@@ -29,6 +29,7 @@
+ #ifdef __cplusplus
+ 
+ # include <cmath>
++# include <limits>
+ 
+ namespace criterion { namespace internal { namespace operators {
+ 
diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch
deleted file mode 100644
index 91b28b06b947..000000000000
--- a/dev-libs/criterion/files/criterion-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake
-index 593f2d1..a771fd5 100644
---- a/.cmake/Modules/PackageUtils.cmake
-+++ b/.cmake/Modules/PackageUtils.cmake
-@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
-   endforeach ()
- 
-   install(TARGETS ${_LIB}
--    RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib ${install_flags}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
-   )
- endfunction ()
- 
-diff --git a/src/criterion.pc.in b/src/criterion.pc.in
-index 18ac3d6..23737a4 100644
---- a/src/criterion.pc.in
-+++ b/src/criterion.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
- includedir=${prefix}/include
--libdir=${prefix}/lib
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- 
- Name: @PROJECT_NAME@
- Description: A KISS, Cross platform unit testing framework for C and C++
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 7c7699a1d1ad..510308750f96 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,5 @@
-DIST dqlite-1.6.0.tar.gz 155087 BLAKE2B 97a49f78f1b6af5ff5abfe6c5e1e3eec67cc1da4bd9c49b785e6fff60e5fd39fa1f479269ec098935ebb7fbbca6346859b54bd0c9b8f428557e2768da938da0c SHA512 07abf0d3247afd0a8f4ea053e10fbf2e53f69dc1101a7e54e064282eee3590ef5925e9b794a7cfd891247747d34b68340946d322d582ce49282b6f56804e8578
 DIST dqlite-1.7.0.tar.gz 157454 BLAKE2B 3eeaaf5bbadfc09803e70d38fcd3ab23c212dc2700ad8ecdde720932b0ad2e32016503eaa8a738139a178bb926a7818497629699ec68eec8c2111f377b40b4a3 SHA512 bf94568b1b52b0d94ddf78a3f975e277a5baa0f553c5c1d175b7e58db3d44478a1b3f8ef962259175b29d774b2eb6ed6765874dd0d461126b3268abbdd57949e
-EBUILD dqlite-1.6.0.ebuild 788 BLAKE2B 3ee1d4715173fa48b6b672d00355f27b7d22031e588ff37b51b510b263dc9081fd164dfbba70e53f21806fce6121f0a131b664e1d7ba1f9794aab6ea917116e7 SHA512 e9fa3c8f94f97162cee82da02011bc4ba4aa83dc50df2006486fbb90c17df351c0058e75d9d01cbfe12eb057899c94b36db1b118008b87c05d9ea1b0c17f6c26
-EBUILD dqlite-1.7.0.ebuild 813 BLAKE2B 8c7b349f92a1024b8e9563eb84a4d94048b9246fd93872a476c787d7ec677138c4107620dc95f8768bdfefd11a2387578e2a4cb56a9133813fbf148c108e5a25 SHA512 2d2cb575074486d71599dc0660b595e7b2c3506173183d0d06100978cee09adbf3cc4f43b7942f5765e1846e17c42e71864f98ca796be5fe8ece44d6788df2e3
+DIST dqlite-1.8.0.tar.gz 158026 BLAKE2B 0e3bc8badf6b7e0447eebd86069785dca51c4dfda527ee7b838da971830ad65e443c130484b25c901aee5ac4e14c81df84756734aac3fd58a2fdbc67a664c1fb SHA512 4b32a8f8414aabfcc53d7f6ac0d121201076d7021a7d244b7cda316c3e3349e1b4da04cca31f2e3ca7605a9357895374fce0cce076b40eaebfc29a94d42fb38f
+EBUILD dqlite-1.7.0.ebuild 812 BLAKE2B bc674d8d9d5527bde955a7b37881b4ae06f5c7e70cd5ac41ace2f61a446639744042537919119ba1b9411743e265080472c051bf9f928815fcd4944e24fc018b SHA512 d10191b3fcb221d1302f2acbd7ed1632e4a5c077094a9b53a8c3e1315dd083e373e3e3ae3c4bc8da1eb0f6b08b7ac2510a37ae288a463203b0824a7879dfb9af
+EBUILD dqlite-1.8.0.ebuild 826 BLAKE2B ecadcdbf953b9b3c607232aba6a9c6a9c27d1978aa73d200024a0bc10de755961d9f9b309cc8ce0930e1e043e875b979d0ad233125124c91e3c15db277e90c55 SHA512 79a20f793a41fd852ffdb729651a2e6ebc92a27188fd90976fd45b47b23d08c61e771543d0a50e6acdf4320d0af144305701edf9d386f0801c8a4d2e5ce5c5cc
 MISC metadata.xml 864 BLAKE2B d4b41f296b83ca318affe7df6ae3eba7b470d75bcdf343ea701890e43d62de317aefc1b4f47a939cd909ddc002201a6f77cb7662afdd8ad601f010ba0a8d16e9 SHA512 086eea8b0a1e5c58b26321bc4db1466437bda4e7129757efadc49b751a9ff2b9472b72ab83881c8e9aea171a052f9434723f27b4ccd3ae4ca15f21f165a1ca92
diff --git a/dev-libs/dqlite/dqlite-1.7.0.ebuild b/dev-libs/dqlite/dqlite-1.7.0.ebuild
index ef946a6d6856..68b083517b59 100644
--- a/dev-libs/dqlite/dqlite-1.7.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dqlite/dqlite-1.6.0.ebuild b/dev-libs/dqlite/dqlite-1.8.0.ebuild
index 460315ba8ec1..0ed80e62b489 100644
--- a/dev-libs/dqlite/dqlite-1.6.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.8.0.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
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://github.com/canonical/dqlite"
+HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
 SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -19,7 +19,7 @@ RDEPEND="dev-db/sqlite:3
 	dev-libs/libuv
 	dev-libs/raft"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/raft[test] )"
+	test? ( >=dev-libs/raft-0.11.1[lz4,test] )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 5687250d38d1..4ecfae006d0e 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,4 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
-EBUILD editline-1.17.1.ebuild 779 BLAKE2B 720abc5941aece6f32b6380f048aa093ebfddccbbea9f7180ee96946be614eef95248981d53f3c993cf7c83f0eea22e52b7f16653e4e6ba87b2bbf6fc7332774 SHA512 16b833462f06fe21d320a0e74aed88958e5992fd73a6dd6b061a2fca604bd8a8b10a81c17acb1268aac69a3571a9fc66c6e3a899c909b19518c242428904a699
+EBUILD editline-1.17.1.ebuild 780 BLAKE2B a7b816f883c8ba443177b64420a91c9a8a7eb9cc6f55ce6c4c4fd58e64089f2a07d9e0230eeefe6736446216803df9e9c440ce66e47cb3e974e232406d4f7a05 SHA512 08fbcbab0c74ea648886347e93d311040db80d23f1c237dde4c6c5734540e1a429abc2b2d0dda274db875f129a8ef286f72fd3c2a355c1d9f0fdaa51e7d69e1d
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.17.1.ebuild b/dev-libs/editline/editline-1.17.1.ebuild
index 2846c63aa397..eed9640bbec9 100644
--- a/dev-libs/editline/editline-1.17.1.ebuild
+++ b/dev-libs/editline/editline-1.17.1.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
 
 DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
-HOMEPAGE="http://troglobit.com/projects/editline/"
+HOMEPAGE="https://troglobit.com/projects/editline/"
 SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0de53e962d58..d533786b3dbd 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,10 +2,11 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
+AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
 EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
-EBUILD elfutils-0.184.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
-EBUILD elfutils-0.185.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
+EBUILD elfutils-0.184.ebuild 2367 BLAKE2B 0a3544424f08f2fc6cc603490b24a3be0f981f5ea459d97db81ee6b212fbd130d0acbe2556f6f33accd3b0a3812c10a1ba4aa5686cfb4e9174b43e9a0795d133 SHA512 92fc6617eb49b7f3e8952357497a3430a6750f28e4b4e8543e568cd1a17127aa296940b9ee7b366a0919bf3d065fbbd86273d09e04dc92919fe68a11252350b0
+EBUILD elfutils-0.185.ebuild 2422 BLAKE2B 8722db7c34a6e74ba835bc1a839bb32dfe88b9f9fdc55dcb487b136465951e7d1b9ee5f12724ebdab9a57e4d8c14a3b043c8d8cc7369c61ad3a5e929b9ee7de3 SHA512 84d9a249517f2e7a7504774546f6f2e80c83ef45a84de0d5a5e086c87d5c89136049d6f76387750fc5fe867c19fbcdf8d1c436387fae4511b30a5d7cb49ae95b
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.184.ebuild b/dev-libs/elfutils/elfutils-0.184.ebuild
index 5860b8abf503..38450aa6bc21 100644
--- a/dev-libs/elfutils/elfutils-0.184.ebuild
+++ b/dev-libs/elfutils/elfutils-0.184.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index 5860b8abf503..38edee45ed96 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
 	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.185-static-inline.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
new file mode 100644
index 000000000000..ec1aaf47a331
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/794601
+--- a/src/elflint.c
++++ b/src/elflint.c
+@@ -3434,7 +3434,7 @@ buffer_pos (Elf_Data *data, const unsigned char *p)
+   return p - (const unsigned char *) data->d_buf;
+ }
+ 
+-inline size_t
++static inline size_t
+ buffer_left (Elf_Data *data, const unsigned char *p)
+ {
+   return (const unsigned char *) data->d_buf + data->d_size - p;
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 5ab7655d6818..95275ec10981 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
-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.39.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.40.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
+DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
+EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
+EBUILD ell-0.41.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
-MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
+MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.40.ebuild b/dev-libs/ell/ell-0.40.ebuild
index 752fd7b7e630..8d87287e5656 100644
--- a/dev-libs/ell/ell-0.40.ebuild
+++ b/dev-libs/ell/ell-0.40.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.39.ebuild b/dev-libs/ell/ell-0.41.ebuild
index 8d87287e5656..752fd7b7e630 100644
--- a/dev-libs/ell/ell-0.39.ebuild
+++ b/dev-libs/ell/ell-0.41.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
index 653c017de8b7..a60a2b208074 100644
--- a/dev-libs/ell/metadata.xml
+++ b/dev-libs/ell/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <maintainer type="person">
     <email>bkohler@gentoo.org</email>
     <name>Ben Kohler</name>
   </maintainer>
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index c08cbe7e320f..89405692ba22 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1,4 +1,5 @@
 AUX fno-common.patch 1170 BLAKE2B 828fb26be2a3055d0dfb7fb5b0237c0a0b6f22143ed0a55e786b3cae6e39a5eca189856ce0a53d5a672194e2a418e76934ade60549aa7cc6d46ee436bc7583cc SHA512 c01d85b974b58accff169bdb34292d79d84b9035374a92933a503622f66cd2b08f407122c16b8c358d418626449df33083ae554a7e7a334ed6f32d500a7d7084
+AUX gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch 812 BLAKE2B 169a9855a0ccdaed5bdc48175a75f801fec33a189640264b603afe3ae3f0231427106897ef8fa9fa3b57b0d7c83e85f307728c71446980b773e5cae633565210 SHA512 3c4b84757a7f3cfd14040cb30d3e9103f53092c2e02db2c81b912cefe83d45f66446fb331dec99758268d78fbb73f33d8a42a21fbaca05264c28d360754ffff2
 DIST gf2x-1.3.0.tar.gz 727717 BLAKE2B 65f6596a09087708e4ae940b067cb375476c1e7b25a28bf12e9318c752cb326516edeb9363d0f98a9b4173f5bcefd204aa62e1cb87b3f27ad9c30b661edc7451 SHA512 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e
-EBUILD gf2x-1.3.0.ebuild 1537 BLAKE2B 547d75cc83b2013547f860aee5ac9f84dc5f80a47678b0a32ef0a41dba52331501a6faea3a21e5601137a2fb4f74c977bb3d1a81293e69ca91968f53229ef649 SHA512 bb8ef59e2b186bc642041fe2b77db5ac36adb8a84822acf16d8e9b6a0be34a3a65c1d6b8b4643b19a8c787a648b4497e2aaae1f9a6c82d786a9f7503c96617b8
+EBUILD gf2x-1.3.0.ebuild 1621 BLAKE2B aea03ad23616d78db41c6cf21980f6a72a40721ecd504a10a3c3513a79ff3b866920fa2f7da7f5e5986eee26c1b8394819465fbd0627f75bf0006e903c3354c2 SHA512 94bbd2e05dfd529251d00b423b5225684286d344a72a693cb32b7ed219389b5894e4cd03f834ce7fdcfd21700314608e42a216929f657ab2078c87da5a774865
 MISC metadata.xml 754 BLAKE2B 53d2cdd4bf257213b6f431fd7692593d9577f0c146c2b40546846ef868a781f8ef40d82fc3c833edf7e0cb9c9805c67e1740af2ba205a2e50f767d3e7160303b SHA512 48a3afc2bef2fee5bce10f9d0f4580269bc0089855f2329cf74c3726ebf20ab05867e628dad5e05c57982433cee2a17782b30b16080a76ebc979373105e18803
diff --git a/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch b/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch
new file mode 100644
index 000000000000..cc1bd0f46a9d
--- /dev/null
+++ b/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch
@@ -0,0 +1,29 @@
+From 292b5784d907f420886e50d5683517b8fe1abe3c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 5 Jun 2021 18:29:08 +0200
+Subject: [PATCH] src/tunefft.c: add include statement for MIN and MAX
+
+Add #include <sys/param.h> to have MIN and MAX available
+for next_step function.
+
+Bug: https://bugs.gentoo.org/719982
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/tunefft.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tunefft.c b/src/tunefft.c
+index a08d82a..f5abc82 100644
+--- a/src/tunefft.c
++++ b/src/tunefft.c
+@@ -65,6 +65,7 @@
+ #include <float.h>		/* for DBL_MAX */
+ #include <time.h>
+ #include <sys/utsname.h>	/* for uname */
++#include <sys/param.h>		/* for MIN, MAX */
+ #include "gf2x.h"
+ #include "gf2x/gf2x-impl.h"
+ #include "timing.h"
+-- 
+2.31.1
+
diff --git a/dev-libs/gf2x/gf2x-1.3.0.ebuild b/dev-libs/gf2x/gf2x-1.3.0.ebuild
index 0ff8c7a7a428..d879f80de12f 100644
--- a/dev-libs/gf2x/gf2x-1.3.0.ebuild
+++ b/dev-libs/gf2x/gf2x-1.3.0.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
@@ -17,7 +17,10 @@ IUSE="fft static-libs custom-tune"
 IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
 
-PATCHES=( "${FILESDIR}/fno-common.patch" )
+PATCHES=(
+	"${FILESDIR}/fno-common.patch"
+	"${FILESDIR}/${P}-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch"
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index ca118d03e439..ab2137b283c6 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.68.1.ebuild 1120 BLAKE2B 4b3c4da6265bf6494e180607706025373a9400baeda83f8ebaf0ebcf2ae47380b367a5b4918a61e9ecf75b59ff1e817ab35fa7cfd8a24ab406aad44304e25660 SHA512 67df97c143570e5de2ee7939b85a26065fb313fc3eccf3171aa50ed44325f8a063d917ea9031b50f0e704ebbcda308c245ba5af967f5038afd5e6e466ea72154
+EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.68.1.ebuild b/dev-libs/gjs/gjs-1.68.1-r1.ebuild
index ddfa9d548626..433139d0b4bd 100644
--- a/dev-libs/gjs/gjs-1.68.1.ebuild
+++ b/dev-libs/gjs/gjs-1.68.1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? ( sys-apps/dbus
 		>=x11-libs/gtk+-3.20:3[introspection] )
 "
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e7e0c1ea297c..7da7d03c654f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,12 +1,6 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
-DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
-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.66.8.ebuild 10445 BLAKE2B 65df1eb457eea785eb3d6ecae687c7b25c9257c121b2c6010a2fa2180baf8f471ede84ad81902c3a3bd2e9d4134b09d18e32b3dccb68090d918b1db6764d82c1 SHA512 42bd901d34e24696148f037276ef17dbb5dfadd05d59f603ad7d5f603bde71354dd72e7298c09cc38db510b6b3f9fb0947c240ada96af5bde3d71c33257d069e
-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 10213 BLAKE2B 14c764410afa31815ec0d4d22f081cfa0ed5d73c7af9992c30afcc3a4c7edaf8668cfc4e2224e2949417f147aac177e7dd8f4c9b8cb3382919b1f87368f72dea SHA512 31e041a5ff2399f470965bc71a5c008fe85378447fc9cf2d54f505fcc65e474c9021d75e6873ffb69156ec9cc15d04e72d6bbec7162d99ed67080878d96e7461
+DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
+EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
+EBUILD glib-2.68.3-r1.ebuild 10173 BLAKE2B 3cf109f2adca4ce3099cf971ddbbc306d626c1c7c34741373f8a26581e163cdc613999ac70ce13e8adbe94d4e66877ab1b3296854e3f3c2f485d4dfd726af680 SHA512 9bad46f0d871949c9871d7538b144479009a6597b5beee394dfe6db75d5f64d733f9cd7f6561cda099363a389a1175cf92d23a21fb67a754b1bd3319c285b64c
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
deleted file mode 100644
index 0f1be9803c93..000000000000
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ /dev/null
@@ -1,290 +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} )
-
-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 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"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * 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)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=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/glib/glib-2.66.8.ebuild b/dev-libs/glib/glib-2.66.8.ebuild
deleted file mode 100644
index 62117610b3cf..000000000000
--- a/dev-libs/glib/glib-2.66.8.ebuild
+++ /dev/null
@@ -1,290 +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} )
-
-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 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"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * 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)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=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/glib/glib-2.68.0.ebuild b/dev-libs/glib/glib-2.68.0.ebuild
deleted file mode 100644
index afd809960de6..000000000000
--- a/dev-libs/glib/glib-2.68.0.ebuild
+++ /dev/null
@@ -1,288 +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} )
-
-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/glib/glib-2.68.2.ebuild b/dev-libs/glib/glib-2.68.2-r1.ebuild
index c43b9d12caae..aa1479e53d82 100644
--- a/dev-libs/glib/glib-2.68.2.ebuild
+++ b/dev-libs/glib/glib-2.68.2-r1.ebuild
@@ -4,7 +4,7 @@
 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
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/"
@@ -13,6 +13,7 @@ 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 )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
@@ -37,7 +38,7 @@ RDEPEND="
 	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}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 # libxml2 used for optional tests that get automatically skipped
@@ -166,21 +167,17 @@ multilib_src_configure() {
 		$(meson_use systemtap dtrace)
 		$(meson_use systemtap)
 		$(meson_feature sysprof)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 		$(meson_use fam)
 		$(meson_use test tests)
 		-Dinstalled_tests=false
 		-Dnls=enabled
 		-Doss_fuzz=disabled
-		-Dlibelf=$(multilib_native_usex elf enabled disabled)
+		$(meson_native_use_feature elf libelf)
 	)
 	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
@@ -202,8 +199,6 @@ multilib_src_install() {
 }
 
 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
diff --git a/dev-libs/glib/glib-2.68.1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index afd809960de6..727335efbd4f 100644
--- a/dev-libs/glib/glib-2.68.1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+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
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/"
@@ -13,6 +13,7 @@ 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 )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
@@ -37,7 +38,7 @@ RDEPEND="
 	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}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 # libxml2 used for optional tests that get automatically skipped
@@ -166,21 +167,17 @@ multilib_src_configure() {
 		$(meson_use systemtap dtrace)
 		$(meson_use systemtap)
 		$(meson_feature sysprof)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 		$(meson_use fam)
 		$(meson_use test tests)
 		-Dinstalled_tests=false
 		-Dnls=enabled
 		-Doss_fuzz=disabled
-		-Dlibelf=$(multilib_native_usex elf enabled disabled)
+		$(meson_native_use_feature elf libelf)
 	)
 	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
@@ -202,8 +199,6 @@ multilib_src_install() {
 }
 
 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
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 19ef130aace1..142a5f77cbcb 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,3 @@
-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-common-1.66.1.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
 EBUILD gobject-introspection-common-1.68.0.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
deleted file mode 100644
index 483d8f843f5a..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.66.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-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=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 065469acec47..4bf5585ee27c 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,3 @@
-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 1985 BLAKE2B b4db889fb3637c8f2f2b08634b9bbc94c2c54eddbb4efaaf87090f2d6c30ecab7b914de1c95a0b25c48122aef658e6e5a6525f7c4ffe7689c53989837288c7d6 SHA512 aace126b652da5ae63f88f6a6f98d63d86265159904725cbb04a163bfd659a6e9174ce5207f4b6bbe1c3d1c36d59e78357606f4388f6aefd5fabe81ce15e50c0
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
deleted file mode 100644
index d71b7d125b04..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.66.1.ebuild
+++ /dev/null
@@ -1,77 +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} )
-PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-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"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 9ea9fda8e1d2..24b17f812e1e 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 784 BLAKE2B 855c676e8d66ce5f46eefce65a8623ad00a675a929e0919d657af29d38dc02e1a355e7f0472a64bb7b53fb72c7a998c4ff1417d21832a155e360f9e3d3792799 SHA512 1ba49e98dd10d0826006df9061266062c9e9b52e9bd1eb472148673e3aecf3d6a4c7435d18a2b297ef69bd03b915022e241750f486243bce8807fb1019bc69e2
+EBUILD hyphen-2.8.8-r1.ebuild 791 BLAKE2B e092dddb543e791e2ecc3306e9c47097c3fdea533bba4fdc3032be1933c914f4bcf406abf3047b300e27b7ccf096869bb1d91442d25b768ed02b4563087cad2f SHA512 86385056654a223ebfa10fc0cb76161bb9ebbea09fa7b70e37bd39b41d6d1cc80349323e6062f248ecfaa15e8aead202bbecf108a9d3395809e3b40f61ae3735
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index c56b63111a4f..85909793c2f8 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index f117cd21783d..036cbae5bcf9 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,5 +2,5 @@ AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-layoutex-68.2.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
-EBUILD icu-layoutex-69.1.ebuild 2508 BLAKE2B 4c9ffe7646a368f7ed77e09eecd0c316eadb0a4a7dbfaa4ae87661a91f0625b8cc1fe78184f34edb2dd7cfba946ff915ec99d621fcab2d1fec7b7dedcb7db77c SHA512 aa19d35f20cd9503458e4eab052c6d83667c92eb7be47bf653c61db17cf51b2717317c36adc90c6ab89985770992745cfc10949a759781f56fa567e6ceef92d2
+EBUILD icu-layoutex-69.1.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
index 9f0d780f0e8b..1f04fa03da06 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 3fe154c88bdf..0a2a930f53d6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,5 +4,5 @@ AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d1
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-68.2.ebuild 3513 BLAKE2B 96030ab9f3819d5c9d60adc9cb044150abf0adb958bef0925dae595ea4139bc80fc02d1743df56feb6b9a4ee8235d62a24280457710f6a51d720746535a50b1a SHA512 f1aba2f2669183077e5d46356ffaa570b7dcfab7531e0e4c33b6b6a4d1d8b19ef63422396b9dd8be03488089faafd4e66d61e60c763330f94dc03b9d83d55e63
-EBUILD icu-69.1.ebuild 3520 BLAKE2B 77da9f393e2c57cba27e9b564c4f2969191cc01e02465af3dfe3bde0ac0caf8284c1e6d6ae5e1394e76a105e818911eeca3586bdfafc19cf153844166b473a01 SHA512 85707a3e75d0b21d6a78cdda3c6752e00d01c913a782e0e579e506005827bb5c8e7573abf16b39f660b834c537a048557ad40c2353ca6ef0a49676e5b7b99704
+EBUILD icu-69.1.ebuild 3514 BLAKE2B 0d1b9db61f868bde6963c7bde6cd6a1309555f521c010134f37237eb227262e66256c8e1e5c225df04fe72eac88829b89eaa2ae7ce484c356efdc0869c7080d9 SHA512 4e2a0c07a99a04bce0316379deaf69dbd18182a135aff4e4f2f870b14b26e6d91bfe78fadfda853e8cf5557342976bbd9cb60b6b72fbf294c80961f9d1f8208f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-69.1.ebuild b/dev-libs/icu/icu-69.1.ebuild
index bb3f5f0b9fe4..1d2630ee16e2 100644
--- a/dev-libs/icu/icu-69.1.ebuild
+++ b/dev-libs/icu/icu-69.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 1efb765b15ce..8cbcc8bc0544 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,3 +1,3 @@
 DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
-EBUILD inih-53.ebuild 843 BLAKE2B deec706b54388544da5467665be9cb1dbdd22c7b973df3ac1f41953679b0f5ec0fd402bec661b7f60f4cb2b7e611766043371cc7ae4883853bdb85cc2b4bb5cb SHA512 27521846742cf375bf4c28950293653b1c0f230ee938e185814a35f499830d6c1c4e5f8165d2178cc17a8b52dba787ebcab052a0e3f2bd438c33e4170f059c5a
+EBUILD inih-53.ebuild 741 BLAKE2B 922581afb5a1e55042ec9d8396124f1cefe272371ecc047691f256e47e4fb59245ecda20ef9b3be1ff1d06b5138d4f577c953fa8f6b0c2915c0401614a9723d3 SHA512 1ab336d4e18d238f974e7bd5a5b3eb3982f5120d804f5d774547b2626f7eaa3dc9c7b03e8d5fa6f70ad5795ee7dc203bc101ebff4d85bb8a39f8a54f804fc561
 MISC metadata.xml 519 BLAKE2B 837ec41139390ae96130a1be2c25e178f4ca39a655a263e1be689c3da09236c43cc9750d07af108577d54663710ccc0cffb5fc432b0320c9c3f55177424ed35e SHA512 b9c05b7b9e8314a943215b721862d16b361306cc715d77250eb5e4fa1ac24f22165b8a79465188f4b5e3dc2381de72821c76b6bd6b6c7b966a3c6697209a8234
diff --git a/dev-libs/inih/inih-53.ebuild b/dev-libs/inih/inih-53.ebuild
index eca5aae8a4c7..9ccb6693b900 100644
--- a/dev-libs/inih/inih-53.ebuild
+++ b/dev-libs/inih/inih-53.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
@@ -28,14 +28,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
 multilib_src_install_all() {
 	local DOCS=(
 		LICENSE.txt
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 0e94441e2fb8..cda504352a3a 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,7 +1,5 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
 AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
-DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
-EBUILD isl-0.23-r1.ebuild 1946 BLAKE2B 74d448cc3408bdb9bea687ebf578effc2b16676974b156b3dda38c84d27ccb5073bc8de951c615f3e68ff8a0ea0fdd65ecbf6cf41867a50484434e6c8a446e7a SHA512 c8d379c083def1b02c4c9e50d5d520b6cdcbff3fdad85c8c954a28004174ef9e2fe6b985f79d3bd770bcb959365ab067f17a361a9ce929edda4a9dc2eb9ca30c
-EBUILD isl-0.24.ebuild 1992 BLAKE2B 94740683f4723be4a48efd694b1f6ad558b432d27a5863e5abe7d5ea5cbdb90cd4a92b285bf059a5ee5cde841f1dd5aee97d1bd858e83f5a01b6597c2f887726 SHA512 ba3424ef9c934830c6c1649ef029b984fcba67601af66cb93c6db6b77f376bc675f004693e7fd448925409239d99f8487042850da7a728d90348c5bb862d4799
+EBUILD isl-0.24.ebuild 1985 BLAKE2B e0a65b6a516eb5a69ccc4f82af31b51912561c371005f01552f0441d5d1dab906cd64ac0d6796e33548a4684b3f4cca39c471051b9d467b655923d18a5ee811d SHA512 b18e57fcc4ddb1aa00a9e849d2741dc5a91120e7bf0a1d5fb67ba2af2b88a2ac998e592e31865629dc57516723fbf08c17878d30803d621a356f19e0eca769af
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
deleted file mode 100644
index 5668340ffa59..000000000000
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal preserve-libs toolchain-funcs
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
-)
-
-multilib_src_configure() {
-	local econf_opts=(
-		$(use_enable static-libs static)
-
-		# AX_PROG_CC_FOR_BUILD deficiency:
-		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-	)
-	if ! tc-is-cross-compiler; then
-		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
-		# even for native builds. As a result -O3 is being used
-		# regardless of user's CFLAGS.
-		econf_opts+=(
-			CFLAGS_FOR_BUILD="${CFLAGS}"
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15) \
-		/usr/$(get_libdir)/libisl$(get_libname 19) \
-		/usr/$(get_libdir)/libisl$(get_libname 21) \
-		/usr/$(get_libdir)/libisl$(get_libname 22)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15) \
-		/usr/$(get_libdir)/libisl$(get_libname 19) \
-		/usr/$(get_libdir)/libisl$(get_libname 21) \
-		/usr/$(get_libdir)/libisl$(get_libname 22)
-}
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 5793b07aae36..9b5ae94248d8 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index ce8c12a35ebc..9a89d4dec539 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 1548 BLAKE2B f583b5f61033006655b03cab59a34bec4cf812249ed1e4886f39c4d9c548107a2c9f66c963292dfc4688feb35cd619fd5f8442f33b0a7e94bf6978dea8848931 SHA512 3d06ef0d000063054846e712a5e04b4eac08fa83e35e6d9b726402360c344d8d17df5071c294c9ed14bce8dcd597738511a90d050ec6f1351f45759a21b8f398
+EBUILD json-glib-1.6.2.ebuild 1375 BLAKE2B 3c0dd469acf28bfda3bd4e5f5bb4586608f7d0f59af216b7f495ecd08a14b511706cb976c61baa90905a2b3608161beda873900d6d5287fc2a1dd3009f1b03f2 SHA512 8a1e9737690d3bd911f75827a0d40669482dc2ef7ac3144ef07c417db9b74fe6d189342e4e10bec9828b8fe07749d24cbff9a0312ca9ea0ae20fc481248dba69
 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 1c8aa914c62e..2802e1be6769 100644
--- a/dev-libs/json-glib/json-glib-1.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal xdg-utils
+inherit gnome.org meson-multilib xdg-utils
 
 DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
 HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
@@ -38,21 +38,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled)
-		-Dman=true
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_native_true man)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index ec5bf5c90e64..db7773c63275 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.1.tar.xz 62176 BLAKE2B c0b8bbc747fdc947eb05980796a0b8c2f6006cff4278ec5fe941eaed66becb8904e05b599a7562680bdfee79ecdc6755bbe4afdd8dec928b7ef404becbd9c3d1 SHA512 dd65c0ef888e5e8b88109eb9e873203f190ca657812d4be72ac59d2ac7910fad9342a47b185af1c6949cd9045f15e1deaae0ac95eebee64d10e702621a8d2fe0
-EBUILD kopeninghours-21.04.1.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
+DIST kopeninghours-21.04.2.tar.xz 62824 BLAKE2B 1bd346fc46894199fd0f80a5cb35768de4131d1c0daf4594f4500745f8b0e79209fe41308b8e005fa1b0c6424d1776aeece3dd39b065e6ce0159f9a094679df3 SHA512 566550704a1ffe92249a026ffca10ec52514e2460da459df6dbf457065cfab5c9462ff1b9a90aa9c35637121fdff00ac89986764b5c77b519f5ac5c2174faf85
+EBUILD kopeninghours-21.04.2.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.1.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
index 405678cd3d3d..405678cd3d3d 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.04.1.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index ac76d0598e71..edada7a201e1 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,3 +1,3 @@
-DIST kosmindoormap-21.04.1.tar.xz 333772 BLAKE2B 0b58671308c5d1c69a921212913d82b32bdef4b86455c4b8b25e23fb0ae75da5886df1a50b1e0c97f9eee327ce58c438fb7bc6905dd24ef03e7f3f59c35c5381 SHA512 6645b4718e864edb6208c8fa0651e0c429cfaa1b46b5d77547e01e2935e3e73302a84eee79183fa9122f6d86fc2074db3b9daa73c97cc8bd13683f1ae94f0766
-EBUILD kosmindoormap-21.04.1.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
+DIST kosmindoormap-21.04.2.tar.xz 336984 BLAKE2B 723fbd372e14cc6d731dfccea933ba923fd804b8af4d463fa6eb78fdda8a200d67cf6bd780ad65127d93e44f44c237aa8e84987e7c2df972aa1c2ad731c0f319 SHA512 1bf6513577f0033009deaa506fcddd4407beaf0d8e44e2661b76352e851e154ce3a99e9f1e78c33428f2cdd7f4ba6637dc56882f7dbf97e583140a7972e82449
+EBUILD kosmindoormap-21.04.2.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
index a16f08aee91b..a16f08aee91b 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-21.04.1.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index fbec6f92dd08..b5859e9c0c25 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -9,5 +9,5 @@ DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b
 DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
 EBUILD kpathsea-6.3.2_p20200406.ebuild 3297 BLAKE2B 77daa60068d648efb1b1c3020d9b78446ee588f478c4f2feb2750b1798d0e18bcb6633c33a75d953879ffc0c0dc1f3f6ef2955bafbd3403b8658a70dcf4bf2d5 SHA512 6ffe280320825ec0228cefcd822347b8f80f70a864b27a777c6615697ed4c11e4dae1e81d6f7dce1c085abd12dfd479c807d7c2358fed6b02b2ab4a81a5db8bc
-EBUILD kpathsea-6.3.3_p20210325.ebuild 3318 BLAKE2B f22884982032df28eb754ad3aecfe3b7fc1b355b72947c658fbc8ca0af2a62bfd4b263c0a6c882724421bc661080539d91d5583064c81161ad82068bf561704f SHA512 1c0fbc057720571211fa3433b269d632f0b6f53ae449f2a8d1d40dcba817a75c569221ad3eaae6a5a5416f533f7f1b8bb1df5b30dad1b5a9efadb9ebea24eb73
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3310 BLAKE2B 1076c000da7bd16e06b2c3ae8f30b35e4db70bea99a33101d8bd691bf89b79936f1fa89788aa77d46f7a3b410e6d1f9764b57a86be0f480f9056f97d868a37ae SHA512 34d099988c6f36c5d2c255cd04c7c9e9abaa2313f259b55e28170280ad1e473d4a2c05c794ff5ad62e816cdbb16ce965d2ea1935fcc1a5f3006c5185245d5504
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
index c5ab6c78239b..fa2ca0b061d3 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 5b8c97274534..a1c7e07fb43d 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,3 +1,3 @@
-DIST kpublictransport-21.04.1.tar.xz 392072 BLAKE2B c4df8961c8df3299231079b060ff9238091f372a15d0aba05cb62ba914b2f9d52151bddd6d1ebdb6269d81bc45e2363f09804935545557ccbd1382a3bc5fa737 SHA512 3dc4266f296737a8e1d0a7c4792d1247b0feef3038c580d62e065d122494c87fc60cb79babbb9a0aafcc7b9c55bb0498771c572fef2ac767cfd487cbb06cf6c0
-EBUILD kpublictransport-21.04.1.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
+DIST kpublictransport-21.04.2.tar.xz 392464 BLAKE2B a06eace8fb1c1ab1e753d4042868bba520b5e5692186097ede5f2a92d3deb2b139f0552d0dba7d306ea0738f2f1447c876dd3973efa3aba7857cb8f7cb8378dc SHA512 6b5f945349e0c0d460bc1e7d797de688370200596b0b60fa51cf7d815fdf692bb6e9aaa4be290ca78b3fcda12605a6b881a40c013640394a5c966bd52eaa423e
+EBUILD kpublictransport-21.04.2.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpublictransport/kpublictransport-21.04.1.ebuild b/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
index a5fa8262d790..a5fa8262d790 100644
--- a/dev-libs/kpublictransport/kpublictransport-21.04.1.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index cc0a37154786..48cb79e9dde7 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
 DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
+DIST leatherman-1.12.5.tar.gz 818066 BLAKE2B 9d30fb224d3f4389f398294712dc85af782eeff877dd0a214fc60ee67d4a70467c1d32255cf8814f0cfc5428c660a315c24a9becdb1aa05f4d5c43ede8552af7 SHA512 dad1ee67f98a4cd12d9c6f022ae2b8c748e4c081918744030191d7c33f84983691f6bcfba3ddf5c0e5b4c36109ebd757325d6e42d88c74caaff942e6603d333e
 EBUILD leatherman-1.12.2.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
 EBUILD leatherman-1.12.4.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
+EBUILD leatherman-1.12.5.ebuild 1301 BLAKE2B 18a2b2846d2e251b1f7f7e00f2febd27c0f113ce61a3a4b489b2723a3bcaeb7ddebcb37d10aed0ec37cfd598f407f7c5e155e253b6428769c4e82b18c4c8ba91 SHA512 c2e05d17884a9a296b4cb5d4db242c16b88d212e02d7031e0bf35661d4a3ffdf2b2015b6ff4797aec8ff1a2a0c2e5162c320fd72adda97764e19d79815c72346
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.5.ebuild b/dev-libs/leatherman/leatherman-1.12.5.ebuild
new file mode 100644
index 000000000000..c105fc67cf23
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index f144fd65a54b..4d666af32317 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -5,5 +5,5 @@ AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
 DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
 EBUILD libappindicator-12.10.0-r301.ebuild 2120 BLAKE2B 1463512cb7bc35e86a3aaa486f85637aee8269931b2385d2a6006743be5f7055b16308137631c7f867d5b7b3c7986b94c5736ec2ad7aece1b3f8b8f0d90f67db SHA512 a7aa23d5998bbf8e8e8c8d278fa0ab6acd3ddfe3e4f9a5513f2cec1e14cc2cdee062d76990d248add697f5dc01dd178fc53e0f0a18d16d5623f0a07293f5171f
-EBUILD libappindicator-12.10.1_p20200706.ebuild 1934 BLAKE2B 24d791c45d2680996ecd499bc99dd4588d9e0d0b8815acd1440fffee94701b4a24862af9733d29b70c699a8c38229696b64e2600cecacd718a4ed1d0f9eb7935 SHA512 4280bba256963d0dd64b799e40d28481f28d8e3269b7b251ea7fe89a724dceb7441753eda9eaec2eb5bbd8dba5114c31bebceed5e84e93c47c2927b82dec3a49
+EBUILD libappindicator-12.10.1_p20200706.ebuild 2030 BLAKE2B 24807e5ece0a6e7dfce50b86a5b52f11fa83519a3e4d03693f2a5cd222dc7e80e3a718f9694b47b81d63e754ac77c13973f4b2d8d4cc956f05adad71ae2a5b24 SHA512 eafd8178943734188a3179d0b6d1c49a3ba217e354aadc7322ee741b17300904d95cf439f180b80262ac36ace4014ce7f005d17b5b90b2026d2d783fc2804184
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
index c963bba5ce2d..68a9bedb71df 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -67,6 +67,11 @@ multilib_src_test() {
 	GVFS_DISABLE_FUSE=1 dbus-run-session emake check
 }
 
+multilib_src_install() {
+	# Fails in parallel, bug #795444
+	emake -j1 DESTDIR="${D}" install
+}
+
 multilib_src_install_all() {
 	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index e3f199a22116..bcf549ef1ed6 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
-DIST libarcus-4.8.0.tar.gz 31906 BLAKE2B 677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794 SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689
-EBUILD libarcus-4.8.0.ebuild 1359 BLAKE2B 5f0b775d5bd0e4fef3371d0489cd7130554cb4995e08ffd299b57d64a13904790714c890614eeec2a62196e240ea38260c0d83818eaece3ff57886d247fe9e17 SHA512 8679d5641f0edeeb45cd218f277508ffdb86ad4b3de1c12dd98d0e02f27ad06ce6f58b9ea01887ad0cfaa2587ac46142f21adb119bea9c88e5dbc360439bf2fa
+DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
+EBUILD libarcus-4.9.1.ebuild 1371 BLAKE2B 12a630a06120be5e05d505e33b3978399f484c7608885c06d41add4f9e121e8465749403fe30c2694643f01534f119b0963c6379a707df91af263fb56acaf75c SHA512 d73af44d77a3bbe1ab08ce1f50ceadd55cbeebd3fa44690112150fa8bb33339aa2b6a226d211d326ccef43f9442c9fe493b66bb450156c26e0068016431f903b
 MISC metadata.xml 1285 BLAKE2B 49a2e165b06fde2a648dcd05d2d4da13bf0205fa5ceeee17f7e71672913747b44e82bedaf4e8bb8f12d58c2678ed20366325ac6b396d4c833a69fd94b5b946d0 SHA512 762d61333089b3bf0800ed9578c7d231e0a996cd0c8577c794cc8e745fa46caf9f3e2ab21465a84273c0185c598ec55875e11345d982382020d002f277382117
diff --git a/dev-libs/libarcus/libarcus-4.8.0.ebuild b/dev-libs/libarcus/libarcus-4.9.1.ebuild
index c7e1e71a1b8a..79e8a85d03be 100644
--- a/dev-libs/libarcus/libarcus-4.8.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.9.1.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} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake python-single-r1
 
@@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
 		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-deprecated-protobuf-calls.patch
+	"${FILESDIR}"/${PN}-4.8.0-deprecated-protobuf-calls.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index d7d533bda284..0b4abfc6c709 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,7 +1,7 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
 DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
-EBUILD libassuan-2.5.3.ebuild 1205 BLAKE2B e8d3dc198fe9e2653bd42c2cc0ea107696f3a07ee7d2b943992a5a9843e565e7a62a653b718884b3a5b94ecc4ad1179b4ec5d534fd09e2ae71211c18816c3554 SHA512 b78dd22d73b01e200b5d365bf3a558ecfadb79494ff50787a4da9faf2175dfd948a22b5a557f641d88706c851ae45cb556d22bd2718cbe52fa22ce2e1a506953
-EBUILD libassuan-2.5.4.ebuild 1206 BLAKE2B 7ab8a7b9f4a768fe4a03da25a331e0072426a3cc75bc679e3c51d308b7c282c97710dd8fe09902c6f0e367e468a4f1aa5c7bdb0440d57e08cd2ba4a3d58b480e SHA512 6e7446a389c86d3be8b28b25302ac04ccbf14b8a98a54131e4e874ff17e78dbf6a08a857fb9ab7019e3945a8efb8bd54710edc95a48eb06df7fbe8f2b0ba2918
-EBUILD libassuan-2.5.5.ebuild 1214 BLAKE2B 0781a4a4af292712cac67400b78d06d04dacee6b2a0014f3aac6e2c80f7a7eed3870359b3e651c8aea176e158e25353002171d21bbb85735889da6805b6a7c9b SHA512 51faf23074d4436560e96d2fb1439b19d851e6760f3a469af9cdf2b9ed9205bf47e21bdda72568cab8993647b69e7b03a30afa5f680f3dbb05c6d50da9318b3a
+EBUILD libassuan-2.5.3.ebuild 1208 BLAKE2B 5ae4f07a5a5cb097db5704b2f5983deb94f3c9a9806ba57dbebc9db1dd9add80e30957d553becdc5bee83f537b6912dad7a95536436edf5bbb8f055027627ad3 SHA512 e4f1d109da09ce902d8bbd09ac643551fb3cc2649e6f41b90c236fabb786a96b56607e07485e406633e128efdc7e339291886f7bcedad95a574f301285bed886
+EBUILD libassuan-2.5.4.ebuild 1209 BLAKE2B 4f83e24fbfd51983cdeacdb7ec8d977b4da06bc30a58debf7d4602f90820251ccada41243c2e5872eb0db4d2352179c8e2f93bf4a2dfba9d406e370a84b37dc9 SHA512 f8f9a93d06b2c8bfa0dda6d523154ca0cc03d10af7eef8032b3805666cbc61679a5774b3f77996fc033462908cf84b1a895e72f836e338926cf664374a9e2291
+EBUILD libassuan-2.5.5.ebuild 1209 BLAKE2B 4f83e24fbfd51983cdeacdb7ec8d977b4da06bc30a58debf7d4602f90820251ccada41243c2e5872eb0db4d2352179c8e2f93bf4a2dfba9d406e370a84b37dc9 SHA512 f8f9a93d06b2c8bfa0dda6d523154ca0cc03d10af7eef8032b3805666cbc61679a5774b3f77996fc033462908cf84b1a895e72f836e338926cf664374a9e2291
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 6b7c07a83540..4e78efd0429a 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-static
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
index 869dbf172ae6..f570bbe99707 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-static
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libassuan/libassuan-2.5.5.ebuild b/dev-libs/libassuan/libassuan-2.5.5.ebuild
index f47712edfd6f..f570bbe99707 100644
--- a/dev-libs/libassuan/libassuan-2.5.5.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.17"
 DEPEND="${RDEPEND}"
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-static
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 0fc7dc3240cc..04759dc181da 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
-DIST libcharon-4.8.0.tar.gz 151223 BLAKE2B fe4d2901908367569b45c466d31ac6e290979a8bd39c84f9c3ceb3ed91e9d9f1a789703fa5006706e21d77bd46b3185571df3f6157c7722e3e35244d27e0231c SHA512 33d3e9aa4e356fbf1d41555cfe2a5470d8f02b1d4f59d83e1ba89236b5e4489a93bdf24fad6f9bd2b0f843c053c485a082f5ee57437862ac40522aa61280b19c
-EBUILD libcharon-4.8.0.ebuild 1780 BLAKE2B 4efeb4d02bda95edca92de8e2e5d844463a1af6a1cf2e4a8c53ad172af051c3ab9ead90865ae6eafd0aec50995d5505739b882785e04702ed0f1e0cd8e9ff19c SHA512 d431e8b45fa1d5da7756ad62ea326b1ba58fb35bf4d9566796bd6be66168c75c4e922684203b4becd5fe5ea2204d0fcae0590eafa545866222ed1ed0dbdcbbd7
+DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
+EBUILD libcharon-4.9.1.ebuild 1780 BLAKE2B 548f44d9e88c4dffb7e8fb33b07f1f14919cb8782606de09a981b9b02943599d18913aeb4ff522c686a6d7ccd2d137d7f93dc1c2e15b5c86f46db554788fd7e8 SHA512 f90f3be2952f83df4b6f36b97aaeee492f1b4c74e72384fc89320f69a7c3c45358e2435fbe6579f5cbf952f83292b538b0e01cb936c8c468e7d858c1552a4bfe
 MISC metadata.xml 1209 BLAKE2B 358ab202ad4dcc96b472845c6f853cce633599231488d21b7cf86b90ff31e07378877679c7942d17c9c019743a326faa01951b50a9dffcf2d46e461920d5f615 SHA512 d3f74eb75b386d226e802179ebd66cc528ece495b2da4ef9c5bc75e98f988891b737eada2b86cb51863e5ccff7aad87af9dda4212f53b75d6f388db82578726f
diff --git a/dev-libs/libcharon/libcharon-4.8.0.ebuild b/dev-libs/libcharon/libcharon-4.9.1.ebuild
index 9cacf998c084..f7557d509131 100644
--- a/dev-libs/libcharon/libcharon-4.8.0.ebuild
+++ b/dev-libs/libcharon/libcharon-4.9.1.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
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 98576d9d3a13..760b114887de 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
-EBUILD libevdev-1.11.0.ebuild 1252 BLAKE2B f1735dba4f6b8aa680ac2d1ea4bf35907d01ef2dc5563d53767cdc3126662f60f0cf18dfe2d932c496ee5cc57f2f35214bbe4bb078ff77148ffc0058adb14432 SHA512 8b6aa3c85043c77eb83acc08da7a0ba59183931a8cb5e8a31fb7119a59ca8535625198f05dd3b3efd0ece998e657f620281a7ab7a98b74720dd2ef3addf9b5a2
-EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
+EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B a441858e338406d2466d8f74994df7df6031361cbf4eab9de748ce1ee59ef326df8337498ca8c3d3dd1b36b262eca501b0904b2605effed1c9190a5199bb1ac3 SHA512 d3172c7f843589d8bd373288af2b38cca467b71793ef323e22726e7e055c9f1a777e962f876814fdba66a4d337b762f0cd02e662fd6b7de00dafc4e1ba7c87b6
+EBUILD libevdev-9999.ebuild 1119 BLAKE2B 4817d8e335bd1f409e33813d03e19ff45727e6902a9340db6b67fc13f03cf2373e989f3ad0f69b77b8975ad90dec1f6c960aece32e92656d9a295b458c4e1caf SHA512 379a7786ee845919e75e1577aabc7f8460723ea2758de577789e73e3b30be0acaaf6461da790fc0ce96a5371e24abf0aa3e6f6e4fd01e1e8da6094eb1986ac59
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index bdb10dff9669..01acbddf9775 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson multilib-minimal python-any-r1
+inherit meson-multilib python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
@@ -38,16 +38,8 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
+	meson_src_test -t 100
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 11acafcb2294..7a92403df430 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson multilib-minimal python-any-r1
+inherit meson-multilib python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
@@ -38,16 +38,8 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
+	meson_src_test -t 100
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 3b30e38adff4..10e8e356b024 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,7 +2,7 @@ DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d3
 DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
 DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
 EBUILD libfmt-7.0.3.ebuild 778 BLAKE2B 9e9b994e80f7e6991913d2a553f76a7cc1690fc39a8c2692ff670a59734be819bc0cd56abffa82445e8e731faa95868341585457fbe7485ec639f1ae5d8154be SHA512 a818d4846e0551fd7eac246654d76104cda35b4a1d8d16f50d4e41876223298dc6c6eb4cff56a4ba2ad6bea304d4ba995f5a984fcadd98b4da5c95e8a905270c
-EBUILD libfmt-7.1.2.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
+EBUILD libfmt-7.1.2.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1
 EBUILD libfmt-7.1.3.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-7.1.2.ebuild b/dev-libs/libfmt/libfmt-7.1.2.ebuild
index 376757b05ade..155509d07edf 100644
--- a/dev-libs/libfmt/libfmt-7.1.2.ebuild
+++ b/dev-libs/libfmt/libfmt-7.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 1802b5c24d17..844ede04bbf3 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -7,5 +7,5 @@ DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf928161
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 EBUILD libgpg-error-1.38.ebuild 2143 BLAKE2B 85b242f6bfef608990a997b86947621e81eefb9f3c2afc4a41d8ddfc5b95f62e2400bc0df486e1a279146f142083dc8a672586e59404708fd18500b5d1edfe9e SHA512 e158b46312d9d67bf5bd52d5b2a8ca84f4054b408abdf307a41df5a3e2051f74afaf665ac02d9f87c96a15e5a70713b986ed498933f17ab59355e7a00e430b19
 EBUILD libgpg-error-1.41.ebuild 1858 BLAKE2B a3d5fdb6789c80b710e53558a1a4c46e204815ab16548eb39d423ab03fcae2b3351f667510501939475f217bced61e60d61e9ab5512755b774ccb1f138a613f7 SHA512 7aa353d58bfec3f89e4e5fb06b8e3439d05f59b4cb810a8e9f21f842767570fae835ab220c6977552a698a854516d7f15cdf1570b55bd71bad4f2ac48d1aa3ff
-EBUILD libgpg-error-1.42.ebuild 1906 BLAKE2B 8cd23b6c36c330d94489b7fcd3981d460ae3e3e3fa4bd7c4d0f84d1e2558c98752339357be606d03cccdd2955120fcb22a09dbc20778125c4553ad70aa7ae166 SHA512 51cf06997b500c79b3a958bb457d2c70bcfb3886bbcb7f67d785c29c1437bfd0dbeea60de11e72f023f4dc5f26f2f82648f7c3183f12848594200130ff6d0a2d
+EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
index 3822446f6e8b..2168705cf76b 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index fed71773bbcb..87a0e15e82e1 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,3 @@
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
-EBUILD libgusb-0.3.7.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
+EBUILD libgusb-0.3.7.ebuild 1503 BLAKE2B 0c54af17979cf21240444e14ae513e5db3d2d2ffbf073f537ebf4092ad08d47dc9ffd91e36326dab5f3503f8ebdc983dbd24e95d6bf5ba6e724f1cc44cc8cd93 SHA512 d74dc92e6dd285ad5b406c721eb9a2f38d81746d8c38b7bf14536127275a4717e7538d159bfd6a7ba87a2d1a635b609a9274c5e5ca218b080389de2fdd1d3b04
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.7.ebuild b/dev-libs/libgusb/libgusb-0.3.7.ebuild
index 2288ee798781..40fc43d65a3d 100644
--- a/dev-libs/libgusb/libgusb-0.3.7.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.7.ebuild
@@ -7,7 +7,7 @@ VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit meson multilib-minimal python-any-r1 vala
+inherit meson-multilib python-any-r1 vala
 
 DESCRIPTION="GObject wrapper for libusb"
 HOMEPAGE="https://github.com/hughsie/libgusb"
@@ -53,22 +53,11 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		$(meson_use test tests)
-		-Dvapi=$(multilib_native_usex vala true false)
+		$(meson_native_use_bool vala vapi)
 		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
+
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 0732a8b9ecd8..eeb170d636e6 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,6 +1,3 @@
-AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
-AUX 3.36.1-tests-locale.patch 1825 BLAKE2B df10a2db35720cfcb8b8c67f73573067cdd420a11276fee75f399e47e4b68e3d054d94587e68f7cffcf8de3267351bbdcd61879d5470532f8430a52c33b28ee4 SHA512 0918cd2b8fc9265e974e8315671698aa0e8f3442a30d4f545ef35cf64347a85e93500fc414c17afb6fa89f8eec8d9c1e19b90d2327fca6b6ca426b95719dcf33
-AUX 3.36.2-autoskip-network-test.patch 1034 BLAKE2B a675ec70e9f8a0bcba89743c1ae1d27cf0b451d2bd654ff78ee1097c819ac2c0b9a812bcc0592860ff50a5e0b7685dfb1904ba73522f163cdd75fea6ac047eec SHA512 c160aa40d450d11507db195dbb265aa7e1d261075e841fc521c650301ebaa0d43468aaf508ee9bf0565dabbf4240f3903353f63f15cac94caa10948cab0ec129
 AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
 AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
 AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
diff --git a/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch b/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
deleted file mode 100644
index 9d1bdc017c20..000000000000
--- a/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From ad9fa6e469c4eba423b0f7bd5fbd7a76f6165ffe Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 12:21:01 +0200
-Subject: [PATCH] build: Provide introspection option and don't build manual
- tests
-
----
- libgweather/meson.build | 21 ++++++++++++++-------
- meson.build             |  4 ++++
- meson_options.txt       |  2 ++
- 3 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 6688807..6776839 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -66,6 +66,15 @@ lib_libgweather = shared_library('gweather-3',
-   install: true,
- )
- 
-+libgweather_dep = declare_dependency(
-+  sources: [gweather_enum_types[1]],
-+  dependencies: deps_libgweather,
-+  link_with: lib_libgweather,
-+  include_directories: root_inc,
-+)
-+
-+if get_option('introspection')
-+
- gweather_gir = gnome.generate_gir(lib_libgweather,
-   sources: introspection_sources,
-   dependencies: deps_libgweather,
-@@ -83,13 +92,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
-   install: true,
- )
- 
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
--
- if enable_vala
-   gnome.generate_vapi('gweather-3.0',
-     sources: gweather_gir[0],
-@@ -98,11 +100,13 @@ if enable_vala
-     install: true
-   )
- endif
-+endif
- 
- test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
-               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
-               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
- 
-+if false
- executable('test_locations',
-   ['test_locations.c'],
-   c_args: test_cargs,
-@@ -113,6 +117,7 @@ executable('test_locations_utc',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
- 
- exe = executable('test_libgweather',
-   ['test_libgweather.c'],
-@@ -121,6 +126,7 @@ exe = executable('test_libgweather',
-   install: false)
- test('test_named_timezones', exe)
- 
-+if false
- executable('test_metar',
-   ['test_metar.c', gweather_c_sources],
-   c_args: test_cargs,
-@@ -131,3 +137,4 @@ executable('test_sun_moon',
-   c_args: test_cargs,
-   dependencies: libgweather_dep,
-   install: false)
-+endif
-diff --git a/meson.build b/meson.build
-index 54a5063..96e5d27 100644
---- a/meson.build
-+++ b/meson.build
-@@ -112,6 +112,10 @@ else
-   enable_vala = enable_vala != 'false'
- endif
- 
-+if enable_vala and not get_option('introspection')
-+  error('Vala bindings require introspection support')
-+endif
-+
- root_inc = include_directories('.')
- 
- subdir('libgweather')
-diff --git a/meson_options.txt b/meson_options.txt
-index 19b2c6a..bf4c517 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
-        description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
-        description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: true,
-+       description: 'generate GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-libs/libgweather/files/3.36.1-tests-locale.patch b/dev-libs/libgweather/files/3.36.1-tests-locale.patch
deleted file mode 100644
index fb35d2f00b7a..000000000000
--- a/dev-libs/libgweather/files/3.36.1-tests-locale.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8b20cd91a96eae39bafe82ccf444dbc00759ad43 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Mon, 9 Mar 2020 12:21:57 +0000
-Subject: [PATCH] Do not run local-dependent tests with missing locales
-
-Not everyone has all the locales installed all the time, so let's check
-if a locale is available before using it.
----
- libgweather/test_libgweather.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index 8a219115..77ee459b 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -643,6 +643,7 @@ static void
- test_location_names (void)
- {
-     GWeatherLocation *world, *brussels;
-+    char *old_locale;
- 
-     world = gweather_location_get_world ();
-     g_assert (world);
-@@ -653,7 +654,16 @@ test_location_names (void)
-     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "brussels");
-     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- 
-+    old_locale = g_strdup (setlocale (LC_ALL, NULL));
-     setlocale (LC_ALL, "fr_FR.UTF-8");
-+    if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
-+      {
-+        g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
-+        setlocale (LC_ALL, old_locale);
-+        g_free (old_locale);
-+        return;
-+      }
-+
-     _gweather_location_reset_world ();
- 
-     world = gweather_location_get_world ();
-@@ -665,7 +675,7 @@ test_location_names (void)
-     g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "bruxelles");
-     g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- 
--    setlocale (LC_ALL, "");
-+    setlocale (LC_ALL, old_locale);
-     _gweather_location_reset_world ();
- }
- 
--- 
-GitLab
-
diff --git a/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch b/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
deleted file mode 100644
index bc35bb3c4fd5..000000000000
--- a/dev-libs/libgweather/files/3.36.2-autoskip-network-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4bc5b6792706788f0930bda7049adf349713a2cc Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 30 Aug 2020 10:35:13 +0300
-Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
- resolved
-
----
- libgweather/test_libgweather.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index b481278d..5704bd8b 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -424,6 +424,11 @@ test_metar_weather_stations (void)
-         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
-         g_test_failed ();
-         return;
-+    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
-+        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
-+        g_object_unref (session);
-+        g_object_unref (msg);
-+        return;
-     }
-     g_assert_cmpint (msg->status_code, >=, 200);
-     g_assert_cmpint (msg->status_code, <, 300);
--- 
-2.26.2
-
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 6bf8a5680f0e..6204e169f621 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.17.2.tar.xz 611388 BLAKE2B a94ab1e3ef65f49a3043e5f84d68748c4800be1e2e0911b45be2a9cd6655311b2e6c2fcde64827f57e74318fc759d95e045125239305a2ae94175371c178c50a SHA512 b8953ad483648d5629d56c4dc226d4906693b15da5ba4027627a51ec35ea65b0603c09056b52ed2025df1f7a877669a5b7482c025e0b37003fc676563bd05263
 DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf85377269efebc5ade8606620fcb3d7300fabb05dafd5492458da3d2300667ed6e43d9e6fcda2bd4f461bc0685a8 SHA512 3d1ab4362ede886996795d700a938d20e04cd922e8f9598fe9346f9f93e149119526fb324a096787b4b8a47bf3e5613130bcd874f10df86761031710d2acc792
+DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
+EBUILD libinput-1.18.0.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
new file mode 100644
index 000000000000..610b570961f9
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.18.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 548bf924c77a..32c3f066a6bb 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,8 +1,4 @@
-AUX libixion-0.15.0-bashism.patch 895 BLAKE2B 6da1172978c76732c2e7127a6c85e1bb6bac7912fabe96e0ad91f07f1ff89a97fed2e3bf7d348c58f79fcedfb17d2f5e33dd6738769fb208c3c28a4521b7a9d7 SHA512 aa93ad7dcd20b703b9bab4fbd880ae13cc532345a007e28fca010215bbdeab411fffc1ce5cff5e7b602ffec2db4193d212e2b5a956b33cbaa05207b04921205b
-AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e805840a5831ce38f2458c3e2b008dfca94b5bd68cdbadeda81a6b4bbd647fa3883d3c47dfa76761a31f8f9ff699c0ad8d SHA512 1b6a62c9219705472046d9da5fa8a92672a7055160c66f16a31fd003fe88ceceedaac4d67774bf55103a98d7434c030e1a020e15dd818aec23267b47bcb9561d
-DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
-EBUILD libixion-0.15.0.ebuild 1197 BLAKE2B 4e29a88f44a9d75b451213de6cd404675aa105cb3b838f06a604d4aae7cb935cfb464fd07e8f8c602d5224731274db509ea0fde95dbb0b51c9e6aaa39fe196e4 SHA512 7dffca8b8d82fc84b6888ffce3d3ef43c8307fe7148fd15b2ecceb1b661cd927fade9daf97fccedecdac15089b527ab6b3e2e6a6c5f645e3e4b2363c4dc32d91
-EBUILD libixion-0.16.1.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
+EBUILD libixion-0.16.1.ebuild 1207 BLAKE2B 0edbb68de39c1cdacb6d863001713d5a282b3a81aaed817f92569dd47e0ebaf6c1c0124a186d97745b006ad4c54357b353b2f1b459a3c7ca6f3a33a322a8b9ed SHA512 a5a114d0b1d087aacd304414284656993db49ad11e877b42162781791ec54ce754f677e3db56ea42d378a4b1103e5c1dcc79bd56d36e533d375191039ae2d92c
 EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
deleted file mode 100644
index 9df7b04a865c..000000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 15 May 2020 12:42:20 +0200
-Subject: [PATCH] configure.ac: avoid bashisms
-
-or else we end up with unpredictable results if shell != /bin/bash:
-
-  ./configure: 19427: test: xno: unexpected operator
-
-Reported-by: Matt Whitlock <gentoo@mattwhitlock.name>
-Gentoo-bug: https://bugs.gentoo.org/723128
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3a07dd8..505aeba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-
diff --git a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
deleted file mode 100644
index be5d2e6ecaeb..000000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 23 Aug 2019 08:50:28 -0700
-Subject: [PATCH] Fix build with clang.
-
----
- include/ixion/model_context.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
-index 6ff5b67..dc27ed0 100644
---- a/include/ixion/model_context.hpp
-+++ b/include/ixion/model_context.hpp
-@@ -61,7 +61,7 @@ public:
-         } value;
- 
-         /** Initializes the cell to be empty. */
--        input_cell(nullptr_t);
-+        input_cell(std::nullptr_t);
-         /** Boolean cell value. */
-         input_cell(bool b);
-         /** The char array must be null-terminated. */
--- 
-2.24.1
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
deleted file mode 100644
index 9d8cd6a883d7..000000000000
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools python-single-r1
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-	inherit git-r3
-else
-	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.15" # based on SONAME of libixion.so
-IUSE="debug python +threads"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-util/mdds:1/1.5
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-libs/spdlog
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-musl-clang.patch" # bug 714018
-	"${FILESDIR}/${P}-bashism.patch" # bug 723128
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable debug)
-		$(use_enable python)
-		$(use_enable threads)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index 96e5b7ce6f18..398d697373af 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 3dbd8330942e..5af84f7cdfb2 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,5 +1,7 @@
 DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
 DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
-EBUILD libksba-1.5.0.ebuild 1038 BLAKE2B ed27687308712eae693801147acc1d84f7ecbeefb2a3cfc9cc9b95cc71eecf4949302c6cc2f83f77fac733ebc90be9c96921681fbca358fca94fcb5f1bce9cce SHA512 3daa8cef1e092e7c21828da9b2a0687cb7b1d9fdcac2487db46e154f0c4cde9aee50ad6b3e67ec0749daa903e04347aaa38fa328105027322ff0400137fc5f7e
-EBUILD libksba-1.5.1.ebuild 1046 BLAKE2B 4ebe4e7501cb4a327c13b71e0a84f37b3e563dde026af18815fe9e780dbabfa2802876ecdfa184a5e7b571e1cb00dab186ae26c6a1658f6f7bd8d0284d675b4e SHA512 5805d1dfafe5c0b04eba150a4367eb8ab827608348dd8cb19f5d0af808969d4786a4b10b2f6afed15d26ce741e5250b5d79fef201690671e9f0f5f99221d9871
+DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
+EBUILD libksba-1.5.0.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
+EBUILD libksba-1.5.1.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
+EBUILD libksba-1.6.0.ebuild 1052 BLAKE2B 72ce1146fc1eefbff802d10d6b273b426af9f6450d6612659ee853ddf4d53f0081dfcaa1d63dbf932e5e7a914c2fb0466d9fa1773e3a90f48868a39c823d2e1e SHA512 6d0aa0e9dcc1900aaef3be8b3d88c33dbadb8f4b9c643e66ff5719cc3a9ddbd89e90a235cad05f33d6e5bf2cbb65ee02a6cc4bf15bbcfbe1a736309017feb26b
 MISC metadata.xml 252 BLAKE2B da45974cde6a1708a138afe22c68a85a8ff108b4fa2761d3552c4c9200dee3f548bb3a351a70b3129e574e21b52ca9dc2028776ca644f7e0d5a7c82ed6dff0aa SHA512 1b195c0e35c6cd524cbb5e1088f3a634a1917095d133ce81625eef7b8ed76532a9e3dc7b364fcc3f65a13767cddfd194512104586e4a55487b1ffa067cfad3ba
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index 6b66a7c049fb..32f6d92671c7 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -19,8 +19,8 @@ BDEPEND="sys-devel/bison"
 src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libksba/libksba-1.5.1.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
index 788b29757356..32f6d92671c7 100644
--- a/dev-libs/libksba/libksba-1.5.1.ebuild
+++ b/dev-libs/libksba/libksba-1.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
@@ -19,8 +19,8 @@ BDEPEND="sys-devel/bison"
 src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
new file mode 100644
index 000000000000..579a792bd5f5
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# ppl need to use lib*-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 0b0c063d3552..87602073fc0d 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,3 +1,3 @@
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.6.ebuild 987 BLAKE2B e27ef5fa2bec4c69a197a575434c14e4b403514c66c4d69dace179ad3c6c6ce478ba6786a56c1bab9e4c22ef518e37a29c3ae5caaf01626635c9a3bd964ab2c3 SHA512 0efd4f2fb050f811f8211cfdcaa7f84aa0a69f6d8393d72b9ae2829e88b675d93d35f2c4745dda628036723dd09976833a2cd021a07d99ac106293bb9800176e
+EBUILD libmanette-0.2.6.ebuild 994 BLAKE2B d86fcb4795f4e1bf4a8e0b9c3f6c2ffebb18a1e627efe03afe54a8e01378acbe6934d3bc3cc323bb30cf65b0294a1205a38b6b3869d2ccfad5208a0e38feec84 SHA512 16bd545c48523fde818db9256579b876b075fdf01cf08e2a1d8a60e6ad24262c07b063fd30ca4231fcd3c1475e984c7153d971b70d2868762b04597c98766762
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index 9f917ee7f861..eb69e6e688c6 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gtk-doc +introspection +udev +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index e9aab6a1b0aa..d9cb616e6b6a 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 DIST libmaxminddb-1.6.0.tar.gz 605099 BLAKE2B 6868e42b8a166d75f6fa3a1da0fc2bd47a381ff960496ec9348b88c72b1bae180e3c0ce8989149e60d7d9c795d6baedb8e9d984098914064db985f2d201983c2 SHA512 9394e8dd959982d4ef5d15a928d32700722ed9d6c9988d9cc1bf2f4e67de0a53cc6987e90aaef3a6926c9ff36ac378f7a1fe47818fda4f5a3a22539210b2d004
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
-EBUILD libmaxminddb-1.6.0.ebuild 882 BLAKE2B e494290aca853f49cd534931ddf000d55e07262457ce3ddd51274e4fcb1bb872f4e6d775df480ce8234a788c8576a1490e5887942f55ef3eec59a9a24b410dc4 SHA512 cae581327a36ce1ab3f298871fd398afe360f45a44fd8c2b6d35c2f5a65736d8b215e6783e9d36c67421fc2080a08fb6e4e5fc82b2894f93fe3903a3d341bdd6
+EBUILD libmaxminddb-1.6.0.ebuild 879 BLAKE2B f76fe650a6d94ade1432bd21aafd1dfb544cd17fc3b46473ca48e0ae6b2383086c02ceac2963b8fac5effdc100c893a597ca7c4e4674d23dd59583a447381f4b SHA512 512039475e868544e5ac252c74e8c2ee33df3f009a309c851e025311305eebdb2fc0760c2588e2780d1bd1447ceecb4a0972a55fce38ac636164f58a9b357fa7
 EBUILD libmaxminddb-9999.ebuild 886 BLAKE2B d5f7b28779a576a1a0d2046652ed89b149f89a17136751de7c9f2f699d64667ccc25edac1bacc24053dc4327880e03025d0983359c715be9c901cecca26c6de8 SHA512 0636f14a7390c502005ec72458b9e4421ecb3e04f996466a936d864f1d92341d4231d0c5461f0eecef92dd2c66fa5e74f1844eb13200343ef307334ecd17fc51
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
index 5d3af3bbf396..a2f75ab9c024 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 45d3131dc8b3..980a38de7dea 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,5 +3,5 @@ AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c59191fe2b836a0c2a988b6d0404821a9f99be1fa4b258afbbc35b0cb254b348a1e7a0f7a8c4010645afff52f91 SHA512 14ba2779d94209312a8a1bbf598e6a31820df4fa7e222ae1abb8d4234a6c7ba7068e06a73ad4ee93bcb53ccb99a8007d799d9e66a9921704dc75c84b0e7dc307
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
-EBUILD libofx-0.10.2.ebuild 1154 BLAKE2B ae6eb8bc734361c773269476dbb50424575a74ddc28ff487a8d97a9ba816c5faab98cec8ae3ce8613291ce635e39aaee9747b26f419c18df28be83551982b22b SHA512 366671d6f3aed9dca56e113ca9ae0052bf77f683db0c57509cf72a708daf76db8dbafc9bcb10adfe7f69b6e2e4682c21f6ecdac22c6f1001a16e7e9563b45d0f
+EBUILD libofx-0.10.2.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
 MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/libofx-0.10.2.ebuild b/dev-libs/libofx/libofx-0.10.2.ebuild
index 3f8f6d55f1ad..1acb92d8616e 100644
--- a/dev-libs/libofx/libofx-0.10.2.ebuild
+++ b/dev-libs/libofx/libofx-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 56e4ac319753..f749caebf832 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,5 @@
-AUX liborcus-0.15.4-bashism.patch 640 BLAKE2B 4ccb09840325fb59756b806c1be68bd327757899ba904e9c3b83bafe167c61ac3e94b9779e2df547b2427f622532c86ebba56d20d853095c215a0a15d7b179bf SHA512 0d7605eea0594b81b45faa0120e7fc37021efbae8b676ee0a1262923aa69511203927163785a8648ab23ac8df8ea5b4bb08ca8f0dda436b81ec287dbe2064951
 AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a
-DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
-EBUILD liborcus-0.15.4.ebuild 1330 BLAKE2B 1418857b75f7c98f4160430afca5fcfcc05540a01b1c9191e71701c8900f2937a6bc2632697778af6364b3995fb487b9307a376420b5f62a1572a62673abcffa SHA512 a1f0505fabb9d35f33d620f31add9c96ebdaeaee8fbecd20b1537c2e0a72cc1b1accba1171ba2b0c2cd6cca7de66a5be2dfe90b8b19a79221b74beee8e915a82
-EBUILD liborcus-0.16.1.ebuild 1363 BLAKE2B 84ce1bb3d8e91578ac6a5658a1cf728097f09f85d59153de6bca210ccdd09aaa439eb122783f67ba9f3a0f675307a119827d78da1a7c7177b09a1938951cdbce SHA512 a324b201f1553a649c00a379cd4c5e851f2c3d688efbeb3e208608a7015d3961176c53a0dadf72c982290bdbce0090ce04551233f9a29eaf20f1ccfc160c14dd
+EBUILD liborcus-0.16.1.ebuild 1360 BLAKE2B 6ab301e988e28757489b577935e821cc1d78bd42c411afb9901e6003f7c2533d07de9ecb4fe156ee20c75f56014e209000a7e89e28327eb071ff295209168ed3 SHA512 d75f165acfce79042155862c2e0beb78cce03a299b2ccf240852823f60193fce202bf30edbcba77686a81767d7cc6fae5a34d4a3181dc5d5e7c2cdee1792ec8c
 EBUILD liborcus-9999.ebuild 1298 BLAKE2B d36fecea100888f02258506873c9590989d7d8abadb2e03e97b0c80d1d3643fd462f13a7af52ca889c9ea91d44a8eed9b5764887f8a2c0b0d4fd78995b9e28cd SHA512 d7c070b9f43558abda76cd5602a0176ca4713abce69b458243edd089a114bef05ec189fa61384a158406427368463f5618f256d65c7177b04d59051a6ab954d0
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
deleted file mode 100644
index cc201a5024e0..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7d2ae0b6e47aa0c1fc43a91300d82c5394420162 Mon Sep 17 00:00:00 2001
-From: Ryo ONODERA <ryo@tetera.org>
-Date: Sat, 11 Jan 2020 23:01:29 +0900
-Subject: [PATCH] Improve POSIX shell portability
-
-DO not use bash syntax.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index bc5dc195..a854c0c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
deleted file mode 100644
index def16d79f7bb..000000000000
--- a/dev-libs/liborcus/liborcus-0.15.4.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3
-else
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.15" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model tools"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[zlib(+)]
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
-	dev-util/mdds:1/1.5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bashism.patch" # bug 723130
-	"${FILESDIR}/${P}-gcc11.patch" # bug 764035
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--disable-werror
-		$(use_enable python)
-		$(use_enable spreadsheet-model)
-		$(use_with tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
index 5d24f93374c8..22d31899acaf 100644
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 1cc39c7c2804..aa3cbb35846b 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -4,4 +4,4 @@ DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185
 EBUILD libowfat-0.31-r1.ebuild 990 BLAKE2B a9f8efca4c9eb61726390339a7caac4ffe8f2ffa65e3e7bc7886fa1ea8e526ca41e04ce7e8647ba0f6eb99a3d3ad609c72b29455e3fcf253f2727ddd3f5cec71 SHA512 42ecb020a438fe3fee377d1c3aef631c991a2985b840da07532e9abdd9fba46ecf3bc9127a8a6436611e5e399cdcb815bc6f9a5e7f190048003f3e632d57dc92
 EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
 EBUILD libowfat-0.32-r2.ebuild 1088 BLAKE2B ec8425cae879c38ce0e4f896d94d2134972c79ba2e5da60ae9d23a390b5028c33bb75bfd751516a18e6854d3d9acddc7e8d4e85810f3b7d17f386a3306dbc2ef SHA512 83af89a98d847be639f4ef89d7aa5d26435073a34aea2cd3df5b6a652ed08423f9292b6c92489e2969aa5b6def756dd93c342f82892e7935c9b4af82bbd4f9c3
-MISC metadata.xml 334 BLAKE2B 24f4025b3aae0eced15612fbb46aecd98b56aafe85a4d86d28d88bb323e5fa5f10dabed4a31d416499fefeecf7ccbdc7f4b64ad4e7e01d6dd9fe6f181fb6dcb7 SHA512 7a9ba196d23359e5fcc0b37da80ce8962f16bcc64bfba1eb2fb547dd8afc95695a5518048691de673c1db4a1b2c4be5e9b869c2e67ec65f5062fb65b89573fe6
+MISC metadata.xml 254 BLAKE2B 7cf57cc5c5b28f1c88b6be41652171f75224fed5f4645b24c557c9c8ad24a320626cfb144960cd60973ce6bf8ff6e479065cf18fc4081b09372efc343d4e88fa SHA512 c3f56dbe0c81639d190d6192085ff6d61aab05cc2e317454b8fb7969e95cb1e1442f5b0eb464cbb4e604d6a9fbf8f582e253d6e970b2acef91789b5a04225dbb
diff --git a/dev-libs/libowfat/metadata.xml b/dev-libs/libowfat/metadata.xml
index 35e6645b7362..fc9c2333a716 100644
--- a/dev-libs/libowfat/metadata.xml
+++ b/dev-libs/libowfat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag>
 	</use>
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 9d51c2f376fb..64359481e454 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,6 +1,7 @@
+AUX libpcre2-10.37-jit_fixes.patch 3022 BLAKE2B 7e3091cc46d60ec3c72981f1980f7ebcfaeecc1c777188bed0edbaa64205752fcd69164ebf5de670f857f4837a76593c1930cdfe7997b49b38dc1501d7e5cbec SHA512 b691357b43032be0e97234a7fb27b4bdb684028acd4e2bc3da9a997ba823e8ffc9eca1d32fb5c3bc5700b7504ad16f83aa0f6e486c869e529cdbfa597024ad70
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
 DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
 EBUILD libpcre2-10.36-r1.ebuild 2482 BLAKE2B a569108de5f728ff394048a43b3b2fbe4dd0007da77d0edfa04a5fd973822658e138cbe48ef700a07b8a19b2993e44fce9fb0aefb50cabe285338a63f7b23bc2 SHA512 33af5c3113fadfd29ed6d9d56110be92b85d5cc905e4cbcf69606ef1b797285558106b72135b8abd07e720c0348b1ef7e17dc82ae0243590a5b5ffd314f370a6
-EBUILD libpcre2-10.37-r1.ebuild 2598 BLAKE2B 917fd2653c78a6472026a1d53caaf0a02352e705f831e26223ca4a22c98a08235422d611e780a7fd98961e3b50874da96ed33a54346ad0b13b5420f566d22ab3 SHA512 9c316a1a3d9965a9de317fd610b92e852ee5f3ba2b111b9d351cbd728718637a5427595b24d19fef95c4a2b3bc3d76720ee6c70ddeb3f4755ec446c7f6fa2def
+EBUILD libpcre2-10.37-r2.ebuild 2647 BLAKE2B 03ab44dda646c838a12d6ea42b5f001b2342658a27eed1bcb45c3b35a4d71c20c9bfd7b66cecd96b2d4cf075cd04d87365b45d5c09188e8a78566b50382dc0ed SHA512 7f8bdf84950037af4c314c272c331e428bd34d27d1e5a6701499a0b70eefe886be20177b9320d93773ef1c2dbc9175fa484cde7021896906f725fa15d86f9207
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
new file mode 100644
index 000000000000..6ee5494f2bc5
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
@@ -0,0 +1,80 @@
+Index: pcre2/ChangeLog
+===================================================================
+--- pcre2/ChangeLog	(revision 1314)
++++ pcre2/ChangeLog	(revision 1315)
+@@ -1,7 +1,14 @@
+ Change Log for PCRE2
+ --------------------
+ 
++Version 10.38-RC1 xx-xxx-2021
++-----------------------------
+ 
++1. Fix invalid single character repetition issues in JIT when the repetition
++is inside a capturing bracket and the bracket is preceeded by character
++literals.
++
++
+ Version 10.37 26-May-2021
+ -------------------------
+ 
+Index: pcre2/src/pcre2_jit_compile.c
+===================================================================
+--- pcre2/src/pcre2_jit_compile.c	(revision 1314)
++++ pcre2/src/pcre2_jit_compile.c	(revision 1315)
+@@ -1236,15 +1236,16 @@
+ 
+ return: current number of iterators enhanced with fast fail
+ */
+-static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start)
++static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start,
++   sljit_s32 depth, int start, BOOL fast_forward_allowed)
+ {
+ PCRE2_SPTR begin = cc;
+ PCRE2_SPTR next_alt;
+ PCRE2_SPTR end;
+ PCRE2_SPTR accelerated_start;
++BOOL prev_fast_forward_allowed;
+ int result = 0;
+ int count;
+-BOOL fast_forward_allowed = TRUE;
+ 
+ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
+ SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
+@@ -1476,6 +1477,7 @@
+       case OP_CBRA:
+       end = cc + GET(cc, 1);
+ 
++      prev_fast_forward_allowed = fast_forward_allowed;
+       fast_forward_allowed = FALSE;
+       if (depth >= 4)
+         break;
+@@ -1484,7 +1486,7 @@
+       if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
+         break;
+ 
+-      count = detect_early_fail(common, cc, private_data_start, depth + 1, count);
++      count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed);
+ 
+       if (PRIVATE_DATA(cc) != 0)
+         common->private_data_ptrs[begin - common->start] = 1;
+@@ -13657,7 +13659,7 @@
+ private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
+ 
+ if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
+-  detect_early_fail(common, common->start, &private_data_size, 0, 0);
++  detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE);
+ 
+ set_private_data_ptrs(common, &private_data_size, ccend);
+ 
+Index: pcre2/src/pcre2_jit_test.c
+===================================================================
+--- pcre2/src/pcre2_jit_test.c	(revision 1314)
++++ pcre2/src/pcre2_jit_test.c	(revision 1315)
+@@ -351,6 +351,7 @@
+ 	{ MU, A, 0, 0, ".[ab]*a", "xxa" },
+ 	{ MU, A, 0, 0, ".[ab]?.", "xx" },
+ 	{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
++	{ MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
+ 
+ 	/* Bracket repeats with limit. */
+ 	{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
diff --git a/dev-libs/libpcre2/libpcre2-10.37-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
index 12ac913d688a..8f86138dfd59 100644
--- a/dev-libs/libpcre2/libpcre2-10.37-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-jit_fixes.patch"
+)
+
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pcre2-config
 )
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 4d4d56a48969..37aa22a13f8f 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,5 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
-AUX libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
 EBUILD libpeas-1.30.0.ebuild 1967 BLAKE2B 7341b999788c5f064aeb6c9c5a230603196b4dfd4a4c8280cfd9dbb6fa2406bdec4fd2594c60b23a925ea48bab9a29b7c2a0bdc80ab838e5cc7ab2a0fbb6a8ba SHA512 09f8a95941f6dafa3dfb524a05188507ff8d3dbe743acbb6366ba39ff0fbe28f01a2fd06a6eca86a479d5f0f8d58724b88db4ef2a3d57f99bdc8dac8e4670d29
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
deleted file mode 100644
index 55a425c9d513..000000000000
--- a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6d053ec0a4108be59f5e30a04ab4e6539e694e53 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 18 Sep 2020 11:31:52 +0100
-Subject: [PATCH] tests: Explicitly depend on the GIR and typelib
-
-In Meson since 0.55.0, having the test executable depend on the GIR
-dependency is not enough to ensure that uninstalled GIR and typelib
-files are generated: we also need to have the test itself depend on
-the GIR build target.
-
-It is not clear to me whether this is a workaround for a Meson
-regression (if what libpeas previously did was meant to work), or a
-solution to a libpeas bug (if it was never meant to be guaranteed to
-work). For more details see
-<https://github.com/mesonbuild/meson/issues/7756>.
-
-Resolves: https://gitlab.gnome.org/GNOME/libpeas/-/issues/40
-Bug-Debian: https://bugs.debian.org/966951
----
- tests/libpeas/meson.build | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/libpeas/meson.build b/tests/libpeas/meson.build
-index 32cf5e9..c95190a 100644
---- a/tests/libpeas/meson.build
-+++ b/tests/libpeas/meson.build
-@@ -53,5 +53,10 @@ foreach test: libpeas_tests_sources
-     c_args: libpeas_tests_c_args,
-   )
- 
--  test('test-@0@'.format(test_name), test_exe, env: test_env)
-+  test(
-+    'test-@0@'.format(test_name),
-+    test_exe,
-+    depends: [libintrospection_gir],
-+    env: test_env,
-+  )
- endforeach
--- 
-2.26.2
-
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index a3ade8bd71c4..58c68b01e0bf 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,9 +1,6 @@
 AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e
 AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688
-AUX libpreludedb-5.1.0-fix_py38.patch 326 BLAKE2B 1d568b80b66dd919d990233fdb2602a5de9f68055524c0b20adad82c6b0844bcb9a62af55d4ae538b8e3fb63f3d56c7948e164cec21f5eb9a0e135897a666709 SHA512 7068f2aed2eb79186dc3eb77845fb828d3b6e5d7ae8bc809352c83f0e19d342b77459d495cd568d022df34299c43082fa23b7e49754a17207d63b3a2326ca301
 DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
-DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
-EBUILD libpreludedb-5.1.0.ebuild 1875 BLAKE2B 5fba769391866fc42ecf439deaede6dcdb2bb51c022bb56cc8c0bc10230cd7b7bd347ab078e63b2be17ffeedfac3dae2318043f2751e7568bae843f476ebf0bb SHA512 511e3fd42cf9157ef63dac60238550d0d7573c00450efe3b2acd3f90c556151ffb05f2e231b2f4a4f74e14064e0a5b05fb5202955244ce83d77ff4a67ec5e608
 EBUILD libpreludedb-5.2.0.ebuild 1902 BLAKE2B 70abf2f4c1a002049b36aa37e173d813679fe875eb3ae127c6e1d69bd2bf17a719f29c6700d9d4615fbd93939817b7a340ddf5e8b6869d26ded6b92a4073746b SHA512 ef0089648810af994210043f51c197a82323bde7d940b95de29140674755a0470308cc2f7a54b10ee7ca1975d77d0c7d13936bc0e90f03903872293f5563755c
 MISC metadata.xml 770 BLAKE2B 5765d87e951ae7d219fbd111582ce89679c8c0f501957b9cf0d8a33d98bc7a244f210e228203949efb5be2b7a07c12d91279c85b4300d4bebe579e20b40e7380 SHA512 604f81ca0cca54d7bf06e025756397e83089ab1c6ba652b59bf16f59bacee18e9c094fd7244d36b5fbf7c1d8f4123788bb7e89b596a6aefb407ebd91681c26e4
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch
deleted file mode 100644
index a2a6a0a8be04..000000000000
--- a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bindings/python/_preludedb.cxx
-+++ b/bindings/python/_preludedb.cxx
-@@ -3133,7 +3133,7 @@
- 
- SWIGINTERN void
- SwigPyStaticVar_dealloc(PyDescrObject *descr) {
--  _PyObject_GC_UNTRACK(descr);
-+  PyObject_GC_UnTrack(descr);
-   Py_XDECREF(PyDescr_TYPE(descr));
-   Py_XDECREF(PyDescr_NAME(descr));
-   PyObject_GC_Del(descr);
diff --git a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
deleted file mode 100644
index 2d7d6e0157ef..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/libprelude-5.1.0
-	<dev-libs/libprelude-6
-	net-libs/gnutls:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-lang/swig-3.0.11
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	python? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
-	"${DISTDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index e640ffdf2d29..747ce09120c4 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,10 +1,3 @@
-AUX librelp-1.7.0-missing-files.patch 10718 BLAKE2B 83c4621bbb5e896464d0ec3f8c2ccb1bb5d59371582cf2d360a314cf5bdb8094326aa17b913178206fc8a3dd29f98d7b0c20764fc07e96f5c1204cde51d1243d SHA512 9a8a88a2704b9c16cd5a9bb8c1ab19e6fe541bd5a10f7016e55733baba343a46f1c372f2865f23970d4806395f0f071ab5ec940b7fd207d836179da6818b0a28
 DIST librelp-1.10.0.tar.gz 543414 BLAKE2B 3c7bace3c7892755c943dc4fc9bee7962e6891f5200ac184555da5f552d19d65f5604c745653d06a87210152af9b57f7234636e59257dd29dc83b5dc566c9680 SHA512 a38840231902bec034edb497166deded7577c989e4f735e406c8488384972925de1ca6132b3080472f7919d2439559c8774c02a49c356e90ad791dfbba2a4865
-DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
-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 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
+EBUILD librelp-1.10.0.ebuild 1344 BLAKE2B b33053f78d91432ca014378e08f7d8a901538b5c3739a501f97b45e33d63928ba27d91e20604d0a27871aa3177bcf0c7b29346268807272b7b2c82af19df1b7f SHA512 ded75d538100e75c1a2c11823e0ec82c1ddedb928c62ae1af3bf4da98ff7aac3093b3682097e730bf06648480286f280a8547acc44ab0ee03ff62580730d1995
 MISC metadata.xml 348 BLAKE2B 2af0e4639968ab3b7e549bd57d42637cf2f6938a1e00d78f90b1697462a76f92adb1396ab3b6966cd1dd433870c5eb23cdf75e8ee9b022b4504d1b639ec39007 SHA512 c294b01d94ab0b79a0552cbb0208dd02dcc022ae8a3b8b8ebcebe4ede39ab9ae01a53af1b5bf28133ba9fde4962f874f351b21979d50e058bd9fede0c5c46f96
diff --git a/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch b/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
deleted file mode 100644
index 327ca720c72b..000000000000
--- a/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-https://github.com/rsyslog/librelp/issues/206
-
---- /dev/null
-+++ b/tests/tls-certs/certchain.pem
-@@ -0,0 +1,60 @@
-+-----BEGIN CERTIFICATE-----
-+MIIFVzCCA7+gAwIBAgIIWxfNMhQmuncwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDE1NVoYDzIxMTgwNTEzMTIwMjAxWjCBmDEXMBUGA1UEAxMOcnN5c2xvZy1jbGll
-+bnQxFTATBgNVBAsTDEFkaXNjb24gR21iSDEVMBMGA1UEChMMQWRpc2NvbiBHbWJI
-+MRgwFgYDVQQHEw9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQG
-+EwJERTEbMBkGCgmSJomT8ixkARkWC3JzeXNsb2cuY29tMIIBojANBgkqhkiG9w0B
-+AQEFAAOCAY8AMIIBigKCAYEA8nNWVoZwi7fYKSYxm+lidTbMQEHh9pLXV8P1N2FD
-+wqhNc6Z71VqQw6gIDyzxBjZf3ldyPb6xAcxikvk2XCxVGqDaP7E1rfnCDSqxcgLG
-+r1/TlRH3fFMFPqzMgs0GbDoKi7WuhcNMH1yIRk4uPVSUY3IclcE9sNvMpNVY77c9
-+tYeLyoLgG8A2ljlSjbHXDmR8E1C+WcOvjFKQunpv29zIOvfp3Wuw0g3C6E26RyvY
-+OnNNq6bmDHXdyIkxYNPwxyfBDGq/WhnrFqQTyEqulVLVVIpK+3fIdtmH/4OpOwxz
-+KM0q2k9CzL+AI1JqlFoePeIKYQYAOssUBwB0VBDbhyo8f7txBs6OB1phPcmbkAo2
-+bJfL01UT315omqlGWjvvDRjDEeRAfXnWu/UVLIs1MNn09l2+fKwgZyOZIQEk5gGg
-+b+xO7pZp5W1IuLxB1DMatQjYK1L1MG8KUebovTyumAj8kOaCJaqa+EWcPvsH2wJb
-+zp7JZV7xAMnNQGLHHccY9Iv9AgMBAAGjga0wgaowDAYDVR0TAQH/BAIwADAnBgNV
-+HSUEIDAeBggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMRMCAGA1UdEQQZMBeC
-+FXRlc3RiZW5jaC5yc3lzbG9nLmNvbTAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQW
-+BBTFQ9rF9eWMeqNtrDMOGb1fZ54EYTAfBgNVHSMEGDAWgBQMETadsJwFRGSslyZA
-+wChTI52OmjANBgkqhkiG9w0BAQsFAAOCAYEAG9hahjpm74U85pP7/zngEJ5P5nnM
-+3aC8u4lDM7kodtnxJWoisbv/EBr6SihpDtfWA6+bAJGGu+4UBUaMyUg8w/FjylHc
-+INtljbalRuu7YguL2uLdlDNCxQa1XkWugYMObR6r6OvTPUwK0QakTsZuibRbWBDz
-+lWKOoM7ZSxZi9DaeChe3yNSGxJSC9xHZbYYBOP5RjChXTZTKtYZemF2wx6EtWRtc
-+vXK3TbnJtDy7SPm60EoFnLXUyywmo5mCUSlx85HinS1DzYo7I1yksWQgdW4XgWId
-+9RgwPtP0iZSjrZ1TwKqcvo5jvn96LNCoob+JyhpL+9mFvPc6C3vLOxyG7JZOb7Dn
-+IpJf52KeBnLRUoIpp+x1XYptoy1ti7r8YqPYn5EHmPxCDVoujskRSX7ncP3SV1qY
-+eEgr94Tw/l8GyiaGyixVl2pAMbzYJtgrzQ9UvZurhSPjApGlm87X5KHHXN/CJTY5
-+8t59+qvjESRJk74JNpm1L6X/N7HpAsqcsYjP
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIE9jCCA16gAwIBAgIIWxfM+RyuD1EwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDA1OFoYDzIxMTgwNTEzMTIwMTA1WjCBizETMBEGA1UEAxMKcnN5c2xvZyBjYTEQ
-+MA4GA1UECxMHQWRpc2NvbjEVMBMGA1UEChMMQWRpc2NvbiBHbWJIMRgwFgYDVQQH
-+Ew9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQGEwJERTEXMBUG
-+CgmSJomT8ixkARkWB3JzeXNsb2cwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQDHA1CeNI30en7OKGJ/pWyNSH9rnw8z6egDxdTjtOIichA2/LVPaGZYecI0
-+GH/UtkRgM69kFuo6dRaWvr0yp+XPfGlAcFcPg6cYKEoYyb18HsTReyuAcdBcYQYg
-+2ZdmAqtqeHAqcb7wSEB8XuXLdD2Flsco3GaT3zFNv7t7QFDW1b2tT/92w+QGtI1T
-+r5LCMVbISRGSQzhCv29l3UtWt4SKA9W8yhg5zMJkMExaUJVtViRFlAFzKrUVKFqZ
-+8sszy2yXIcTLskJJc5if8o5cpWCrbcXSb5TsHA+4FHOB6ou0z7/s3LwYjof056Zy
-+ixj0LM4sTYIEttDuLERRvYTIhtLhlA2BWfAfuW9bGuog0C9xGpt99vniHJlKmMms
-+qz5hEDLYziUEfj5qzSxKMcA2VCeO1DgajSedh13VN/sWUyk5aKA71i40Cnp4oK/u
-+zeYW7vWl/ttCEFc6x8pzeMdoBjv1Jd9hC0Z2UgttC/KnMTKX3y6NR1PVFjDQ3MIA
-+7Bhxj50CAwEAAaNaMFgwDwYDVR0TAQH/BAUwAwEB/zAVBgNVHREEDjAMggpyc3lz
-+bG9nIGNhMA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYEFAwRNp2wnAVEZKyXJkDA
-+KFMjnY6aMA0GCSqGSIb3DQEBCwUAA4IBgQCOv2kyg8vZ3jncZuZ4i2k0QbXztZoO
-+jMDNqFX2935lK6WrVZ6u1InZzsaqrXXOJions3EvmmAqrdTBW6dyw6V2/lic1gGz
-+MhlafAPe0DyQCaXp9iFCH91Hzo94YhuPbne1qdga9jrVTiQIHdIKqVtbiUv7i7mN
-+43GssOm4a1guf+Qs5rkuHG4YwiJZhjzhmixfXCerHXykJkpSvBUb6EeKA+p5/w+I
-+Wjm9sAkJgqcvrNvOwwBZInU1I56zmM0ZwWucSydf0hgOImpgO5F6KGVQRoZsO9IA
-+Iju2RQ1y9qVTNp8evVjIMuqXh5ZtU9ti/buZrjr5Zb601jFLZCMrpDVUcVyHUfOB
-+rb3nkUFDcFcrKlfovwp/fvlISKM0bp6pFas5X0FXg3sVVI+iIokmHsmqRUHhjdLX
-+t27+/TYpyEkjF1cH3acd7MOcw33KxE/4+qUHT2QU9COPkGu7oPS24qDYnmGPLkev
-+ZSmpz4jLTmbCBSRcoOB0Q4K36WnegzVtvd8=
-+-----END CERTIFICATE-----
---- /dev/null
-+++ b/tests/tls-certs/ossl-client-certchain.pem
-@@ -0,0 +1,54 @@
-+-----BEGIN CERTIFICATE-----
-+MIIEoTCCAwmgAwIBAgIIXBeg0SlsiUswDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTI1MFoYDzIxMTgxMTIzMTMxMjUzWjBY
-+MRcwFQYDVQQDEw5yc3lzbG9nIGNsaWVudDERMA8GA1UECxMIU29tZVVuaXQxEDAO
-+BgNVBAoTB1NvbWVPcmcxCzAJBgNVBAgTAkNBMQswCQYDVQQGEwJVUzCCAaIwDQYJ
-+KoZIhvcNAQEBBQADggGPADCCAYoCggGBAJ2R2tguPZ2uhcPFp/akZvjIkZG4cCDc
-+7egjylP3uFJD86fr+9+KOyywE/pi06FTpFFxH2jZ/bw5SvvJat/ziISwgLzA9RtC
-+EfZMGtgsYgtdUGQwmtPbwdV/OVPkvegeBJ3JEuDkVykpAbnx5bx0pudLYeZnXGxO
-+7u4iDBsUbegMb+7uw7jd3xXtepZbzIXl41DEziu/tjfmIPxuRX4JvYR6rwcn9Jkj
-+Qd822CkxoJaEL/1FLtS0+frcjyPA4AatrQpy2vQ7ocvWpjvsRsSV8nGlrQgf5wYY
-+DtuAUZa6JPZkAmvT8HYBNDpyAunL0KpiUQyPg77AR5nSknLtU6VJBdTJofRN3hKd
-+GsgXhPOifGdHgkuGHnOG4iYmEJSjmZsImXidPTNdhcJGZZSrcLQ7wSaLEbZmJ4gi
-+hAO1CEUyjIEjvmLcb6CqXp8D96f1A3A8eAnQhESMGa9295P8r8b929lMyyB5RHHL
-+5lVhqXqvC6Om7empEa/6o12sl+fvK7aoNwIDAQABo4GAMH4wDAYDVR0TAQH/BAIw
-+ADAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAweg
-+ADAdBgNVHQ4EFgQUlBeunSFXuHvBrhB7CKkhvKEUAIswHwYDVR0jBBgwFoAUsJ9n
-+MyyIiIkfRGJ0nSX/wAYTXdYwDQYJKoZIhvcNAQELBQADggGBAEk9KaiQ6NzNHf7M
-+kvPosgCu9Tm1jgRg4qjdMHxtzDxFQZWOtMuDxqqrNEC9FEF5zpEB8Z4VtubIeVK7
-+6i6BdSMbI5zlnlxffPD1Gz8AKXe9BNb6UlLvlEC+58D4CJmrxDuKZXaBzy3xh2TP
-+Al/s5XkPBuXKc7l0qQdDkt67LfDCrwpGfseOFXNUHDREBOulwX4LJzilVqLMsp03
-+qMHK0f4kOxc0oJrH+2+jCgpu1QPoFOLl/6shbRw3qls/f/coWnnS5kd2NOPUf0pe
-+j5lBt5ThhnLQIGwJucLa6cHVx+R4BWtTz4/v8hCwWr1cUbNEkxTyBErl0l8KkpCQ
-+d0NCuZe2u2AJYEKdNilSiBr33ERZ70peE/ATfk6hv9ysWepeGYJiuybWXMrDtLbw
-+X9wzwtdetIvvMxXiNAT5RpsZtFrdBD9ZwCHhJ+xjEycRDQKdnL/H4WbpAfvB9zcJ
-+WCJ50FBFjNoHSYrwmhQULOYa8AjVxxrX/27g2mN3P3sDLG6bzw==
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
-+MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
-+U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
-+1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
-+qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
-+YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
-+flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
-++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
-+4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
-+lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
-+eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
-+b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
-+YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
-+9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
-+UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
-+wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
-+S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
-+OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
-+wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
-+dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
-+QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
-+thWJZzNJeHyZSpah
-+-----END CERTIFICATE-----
---- /dev/null
-+++ b/tests/tls-certs/ossl-server-certchain.pem
-@@ -0,0 +1,54 @@
-+-----BEGIN CERTIFICATE-----
-+MIIEmjCCAwKgAwIBAgIIXBegQDWsgowwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTAyNloYDzIxMTgxMTIzMTMxMDI4WjBR
-+MQ8wDQYDVQQLEwZTb21lT1UxEDAOBgNVBAoTB1NvbWVPcmcxEjAQBgNVBAcTCVNv
-+bWV3aGVyZTELMAkGA1UECBMCQ0ExCzAJBgNVBAYTAlVTMIIBojANBgkqhkiG9w0B
-+AQEFAAOCAY8AMIIBigKCAYEAvYhZDSdPcxBgjF+sgQZ10YPuIXIzoiq4G943OGFX
-+EdMc0kdaVQcCKkR4raPMR0wKs57akpiN5CrU1HvkwYZbTNB/BpyhUuZnx2qjTRyO
-+pB71k62z7HP3KAI/GYfEMX5DNPS0X3B7chkAT4Sk1Xdn3WjW3BVt3GK4XdWmG2M0
-+cmsYaFvijFJDi6Fs8fy/5sG2x+WBwct1Kt8HnjfR+nh00YhgiqOdX1jOrDN29XHk
-+n4GIEm/BRQRQ0/PoOa6VWGVVxu+8sfmM7IJ8kC5/QII3PFZCplqPnxFYd3C0Wa6v
-+au+tYisJ9B5CB/fn9ars7H6nFMc1D38G/sVkspdJrFuFbQLElkH7ydxBZBv3O+fl
-+Iomav/+JL1PiNHFtXxoGsTOPHHFKbqauxLuTbv9B5D1tO/MaxOBTt9MVMx8rDpVB
-+y0spKhfWcxJ/0Hge7G9XrFGpN4joBPHPMghM8QjS9/EL8r98m8PNQk6OIG9TNeQC
-+gzglQIV3K+rhFwTeeyetxDozAgMBAAGjgYAwfjAMBgNVHRMBAf8EAjAAMB0GA1Ud
-+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1Ud
-+DgQWBBQ3rDq/2kYOFskMD0lHFG+g2Ej/2zAfBgNVHSMEGDAWgBSwn2czLIiIiR9E
-+YnSdJf/ABhNd1jANBgkqhkiG9w0BAQsFAAOCAYEARbJDuWZiqwA/CU9Eh99POTOk
-+fnWdog8tLaOPLFS5mCiLNDmTXX14syAAjhbRrJ+43j1HWXbgovzDqzFtQzbztCMB
-+qpxQy3d3R9nUKv6NpNT/IO84OcYuiMtRGr/AaVqc2PZlFirBqlQkxFUxiDc2pIhy
-+h2orOJrPu3jSQdWI1PDT6oWKCwHdU+obqh+NmRWwjetpmeJ5r/kgAlZJ1krlNPJU
-+V3U/J9WTdOYMhLcn4RcNOTAyrmxOoTEIOcqkXzJOypbkMcZic+OHCaDohUsfdOkB
-+Xxz+6nP4xqnOcyHBLNTjVVrnr+wyqsWA18HoyLiCluf946S6mVoXcxwvWHzz7VVm
-+qHVppLVD/iOJxtl4bm8YEYjO4C1IPxWOCszG4N71Reyo/+p1UJ8Ww6IAgJj0jX2l
-+L7pqCwZKXhd8+LT05dZr7YJV/EjmGV/pL6IU3RAk6s2BqgtTkvy5nnmSPjBFuxG/
-+gUBfaglsXC6w6R1aMVr9m3E1ht4vOPu9Qx7E21oG
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
-+MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
-+U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
-+1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
-+qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
-+YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
-+flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
-++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
-+4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
-+lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
-+eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
-+b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
-+YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
-+9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
-+UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
-+wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
-+S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
-+OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
-+wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
-+dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
-+QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
-+thWJZzNJeHyZSpah
-+-----END CERTIFICATE-----
- 
diff --git a/dev-libs/librelp/librelp-1.10.0.ebuild b/dev-libs/librelp/librelp-1.10.0.ebuild
index 9b219ea369bd..3d59dfe5c0ac 100644
--- a/dev-libs/librelp/librelp-1.10.0.ebuild
+++ b/dev-libs/librelp/librelp-1.10.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.1"
 
-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/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
deleted file mode 100644
index 5b9aa08070f0..000000000000
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ /dev/null
@@ -1,75 +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} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-files.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.8.0.ebuild b/dev-libs/librelp/librelp-1.8.0.ebuild
deleted file mode 100644
index f877c131d5b8..000000000000
--- a/dev-libs/librelp/librelp-1.8.0.ebuild
+++ /dev/null
@@ -1,73 +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} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.9.0.ebuild b/dev-libs/librelp/librelp-1.9.0.ebuild
deleted file mode 100644
index f877c131d5b8..000000000000
--- a/dev-libs/librelp/librelp-1.9.0.ebuild
+++ /dev/null
@@ -1,73 +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} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index dd0e49231783..98039ea24399 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
-DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c
-EBUILD libsavitar-4.8.0.ebuild 1753 BLAKE2B 693cea9194c410e2868e2f109d0cd31ab56c8140469be0fde64c6206847704ecddeb6097aacc37f5a1b5e067eefc69e0120f13fec2216364cd922d7ca616756c SHA512 bb7fd8bd856d2bea79be263a2ba827a47076342ae4b965f7cbbdfba4ed6308b820798cb503d914452984075203da5a1380e736aa68e25f0d962156631bfd009f
+DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
+EBUILD libsavitar-4.9.1.ebuild 1756 BLAKE2B f0972d130215142144664b4837d9eb1918e49d723080e418f69e935684bf9f86ea47b3aa234e04b28313af1f80e27e51c97ac9a0b9ce24e95012ef9cd62fda4a SHA512 56aeb94f96fbf8fe9987663842c57a702a3b85cd6de9fd0b4749c64d6f6932dde408b0908acb795087a1e7002a3d60fede1f9a402487b8a7b48bf8b5b3fdd8e2
 MISC metadata.xml 974 BLAKE2B ac8e144ae33fea171c6a64d8a04f1876a3a3145b952e285fdc3f0553b8c5cf9c03a36a3e3982b88fdcacf69d668b9df8d156292a687fbcb65171700517bcd772 SHA512 8ee0d54dc6f627e57ea7b980df32aab3fb49bf73888c0d69a91c9f8962df159d6145f19892d4b922e8fdd673dd489fa72f4f3128bb04d0089d4204a6f060d0b5
diff --git a/dev-libs/libsavitar/libsavitar-4.8.0.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
index e1b8a3b218f1..999341bf1c3c 100644
--- a/dev-libs/libsavitar/libsavitar-4.8.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.9.1.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} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
 	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
 	')"
 
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 13cb766f28c6..31fde25bc16d 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,5 +1,5 @@
 DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
 DIST libsigc++-3.0.7.tar.xz 790604 BLAKE2B 2363fda42744c3c4a2c31f236a2160f8dd63bae098e8190e2ef20acc23296de26cb7c275b928785c99c33d23f15709e411dc51f973d4fdd6a0556b11b0031512 SHA512 0ce4b56d85ccb0041096e2241523b9ca5bf0fd52f9655d2216e2280d5902075a4685023aa60058eb8ee9b7ed0ffc945d652940b0bda73f2fc7ce4de7371ca984
-EBUILD libsigc++-2.10.7.ebuild 1377 BLAKE2B a98f755e46f8b2c9c7e6618e6701be08905008bce599f3351663af2bc642c6a1e7b196a3803badfe2254380fe470ebe4ce03cea0fdae591012aa95f2674e3d7b SHA512 014c99c199e16540c482d2d02af97b6a5380b2e45c9cdfe63a122ef668eb53bd41c4e84074c1efb9bf1a5084eec348ff93caf566efa1c0c4f8f4914f8face3d4
-EBUILD libsigc++-3.0.7.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
+EBUILD libsigc++-2.10.7.ebuild 1199 BLAKE2B d18e2cdea8f9908e7d30e794c9504f3ab2024405ef54c7b4cb090999a314d9e155ef1e1be34d783d11ae309de6518512276879bf78a3435307cb9e67d05a4170 SHA512 cb305e7469a97cfb28cc948c7a23c844a6763a04acb046095d82ee2e01993be8fec0c6b68c74acc4cb217d5526932c172d6a0eed74eaf3f33684e7b2ce94627b
+EBUILD libsigc++-3.0.7.ebuild 1170 BLAKE2B c9dad5ec3142eac79ca610ee836210f2d1306f261bf228843bfb6995cf6eea7ffb534a9035b01af83d6161680f967d56632e97444fded29222adce4e97aa6d70 SHA512 ff727eeb630e5c76ad705f90cccf4c7d3d54d48e42e7476299a5ea294867677d1c1b81b078a1fe26140cb72a2e22b5cf32a5f251636efd6aa040e35f86994e67
 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
index 4133034c604c..04e20fbb28ef 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic gnome.org meson multilib-minimal
+inherit flag-o-matic gnome.org meson-multilib
 
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
@@ -23,28 +23,14 @@ multilib_src_configure() {
 
 	local -a emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
-		-Dbenchmark=$(usex test true false)
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_use test benchmark)
+		$(meson_native_use_bool doc build-documentation)
 		-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
diff --git a/dev-libs/libsigc++/libsigc++-3.0.7.ebuild b/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
index 9915fc5555e0..a091f2583e41 100644
--- a/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org flag-o-matic meson multilib-minimal
+inherit gnome.org flag-o-matic meson-multilib
 
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
@@ -35,27 +35,13 @@ multilib_src_configure() {
 
 	local emesonargs=(
 		-Dbuild-examples=false
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		$(meson_native_use_bool doc build-documentation)
 	)
 	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/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 8ce5df8cff49..17a2c2117aaf 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
 EBUILD libtommath-1.2.0.ebuild 1834 BLAKE2B 2ccac0b08ab3533e2f168d8a89b9f7a5fa094738aef9275eb3276cf909e75c503df6b1f490de4677c6bbef1bf7298a5b69124ed8222c826d54ff25bd463a6644 SHA512 cf92f7c22625ce6367fd0164f945344689736f298da7c9447f0c332d0acda3addb9722165bf67bb43a515ea9a3fc07e5a5615ecea656529a635f2b4e23949ab2
-MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f
+MISC metadata.xml 3151 BLAKE2B ee84d117d269999fd851b96ec99892d504d95252303fef90979a79472cf24c338a2dc0f5c7b2c45e5040ca5e0768df8cd63eb004f530842aef8b5681939c820b SHA512 a459604058515a87ee3b4521569e94c3cb9ead69f5f3086b5e2de906d561bb11049d719aa38d80bb6b6880b61ea0d9536e55bfa1337ccb0f4b5ccfeeda15f00e
diff --git a/dev-libs/libtommath/metadata.xml b/dev-libs/libtommath/metadata.xml
index 1abe0f30209b..485d9f73f113 100644
--- a/dev-libs/libtommath/metadata.xml
+++ b/dev-libs/libtommath/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
         <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-        </maintainer>
-        <maintainer type="person">
                 <email>sam@gentoo.org</email>
                 <name>Sam James</name>
         </maintainer>
diff --git a/dev-libs/libtompoly/Manifest b/dev-libs/libtompoly/Manifest
index bcfc449b0327..03a999421463 100644
--- a/dev-libs/libtompoly/Manifest
+++ b/dev-libs/libtompoly/Manifest
@@ -1,3 +1,3 @@
 DIST ltp-0.04.tar.bz2 171966 BLAKE2B 748fd04d55bd3dcdcd9510de1e34e2b9d96c38fc4f48c14137676f60c6d89751e8a095e07687d368d9a46e49ed056484cf8971e96fc400cde15b254a7374c38c SHA512 64a0b25eb058fc2475e6c645138729796099081ad7e926b58d2e83468d988048607e26716b4b669f0e923ea74d4d9705ff5a0466eb41cbe160488d0173447234
 EBUILD libtompoly-0.04-r1.ebuild 686 BLAKE2B f6276e6bc9d7b22b4a0b7bd7251505a7c57e1eeffd09b42cfc2d0455a58d08ba83fcc8b20e04cb596cd657c4c22702c2ff61ffb7f6532660f776ad8d3dda0fbe SHA512 6f1cfa6866ac2470764ffca882936ea6c58e3582fdfb81281c7710e46c91ea942f6c6fe30335b07d27a595d6a36913b2c8225c47e28a9255a91291af66c6ed30
-MISC metadata.xml 1004 BLAKE2B d86d81d29c11a770df1762f2c2d3117fbca74d70c91f0a14148d40d9f0f96cbf991a17187aa1991a9887f3dd2da6cb37c070da413d7d417809cd438412f990b7 SHA512 5582a5f0f3509150e65dc6059c000a32dd7e13e9335530934a47d3752c8213288048fb1c19cc4350877289181fca23c42f23e20fa56b2d0570bfb737c3bf752e
+MISC metadata.xml 909 BLAKE2B 003f6f9e76fd6d94c8500c7c8bc862ed72527c9eeb6ee7ee61cee091de2853f70908ef05ffee3fb720dcb19119a3868afccbb25ee5e97c9ef8b50efc2eb759d8 SHA512 d5fb5badf3e341d9ba46fa61b4bdf80e5d3629c861c4d0dc5fcbab09f22d99ca8513de714deb3a39179a279b052326de47ecba9b739a2c5835c75ea4ba4f3bc1
diff --git a/dev-libs/libtompoly/metadata.xml b/dev-libs/libtompoly/metadata.xml
index 6f94cfb2cb6e..885403a7ae53 100644
--- a/dev-libs/libtompoly/metadata.xml
+++ b/dev-libs/libtompoly/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>patrick@gentoo.org</email>
-        <name>Patrick Lauer</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <longdescription>
     LibTomPoly has the following features.
 
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index cc0de8f6be58..ec98fd0c2fc9 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -3,6 +3,6 @@ DIST libudfread-1.1.1.tar.gz 33546 BLAKE2B 2a9781d2db569ca5787b0fa27b75b790d21b7
 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 809 BLAKE2B 09b9f9c4276f1e5a47d9ec3eee61dccd8bb5ad08766836dcf383a1b64217024b865c5b6017ac12261f7b6939d2a7eeaf2bd48634eb573af62f2a3c49362c532b SHA512 32da6f506e59f8cf2554cff5e464d9450a10c73ccaf01dcde6150e99702e12164455fa23457710c7095785639b1a49097a41a4996d7fc758d69aaf88cef0828b
-EBUILD libudfread-1.1.2.ebuild 825 BLAKE2B 4d8e2a78467213b8283c6ca7d677732c28d5918c90d645a915568546c8e6e7c88de0e3d4ca0fd48705280f18cd4a5ee15db02f766e6ff02d8e98703a787030e1 SHA512 9bdc79c93a67d9f2cbb57cee7a03dc893f940be5f349bbe8df3f57caf92339f410c3ee8d6c761c57ed36864040583de23474ee2e8f5e530642f2218bf4ac5e73
+EBUILD libudfread-1.1.2.ebuild 823 BLAKE2B c1040e8b05a0acad40afe962ff51e111815919a7a20cf5cc055f999aacb19c1053e9ad59193fd6e74aa5b4766c97dea04b939ff2674838dbdcebaa7fe3149e11 SHA512 845eebce4c3203ece50879470ba807f87d4bf13a624d77bc30250872ec3c3445a01447f808ac0bba408acc67fb2b5b561195d50a9eb640876486976512e438d3
 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.2.ebuild b/dev-libs/libudfread/libudfread-1.1.2.ebuild
index be5aad3b530d..da5fa508773f 100644
--- a/dev-libs/libudfread/libudfread-1.1.2.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.2.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 ~ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 5b452d4fec90..0aa25edd22d1 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,5 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
-DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
-EBUILD libuv-1.40.0.ebuild 1702 BLAKE2B 3a8c32240dffaf200cde5cea866934965106d3dfcd56b330d8f346e2b317d87a3dad03511ae954f93e3548c5baf9d707a40fd25347768b9125e55084f108d4ba SHA512 147a8e3ad48b3dbea5da4b635cc472d5f85b4ee3deb2405bef38712a3d9a124f4f9b6576a3a973905e665735229a84d7af06741e4713cdf77564bfeb5a9a8e26
-EBUILD libuv-1.41.0.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
+EBUILD libuv-1.41.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1429 BLAKE2B 78cfbe0bb9f028975aaf6721f96efe4e79ac0e14563a32bffcc4ed5509928c76ea28d5b7513290cdaf062c9edfccd8f8f1ffd30922739176a1919303a60e222b SHA512 c429cbb18602a7681a1c2bea6af32e889e33d788c5cdd1f1f5a8b99a9c533c5603bd612bca76ec37bbdc1eeb9bcf5ffa47018f71aaadf66785a3da06667661b0
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
deleted file mode 100644
index 74d8000909c1..000000000000
--- a/dev-libs/libuv/libuv-1.40.0.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-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		sed -i -e '/!defined(__DragonFly__)/i!defined(__APPLE__) && \\' \
-			src/unix/udp.c || die
-		sed -i -e '/err = pthread_setname_np/cerr = 0;' \
-			src/unix/darwin-proctitle.c || die
-		sed -i -e '/int uv_if_indextoname/i\
-		static size_t strnlen(char *x, size_t len) {\
-			char *r = memchr(x, '"'"'\\n'"'"', len);\
-			if (r == NULL)\
-				return len;\
-			else\
-				return r - x;\
-		}' \
-			src/unix/getaddrinfo.c || die
-	fi
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		cc_cv_cflags__g=no
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.41.0.ebuild b/dev-libs/libuv/libuv-1.41.0.ebuild
index f1d10ed56e94..082ca534234d 100644
--- a/dev-libs/libuv/libuv-1.41.0.ebuild
+++ b/dev-libs/libuv/libuv-1.41.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 65bc208d047e..245ce819bb30 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -8,6 +8,7 @@ AUX libxml2-2.9.8-python3-unicode-errors.patch 1156 BLAKE2B 15d58fb615aef745ac6a
 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-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
+DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
 DIST libxml2-2.9.12.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
@@ -15,6 +16,7 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 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-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
-EBUILD libxml2-2.9.12-r2.ebuild 6950 BLAKE2B 32882b5e31426406b7a77081571fa6328fdb67b602eee3908fe8a58a50ca330e25a006f670d23ba61e73a443e14685cf840dc2e4e6ceba050d920f373a0a283a SHA512 448797c0a911973d157daafd73835bbbfbdc3c913f42c0d163a1f16782183ab55d991b07d5d9291e30168d133264240dd5fa3de43b06f44abe8e56d7453d5b27
+EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
+EBUILD libxml2-2.9.12-r3.ebuild 7099 BLAKE2B 94c2334599571ecaf9f0e348f62871fab7eb1156d3f746403ecce488c4611697437cdf83bfb4fd709b483f95eda61c774cb8886e14e2bc6b7d3e69aebcc4269c SHA512 83945cf8b255f3c952540fb1a9ea05c7a2c0a1f68ac51b9de0321e018c3e21f185939735a6bbc40fe0cf4673809bb59afb756998990dcbacdb27117d9309ca56
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
index c240ff54c1b2..3a36dc6102fe 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
@@ -34,7 +34,7 @@ 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"
+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} )"
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
new file mode 100644
index 000000000000..39a7586055ae
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
@@ -0,0 +1,251 @@
+# 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-r3-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 (bug #790737)
+	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+	# Fix serialising empty HTML documents (bug #794733)
+	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 2b6f5191d252..9aedbc169ca2 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 810 BLAKE2B 72a312d607828372b768a925ed710ab0471759b261618814c886ca727f2d54483454b0acc4de406f35b16e4f6614842ee0906a719497a510687e20f348cae1ef SHA512 e65fe9cc16172ec905f60ac0f9053a717c5c493ef1063202a24ebce70cef5d236e3b3ef1f7c222ceb228561e95ac0d7124c4d7a62d4ab8ccefde03199680da56
-MISC metadata.xml 327 BLAKE2B 71ce5ebb7000c112f9e49bb621a5068f18619b04dea3fb556daabb0fdb9f6e9cb587b5809bda561e9bad6998f9866d65de6e367cc33a9f3218580b4d192fe591 SHA512 210c2febfa6cc50563269e1e386917959d24331d2226262084b19e6b7d24e49c38e79f31bb21d3c237ff4f9971135136007e33e99f1a9f37f1abd1419e3f85de
+EBUILD nanomsg-1.1.5.ebuild 995 BLAKE2B 3eb80eb46b9e392c6a41958525b7b23a0f3b2ffe160b00d0344a8095bd490535dd7504a51d7d72ee992db1bb448180f37983b058397ce784d25e7cdea094e781 SHA512 f64d63065ba7c038a4601e68affdf45fc866dc892daa3803693649dc66431356eee749861434043bfbbdc7e9c536fd8909038c4386b7304f33cde824139c3431
+MISC metadata.xml 247 BLAKE2B 6474b3360f35b862e1df90ca2717bde61ee0d1878dc7e7a92d3e2e44d86f7bc33022e8338a0d3fc6c3debb1d676ea9107c4705595e5607d611d4c49a8de4f4ad SHA512 a1400bbdfd7e7a9cb5d2f588383417cdbee4a149c069a5fd818f3a1bd587e2f99d514fbcb23e0f7c7d86be15ac8367a22e295802646b0024a3d9bc6fd512dcd1
diff --git a/dev-libs/nanomsg/metadata.xml b/dev-libs/nanomsg/metadata.xml
index 60d7533c2a19..15779e951f72 100644
--- a/dev-libs/nanomsg/metadata.xml
+++ b/dev-libs/nanomsg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">nanomsg/nanomsg</remote-id>
 	</upstream>
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
index 004a080aa242..dd2c4d96aae9 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -12,15 +12,23 @@ 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 ~ppc ~x86"
-IUSE="doc static-libs"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+IUSE="doc"
 
 DEPEND="doc? ( dev-ruby/asciidoctor )"
-RDEPEND=""
+
+multilib_src_prepare() {
+	eapply_user
+	# Old CPUs like HPPA fails test because of timeout
+	sed -i \
+		-e '/inproc_shutdown/s/5/80/' \
+		-e '/ws_async_shutdown/s/5/80/' \
+		-e '/ipc_shutdown/s/30/80/' CMakeLists.txt || die
+}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
+		-DNN_STATIC_LIB=OFF
 	)
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index f7d38573c4b7..6e13c432dada 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,6 +1,4 @@
 AUX ncnn-fix-glslang-include.patch 281 BLAKE2B ae6293b2c16ee870d65cde7398cfe615ba3cbfa682edd5da0e92072d80f37f46f0fdc84648bb3757a266e1406d3289025344cff462ae2c3d84e232460db40759 SHA512 7e424a89b3d2a8b9cd4630e2ea8fd789569bef9bfcbea39c11fecf2cb0d9ece9639bd01e88735715d28fe7d92aa5eee9231d59cade55829f8d4af7e33a4f4adf
-DIST ncnn-20210322.tar.gz 11339362 BLAKE2B 26848f8c6598c98e10e62717bf4aa86f803b425848bdeebd7dacd752f57174e4c3a7fe56d309cafa150be7cb80176fbd8f487c9fe79bc957e29157b1781fe849 SHA512 78862bdbba3ae4127d856f514ea37903098e8a9e827ccbdc85faa498d8a343b4c404465b7f55d368f2ea867063340f33facf286c2bad6a0587b903ba8bbf2394
 DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
-EBUILD ncnn-20210322.ebuild 883 BLAKE2B 67350ea55f8bec9dde95b5ee61930d7eafccc59c57a977fd4443ec90552931f088a4bc550290b591d866b573ad2e11ab5729fea4940f21f2a3e13a760bd672f5 SHA512 b0bebef4edf4b905f842a5736868fd67a2c41b0b501e14dfee27011f06f459134f3f7b8c8ffcfbab5891d894d66a3ea124adc27f37540e2b3660f5b4a61a0d13
 EBUILD ncnn-20210525.ebuild 1804 BLAKE2B 32c7b8bb64ef7b4b177a940ca130048832f92a3190c6bb411786629b09d5a486bc306ba7753c1adebff6f40b989f048e1f5b2eaa0ab79767d936e68f51106b63 SHA512 893c53fdeeda50ba6cb4ea76eea68a961d7d77cc98fc4f93894ef3a5b944517480795d3a4f1233f66b7bb71741b74760ba9b7912b81d1a3a6597bd314266e05b
-MISC metadata.xml 617 BLAKE2B 3f4be1642c013d6f065fa54f8ede9c9929d934e79b44dc615c85437a6e13c772efeadf534c10c895fa9841855d8db3a00fd0df97f9490e5190574c79166a3874 SHA512 53192d182ea04c21a9d69c5bc1fff7e08a149168fd6dfca44d5bd6191b886a09324a60667114432280b3d2175b3fb920d71aa70f8bb5e46295ebc91d39e405e1
+MISC metadata.xml 601 BLAKE2B 47cf3fe47cdbbf4679cc473ca6bfd50314bc20b2a3e51038d61e3bee857bd814fd0823856dfe86f74b944765a781196e99932e9b23ddb1c615242bc97c5bf9e4 SHA512 8f1543ab268f7536411f9bff6c83032537b9439f0a58575167abb28b6de587bcb864c1c96178e32b14477e2a29f970bbbff6d855e342fac2fb16faa54e776a7d
diff --git a/dev-libs/ncnn/metadata.xml b/dev-libs/ncnn/metadata.xml
index 93b23a68d96a..228a653eff52 100644
--- a/dev-libs/ncnn/metadata.xml
+++ b/dev-libs/ncnn/metadata.xml
@@ -5,8 +5,8 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
 	<use>
diff --git a/dev-libs/ncnn/ncnn-20210322.ebuild b/dev-libs/ncnn/ncnn-20210322.ebuild
deleted file mode 100644
index 0307bb67e2fb..000000000000
--- a/dev-libs/ncnn/ncnn-20210322.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A high-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-PATCHES=( "${FILESDIR}"/ncnn-fix-glslang-include.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-		-DNCNN_SYSTEM_GLSLANG=ON
-		-DGLSLANG_TARGET_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 9d8f640ce7fd..bfec4e3d1e7e 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,5 @@
 DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
+DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
 EBUILD nettle-3.7.2.ebuild 1836 BLAKE2B a8109c4bea51c922c1e23a706c33bba6faf27e58931a058a7051b172e7dcbbc244f2589e57ac68bfc47b6f3ddefc1b092462fb764c45506e7dba5034aaa84de6 SHA512 3d112ed3d24c410c1768974a9702a468c3320772aca3565d7d7e9777969bcc1165f5994518d04966ae92f0adc27580348b369ccfd3e3c1cc721c56d30fb796d8
+EBUILD nettle-3.7.3.ebuild 1844 BLAKE2B c1488108e31969da2e7cfacef25af839eedb8b93a4d4d7f53c9b6e0236415289e2c475d6fa069e6647c769282fb22e49c7a52e597cdb51e6970f4f6bcbb213fa SHA512 29525e4cb2e5f88bcd013157a24dcd796bc662f3f76534838daf89169b2811db35ffc5343b323cafb2a8d09cadb5fab03f6c1bcc5cdf38cdcb5a749a85857096
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.7.3.ebuild b/dev-libs/nettle/nettle-3.7.3.ebuild
new file mode 100644
index 000000000000..38e1726fa6db
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.7.3.ebuild
@@ -0,0 +1,67 @@
+# 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/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index a5c91a72016d..ec89e2561cb6 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,4 +1,3 @@
-AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.7.ebuild 702 BLAKE2B 410d9a2f78d5966dd5f26deba58716e841608cad779c9284fd77af7d0f0a0c76d5dfeea998237cca2130b2e955cc54a26e874534abef0f7c89571ebbef049a68 SHA512 11e2af21ddffc0f5266508e99d6c5881fd3d08d2c7edb68ea00c739fff075d2f26fdcf6a677fba2f60905d9c722acd6ec6bc2c92099b4398bd4b938c7f0e5495
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch b/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
deleted file mode 100644
index 10cfd2cd0228..000000000000
--- a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e14d5b53ad588e45b2bcffb778563daf2fead5df Mon Sep 17 00:00:00 2001
-From: Ian Kumlien <ian.kumlien@gmail.com>
-Date: Fri, 7 Aug 2020 15:57:17 +0200
-Subject: [PATCH] replace deprecated CK?_NETSCAPE_? constants
-
-... with the corresponding CK?_NSS_? constants
-
-Fixes: https://github.com/kdudka/nss-pem/issues/6
-Closes: https://github.com/kdudka/nss-pem/pull/7
----
- pfind.c   | 16 ++++++++--------
- pinst.c   |  8 ++++----
- pobject.c | 10 +++++-----
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/pfind.c b/pfind.c
-index 83d5b89..fa5dd4d 100644
---- a/pfind.c
-+++ b/pfind.c
-@@ -276,18 +276,18 @@ collect_objects(CK_ATTRIBUTE_PTR pTemplate,
-         type = pemBareKey;
-         plog("CKO_PRIVATE_KEY\n");
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         type = pemTrust;
--        plog("CKO_NETSCAPE_TRUST\n");
-+        plog("CKO_NSS_TRUST\n");
-         break;
--    case CKO_NETSCAPE_CRL:
--        plog("CKO_NETSCAPE_CRL\n");
-+    case CKO_NSS_CRL:
-+        plog("CKO_NSS_CRL\n");
-         goto done;
--    case CKO_NETSCAPE_SMIME:
--        plog("CKO_NETSCAPE_SMIME\n");
-+    case CKO_NSS_SMIME:
-+        plog("CKO_NSS_SMIME\n");
-         goto done;
--    case CKO_NETSCAPE_BUILTIN_ROOT_LIST:
--        plog("CKO_NETSCAPE_BUILTIN_ROOT_LIST\n");
-+    case CKO_NSS_BUILTIN_ROOT_LIST:
-+        plog("CKO_NSS_BUILTIN_ROOT_LIST\n");
-         goto done;
-     case CK_INVALID_HANDLE:
-         type = pemAll; /* look through all objectclasses - ignore the type field */
-diff --git a/pinst.c b/pinst.c
-index ef2d955..564458e 100644
---- a/pinst.c
-+++ b/pinst.c
-@@ -236,7 +236,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
-         /* more unique nicknames - https://bugzilla.redhat.com/689031#c66 */
-         nickname = filename;
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         plog("Creating trust nick %s id %ld in slot %ld\n", nickname, objid, slotID);
-         memset(&o->u.trust, 0, sizeof(o->u.trust));
-         break;
-@@ -265,7 +265,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len,
-                                         &issuer, &serial, &derSN, &subject,
-                                         &valid, &subjkey))
-@@ -344,7 +344,7 @@ derEncodingsMatch(CK_OBJECT_CLASS objClass, pemInternalObject * obj,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         result = SECITEM_CompareItem(obj->derCert, certDER);
-         break;
- 
-@@ -497,7 +497,7 @@ AddCertificate(char *certfile, char *keyfile, PRBool cacert,
-                                    nickname, 0, slotID, NULL);
-             if (o != NULL) {
-                 /* Add the CA trust object */
--                o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
-+                o = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, objs[i], NULL,
-                                        nickname, 0, slotID, NULL);
-             }
-             if (o == NULL) {
-diff --git a/pobject.c b/pobject.c
-index f613678..a97f3e2 100644
---- a/pobject.c
-+++ b/pobject.c
-@@ -149,8 +149,8 @@ static const CK_KEY_TYPE ckk_rsa = CKK_RSA;
- static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
- static const CK_OBJECT_CLASS cko_private_key = CKO_PRIVATE_KEY;
- static const CK_OBJECT_CLASS cko_public_key = CKO_PUBLIC_KEY;
--static const CK_OBJECT_CLASS cko_trust = CKO_NETSCAPE_TRUST;
--static const CK_TRUST ckt_netscape_trusted = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-+static const CK_OBJECT_CLASS cko_trust = CKO_NSS_TRUST;
-+static const CK_TRUST ckt_netscape_trusted = CKT_NSS_TRUSTED_DELEGATOR;
- static const NSSItem pem_trueItem = {
-     (void *) &ck_true, (PRUint32) sizeof(CK_BBOOL)
- };
-@@ -578,7 +578,7 @@ pem_FetchAttribute
-         return pem_FetchCertAttribute(io, type);
-     case CKO_PRIVATE_KEY:
-         return pem_FetchPrivKeyAttribute(io, type, pError);
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return pem_FetchTrustAttribute(io, type);
-     case CKO_PUBLIC_KEY:
-         return pem_FetchPubKeyAttribute(io, type);
-@@ -775,7 +775,7 @@ pem_mdObject_GetAttributeCount
-         return pubKeyAttrsCount;
-     case CKO_PRIVATE_KEY:
-         return privKeyAttrsCount;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return trustAttrsCount;
-     default:
-         break;
-@@ -1168,7 +1168,7 @@ pem_CreateObject
-                 if (listItem->io != NULL) {
-                     /* Add the trust object */
-                     APPEND_LIST_ITEM(listItem);
--                    listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust,
-+                    listItem->io = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust,
-                                                     derlist[c], NULL, nickname, 0,
-                                                      slotID, NULL);
-                 }
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 6df1b258285f..f504ad7f8e49 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,8 +4,10 @@ AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a
 DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
 DIST nss-3.65.tar.gz 82386222 BLAKE2B 4e1876a12d042b67c6654a8396611ca33d5257b07c75b55201de229f0a6860577886f38d640837d6512b30a074d05b917bae4e34263d9c0f6f4606c80b369a04 SHA512 6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
+DIST nss-3.67.tar.gz 82402188 BLAKE2B 00733c3f3b47e9dd5d5492ecc67baf2507b2bb446a7245422065f1ff28fcfdca25b6e93854ab5b1bd8b2706821a143b5d1d33273008982416148a8ced8e5117e SHA512 1d3fa3fafbf3e54c9c3b54b0b3c291aebb48542380a1b704fa07359d3cefab93f166b31928c9db190ed58118e289e67ce8aa1619e4219d69b2c098484a22bc9d
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9222 BLAKE2B 8c6ad2c1156913b3a21c056524ebde104e2b6d2d8422eb5f3ae8c9782bf671ce70f8e6ccc527201e7d4c6ce3e7a703d00fe349c719368f6df0d96a36f0be06d9 SHA512 e5e73cbf0cfb93d4493278e8ec93faeb704196d5ec19aaa3e27c42518c611605b87118f2fbfe546575cd549a98c2df2b09da42bcf4a26eb86af56678fbd8b1d9
 EBUILD nss-3.65-r1.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 EBUILD nss-3.66.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
+EBUILD nss-3.67.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/nss-3.67.ebuild b/dev-libs/nss/nss-3.67.ebuild
new file mode 100644
index 000000000000..200e2c3b7bf9
--- /dev/null
+++ b/dev-libs/nss/nss-3.67.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-r2.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-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 9eb64976036f..5796f172baa3 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,6 +6,6 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
-EBUILD openssl-1.0.2u.ebuild 9857 BLAKE2B 22b13b347cfd5dd3f42253f768912a1dcac00a3ce017a6dc0f2b8dc28201ffdc4d2b37e1ca17b3caf4665b2998e9e903b03934f0975605ab1cd1d35a550abba2 SHA512 4b0a57fbc4c06ea56d51d1715182bb309df4b18951bb69fea15ab4cc1225b648481003372cad3701dd6a42b75f20aa860c88554867338c709f6e0226a0dfdadb
-EBUILD openssl-1.1.1k.ebuild 10254 BLAKE2B 2a0cdf09786c55a7c503421cb52c4c304ea61ace51dbb6517c90b26d5769905f3b00aba5418ba44db2cd67c7144dc68eed475c5747d0899cdf72ef1dfa9e3a7e SHA512 26c79f8e5eb6b680b04feac08ee71eb33c1f874b5ef2ba76a0a79ca6ed084806cba85dba15fb992065eb79b5486fb6817ae917dc5522b65f1b067ee214ad4b3a
+EBUILD openssl-1.0.2u.ebuild 9895 BLAKE2B e3120c9bacee4a6cf6e00f1fdc0e480df1e28ca38c9c901d14f679a4a6a5cab074f1bdefbd9e94a28399e2ce7f14fafcc7261146a3fd95bca92427fff46ab361 SHA512 ccb2f8c173cfac5adf5aef9d61a5894168f3092f626d6e6b09cc91e29592765975eef243cd1d42b4693abbd568bc836cc875242476ab6ec00df143cfd394a080
+EBUILD openssl-1.1.1k.ebuild 10292 BLAKE2B 65992f0284bae36b470dae1c979ed0cd6794d147e9c5981f43822e32be87ac4cb51db517141d20b77c5fba104a068893b838f91cefbb24e57af22d1377534c3c SHA512 cb43106f639e268230e406bba3eb0e742c8daf6bc6584faf72a7138ef82213ac92d4400360957a444d981b09edae091081a84425feb76156095d11449f4a4962
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index b7b3fba6c2ed..65c297883822 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -248,6 +248,15 @@ multilib_src_install() {
 	fi
 
 	emake INSTALL_PREFIX="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
 }
 
 multilib_src_install_all() {
@@ -260,13 +269,6 @@ multilib_src_install_all() {
 
 	use rfc3779 && dodoc engines/ccgost/README.gost
 
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
 	# create the certs directory
 	dodir ${SSL_CNF_DIR}/certs
 	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
index 9b4eaf0e7a62..1e98af8f7039 100644
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@@ -270,6 +270,15 @@ multilib_src_install() {
 	fi
 
 	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
 }
 
 multilib_src_install_all() {
@@ -279,13 +288,6 @@ multilib_src_install_all() {
 
 	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
 
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
 	# create the certs directory
 	keepdir ${SSL_CNF_DIR}/certs
 
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index ff38f0dafb1f..5b4d05a8e94a 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,7 +1,8 @@
 AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
 AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
+AUX pegtl-3.2.0-no-werror.patch 2200 BLAKE2B d202ab63aef347bc627d2c791a44e9051e98b624529cf7454cd9e210fc49e0c0e9432d19e72eae7b42735da1a94ac81cd7568d41db98842cb592e89334bfdc70 SHA512 82263553435fec96bc24ac269875c92c119dbd02c701f60db6040a8f6dbda7e8681595b774915e37673cd48bed6318bed0eca6b9bad4d23be86cd7128c36d214
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
 EBUILD pegtl-2.8.3-r1.ebuild 728 BLAKE2B 8829d909043d92b5581e7dc3b89e3fb08baa0dc2942cffd13aaefccd417a7d48c7f2a8e8f6bec28a0c8aca168b7892984a88d57c23a0121cd2f74bd12a9efaa4 SHA512 f55c59b83f986a6ce8d4ada2bc4166c998161cc76ddc3ed986183160cd71cd567026cb5a54bf9c6b6cc3b99c748684da6b2927c4d6f08524333f236335262b5e
-EBUILD pegtl-3.2.0.ebuild 631 BLAKE2B 2fc285796ac7f29f180e408192dad8b673fec08d5ab8a513d22c9a9f63cd3bf682cd53b9923e9689ccb71ffd38f138245aa2e7a64c44a296d6523111d9df20e9 SHA512 138a9c002084645f12c37ee2fb6757d0bb992da805b65048e76e3743deb34de036b60defa87b4cfdfa8e0fc0dd81825629d9c008c6bb4615253d610dd7935719
+EBUILD pegtl-3.2.0.ebuild 686 BLAKE2B 31426935a3957b8ab565b89ba6e0947fcf94773f6c0812c53334eb33b23c0194b2596d4eb73b919a1375fdfdc68d1152fd7f86e56bd0222d576c0bc99b781012 SHA512 524c735ff7dfe6c594d0c2075e6d880447906a0edb0bd3ed3b83fdd1ac5400ea4945d2ac7f8339ae057832bab3273c9969ff07fa7e74f8a991fe67f4a84d38ca
 MISC metadata.xml 330 BLAKE2B 1ecf1d4e82723b878142197d5d8ace0b53f719bdf64fb5988c566ffaf1b60a9d7f899664a21c51d7645503f84376945e428cb9523caa92c1c09091284b42e5e1 SHA512 5177a4fb177ebd3064cbd9dd9abdda753d9c8349dae0e9dd9e02b6f61b3145f55ff691616a8933f3cc75da26f26af25770feeafce64586e4e16eca3d9a63689c
diff --git a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
new file mode 100644
index 000000000000..32bc4b5103ef
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/787854
+
+From b807854fc6573d59350551578375075fc61a21e1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 01:31:40 +0000
+Subject: [PATCH] Drop -Werror
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Makefile                         | 2 +-
+ src/example/pegtl/CMakeLists.txt | 2 +-
+ src/test/pegtl/CMakeLists.txt    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3ecca07..2b8fa20 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ endif
+ # changed if desired.
+ 
+ CPPFLAGS ?= -pedantic
+-CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS)
++CXXFLAGS ?= -Wall -Wextra -Wshadow $(MINGW_CXXFLAGS)
+ 
+ HEADERS := $(shell find include -name '*.hpp')
+ SOURCES := $(shell find src -name '*.cpp')
+diff --git a/src/example/pegtl/CMakeLists.txt b/src/example/pegtl/CMakeLists.txt
+index d416731..4d1a417 100644
+--- a/src/example/pegtl/CMakeLists.txt
++++ b/src/example/pegtl/CMakeLists.txt
+@@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources})
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+ endforeach()
+ 
+diff --git a/src/test/pegtl/CMakeLists.txt b/src/test/pegtl/CMakeLists.txt
+index 577e310..84a8ab8 100644
+--- a/src/test/pegtl/CMakeLists.txt
++++ b/src/test/pegtl/CMakeLists.txt
+@@ -146,7 +146,7 @@ foreach(testsourcefile ${test_sources})
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+-- 
+2.32.0
+
diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild
index 88365e453f48..638a33f9abd7 100644
--- a/dev-libs/pegtl/pegtl-3.2.0.ebuild
+++ b/dev-libs/pegtl/pegtl-3.2.0.ebuild
@@ -8,6 +8,7 @@ inherit cmake
 DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
 HOMEPAGE="https://github.com/taocpp/PEGTL"
 SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -15,7 +16,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${P^^}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0-no-werror.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index ef209f7d5f34..9d7524711653 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD plasma-wayland-protocols-1.1.1.ebuild 455 BLAKE2B 9072fb9f96bef5c5e3733242fb648b295f95bafe31d79a3142aca781765e5b05e73e9b9741e5de50179c0bf8634c5146086a41d1e4826874935ac8529c290d75 SHA512 b5c9738c1215e5bfbc914137b0746b880fecdc54024a88464254ab97e0311d34ac6482453ac74edbdbb6807df4ca0c6033c5d1f9fc477e834af709480cffd3c6
-EBUILD plasma-wayland-protocols-1.3.0.ebuild 452 BLAKE2B 06d8de96518f95bd1561b1b7e35f6c8f0e81c454dcbd2266953a7e91a501f33bdb30b8c5a35b3d566f6ebe3b09b4a957f131acc29eab9c3de08cfc5c9e077968 SHA512 290955b71f01f6de8b6e59f4730c624dbe3b910c98b93d791de9fc5227204f697d7cc6093acdeb5306367ff27cbcaf6af8fcb11b502bd596ea74bdb84aa59d58
+EBUILD plasma-wayland-protocols-1.3.0.ebuild 449 BLAKE2B d97d5458abf29ff6c1c71fea8f5887dd1d9c6aaf905456d5a9eae7a0ca9b2ef111b3641404034dd41acbd5052f87ee5c987d7b92ec8c2ff2af73554235f8e29e SHA512 ab1172e082dc561d362dcceddddd68b4b973c8e50dbadeebeeca2e44cdf91a68f2a1abfd3d1e4141b224824c12f1acdf193a7befd7db5a99f31e4dc28eeccfaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
deleted file mode 100644
index 8a6dc27d5ba9..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_NONGUI=true
-KFMIN=5.69.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}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
index 9f351e59b861..a449591803d4 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 493ae2a4e9c8..9a6cd75b2a6d 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,6 +2,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.10.1.ebuild 3774 BLAKE2B 8e32832caccb524e07d12b2c5386aebb7eae8f1e43f25cfa6b7b03b74ce40aa58b5b3cb55b48ad853f256dcd46a49a4977f0c8bc721e7a107145a4f3d6d28426 SHA512 5df91b52c5c13de51475d70c1def52a0790db554c9249c638a44b5482958387f19179b13bd6194f4967ef11e22f62934efc0ec42a13d573406fc8131de3abaa1
+EBUILD poco-1.10.1.ebuild 3772 BLAKE2B f80f31b0f0996f974de2dbde09264d803aacb1d2245b3fb425cbd0c18e1ae333ca011ca1bb2074368a6120f95b92429b380588d5f44b8a82bc430ac454a6cbd8 SHA512 7722395e53d00cdd7ef38b3ced7c25713c7f88bdb5518ccade1a297f7b09380e18ee0b8000f2fd6d83422e2b70c06b76f247b44c1088ed5dee87d9815c820610
 EBUILD poco-1.9.0-r2.ebuild 3784 BLAKE2B 0e03a468a231f441c59b2e5900ef3b47694b822ef01abde89aa3d5d142e0db2a776c8f2c817e84ee890338b87cabd8f89d07fc34c41d7709380a3664f94bf8fd SHA512 2f9918b32a2fc7a78569f305a4bc270f6d2f80aecffbffeac2573c98d0981bfdd11b65e757a1f8b78965b2009d11e43fb73eff15a13c9455915158db1d55cf20
 MISC metadata.xml 2583 BLAKE2B b99136b66aa75ad6b95b142ecee307402a845c1de12fd3cac0105c4988fed008fd1ec19cb2a1f8e3680f8d6da889005aa4b21ac1925c19db18cfadccea0761f5 SHA512 bade97f4def1e022ed9693117936c595d08ee233c6afd8f68fb0d941a71a7e96004457d48996ed6106815fda64755f235f561b9456de54fa9024662079625cef
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild
index 6597a6da68d2..d615fee58123 100644
--- a/dev-libs/poco/poco-1.10.1.ebuild
+++ b/dev-libs/poco/poco-1.10.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index a6e9f42c59f8..e6b535957a38 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,33 +1,23 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
-AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
-AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
-AUX protobuf-3.14.0-protoc_input_output_files.patch 10684 BLAKE2B 79b86a293fd48e3694327e772dbb7e7ecad2ceaa4d719e2eef5a6221face7bbc26ed00d1efdf9e73dedb9b437603ba6560b5812bbce1c4585bf2d4813afe3aa0 SHA512 35f0ffad2ed3c3d37ba832be4bafa59577e91fba7bef862581369ab92d8c4d3dd801f2e5ec486d989d5e8dfbd04d52d0a869aaecb62c716696a8e3ff6fb9c4db
 AUX protobuf-3.15.0-disable_no-warning-test.patch 965 BLAKE2B fdc24fa141b5d3c4d45dace718d089e26862bb451789c14e652e74cfedde7cca14d1c4c2bc7fbf028516e47b790841bd9c69658b94a47d3ad36ee61bed596b36 SHA512 d1c4ad3ff7a5548437a116243b263d4ccc22b2bc8872c0e043788e902c5190b26de73d61736fb08403bfe4a0b4c2340dbe8d92f35768e52ba3c770350b26cb49
 AUX protobuf-3.15.0-protoc_input_output_files.patch 10060 BLAKE2B 5e20468fe2d31da3651106e57522c2efcdfd70b2430dc1028c95f9752f446b150f8304835349e048d0bcd9aab673814a4540e01671a67e31850f0c44da9cd0a6 SHA512 c43d0a0b5d022ffbac545b596aee139267b5232d4971356d90327a4016e0b2cfed12711efef818aa747caed08964c3b0bfcf501668b9df887b7d3988c17885e3
 AUX protobuf-3.15.0-system_libraries.patch 6352 BLAKE2B 8d54bdfbbeb0420c9d4629ac38b4ba172d59bc832dbff46b6438985bbc76239d3f1a74ada052b046f0e982fe3b2f5109621e6370f2546c37160d31e2d1b4593d SHA512 d98c88b2e96990f943464c429e01a19fe47458d0794ad9ebdae098c48eb25bf46e1fecbca9d09a2e23330a4b9723b9bc18638eb7a043cbd486919b29d57033bf
-DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
-DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
-DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
-DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
-DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
-DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
-DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
-DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
+AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
+AUX protobuf-3.16.0-system_libraries.patch 6299 BLAKE2B 30a2aa46cf9bf6a415e5a12d6d8c931fdd5a18cb100e4389ed777196480598e1400464cf759a49ee3bc4954fc3b9e8d6029a24623aad123186bcb27ca1da6ef7 SHA512 b4b2b60cff6bea9d4dd716c8f7106b0c77ca35f1377201996d6fc323fd4dc59054d7300bb5e949005405ae7371d6c56d1b30195804e723d05fc2199554398302
+AUX protobuf-3.17.0-disable_no-warning-test.patch 965 BLAKE2B 584b43b43861280254f92ad48d8a068b6427e1af3822097f2ddd872983fae11f3bd7af1d73b9b58592987ac4aff7399fa31291e21db6656518bce10c5977a785 SHA512 a67fe3231064c1cf3f4ca94be4248fd65f455b1aaa1d1a09afae847a9b9bbae9673d1fec177e822abe0a83b2fe3342bd20dd9aff87adea0dddcc05309aaca682
+AUX protobuf-3.17.0-system_libraries.patch 6299 BLAKE2B a9252af294342e0a12137c618bc1e6fbe9aa021feaa458c2638aaf407dd6a43473587b7ac3e7278217874e5091ff7337234594715daa7567c9d3cf1bd3191973 SHA512 1d712f886e28907d5a5bef414c9fec56d1c056c316428f6e05fdfb87494e93506c17ff6dd5cff4ec716a6f20b56258393773701cdb6b04f87e44264a919a588e
 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 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
-EBUILD protobuf-3.15.3.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
-EBUILD protobuf-3.15.4.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
-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 3179 BLAKE2B 7f34859c4bf21a509bb58fa39eab8a5ffa157aae30fe87aebeae8fe519bb672c6a626dffce7c0fd4c0ba0ca12f69f940ccf84ae293850ffa7801d2f63e4a6d7e SHA512 d6ff8fc8c139438fb9854e0a0b2fb993fe9d274a2dd0f4190b5f493c81a2cb2078c9ff95c83e274d67001779a271359afba6e632399be87704ffc0e8cf7c8f3b
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5cbad9cde8198ca2113451c4c5683ad1af8e645b939d8794edf8e85a10e223e3a736de4073fa8452b2453ff458d2c148d8ceb2618aee354b2de0d6803b221fe4 SHA512 30f97c4b2688602289bf1c73fc6e742394bdf51fcfdbf76b8e34f5bd9d7c92ada0e6de220919903ebce05b84cd5eaf30dd1d49965b0e654cff8b921f4db41034
+DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
+DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+EBUILD protobuf-3.15.8.ebuild 3749 BLAKE2B 12ba8cd774d1ff1961c54253cffd729f30f37da02e3d103646b966e261d819b4b85fff402eb3a917bdd41153ab07883d416eb288b20801aa89d9a41c3ce85ed7 SHA512 1dc4105d31dec058a611c6c1d05060854e904fd5018e75d1718aeed3a719d22746e94b7a1fefcf6ebe894fec4211f17729ed8a55289a43647aa22cd7b16720c1
+EBUILD protobuf-3.16.0.ebuild 3756 BLAKE2B df0ebf61c08a5dbb4fdeace2bfd04d1fa9929cb20878802142044aa13d417a59b61f7a81246ef7595fff417d17590ce43e14ee3c2b513aedf92d79d3a9be7015 SHA512 d3d3fc384d2fd1d0bfcf155c5fd1a5140057d39c6350362cea4d19cd77154a49d0b9efd4265dd6983299493ba4b7c4ba471bbf2bf170085e6a2abcb74aec25be
+EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.3.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 194e9d88477eb97f57cb544d733c61661bcd2fbcdb9cd1c1353ba1b9fd1c22de8e3ea291cd5f9bfbdac939afa316c6ca2888a2fc790d5f1113a2c416d9f3a3ed SHA512 c55a151753fe1b845d5566999064640fb3ccea13c222b37e4563eeaa8c09788ee74bb89407f4d68d17288d40ae0fd5761ad556989e8d2803c9317c7626ad24e4
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
deleted file mode 100644
index a36bdcb734a5..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -1109,6 +1109,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -1117,13 +1139,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -1161,6 +1190,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1904,6 +1938,12 @@
-   } else if (name == "--deterministic_output") {
-     deterministic_output_ = true;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -2040,12 +2080,15 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --deterministic_output      When using --encode, ensure map fields "
-          "are\n"
-          "                              deterministically ordered. Note that"
-@@ -2053,22 +2096,40 @@
-          "                              canonical, and changes across builds"
-          "or releases of protoc.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2416,7 +2477,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2428,15 +2491,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -296,7 +296,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -428,6 +430,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -97,7 +97,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2638,6 +2638,17 @@
-               std::string::npos);
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2761,6 +2772,19 @@
-       "Can only use --deterministic_output with --encode.\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch
index 0416aac68f67..7295e805a196 100644
--- a/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch
@@ -2,7 +2,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -997,6 +997,28 @@
+@@ -1110,6 +1110,28 @@
    }
  
    if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
@@ -31,7 +31,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      if (codec_type_.empty()) {
        // HACK:  Define an EmptyMessage type to use for decoding.
        DescriptorPool pool;
-@@ -1005,13 +1027,20 @@
+@@ -1118,13 +1140,20 @@
        file.add_message_type()->set_name("EmptyMessage");
        GOOGLE_CHECK(pool.BuildFile(file) != NULL);
        codec_type_ = "EmptyMessage";
@@ -58,7 +58,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      }
    }
  
-@@ -1049,6 +1078,11 @@
+@@ -1163,6 +1192,11 @@
    for (int i = 0; i < proto_path_.size(); i++) {
      source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
    }
@@ -70,9 +70,9 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Map input files to virtual paths if possible.
    if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1754,6 +1788,12 @@
- 
-     codec_type_ = value;
+@@ -1885,6 +1919,12 @@
+   } else if (name == "--deterministic_output") {
+     deterministic_output_ = true;
  
 +  } else if (name == "--protobuf_in") {
 +    protobuf_in_path_ = value;
@@ -83,75 +83,53 @@ https://github.com/protocolbuffers/protobuf/pull/235
    } else if (name == "--error_format") {
      if (value == "gcc") {
        error_format_ = ERROR_FORMAT_GCC;
-@@ -1890,29 +1930,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2258,7 +2319,9 @@
+@@ -2018,22 +2058,38 @@
+   --version                   Show version info and exit.
+   -h, --help                  Show this text and exit.
+   --encode=MESSAGE_TYPE       Read a text-format message of the given type
+-                              from standard input and write it in binary
+-                              to standard output.  The message type must
++                              from input protobuf file and write it in binary
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --deterministic_output      When using --encode, ensure map fields are
+                               deterministically ordered. Note that this order
+                               is not canonical, and changes across builds or
+                               releases of protoc.
+   --decode=MESSAGE_TYPE       Read a binary message of the given type from
+-                              standard input and write it in text format
+-                              to standard output.  The message type must
++                              input protobuf file and write it in text format
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --decode_raw                Read an arbitrary protocol message from
+-                              standard input and write the raw tag/value
+-                              pairs in text format to standard output.  No
++                              input protobuf file and write the raw tag/value
++                              pairs in text format to output protobuf file.  No
+                               PROTO_FILES should be given when using this
+-                              flag.
++                              flag.  The input/output protobuf files are
++                              specified using the --protobuf_in and
++                              --protobuf_out command line flags.
++  --protobuf_in=FILE          Absolute path to the protobuf file from which
++                              input of encoding/decoding operation will be
++                              read.  If omitted, input will be read from
++                              standard input.
++  --protobuf_out=FILE         Absolute path to the protobuf file to which
++                              output of encoding/decoding operation will be
++                              written.  If omitted, output will be written to
++                              standard output.
+   --descriptor_set_in=FILES   Specifies a delimited list of FILES
+                               each containing a FileDescriptorSet (a
+                               protocol buffer defined in descriptor.proto).
+@@ -2344,7 +2400,9 @@
    return true;
  }
  
@@ -162,7 +140,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // Look up the type.
    const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
    if (type == NULL) {
-@@ -2270,15 +2333,15 @@
+@@ -2356,15 +2414,15 @@
    std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
  
    if (mode_ == MODE_ENCODE) {
@@ -186,7 +164,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      // Input is text.
 --- /src/google/protobuf/compiler/command_line_interface.h
 +++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -296,7 +296,9 @@
+@@ -292,7 +292,9 @@
        GeneratorContext* generator_context, std::string* error);
  
    // Implements --encode and --decode.
@@ -197,7 +175,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Implements the --descriptor_set_out option.
    bool WriteDescriptorSet(
-@@ -428,6 +430,13 @@
+@@ -427,6 +429,13 @@
    // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
    std::vector<std::string> descriptor_set_in_names_;
  
@@ -213,7 +191,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    std::string descriptor_set_out_name_;
 --- /src/google/protobuf/compiler/command_line_interface_unittest.cc
 +++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
+@@ -99,7 +99,7 @@
    virtual void SetUp();
    virtual void TearDown();
  
@@ -222,7 +200,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // command is automatically split on spaces, and the string "$tmpdir"
    // is replaced with TestTempDir().
    void Run(const std::string& command);
-@@ -2627,6 +2627,17 @@
+@@ -2626,6 +2626,17 @@
                std::string::npos);
    }
  
@@ -240,8 +218,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
   private:
    void WriteUnittestProtoDescriptorSet() {
      unittest_proto_descriptor_set_filename_ =
-@@ -2721,6 +2732,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
+@@ -2749,6 +2760,19 @@
+       "Can only use --deterministic_output with --encode.\n");
  }
  
 +TEST_P(EncodeDecodeTest, RedirectInputOutput) {
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch
index 990081ae1abf..5b6f4101e9ca 100644
--- a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch
@@ -32,9 +32,9 @@
  	fi; \
 --- /configure.ac
 +++ /configure.ac
-@@ -223,12 +223,5 @@
- esac
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
+@@ -236,12 +236,5 @@
+ fi
+ AC_SUBST([LIBLOG_LIBS])
  
 -# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
 -#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
@@ -47,7 +47,7 @@
  AC_OUTPUT
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -702,19 +702,11 @@
+@@ -703,19 +703,11 @@
    google/protobuf/testing/file.cc                              \
    google/protobuf/testing/file.h
  
@@ -68,7 +68,7 @@
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -806,12 +798,8 @@
+@@ -807,12 +799,8 @@
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
@@ -83,7 +83,7 @@
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -832,11 +820,7 @@
+@@ -833,11 +821,7 @@
  # full runtime and we want to make sure this test builds without full
  # runtime.
  protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
@@ -96,7 +96,7 @@
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -848,11 +832,7 @@
+@@ -849,11 +833,7 @@
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
@@ -109,7 +109,7 @@
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -862,8 +842,7 @@
+@@ -863,8 +843,7 @@
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
index 1c583fec0fdc..eb1598c945fd 100644
--- a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch
+++ b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
@@ -2,7 +2,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
 
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -708,7 +708,7 @@
+@@ -713,7 +713,7 @@
  GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
  check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
@@ -11,7 +11,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                        $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
                        $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -895,4 +895,4 @@
+@@ -900,4 +900,4 @@
  
  TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
          google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
diff --git a/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
new file mode 100644
index 000000000000..3d5069dd1478
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
@@ -0,0 +1,121 @@
+--- /Makefile.am
++++ /Makefile.am
+@@ -11,28 +11,10 @@
+ # Always include third_party directories in distributions.
+ DIST_SUBDIRS = src conformance benchmarks third_party/googletest
+ 
+-# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
+-# because then "make check" would also build and run all of gmock's own tests,
+-# which takes a lot of time and is generally not useful to us.  Also, we don't
+-# want "make install" to recurse into gmock since we don't want to overwrite
+-# the installed version of gmock if there is one.
+ check-local:
+-	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
+-	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+-	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+ 
+-# We would like to clean gmock when "make clean" is invoked.  But we have to
+-# be careful because clean-local is also invoked during "make distclean", but
+-# "make distclean" already recurses into gmock because it's listed among the
+-# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
+-# cd to the directory again and "make clean" it will fail.  So, check that the
+-# Makefile exists before recursing.
+ clean-local:
+-	@if test -e third_party/googletest/Makefile; then \
+-	  echo "Making clean in googletest"; \
+-	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
+-	fi; \
+-	if test -e conformance/Makefile; then \
++	@if test -e conformance/Makefile; then \
+ 	  echo "Making clean in conformance"; \
+ 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
+ 	fi; \
+--- /configure.ac
++++ /configure.ac
+@@ -236,12 +236,5 @@
+ fi
+ AC_SUBST([LIBLOG_LIBS])
+ 
+-# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
+-#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
+-#   too.
+-export CFLAGS
+-export CXXFLAGS
+-AC_CONFIG_SUBDIRS([third_party/googletest])
+-
+ AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
+ AC_OUTPUT
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -707,19 +707,11 @@
+   google/protobuf/testing/file.cc                              \
+   google/protobuf/testing/file.h
+ 
+-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
+-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
+-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
+                  $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
+-                         -I$(GOOGLEMOCK_SRC_DIR)/include
++                      -lgtest -lgmock -lgmock_main
+ # Disable optimization for tests unless the user explicitly asked for it,
+ # since test_util.cc takes forever to compile with optimization (with GCC).
+ # See configure.ac for more info.
+@@ -811,12 +803,8 @@
+ # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
+ protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
+                       libprotoc.la                                   \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                                         -I$(GOOGLETEST_SRC_DIR)/include \
+-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
++                      -lgtest -lgmock -lgmock_main
++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
+ protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lazy_descriptor_test_SOURCES =                        \
+   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
+@@ -837,11 +825,7 @@
+ # full runtime and we want to make sure this test builds without full
+ # runtime.
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
+-                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                             -I$(GOOGLETEST_SRC_DIR)/include
++                           -lgtest -lgmock -lgmock_main
+ protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_test_SOURCES =                                           \
+   google/protobuf/lite_unittest.cc                                     \
+@@ -853,11 +837,7 @@
+ # gtest when building the test internally our memory sanitizer doesn't detect
+ # memory leaks (don't know why).
+ protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
+-                                    -I$(GOOGLETEST_SRC_DIR)/include
++                      -lgtest -lgmock -lgmock_main
+ protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_arena_test_SOURCES =       \
+   google/protobuf/lite_arena_unittest.cc \
+@@ -867,8 +847,7 @@
+ 
+ # Test plugin binary.
+ test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
++                    -lgtest
+ test_plugin_SOURCES =                                          \
+   google/protobuf/compiler/mock_code_generator.cc              \
+   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
deleted file mode 100644
index 25ec4601ee41..000000000000
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-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 )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.13.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/7682
-	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"T is overaligned, see b\/151247138\");$/d" -i src/google/protobuf/arena.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
deleted file mode 100644
index ef5249f79dea..000000000000
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.14.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.4.ebuild b/dev-libs/protobuf/protobuf-3.15.4.ebuild
deleted file mode 100644
index 9cadeaf49236..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.5.ebuild b/dev-libs/protobuf/protobuf-3.15.5.ebuild
deleted file mode 100644
index 9cadeaf49236..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.6.ebuild b/dev-libs/protobuf/protobuf-3.15.6.ebuild
deleted file mode 100644
index 9cadeaf49236..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.6.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.7.ebuild b/dev-libs/protobuf/protobuf-3.15.7.ebuild
deleted file mode 100644
index 9cadeaf49236..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.7.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild
index 7fff0e4d377a..751620427fff 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 )"
 
@@ -49,6 +49,15 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8082
 	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.15.2.ebuild b/dev-libs/protobuf/protobuf-3.16.0.ebuild
index 9cadeaf49236..ed6e85a966fb 100644
--- a/dev-libs/protobuf/protobuf-3.15.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.16.0.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
 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 )"
@@ -34,8 +34,8 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.16.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -49,6 +49,15 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8082
 	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.15.3.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild
index 9cadeaf49236..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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 )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -49,6 +49,15 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8082
 	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.15.0.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild
index 9cadeaf49236..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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 )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -49,6 +49,15 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8082
 	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.15.1.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild
index 9cadeaf49236..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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 )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -49,6 +49,15 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8082
 	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
new file mode 100644
index 000000000000..6391fd499f34
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/28"
+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 )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index ca997c7db9b8..6a5eecd502cf 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/27"
+SLOT="0/28"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index f7c86f0d1c33..629d11c29eb9 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ptexenc-1.3.8_p20200406.ebuild 1309 BLAKE2B 0ae99cd71415c2f06d42137dc44d8a5ef23ee8bc11fb262056b6b3c4bb529f0f19a1272977fa6fc5cdc3f385661175c79e53803bd3d8ecbe508cfaae9d125e75 SHA512 07d7ea7e9cba8b47c86d1758d84c189f5a5c8b171de68f9f9383822bd8695dc2ef17f8ea39fa0ef6c1c65b5475c0f2100c0496f8a719f200e60c0adaeff9de01
-EBUILD ptexenc-1.3.9_p20210325.ebuild 1254 BLAKE2B 1d62f5a28813e0b2ab46d45a6202f22db61bc30edf5f759536ac5dbe713b0f137ec9387246111ab006aeefd503e1357f530a07dede1bd89bbaf84da35c0b927d SHA512 1d76cf17e7bf30ad2cdbe826acdd88dda1ff8d67b0a93bbbb9008cb40132394977d61b29314866326663b19ca0b8713f7c04cf3da7185aee90c7ebfdb38890a0
+EBUILD ptexenc-1.3.9_p20210325.ebuild 1246 BLAKE2B c1ea0d72f61bed46649ab0c6e91f8447c235da3e57e789680d274927e4f7f225ebb794ebd3dff959e28b3786b8bf3ae5bbba5e02420e302a31843754cb3e5f33 SHA512 e2250cd30a429310f540f850ab14709064737bbbea0715c0ac00424b23dbbb968d6cc4126a94fdcb0e587932f1a9f7fbe93573e5d52aaf36a2b73aba3bd1c450
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
index 94d3676e1748..48ca2a23a9b9 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 27606afd50da..1b8c6bb25a38 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,7 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
-DIST raft-0.10.0.tar.gz 315569 BLAKE2B 2365ee2ef4aca44257cf7631875013a6778d8858427946443ec02411783517f3ef129529c3302eceedbd43d9a57de9a3fc20a762b51ce8c7ed96045d4c8d27b0 SHA512 5039e2305c92f5002de4ef33f3c0b76dac1e72b8d983440ae0f5cb65d99213278e23a80401476617f32857c1913ab30bf257265d92f6bb5992d2701d4c25f977
 DIST raft-0.10.1.tar.gz 318911 BLAKE2B 42ef22dfc89f05a3a9f130011c0f906201126a1615f9a60648587e014bbb63e038b3afd1593c2c07b046c3c35ef07deaa45cdce58062707409e4dbd3a9f7516e SHA512 6fa99d9dbb5895299c5124f5c8cfb544cf1bccae4ee196bc8011cd4cf9c632cd896f8cd93181409fbaf7da115235c72a4e10568080dd9957eceb978784dc0f9d
-EBUILD raft-0.10.0.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
-EBUILD raft-0.10.1.ebuild 948 BLAKE2B b594180bd763206d959ed723aa4058a7a3a1349a97a6a1f3b5cc2efb0ab5a9b2acaf82ae5c24ce559b2120b539da09b724f44568fba25939fbd0bd33944c8b4c SHA512 d5fb44d9341600d522abfdab8f72b3fedbc458a883c481ca6adbae20f1eb4c24f8fa6edaf2e674d10a06d9e4b0043540d03ddc0dea7d55c862aab76dde29621d
+DIST raft-0.11.1.tar.gz 324285 BLAKE2B 10e62a392bdbb98f262068ad2bcfbcd24488918fbb7d4c3b13101c3d771ff8b9d592bad31bfe69cfcb4d6e9c93e1d38da24d11a3167d37208906af4e354c9280 SHA512 5afbf0f7e325ed242c5a37a39038818395c1b39184e2440bf89db6662dee73b9abaa8fac0efc28dbc3478267aa66fd94e908e320a061fb5b343735e111dbea86
+EBUILD raft-0.10.1.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
+EBUILD raft-0.11.1.ebuild 995 BLAKE2B 29e8f04d211ee58fdfc468597d9f72d030c4a58d100af5b1acf936dd146f67273a4830de15b24f39480c7fa4726ddbbb1fa7beb173bcb14a98154c640363c2fd SHA512 1fda61e71df519c691f0ee66fa15f627940c1a6712a6bd24d932dcdb9d65630c307c91a5a73b3ead72d4774fb1e051cefcc218507d29ef950543bf42b3840b41
 MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/raft-0.10.1.ebuild b/dev-libs/raft/raft-0.10.1.ebuild
index ffd134995c1b..7d5c828a261c 100644
--- a/dev-libs/raft/raft-0.10.1.ebuild
+++ b/dev-libs/raft/raft-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test zfs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/raft/raft-0.10.0.ebuild b/dev-libs/raft/raft-0.11.1.ebuild
index 7d5c828a261c..cbf81fcbddb9 100644
--- a/dev-libs/raft/raft-0.10.0.ebuild
+++ b/dev-libs/raft/raft-0.11.1.ebuild
@@ -11,11 +11,12 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test zfs"
+KEYWORDS="~amd64 ~arm64"
+IUSE="lz4 test zfs"
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-libs/libuv"
+DEPEND="dev-libs/libuv
+	lz4? ( app-arch/lz4 )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -38,6 +39,7 @@ src_configure() {
 		--disable-sanitize
 		--disable-static
 
+		$(use_enable lz4)
 		$(use_enable test fixture)
 
 		$(use_with zfs)
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 95d566805122..8a80d47f187c 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -4,6 +4,6 @@ AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb0
 AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
-EBUILD rapidjson-1.1.0-r3.ebuild 1343 BLAKE2B ee49d50caad8fcb954051e5b29001a67fdd948090a0a584e9968d51c0beec891f14df9f38eb6496d52294f8b76e5a05bb3731659fd0cca4eae70f092e8d97077 SHA512 688f90e844e975ff8ad1b242ada5810611cfe10a957fde46d38d64cb8486d47690f7fbeb4b099c925777a0ee60024173c4d7d8042ba35d2da9f70830f4e7bd16
+EBUILD rapidjson-1.1.0-r3.ebuild 1350 BLAKE2B 99b22f8cd778678bded3ad6b67e64bd859a000a1ee512289a96200ea6376664f8bdfd5d051696942969690682ae9bea072cc1ad69ed07390e596fe5d415488e7 SHA512 76b25f84f25bf41cc1d39e5858869f60f032af375b871b4f41106565e371dc67ac46258a13ad70bc52b45925c20d58431edc8aa5b8cdedebd59927c70c137f5d
 EBUILD rapidjson-9999.ebuild 1341 BLAKE2B f985212651256604f3e2ef7c58581dbc21d95c4b2d53a25847a70403520956b30b87cc3d9d18d316004d8dbcce96b906aadb7bdb28a8b15e0d84f370bf500b6c SHA512 0c4b5c74f2510a8623e09a2b10a7e564ac1cda70875d061ef2a02e4fe0dfe219b8118295c1a996399e00a9919f2af4cdab77e2a100fbd492a6efd74280183302
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
index 5b1dcd2314e6..0cc19acd1ce0 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4be251aadd0e..b1404bd2084f 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,5 @@
-DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
-DIST re2-2021-02-02.tar.gz 402958 BLAKE2B 824afc7f6f92cfa7070f37e975469c995e9d4aa4bfb12a6e22a739199b74ea414536278ca18fc3a61250aa8744d56eeaaa203f4a8a37378fbf554750c9c8db9c SHA512 643ebbd998ae4089f1cda259df98f7c973df716f2959c3c01dc0c9ebdad685a5392d26e2149a1f865a93334dfec42d2e133776a39a4bf6a36053829958fa86db
 DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
-EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
-EBUILD re2-0.2021.02.02.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
+DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
 EBUILD re2-0.2021.04.01.ebuild 1345 BLAKE2B 895b1d92d1ed990d5cdc63041fe39e2fe3bd10cb7247e28a6461af5c170ea2215f5ffbd8dda0812443379de0f2131d5da2032a33240a3f210a72184b0f9c53bf SHA512 3f65ba7cb020840448c228a03973a387cbc282fb8e605f274321d7e60774dcf33d8e76e854eee9e1e716a428e89c49a748ec8a5b9673f1e605f9d08e1a5e86bd
+EBUILD re2-0.2021.06.01.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild b/dev-libs/re2/re2-0.2020.11.01.ebuild
deleted file mode 100644
index 48b29137b04d..000000000000
--- a/dev-libs/re2/re2-0.2020.11.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="9"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2021.02.02.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
index 383b552b2a85..383b552b2a85 100644
--- a/dev-libs/re2/re2-0.2021.02.02.ebuild
+++ b/dev-libs/re2/re2-0.2021.06.01.ebuild
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 2e01482036ef..be4a841faac2 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,7 +1,7 @@
 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.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
-DIST simdjson-0.9.5.tar.gz 7956300 BLAKE2B bd860e91ff3d14eba49370e7e5f62f3573e3b76e689633f93db7a03030b24bd600d07c7a378a82836e1d234249b10ee3bbb050ba495fd50733f0355fcaac8ff3 SHA512 cdb80fd76a6b67c52f5ad4c0fafe76cdb4c95f35ce6c486fe37c9c61e041c349c1c8ce01fef1dec8024083ae01a0afa780d595bffc833e8a99eb82ab62ab615e
+DIST simdjson-0.9.6.tar.gz 7956235 BLAKE2B 8d1ffb96a937f859598f45232f1c55a767c4dcb401e1b15b8745df0b3b1907a9ecf3319080b5f7dd6deeac7c97b6b7ee608a98173c2c92794ea5f79ea0083b18 SHA512 bfe565dd00e95e1c5c409fce1ec2a8d88c83fc61d9f46265afc0254f8a37f241fcb5b0729bc5ac58695766e2a6cb05abbf93220fa21fd8fe34872ac4a538140c
 EBUILD simdjson-0.9.2.ebuild 1185 BLAKE2B a3fb6be762829803a2fe3822452c19ffc93eb1e33711d02f61467d95dfc60fed93c24db58f86f868a0ffd842a8ad6e54e47dca2e1d6a00ebdd20273ce65c2c87 SHA512 cd5d0a75e28a315ffeb03f2c0716e5fe82b3fff11b506b0a45d4b05572a16cad19ed91ace2d78056d2a0ed1572c157ec541c1564b79613bb178fa733e4c95feb
-EBUILD simdjson-0.9.5.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
+EBUILD simdjson-0.9.6.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.9.5.ebuild b/dev-libs/simdjson/simdjson-0.9.6.ebuild
index ce97a46f1129..ce97a46f1129 100644
--- a/dev-libs/simdjson/simdjson-0.9.5.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.6.ebuild
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 84fd2e5a40ff..730788ec135b 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,8 +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
+DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367
 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
+EBUILD tinyxml2-9.0.0.ebuild 612 BLAKE2B b86357e9f7b339ce816ea62433c3b4a1c9164bd8acb286639134005149aa56e90acb2f1a72a6a8ca60f8d4615fb78ef9a6d2ab7342c37ccb231604f827d599f0 SHA512 ae9348540ae00beb161354ae13e5cd32c6c4a668d18e8330557c4d298c8ae727fdf35779132ec6e4748bb145f60518994e695893498df83627ebad3ae1bd5150
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
index 1ceb8e57aecf..7c0082ac47a4 100644
--- a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
@@ -3,42 +3,20 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 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"
+SLOT="0/9"
 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
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake_src_configure
 }
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index bb7d2c1c3ba8..32bb9501d5b5 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.4-r1.tar.gz 2869856 BLAKE2B ae010a66f5fd51175b474e1418d36965cea8ed87edb5d186c9a554cc2a193233046148ffd8f7764b61c166e75eb94866115d948b2a367a5e1140f5d41c9f8505 SHA512 cc6adba489f4bbf3348b24f6d0d4039ae8bd80164d6e6bd5ee313bea064ef978d43aa78f7294601f65a95501b4fa0a914af879fdc362e54f429ca2255f70ae2b
-EBUILD tree-sitter-0.19.4-r1.ebuild 730 BLAKE2B 1acefd32f4e55acaa31f04c447f87c0642d509b61fc2caea5b3ebc7d41e14a7abb1f2b4f7055d2f4cce0a002bf425afa1f48706be9164b02943d442b7f38f42d SHA512 fac2eb94f629306a7762414a7d4077e72e2d1855e0249c46e6dcc13d742e4b0c30f6b017570d8622402ceced13ddc090b524f368fe362094918c7cb36c999521
+DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
+EBUILD tree-sitter-0.19.5.ebuild 757 BLAKE2B 6e35d71a61461094f1b1f5b9973d9439b33dd9b46e31bc9fc454b0f9b1fbb9daac0052cf627e38f4fc6758419ffe7348b1d65969a21d0aebfdb7ebacbc17ffef SHA512 ecbf7f58b06040a0a6a27eeb1e31fa8a1ada430d31effd07b8c67079ef71f23b43133ac255e9149869e4352b9d569e6fd825eac7f5c052cd71ed899c8faa60dc
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index c21aa2ec8804..ac77081630dd 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}-r1.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest
index 243c6f909b97..cdcf9fa4f235 100644
--- a/dev-libs/trio/Manifest
+++ b/dev-libs/trio/Manifest
@@ -1,3 +1,4 @@
+AUX trio-1.16-no-inline.patch 197 BLAKE2B 6d4eaad93ef8bafe450d9dce6a6b676e649be525184a313af55f82916090a0c73edcc606f96097009700a8c1dfaae3c1a5081e0ed32b7b22f2c88a0cb385edbf SHA512 ee581daa9e957c6bbfc080f688b664bf04df29cd2dfb5ce59cc9e6f41ec005258a2584ac81505760a939f23b14991913b42d67742fa44e16000bd0552518aaa0
 DIST trio-1.16.tar.gz 167337 BLAKE2B 0f284e0a130723f7511c0e874276c79c1addc1329833d14f0b76bae9808d90b76a2b26817ee85da71c3997360918cb534917a11bbe35ba627d1012cd8a2f6299 SHA512 3a8bac3ed001f70f498bd2ab0881ed6d3760bc978bf9ff587c3fc1d5d7a38205f779c5fe445f41edaa9e23c15bc1b4a521916e19161277741bc8e2f744b46c69
-EBUILD trio-1.16.ebuild 812 BLAKE2B b0058b7e1079f6619f3aaec03fd13bc80f9dd99139d4959359caecc12b9ab312260b906863a63805ede02873e94e38714d898ba4664afebe96f479fcb6c1eae3 SHA512 92799664ce644cb5a0b63c7bc493d3dcc82eacce4328492e0012a82aba88a106e8ca4ba59f562cd106dd9f75fee95fb74b4eb18cee7f6214f3ab41d0bdc32f87
+EBUILD trio-1.16.ebuild 860 BLAKE2B cb67c7210025e47731cfe8aca3aa8f95a6b43ce82574e7f3c5129508ba51736652955d9c7428d79d2bc77b7195ffd80ba4beeebc70a490766207d877d3d830ca SHA512 9ce79b1dcdead5e65097eb89d456c63af2538d9c267e8f864a33b060beec73dd62bbe298cf7eb589eb9a3fba5ddf0189ae704c769b79c42a348224c54f65812a
 MISC metadata.xml 328 BLAKE2B c7b164aa25ad9fab55823ed0ff243062f73a4a7ae3d6d9630f72f9d912406a82f30fd9629cfe3441552478cd32b0ff4247b9fc7fe7eefe0fb65ae52cda4de5f2 SHA512 e507df5cc9d38e4f11eee8a2dc26390fb0380c596c91c1bb4b3f3a4d60303e0707af3679fecf0d1a0c560998e66284cb8cd24a539f7d47b37f046d01d5be4209
diff --git a/dev-libs/trio/files/trio-1.16-no-inline.patch b/dev-libs/trio/files/trio-1.16-no-inline.patch
new file mode 100644
index 000000000000..b1584344a111
--- /dev/null
+++ b/dev-libs/trio/files/trio-1.16-no-inline.patch
@@ -0,0 +1,8 @@
+Let compiler decide what to inline (fixes build with -Os).
+https://bugs.gentoo.org/792075
+--- a/triodef.h
++++ b/triodef.h
+@@ -315,2 +315,3 @@
+ #endif
++#undef TRIO_INLINE
+ #if !defined(TRIO_INLINE)
diff --git a/dev-libs/trio/trio-1.16.ebuild b/dev-libs/trio/trio-1.16.ebuild
index 1980624be416..bf7d164f5baf 100644
--- a/dev-libs/trio/trio-1.16.ebuild
+++ b/dev-libs/trio/trio-1.16.ebuild
@@ -13,6 +13,9 @@ LICENSE="trio"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-inline.patch
+)
 HTML_DOCS=( html/. )
 
 src_prepare() {
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 216604c4f4a3..2cd4f0a4064a 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -18,5 +18,5 @@ AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5b
 DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
-EBUILD tvision-2.2.1.4.ebuild 1594 BLAKE2B a1bccac96513ec89519025292db0189fb4dba4c8cb132bcc1367b8ff14664bce0113b5fd550dfc66b8357acdc25cd76523732414ffe13c5917e8390f97ffda4d SHA512 4c5acb5a63b1676dc9e5f92736608d579f7055cf4e0b301d3042f76ff56fe042e802f38a3b18608df4c9c3c273065de292713faf46bcf65e01f295b03add0ad6
+EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67
 MISC metadata.xml 584 BLAKE2B 9e0a46f70886d90423d03dbacca6f561f72aca282cbbead51e61a78632d93b444caf1d4485f0cdc1a3c8ef6069e0da7f04fc9eb152a0f630f8ed745e2347e11e SHA512 5c47abf240f67aa4eac6aafb2d1ca26bd494ffb8eb3ecaa6c989939cf201707ca50be9244abda468cb17391d4d8acc287a6676f4fbd565587cea446d51da4bb1
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 40d5d8d3482b..12f863d2694a 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+X debug gpm"
 
 DOCS=( readme.txt THANKS TODO )
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 9ea478d31a89..ea1a2f800ee3 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,5 @@
-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 653 BLAKE2B d9bf714e1dba1d434be738da71300a84588f0d60c82404dcd55abd41369d92c5b936b2e9f62bbcb93d66ba861adfb3bc7ae4375d9b2528a8ffbce375fa948710 SHA512 1654740c9cec31d743809f37e41dfd4f0f2d0108def37c6ea76f6a819dcc75e4d396e827cae8f213f5672150e32f850c927ed84bf0a233e7e625c0b3135d002a
-EBUILD vala-common-0.50.7.ebuild 661 BLAKE2B 16dc4858ce7998b2a2fcee77cd6547f7c5cbed76a73ca1d1a858d2d8731779976b988a3549d6a496f209673d6312acca629db115790af3a797be737cb1c1a94c SHA512 458bfd820271e520b7a02e29bfba7df0d9ed14cfbad6b240ddd49f8d2e0a69c87c83eb365cbb168f8361f97c5bc8d3d0c840290c3ca842732a2dba819a6ca5f0
+DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
+EBUILD vala-common-0.52.4.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
deleted file mode 100644
index 82c42780ac27..000000000000
--- a/dev-libs/vala-common/vala-common-0.48.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.50.7.ebuild b/dev-libs/vala-common/vala-common-0.52.4.ebuild
index 91b80ebdc38c..043fa5ecbb04 100644
--- a/dev-libs/vala-common/vala-common-0.50.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.4.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 6e684d530617..7b06f8937421 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-1.19.0.ebuild 1820 BLAKE2B 9cda545cdbdc652d3fae5d76e9e27947b9a15fa5f8215b83fdf46afd3e6717a6c1d3ca0a91bdfed6d2146a883a01790b06b746f7dd1d577f2d394ef34449dd09 SHA512 89bfba7c9ea7fe6770b039abe27f1a9f3e12d3d82d2fa2a6eb229d7a01df3a31c9237f4959b2bde84d9e6f0c28cd22dbebbd9bae3821e37e437688e9f335e694
-EBUILD wayland-9999.ebuild 1827 BLAKE2B f239a647ff50a6ed23c90d3439caff612116c5bddbc642842142015ec4bb592de91f934804c5487957c473b838080514b9fc43c18316df05a58fe8bc9fe21dca SHA512 ff5751e03b6f098ac784c5d10bddcff73a831974537b795dd6716b813f97b412110f0fcf145f43271636646fd42e8b407a29f99611ced9b29a1c374149fdd8c7
+EBUILD wayland-1.19.0.ebuild 1469 BLAKE2B a44e69efbd172377a84d8bfe46ca35a9f10652f37ffc949d7b59d9130ea460ab42db6affacf076bc2bd574c70629d814cf829d452a88ae7cfc0c135097a08d72 SHA512 3a368fef2f2170c29ffc2598b0cf634109c10cb1d845803299a07a3a6634864650283190fe81cda401c2e4de488cdd0f632145a590caee959c25387461fe380f
+EBUILD wayland-9999.ebuild 1476 BLAKE2B f367b4aff2adba99306d601b4abe4c41fcf803eba363ef8f265e4893beafab9477ebdcc7f1373734cdb58ee0205aeb0dba0087691d858a649396cfede9f0adcf SHA512 1f5076f2c7699bdbd14d2d5e63c43eaee550d109a39709e1435204c721036af9eddb13bf4b6fa57d930e142347d2cfae139c037677e7474d967908b9d23578f9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild
index 765bef844873..1e94dde694a5 100644
--- a/dev-libs/wayland/wayland-1.19.0.ebuild
+++ b/dev-libs/wayland/wayland-1.19.0.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,40 +35,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddocumentation=$(meson_multilib_native_use doc)
-		-Ddtd_validation=$(meson_multilib)
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
 		-Dlibraries=true
 		-Dscanner=false
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
@@ -79,7 +55,3 @@ src_test() {
 
 	multilib-minimal_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index d069ea46340e..058e90a73824 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,40 +35,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddocumentation=$(meson_multilib_native_use doc)
-		-Ddtd_validation=$(meson_multilib)
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
 		-Dlibraries=true
 		-Dscanner=false
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
@@ -79,7 +55,3 @@ src_test() {
 
 	multilib-minimal_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index f6dea4b76b7b..307e752d7690 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
-EBUILD xapian-bindings-1.4.18-r1.ebuild 7016 BLAKE2B fd0301d6eaf8343e04e4e21dbeeb5b81eaabb86050429623d939b26494a63e8bc5fa354ea69db6dcb219b17ee54399c9629c7e51c7ac6cc9c1bdfa08dc54d86d SHA512 95db246a513bb9302222d2f2de91c728558a215a9ccbe3cef3908255c531c762c2df3b569d42686c70d07957ff7ec831db6c6ccc04f73e91b4173c1f6ab76adc
+EBUILD xapian-bindings-1.4.18-r1.ebuild 7054 BLAKE2B 8cb7f791261999cfc0b1391c9401772f95e6a3fe316aac11a8dbe47ecad6b046e707c85527a97917d2203db716460114f837cfb469d21924bdebd629691ab908 SHA512 87e02b8a4c73c62ebaf21313348a6c49e2e8cf1c8adf1c4a64334a61429f064f77786c90c3ada65fb015d4ea88782049b26dc97c6e7400ed9a37377b326544a8
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index 92b6d26f5962..19cb5b2c3544 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-2 php7-3 php7-4"
@@ -327,6 +327,7 @@ src_install() {
 
 	if use python; then
 		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
 	fi
 
 	if use ruby; then
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 73394339889a..55778f3e1459 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,7 +1,8 @@
+AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8d91f8d6921f9a897188991e518f78e402b48c013e9659438be65f558157fec0bc214238f64010b428f3e3642586931d561a2ebc7ef SHA512 a2c9c30bbfe1217dd185bf547cf637784b73180f1346b97564c760c2a6cb67eef28766b0829f6dba04483c9bff8d6faeb58d2daddc9c541d6a2df62e9d4a9684
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1846 BLAKE2B 4ff9216abc501a2f4f517074317d06e2bdc44d2828971c66c6e756b3a03770485eb5788c2cccc1f59bd4370f13712db70d8a33ab11edf67010e9e474e390d2b0 SHA512 63c427797d5d374164f176f60e0a38f42ad2d9b1ae5b0aead552a79302c692424ae788779112f44229b7d32db6d2a9da65af5dc9ffeae70500ee610e122084b5
-EBUILD xapian-1.4.17.ebuild 1811 BLAKE2B 3f94c8906bc29c3bc221616b80578eda444cb3b2f56bef639aaf03a22b86e938aa2b3a8cf66afa1dddc7fd243865c9fc704cef181699af1465a3775ea65a3af3 SHA512 0cf9f291f252f8871229e5e7705e4bf34a1c868de50b8e591ce888897ceeb19af8f75bf0dbb96762443ab6c8855ece59a30b79f4b167c5dc566b95f29ac87349
-EBUILD xapian-1.4.18.ebuild 1818 BLAKE2B 1d0f89fa2f4e92ab049e0e63d2974ecf8e538f2870090164272eae4b2d8df60defaf0e848ce12306d1ab19a31da96a4dadbf8d0a8fc6f688dfbfcac240e97069 SHA512 2f9786eb876caf81b091c3d80eec0a474332e771099bc0926bb84bcec58ea37d2b70ba05d3071619fc4e073d937f97610660031d5a8a8ff8307af1ca023b2e68
+EBUILD xapian-1.2.25.ebuild 1974 BLAKE2B 9d9fc21e0f06e17af35b0c3fa26408c247ce1517bb12c21074ce63bd4fef7f384bec6ff34829aac8449a267d2c4975a0387e4264991ec2dbae993eb0c2784257 SHA512 e015e54b13c1a2b6f3a40ed40bfcb6494264896106bf3b6a69aafdda2748be9a3fbacd8c1ffae5cb7a3492de6da75b0654499a7330ec38f671d6f94a1337df49
+EBUILD xapian-1.4.17.ebuild 1880 BLAKE2B 368ba58fc611bf232f8a91da11a18b069699374bbd001eef86459a9b2158f87588b8ca46fcab5d6807619e08a5aa126995d8fb48e57c5a8c9b2832ca914d3156 SHA512 9d8de077dc2d2d8a2507e24561a16df38870893a486ff9df917c54bfb7cf63d460cbee945eaa50e129b929f4da988f109f51c9a2180eac1060993ee8db748be6
+EBUILD xapian-1.4.18.ebuild 1815 BLAKE2B e21bf3ad34a8fb74953764c938ed335061d24562b939fc1ebca54606db1f4180c9cd75d30038d2944ab76ce56be71d45b95fd583575aa1222097911c13ad4487 SHA512 a2aaf52d01b415f9330feffc27c75ff15295eb113fe88b3a3815f5b71bef64697559b1a08caae9e47e962ccbb86f3760dec7bc4ce0e04087c76348dfc0a0cdf1
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
new file mode 100644
index 000000000000..67693e968dff
--- /dev/null
+++ b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/788046
+--- a/api/omdocument.cc
++++ b/api/omdocument.cc
+@@ -39,6 +39,7 @@
+ 
+ #include <algorithm>
+ #include <string>
++#include <limits>
+ 
+ using namespace std;
+ 
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 6fb5b4472847..c756a3c880b6 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -24,6 +24,10 @@ S="${WORKDIR}/${MY_P}"
 multilib_src_configure() {
 	local myconf=""
 
+	# "brass_check.cc:40:48: error: reference to ‘byte’ is ambiguous"
+	# bug #789390
+	append-cxxflags -std=c++14
+
 	if use cpu_flags_x86_sse2; then
 		myconf="${myconf} --enable-sse=sse2"
 	else
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index d78cc9126d08..28d37a143933 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch
+)
+
 multilib_src_configure() {
 	local myconf=""
 
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index 6a4927607af9..e92a0c0daef0 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-libs
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)