gentoo resync : 03.03.2021

267 files changed, 2121 insertions, 6282 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cd36e0c8a645..4574df24233f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index 581b5b19b306..1724c76710c2 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,3 +1,3 @@
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
-EBUILD bitset-2.8.4-r1.ebuild 943 BLAKE2B ef2417a00b17526532c0042ac3248518508391ea2d392b382ecbf385dc1dd10dd45e910bc1bf0fa034c1f30c0119a2de90ef0e1d9d10451bd9d78d2d005e7ef4 SHA512 7179d196b836ff6e601f62d85e5ccfaf008d0eff5ae4f817301bac92b73f2dc38310389e0c8f501089f93b922279d85bf1e3edb91b08ef2cb0199813f2c18119
+EBUILD bitset-2.8.4-r1.ebuild 1023 BLAKE2B b7b363a53d3042983663f54c77a7c01d08b2007f1adc6a9014b3243b406bbd50025c6055deb1ddcde9928a8ca0b45049bc05434eca313ccd242361c04ec64abe SHA512 e9f1bf4620afb140853a2fc07af46de5a9f67f4f789f4e97786b26cc64f9c74463e3096005a6315bb0a202d670d4cf20a9b5d6d5c95a5e75a8aac191519adacf
 MISC metadata.xml 442 BLAKE2B 62782589bd4f5873f440b71efa6d0938e90f7b672babd073f316367aca8bf414cb6d57531700878267bad53e44d0c40b5d170f530827612cf7d6765b95acfb40 SHA512 4430820b6c01fbbc8f99e261c7abd221821ece94c954f0b9f78b99e7e06d9e82782baf873dc372ad00f0938d4050d899c1494e848c265662387666dcde63c70e
diff --git a/dev-libs/bitset/bitset-2.8.4-r1.ebuild b/dev-libs/bitset/bitset-2.8.4-r1.ebuild
index 420af9b499c2..74a48300b7fc 100644
--- a/dev-libs/bitset/bitset-2.8.4-r1.ebuild
+++ b/dev-libs/bitset/bitset-2.8.4-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A compressed bitset with supporting data structures and algorithms"
 HOMEPAGE="https://github.com/chriso/bitset"
@@ -15,21 +14,37 @@ SLOT="0"
 IUSE="jemalloc static-libs tcmalloc"
 KEYWORDS="amd64 ~arm x86"
 
-RDEPEND="tcmalloc? ( dev-util/google-perftools:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+RDEPEND="
+	tcmalloc? ( dev-util/google-perftools:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )
+"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="?? ( jemalloc tcmalloc )"
 
 DOCS=( README.md )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local tcmalloc_lib_name='tcmalloc'
+
 	has_version dev-util/google-perftools[minimal] && tcmalloc_lib_name='tcmalloc_minimal'
+
 	local myeconfargs=(
 		$(use_with jemalloc) \
 		$(use_with tcmalloc) \
 		$(use_with tcmalloc tcmalloc-lib "${tcmalloc_lib_name}")
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index cef60168d278..2d930caba0bb 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,7 +7,6 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
-EBUILD boost-1.74.0-r1.ebuild 11202 BLAKE2B afbda2cca3942411d3edb50bd1c6786e413d0cce0debf6301f5ac765cbb40ad5d3a2ff471635b17212287f6b3d969dcc6c72f517863c9e0f42ce23a84fbd971b SHA512 7d6f48fb0a2179c06a147ce0d0eb18917f9250ef12882fb7430b48f5e8222972da41732ff50e15ea9d2843741b3b6ae47da8bedcf3369e5fee5780da2d25d4fd
 EBUILD boost-1.74.0-r2.ebuild 11248 BLAKE2B d8d0e8792d13c8885d484201ee0255dbb0512f91a8c576f554e6ec60907ccabff2cf1c9941b45ef85701d3203525ac56dd9e74122920df9067e08119c75d5a74 SHA512 e9975bac036cede871bb60dece316fc4c48e6516084a4b4982b33a3a342f7c7c0deeeae6c5dbccaaaae8309b65f2425272475d93a666aa799938249174ffb8f0
 EBUILD boost-1.75.0.ebuild 11100 BLAKE2B 95d3e30860c81855ee702516fd09384adf771aa313f937fe4266843fd1881a7dc37fc4ad83e57ef7588a17ae5afd4d654a5441c43f8114eb2a697a71ab505e56 SHA512 8ed1eef22c42c6f0f1db6b79a2ee6169fa37843cfa05ffd20b715c01f932e972c53f7f959331510ba377ddf3d4479cdc0351209088187eb820d32eff8bf8e1a4
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.74.0-r1.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild
deleted file mode 100644
index 4ef64b4dd57c..000000000000
--- a/dev-libs/boost/boost-1.74.0-r1.ebuild
+++ /dev/null
@@ -1,358 +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 multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-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 ~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 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# upstream unresponsive to pull request
-	# https://github.com/boostorg/python/pull/286
-	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	# Remove annoying #pragma message
-	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index b8208dc28d08..1f242a5395f8 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,3 @@
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
-EBUILD botan-2.17.3.ebuild 3092 BLAKE2B 6671c557742a06de444be8fd702ab013d60e926cc1add0d7fe8d6a81f3ba44536f4a4c0160f50e6f7bc8668369c45920030901816c8c0eb98f35488746d21a0c SHA512 7bb98c9b4ea8d4f90660aebf273bf5de598a3f0bc17de081cc5ffa37df0797f9711d898343155d345e8fe5c00945c0a3294618126269fe2176ca88800f0a224b
+EBUILD botan-2.17.3.ebuild 3099 BLAKE2B ebd1ed5e8c3f0349bdd7d6e304a218fab1781918f4af0325aee3cd25a8db7f0e91cc2b74ae8403b088b3e93ba9a113200f4e384893136e6a0c78ab78af97e221 SHA512 dd189641a29f33fc456c878f9e72fc7ff342f9c2c82383fa2992cfa88478603b1abff9d1efaec42c984cdfea3a6984ec966b3049d3e119cd23004aec73173d23
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3.ebuild
index de43def34d08..fb15d09e9e4b 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 2b78860fa532..bbc2350426e0 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,5 +1,3 @@
-DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475
 DIST c-blosc-1.21.0.tar.gz 907199 BLAKE2B 08c52ce5f0d285798aef8720378d1cc3f2d2b0a99cf47f0a49dc82757a0edb4a37c5c0d226a80bae5f9be74b5c2a070906387b9677df71ea6b825662997168a1 SHA512 76758176f91979794dc3b8d46c21294d81e33fda4f2e299b031f2dc059d77e351e3f5f1c984b0263713d6e04c48534984d580244573dd96f0198dd3838b9f376
-EBUILD c-blosc-1.20.1.ebuild 1116 BLAKE2B 02a343be0d3eaa9c68527412bfa9fcb4f617ffd8710ac438f55710dbf9bf5262e2756b6d31625c0066af40995d32f8052932a06174e7e7432bf95d651c88ae55 SHA512 a841e25358a6b757a38d40e03bd563c5e485bd8d56177a544d158fb4147bc2c2badf14cc7059180cb0566a7b22dd070ceeb04b71c92d3f97413a0d89f4d15581
-EBUILD c-blosc-1.21.0.ebuild 1118 BLAKE2B d915c96971f1796fc37181fd4beb28b30e710190de0fc8842f62518ed148340196870b74e88bb0d76644bdc05f2d808b04ffb6e5ffbb28f9900d2205ebc2ad12 SHA512 8957ced34ce9ecab48a1a7e2ae768a36c5f6e1c4a49ab0229a5910de726b4bd483ca14fb20439030f57a82f1cc51a77358d0ee72a3eca221000cf84f875b2600
+EBUILD c-blosc-1.21.0.ebuild 1116 BLAKE2B 267a72b71ad922d3423f9ccc7277672dd7372f389e7c7119e0fe4622c37f7b1604b3e0bda1c3207bf0c230669dcccdc5c4ba39aeecc8d53437457126e3946c62 SHA512 7df851cf5d01648647edabeb015e9b927a2dc52f26ea6dab9fbf9df12129cb10f5f63cc222806a56c4a9db47ed68b52fc0eb05a4fbf2110a84acee6f614803fe
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.20.1.ebuild b/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
deleted file mode 100644
index a29541d5e367..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild b/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
index 3890df40b0be..206c6b168d2e 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-capnproto/Manifest b/dev-libs/c-capnproto/Manifest
index f1ef1dc23efb..86eb143ab715 100644
--- a/dev-libs/c-capnproto/Manifest
+++ b/dev-libs/c-capnproto/Manifest
@@ -1,3 +1,3 @@
 DIST c-capnproto-0.3.tar.xz 620560 BLAKE2B bae9d568531cf4138c945255e16cc989e096714c088581716f49b52d96c552aba231b0f3ff7795d9d64a51555f7af3ea7e06f3c5d5cc249d3eb8a017a093127c SHA512 188167a7e1e50e099135dfdcd2e739585074e0c63fe891ef173a5070cd4f019195823eb8f30389c82228b8981fd595c25fe03c3ac35a158f593c1fbaab87691f
-EBUILD c-capnproto-0.3.ebuild 494 BLAKE2B 2a14cb19b4360e4939099d5769f00e9fb4aa966fe0e19a309c8767d76d8ee951f43fba5d49c31cd9a23735e024a949967ea755171200d2f28821262b6aa046e4 SHA512 878471c96670abf88a816dd42ea9b4ceb0a65a520f2cbcf73697831d1898207f60b12c703b7d130d50164a8aa477b700775a56be5d00a1f59f52e229b3d207b5
+EBUILD c-capnproto-0.3.ebuild 446 BLAKE2B 7fac4fdab40df3f8cc54d4bacbb0acb043d378c31a0b509a4988658ea3d06afb09a6666f3996b3b79d78aa3cd8806b2a89fac85cab21381b365fd4a78a676d66 SHA512 105cd934715644a359c898983bc2236801c16260c545e0a42e2ed890ad87593906e6f164dcec1314b15b0930b52ea81c3bc496299d7747f2c29cf29f26a36091
 MISC metadata.xml 353 BLAKE2B 4128eb6c17498fcf4c5f5f34cff4e99245bcdcaa08ffc3d15901ba444ff21604db6eddb43ec282539ccf32dc7556907d8cc2356a0870f0a7b921505faf2a7c4c SHA512 09695711d2274fd74f3bd14caaff7cfbe51054e608038c3d392e5f56498ef91ec7bac4530763fe569e62d30f714af87c8bbaf71051efefc5cb7ef105491af33b
diff --git a/dev-libs/c-capnproto/c-capnproto-0.3.ebuild b/dev-libs/c-capnproto/c-capnproto-0.3.ebuild
index 645557b58a6b..efe586aaee46 100644
--- a/dev-libs/c-capnproto/c-capnproto-0.3.ebuild
+++ b/dev-libs/c-capnproto/c-capnproto-0.3.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=5
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="C library/compiler for the Cap'n Proto serialization/RPC protocol"
 HOMEPAGE="https://github.com/opensourcerouting/c-capnproto"
@@ -12,9 +12,5 @@ SRC_URI="https://github.com/opensourcerouting/c-capnproto/releases/download/${P}
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64"
-IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-"
+BDEPEND="app-arch/xz-utils"
diff --git a/dev-libs/d0_blind_id/Manifest b/dev-libs/d0_blind_id/Manifest
index 1596689d9462..7aa4e45fb8df 100644
--- a/dev-libs/d0_blind_id/Manifest
+++ b/dev-libs/d0_blind_id/Manifest
@@ -1,6 +1,4 @@
 AUX d0_blind_id-1.0-slibtool.patch 1564 BLAKE2B 60aa46c04897ac10b57b67cdaf0efcf93468a089d0b0bf735abc0d97af734821d24139825600e20520e6a15359de236a0e010aa2a8d5dffb3c7502662dba6fa8 SHA512 b0c082358bae52efcac9774198a2c8f75d804e9cdb88922a81548c19bbc9b03f1c4cc20c70e5b75eec3ca822d297ba01092d72fc49e4d41023fc384320818a5c
-DIST d0_blind_id-0.5.tar.gz 344460 BLAKE2B 9b77061e35b37bcdc009ea82989b0fe18ca6ddaebfcf7c3a4bd35523ae683fc0f05c3886f1c7904afbb5120a013dab2bbb1031c3c5dba9c435258e0b7fe960e9 SHA512 0a7735269a41108f191c4143b52eff2179889d94239be5be0c2406c6ed789b68e2d545250f9964e97f8c86a0653296bacdbe9b8d9db89a79ca6922d7c1a90162
 DIST d0_blind_id-1.0.tar.gz 49110 BLAKE2B 1977bb9c71d6655e8a84aab9daf5aee470ac3f3e140e7beff3555a41a81baebab5e4e5019b0550594b8c6e8b936706bb9790e5e3171c1348abf3212349d07109 SHA512 dbee0bec44a008a6843ec367211e4cdfa25f6c4577b48d942d19301d5ff885d4fde8d40ea304a114d349d8e90283a50854afb2fb322bf19640842ded025849f2
-EBUILD d0_blind_id-0.5.ebuild 837 BLAKE2B 326a06fb0ae0c2d3743734c9b7c73cba54e52e6d1cdfeb7de7c81a892a9df9072a8807e862e9f1264a1f0a6348338104416c03bf2ff89b34931492926e2f160c SHA512 d3121ad66661a67e15ecbb1775c76dfd50f6ff0247b60947ff8aa767b2bcbbad5acad419192ea777393b6dce10502e0eeca8bc4225a6d918a7aa5daf5044df42
-EBUILD d0_blind_id-1.0.ebuild 991 BLAKE2B da58c17c2bff8fec435d7050e2e1d7fda1d9db0c7e2c23a93b152073153ed26315354507f6e030a6f85c30ee402feadcc504c077a4235e870afc3a90f933ea3a SHA512 6e943cd9696e8c6a587a5f6dc2e33bf1e601f3d0a8d9b59492028affc71b7b143dafa7bf32212c24a999dc7d4de8ccfc83cbacc91223609bbd37238b9d12695b
+EBUILD d0_blind_id-1.0.ebuild 989 BLAKE2B 3933e658ba0516397e72e4350e261852b8a870e02ef68049426b386c12b2c2cc26ee53a52dde47b31e2c8c5f95dfde8ac72edb33f6c99f7d92e195082622e856 SHA512 550ba6ddc37800442f864dcc08231a88ef20b5fff27c4e9d0368631363408efa476b7f673a98c8a848fdf801812d0ac1cdf92f597da117c8e01e104f395c1a1f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
deleted file mode 100644
index f262dc8d640e..000000000000
--- a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
-HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-SRC_URI="https://github.com/downloads/divVerent/d0_blind_id/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/gmp:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( d0_blind_id.txt )
-
-src_prepare() {
-	# fix out-of-source build
-	sed -i \
-		-e 's, d0_rijndael.c, "$srcdir/d0_rijndael.c",' \
-		configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-rijndael
-		--without-openssl
-		--without-tommath
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
index 013b70c77ca0..04e9e80c4412 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/divVerent/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/gmp:0"
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index 43430b8b80cc..a63b196f829d 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,6 +1,5 @@
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
-EBUILD dbus-c++-0.9.0-r3.ebuild 1716 BLAKE2B af521bfc1a4162a3b34405815d3ba69fc625ceb4af960812f8a21b84f1c06cd36c4775028e32608a0e6555e105b6d989778701a7b59c6b2e3051cbfa71ba5187 SHA512 c090408d04caf9bedcbd71f392a88552f63621b727e01be8b26edd0adb73854479672fb1f93420b4b9b676aa67477d476bb98ee6326fd15745e695854cf073f2
-EBUILD dbus-c++-0.9.0-r4.ebuild 1613 BLAKE2B aa91bed053176d5a2812d7404fcce52118e03ceac25ec65b79a5d52f3b054a01e9eda212de6ed933cd0d560b5f2713580213f37dd686c4a4a9f74da0324abb81 SHA512 c8346b94cf2fd4cba79194a662b4a84579fc4c350c5b4f857ef8d173927c3788af11be4f4455608e1fbc26bfc73704cc50b0dbc5a4b7a862c3bb48b06b4733ea
+EBUILD dbus-c++-0.9.0-r4.ebuild 1612 BLAKE2B 28e37d9c1b7fafba46f71ad1c21fe4aa74a0ad04b86457be87d2a579b01270ca9bc273e8590d1093a7e1c18b7f8ba017ba6bf384157d45be4cea028939f5d7ff SHA512 4a9facb08cfc44d8c59820c9086e6112fdc24a2ff264db93bf76399b49fd5cc4d5913f9aca987c2f0a3ecd9a56cae3a33ebe7f00ccc9c2ea35bf68e9547839f5
 MISC metadata.xml 364 BLAKE2B 12695ecb75cc83a5aff33d9d6a0cb001b3d37d8d567806d1d76c79246e94f0796ca65a19799e18c06ef4f22fa19cb434521f1f7c02b0234ac5a7f8fddd2f1edc SHA512 9b4bcacc042091d3d5c058f2cd98d48ba3fea02b4687d137d95dd6219808dcdaf964793a6d6761c29a52eb31e55afa17bb45717d85c8904312a66f6c5ce03d9e
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
deleted file mode 100644
index afa3caaaab8a..000000000000
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-inherit autotools-multilib eutils
-
-DESCRIPTION="Provides a C++ API for D-BUS"
-HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
-SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc ecore glib static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
-	ecore? ( dev-libs/efl )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/cppunit[${MULTILIB_USEDEP}]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/lib${P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
-	"${FILESDIR}"/${PN}-gcc7.patch #622790
-)
-
-multilib_src_configure() {
-	# not just using autotools-multilib_src_configure because of multilib_native... logic
-
-	# TODO : add ecore multilib support if/when it is multilibified
-	ECONF_SOURCE="${S}" econf \
-		--disable-examples \
-		$(multilib_native_use_enable doc doxygen-docs) \
-		$(multilib_native_use_enable ecore) \
-		$(use_enable glib) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		PTHREAD_LIBS=-lpthread
-	# ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
-
-	if multilib_is_native_abi; then
-		# docs don't like out-of-source builds
-		local d
-		for d in img html; do
-			ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use doc; then
-		dohtml -r "${S}"/doc/html/*
-	fi
-}
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
index ea5c32b3c3d2..5da1267c21ac 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc ecore glib test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index 0597d684894b..c08de9c2ac44 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,3 +1,3 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
-EBUILD eb-4.4.1-r1.ebuild 821 BLAKE2B 61fd4654643774af847125b8430f57e4e99502c2dc379fb5bc93be5c11650cd12909b4b5e8d4dc295d8fa4c6c584e6876b223cbb2d8a5cb9be87f01d72af8e14 SHA512 5ef2f5289006f64d0129149e30239ecf94fb8e9a27f5acabf91d769dbae072b8290a56319c7dfa8c59ffdd1a1cc4856279b7b9ca0c6958b6b35ad1a62307a990
+EBUILD eb-4.4.1-r1.ebuild 924 BLAKE2B 41ab8769ebe9404b0a83f750ba669be58c0f585d847fef8f6cc798be256a14e38ea3601993ee58c9c29678bc98116ae71c8c90c65917c030cc4b500d130f0f46 SHA512 4ba4a092fd93a8995ab40995b96f60b02a863c5d9777366be83bcd3f85c95d6d4ccc91f6d0e14336d62ec6346d1de1c4024599a640f0550fe0a63e7c5bd8778f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index 2caae076012f..42e4a85f7619 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.1-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books"
-HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/eb/"
+HOMEPAGE="https://web.archive.org/web/20120330123930/http://www.sra.co.jp/people/m-kasahr/eb/"
 SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"
 
 LICENSE="BSD"
@@ -20,6 +22,11 @@ BDEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable ipv6) \
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 457b3cefd772..e7c688f8adf9 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,3 @@
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r10.ebuild 8182 BLAKE2B a5f2b0d2a0aa975f4d08034565d7140dd9d335f22907e5d2809c7eadf3857fdac1dccb3a4e1aa20ca8428e4a66d5b72493cbeaeb65e16e98f87b3054b08a875f SHA512 473c8ebf5e5867dcdc67631baac3181ace13db4ebf6c6982cb2be9426f2c9d4f3cf558dc1008c7c0a9d786325efe8dfb0d297f55dd27b9b935eb3f738c7396f0
+EBUILD efl-1.25.1-r10.ebuild 8198 BLAKE2B d7f6270741630a4ef21fb922b01e16116266c8178b2968046bdb00e959617a0b91cd7d99a1ee82d3bf12bcc967f1294d6bbecfada558cce375b3200eefa5c420 SHA512 5571c51566a9ca8bbd93d65ce589cb494e8caffa29c96f5ccb92e5a0a9598ad6d5847394f3ba6552b409c7472bda10dd37807937ffb603c277cd98b666e2a1be
 MISC metadata.xml 1888 BLAKE2B 4c689687387fb09a2387587bc32e5cb4f09b94264fb1b594d8dc0c1c214eaeb6cf5f39110ea3dde72acdcf328da25bfcd2756dc85c8b060ad64aa321b8dc8a23 SHA512 40289f8c6e10786c8c9d5069b775c7db5695910a33593e706d3ed0f623bdb8b6149161a25ad55deedd479fbc214dac174d6b99151e5167272fa464f5115eece1
diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index 85b495cd9fe6..d2c0c756ed57 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 	drm? ( gles2-only )
 	examples? ( eet svg )
 	gles2-only? ( || ( wayland X ) )
+	ibus? ( glib )
 	pulseaudio? ( sound )
 	wayland? ( gles2-only !opengl )
 	xim? ( X )
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 1c4d3160c232..848d7800b825 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,8 @@
 AUX ell-0.35-add-missing-include-in-dhcp-server.patch 586 BLAKE2B 487fc9d8079adaff7fcb63a34bdc4f5733474c5e39772a1b37638759372aab4996c650ed63fcc7a3f90717076e2d82d75c88320c153d4bc4f740c31a7beda464 SHA512 fcaa34bcf98f440d3aabc05349c5dbd515117f626dded93fe8a77060cc51c9a70e255fa49100b2fde9812c8d1cfb60f1059946285feb5d9ce84854c722fec482
 AUX ell-0.35-add-rawmemchr-to-missing-h.patch 1195 BLAKE2B 2ab70a003b79f10f755ef3c2fa289d913d31387f49aa4e1b6d5bf9c538229801ed2869f877b91ea277f845c196ed04d8bf23a424f5fa08fe78f53ec2f17160b0 SHA512 f1c3c37930892b421ee5e495b80db5deef0d34f860b3c98543a2e230aaffed57129bdf834a18c82b3c31aeb63f1081a9845f70ed243dcd6457c2da621b1168f3
-DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179
 DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c
-EBUILD ell-0.35.ebuild 1482 BLAKE2B f490d92fb666ec44e189178e659336df949c25c55f99ae7b370bcc1af48772a4d1bf24c0a9beacaf6a0140ce2cdf9b39448e44f8a294a0a570bcd12ea73b623a SHA512 2d859cc5e33d61c44c4dfd4f0be3820d80840a12ee408d49a228deb379256b2500f58e04625f08c58773b758f94139fbe7e5e7c65ecf2c1833b62a7d67be9ef3
-EBUILD ell-0.36.ebuild 1253 BLAKE2B 39c42d8c149bcae4b0ce4c886c2c83141d02a8dc8d0ccd2b4cdc2ae8af80befaf9af2f1a8b242363ea83a6095ee9616bc8eb2de37cd7d1e30ac6e99e7a7274e0 SHA512 67b5dd3428f4db0ae63145963c5678d2c75dd07150f771d3f31c9e09e004477115d139bead25bf188f0b59035408e1f0a9caac976601dad1be5d9453c6ce7ae7
+DIST ell-0.38.tar.xz 520744 BLAKE2B 24d552ed1bdd55c78aef7d427c40cb391ddedf8f06e77ddd188509a9eca71135b9fe282377bec1a225cb617c7a8bcc4efe6da6eb1dd86596e03ed6ba790b9619 SHA512 e482df8d810b866479c97a096efb8d2badb903bb7fda35ee3bbbaa65652c63f8058188a5ab9f477f835f6a5789a7c5d2eb7db2d9e30493ecd75bd7e71017b6c2
+EBUILD ell-0.36.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
+EBUILD ell-0.38.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.36.ebuild b/dev-libs/ell/ell-0.36.ebuild
index 163c92118f1c..8d87287e5656 100644
--- a/dev-libs/ell/ell-0.36.ebuild
+++ b/dev-libs/ell/ell-0.36.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.35.ebuild b/dev-libs/ell/ell-0.38.ebuild
index 59aed122b178..752fd7b7e630 100644
--- a/dev-libs/ell/ell-0.35.ebuild
+++ b/dev-libs/ell/ell-0.38.ebuild
@@ -11,10 +11,8 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
-	#remove on next bump
-	inherit autotools
 	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"
@@ -40,14 +38,8 @@ CONFIG_CHECK="
 	~KEY_DH_OPERATIONS
 "
 
-#remove on next bump
-PATCHES=( "${FILESDIR}/ell-0.35-add-rawmemchr-to-missing-h.patch"
-	"${FILESDIR}/ell-0.35-add-missing-include-in-dhcp-server.patch" )
-
 src_prepare() {
 	default
-	#remove on next bump
-	eautoreconf
 	[[ "${PV}" == *9999 ]] && eautoreconf
 }
 
diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index 0a69ac86c84b..da5578767857 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1,5 +1,5 @@
 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
 DIST freexl-1.0.6.tar.gz 941179 BLAKE2B e0b04e66c56d3a2805eed3f86442269843a2ccf7133669b9506a1812562396f2b5bbc04e29c9f829d9df6e627fa31b87fccc5407275ffb205ff498bd47bc4b89 SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
 EBUILD freexl-1.0.5.ebuild 557 BLAKE2B 3d5a55d682d5571d0d499f8adbadc082049a09febd5b8c75d56029cfa0442355c3515de9cc5faa8f05dab612c0c201857be76cfe486dbc18f7ad75d654d53591 SHA512 796a1b5a51abb07e46d52427f470c44d89affec59c1d7473f65d30abf844f1edb18038cf7e5842bb9b5ecd50102c9ac97678ea707086e054251c9045a1ffa98e
-EBUILD freexl-1.0.6.ebuild 563 BLAKE2B a8c4bf2add3bac02f35624b9bee8c62df012243e8c4bddf84d0d066627e671e8f5f1466c697d517e855f612b11dec4f011f92bbf8ecc5185b3b8bdff41d0f8b3 SHA512 eaffee37be563b4f798a55378e2e64bff139018a71e5c98dfc0ad09ed84d496170002f034f5ea6a44bf28f48d3a398cb5d9e3924554b4ca4fd4f6a122cbc6218
+EBUILD freexl-1.0.6.ebuild 559 BLAKE2B d62952a068c7f43c2028547e5740305d01bfacdbcf4bfc7f32d77f4eb9d14d9417201eb0f89dd55f82d34d5d67d2e0cc27e59bc9843b19bda8b1b0cba285ed4b SHA512 2ecc8dc4a0d9754e53cbee2d123ad6292b992e7d80033a7d9c9750fe6263814d317482862b12db14097c2bb959e76fb09eeb352bc4d66e104301d28686a70e45
 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/dev-libs/freexl/freexl-1.0.6.ebuild b/dev-libs/freexl/freexl-1.0.6.ebuild
index 0677e5dfba87..5075b861502b 100644
--- a/dev-libs/freexl/freexl-1.0.6.ebuild
+++ b/dev-libs/freexl/freexl-1.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 
 DEPEND="virtual/libiconv"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 47445e35e43b..b3c4bf9a262b 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -3,7 +3,7 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f
 DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1262 BLAKE2B 292dd45ee9f261aa7c3554d05337f14d8db08f3022ab4ba4cd00141f72e567fa186c3a56f7554cf07147b4c12ca05a65a0fa73cdc62a3e0487b2e2f71cdfb929 SHA512 6bfb72710863d441695e72c32ff355290293187a27e7244c53d25c1de557c958e59e1a16cbd3dee7150bd521894bf7eb0934749a0d68366277a7563f7f4539fc
+EBUILD geoip-1.6.10.ebuild 1261 BLAKE2B 6a766b7dcfc177a88f2a35c419f3eb0b49c48db5359d3383f05126bf0b63673f64626ecd8bf76155d5e8bb5739711767320318286af4a940ffe07fcab0409f86 SHA512 662603f6fe45fe8d6330ee8e323d66e6673a7f6f9aa7580def3c7b8f725c0bbc4f9e2d7c6742099590f9dd5d08f5e0bc6417a4c7b0383b0ff6dae7a646c829e6
 EBUILD geoip-1.6.11.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
 EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
 EBUILD geoip-1.6.9-r1.ebuild 1262 BLAKE2B 3c943ad84847dd2d49e9448c67858329a5e4a00ace289f7184d8ea9ae7086451482f92f31147940e7bbb386e55a23a1b12397653fe9e52b921007277a8eb6bd3 SHA512 fac580a443ee56aa9ac35d27e6a257da0d0bcab2fd46e6d76e22ce66d46b887c4ad7ab64513ea8f0f5490328ed52230439d18399d1b3c7283adf92def939a921
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 282925bbff31..2f5ee8e5606d 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e3fc789423a3..5fa02a604225 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,14 +1,4 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
-DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
-DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
-DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
-EBUILD glib-2.62.6.ebuild 9409 BLAKE2B ca6214157f5ce328ab0409ea26a73465c4fd864ef858977fc965e482b56ce4377956389942083de128218461ef6a59498e158aeba8a012b5a90e4500b847f2de SHA512 000882ab5032724685e78d64b12078e86a20b545cc2e0f0cffe476c420c35bd768607bd3ea8392575c5d3f116351a9453f34d0e103d8bc4761fe7ffb9d216781
-EBUILD glib-2.64.5.ebuild 9994 BLAKE2B 85e7698b2251b35f1be32e301ff386ccb7e3159eb6ecdb7e00504433bacfe6b283cbe1a62d04d2e6d154f0a612053ecaedfd2df1172860ebeb3ca041e25e7f10 SHA512 3c68fbf65fab4212a90213c5d97ccb250115f3c80f77fb7d0e768d7d30d770071298a7adc6de8c83078d21a18d74640b01c7f0013cfd414c77f849e18c4e4c3a
-EBUILD glib-2.66.2.ebuild 10109 BLAKE2B 0127f5bb4351d90a2355a12171eecbdc14425e09d60560f33ec6133b544ea3324381860e45ac4191abe7117ef4ed959872fbf6ccd70ba3331434d4f9802358d0 SHA512 0aed523c85564c5027d7b5b94b822814fee89531df97aeace3cb15c632ec938ab5bca136a1c9b5f659d487179e69674dc3052d4892322be1e55e7e29ca09856b
-EBUILD glib-2.66.3.ebuild 10105 BLAKE2B dc3129fe5286630071d5ce7ba28c4fb93fd36fe82058603c94a6eb4bf3dd28d571248f7e2f276b974fcdb8f0e4188a8eff4e3f2876956176812e2f07366adba9 SHA512 1b782096b36df0f6092c71a8d61d11b16a0b8d88968a4102e006c53b5f340f9415e58bc4b6dd784f243b256821269981e504d8e5c45c1d3c786c1610734085c6
-EBUILD glib-2.66.4.ebuild 10448 BLAKE2B 1eaaed679481f49c4c12a4a8c3cc5aecf156c68707ebb8356b4ff8aaf130eba85f67aab62f67ade1a98cdbe2960f76541f460fb753b9335a26f66884c38ae40f SHA512 68c35dba7eeee598ed0fbb3a8d6a62d347444b51f5e17eef57cdb99b21079c7d6f86cf669251092e775a52c799b7a872f9f1f0c53b46f99a71c8bd874824b178
-EBUILD glib-2.66.7.ebuild 10445 BLAKE2B 1b6a39c637f711e63d4a4fd63c8cbaae7335c85f7b861c1a9873026b0a684681508c4b77f1f5c5d589dc24b59acf129e5cc249b1fb80c585b07417f71b0b6c39 SHA512 f85092ee048f18f51518c9e8d99be7586a1032714491b74780134a2c7ff95cc7b518e0ef9642c46eb9e35af1ca6db567a99c11ebe74ec19bc68eaef6ed889078
+EBUILD glib-2.66.7.ebuild 10439 BLAKE2B a6ddcde770682eeaa0908e335d66e7339234ba8e32d8ef670b1daa1f9a603dad17bd5c1a450e8488b34bb3ef13e3adfcc0c15990ecec1f3fad0eab871820a939 SHA512 110402fe5b3dacf806cf13355e05e6e76e6e50a012a21b4c12536f861dde7464a4bc2a97b7d28ca679945fad120146528c9d0ea83373f7079eb72e0fd6cc0540
 MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
deleted file mode 100644
index b04957279e89..000000000000
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-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 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).
-# * 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?]
-	>=virtual/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}] ) )
-	virtual/libelf:0=
-	fam? ( >=virtual/fam-0-r1[${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.20
-		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)
-)
-
-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=true # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		-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})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-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.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
deleted file mode 100644
index c48471d6fe0f..000000000000
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ /dev/null
@@ -1,281 +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 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 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}] )
-"
-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.32-r2
-		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)
-		-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})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-
-	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.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
deleted file mode 100644
index 54d6b27eb677..000000000000
--- a/dev-libs/glib/glib-2.66.2.ebuild
+++ /dev/null
@@ -1,283 +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,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-2.66.0
-	>=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.32-r2
-		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})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-
-	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.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild
deleted file mode 100644
index d5040c5b8627..000000000000
--- a/dev-libs/glib/glib-2.66.3.ebuild
+++ /dev/null
@@ -1,283 +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,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})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-
-	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.4.ebuild b/dev-libs/glib/glib-2.66.4.ebuild
deleted file mode 100644
index eb54ead1f999..000000000000
--- a/dev-libs/glib/glib-2.66.4.ebuild
+++ /dev/null
@@ -1,290 +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,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.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
index ff43d5108617..417cda9f1dd4 100644
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -14,7 +14,7 @@ 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"
+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
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 3acede9931e2..44b9cba1d9e4 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,6 +1,8 @@
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
+AUX gmp-6.2.1-no-zarch.patch 623 BLAKE2B 4cdf9b780ca92f56eb3dd030a3614169b8cf4df94ec3b419d97c5488dd091c1847605b3525e1d90f07434b38cb82135b9a91d87785b79f0af828cbb09c54adde SHA512 6f071f6c44d3991a92f157545832238bcd2d7275321f7420aff0b4f88a95a66ba7cfd457d3c56040f8579a1be0b77ddedadc7dc4ce8a31c75266909fbb61c399
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
+EBUILD gmp-6.2.1-r1.ebuild 3101 BLAKE2B a042c754bf50429a85c65d63e33f5391b6f3ff3acdf5325a965b60a93ec5302104e31271803a2df9081216d8dcddad82304ef4b13e11cd4a5e5a6ef4dfe10927 SHA512 a8c4dd19a4c20b9723af536a967333bd8c1d011f74f93c7bef24422f1369963340de217a77e66ff62bdcfda4b563d13be6a5dd89c56669ca4391568663ad8d54
 EBUILD gmp-6.2.1.ebuild 3050 BLAKE2B bf2eb852144ec36f5ba182371b501d9c9c2e66a311fdb83ca1288017615a5ea07839eea21a4aa8d7fccad342f5ff8b0d842517254419f6af80cebdc8c8485324 SHA512 52be7365be21e1b4109df63cd8dc544a54681bbeede58ab1e518b9bf3f852ab1b6360066dc17d85eae7f43d8757016b50e2558709779462f53d6c3cc775fe78f
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/files/gmp-6.2.1-no-zarch.patch b/dev-libs/gmp/files/gmp-6.2.1-no-zarch.patch
new file mode 100644
index 000000000000..6ba7c8aa561b
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-6.2.1-no-zarch.patch
@@ -0,0 +1,20 @@
+configure.ac decides whether udiv_w_sdiv.c fallback is needed
+based on $CHOST value (without $CFLAGS). longlong.h relies
+on compiler macros (relies on $CFLAGS implicitly).
+
+That leads to use of undefined macros. The workaround makes
+udiv_w_sdiv.c a no-on for -mzarch.
+
+https://bugs.gentoo.org/761310
+--- a/mpn/generic/udiv_w_sdiv.c
++++ b/mpn/generic/udiv_w_sdiv.c
+@@ -1,3 +1,4 @@
++#if !defined(__zarch__)
+ /* mpn_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
+    division.
+ 
+@@ -139,3 +140,4 @@ mpn_udiv_w_sdiv (mp_limb_t *rp, mp_limb_t a1, mp_limb_t a0, mp_limb_t d)
+   *rp = r;
+   return q;
+ }
++#endif
diff --git a/dev-libs/gmp/gmp-6.2.1-r1.ebuild b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
new file mode 100644
index 000000000000..9046e8651103
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MANUAL_PV=$MY_PV
+MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
+HOMEPAGE="https://gmplib.org/"
+SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	mirror://gnu/${PN}/${MY_P}.tar.xz
+	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
+# The subslot reflects the C & C++ SONAMEs.
+SLOT="0/10.4"
+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 +cxx pic static-libs"
+
+BDEPEND="sys-devel/m4
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P%a}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
+	"${FILESDIR}"/${PN}-6.2.1-no-zarch.patch
+)
+
+src_prepare() {
+	default
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# https://bugs.gentoo.org/536894
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
+	fi
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/usr/bin/env sh
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+	EOF
+	# Patches to original configure might have lost the +x bit.
+	chmod a+rx configure{,.wrapped} || die
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	#367719
+	if [[ ${CHOST} == *-mint* ]]; then
+		filter-flags -O?
+	fi
+
+	# --with-pic forces static libraries to be built as PIC
+	# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--localstatedir="${EPREFIX}"/var/state/gmp \
+		--enable-shared \
+		$(use_enable asm assembly) \
+		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs || rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
+}
diff --git a/dev-libs/gtx/Manifest b/dev-libs/gtx/Manifest
index 488f48d7c016..9c2f50b9dde6 100644
--- a/dev-libs/gtx/Manifest
+++ b/dev-libs/gtx/Manifest
@@ -2,5 +2,6 @@ AUX gtx-0.2.2-debug.patch 824 BLAKE2B 99491b667059303ecfa3ca8af8a1a5af4f7801f22d
 AUX gtx-0.2.2-docdir.patch 354 BLAKE2B 2ce7f2ccbdfeebb21481113f84ed6ab840b13cc0b0ad01b38f073c3283dd746f3553a3bbdac5be6eae8458aec2b2cb50f47bb48e1b565022f2325efc18cac756 SHA512 3107bd3cc76fcdf008cf3a0f0a11c2d3761ba164158f7768f597d6f79a60c7cab8a420b6a7c41a7c5e2f0d42811531fb5be769ceceaba7e9fc2c0e4d70c5c522
 AUX gtx-0.2.2-glib.h.patch 277 BLAKE2B 3adec98810b92eaf65df3f421da3f3b3897e4754af8e8aa5881b5f7f66141031a560af7fe594415a32ad63dee54e59e3f5c20f64d09003c4c894860182fde336 SHA512 fb8581fee93122b2163472bb4c873ede049d42e00882633943c96e9aeb74fece1a1b8e2ef16d107eb765ecccf29aea250fc0948cd21cfe17b33e191c1699daba
 DIST gtx-0.2.2.tar.gz 306024 BLAKE2B 861e5e729edc376b104906dbefe7f79e018a61dac3fefa2b260a869324b9ad88f002c64bb753d06cff93d58102c8f35e052ff18129c5c97da45f0abff6d78718 SHA512 737e21c66388f520c9d6812f3478e583940e9558646b4f3281306e3a946d4fb87719a48c1ac5fb1e38e9e465dfd1f82dea90badb3b321c0ee6b1dd105a9329cb
+EBUILD gtx-0.2.2-r1.ebuild 862 BLAKE2B b7d0f3516172d8ff6c2a56c4b1371dddc3b8c36045d237e84f0f06f65c96b42d24018e3f1c3760cc5955962976d65ea988d4d1c1635c3b1bffa737d88a06d557 SHA512 df91c3bf83780fe4e513e16129e173d3dc63d50af1da43cf23809c3752dc9c3e0a9c384ce666eaab58bd992602461a40dfc88806aae71b91db5ddff56273ef2e
 EBUILD gtx-0.2.2.ebuild 761 BLAKE2B 0bac23a908010ee7be21b19d0415f221c4dacd3a0935d499591cc347c4904deb0624e58a5e60e4c33302d3fda606bdcf83a9073c6d9df23d136cbae1f5057b51 SHA512 a5d181b46f89e4fd8ca76065ed1fa4fd5a3f0c0578af3fa201afc0aea9dea5f595f95b464ff5ab9bb035596dcdde2a1249e1d55b60ea3fd20bd3a503182a3f70
 MISC metadata.xml 556 BLAKE2B bc74ab5b4ce6c4387207158870c59db0c0ff24b83409c4dc84aa27096630ac21b56b81789436c76eaddeff9e9cd1ce7feaa9914cf800873cf2e181848c92c67a SHA512 b57d6e9203c1833935e561c5479d7dddd88ac5514aee2d1c95304ec3b60ee85f743916b19f23f4a3633d64823151bd4dd256da73db12ad5a6bad670df16a6808
diff --git a/dev-libs/gtx/gtx-0.2.2-r1.ebuild b/dev-libs/gtx/gtx-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..7354843939d9
--- /dev/null
+++ b/dev-libs/gtx/gtx-0.2.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Small collection of functions intended to enhance the GLib testing framework"
+HOMEPAGE="https://launchpad.net/gtx"
+SRC_URI="https://launchpad.net/gtx/trunk/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-debug.patch
+	"${FILESDIR}"/${P}-glib.h.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index c8e5b05e3d57..642e8c9da459 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,5 +1,4 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1845 BLAKE2B 8739529dfb703312efc9d736a8ae895d4359d8e236960d315145a7195150ebd5945b3d048ef60f437abca65f221a9649fad1f98dee9303956521cb01af28df37 SHA512 e7687e1b52efec017253d1218f5a1f14701cedb9e9fab8c6ab3a272f11109045400a506955f672193ec5bae83264a3ef022c905e9d3c1b2e06045dee3d72a975
-EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1985 BLAKE2B 87615eda8dea3490a69324a0d07dea4fc79d0792ff132a6d10b5ee8387e46245b3fbb763eccdb8d8cfbbc6b4ec7c0bd16c411ef5a8afa0e60a9d64d390b00d63 SHA512 7e25765fb19ee59e2877c4155cd0495b82e3548e25b1c15ba8b3d2f58ad22711480c766b96f43e150268ed1fb5745c03184badcff35cfc0e96272767b3af8af5
+EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1844 BLAKE2B beacd5e8d3e72157ccf93e44e1a777fa00adcadfae6e247397aa5195e9367f9d00dfcf237e2f482ac9579a929a7292cfcad14c21538b7777ef5e980fca6e4399 SHA512 7693a87f85507b8cdd3eea7d81b38da476e0ef84e4a44c39ce219c5240af13775605ba7df900b20e4ef2450631b72d000e6ddf291fc732b3cc41287e906bd704
 MISC metadata.xml 540 BLAKE2B 6396197ca946971d1e954233589189f5e91dd4dc4fd6182f5cdf24890a5601a5e32fa71e2f4b2a676d346cb8feb1232467fa569f9348a5b788f5ee4a6838d7dc SHA512 3e0185fa3a56d0bb18f1256fe9e5c74cb5cdaea91cd24054d12243512012fdead25ac69c84a82d282b070bd73be2a9a7e313e858c05e6c2fe49bd38cba4d28d1
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
index 020ef1b48166..229c764ca7cc 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc fox"
 
 RDEPEND="
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
deleted file mode 100644
index f10a930314c9..000000000000
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit eutils versionator autotools-multilib #git-2
-
-# If github is desired, the following may be used.
-#EGIT_REPO_URI="https://github.com/signal11/hidapi.git"
-#EGIT_BRANCH="master"
-EGIT_COMMIT="d17db57b9d4354752e0af42f5f33007a42ef2906"
-
-# S is only needed for the debian_package
-S=${WORKDIR}/${PN}-${DEBIAN_PV}
-
-DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
-HOMEPAGE="http://www.signal11.us/oss/hidapi/"
-SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tgz"
-# When 0.8.0 is officially available the following link should be used.
-#SRC_URI="https://github.com/downloads/signal11/${PN}/${P}.zip"
-
-LICENSE="|| ( BSD GPL-3 HIDAPI )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc fox static-libs"
-
-RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
-	virtual/libudev:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	fox? ( x11-libs/fox )"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-PATCHES=("${FILESDIR}"/${P}-autoconf-2.70.patch)
-
-src_prepare() {
-	if ! use fox; then
-		sed -i -e 's:PKG_CHECK_MODULES(\[fox\], .*):AC_SUBST(fox_CFLAGS,[ ])AC_SUBST(fox_LIBS,[ ]):' configure.ac || die
-	fi
-
-	# Fix bashisms in the configure.ac file.
-	sed -i -e 's:\([A-Z_]\+\)+="\(.*\)":\1="${\1}\2":g' \
-		-e 's:\([A-Z_]\+\)+=`\(.*\)`:\1="${\1}\2":g' configure.ac || die
-
-	# Portage handles license texts itself, no need to install them
-	sed -i -e 's/LICENSE.*/ # blank/' Makefile.am || die
-
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_native_use_enable fox testgui)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile
-
-	if use doc; then
-		doxygen doxygen/Doxyfile || die
-	fi
-}
-
-src_install() {
-	autotools-multilib_src_install
-
-	if use doc; then
-		dohtml -r html/.
-	fi
-}
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index a4b95b027c57..7f50d2956095 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,5 +1,5 @@
 DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
 EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B 9bae28ced3eaf52f9994e9641bd8d68583422fb888f8c2bc407073a0dcae600a3a50f6aee20ada3892ed631a1f9bcd292728589c0ebcbc57dd434524bfd62cf4 SHA512 20efbf148f3b1c816696cf36b10e936021113c8f1b6e5d681b541ae323c84b2043619e7cd381e4aff033bbf80d7ab8b2d51224ac8a3aa17a4854375bd26bd5c9
-EBUILD hyperscan-5.4.0.ebuild 1191 BLAKE2B 65762e76f3ef080c32cac5a2469eacd05e885aa9f51d8ec22dc39481473134997a10bcb5e0b9bdaa2d744303879fb0d2bc9eb6156b2d47dbda83da754af2f8b2 SHA512 e47aa3971216352836d145652a33563f9ef448942b1dd65944878a372eca5883412323275606eb082b60468201cdf7884951daaca34b214f4247e8dbcb78f66d
+EBUILD hyperscan-5.4.0.ebuild 1265 BLAKE2B e7803d2a72e6e63216a08a76f6c0d0bafcaaec2a1f1414d6143b3b57b4f5f804fe55ffbf628730400392e661abbda37aa4b9faf44fd17e32b8349c540099539c SHA512 cb83991b397c87abb9966bad8ea4277ea979baf51432ac53f30533ef5ea840c26f54d4ff7f474a9d5796a14011e04090cba897da722a21bbd9b9b638bc2b1176
 MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index f5eac0bc20f2..6e40c26f0f8a 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost:="
@@ -38,6 +38,9 @@ src_configure() {
 	use cpu_flags_x86_ssse3 && append-flags -mssse3
 	use cpu_flags_x86_avx2  && append-flags -mavx2
 
+	# Temporary, see #772086#c1 and associated PR
+	CMAKE_BUILD_TYPE="Release"
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
 		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 6c418d00df62..f10b370d1738 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,6 +1,9 @@
 AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
+AUX igraph-0.9.0-cmakedirs.patch 356 BLAKE2B ddef81838cbcd7142f1ac31b276bafd9e490ac4951e09a1624dd5479f534245abb1efde09455bf633af07b6f6f550739cadb4809094ae130b6aa2ee5321e1338 SHA512 ebb4bef1fa95e0b62a788df1d34b965c8c91e3adffdcb5444ff40c498c120eac1568dca1ce56527c8447422a780b984e23f46d8f073b53a6cdf31451a3470d7a
 DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
 DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
+DIST igraph-0.9.0.tar.gz 3752584 BLAKE2B ab8724de1fb57fda1250a9a3e1958609004731f72d38c225c23a94b7ad39af8af7a269bb9e9a2cae28b5d4038acbb0fb4f12bc90831340f59cdafa75f4b7c264 SHA512 ee6ddda3ebb9fb01029a3efbbab2329516d42ecb3030c57e7a78c8d7f28b76650fb4f3245e993cbef6161de6f6a1e0a4f5ba2533cbd8271df72554561b4f407f
 EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
-EBUILD igraph-0.8.5.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
+EBUILD igraph-0.8.5.ebuild 1177 BLAKE2B 0aebcbb3875bb2ee611d6e35fae031a41cc0eec694649e573adaa3cf987099b2114417332b930102a3b817344ef30f5c383f4f72a70ac9dfe7d3a0caa8397207 SHA512 b8c588bd5a802b2c879d02e81d6c5cde176ff698739423eeb4de5df89cf03d14e70030218b957974f4b65278922116ae0035bf9ad3da9cf9ba275ada0311fdf3
+EBUILD igraph-0.9.0.ebuild 1079 BLAKE2B 6ba6490a7a042c441e64df9fe37cf03d8c078cdbc5b970431007a720d4a80d4c39154948b15eea4496266be58a298380a27c666dab001beb81c77ff07da6adde SHA512 2fcca50517868fde197fda25adc3c827abaecf903f9b67c1792105ee32aabc15ae3281cdf2899d41ce2ef9f413d43eb8b6caafd154f49373bdb3e2df0badaaf2
 MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
diff --git a/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch b/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch
new file mode 100644
index 000000000000..a7682d41e0a4
--- /dev/null
+++ b/dev-libs/igraph/files/igraph-0.9.0-cmakedirs.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -440,8 +440,8 @@ generate_export_header(igraph
+ include(GNUInstallDirs)
+ install(
+   TARGETS igraph
+-  RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ install(
+   DIRECTORY ${CMAKE_SOURCE_DIR}/include/
diff --git a/dev-libs/igraph/igraph-0.8.5.ebuild b/dev-libs/igraph/igraph-0.8.5.ebuild
index 186bd9a51133..1bce379e3060 100644
--- a/dev-libs/igraph/igraph-0.8.5.ebuild
+++ b/dev-libs/igraph/igraph-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-libs/igraph/igraph-0.9.0.ebuild b/dev-libs/igraph/igraph-0.9.0.ebuild
new file mode 100644
index 000000000000..d825b06fa454
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.9.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk:=
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.0-cmakedirs.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DIGRAPH_GLPK_SUPPORT=ON
+		-DIGRAPH_GRAPHML_SUPPORT=ON
+		-DIGRAPH_USE_INTERNAL_ARPACK=OFF
+		-DIGRAPH_USE_INTERNAL_BLAS=OFF
+		-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF
+		-DIGRAPH_USE_INTERNAL_GLPK=OFF
+		-DIGRAPH_USE_INTERNAL_GMP=OFF
+		-DIGRAPH_USE_INTERNAL_LAPACK=OFF
+		-DIGRAPH_ENABLE_TLS=$(usex threads)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 7df7a3cbcb6e..912cd9ad858b 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,4 @@
 AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7
-DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
-EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
 EBUILD jansson-2.13.1-r1.ebuild 941 BLAKE2B c4415794d498b4c805b33084d58a3aa985e287632fe364eb21cb4a35d1bea38eba94ecc87f7827654420083429cb4cfe10a5f74362e2b2016bd41aecfad864c4 SHA512 55a7703ca6a653613983eddcdbe866720cced62bf971f037c5400938b7da472354c09da69199453f7c4b2a9e922759bb03959baf87ffdb20b37d7931a90f4b6b
-EBUILD jansson-2.13.1.ebuild 900 BLAKE2B 474ff8e775505791709913bd732e51b66a501a63486ef1ec13f6badece49f5a1fe6a7a333ba6b363ae5e029d8a64532ed6ef147a82a3a3e5b8b4f694585de602 SHA512 703c4fc7e791daedd3a2922c8b5e1b89a487ef033cfbcb12df13472a22c3315e5ca370c14f75e6de4ee6ca562d377c905297f45e8f17cb5c54704704160328d8
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
deleted file mode 100644
index 68ae0abd38b9..000000000000
--- a/dev-libs/jansson/jansson-2.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
-HOMEPAGE="http://www.digip.org/jansson/"
-SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )"
-RDEPEND=""
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake html
-		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
deleted file mode 100644
index 696d47604721..000000000000
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
-HOMEPAGE="https://www.digip.org/jansson/"
-SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE="doc static-libs"
-
-# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
-BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake html
-		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index ebb2693f1364..8054f5c84858 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,3 @@
-DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
 DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec
-EBUILD kdiagram-2.7.0.ebuild 832 BLAKE2B 3387718914baf3dc319847459b5674ac8a8d3e93c2a027da009beaf47bc6551d1749f62647caca93feda84d722ac5fba0528b85d217e41761589992f82062cd1 SHA512 a2cdd3a8e297d8253dda98ab8f4812b083dfe03e4e8f5f0e76c04b5110d1dad9f251a6be1db2a2751f881d3f6cb6ab7c5e95a12238eb5c10fe6353004dc1739a
-EBUILD kdiagram-2.8.0.ebuild 863 BLAKE2B 04a039bc46d173c7e1ae64604354c766760984eb3887a1e39a8ff0c8f6a031ef7b5e80d94f55f481c9cc4272408b9159a96b9c73b3202247899b0fffe0c932e9 SHA512 12481f98888c9a5f56982bc27b8b906ff16457ca794da439b70d2d433410e4e7dbbaea04ce0f330e6171a139c041864a35e6a9803f6d57abfd660b0ea2dcdaec
+EBUILD kdiagram-2.8.0.ebuild 860 BLAKE2B eb7f2affb45c97b81252ebbfcf5aabc89312442e69457c07ec2a1906da86f7d580f57d56a402d79301dba7bf7c07361f723aef76af4ad437830b82670a57702e SHA512 7c2a30bc6d6eea7a84501676db6b21a75384951f7ed28f0dcfc5f424c938f69309bf66af25f0d77f62feb66543d07b6ecacce86b6fbd9daaaec5a6fc70ecdb93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
deleted file mode 100644
index eae79d8708d2..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://api.kde.org/kdiagram/index.html
-https://www.kdab.com/development-resources/qt-tools/kd-chart/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2" # TODO CHECK
-SLOT="5"
-
-REQUIRED_USE="test? ( examples )"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
index f0bc2ecf78f3..49ed3aa84440 100644
--- a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
@@ -17,7 +17,7 @@ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 54ca1916e55b..91ea99dc3949 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -4,5 +4,5 @@ AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d22
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
 DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
-EBUILD leatherman-1.12.4.ebuild 1332 BLAKE2B 5f942d7a5e371eddf3312d28202ec9d4fdb93a9c524ec76081915641d776085dcfd77d66d13693369e94b3e57ffc7a62b1b9f1175ebfd02fade4b256323a45b8 SHA512 a49db9d2f88f8834e8641e67d005e1116bc02fa3c1dee06e97bca0b05f598c6283d0ac2ccfb46fd3f344f687a332950b498ecc11d84bc7aa0b514b8d234d0c47
+EBUILD leatherman-1.12.4.ebuild 1329 BLAKE2B c6be811b3ef20dc571fc8ba7423d6ad96033171cce89dd1845bd44695dce67fea6b9c66ae8701a58bbb6f64a337f63c97bdd44b916f546dc90705bbb5c92d0be SHA512 4391da9e69af541cffcb1f8aab5e60a1f4bc1442d4450d43d159fb6617b84e9521d48ab5efc92fe2774b29b7628687003f16ff22d027b2fe869e89a120b5f82d
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
index 75654f08f0ec..12a9cdb19849 100644
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 7df24b055d74..abda3fe87408 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
-EBUILD libassuan-2.5.3.ebuild 1203 BLAKE2B c2ef2ad97c18751e67f6780880d57b01eba1aee7c5239a715ea20c57e07b6132474a217a746ac665ae7412625598cbec1f1f3aa440be194de1e3bdf4aad54dbf SHA512 40b43298a50e7a6672538176e4cbf621514d63ec83ff25346c6ce68e0bfbb2108bf96c997c8c5a30a3d4619cda0c5adebd1726fe360c72309cc33ccda5aa11ef
-EBUILD libassuan-2.5.4.ebuild 1213 BLAKE2B 8a936a17e0b5c7e72a7c81f71accbef8138aced30777a6175b87b898096d3e54c3463355a3dd931fc9a984b69c8df3e543512bb12c50eef36d9905809749085a SHA512 60002fb359df485556a1645821bd3976df19146f39b1cfa156d9f970de89638b42ce0ca9a3d6cdd6f35fe76d9ec70403ae9145026ec1dc64f8b69c711961ccad
+EBUILD libassuan-2.5.3.ebuild 1204 BLAKE2B 6e42c683176d3d20582599a7cf7e0415ecf9c582da9f0342fa71ae85d41c1c2b436383c38e2d1a49ea18fb9a5b5f8ada25ac864e2cb607fa47c31313dc05643a SHA512 6ef03b3e23e05b37a9befef849f8a593d43918448387faa8297fc39332c2eb15c562aa5f65c58f9dfbbbee75be1aa027061564bf90d1acc7903be623614588be
+EBUILD libassuan-2.5.4.ebuild 1214 BLAKE2B 0781a4a4af292712cac67400b78d06d04dacee6b2a0014f3aac6e2c80f7a7eed3870359b3e651c8aea176e158e25353002171d21bbb85735889da6805b6a7c9b SHA512 51faf23074d4436560e96d2fb1439b19d851e6760f3a469af9cdf2b9ed9205bf47e21bdda72568cab8993647b69e7b03a30afa5f680f3dbb05c6d50da9318b3a
 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 db7625faafa9..35ede059a696 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit libtool
 
 DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
index eb2923a1d284..f47712edfd6f 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit libtool
 
 DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index 8cda1ebf17d6..302835832d04 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,4 +1,3 @@
 DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9
-EBUILD libbase58-0.1.4-r1.ebuild 1320 BLAKE2B 0133aad6697023b82efac4246b710e8be8261acec736d84207d4f9db669cdc1518ce48cd2d46599c074967397495359d6a56bc3f906c9f266a3ac34f95b00c35 SHA512 805064dcec7ffdef9421196e1afe1d972f773c7a3e788567e1d326e3c14c639b04449657d45cf2939b4d0410250b40e923890b358d353204b22804df4b4c8e99
-EBUILD libbase58-0.1.4.ebuild 559 BLAKE2B 9194cf1bf7f8f6e5b065f5043efaabfee32e6de8f7d743c45189e9149224b677ef6e310649d1c5b17fd53d715882035514426d5b417ae786d8840b4bd91acab2 SHA512 9d7718bf1cb20eb8208adff9bb65e44ef32ca0804ce403a8868c4ad47b333ca50498d84a758bc0f4c06070a2120ed0896b30106911e9cd8c7d8dcd3e511916f0
+EBUILD libbase58-0.1.4-r1.ebuild 1344 BLAKE2B bc4e5d9bd8d2b30d3d2639f09841251d9509993a2b7ffe295719dc05c61977c145d330c141b5d942854091947057874f6dd0e7a74234aec70ecc5e6a20550bc3 SHA512 d0b9fcc76dc65bd9ee602004f28ae6c810cad8a19d06692c2a38b4a2cfeac5aefeb2b074cfc15ecb84588196f54e154263993560efb67e710cbe465978f43426
 MISC metadata.xml 546 BLAKE2B 82f8c4af155cefd55772b9bb93f62ca3ac7bebe9ce51519066ee9439293933490d279a6f0da794d1b39fc7eb1a8bf04ccd911685a11f262549957fcc2bdca476 SHA512 2944ee72c2a86666eba6ad64046c1d607b816ab8f2a0c1f3cc38805ebd4c95f9169afc4438a523298ac0a0038c2d9ea702571fb407fb7bf87d8e8fcb3b2ea052
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
index e849059b854e..80dc047c83be 100644
--- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
@@ -11,14 +11,17 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
 # NOTE: If not testing, we don't need non-native libgcrypt
 RDEPEND="tools? ( dev-libs/libgcrypt )"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
+	test? (
+		app-editors/vim-core
+		dev-libs/libgcrypt[${MULTILIB_USEDEP}]
+	)
 "
 
 src_prepare() {
diff --git a/dev-libs/libbase58/libbase58-0.1.4.ebuild b/dev-libs/libbase58/libbase58-0.1.4.ebuild
deleted file mode 100644
index 78152ff985e9..000000000000
--- a/dev-libs/libbase58/libbase58-0.1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="C implementation of Bitcoin's base58 encoding"
-HOMEPAGE="https://github.com/luke-jr/libbase58"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0/0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE="tools"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable tools tool)
-}
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 74058f783899..f09de4bcf24d 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -18,6 +18,6 @@ EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff8
 EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
-EBUILD libbpf-0.3.ebuild 1186 BLAKE2B f13d70453ef184f8586229e4f4e18752b2c633e9d33ab2c7a519cddf4c91784aa735f6e1df3722b833bda11ab6ec95ae44209c406bf4af8023e6ed2cbb4a7173 SHA512 a79601bd397f4c01687abdc8131dd761dd54c61558749f15a17c493cd12295dab858791e1eba17f5574a71350f6c7000e06b6043c7a7862ba0a184244e5e05b8
+EBUILD libbpf-0.3.ebuild 1228 BLAKE2B d6eed3093c1f3d0bbf065250190cc458fce536586a64f2f4255f50667ddcc1389f7cd075b95e6cf2aefe7c9e9311065f466df245726233c1ca1954d91846d71f SHA512 5c3d6d4ee284aa33aef21ed93355ca4a16e0dbf87f7daca372a89a713d8fb98341e289f10d9359bd5aa305292e0596b08bd12ffe1980c3d61aac7d330f9802d8
 EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index b74596abd7bf..8b55fe162b20 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 2aee3148aad2..71373ed09afd 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,39 +1,8 @@
-AUX libbson-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 AUX libbson-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX libbson-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
 AUX libbson-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
-DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
-DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
-DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
-DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
-DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
-DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
-DIST libbson-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
-DIST libbson-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
-DIST libbson-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
-DIST libbson-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5
 DIST libbson-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST libbson-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
-DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
-DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
-DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
-DIST libbson-1.8.2.tar.gz 4885188 BLAKE2B bd867dc2b93fbc45d155e0433cf20202ccabc8fc20414cf0dec9401242ed4469f89f067c56a9c1e304bd2e806c94682fd9b7a26300f56f7da690338b8df72811 SHA512 a0d9e0e3acdeb03f2de4507330cda36b2bcdeb2420ab4a0b342fe666799113f4384859af70d02d3c01ef1e4e0b8f2a06732ed14f86b386452508c680acb9b94d
-DIST libbson-1.9.3.tar.gz 4957319 BLAKE2B a4e4ebc96f876e52173fbf41e9cb995824683f6eaef7d49dd71ad834f313bf182bec456ca8e78d697d1688a54c497702783a18424bf32b485a205a9ad7044453 SHA512 ad2fdba2138c3197d236740ed2765848737afc847cb7b9e9a418c1fb98eceabccc561dab040aab1b7d67160f5969930c51caa17962667a35102475d909b4cbb7
-EBUILD libbson-0.98.0.ebuild 975 BLAKE2B f5d79791d080bd8fce54c8cf351cf6910c916bedd7bf094b255b022a29182c8d32151a56141a43b13bcd9db641b87cb35e41e215d9506f629273562d901d27a9 SHA512 051fb16d7dfd19f69c906d929b6294b7bc0844318afbb7efe5c3d9be6e7f92b04f3ded674197a1ec6108aa4ccf8913de928f1e8ee1d82c7b69529792b50f8ddc
-EBUILD libbson-1.1.10.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
-EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
-EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
-EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
-EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
-EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893beda6fc42d7de9d64bdffbae75daac11a40520a0cd228c7c41c2607985962f67007d689f771ecc54e82bf28e3c5 SHA512 efd6fa747afce9dffde09f23475f944a8df869ef4f997712f0ebb536d77c074a198955eea663f16de138684df5601298a9046e8fec1d4e6f17fc3e533b1b62c6
-EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f
-EBUILD libbson-1.14.0.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
-EBUILD libbson-1.15.1.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
 EBUILD libbson-1.16.2.ebuild 1105 BLAKE2B dbf2c09216d0b1d3cabc583a80f2d7f4f67519eadb8d27709c46aa6dea3eec658f3fb3ee8dd78972ab1cca25ce548d93328d7e4e53ea5597b338ba5405b05a7b SHA512 4e31f2d52cf21dfb17a067fc4928f918433e26b1f535323861d92f7dca6805a8c0a142a5c8b069bcc29146d419fedc0e4632717c0aeea72d634b0c2634f85490
-EBUILD libbson-1.17.0.ebuild 1058 BLAKE2B b45b4ea5065e8e2a4c71353af6d271fe181c966ef7aa4e5f645383109ad96d7a76e7e5908e03f25250c18d8434f28bdb77d1e9ae3b1bdac32d6b791906846283 SHA512 9eef615d32dbd7015355995d9fefd7b5b06adf72320af27b8892f370c0329cbbe86c4022290670482aa096b1d27d5933824b3d9bc25adeb48a5ac39c79bd0ff4
-EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
-EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
-EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
-EBUILD libbson-1.8.2.ebuild 779 BLAKE2B d928a6f8248448e8d5988246bd63737771f6971165e3056797c23674c4bfddff0c32f73eb2e55e08e5b2c322f3763d05beb0af7644cfa3d444f33b527177a9af SHA512 9ad3d186da9d4c936445afa4c789f9e8a14929a68b44d74a3c8530679e1302a325ad9839f6582a1dd742fd7cf9dade3fed171560a8772a5744eec664f7925824
-EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
+EBUILD libbson-1.17.0.ebuild 1040 BLAKE2B e46d4b49d5e9a5cbc938f43cea74dc42ba7449552554a891cc95fb82c83414c0e69aa0a5e76c1e9cab37c87c7ec5209890b0b0cd517f5aa90b1a46ffc622a005 SHA512 5d04ebc113ec3176c5216e19c451750d554f9eae7c61bc7b3fbfaca647de5085b0201dcac316083bbd1ce9c5339a3ee3b38aad1e636e2d0492b70bbda61fe5d6
 MISC metadata.xml 333 BLAKE2B 25979b807deae1e87e62fa985ffc6d01853a50340d694ac6b4383854df15c26d1c7faf3a4abefd195a7525ed95e255b9beeef5e22a25fb936244de1029fd0480 SHA512 bfe49ec533a23f950bbd560e65fdfa0c5c839d189a53ffc3135242c5bb262141f0c89cc69d7578fe9b3ea9116b70d55d1c362a1090f069e54e54bd03c51f6265
diff --git a/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch b/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch
deleted file mode 100644
index 64a90bbe3ece..000000000000
--- a/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f7a0dfe..22d1f4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -271,7 +271,6 @@ if (ENABLE_MONGOC)
-       VERSION_CURRENT
-       VERSION_RELEASED
-       # This sub-directory is added later, so manually include here
--      generate_uninstall/CMakeLists.txt
-    )
- 
-    set_local_dist (top_DIST ${top_DIST_local})
-@@ -341,14 +340,8 @@ if (WIN32)
- else ()
-    set (UNINSTALL_PROG "uninstall.sh")
- endif ()
--set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/mongo-c-driver")
- 
- # Create uninstall program and associated uninstall target
- #
- # This needs to be last (after all other add_subdirectory calls) to ensure that
- # the generated uninstall program is complete and correct
--add_subdirectory (generate_uninstall)
--
--add_custom_target (uninstall
--   COMMAND "${UNINSTALL_PROG_DIR}/${UNINSTALL_PROG}"
--)
diff --git a/dev-libs/libbson/libbson-0.98.0.ebuild b/dev-libs/libbson/libbson-0.98.0.ebuild
deleted file mode 100644
index 9d2c7204d9e9..000000000000
--- a/dev-libs/libbson/libbson-0.98.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/dev-libs/libbson/libbson-1.1.10.ebuild b/dev-libs/libbson/libbson-1.1.10.ebuild
deleted file mode 100644
index 6904ae31ae57..000000000000
--- a/dev-libs/libbson/libbson-1.1.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/dev-libs/libbson/libbson-1.1.2.ebuild b/dev-libs/libbson/libbson-1.1.2.ebuild
deleted file mode 100644
index 6904ae31ae57..000000000000
--- a/dev-libs/libbson/libbson-1.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/dev-libs/libbson/libbson-1.10.3.ebuild b/dev-libs/libbson/libbson-1.10.3.ebuild
deleted file mode 100644
index e229e5ac1bdd..000000000000
--- a/dev-libs/libbson/libbson-1.10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.11.0.ebuild b/dev-libs/libbson/libbson-1.11.0.ebuild
deleted file mode 100644
index e229e5ac1bdd..000000000000
--- a/dev-libs/libbson/libbson-1.11.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.12.0.ebuild b/dev-libs/libbson/libbson-1.12.0.ebuild
deleted file mode 100644
index e229e5ac1bdd..000000000000
--- a/dev-libs/libbson/libbson-1.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.13.0.ebuild b/dev-libs/libbson/libbson-1.13.0.ebuild
deleted file mode 100644
index 2ea5452eeaca..000000000000
--- a/dev-libs/libbson/libbson-1.13.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-uninstall.patch"
-)
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.13.1.ebuild b/dev-libs/libbson/libbson-1.13.1.ebuild
deleted file mode 100644
index f0095e641c58..000000000000
--- a/dev-libs/libbson/libbson-1.13.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.14.0.ebuild b/dev-libs/libbson/libbson-1.14.0.ebuild
deleted file mode 100644
index a21a401d4d66..000000000000
--- a/dev-libs/libbson/libbson-1.14.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-PATCHES=( "${FILESDIR}/libbson-1.14.0-no-docs.patch" )
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.15.1.ebuild b/dev-libs/libbson/libbson-1.15.1.ebuild
deleted file mode 100644
index a21a401d4d66..000000000000
--- a/dev-libs/libbson/libbson-1.15.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-PATCHES=( "${FILESDIR}/libbson-1.14.0-no-docs.patch" )
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.17.0.ebuild b/dev-libs/libbson/libbson-1.17.0.ebuild
index d29735c6690e..a25e6ef7e4e3 100644
--- a/dev-libs/libbson/libbson-1.17.0.ebuild
+++ b/dev-libs/libbson/libbson-1.17.0.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
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
@@ -34,7 +34,7 @@ src_configure() {
 		-DENABLE_UNINSTALL=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
@@ -43,5 +43,5 @@ src_install() {
 		dodoc src/libbson/examples/*.c
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-libs/libbson/libbson-1.3.5.ebuild b/dev-libs/libbson/libbson-1.3.5.ebuild
deleted file mode 100644
index 76bd281fa631..000000000000
--- a/dev-libs/libbson/libbson-1.3.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default_src_prepare
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default_src_install
-	if [[ -f "${D}usr/share/doc/${P}/COPYING" ]] ; then
-		rm "${D}usr/share/doc/${P}/COPYING" || die
-	fi
-	# Installing all the manuals conflicts with man-pages
-	doman doc/man/bson_*.3
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/dev-libs/libbson/libbson-1.3.6.ebuild b/dev-libs/libbson/libbson-1.3.6.ebuild
deleted file mode 100644
index e2a4483d6d6d..000000000000
--- a/dev-libs/libbson/libbson-1.3.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="debug examples static-libs"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default_src_prepare
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if [[ -f "${D}usr/share/doc/${P}/COPYING" ]] ; then
-		rm "${D}usr/share/doc/${P}/COPYING" || die
-	fi
-
-	# Installing all the manuals conflicts with man-pages
-	doman doc/man/bson_*.3
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins examples/*.c
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/libbson/libbson-1.6.2.ebuild b/dev-libs/libbson/libbson-1.6.2.ebuild
deleted file mode 100644
index 53d3018c63c9..000000000000
--- a/dev-libs/libbson/libbson-1.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="debug examples static-libs"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default_src_prepare
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/bson/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Installing all the manuals conflicts with man-pages
-	doman doc/man/bson_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	einstalldocs
-}
-
-src_test() {
-	emake test
-}
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
deleted file mode 100644
index cc0a1d7a476a..000000000000
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE="debug examples static-libs"
-
-src_configure() {
-	econf --disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Installing all the manuals conflicts with man-pages
-	doman doc/man/bson_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	einstalldocs
-}
-
-src_test() {
-	emake test
-}
diff --git a/dev-libs/libbson/libbson-1.9.3.ebuild b/dev-libs/libbson/libbson-1.9.3.ebuild
deleted file mode 100644
index 5fa502a4ac5d..000000000000
--- a/dev-libs/libbson/libbson-1.9.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A BSON utility library"
-HOMEPAGE="https://github.com/mongodb/libbson"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="debug examples static-libs"
-
-src_configure() {
-	econf --disable-optimizations \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Installing all the manuals conflicts with man-pages
-	doman doc/man/bson_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	einstalldocs
-}
-
-src_test() {
-	emake test
-}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 17f8e48b8a6a..0bd7afc28064 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,5 @@
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
+DIST libburn-1.5.4.tar.gz 991212 BLAKE2B 3fd4aa70eed2c9d0d33ef8bb967cd6208f1561aeebe8bc2b222fa4639fa3c215d49ee5ed3efc32813221fc4a9016ec9a3cabdcd8ae052d161794c0af11c7e6ee SHA512 dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9
 EBUILD libburn-1.5.2_p1.ebuild 889 BLAKE2B 981fee1ecbfca821dd15422f20963858807ccf0c7624157150c9f75eb4b9e4ab0527e8b63a50bb4efacecdb3460ae5fa3f2d471f0f0d7385763ac77c5ef8a86c SHA512 654cde093a0ac37397e4d0d63284259e2cb8230f0ae8d9934573501425c39049cd2b04238f284c62f8e13f3c885d3cabfb17ee70b8811533354b2ffa4b7e1f8d
+EBUILD libburn-1.5.4.ebuild 847 BLAKE2B b7ca55dcb20d93929b1d70059ecbf6cb02f3fae4c57c9200b32b40ab31f9f6705ea4595d46548af274f80d787d93f2d1fa9c47b93762640905da702526f74fea SHA512 287c3aede68b0dd378cdd3999e04dd8ab19c9a4979cfc0dab2ec647c28d4914216cc4f1d652b1741b9599ecda7de1e91a1302e967153a17c8dc10911a097b5de
 MISC metadata.xml 243 BLAKE2B d63a20aa244e2d01198a2c4d25830ea1a68f7fa3fcb918ac373c31e99b303cb825bc33a753324b0999290c49421076f5fcb2450783a7e13a15cac8bfa8ebd044 SHA512 010182e2f4aa6b9ba90b1cc05b0efe19e0f40188917402ff7ef6034b5210376b33a35f9a2cc921b4cd90030bd6bd8d7e632928b34e2ed91a3e3a36a1e0b8dae7
diff --git a/dev-libs/libburn/libburn-1.5.4.ebuild b/dev-libs/libburn/libburn-1.5.4.ebuild
new file mode 100644
index 000000000000..49396c70db5c
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index df1431fc54da..950d2ba9606d 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3877 BLAKE2B 8aca06e1b0dc272fb6828e30b49034c08c4f9cad6d5fa5650ae98ec63ba2184a4e23ad7994641715a190cc2c3821a9346c7c5a274ab726eea2fda871d2b681ac SHA512 e983bcc5626f812e4888a6dcbd32118920e8313eb5c938a4ba2c26e394aa010d9676a0b12aff00ff2ce1750359508588c066b0822d5861c6ca43b91fbcbd2b3d
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3875 BLAKE2B d3dca585372505f5b2e86dbd4ce0a6252eef0c489caecd0d06dd9b3937f5ff0f127b73be4e4fc8a8e83456201ee95500d4288c97ad74e6970d72f56f063e5b5c SHA512 c1edf76187fc6260e345bf0b468824ba22c2d1e789ff45c243912cde18f42faf67a4f703362d8ba31ba17434db05499eac89d917fe8011556f4f61a7b620efd6
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index 5b989cd3913a..1651b303c421 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index cca6df39e56c..9ab233503e64 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -2,5 +2,5 @@ AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.14-r1.ebuild 1505 BLAKE2B c56665847b90b14919528c753e2cc87d311d3c378c32eb26c2389e59c5a4d883c00d03e1fdf9702195f1d50608fc85958309e56dd041c51e94588b20de91f861 SHA512 9d6e0f8c10d8b0cfd24b13462caa2e47fe49ec04b52f029d1de20939be26d0c5617b37fc65ad9c7566f2a6ed3c2cf9e58d78a5594b0793f5460f2110806b9188
-EBUILD libdnet-1.14-r2.ebuild 1550 BLAKE2B 30605f217b906b6c6ee3ee4a8ba3a009c613947a2178a3771a0a1b8752e753faa365e387338006021b925888742819b52736615723990c3b761e02b47c73610d SHA512 0aaadbf54e4620754cd0031a628e4001d3743c8ab01f45518c817cfcd6f57450b8e9126bf3d6c7a1076d3789bf3d367045ba7fff75e50149cf94d7a8ac48c50d
+EBUILD libdnet-1.14-r2.ebuild 1549 BLAKE2B 40321bca56583e9edfc1f768b9566e1b8be271deb98a8db56457c64bf345bdf8308d04523fa30ad8b96457c3a65097a3f5fac9920e0f430a28feeda3957b97de SHA512 dc14df9d1d60dfb35cd2118dd632d07b174915c5e728c1bebd2e511bc204cb997b85d68f227b550b0124e5e631bdae94fd400bb39cba72a5ab0d2aa485ae7705
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index f1fa7a9b02d5..88c4acfad33a 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index 520ecf8bb995..28befa7ca8cf 100644
--- a/dev-libs/libdynd/Manifest
+++ b/dev-libs/libdynd/Manifest
@@ -1,3 +1,3 @@
 DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f
-EBUILD libdynd-0.7.2.ebuild 1911 BLAKE2B 5ba0be5542cbd76765c5173fa72a660f4826404651ce9abab64f54fec3391ef8d0d02b5c47ae97ad1a181b9db09d0b8a6c423dfe4b61950e1fce2fe77728237b SHA512 4ee29a9718ecb18e66daa2f6860a1cd1cc76a0e7123a37235e80af9b11b8f173e98581dcdb2d334b500580bdd23c7223dc02180e7f7a246bcbe2e1c5f8f84673
+EBUILD libdynd-0.7.2-r1.ebuild 1995 BLAKE2B 1ecd811bc47d1864a513c90033709d3ba8cb922e4c98550a991db7d8cc2db2c24912995d67024f3089e799c86eba0da4a36108d4ef69d135ffa8907730443658 SHA512 4c41cb056023f33ba5c852bdfc0c0a64301a75bc8896b99ae39c98a7e0162674d3145c7250b8c4a0f464b375e85dda555d3a8dcb733cb36b279c6f14568a61ae
 MISC metadata.xml 1022 BLAKE2B 5249d8465047f4f6cd62f591aeb54a274ace157f9b9889a1be17cb049ebf20deebd6459975c62f466faf37f9eea214bd454642b6783fbc4da48e28e9aab40e30 SHA512 7f8a4d5138c2103a4d74a3968dbd198eed8b92312cf52f9ae0910d06b8e9ddf08091bc6e22e92fbefd35ee1b8929e1cb8cda19a3b4c2ff5b7729c7ef23e874ac
diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
index 90d8c02bb873..b83206ebd457 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils cuda
+inherit cmake cuda
 
 # change each new libdynd version, to avoid git in tree dependency
 DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
@@ -18,30 +18,33 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc fftw test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RDEPEND="
 	dev-libs/c-blosc:0=
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	fftw? ( sci-libs/fftw:3.0 )
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
+DEPEND="${RDEPEND}"
 
 DOCS=( README.md )
 
 src_prepare() {
 	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
+
+	cmake_src_prepare
 	cmake_comment_add_subdirectory examples
+
 	# fix forced cxxflags and doc installation directory
 	sed -e 's|-O3 -fomit-frame-pointer||' \
 		-e 's|-Werror||g' \
 		-e "s|docs DESTINATION docs|docs/html DESTINATION share/doc/${PF}|" \
 		-i CMakeLists.txt || die
+
 	# don't install test exec
 	sed -e 's|install(TARGETS test_libdynd||' \
 		-e 's|RUNTIME DESTINATION bin)||' \
 		-i tests/CMakeLists.txt || die
+
 	# remove the version mangling from git stuff it requires a git clone
 	# rather force set it a configure time
 	sed -e '/GetGitRev/d' \
@@ -49,6 +52,9 @@ src_prepare() {
 		-e '/git_describe/d' \
 		-e '/dirty/d' \
 		-i CMakeLists.txt || die
+
+	# fix libdir, bug #701474
+	sed -i -e "s|/lib|/$(get_libdir)|" libdynd-config.in || die
 }
 
 src_configure() {
@@ -63,7 +69,8 @@ src_configure() {
 		-DDYND_FFTW="$(usex fftw)"
 	)
 	use fftw && mycmakeargs+=( -DFFTW_PATH="${EPREFIX}/usr/include" )
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 82431ff396a7..71060dd49f4f 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,9 +1,3 @@
-DIST libebml-1.3.10.tar.xz 69488 BLAKE2B 0133ec041cd2f2aad9e8870d56c4ec8f3f3cbf745cbdbc2470f02f94152b8a236626d804bf8c42c00c6a49cc5e7d691394cffe0a888f26100ff67bd03a6ae2d7 SHA512 c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49
-DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
-DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230
-DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc6576a5b91ccd93286c0cab2d99a80e3d2aefcbc6210724d9e05229c9ea19e0def85ba28f7e1aa059ba52925d SHA512 ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b
-EBUILD libebml-1.3.10.ebuild 601 BLAKE2B b86e87e70d8802cb2f3c7d1a5670f25f9f2d7167d8ba16b830300ea9e3979d7f0a1b6bf9c1e26055effa4b52f27e326168d885a47933f1a5e094c4ddb742e32c SHA512 5f777da9fe58cc72eb8e354a3d2d59cb7cab7cf411a85805cf368cafd0849ef5ea3a064ae13243670c5de8819f9185c94e6c3088acd15d589a2d2ece33e103ae
-EBUILD libebml-1.3.9.ebuild 594 BLAKE2B f6d165e999ba2127e529b26077f532c64d110d0fb481408f6be06733f573ce401f4e622d2fcd13fdda75343b84f5cde6cd962fa131f6b3bc73d930c9a0714395 SHA512 7a8f357385c3169cf83e4364f31067e6bbdd827303042412a792a921ff8be8fd8b758847202b47aaa0f611721301ebffc9eca8ad3c2bb80dd37ba9d8edc251dc
-EBUILD libebml-1.4.0.ebuild 594 BLAKE2B b83fcefa006b8d180ad9556ab51a4a3c623df1608dba85f70b4004ea6bf47b6372c724c27bace7c1aa72d71a5875dd25daa1eb61ea9afc672bac9f617173edca SHA512 74cfaa253181ad4bd3b261fcaeeca70512b0d7a23df344fe63ea92dfba6f78bf3acdbda15c3f4e704f8ac91f97b9881c850bd40c6912f402bc1b97b81aee6e9b
-EBUILD libebml-1.4.1.ebuild 590 BLAKE2B 7620d314df2222094c2356142fb93a2944c1b21595d09e5b382bd0ac24922369db1b8161634de11a7a53ddeb4f94bc3ccda7c15252b7e876221be8ceb5cefe57 SHA512 6d26aaadfe821c31d9a9daf07b83815156cf31f4dcc6a38a2a1b6690c3e34475683c78b92137872244114f4a8b21697ffb68c9b05068d4877a3accfd58581c90
+DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
+EBUILD libebml-1.4.2.ebuild 590 BLAKE2B 7620d314df2222094c2356142fb93a2944c1b21595d09e5b382bd0ac24922369db1b8161634de11a7a53ddeb4f94bc3ccda7c15252b7e876221be8ceb5cefe57 SHA512 6d26aaadfe821c31d9a9daf07b83815156cf31f4dcc6a38a2a1b6690c3e34475683c78b92137872244114f4a8b21697ffb68c9b05068d4877a3accfd58581c90
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.10.ebuild b/dev-libs/libebml/libebml-1.3.10.ebuild
deleted file mode 100644
index dbb462d75acb..000000000000
--- a/dev-libs/libebml/libebml-1.3.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extensible binary format library (kinda like XML)"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake_src_configure
-}
diff --git a/dev-libs/libebml/libebml-1.3.9.ebuild b/dev-libs/libebml/libebml-1.3.9.ebuild
deleted file mode 100644
index 9167d401fe7a..000000000000
--- a/dev-libs/libebml/libebml-1.3.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extensible binary format library (kinda like XML)"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake_src_configure
-}
diff --git a/dev-libs/libebml/libebml-1.4.0.ebuild b/dev-libs/libebml/libebml-1.4.0.ebuild
deleted file mode 100644
index 02e999ad1c84..000000000000
--- a/dev-libs/libebml/libebml-1.4.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extensible binary format library (kinda like XML)"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake_src_configure
-}
diff --git a/dev-libs/libebml/libebml-1.4.1.ebuild b/dev-libs/libebml/libebml-1.4.2.ebuild
index be4140b75697..be4140b75697 100644
--- a/dev-libs/libebml/libebml-1.4.1.ebuild
+++ b/dev-libs/libebml/libebml-1.4.2.ebuild
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 0ee983dd5f6c..19d3b2b9f688 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,7 +4,9 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
 DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
-EBUILD libgcrypt-1.8.6.ebuild 2305 BLAKE2B 54b27480c598a2c43a618208ea3c36adb458d471cfa5ec74bb118cfe8047342a5bcd0515c42e7b7379f9f689f2f967147672ba3fc70d811a044d75582fee2085 SHA512 ce11a1cb68d57067b0365ece1f837bea23f3b421646fdc98675a8cc8afbaf3aa8aecfe05bac6e0099a3b22e7045aba16b2d26016c1be5370f44927f882e6a6a8
-EBUILD libgcrypt-1.8.7.ebuild 2314 BLAKE2B 75f2be613a43bac7d4aad315dbc557814be8c1e06a841433ab0e4eb3d90c15236df92b9e9412fe2c59e5f5578681ff4712637aaa2232ff4ad02053bc7e1fe216 SHA512 c8cd40b09d2c2f328e3b8dd8ee151336a3578d5cd23d5e650948f944731e8d5fe6e74ac6a26d3623514bfa981ed9fb57cde3b841c44816736ec7f1d7b03a46bc
-EBUILD libgcrypt-1.9.1-r1.ebuild 2895 BLAKE2B 0629e28a6ecec4aaad53c1e185e9d256e4c5b89f898e88edf74d23d4d5e530343a53f0be8832a6715034407d98189a29f9b671ede56c6f5f3edba2ec7fbed218 SHA512 85f09b35a40bf7399a7668ec7d1c2f426d0775119b5ef973db8c8ee117586faf120bc174ce04d3cf44c85025a66c2d34804fb930499fc4dc0ffe2134d606eaa4
+DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
+EBUILD libgcrypt-1.8.6.ebuild 2306 BLAKE2B 0430932adb2cdd898c6dc95d54027360a412d31344467bb9798d156414da65813a6f99b5e1601a95f8a3d5394febdcead90b6e61bba5d5c7bb88689c283d8ed3 SHA512 a9b9fa4c02560843ff46a97f275693331df1b3d7cfc25e011ad36114294bca1c994985c0ee0b375c1685e1b2fc820351671107d7aa1eaa21c99c24c9832b7137
+EBUILD libgcrypt-1.8.7.ebuild 2315 BLAKE2B 91d3ccac5c4d422185742831f570befa6cc60125ceb33e33a9dbd334b7badd518152ebcdafdda083f1e051ce6c8e3a412874ea05d4e48aac0c5860d312324095 SHA512 28befd141be1ec44bbaa9430cfc279df5eab27573dfd15c6dc58387d1677d20a08cf3ea13c7eb110345f1aaee5328c49c6117a6b43e2902d72d8595a228d6a9f
+EBUILD libgcrypt-1.9.1-r1.ebuild 2896 BLAKE2B 450a6eabffe65b2d7cac0f8e0495c9ff63ea041c3f7227bbcf729326d45ce57529f1cddcd4514a5533163fc10e2b1dc4edd612a7ce4f2d067ad404f53334cb0d SHA512 0d3c07a5893db2941d7c33c1f5465e5e04c62a7e0d457bc8143b4beb9a4afc8d53ff32166072837e56d2d941c1b7eb52a71a91ebc0d8831776530473a15cf736
+EBUILD libgcrypt-1.9.2.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 MISC metadata.xml 484 BLAKE2B 3e077dd32170cc7cec14a9b68ae2565d6eadb1e78566fc6462ca16e07cb20de6f058de037887654c3269160c069561c30c1c90e432c355663e6008741e1099c9 SHA512 0b8ff0cda84bf73068a89ab4164b164a34161146a6aeac73cfd4baf2420f41f3b352b3e80a1668f28c7221732f06e8366fffd806c53854ecf6e64c06fc7d3b9b
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index 24d222652292..4a892f63e455 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index 6439664874b0..ecface3601d1 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild
index 952a5816824a..8ba8d90c7b23 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild
new file mode 100644
index 000000000000..584154b6ff2d
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+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"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index d9d6da485ee8..9b80d77b3e72 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -4,7 +4,7 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca913
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
-EBUILD libgpg-error-1.38.ebuild 2149 BLAKE2B b9387021b77ca43f4ace6802ef72ddf9b9bea42f982d7909e301ce7d384381e17b69027803e9fe3e36eef1b005215cabafdc2af5202eceaf9316ef98c362a302 SHA512 84d751d5bd32a91c5b50da37f9731d78b8955f0425567dca519909261d4a32fa795e8514feb100ac29f99744ff60b2e4376e3afcdd19b636d6bb32dfbc0354a8
-EBUILD libgpg-error-1.39.ebuild 1721 BLAKE2B 8802c5a160ec5d1d69c9180a3e0b9c412b909a4ba7459d26201b26341f467c0b9dae8cfec3442d75ad17c7e9e4df9d3c97bcb78cdaf82f838769ee0b802d4d14 SHA512 18744632caf6912dedf8c679c44a4f2aeee14300a7a54331883f3b64b88dc32840886bfc7e4c6735e96bcf7ae97ac55da603a3d2da65adf0d5965aab1e67e6a7
-EBUILD libgpg-error-1.41.ebuild 1873 BLAKE2B b0126cb56912b6c278444fa54d538fba663374cb5b67d0a68dbedfa0d6375e9df462fe507d3e57f2ec85566f90e7ef2f9769db022ee1c63be1a081b728de00b5 SHA512 ada3db63bbbdd9daab8880c11ba840838c0677af238587e9af522c809a1f16a38af525420d13d2faeb0d49be65edc26f692fae5c44c32dab0e731f5382a7a671
+EBUILD libgpg-error-1.38.ebuild 2150 BLAKE2B 912412e589136e6b537967940954c084339726c43700f4dff5a5bb69e0792fe6a0b8832339ad81aa2df44555d7f95bdac7ad1e9a3b79ed9df9818bcad5d2aa42 SHA512 a301494ab2e81d6e94a6134124b047f1fbf37e448f1b141ea97d6c1bfbaab29b2b168fecaea683c63b42393626cd8487ac0aa2a9e26e6a5d4d5e5afc22846440
+EBUILD libgpg-error-1.39.ebuild 1722 BLAKE2B 4bfb541b61ec0b52d760b7ed80115c388754f2540d5256374409646dd26ab0377d899cfa2aba566f625006529c8b7ff3900c93bd50f342cf1936f0d09493ae72 SHA512 e82c9f0af8be9838e873b84260d7bbec05dd427763d5d22add627a5f3ca4d2f937a55e142e9a84349603aa284b75b683e33d922b01a12a387c99031e621f6027
+EBUILD libgpg-error-1.41.ebuild 1874 BLAKE2B 3ac41aac960f6e82388ab269a4c2eb29f34640d799dacc49efd648f9077ad0d84ca83510661001397f3a23c66513a6171955b8874ef95100c62a4b8787f2bc92 SHA512 be25c1a8e12ad3a2c0af586375096ad0a0f8b7fa14fa6f03b47e914c6345a62fcded6f0538329777ebc5b678cce39ae8806311ec7c4d610aac11ea8d737a0ed9
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index c9b2c8a370d6..d37b93f1d197 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools libtool multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
 	https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh"
 
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
index a81e613e54d0..548ddb2954c2 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools libtool multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index 3c43d99cb3ac..c6202ddd30fc 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools libtool multilib-minimal toolchain-funcs prefix
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 5be74b0a0b07..c0d60e93e6ba 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,5 @@
 DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
 EBUILD libgusb-0.3.3.ebuild 1477 BLAKE2B 1384a0af7a44ab3ecd9c18aac872719e77c2a0b785045d1f58002d1187735dcfb1ca1fd209a64ab05e28ab8ff194cd2d3dc566dd07eb27fc91c51ac69f6d8c5c SHA512 973501c489c7b109fa5c42ae1608ac396ba4677c06ee001c99f637ff98652dd8f3748fc4b2f967cb2550ba322f540e801386573271ef2512445f429eeeea8467
-EBUILD libgusb-0.3.5.ebuild 1693 BLAKE2B 161b3dcf44ec83f4791228b3a924b5c821d1d988715aac747de2f8f53e37393d6d5a53f74f488e6bc79dfea5ef861500bc390f4c769c7c400d9a5196d31312d0 SHA512 7ee93ea4e6aad73a94e40086d19396e4e97e06de60b16a1d5e9b237a18731a3926a1426ec2a063dcd0f9a073e69cec185080020fe3c4364aeb1df74819fd5bc7
+EBUILD libgusb-0.3.5.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild
index 3d42d69fb362..2288ee798781 100644
--- a/dev-libs/libgusb/libgusb-0.3.5.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson multilib-minimal python-any-r1 vala
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 68918f98c29a..2ffb6ff1f07e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,7 @@
 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
-EBUILD libinput-1.16.4.ebuild 2236 BLAKE2B 3b359cb3a754e7a1f60283f2299f4aabdc357c46677df356415f6bb8185426696aae534bdfa970c6ebb4b913ea28fe7b1e118493cd5fdd42f48fdd61aa2d44c8 SHA512 9148fd4bbfa088a54aa678f1695be586d5bb53d255c3e20cded31a2c8192ff3f4136036658bbde3d1d6dd2f76eeac1ea6f7e0675b709974581f58071350656c5
+DIST libinput-1.16.5.tar.xz 595000 BLAKE2B c325aac47a73992232cf7905935bb6ef0ace89d6e4e8d64feff3fcdde3aa9acb6c1470a07cc89430bfecf52df62a37617ced1cf5f05435eefa1902ee85e20a0e SHA512 b2fdd87375cbd5b212f76cefedfaa146966dde1d5e5d566beadd3167749dc3667214946178b157fa4b44360dc6b86a25ffb0356049cdf5a57d0fa2b8e3fcb1e9
+DIST libinput-1.17.0.tar.xz 612004 BLAKE2B 035b85115917804c032a4b0629b4cfee29513beff6cf84921d95d3f9d09d5f55574e1088256f72e271dbb6508b66c6a7271cf07be572a402e6c9ef02f075591f SHA512 490c7e59cbaa43e4190dbc421582dca887b6ae92304c4f8f3ea9df515bd76de41ca9a376e6f1cfe7b235dd2d5d8d8ef5982f5ddcf958e3b31b981e9440bb0888
+EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
+EBUILD libinput-1.16.5.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
+EBUILD libinput-1.17.0.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild
index abcaeae1dc4b..66c9079fcdc3 100644
--- a/dev-libs/libinput/libinput-1.16.4.ebuild
+++ b/dev-libs/libinput/libinput-1.16.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-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 meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.16.5.ebuild b/dev-libs/libinput/libinput-1.16.5.ebuild
new file mode 100644
index 000000000000..610b570961f9
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.16.5.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/libinput/libinput-1.17.0.ebuild b/dev-libs/libinput/libinput-1.17.0.ebuild
new file mode 100644
index 000000000000..610b570961f9
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.17.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/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 474ccaac6fff..e4633c383b7f 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,5 @@
 DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
+DIST libisoburn-1.5.4.tar.gz 1623904 BLAKE2B 3bb6ba88ad0422e1f3fbefdadb60231ea338a6bb8f39087fd25d58d68a4603c445d5d02b54c0a69897c321b4620f2ceb46eb8899552d2486e579a34f345a9d7f SHA512 5fc8532a13caf6caa5a0711753ca99ee2b3f4d5e2db9b3ed2aeef76714e3ae6de6d9c2db0d8297c0d749c42c5ab84fe92989751d8da24d41457b98656eb1bd86
 EBUILD libisoburn-1.5.2.ebuild 1833 BLAKE2B ac256b90ba3b81d78cdc0d06f02454203b1a961616e5c00820f1092a3021be875c96e79f2eb0c642a21c6ed4ca1e7d1c0a3ae962ae78d6ec30ee4f6bcb6c1cab SHA512 a8e7d0e64616cbafcda65ccbb59977270beabc0c0042a3ad8af4ce7af40896c625c4050ba4a6332139f7c9b7da494013e511ce0ef877665d7138b2ba385c3965
+EBUILD libisoburn-1.5.4.ebuild 1840 BLAKE2B 3dedf53dd455696e9c5533a5e626638b3593418f2001d5754d2a76faa6da216acf682a9ab8a0461480427cb959a518792577ce0f9c15103481c3311570fd2050 SHA512 6af321a3a264b83eb7c5aa22a4b9a01dafa9b0108e9870e5d5f51307cea29084f07dc8a4782fbd4d25c9b53cfe7361d02e9451d8c0ea5df588e97f8ea2ae2eb6
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
new file mode 100644
index 000000000000..d2b83150fa03
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug external-filters external-filters-setuid frontend-optional
+	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libburn-1.5.4
+	>=dev-libs/libisofs-1.5.4
+	readline? ( sys-libs/readline:0= )
+	!readline? ( libedit? ( dev-libs/libedit ) )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(usex readline --disable-libedit $(use_enable libedit)) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	docinto frontend
+	dodoc frontend/README-tcltk
+	docinto xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 46727f7f51e9..6d8c6cef60f4 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,5 @@
 DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
+DIST libisofs-1.5.4.tar.gz 870395 BLAKE2B 2cb9d247219c368e9808dbb2b7bcbe22829e78683a6dc6d8a182b54ebfe6d8c8a082990179b784f891fc79f2ed4830f09dd43c64bfdce60cbff6c34fae2150e7 SHA512 a06e834e81081358478cdd27d1dcc6f3bb52ffd2ea57ade59f3ff2f69868fb6886a0b38fd1580d24295b7ed936ac471f107df64d62c1ff42b57dd8ce0810e3f2
 EBUILD libisofs-1.5.2.ebuild 960 BLAKE2B 2484974ebec23a28c2dd5308c671a90a3f6ddad3aa85175796bf50118e1537be24cbcedff6c450ab2ce71ec39eebfa895d2b25518e4ae863029a501b5351289a SHA512 a8b19668e891970ce4e5b77f57ede6f8d9b8d718908098874de505208a86dc4dc2ccba51e6eddddb5d1bbe1da28cd1f0f1e9bd39d8e4041c60b8d3f6e8a8fc1a
+EBUILD libisofs-1.5.4.ebuild 967 BLAKE2B 1e6a27109539084cc10dbb69935942c803d09a4721ff38130ee01852dbc9027cd5c5f88e7a2ef17be6438698920cdbbda5b243317c2e540ad65609fef9684e2d SHA512 038891c2355d326864c622ef0e193735eab26bdd6f6bda8261fc7b4bf3cc1eb483926cc7adcd4253b732a90e4d99819d9b3db70a2a62606de2d8810a20b9d356
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.4.ebuild b/dev-libs/libisofs/libisofs-1.5.4.ebuild
new file mode 100644
index 000000000000..9260b375ebe6
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.5.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable debug) \
+	$(use_enable verbose-debug) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	--disable-ldconfig-at-install
+}
+
+src_install() {
+	default
+
+	dodoc Roadmap doc/{*.txt,Tutorial}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 0acedaf488ca..b4ffa9f3e3a4 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -4,6 +4,6 @@ DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b
 DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a
 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
 EBUILD libjcat-0.1.4.ebuild 1502 BLAKE2B 8818aae450ccb38e1bd1dc0d43fc6932a0fd3713dcdf1aac649980dd1958c8aa7a1103642a672cbac0e9cf29153ce12fc67961764704c9bc3d16c642d6a9024c SHA512 f4257592f032bb21b7213a98a14ebddde72d3dd09a25147fdbe9980cb6d890d6833fac0f47d5b683493de910f5db2347cda7abf1f32f6d2ab55f2467e08d6e95
-EBUILD libjcat-0.1.5.ebuild 1447 BLAKE2B 1d6aff273853d5e0230d7bfe2ecbae6995347b4fb42dcead92e6283729950fe56d0ff3efb553cc8549b83794cc4da6a079f6e6d7267645b1eae38422350abd24 SHA512 b4ac09789f0113d3f8d6fb09656f8d16778eaaa252053c77a3813c07aca6a2f27261aac6e933d73f084d8f0a203c4d7d29f1909f67ac90f98c507f07e2d30b50
+EBUILD libjcat-0.1.5.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
 EBUILD libjcat-0.1.6.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
-MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
+MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild
index 143d6be4ab90..bada11c0c7e3 100644
--- a/dev-libs/libjcat/libjcat-0.1.5.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml
index c32b3c52e6e2..ab3326b56e48 100644
--- a/dev-libs/libjcat/metadata.xml
+++ b/dev-libs/libjcat/metadata.xml
@@ -18,7 +18,6 @@
 	</longdescription>
 	<use>
 		<flag name="gpg">Enable GPG verification support via <pkg>app-crypt/gpgme</pkg></flag>
-		<flag name="man">Generate and install man pages</flag>
 		<flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
 	</use>
 	<upstream>
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index c9deaeb6d128..d7486f03687b 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,5 +1,5 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
 DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
 EBUILD liblzw-0.2-r1.ebuild 475 BLAKE2B feb1b5ff6c6a9e16cab04c92114682be0e44fda1eb0c4a0d6180d35afdeabdae6083e81c13d23ff0d86d7829bac409d919f38ee222cc1c5c80889dafa97f63a5 SHA512 8ad04869d1d2ed550f6d85f5d24187dff06276abe4af086eecd7dc9755c2a85c6dd34e1da6f8f895d76bb4af810e03fdb90f3c31af6edc28cacf4996b689e5de
-EBUILD liblzw-0.3.ebuild 542 BLAKE2B e8c7305dada21f74e825d192935e8f8b668af5e54aa616f5b5940eb60ab0226ab55e8f2224049fbcfad3406e1ce21803d4a380e275aa9f305def829ef12ce1fa SHA512 a0c323c35e2544ac40ea4be2ebac1b0f0087e7e281bd1968743a2c619faa71bbceeaa4394bcc38c414594fc28f19a17e1c2d58eead573a46bf9fb239338a648b
+EBUILD liblzw-0.3.ebuild 555 BLAKE2B c52e24798c330849f4554f5b29d6023fb7dde6eb629f331320a809ae2e3e027ac10f0de228cb13d085e20ed9395fde594b5da90bdf3804f49dd8500e9aefada0 SHA512 c86074f950ec5e3d26f7e568ddeaa4d3f88bd24a94f83b289ca1ee83f9b07868178abc08284449f32507c05495b3ef3c2ede29536656e25e38e6159f0f16e388
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.3.ebuild b/dev-libs/liblzw/liblzw-0.3.ebuild
index ffb0f9291ca1..2526a2476407 100644
--- a/dev-libs/liblzw/liblzw-0.3.ebuild
+++ b/dev-libs/liblzw/liblzw-0.3.ebuild
@@ -10,10 +10,10 @@ SRC_URI="https://github.com/vapier/liblzw/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~x86"
-IUSE="static"
+IUSE="static-libs"
 
 src_configure() {
-	econf --disable-werror $(use_enable static)
+	econf --disable-werror $(use_enable static{-libs,})
 }
 
 src_install() {
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index b5577612951b..a7f89d254748 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,8 @@
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
 DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432
+DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 EBUILD libmaxminddb-1.4.3.ebuild 627 BLAKE2B ec59a52f9ddffb0faa9ab6a33416905cfa1f13dbbfaf62fb870c248e671772bdc07bf3b93c3236f582d29224782b03a8c75b951af17af9960dc344ab583d6469 SHA512 c41b3a52fef686e2652538711f40f05467239df7915ed2cdc5aba6968891764ce3b41a82b03452077e99c4ad0a746dbc3bc5e956f0a6846f5af0752ed9ef1c5a
 EBUILD libmaxminddb-1.5.0-r1.ebuild 672 BLAKE2B c315939f56ca0795e3b82e087fb94d422b1ae2a1bfadeeee0104f0edd09c81fbf77f56e22c0caabeb45f12c557abba6e4fe9e2dd292af238a4123d62e51a35c0 SHA512 a60002797d17cad41d731ab210d6c87f4b71c530693118142a520cc4a43d67ed23397352b063f41a11287e623ddaee294689d6d22a18f80302eb1dc01f60f86c
+EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
 EBUILD libmaxminddb-9999.ebuild 622 BLAKE2B dcaca8ba54d66b52229e8ab3b0d64c92a4a4be70e6b130cdae77ad131f6b60a056336e64b5d494542d4c8003c32a2381549d8688640bee9c89d142d70955cf64 SHA512 311ebe39f56c5a159504636d91d791f7058ebc263ea879843eeea648e562b5e8aa55b2d42721a37e4b550d49cf41fa99bce4361054ed58df481f1bf01505bd56
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.2.ebuild
new file mode 100644
index 000000000000..06edfc8d0843
--- /dev/null
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.0.7"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-perl/IPC-Run3 )"
+
+DOCS=( Changes.md )
+
+src_configure() {
+	econf --disable-static
+	tc-export AR CC
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index d72cecf55db3..d2972bc72cb3 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,6 +3,6 @@ DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
 EBUILD libofx-0.10.0.ebuild 1140 BLAKE2B 9afd641e07b3f052c83296611ecdebcb335c20e1fa7b0dcccbb6d9129bb154caeacdbc3858b6224a454c668d4034a431ddadc2d28076bd7e50536731262a9904 SHA512 dccb49c1e6b018c086cee1bf22f1b6a791bb6208fc65987eb141e9c9e563f6a24db3c7b915c760f924ecbc2f1c56c23f10fd827f210e7d25c95cf0b411adca5d
-EBUILD libofx-0.10.1.ebuild 1139 BLAKE2B ce0b6add11e48fb4edc08adc1d56b6974a59db3a7014dcb67948c61fb82de3d28505bbc07d8ed9bd5e0b0d3d92cea9b8c5523497c7519bf621da340ab74e692c SHA512 371bd2461f295ce466aa47c1e8a7349b26366751949de08f0db045915e7d6a582542fafd6c4770d7d5e3a4c3b8a5645a1740305fc54ae45be4609361fcd8f49d
+EBUILD libofx-0.10.1-r1.ebuild 1156 BLAKE2B 0d79282546b28500d40840514f973adbe56bd3f0b3e16318b74815a9331dfeeb1a3b74ef0763c9736cf4ff9a1a9f2d7c0c5e0907f8ace237512259d2d686323a SHA512 a0f1eb2b8878266d962a01d3650f8e5f9274b18c242f615a8fdf9a1aaf5c81e43dafd8af0dd2fe4fe8c64168273aa88911feb93191bf0acda9b87a8c9272f572
 EBUILD libofx-0.9.15.ebuild 1037 BLAKE2B e8dfb36676b66ea17433f2a5320c74946f42def29eb972668dc388b58f4b25bcd410e57efcbf61b7a860a35d652ece28f955ec41a38f5dc41538b1623f03189f SHA512 9c18d1650b0c2ff2cc822dae6de12d64d2315cf489669df5c8cce8547eacc61ab700a1d530fa81dc3e900dcef90fb3277deba661873b7e4170d2c8fa082870e9
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.10.1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
index 1b4d6cf7be8e..0db669fdea8e 100644
--- a/dev-libs/libofx/libofx-0.10.1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1-r1.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="test"
 RESTRICT="!test? ( test )"
 
@@ -23,6 +23,7 @@ BDEPEND="
 "
 RDEPEND="
 	>app-text/opensp-1.5
+	app-text/openjade
 	>=dev-cpp/libxmlpp-2.40.1:2.6
 	>=net-misc/curl-7.9.7
 	virtual/libiconv
@@ -37,8 +38,10 @@ src_prepare() {
 	# Use correct location for docs
 	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
 
+	# bug #566456
+	append-cxxflags -std=c++14
+
 	eautoreconf
-	append-cxxflags -std=c++14 # bug #566456
 }
 
 src_configure() {
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 06585f19034a..ade749fe8941 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,6 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r2.ebuild 1604 BLAKE2B 7413e1821afbee9e6f7e671d3841a5261804c493a1e9fbf30e889c09a9581eb962e2e97669095fcd19c04b2ec81286010e213ba5cc94d0a65fec19374757494c SHA512 20004b9e395a5a2f6cf7935affd1e020531c45a7831c6581818b94d45f01dea83be3ba412591c2d4a470a8b9d28d47e904a2e2ad33081e2cc6fa3e05189979df
-EBUILD liboil-0.3.17-r3.ebuild 1749 BLAKE2B c752870927d8ef64a8843b9cc69cfb2600b390d3e372cc86c78ebb2a4ba7c9045e59731ebb98b9a2540f55c8b9dbf6a467b25a1693062a8097c53e439bfde01a SHA512 6fc93f64590b737a0ad0dfd085007d126e6d4bb09520629e9aaf18d3d2b4c39cd673b3daa9a10b4da964b19d7396cafc73a4510156a36821d0c1e1fd0188a4d8
+EBUILD liboil-0.3.17-r3.ebuild 1745 BLAKE2B fbea1004b30ef54222e46199ad6327993627ff66ba081b694b99ea17053f24ac93ea8c4333ea9b32d5b6a51e226c30908e35278756b2a981d6d9bb3180a66e09 SHA512 cdf065a30a8cdc71fdcb5bbcf26891949e6031e21067bf6abeeb67d65093c2f35b849d35ec46266f36665ef2f1bde4f903638ef74bb07f32dc34f37596ed0402
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
deleted file mode 100644
index d46aa0f41d0a..000000000000
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib autotools-multilib
-
-DESCRIPTION="Library of simple functions that are optimized for various CPUs"
-HOMEPAGE="https://liboil.freedesktop.org/"
-SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="examples? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-DOCS=( AUTHORS BUG-REPORTING HACKING NEWS README )
-
-src_prepare() {
-	if ! use examples; then
-		sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	if ! use test; then
-		sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	epatch "${FILESDIR}/${P}-amd64-cpuid.patch"
-	has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-0.3.17-x32.patch
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-
-	# For use with Clang, which is the only compiler on OSX, bug #576646
-	[[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions
-
-	autotools-multilib_src_configure
-}
-
-pkg_postinst() {
-	if ! use examples; then
-		ewarn "You have disabled examples USE flag. Beware that upstream might"
-		ewarn "want the output of some utilities that are only built with"
-		ewarn "USE='examples' if you report bugs to them."
-	fi
-}
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
index d31a433f0e08..35619ad3a606 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 51d20567d29e..d84ae8edabc4 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,6 +1,8 @@
 DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
+DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
 EBUILD libpcre2-10.35.ebuild 2509 BLAKE2B 3c553f0620a2edd6ef5b812b29f09e1775c924eb469d2d2e182be74858a78e6036ccc45c681d14c78e55102dd72a377be3231d5220b7767b5d00dbb9723652f6 SHA512 257bae0550c2f750b00e68f829bdbb245f596cbe39e74c871167f704874e03ac3976c4378947acb7eaa424f355eaee79537cc121c46e93b43896dd39ea210d55
+EBUILD libpcre2-10.36-r1.ebuild 2518 BLAKE2B 85544807e037c63e7fd8542f9f31cad99303cee1772f3e0efb154ec490cbff9ca900e59ca7ac0e1904b5b34563a8f854955ddec2536fbc3f94fd5b83b5877d9a SHA512 169ff5b447a212aba4567f9ba8e3c9f66ee641b6812f3ffd6b444728ca968bc1a8d4086af151c8c003689555ec004f268e0fdba637b0bf9d2256e27fb6fd5e1d
 EBUILD libpcre2-10.36.ebuild 2518 BLAKE2B fa8f19945df570d515d34566d40a6fd85160bd5edb7be699f486d6d0d4c2e20e3725e37321cfc7ef4e936e69196ba0ae5cb06f84598b5b3eb733a81056db35b5 SHA512 9cf1d48a14904b3d4fa4e5b3cfaf2c0d7edc58c19c47647f50b4d25011e99520d1aeb6755187d95ca46d01a9a18874c90201b1b5cbf5357f563b017708d64b00
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
new file mode 100644
index 000000000000..b4562da19092
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+BDEPEND="
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
+
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 709f816ddb21..9ea0ae7b97dc 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,3 +1,5 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
-EBUILD libpfm-4.10.1-r1.ebuild 938 BLAKE2B a57f15b153b0c398c04567f3bce545b72f8d59c9643effe8589dabe4c2756489f53caf846c01780d60ed49fd8e249b4860cab99bb880a89710461756d680e022 SHA512 36e56b878cd1674914d3ee10f8d848187547b56b739faaf2515500187b76249340daafb790686affb38436568436ad12623e8d0e442e7dfca67846b225a3dabf
+DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
+EBUILD libpfm-4.10.1-r1.ebuild 898 BLAKE2B 5f6ea6c7e7e0620ab1dfe1c55630537500f1e70e479311b37d7c1a63518abadc324d664c394c6f87382462974bd0600bb532f43322989dbc2d916fc55316c528 SHA512 91fc7332530d754b3f6a9644df4b69c8cc49f60781a68fc83f5f45cb530722876884398b6cbc3a0ede8a1cd684db481fe1778d77819309f257a74420182b8b6d
+EBUILD libpfm-4.11.0.ebuild 957 BLAKE2B 8e5b3c7a2f1690d376fdf3c0f775b3550258a1c8549009244265b4aea3a17905a3035729e49f20d869e33750d515bb956cf048009cc4a364278401740173b915 SHA512 85d97627cb4ec14b4635160037bde3431384912440da73a8fd41a5b18327b2c4fd62b62aa89881e03d09b35c8650834b3f6a4a18e6fa5e01909808859b8d4de4
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index c99c4ffbcb76..faac7cd052bc 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Hardware-based performance monitoring interface for Linux"
 HOMEPAGE="http://perfmon2.sourceforge.net"
@@ -14,9 +14,6 @@ SLOT="0/4"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_prepare() {
 	default
 
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
new file mode 100644
index 000000000000..b6483a94ff57
--- /dev/null
+++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hardware-based performance monitoring interface for Linux"
+HOMEPAGE="http://perfmon2.sourceforge.net"
+SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
+		-i lib/Makefile || die
+	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
+		-i config.mk || die
+}
+
+src_compile() {
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake AR=$(tc-getAR) CC=$(tc-getCC) DBG=
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install
+	dodoc README
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 996f8f33f8c1..86808453ab6f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -3,9 +3,11 @@ DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12
 DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
 DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
 DIST librdkafka-1.6.0.tar.gz 2909665 BLAKE2B 64b9098531febc0c4b06ce8d6d6cc65b9895cda9b40c9d9fd8b70d5febbb2c851856fb71a355d606074dae9e026277da5e65d0e9ed44a3dfd76b2b55cc142651 SHA512 b58d701f71342eb2c29ecd5aa0514af351b5a5d2282768e034b5995300fcbe2c416d6b4e15dfaddaacf2ec3b7571a320bf5356ade3fe33598d3f05f99f6553ba
+DIST librdkafka-1.6.1.tar.gz 2920909 BLAKE2B 03d949319b022bc933a9b816660f87498cf9df460f41c65f08e5f6aa22cf5766974f4abe5fe0078054a21df45cc0b46f30383ce83743348fd3124e3b9ffed7f5 SHA512 19f64f275c7cd1c60f026a466c79021549e4acced60e6c01b364944ddb2f4a2c0784ab35031275c406b638a14b958c6f904177e51e2fcb4d058c541d046677dc
 EBUILD librdkafka-1.4.4.ebuild 1653 BLAKE2B 2f0a5d2b1df78f090be40b06b8213483729e7d74c44a942b43e0134c27b3d467bc89530ffb87ee47c88094ff14f7a117475e8e6998ac0a3d04f63519624fed56 SHA512 750ca1610433a16dc37b65a07461250b93a3865ba6138f37c9b4c552d9796398d7285be8671dd121f7f41921c6f5789fda61e232a6fe246f2799005bc80a45c3
 EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B 724f4a450169857f2c9ad04440addccacacc46d6bcfa498ef7093c334b0abad82368d6d09cf15f74fd0df94bd849f77f5ee7da9bf06d0a4aa21a68f989849009 SHA512 dcf76e5a372dbda89f265b8c76ea6bf35a7defaf5164e16e38b3fc7be69a696906649b76f659ae489a6bc12b1d5b600783e2b1589a493668eeb63a4731cec598
 EBUILD librdkafka-1.6.0.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
+EBUILD librdkafka-1.6.1.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054ac5cda331174f84f3f4f876d8b83a2b61a72b894e27bde6e1ed7aa2662abdb2db51e89403aa52c4fb9ff870c47f06 SHA512 47476bdd7939cf218e1a989ea4520114d6fd935d557e3f5f2f992d00d68d2988f56470ca422a2e0b73856d5d3d0de95db01911f2d62453e73730215bd5a91995
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.6.1.ebuild b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
new file mode 100644
index 000000000000..01faa8bf266f
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 57d82440cba6..1644153c24f0 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,7 +1,9 @@
 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 1416 BLAKE2B aca590fa173f88c56cf1b168f5c1a7bea15a63ffd69d8bc302257bfae757eba7bc44aa2c019498cc79bf20c444f1bee9b7efbf7c9d80e545662c79235b11cb43 SHA512 4c15ae66a01a19612e0ad4e4c103e777126f030006c3594de03018b71816f3b68be4285273a508ed47e616872559502045b4516b3bbf6369c7caee886c341295
 EBUILD librelp-1.7.0.ebuild 1462 BLAKE2B f4a137aca0d0748f1ed7af47f52e090328ecd2beb93eb4b83797eca8c1a7993cfe8359c32c78ead5835815c5891b27d8bd0f27f78ecc520f71676c56cb7b48be SHA512 03a52540b764e8f99e147da66dc23bf217c163a1c8142afdabbe2396b38e43f79cc8ea6a82a49cc34bb67ba62c98b65cc4ea368b6a235737abc3085fa6f6c9fe
 EBUILD librelp-1.8.0.ebuild 1414 BLAKE2B be0b5f4d3f5053cef401c7a4936c79a7d90771c9ececd0b47691bb6b30837957023efb653c8b979fa86e1b49a47be8f76eaeefcb10deec31e3531aa42eebf80f SHA512 cdcf026ddc2dd96c75452a9191858cde26896e1acf09c797f0dae15ea861bb99f81180bd49e2bc12a9c39f173744eadc33aa5906b5dc522aef46ba18d2ac1989
 EBUILD librelp-1.9.0.ebuild 1414 BLAKE2B be0b5f4d3f5053cef401c7a4936c79a7d90771c9ececd0b47691bb6b30837957023efb653c8b979fa86e1b49a47be8f76eaeefcb10deec31e3531aa42eebf80f SHA512 cdcf026ddc2dd96c75452a9191858cde26896e1acf09c797f0dae15ea861bb99f81180bd49e2bc12a9c39f173744eadc33aa5906b5dc522aef46ba18d2ac1989
diff --git a/dev-libs/librelp/librelp-1.10.0.ebuild b/dev-libs/librelp/librelp-1.10.0.ebuild
new file mode 100644
index 000000000000..c93e6e68ef55
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.10.0.ebuild
@@ -0,0 +1,74 @@
+# 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-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.1"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
+
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl: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/libretls/Manifest b/dev-libs/libretls/Manifest
index 7e7e93196421..22f7c380d03d 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,3 @@
 DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
-EBUILD libretls-3.3.1-r1.ebuild 674 BLAKE2B 050bec311e70765e2adda7f26083ebb39056b79388f865cce02751d5df7a12bbb6f1b77c33928331261e879e04c2f9cab32d64b6d28c96a96813a93944527a20 SHA512 a9f9282ec7fb93b1879d0c4e9a64e05c4d68d01974fc1f1b465abdde19654f3b33d79fa41d8b13061bac69a722d7add02d167c7a381311008f51957f146e47cd
+EBUILD libretls-3.3.1-r1.ebuild 680 BLAKE2B f59e32ccb7244e16cf54d5908748c513c474d9468996f1ef0052822653e77cb485b88ff8e8b8af8cb64bbb38920908a276e48df2653a527c6724dc6208934bc3 SHA512 f378ad47ed974fe36ab42653b1f02a88d62bcf16d6bd0a6f8548eac592ba10a677ca8a9095b37a57292095cd095aff586d962187d3bacc95f8674d1feb54a8a5
 MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
index 2c0169fa8b56..8b3cb0e92b3f 100644
--- a/dev-libs/libretls/libretls-3.3.1-r1.ebuild
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 12f1032014b0..09db209f2367 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.3-r1.ebuild 1228 BLAKE2B dd67b5a8f5302d9c589900e99af55cd2176fb8c4827cb2683e115b13c156d1d1303a6131c62742479fa6a87ed82b9f11fcd3fef60ff638a0f9538b218f1a6953 SHA512 795f76c810e20b2cd76597288a86ceb8ae30f05263d63d1001adca0b88d5d9e0abb98c5c9a80be2b7b6f92af5fdf9c955186995cc7105017cf824a0a7d514eb4
+EBUILD libspnav-0.2.3-r1.ebuild 1233 BLAKE2B 42e8a58e18ac6557945848af6c9b61617dcf565d899c2f55dada0729797cabead916d31a9f66f60cff427876529b21ded41d8a0b72f2370e92ff10f6dbeb3066 SHA512 2e363b2e500806169cdc29bd4e7c2580251abe0242458581e7cffee7c8807fb503fd6824673f024829d48ec0d5e6d2ebe81b66b26f910f2bcdeba1c78b2697f1
 EBUILD libspnav-0.2.3.ebuild 911 BLAKE2B 5bc75de1c7f55d63e56221fa2e0de3b468d391bf025a8d961d168792de96508dfda92019bc36eddcfcb69fbdf7b5fde085bb2d7385e01ef9e661d41308055ab0 SHA512 d7baddeca48ec813dad886a2724c1d7afb762b417a5b976fc21b6d1b386df01aaaeb76325960f7351a8e58743374e1a5dde1713463fa9dc3b04a7fcc8cdebcdc
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
index e6ac19071675..c5a626aac159 100644
--- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="static-libs X"
 
 CDEPEND="X? ( x11-libs/libX11 )"
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index fe9c50b1a2bf..8d51e931b18c 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r2.ebuild 2786 BLAKE2B dd40cddb54421bed1e2693b68d40fc94b2f3f23140033fc6c20916d244f2836bd5a35d12044ba3048261b90faa52c304dc70eea524e638fc13973da752e8be89 SHA512 3b6fe171082bd93503ced14923334b9a956df0ba51394455f7229209d857b0d8c12c85258cb6372101ab5feebe84bd0bc965d3ed7bec2b2e5025b620584f87d3
+EBUILD libtomcrypt-1.18.2-r2.ebuild 2798 BLAKE2B 1dc6dd3e1ea47b1f622163858fefb3fa79456d436b29f7b2cc48372772640025b23f308fd7bd26d36ad7b1e13db5e26c22869052c2ad90dba5afac60e7cb0803 SHA512 813e4c9f8d827d69c3b6a8d23c176b880501cba7cc25984d3545df893358fc55849fe21732781b946fbca8fa83a9f0f24c54423ed435259c69e0b6e79a351fd6
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 6b394a5ffe92..134002447d9a 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="+gmp +libtommath tomsfastmath"
 
 BDEPEND="
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 70015cae3823..392b37a1aa88 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -6,4 +6,4 @@ EBUILD libunibreak-4.0.ebuild 1271 BLAKE2B c5f7d7a51ea9c2b7ff881ba8fcd0381f6f356
 EBUILD libunibreak-4.1.ebuild 1232 BLAKE2B 47504972e021c99175e799f3a306ba130c031da7b92be3f31aa0138d98efffe6cfdd7609027f989bc7cf278e64bc457efca0bff9b3580a802f921c69ed04852f SHA512 68b7674d00f517183383124702a51de40ce2f0d06992f29e1965e0cb55c74444ed8ef6b4c268839cd7a0ab123d47ce878adcb4fdb7a4816ef1d646abeb82af27
 EBUILD libunibreak-4.2.ebuild 1233 BLAKE2B b85936fcba3579d376ea3ff9657a1d64460cce6e9d26a8d8f6c7ea3e5edc52575f56ae25cbcbe1816df4baa40d56d605cef07c57e278c8b980b0fa899f3f7f0a SHA512 d2b80e682602a2fb8daccaf15a873db4352307825ab9ded6d88e8013ae62c9bbf8d9bb7fa2931fc294b7efcfd03701acde2f2efbd390f2b6ff4b21b72e031ada
 EBUILD libunibreak-4.3.ebuild 1196 BLAKE2B fc79f3c2fab1c8d9788932a5e561a5a020512351a089e5b7d8c60d8e6751ede0abcd4b0dfe1e42ceec9f60488e24df0d99a91fac0358ba85cc1a7b0908b33712 SHA512 808611b6e37b739ed80ad42988c9a9f6ac8c0dbbec48bd209037a90d57d1c3283a2b964d58c95b2e1f35d306a2b480589b26865489afb1d648813b15deb3c338
-MISC metadata.xml 614 BLAKE2B 9a68d6b1935c236312fb74a18fe8d417c8e11970be97aad071d04b5a2c57cd18df55e2b48a855ff81a3287636af6afb4abf1ab0fa84c6391c013500f65585061 SHA512 bb9c9c2b2264cbb2c7596146c1be2b51a1e0d710432b86b3f68dd7fe9832abe7aa68ffe7806e58b6e4d044d269f86a533b1b9bc437eb5cb80bac39027989e62d
+MISC metadata.xml 555 BLAKE2B eb162dde2c8d6c9d3e5098ab2c7c983c5907345de68e067a09b820f1b430980502bad3c0271b59b0a971556bb7212868471b6d31c7aefc8d75d0b569b6de64e1 SHA512 44d76eef672e931f6d5b76d667af5f667cda9f8d15cad07ab7ac97fb785a34b7af21ba735ef692571e8a1364aab3b98dde787566f7db3eb2b4442924ebebe8d8
diff --git a/dev-libs/libunibreak/metadata.xml b/dev-libs/libunibreak/metadata.xml
index fc50d1f50d2e..7832b5377301 100644
--- a/dev-libs/libunibreak/metadata.xml
+++ b/dev-libs/libunibreak/metadata.xml
@@ -11,6 +11,5 @@
 	</longdescription>
 	<use>
 		<flag name="doc">Install html API documentation.</flag>
-		<flag name="man">Generate man pages with doxygen.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index f66db94c1b5f..13cdf39d6fdc 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -2,9 +2,12 @@ AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbf
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
+DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
 DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
+DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
 EBUILD libutf8proc-2.2.0_p1-r1.ebuild 763 BLAKE2B 099b8bc2f67ac32c5c4df88ac68c641b1fc51185b4e13df6c38ad32a4fc9fd23c850affcb64143d93bf6caa589a8d4aa7ee1ce0b77cd899a4b9ca4335369d75a SHA512 f26ef903568f966e6e28021f38376a3588d43f7103695d5b2c1eff1602e55a14954c0a4ebfa404e3e4fc3066c4ac69ce81e6aca81ff6e180174c22675f545f41
 EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
-EBUILD libutf8proc-2.5.0.ebuild 1311 BLAKE2B e5ca29fb70142e745db0b3eb5230a1e737566e975349e86ca93735a7e54ff4d9edf233008aa40597801fe1fef4075dbb81022f3ccc3d23864ac8056860a2799a SHA512 c38ae48a2208092665de10674300580027b3a75d4fef0c8982e0efa8737ace823787ccd4ba73fdd6c1b0c3d0feb41b81ec0572ffc0921d1f4ad43bc6d0cd10c3
+EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
+EBUILD libutf8proc-2.6.1.ebuild 1288 BLAKE2B a020d281475836d53b25611599999745447491662f0328ec3cdd7996c3cc389385356706c6577a7f301182e84f6920c190b7a9f6fead5a29525a0af75e2387d9 SHA512 9d103ebba81e9d837b288d10d8a6f0e56f1201aeba8bc0bffa5b558a3e888a483aeb4253f0640fdbc019a6a7408321467dcb7831a343831c451e77637296296d
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
index 5d41081fd989..5a659f96fa5b 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.5.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"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
new file mode 100644
index 000000000000..323f38181fb6
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
+HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-13.0.0-r1.xz )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="cjk static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( =app-i18n/unicode-data-13.0* )"
+S="${WORKDIR}/${P#lib}"
+
+src_prepare() {
+	if use cjk; then
+		einfo "Modifying East Asian Ambiguous (A) as wide ..."
+		cp "${WORKDIR}"/${PN}-EastAsianWidth-13.0.0-r1 ${PN#lib}_data.c || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
+		install
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+}
+
+src_test() {
+	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+
+	emake CC="$(tc-getCC)" check
+}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index adb08ed1b999..2a4900eebf14 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,4 +1,5 @@
+AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
 DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
-EBUILD libvoikko-4.3.ebuild 1177 BLAKE2B aa4e245e4219ddbe869cd26177ca32ec39b047fa3b57fac97c98959f3d88d670df63de3222ee34100a5716c8f2141c497892c89ccde818fe1f96a60f5677f012 SHA512 09c89a4d5cd44e30d1c911a004d79f1787dd3692fb8a6971ed25598d707dab0fb8e0a636c9b34d2b0fc045e671d1157127184d4e64ad443326b7627cdce1467f
+EBUILD libvoikko-4.3.ebuild 1235 BLAKE2B 3887dfa49f9c0bc1d62a52e4c38dcee8b64131538f3687ca6722036de2cfaa4233507a3a36f375660ac7693fd8760f3c354584002412b90987ad1eca3a3e1de4 SHA512 112c5a28dad525cda883157251dfe3bead401c834ac49c7ef7ced715d585432f8896bfc544654d01e17ea55fa7de34d00ad13ab994e2778e5fc6f4f9da58ea95
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/files/libvoikko-4.3-disable-wall-werror.patch b/dev-libs/libvoikko/files/libvoikko-4.3-disable-wall-werror.patch
new file mode 100644
index 000000000000..59369a613b7b
--- /dev/null
+++ b/dev-libs/libvoikko/files/libvoikko-4.3-disable-wall-werror.patch
@@ -0,0 +1,30 @@
+diff -Naur a/configure b/configure
+--- a/configure	2019-10-17 17:28:10.000000000 +0300
++++ b/configure	2021-02-19 11:32:45.084523937 +0200
+@@ -17652,7 +17652,7 @@
+ 
+ 
+ tmp_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Wall -Werror -fvisibility=hidden"
++CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports the visibility attribute" >&5
+ $as_echo_n "checking whether $CC supports the visibility attribute... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18413,7 +18413,7 @@
+                 if test "x$ax_pthread_try" = "xunknown"; then :
+   break
+ fi
+-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
++                CFLAGS="-Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                 ac_link="$ax_pthread_save_ac_link"
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -19102,7 +19102,7 @@
+ done
+ 
+ 
+-CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
++CXXFLAGS="$CXXFLAGS -pedantic"
+ 
+ ac_config_files="$ac_config_files Makefile src/Makefile src/tools/Makefile java/Makefile test/Makefile cs/Makefile cl/Makefile src/libvoikko.pc"
+ 
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
index 825312749e49..16a28656c60d 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.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 python-r1 verify-sig
 
@@ -29,6 +29,8 @@ BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
+PATCHES=( "${FILESDIR}"/${P}-disable-wall-werror.patch )
+
 src_configure() {
 	local myconf=(
 		--prefix=/usr
diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest
index 26e64dbbc206..03abec7c285c 100644
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@@ -1,7 +1,3 @@
-DIST libwbxml-0.11.2.tar.bz2 354176 BLAKE2B bedc86dc269c876d788b682b67fbc021a50ee6742dad4424a118edee061e5f745941dff5589c2b4da562822f655b277c09858382615564831317bcb5b51a4c16 SHA512 1eb01e35b1fab548163caca8ba024216926995adaf2e3bd7a001927858c51a792620eb7e9ca111fc6bdf5af5c1a1cbd3eac3fe53d427cd1a6d9e8aadfc51bf1f
-DIST libwbxml-0.11.6.tar.bz2 360001 BLAKE2B 96fca6a457369b7546c50bb4459490e2dc7b2bf97c3c198abc386e099695a3a1912b7292bb541b841fe63a225d8c387bb13100b458ca17a4daf252751a9a861d SHA512 534c647bae41bf703bb48158d63dc0dd168ead5c4bcd6e775e2ce2588e1bce82f3f9f94ebd863fea2a40f0e9d4af39849a673093e66d7b26f77ab012cf6f108d
 DIST libwbxml-0.11.7.tar.gz 427429 BLAKE2B 1ec456032d4d343f5b11c60dfe5fa5dfb8750c87f1e05c48b1671257822ce7ec121a7006ed9749aacd84d4ce9f5dfa0c358cf3f3581a4a24a34db1c91338f74a SHA512 fc855650661593596a158527682d2c40d800c1fa44169d79e9ca9c6d64d67b6c660807ed89b1bddd644f114c27711356627ac919af91fd7f19d409879505512f
-EBUILD libwbxml-0.11.2.ebuild 697 BLAKE2B 78ee0da27aae3fcd2b085f91d93dda03c9d235e96f1ea5444f7a48b66d8ee97d4ff345013bd79587f74379c7ddd22f1924e9180a9ff1a524160c8ddd18ab47d2 SHA512 e503790e5a686dd98224dec664c7467bc30230d71eeb3266395216f8ba8c621417a867364fa36352a2cd2651c11c491cc3466613730e1edaec8c86d80472c879
-EBUILD libwbxml-0.11.6.ebuild 683 BLAKE2B 5183912a0cc18f9337eb70e84d757158184b73511f700350076670e56dee983bf95bb284016ae424f7b8edc44c6cd3c7bc128bebb19792ef3cf0a2a321601152 SHA512 ad413ee62f7c844ce05a8053837b4012dcc766f2043c8d25856de52f1481348e86e243ddc348d66af1e96e1bcf8cff8eb4dc6f5dbb276f5cb64b2363731e478e
-EBUILD libwbxml-0.11.7.ebuild 703 BLAKE2B 81870f76a2435a19387cae93f2282ce92a9def7f915e7cff0ea3916994157b1d60fc9f419d08d887f1d6c2b06ce9d7803321fb2b7292ab10eb99875ef201ec8e SHA512 bce834109653118add18463fff2b6d0583a92217265f9d7ff1fa3a4499449bb14dfc79ef1b831bed844e2996cfea4993c10fd39913d320ac96ded264c14a5164
+EBUILD libwbxml-0.11.7.ebuild 700 BLAKE2B 9798f8f3aa8461d32f86089d9ef4cc059ce393b65afd31d77bc984d0538d960c35a8f9c42fe5418850d35ffff0782fcc20b1e2a905d92cc307f8936cd789d2aa SHA512 dfa8c1f81e264b465015631865bd23b38237dcbbfae252d21fc776b6826770dd841af503717d0a8f559099e42bcb5ef861010ac09f04be855639204d21f12e41
 MISC metadata.xml 392 BLAKE2B 9c148f598ea01b331d4713306aef2c864a57b8cc03ed49fe506d607c176692ea791d136109a6c211336b1fb11649358efbf4c3caed7841fa0416262cb7037def SHA512 de468eff8ad127f4bfd862ce944bdb6b7784454d9b0f448c402e402f9813863b462b8a8aa853690c7298010c645b44eda79ff142c35106602747785d20ae464a
diff --git a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
deleted file mode 100644
index e836a0d844fb..000000000000
--- a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
-HOMEPAGE="https://github.com/libwbxml/libwbxml"
-SRC_URI="mirror://sourceforge/libwbxml/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README References THANKS TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_INSTALL_DOC=OFF
-		-DENABLE_UNIT_TEST=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libwbxml/libwbxml-0.11.6.ebuild b/dev-libs/libwbxml/libwbxml-0.11.6.ebuild
deleted file mode 100644
index 928004f0e6b9..000000000000
--- a/dev-libs/libwbxml/libwbxml-0.11.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
-HOMEPAGE="https://github.com/libwbxml/libwbxml"
-SRC_URI="mirror://sourceforge/libwbxml/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/expat
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-
-DOCS=( BUGS ChangeLog README References THANKS TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_INSTALL_DOC=OFF
-		-DENABLE_UNIT_TEST=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libwbxml/libwbxml-0.11.7.ebuild b/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
index 55fd805f9931..a36bf18136e4 100644
--- a/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index a95d33f0798c..8859b6715190 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -1,6 +1,6 @@
-AUX 1.4-asneeded.patch 533 BLAKE2B b2f1202d6f788c41f4e96c2a9b2354abe922fda568ebc19e29b76661b8199ad3eca7a0cce3c2f99ac6a35f6a628320e3be1a353acd86a8b4065a2387969cca5f SHA512 de3ed7a3515efcef2518fc04def32b4145b3975d25535f1d1ef06211a89573ccb024286d1904475b8b510caa6109e5106fb264fc097764566aa31616be6bb7de
-AUX 1.4-doc.patch 539 BLAKE2B fbd5b0c726273bec32d7643edfce37bf4295fd12c92664bba6c5136cbfda4e50c3f260fe87577dd8eb32a3e847ffac08dfae376345675b3732d04e92f08cf744 SHA512 7ca3d028c86c6938a51f44f9d7f769702b5a8732bbd98ac9abaee916f25b2b7bad69883844a36a4add055838ce67e779ccc02634aed05bea2704c20b59b5fb67
-AUX 1.4-mpi.patch 652 BLAKE2B 0ad1e3ea9b79178ba8e1d16efc1fd6b59b931773faa0add3519a917164d4d62bbe158e05881d8e077c3ff375cefec2851ddbb160b2d64fac299cde145c2eb3d1 SHA512 73d00caccb02f5fa94336c63a653e99bccdeebd39d6e10d4c8eaab95a8e4f4b90ac5d1232d781e25e5079c7fdb8038471078cc63ba638579f523e27816e49d43
+AUX maloc-1.4-asneeded.patch 440 BLAKE2B d1693dd96756f83e8e0381eb399ef3a80bb920b964b24facdce172ed69632caaa6449b0b5946ba8d889e832975009133c15cfe43e90c9bbc99d410275ab8b9cb SHA512 083956054c32aae4cbf4b4f111714c0cf48987bbf3098529c0638dc0a03137f8f2df5e14e452aff5b97045e058c92ddb967c80b9fad5a14fdecfb3402a2c2616
+AUX maloc-1.4-doc.patch 446 BLAKE2B 5fccdf966ba391c91abd3f2c3d219af122bc12aecbb2a5195aa3cf2335f7ba1a3cdd67aefbd994472d5bb50c49a718f4499499d059510a1c02b83265d2435806 SHA512 80c1abe14d01b1953a97c15e682d2c5b1a58e3b1bf6afb72d3aea0566365458cf2b173f9e82eb05457622d7eb62cfbc8cc267db8f45741d258332b5df186fa58
+AUX maloc-1.4-mpi.patch 581 BLAKE2B e2ac355eb674189e7368fe6b7d2f93c3cc60094cfc73d65d0a3a2b639e5705ce750e89f44bce09b5323e39f73355cc890a598d958612c3d683309eedbdc8988b SHA512 cc5957bdd189199d52621d511673a41b7204d8efe9c3453a5f1cb1408a4863911c939be78f47929fd664aa502be53fa4a16a5b1da0b17a7b62aa3eac78a9883c
 DIST maloc-1.5.tar.gz 794138 BLAKE2B 28b5b6a3bb9769ead517e181c9098762378dea7c8b8ddddaf809c958a553a4e96ee654d477a974c769b027c57c93b84ec5e447af142489b59d2ce8800b5631a6 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c
-EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B 89fd133e2ded56a3c6fb919b4c0578ffa721f9fe1df05d500a1c7efe02f63b35dc0fba0f255f8dd7d628a0dc5b7d6723a703d2b1f883e321cc92e3d820d9ca2e SHA512 75b23865c0516751d547942681c768c5503613351ed79ef8ae5a63adbc64977d560b6a6532275cfe5f5aec16dfeffa644a7fece4aa82c137b96df38ad1f39baa
+EBUILD maloc-1.5-r1.ebuild 1240 BLAKE2B e2d70862242145079ba6958e636881de0efdd66f0c31f35f45a9e18ea3866e74a4f60850274cb52ac1a39aacdb694ec6b7929cfea79c613e3b131d968d48b00c SHA512 c8256aed84edbc4268fd4b9c3da794ddde36cf818c11e461eeccdbcab1a33a896df4e41cd0c434d7a8c892c32af3b61b53a47fbd645f96886e4ddd11c20bc5ea
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch b/dev-libs/maloc/files/maloc-1.4-asneeded.patch
index aed7299e089a..966c28a4d1e1 100644
--- a/dev-libs/maloc/files/1.4-asneeded.patch
+++ b/dev-libs/maloc/files/maloc-1.4-asneeded.patch
@@ -1,5 +1,3 @@
-diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index 512e1ef..eda73ee 100644
 --- a/src/aaa_lib/Makefile.am
 +++ b/src/aaa_lib/Makefile.am
 @@ -49,11 +49,10 @@ else
diff --git a/dev-libs/maloc/files/1.4-doc.patch b/dev-libs/maloc/files/maloc-1.4-doc.patch
index 73be364812cc..575b44f228f1 100644
--- a/dev-libs/maloc/files/1.4-doc.patch
+++ b/dev-libs/maloc/files/maloc-1.4-doc.patch
@@ -1,5 +1,3 @@
-diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
-index 2686292..8f77fe2 100644
 --- a/doc/doxygen/Makefile.am
 +++ b/doc/doxygen/Makefile.am
 @@ -29,14 +29,12 @@
diff --git a/dev-libs/maloc/files/1.4-mpi.patch b/dev-libs/maloc/files/maloc-1.4-mpi.patch
index 807d5ddc8d38..c11420e80213 100644
--- a/dev-libs/maloc/files/1.4-mpi.patch
+++ b/dev-libs/maloc/files/maloc-1.4-mpi.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index d82b184..b8c5321 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -397,12 +397,14 @@ AC_SUBST(rl_inc)
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index 09db961acc5c..7c7351aab1b8 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -1,59 +1,65 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
 HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc mpi static-libs"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	sys-libs/readline:0=
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? (
-		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}/${PN}"
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	sys-libs/readline:0=
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/1.4-mpi.patch
-	"${FILESDIR}"/1.4-asneeded.patch
-	"${FILESDIR}"/1.4-doc.patch
-	)
+	"${FILESDIR}"/${PN}-1.4-mpi.patch
+	"${FILESDIR}"/${PN}-1.4-asneeded.patch
+	"${FILESDIR}"/${PN}-1.4-doc.patch
+)
 
 src_prepare() {
+	default
+
 	echo 'VPUBLIC int Vio_getc(Vio *thee){  ASC *asc; asc = thee->axdr; return asc->buf[asc->pos++];  }' >> src/vsys/vio.c || die
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs
+	local myeconfargs=()
+
 	use mpi && export CC="mpicc"
 	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
 
 	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable mpi)
 		--disable-triplet
-		)
-	autotools-utils_src_configure
+		$(use_enable mpi)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
+	docinto html
+	dodoc doc/index.html
 
-	# install doc
-	dohtml doc/index.html
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index d7d56ed6c129..f14c2a101476 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,44 +1,9 @@
-AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
-AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46576e21c773a87e71ef8618130f8055b03080147e68a5c9a9b805149eb328510ccea172b790df8a512b45241173c5f1a5052ce7db6 SHA512 ce81feab28a06d003c731d4b14a611f705c0f45123282b7a1836d7eb0befdca4a1a041896b3d4b9bb49027c3fafa72feebfff2a26657df56f21862d0125c13c6
-AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d385bdbebd1b90bfc7bc49bed4a4d6cbcb02768fd98b9bf110e9b463893131d44538f1d2ff2b4cba3ce2242832d1149cbd7498 SHA512 fd4b083695e7db3e407e2068fbc76ec063040f200f2087fdad6b21b15bb0da4a8eb74123908a3798af2b81811e8813c047d44117aebdc0d5393069c1ac653ed6
-AUX mongo-c-driver-1.13.0-enable-tests.patch 886 BLAKE2B 9a568e6498ec9ed7b08bcd8e5ae92c8e439bcce6bc04a91f128411efdbeafa64f3258f687963c861aea14c268587972ca679fbcd380098a3eefcc50a0c0a4e24 SHA512 c7f4ca10791c2eae60ea50214c1605d9d4ff48a804511d8dd9b181046f794a61499033ae0f0a8657257ee378dc30976e78984270d7fdc8cb4791b7690c89102f
-AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
-AUX mongo-c-driver-1.13.1-drop-failing-test.patch 842 BLAKE2B ce51289a0e16e9c5fdd072081b85bfd7fcc2d5450a5c34f148f8b81a0ab13e7e79f7ffdbfb7f951566f3fd5af28c2f9cd0b491af91d2d8f3a89312189760c056 SHA512 77a0ea5dcc76ce1fd18a15ae910fa1507282f36f47068b357cac3ae63f4a4368da848dd077747080f423e80a34665dd677f083eab6c16d258e75d5c2f99817fa
-AUX mongo-c-driver-1.14.0-enable-tests.patch 849 BLAKE2B ddae62c9f8d6f94f3c8f2bc48921f1825d8cef150026ea4a1047455901c9224c32f3ef2fdf9b426e73f752207fe9fc617c16547e0a2b7c4526350ba76358947c SHA512 4044c9580fb570640f1bd0e53c55a0699b5a22a93b78e2165ca08a0f99c6f09823e012021f86ff0b9ac2e1a2364b15b9eef77740833130ee08b4aed15afdb98d
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
 AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
 AUX mongo-c-driver-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
-DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
-DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2 SHA512 10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
-DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
-DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
-DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
-DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
-DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
-DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
-DIST mongo-c-driver-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
-DIST mongo-c-driver-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5
 DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
-DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
-DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
-DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
-DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
-EBUILD mongo-c-driver-0.98.2.ebuild 1840 BLAKE2B 2fb16cd97763ff2af007e76670f3d424dafc90c56171be4afca356811a2df7f9c2d6bc21f99d7195f4f09344b6910ea8003807ca9be006a6ce443ba662c9344c SHA512 9c3a12d619c20f018aebd9585504621bfb18067390c5cdfe1a61f3ea449377905718c5bcbd98c2fdbae4c0a8266d79b5482ca3eb8884a47512eac36d591b95c0
-EBUILD mongo-c-driver-1.1.10.ebuild 1951 BLAKE2B f2b3a15a6aa9a0887ae6ab52d7ee1e79d7b3fa06bb1b3684657719dc69f10894070d002ce0f06abad742ee753daaa4dd85e586785e29bf84e7bf9a2a4f2ec46b SHA512 7226237c58d4b94fa052ac455e7b67aaebac2bc14d285f74829fab289eb4d3a0dc4f3b7e5fdbc6ee28b6eeea59dbe0bc0cd3511c959844f0915cd2b1390875f3
-EBUILD mongo-c-driver-1.1.2-r1.ebuild 1948 BLAKE2B 65296d043f84794efa8d8c69c174211097c73f14fbc945f81d6068663c2b23cd2a0b4eea33b5832a32d0bd1adf05e051c481625f767ddf708dc2b2851a5999f8 SHA512 9c8b583be17df5d3a32ab71483c69f2974e6c3634285c1ea6ddf46ab305ffe8852bff95b26361efeca0b0051632b69b267c40041dc13dc8f90a0f766ceba486a
-EBUILD mongo-c-driver-1.10.3.ebuild 2210 BLAKE2B 70d4b065d7b14b605665f03b231162156f30fe099a5fcbe273142be29e10fbfc26d0008974d750a06b079f536bf66eefb526463f85b826d9a482ae45f1f4fecb SHA512 db43cf703c2c4b26d116d4c2c57c4a50777bb8d0cde2d88542399ddb42c6055027f20a6e24b26ea933d258074929b1f37c1c4e8f067549be61c1e1f7b1247762
-EBUILD mongo-c-driver-1.11.0.ebuild 2312 BLAKE2B aa3443f6ff0d5b8d14878fa692fbb746c1d3af47a9c95bced9c0ff51db2cb6c702351b2d730c2825b4a22ba95021a127383e46f5bd76429d02b17b2c70eb46ba SHA512 da4c8f2b4f4f85f188f7546a4275ea60903ff85e1326fb01f9c559f48da40c75f6cb25a165e4dc5be46cb56f4820f183e01a3059842f9caec4468355113c46f4
-EBUILD mongo-c-driver-1.12.0.ebuild 2359 BLAKE2B fdc03adb7e0d826777a84a15137d5901ff5a8ddf56d5a89b6a0899f473d8e3bd9d9357a7f42961398b655bfe2d7a61b5b488375fae96e4995f23912e1a948adc SHA512 12e54afd326cb5697c46e792a54416bc745669c48928457dd7581dc74e953b7f0940bd3b839f26ac11eb503fc703ec14ec773ba5621ba6df7cb174fc74644daa
-EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607c101ef25718224dc627fdc0d8d6b01733e0cec823cc951e5ee955bdd205c421e48ebed98e7e802a3dc974bd1a55b26b178a6 SHA512 d63b7db0564ee4443b72aed22f043f367004716509f4b91374a07cf70ae6dafe627efa936082ad7cf62176e412f0bc179b7bb3e6df88a2979824de00790df23b
-EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47
-EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
-EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
 EBUILD mongo-c-driver-1.16.2.ebuild 2540 BLAKE2B bb6de7ee9d45012925342455a1b5510769009620a85046c7aaa5edf6ad8b1be21463559528976118ed6628cfd911ab76fc5e7261a9e0a71911ef484af573002d SHA512 199881586c7b65d760667630d6b6fcca3f284ad5165fde7031a59885ae2a036578d1da6cf2f1c4400e88e91f70f3107846728f97f737fc3072efbb7334a8b8fd
-EBUILD mongo-c-driver-1.17.0.ebuild 2493 BLAKE2B 7b32636dba41d0baefd313d353f2ec5edeeddb7a233eab73fc2ce9d120b0554276a9bda73c39d5e25977655c97d9c3157caa6276d709e307d38e3b1af60937ba SHA512 3b2fcd5f061d97d0bf3c9b31823b703d201bffab759ab9da93ffb68d96cdbb8fe82f0ce5c92516bf83283bf380543ef4df5ff8e582a4f4672bdd1a9c6bc8199a
-EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
-EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
-EBUILD mongo-c-driver-1.8.2.ebuild 2129 BLAKE2B 138cbaa6afbda5ea53dd3e039e17aa9ba84aad005f372e0568d82c5a373b1550f38ee8da005b00a788ecff5e824f3c5c6c1e3dab2839f3f009531a859749f98f SHA512 35ed648328d28eac36c4cd5ce03301220d9677fd0492f2d9a5d1b2d33d859817f38a1374dc7ec273e6fd59bcc5aa0480729a38ad131a5db4e723dd7c606b299d
-EBUILD mongo-c-driver-1.9.3.ebuild 2131 BLAKE2B 59aa363b4bffd5ebcabf8644341884b9cba4caa7afbe03dbaab01c08aff11c29b2d1b3b4e3f109a0f792b67f8b3d5914b59d8aad48c9c2ab065c36820a8fb3dc SHA512 eedb120627a3a4510783b42dc03985a595bc2ce1e6cfe75fdec9f1748ab506b9549a2a8a5e0d7db05d2fef5032a115d03eb798dcb8f2982fa2317dbc01783633
+EBUILD mongo-c-driver-1.17.0.ebuild 2469 BLAKE2B 9d774c4f93c510d3f176f58c152f64e995c15f4d6f31e5653cc4c12bb5b0a4b104605cb1c5e573958d898d3cfce222dfe5af4b9e782571982540fa6f9b648236 SHA512 8e3b0ddd189dd7a05446a6a99cebb07c096b0d31fa3a2efd90db88abb1b8ef0632cea131d062de56b57896f52847d9a4303f45457cf849068563f5033db71889
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
deleted file mode 100644
index af26b6953139..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2eeb6cb..aeaa23b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -109,7 +109,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
-       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
-       message ("--   disabling test-libmongoc since using system libbson")
--      SET (ENABLE_TESTS OFF)
- 
-       if (ENABLE_STATIC MATCHES "ON|AUTO")
-          find_package (libbson-static-1.0
-diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
-index 51514ed..accb251 100644
---- a/src/libbson/tests/test-bson.c
-+++ b/src/libbson/tests/test-bson.c
-@@ -18,7 +18,7 @@
- #include <bson.h>
- #include <bcon.h>
- #define BSON_INSIDE
--#include <bson-private.h>
-+#include "bson-private.h"
- #undef BSON_INSIDE
- #include <fcntl.h>
- #include <time.h>
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
deleted file mode 100644
index 67fafafc93b2..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 860e4ea..7d646b1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,7 +110,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
-       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
-       message ("--   disabling test-libmongoc since using system libbson")
--      SET (ENABLE_TESTS OFF)
- 
-       if (ENABLE_STATIC MATCHES "ON|AUTO")
-          find_package (libbson-static-1.0
-diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
-index 51514ed..accb251 100644
---- a/src/libbson/tests/test-bson.c
-+++ b/src/libbson/tests/test-bson.c
-@@ -18,7 +18,7 @@
- #include <bson.h>
- #include <bcon.h>
- #define BSON_INSIDE
--#include <bson-private.h>
-+#include "bson-private.h"
- #undef BSON_INSIDE
- #include <fcntl.h>
- #include <time.h>
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
deleted file mode 100644
index e61bffafeed6..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index d09d706..5d84225 100644
---- a/src/libmongoc/CMakeLists.txt
-+++ b/src/libmongoc/CMakeLists.txt
-@@ -109,7 +109,9 @@ if (NOT ENABLE_SSL STREQUAL OFF)
-       if (LIBRESSL_FOUND)
-          message ("--   Found ${LIBRESSL_LIBRARIES}")
-          set (SSL_LIBRARIES ${LIBRESSL_LIBRARIES})
--         include_directories ("${LIBRESSL_INCLUDE_DIRS}")
-+         if (${LIBRESSL_INCLUDE_DIRS})
-+           include_directories ("${LIBRESSL_INCLUDE_DIRS}")
-+         endif ()
-          link_directories ("${LIBRESSL_LIBRARY_DIRS}")
-          set (LIBRESSL 1)
-       else ()
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch
deleted file mode 100644
index 983e025b9170..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 22d1f4f..8ab33c6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -118,7 +118,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
-       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
-       message ("--   disabling test-libmongoc since using system libbson")
--      SET (ENABLE_TESTS OFF)
- 
-       if (ENABLE_STATIC MATCHES "ON|AUTO")
-          find_package (libbson-static-1.0
-diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
-index 6ac94f3..cec430f 100644
---- a/src/libbson/tests/test-bson.c
-+++ b/src/libbson/tests/test-bson.c
-@@ -18,7 +18,7 @@
- #include <bson/bson.h>
- #include <bson/bcon.h>
- #define BSON_INSIDE
--#include <bson/bson-private.h>
-+#include "bson/bson-private.h"
- #undef BSON_INSIDE
- #include <fcntl.h>
- #include <time.h>
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch
deleted file mode 100644
index 64a90bbe3ece..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f7a0dfe..22d1f4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -271,7 +271,6 @@ if (ENABLE_MONGOC)
-       VERSION_CURRENT
-       VERSION_RELEASED
-       # This sub-directory is added later, so manually include here
--      generate_uninstall/CMakeLists.txt
-    )
- 
-    set_local_dist (top_DIST ${top_DIST_local})
-@@ -341,14 +340,8 @@ if (WIN32)
- else ()
-    set (UNINSTALL_PROG "uninstall.sh")
- endif ()
--set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/mongo-c-driver")
- 
- # Create uninstall program and associated uninstall target
- #
- # This needs to be last (after all other add_subdirectory calls) to ensure that
- # the generated uninstall program is complete and correct
--add_subdirectory (generate_uninstall)
--
--add_custom_target (uninstall
--   COMMAND "${UNINSTALL_PROG_DIR}/${UNINSTALL_PROG}"
--)
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
deleted file mode 100644
index 6ef137fdba7c..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/libmongoc/tests/test-mongoc-topology.c b/src/libmongoc/tests/test-mongoc-topology.c
-index d1ca7cf..245a470 100644
---- a/src/libmongoc/tests/test-mongoc-topology.c
-+++ b/src/libmongoc/tests/test-mongoc-topology.c
-@@ -1964,12 +1964,6 @@ test_topology_install (TestSuite *suite)
-                                 NULL,
-                                 NULL,
-                                 test_framework_skip_if_slow);
--   TestSuite_AddFull (suite,
--                      "/Topology/multiple_selection_errors",
--                      test_multiple_selection_errors,
--                      NULL,
--                      NULL,
--                      test_framework_skip_if_offline);
-    TestSuite_AddMockServerTest (
-       suite, "/Topology/connect_timeout/succeed", test_select_after_timeout);
-    TestSuite_AddMockServerTest (
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
deleted file mode 100644
index 76202b5e387a..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0e01a8..3371dae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -163,7 +163,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
-       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
-       message ("--   disabling test-libmongoc since using system libbson")
--      SET (ENABLE_TESTS OFF)
- 
-       if (ENABLE_STATIC MATCHES "ON|AUTO")
-          find_package (libbson-static-1.0
-diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
-index 95356fa..9f9aea3 100644
---- a/src/libbson/tests/test-bson.c
-+++ b/src/libbson/tests/test-bson.c
-@@ -17,7 +17,7 @@
- 
- #include <bson/bson.h>
- #include <bson/bcon.h>
--#include <bson/bson-private.h>
-+#include "bson/bson-private.h"
- #include <fcntl.h>
- #include <time.h>
- 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
deleted file mode 100644
index e57a3560443f..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND=">=dev-libs/libbson-0.98.0
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-DOCS=( NEWS README.rst TUTORIAL.md )
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-hardening \
-		--disable-optimizations \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf"
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill `cat "${T}/mongod.lock"`
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
deleted file mode 100644
index 06580e8e4bb9..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND=">=dev-libs/libbson-1.1.10
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-DOCS=( NEWS README.rst TUTORIAL.md )
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	rm -r src/libbson || die
-	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
-
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-libbson=system \
-		--disable-hardening \
-		--disable-optimizations \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf"
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill `cat "${T}/mongod.lock"`
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
deleted file mode 100644
index 8bb38f883513..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND=">=dev-libs/libbson-1.0
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-DOCS=( NEWS README.rst TUTORIAL.md )
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	rm -r src/libbson || die
-	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
-
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-libbson=system \
-		--disable-hardening \
-		--disable-optimizations \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf"
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill `cat "${T}/mongod.lock"`
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
deleted file mode 100644
index 7e671d96e059..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-1.10.3
-	dev-python/sphinx
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		for f in bson-private.h bson-iso8601-private.h bson-thread-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
deleted file mode 100644
index ec8f06577251..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
deleted file mode 100644
index 0755827f8491..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.0-enable-tests.patch" # enable tests without libbson
-	"${FILESDIR}/${PN}-1.12.0-libressl.patch" # Bug 662654
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
deleted file mode 100644
index 415dc7078333..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~s390 x86"
-IUSE="debug examples icu libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-uninstall.patch"
-	"${FILESDIR}/${P}-enable-tests.patch" # enable tests with system libbson
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		mkdir -p src/libbson/tests/bson || die
-		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_ICU="$(usex icu ON OFF)"
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
deleted file mode 100644
index e61cc887ea3d..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples icu libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13.0-enable-tests.patch" # enable tests with system libbson
-	"${FILESDIR}/${P}-drop-failing-test.patch" # one test fails
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		mkdir -p src/libbson/tests/bson || die
-		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_ICU="$(usex icu ON OFF)"
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
deleted file mode 100644
index 4ad9e86cd71e..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples icu libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13.1-drop-failing-test.patch" # one test fails
-	"${FILESDIR}/${PN}-1.14.0-enable-tests.patch" # enable tests with system libbson
-	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		mkdir -p src/libbson/tests/bson || die
-		for f in bson-context-private.h bson-iso8601-private.h bson-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_ICU="$(usex icu ON OFF)"
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild
deleted file mode 100644
index 6bded6a0a993..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples icu libressl sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="app-arch/snappy:=
-	app-arch/zstd:=
-	>=dev-libs/libbson-${PV}
-	dev-python/sphinx
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.14.0-enable-tests.patch" # enable tests with system libbson
-	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		mkdir -p src/libbson/tests/bson || die
-		for f in bson-context-private.h bson-iso8601-private.h bson-private.h; do
-			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_ICU="$(usex icu ON OFF)"
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-		-DENABLE_ZSTD=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
index 72b58f751ba6..f58927b7e0fe 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.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
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Client library written in C for MongoDB"
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
@@ -15,6 +15,11 @@ KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples icu libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
 RDEPEND="app-arch/snappy:=
 	app-arch/zstd:=
 	>=dev-libs/libbson-${PV}[static-libs?]
@@ -32,11 +37,6 @@ DEPEND="${RDEPEND}
 		dev-libs/libbson[static-libs]
 	)"
 
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 	"${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
@@ -44,7 +44,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# copy private headers for tests since we don't build libbson
 	if use test; then
@@ -72,7 +72,7 @@ src_configure() {
 		-DENABLE_ZSTD=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 # FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
@@ -90,5 +90,5 @@ src_install() {
 		dodoc src/libmongoc/examples/*.c
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
deleted file mode 100644
index dd8921b43802..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND=">=dev-libs/libbson-1.3.5
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-DOCS=( NEWS README.rst )
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	rm -r src/libbson || die
-	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
-
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-libbson=system \
-		--disable-hardening \
-		--disable-optimizations \
-		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
-		$(use_enable sasl) \
-		$(use_enable ssl ssl openssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default_src_install
-	if [[ -f "${D}usr/share/doc/${P}/COPYING" ]] ; then
-		rm "${D}usr/share/doc/${P}/COPYING" || die
-	fi
-	# Only install the mongoc man pages to avoid conflicts of common names
-	doman doc/man/mongoc_*.3
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/examples
-		doins -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf"
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill `cat "${T}/mongod.lock"`
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
deleted file mode 100644
index 574171d957f7..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND=">=dev-libs/libbson-1.6.2
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-DOCS=( NEWS README.rst )
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	rm -r src/libbson || die
-	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
-
-	# https://github.com/mongodb/mongo-c-driver/issues/54
-	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
-		tests/Makefile.am || die
-	eautoreconf
-
-	default
-}
-
-src_configure() {
-	econf \
-		--with-libbson=system \
-		--disable-optimizations \
-		--disable-shm-counters \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default_src_install
-
-	# Only install the mongoc man pages to avoid conflicts of common names
-	doman doc/man/mongoc_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf" || die
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
deleted file mode 100644
index e67b5edaaef3..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~s390 x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-1.8.2
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	# remove bundled libs
-	rm -rv src/{libbson,zlib*} || die
-
-	# bundled headers are gone
-	sed -e '/^ac_config_files/s@src/zlib-.*/zconf.h@@g' \
-		-i configure || die
-
-	# this test fails
-	sed -e '/test_topology_install (&suite)/d' \
-		-i tests/test-libmongoc.c || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		--with-libbson=system \
-		--with-snappy=system \
-		--with-zlib=system \
-		--disable-optimizations \
-		--disable-shm-counters \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default_src_install
-
-	# Only install the mongoc man pages to avoid conflicts of common names
-	doman doc/man/mongoc_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf" || die
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
deleted file mode 100644
index 9bc7a5d5f33b..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-performance MongoDB driver for C"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples libressl sasl ssl static-libs test"
-
-RDEPEND="app-arch/snappy:=
-	>=dev-libs/libbson-1.8.2
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-db/mongodb )"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="!test? ( test ) x86? ( test )"
-
-src_prepare() {
-	# remove bundled libs
-	rm -rv src/{libbson,zlib*} || die
-
-	# bundled headers are gone
-	sed -e '/^ac_config_files/s@src/zlib-.*/zconf.h@@g' \
-		-i configure || die
-
-	# this test fails
-	sed -e '/test_topology_install (&suite)/d' \
-		-i tests/test-libmongoc.c || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		--with-libbson=system \
-		--with-snappy=system \
-		--with-zlib=system \
-		--disable-optimizations \
-		--disable-shm-counters \
-		--disable-examples \
-		$(use_enable sasl) \
-		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default_src_install
-
-	# Only install the mongoc man pages to avoid conflicts of common names
-	doman doc/man/mongoc_*.3
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*.c examples/aggregation examples/bulk
-	fi
-}
-
-src_test() {
-	# Avoid allocating too much disk space by using server.smallFiles = 1
-	echo -e "storage:\n    smallFiles: true" > "${T}/mongod.conf" || die
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		-f "${T}/mongod.conf" --dbpath="${T}" \
-		--logpath="${T}/mongod.log" || die
-	MONGOC_TEST_HOST="127.0.0.1:${PORT}" emake test
-	kill $(<"${T}/mongod.lock")
-}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index fea76066d6c8..9d6e1c997aeb 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,8 @@
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
+DIST nettle-3.7.1.tar.gz 2380974 BLAKE2B 2dbc0204623ca9d42d4e4fec0d96e3d1aa164ac63f046198c2827a9eb8946392cbf5dd48a2a77cb98d52591eb83b48092686e3f5eb5dc2ee5f5e92cfaa335f26 SHA512 25567c0546b68851a03741ea69a2959b07cab660a723b193a9043faf1fd9eb4cd7aea72de150bb0717fd2db28e417f03ad31b14e98aec40ad316f1bcf0caf50b
 DIST nettle-3.7.tar.gz 2375067 BLAKE2B 1e8a77db9b7e62dee9a01e3c3b476e206f36cc7235153b0a1a762276650c61d7c4c3be73b2ecae9313313e416e3c7a2bd999a3505c41b26e806f9b3eb486550f SHA512 be32eff0ea3c83abb8b6670d049a8ce21ea9c7cac3e1a5d41ae003d5160e2683572c7dd8930b869ac1db0b89f9423605e0a8ec0cff074c63e2a60c71996ef66c
 EBUILD nettle-3.6-r2.ebuild 1781 BLAKE2B e01bf5e416b31404c955406cc56094f192504a0a9f18e1de009af0376704279a24f7b61f4d6ab713690b81d97a4117ff67aa8f202c64f7dd3a13b736e0583329 SHA512 a34481eeaecaeb8928ec7185a14a747447ed6bccec1b275347a2f20c03c81fbf07dab3ea0b89d2d629234825ed9fc1c2f84997bc88121bb08b68b13064db46a2
 EBUILD nettle-3.6-r3.ebuild 1831 BLAKE2B 52f6b9858662beb73050485055be6eef7982d280bc8da67141a6077db7245c0162e176ebf722068dd6a3a711946070a233e6cb088740e8474eba055333da2bf5 SHA512 53de5e013ca2c84a211d694ff4495c22085a35698122f4b36b3a56444d69c5bb984a7e96d5ee91df0c091f473f864b3b19ba89fa20181ec759b67e4124c566b7
+EBUILD nettle-3.7.1.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
 EBUILD nettle-3.7.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.7.1.ebuild b/dev-libs/nettle/nettle-3.7.1.ebuild
new file mode 100644
index 000000000000..c99897e5e98a
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.7.1.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 multilib 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/nspr/Manifest b/dev-libs/nspr/Manifest
index 93e90cc1de3f..c1a03d703bf9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,8 +9,8 @@ DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7
 DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
 DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
 DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
-EBUILD nspr-4.26.ebuild 3910 BLAKE2B 0d3b709301c8ac93aefdd024ce76aaa7ef64696f3ae7d704a1ba721acee5b0299d89e14f90780d325798660768fe2d7b18a0f9e48fac33bdd6dcdf7fa977abe0 SHA512 8c565c230ab310f8f0a8aa96449323a261d56b15c4608ba41b1f248a256e57e135322b115efd7d2445b25fd04603939dd249ef89052fdfaab4778198e5768811
-EBUILD nspr-4.27.ebuild 3919 BLAKE2B 75731271e6949d5ab78e13b53a28016fd15cfe7dad931ca273f8ddebcb403e02cd4d2fdec109ac16f1313cda0b903b06acf7239639c01f6f4ab1977943038b29 SHA512 40973d84b9b5e333110705bf74514f5798ae5c6e16d12839a4a6bf2d4f54cb7776c55fc77b81743dcfac30cef752fe4c6430303871377c866aead7d5482f0b4f
-EBUILD nspr-4.28.ebuild 3910 BLAKE2B 0d3b709301c8ac93aefdd024ce76aaa7ef64696f3ae7d704a1ba721acee5b0299d89e14f90780d325798660768fe2d7b18a0f9e48fac33bdd6dcdf7fa977abe0 SHA512 8c565c230ab310f8f0a8aa96449323a261d56b15c4608ba41b1f248a256e57e135322b115efd7d2445b25fd04603939dd249ef89052fdfaab4778198e5768811
-EBUILD nspr-4.29.ebuild 3911 BLAKE2B 8b06675e0165f4aded9e99df3b5146ec7881ef4d71d93962a539c2655164e0091a8ccffaae13d89d39dd53b054f6bc12bec687c8fe1b6d95861564e7ef974954 SHA512 49802c33033cc54c04bf4c534d1ededcc2770125f9e30a0b358b1b9e7dd1301cff414abea421bd71a0dd4bf9ecb38a6b2bc5e73238adef7892ff9f4021c3054e
+EBUILD nspr-4.26.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
+EBUILD nspr-4.27.ebuild 3904 BLAKE2B 24d7d9a95cb45cca71357f4f8adc5d7f1b04f2eddb3a36df4ba9ec078d6ec0eb1155157d30f83d3ea01a2ffb6a447266386ae54c838af8535698a1de17061831 SHA512 d8c2002a06f296b3937501637d2de6fc6dcb11fd23f7fd0e83c91b3574751169b91c074edcd63747f94911207a7ef8ea2cadfd8310df34759391191974eeaf78
+EBUILD nspr-4.28.ebuild 3895 BLAKE2B 5300999ff85d33a3f7a8ee5d8209f233e7b9c1799a4eb1b41ebe519d324573d732bb4a03231c997bde93e47ed26f2d01860148794f16dabbcb0d3de382647790 SHA512 1820760bc2a5af2de5a60fd191eec45fa549ff553360d7a59c20970163de86ee960b750cfe1e7343af3291cfb4ca8f3800458bc4c7e71251a297850dfc934178
+EBUILD nspr-4.29.ebuild 3896 BLAKE2B 8adfe2c29c34d2c67ee88bdcaddb57b7b5892ea9cad4bbe811d8c24aee0398da8678ea036ddc04aa6f291f0b241346ea567d4cbb125002876e2bc71aa1414e5a SHA512 276ce63679d11ae47c2734144c10386dbe227ef8cb703b7f7689ee471e66c5604426dfddb2edec4d2e7459edc7f149b81442adaa52b23ed0e28b83a7e14b4411
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
index 8cce0ccc907e..d3b29336fc1a 100644
--- a/dev-libs/nspr/nspr-4.26.ebuild
+++ b/dev-libs/nspr/nspr-4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.27.ebuild b/dev-libs/nspr/nspr-4.27.ebuild
index d491f0acd139..d88655c54b85 100644
--- a/dev-libs/nspr/nspr-4.27.ebuild
+++ b/dev-libs/nspr/nspr-4.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
index 8cce0ccc907e..d3b29336fc1a 100644
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ b/dev-libs/nspr/nspr-4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
index 46d48bc0bd18..72a4a2f0f762 100644
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ b/dev-libs/nspr/nspr-4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 0db816a64049..3ffe43e7ca93 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -4,5 +4,5 @@ DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452
 EBUILD nss-pem-1.0.6.ebuild 717 BLAKE2B 6e91bc089f8202ebd11485f70e634698aa8b037c19d32c0412c412316e504fc396298fa8fb6477606457b924dfd1af0bdac72a263f3502e7af3abb20d581acf3 SHA512 8b0102f0110b02740e6e19790b6d7cbde13a60b5bd3beab3626fe31883c5f96672c6c8f2d93ab51b7e20fc6a1c9fec95ce8ac05f58ca86b670718074d1e3501e
-EBUILD nss-pem-1.0.7.ebuild 675 BLAKE2B caeea0fa611d95d659beecf9ee585c32065b09bcee04f8f332616b44c7de2d481fa71a62e3aa85f422ca967d125febcae86bc9a7de4a6367aa6c92703e9d4577 SHA512 0a17a3c9e184be0e33f9899cc485f496aa16ee77d136902500dd9f7ed57993eafb2723a5c54374020c48d08bd70564049a062d84f9264f90d8c5395ff71f87f9
+EBUILD nss-pem-1.0.7.ebuild 705 BLAKE2B 74d4b74cc269e43b628e60d24f6d15720bea2eb23846508e44777b0d566ec407b8d2aef448e9b949a3f55c377f371a2a451f93be9be9dcce593272f9ac10d5cd SHA512 1d01a928410061b35200268f1e1a938a2baf4ee0cb8d390353fd71e98a0b505d370e906b1045bf86815e4289db1354c604743e42f1e4bb0baa9193b0d1413a00
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
index 153a69b958ed..7ff29704683a 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x64-solaris"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index cca77072069f..afb6432c2797 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,8 +6,10 @@ AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f4
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
 DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
 DIST nss-3.61.tar.gz 82034245 BLAKE2B f04dd0dd79d44abd335799ee53bb2229ab0c65f5b9d5bf5b61e49fb33ae2eb5c061c278d5e03328e697a6f0f461411ca35df79afb9ab51df9b555cb410c0167b SHA512 b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
+DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B 7a13994368b71fb33774476bc9fa0cbcc7c5d508818f0c2583a4dab276651ddb2a68fbaafecd8323defb597f9e2c4f3cfc27a1c53c6d313b8d6bd170b125d2aa SHA512 98790c6a951414a2bddea810b8611cb5040d2c4ac915e8a0f1327bb7693bbb023785cffaedfc1e1fda4bde7d9ca9f5828350939b4ffd1a3a536bde61d14fd012
-EBUILD nss-3.60.1.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
-EBUILD nss-3.61.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
+EBUILD nss-3.58-r2.ebuild 9243 BLAKE2B d064a59fb9780ffa37454397ff738b4ba91ceca46d98facfd9e2fff2f73980280a3ed06bc02d5ea8ba6915440c4cbf697006484cb5580fae8b16472230f01186 SHA512 ebf3a0df5de6170fa14428bfeae73d8a34d02bf010c9cac49d9edcfbc3303044dde0bd28d6b330f327a9f4f7e8cf9fe2b7b1fad8dba19768fbc51aee06ceaac9
+EBUILD nss-3.60.1.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
+EBUILD nss-3.61.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
+EBUILD nss-3.62.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index f7bb97581f3b..50de523f59f0 100644
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/dev-libs/nss/nss-3.60.1.ebuild b/dev-libs/nss/nss-3.60.1.ebuild
index 7ac46a177d7a..22ec72ccc32c 100644
--- a/dev-libs/nss/nss-3.60.1.ebuild
+++ b/dev-libs/nss/nss-3.60.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/dev-libs/nss/nss-3.61.ebuild b/dev-libs/nss/nss-3.61.ebuild
index 7ac46a177d7a..22ec72ccc32c 100644
--- a/dev-libs/nss/nss-3.61.ebuild
+++ b/dev-libs/nss/nss-3.61.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/dev-libs/nss/nss-3.62.ebuild b/dev-libs/nss/nss-3.62.ebuild
new file mode 100644
index 000000000000..5e3240e8db8d
--- /dev/null
+++ b/dev-libs/nss/nss-3.62.ebuild
@@ -0,0 +1,359 @@
+# 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/~axs/distfiles/${PN}-cacert-class1-class3.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() {
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 1df41b05d0d8..6de80321fd59 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,9 +1,12 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
+AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86fb5f9aba08922be00b9685a402550eaf09334fb7ced28e7ba05d840e389b8d0b315d4809cd26763b4d9a76410401dded687 SHA512 57f59db22b33d856bec6deba6c04ae68d9e5da2c0b2da4fad5053c6915a5e634bb0206eb3c933f2228947df92a633ee2d051164b696803a8e6c330a9218ca6f9
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-11.0.0.tar.gz 79487 BLAKE2B a5ec89c68dd31f53881a002fda0fa9f83b6355273a6f2085c6794a0c9a74ba44b8ac21175854a87427c30523f2dd024006050b77d90bbfa7041e4abfbf0bb9e5 SHA512 bd27d15d5e6f396f0b0a79fb1f2081033e26db1df701a37558f7b9976299e17cfb383beff8fb0f1a5ab63601648cac2a33e4de73100fd1ab8706161c52aabe3c
+DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.0.0.ebuild 1146 BLAKE2B 0b2455f22a68726583b9638b8a20db67efde7a9a19c2879561f5614df99462375fcc453ab6c638bf72d0056325428698976b213a271338f8fa449145c8148e14 SHA512 6297e9bee27415679474b922b31ae1f3b1a5df7b7ccb7954993bd5f6346e7994a5b2e89794ebffd18c306abe48644691eaf764b844532d3d1744a715da8cdcb5
+EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1263 BLAKE2B b84ef38978e43306f5be92a6c138b4aa704d77374e70b8f2c3275168f0ae24bd3a303d87ebbbaaee04f85aaea3f8914493863171ee8ef874b429fcbeb31b6d5f SHA512 3879464f9d72f46bbd6dce799a63d1c62e174635299753df2d1174a4c47cc97ab8f3d698c06c2e636ca9f76ce564f55ee871852fa4aca40786fd3a1a925fc918
 MISC metadata.xml 251 BLAKE2B d59c954af9491cf4baaa1ef87798223542baa4d51b53d7efe06cd840bad610355371123af40858103530471987e6689863955eda4320e45add1964d64a2d3f10 SHA512 1f5116232dec742b8658c6296c94e33b014a4305a191fed50b9c840dd2613d3937a2405efd57b23d6bfeace5473a310bf36b087cf0b73817287043f6a2ff701e
diff --git a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
new file mode 100644
index 000000000000..6df90f21a059
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+     add_definitions(-DUSE_PREBUILT_LLVM)
+ 
+     if(NOT PREFERRED_LLVM_VERSION)
+-        set(PREFERRED_LLVM_VERSION "11.0.0")
++        set(PREFERRED_LLVM_VERSION "11.1.0")
+     endif(NOT PREFERRED_LLVM_VERSION)
+     message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
+     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
diff --git a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
new file mode 100644
index 000000000000..12fd32b2fc76
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="c67648d41df00ea8ee9d701d17299b86f86f0321"
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="UoI-NCSA"
+SLOT="11"
+KEYWORDS="~amd64"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="
+	>=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]
+	~sys-devel/clang-11.1.0:11=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:11=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=11
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+	"${FILESDIR}"/${PN}-11.1.0_version.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 87fc0f8bb644..dc6399d57fc9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,5 +9,5 @@ DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c
 DIST openssl-1.1.1j.tar.gz 9823161 BLAKE2B e5699abeca83acd82546e74a0645f2a765d51f22226f8c537d92285eb0b11e12b0a9476cbd3cb6a594e9840433d713be39884fb4dcd5c3968b36ad4f582ed23a SHA512 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5
 EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
 EBUILD openssl-1.1.1i.ebuild 10262 BLAKE2B bf22af5fa5b25103bdefe046949fe26e6ca78dbf5f9965e2cafc4e08f927bbf8baa478296dfce2f182c13f1576e87ae3f257c18da16a1cc3cfb6c2f2862098ff SHA512 047c34d02e00529450d982dc891a9bc0319f8e7d1f3cdad70d8954f0c463b3c7621005382c091f282982337ea0f2d397038bfcdf2bfad99c16b51de466988ff5
-EBUILD openssl-1.1.1j.ebuild 10271 BLAKE2B 06b5aa9b3388f1f567d4bb882b8397e8eb776fee68e89a967bc876b18d34789aa6c2a32de4cc3a3e44bd3cb25685219459c92f6a5006c75a364c06590a23ae2e SHA512 b863d4694d1e584f0ff3004f6d76c8141c4af25985a75d89f966e185562ce8d854d7c7a4973ea5047f373476ad430aee654bcf9e2dfba53a091f716155e7a4ae
+EBUILD openssl-1.1.1j.ebuild 10262 BLAKE2B e10b9f419bd7689bae4f6e19e4c14407eba31c27e9c67e8b68fa7b0bedab8d8a572dc3c7e6155e080001de43d37df90da8c4585d8340a891440d15b942a2a64c SHA512 f7d468aa14b0d5753db16ebe4daa23ace9b3974324971898e5c8ed48db2e33be1a01b8edc982c2bd19824f664dc15029b66ac295d7a57855e9782a27a0f15241
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1j.ebuild b/dev-libs/openssl/openssl-1.1.1j.ebuild
index e01aa8d72954..2763945ae17a 100644
--- a/dev-libs/openssl/openssl-1.1.1j.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1j.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 4d850364f09a..348aca814d67 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -1,7 +1,5 @@
-DIST papi-5.3.0.tar.gz 3928589 BLAKE2B 64531442b5ebe846ba801455c3cb15437ee2d5eec8b4d567f4bf96f1c08e2af26aedcae0c5601e00e5454aa5ad5d482a6b113a52a20d5b2819161c82b51f8fb5 SHA512 a88d28d895a1b44b0d05ac90c39406b7e9806a1d865b39df405e55b27d7f6bb191330ed7df52d4f3f04f46ff94ce867e6c1bdd9b38c314652cff1ee9d838b226
-DIST papi-5.4.0.tar.gz 4075657 BLAKE2B 17d92eb379ef7c45071c32ca0bbf9baecd0044ed019a2aa731da32d9bb92fad707375f555dc87adc1a8e90e27d2d850c673fbc71c3f2a55f8621151ff21087bc SHA512 be4a929208a83765f99f2f34e98d6770bf46d4f336e492506cc86d6a34fbf84754b05cfd22db0949b382bb8f24ad0ed7f5e7c90941baad2593b82827ee27eb4a
 DIST papi-5.5.1.tar.gz 4233127 BLAKE2B e065bed5a5607bf5ce3459ea84e1dabd6a60cd1f78f3ec2fbed29676ff79a057c77bd4210b8c45428238d927016a5a1e16d7bdfb4a9f56ea1e180cb0b19ec182 SHA512 c65c3a4e95c33ee7ceb950c184c08019d83cfee38bfe1bac86e80670a5191918edab2916b6815b15001da961deb8b6cf51263541554eb92a817e1a48371cfcf5
-EBUILD papi-5.3.0.ebuild 772 BLAKE2B 9db4730a4a95a941529ffaf3e5489d780fe5c511d8c603fc9b03bb3194a9781e0410d9005b21b3bf3ccdb04e6d85e8b110dda405baeba88c48f0034638d08429 SHA512 f5e657cebfee7ee195c79d6a0ed4accbd23b9eab00dc4ec180c3462bfb294ff0fd4e79c68fb657df0d2312ff37b5c48a0f95d5d71f1e4c385cb367adce9a383d
-EBUILD papi-5.4.0.ebuild 772 BLAKE2B 06032f873fc2d668356e642b3dafa34a7c49b4e0ee4fa8872aa48c0ca129206d32ff3c90768d6592dc82f72973c7d094648401a29a8ab5986d49ddd64ce5ddbf SHA512 60b7c896577c5de092f3d9ca0212c7ed14c0cbbdf348b653625c02613d6a588aca59fbc912fa858cbce9c6fb173cbc1fbe0a457579dc8579f65f948645853717
-EBUILD papi-5.5.1.ebuild 772 BLAKE2B 2be068a30e34f1689019be6bb30e331b207ed0b2b85e2b632a14973f72c863fd3484e62fe8bd31cb17e2e9d41511d45497e32582e94ca146d60f7da082b804c1 SHA512 1f5a94fb7299e179bc2c479fc891ea63e65788ca5f55272c4faa1246770aff9480cb9a067726c78640d72b7f68c68e1535df19aaa138d2b092449da5ef0f3c79
+DIST papi-6.0.0.1.tar.gz 4665285 BLAKE2B 5b6b2de8c16510a05a57159ceba591625c78f2a6d4ea62979fea4dd3e72bce73138e36480d82e13713c9ff2298e00330619fa57fdc7f81d75e1ce519b6f600ae SHA512 54c37b49858e921bd1357d8b0bba12c27e40e89b1354d89e5a85672ef3e6d3a4784212079098004256369a172d744580fb283741e7b4ac2d6fa5642bc42ea2ad
+EBUILD papi-5.5.1.ebuild 817 BLAKE2B 6bfc966ebc939823b356d123fec16a8fe3c402a31fa0ed9218024cccd5cf7ce71a2c9263ae9b081f9048886c0a5ed09e17c3f7ae94968bf1a1792f4651451bb4 SHA512 d386295abaf4c244f4bcb5cff018c9be53c5732d90d5c78357449a9638b265ad2a2528481143e20f7589813b21ac3676a45ab2a490752a4052c70646fb3ea7fe
+EBUILD papi-6.0.0.1.ebuild 1118 BLAKE2B 841bc96e9e64018da26bc1ee9698d0e202d77fee3dd24dd364018c1bf013fd637d85f035807200acceb91a2ec3d01f1794f69b32e2d5c1613c05b7fc0ce6cbb3 SHA512 9fa6411201f4142169e477ae4f18039fa6076f7b5d58c4f449f6ad6ad14c60ed91d338fef15245c07b1878647a0351d022bb9e716c988ff06b20c77453ee0d9e
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-libs/papi/papi-5.3.0.ebuild b/dev-libs/papi/papi-5.3.0.ebuild
deleted file mode 100644
index e2aa6283e644..000000000000
--- a/dev-libs/papi/papi-5.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
-
-DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="http://icl.cs.utk.edu/papi/"
-SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/libpfm[static-libs]
-	virtual/mpi
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
-
-src_configure() {
-	local myeconfargs=(
-		--with-shlib
-		--with-perf-events
-		--with-pfm-prefix="${EPREFIX}/usr"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc ../RE*
-}
diff --git a/dev-libs/papi/papi-5.4.0.ebuild b/dev-libs/papi/papi-5.4.0.ebuild
deleted file mode 100644
index 9a415cc1b998..000000000000
--- a/dev-libs/papi/papi-5.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
-
-DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="http://icl.cs.utk.edu/papi/"
-SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/libpfm[static-libs]
-	virtual/mpi
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
-
-src_configure() {
-	local myeconfargs=(
-		--with-shlib
-		--with-perf-events
-		--with-pfm-prefix="${EPREFIX}/usr"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc ../RE*
-}
diff --git a/dev-libs/papi/papi-5.5.1.ebuild b/dev-libs/papi/papi-5.5.1.ebuild
index 0d2f0f2c48e2..2667603df0e8 100644
--- a/dev-libs/papi/papi-5.5.1.ebuild
+++ b/dev-libs/papi/papi-5.5.1.ebuild
@@ -1,38 +1,47 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
+inherit autotools fortran-2
 
 DESCRIPTION="Performance Application Programming Interface"
 HOMEPAGE="http://icl.cs.utk.edu/papi/"
 SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)/src"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
 DEPEND="
-	dev-libs/libpfm[static-libs]
+	dev-libs/libpfm
 	virtual/mpi
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
 	local myeconfargs=(
 		--with-shlib
 		--with-perf-events
 		--with-pfm-prefix="${EPREFIX}/usr"
+		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-shared-lib=yes
+		--with-static-lib=no
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	dodoc ../RE*
 }
diff --git a/dev-libs/papi/papi-6.0.0.1.ebuild b/dev-libs/papi/papi-6.0.0.1.ebuild
new file mode 100644
index 000000000000..f63cab71642c
--- /dev/null
+++ b/dev-libs/papi/papi-6.0.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2 toolchain-funcs
+
+DESCRIPTION="Performance Application Programming Interface"
+HOMEPAGE="http://icl.cs.utk.edu/papi/"
+SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libpfm[static-libs]
+	virtual/mpi
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	# TODO: Could try adding
+	# --with-static-user-events=no
+	# --with-static-papi-events=no
+	# --with-static-lib=no
+	# --with-static-tools=no
+	# but this requires fixing the homebrew configure logic for
+	# little gain
+	local myeconfargs=(
+		--with-perf-events
+		--with-pfm-prefix="${EPREFIX}/usr"
+		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc ../RE*
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 0605b156fc01..6e868986f84f 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -3,5 +3,5 @@ AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7
 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 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
-EBUILD pegtl-3.2.0.ebuild 624 BLAKE2B 7e06d9933634b397cb7217c8558e0cfb0ccd9ba58301a38862d27a23a526200e3c9bc8f19bcb2a689978e9700e47590553aea555bc8607601365c4558d7fdd87 SHA512 0d4d90e70405a82918e28a04cb67361e838c523e8129e317f051b0285a2cbeb64acad998f4880adf746a0b66e5f62da7cc2be674f172580b88bd346a7d49b51c
+EBUILD pegtl-3.2.0.ebuild 631 BLAKE2B 2fc285796ac7f29f180e408192dad8b673fec08d5ab8a513d22c9a9f63cd3bf682cd53b9923e9689ccb71ffd38f138245aa2e7a64c44a296d6523111d9df20e9 SHA512 138a9c002084645f12c37ee2fb6757d0bb992da805b65048e76e3743deb34de036b60defa87b4cfdfa8e0fc0dd81825629d9c008c6bb4615253d610dd7935719
 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild
index a3ac9ff58899..88365e453f48 100644
--- a/dev-libs/pegtl/pegtl-3.2.0.ebuild
+++ b/dev-libs/pegtl/pegtl-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pmdk/Manifest b/dev-libs/pmdk/Manifest
new file mode 100644
index 000000000000..52b44bc29ca7
--- /dev/null
+++ b/dev-libs/pmdk/Manifest
@@ -0,0 +1,3 @@
+DIST pmdk-1.9.2.tar.gz 2281358 BLAKE2B 2124055c9535a58d2904df20504ce17e51d8fb67aab2fd302b44d61e04fc40e7f622b6174bd7f8d4b978ff51386a6548cfbda4423be2764f36f8c8311cf54836 SHA512 da9f7863c346de2ec7874d5f920b5ef8e0de7bc87d2ca21ebc25056d6fde4e7753957d2a1b9d8ea26f53f0b828984d69efbd88ffac62d1a7403ef3bf9d33fa30
+EBUILD pmdk-1.9.2.ebuild 1057 BLAKE2B ee5472c5050edf97db552b5fb0e50f212b5e9ba62bdbb8416b42db124734339a58545f1a5603a8f28a3c2c6265f0f3af3968ac4ec8d8635d469503c24cfad43b SHA512 2699abffb4a9cae0a5c61a4a75cf5ac2842ed5f7877e06b563111c68765ffb4dcd8afa6c12511ae96a5fa358541fe7713ba3298ea89bc4cbae9c4b522d576f39
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/pmdk/metadata.xml b/dev-libs/pmdk/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/dev-libs/pmdk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/pmdk/pmdk-1.9.2.ebuild b/dev-libs/pmdk/pmdk-1.9.2.ebuild
new file mode 100644
index 000000000000..245e99c6fe18
--- /dev/null
+++ b/dev-libs/pmdk/pmdk-1.9.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Persistent Memory Development Kit"
+HOMEPAGE="https://pmem.io/ https://github.com/pmem/pmdk"
+SRC_URI="https://github.com/pmem/pmdk/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+DEPEND="
+	sys-block/ndctl:=
+	sys-block/libfabric:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/pandoc
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CODING_STYLE.md
+	CONTRIBUTING.md
+	ChangeLog
+	README.md
+)
+
+src_prepare() {
+	default
+
+	# don't pre-compress man pages
+	sed -e 's/:=.gz//g ; s:gzip -nc:cat:g' -i doc/Makefile || die
+
+	# remove -Werror
+	find . -name 'Makefile*' -type f -print | xargs sed 's:-Werror::g' -i || die
+}
+
+src_configure() {
+	# doesn't build with -mindirect-branch=thunk
+	filter-flags -mindirect-branch=thunk
+}
+
+src_compile() {
+	emake DEBUG= CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getLD) AR=$(tc-getAR)
+}
+
+src_install() {
+	emake install prefix=/usr sysconfdir=/etc DESTDIR="${ED}"
+}
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 323339e2506c..b0d8d3037ecd 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,8 +1,8 @@
 AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321
 AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119
-AUX quazip-1.1-conditional-tests.patch 1816 BLAKE2B b7500d3300e4934fbba0256b992f7455e2d1fcb3f5e01ac26980319e41005bba814bad89f8df28cd15ae52376316fd4a73467d77b8000523918ddac3ffac0a25 SHA512 9989f879afa32d1f13dc6b49b607dac142d18dfa96727d7d621d29161fac49698ab5c2e99adfb87da2719f5f66aedad8187c00563b51decc54f55a7f5c899f57
+AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
 EBUILD quazip-0.9.1.ebuild 831 BLAKE2B 7c9fae6be60bbca4abccfaa1f9fe33ae87071e576365ecf9f2197f0cba6d4fa3a134004d93f07cb16ef6a1136d7b39ec61c1c12aaa5e56bcf6f0871a18a9f3e9 SHA512 c2e3152d2f13f9bad676af409ec288ab49771d54f17fd6891effbc025d1cb5aab1c524647817d97bfce1ec766a73813553759669dcc19d5c624722011677b276
-EBUILD quazip-1.1.ebuild 1227 BLAKE2B 15516f8b848b80e73426d3334f1e5a25cb662fee58827aec6614e7273b51a5c6cea4546c60cee7c55776958963cdf419a0881d9e90ef0673f7bc751ebc156b47 SHA512 ae431d45a562a7c43d955d90116bcb41e2ed30293efe8fc7eb98979f6e1c12e6aa5a8ecc24a25082805b6e73bc158f035e6d908ca53195dd865bf953b599cb4d
+EBUILD quazip-1.1-r1.ebuild 950 BLAKE2B 3dec02c01fb48908d0e3cd6d88c89c10845087387b3f3a6d2b4733ae3d5937758a5a6cecbcf17fb9e69522426f9d90d3eb041e76731f78ad3cc872c4d3cf7bf4 SHA512 8abd1d854f14803cd4952bbc63f09b6058b4be30949dce8df03f7dd7e1e9b8cff39355cf662d170dec76a8293319a649ebf02330f60a8fc6e4ffdcd7a109f4ca
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
diff --git a/dev-libs/quazip/files/quazip-1.1-cmake.patch b/dev-libs/quazip/files/quazip-1.1-cmake.patch
new file mode 100644
index 000000000000..1355f6c13d39
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.1-cmake.patch
@@ -0,0 +1,84 @@
+From cb46ae4bc4c9684010b433eec3a35fc4fa1ebc5d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 22:53:46 +0100
+Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 38 +++++++++++++++++---------------------
+ 1 file changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c314fe1..bac3699 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+ 
+-enable_testing()
++include(CTest)
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_DEBUG_POSTFIX d)
+@@ -27,33 +27,29 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
+ set(QUAZIP_LIB_TARGET_NAME QuaZip)
+ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+-set(QUAZIP_ENABLE_TESTS OFF)
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+-                         OPTIONAL_COMPONENTS Network Test)
++    find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
+-	if (Qt6Network_FOUND AND Qt6Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
++    if (BUILD_TESTING)
++        find_package(Qt6 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++    endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+-	find_package(Qt5 REQUIRED COMPONENTS Core
+-                         OPTIONAL_COMPONENTS Network Test)
++    find_package(Qt5 REQUIRED COMPONENTS Core)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
+-        if (Qt5Network_FOUND AND Qt5Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
++    if (BUILD_TESTING)
++        find_package(Qt5 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++    endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+-	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+-                           OPTIONAL_COMPONENTS QtNetwork QtTest)
++    find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
+-    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
+-            set(QUAZIP_ENABLE_TESTS ON)
++    if (BUILD_TESTING)
++        find_package(Qt4 REQUIRED COMPONENTS Network Test)
++        set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+     endif()
+ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+@@ -69,7 +65,7 @@ endif()
+ 
+ add_subdirectory(quazip)
+ 
+-if(QUAZIP_ENABLE_TESTS)
+-        add_subdirectory(qztest EXCLUDE_FROM_ALL)
++if(BUILD_TESTING)
++    add_subdirectory(qztest EXCLUDE_FROM_ALL)
+ endif()
+ 
+-- 
+2.30.1
+
diff --git a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
deleted file mode 100644
index 68520a4b3b9d..000000000000
--- a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14230a6..22c1421 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,34 +26,25 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
- set(QUAZIP_LIB_TARGET_NAME QuaZip)
- set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
--set(QUAZIP_ENABLE_TESTS OFF)
-+option(QUAZIP_ENABLE_TESTS "" OFF)
- if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
- 	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
-                          OPTIONAL_COMPONENTS Network Test)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
--	if (Qt6Network_FOUND AND Qt6Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
- 	find_package(Qt5 REQUIRED COMPONENTS Core
-                          OPTIONAL_COMPONENTS Network Test)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
--        if (Qt5Network_FOUND AND Qt5Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
- 	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
-                            OPTIONAL_COMPONENTS QtNetwork QtTest)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
- 	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
--    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
--            set(QUAZIP_ENABLE_TESTS ON)
--    endif()
- else()
- 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
- endif()
diff --git a/dev-libs/quazip/quazip-1.1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 491c9969ee34..6a18b5ce23ed 100644
--- a/dev-libs/quazip/quazip-1.1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@@ -5,48 +5,43 @@ EAPI=7
 
 inherit cmake flag-o-matic
 
-# Note: Please check if upstream want 2.x and so on to be slotted when released.
-if ver_test ${PV} -ge 2.0 ; then
-	# Sanity check to avoid naive copy-bumps
-	# Upstream expect parallel installation of 0.x/1.x/2.x/...
-	# https://github.com/stachenov/quazip/blob/master/QuaZip-1.x-migration.md
-	die "Upstream want 0.x, 1.x, 2.x, ... to be slotted"
-fi
-
 DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
 HOMEPAGE="https://stachenov.github.io/quazip/"
 SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="1"
+SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
 	sys-libs/zlib[minizip]
 "
-DEPEND="
-	${RDEPEND}
-	test? ( dev-qt/qttest:5 )
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!=dev-libs/quazip-1.1-r0:1
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1-conditional-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DQUAZIP_ENABLE_TESTS=$(usex test)
+		-DQUAZIP_QT_MAJOR_VERSION=5
+		-DBUILD_TESTING=$(usex test)
 	)
-
 	cmake_src_configure
 }
 
 src_compile() {
 	cmake_src_compile
 
-	use test && cmake_src_compile qztest
+	use test && cmake_build qztest
 }
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index af9c2795d93a..e891d14598ba 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,4 +1,4 @@
 AUX rccl-2.7.0-change_install_location.patch 894 BLAKE2B b38635d2eaa2e3f342c9db7ede66eb91a6170cc486ce90f487820895879ad6666a35ffe3673dcc2ee610ade9c8b5fcb6a65f0469aa971aa3c0994ee347d22eae SHA512 97b1d3799e3eb105045d1c29df498c1255bd008433f56dd53cedd602fef77d9cee61b3b9db9281d72ec297da19058e86e74b66380b321f1727053e8c6148e698
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
-EBUILD rccl-4.0.0-r1.ebuild 790 BLAKE2B 8d4729fbc4699c6a49e44b3a5c9575a18da303757c5b9ffb0d9794897c5f6a92540936c2552e326e77c1660e22f2c9204f0dc879595a60a900ab21577390feb2 SHA512 1764142493266f7a0ab869abf951deed99cc8f01b75d81e1396eb48f186944b440644fa67c6e8e4f47a679474bf37ba5694d096e6a477d245a70c2cc6b638e40
+EBUILD rccl-4.0.0-r2.ebuild 791 BLAKE2B 1d2b95f2086c0f14ab87779e5d8d0304ec030dd985e8161aa9467455e414457508eac9a9450638bfa43499e38d9c597302399e4a08474568752bb47e6b378321 SHA512 79f6f264b5466b4a8c4389923487c4378fe8c59c9c34f5bbc0f5ded01beb2793b9981c982ee1598b00d5a16668f44a5c226e0d2cb40ed0eea1efd871825b4851
 MISC metadata.xml 583 BLAKE2B 74c041b3ca69729d6be7b81ee439c0a51aaf24dd72de8e2b75878b07b48def0d2ef6509f8bd5dab1fc92301c6ceee350d05b2dfa5cc16c08e0bdf6d7c2e59e9d SHA512 4aef286c591d749a019ab3f9db5542a4b05569d53429522b5c5acac48383513599ef5e5f75254297c5b30a71db7a3b43f0aca53b50bacd46db206243f58edd2a
diff --git a/dev-libs/rccl/rccl-4.0.0-r1.ebuild b/dev-libs/rccl/rccl-4.0.0-r2.ebuild
index 364e12bac665..c909f3d96122 100644
--- a/dev-libs/rccl/rccl-4.0.0-r1.ebuild
+++ b/dev-libs/rccl/rccl-4.0.0-r2.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDPEND}
+DEPEND="${RDEPEND}
 	dev-util/rocm-cmake"
 
 S="${WORKDIR}/rccl-rocm-${PV}"
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 293b35a21069..b080643bf0a8 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,9 +1,5 @@
-DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
-DIST rocksdb-6.15.2.tar.gz 6499824 BLAKE2B e0fa1dd2c7a7b03e561690c6ac16b15bfafeb27ce226765a591c365b4c2f665138170e0b37f3c65990d6a78a63dbab1f78b875c4a81ca63df46d9118aab34c00 SHA512 1471776a87f1136a7276fbc4c53a1b69ca40110adf49ac459d6f641c1ef8a75482cff3c9b89482ff4edaa186c9a6d0285d38c544c6abf2931508359cfe4cf1a9
-DIST rocksdb-6.15.4.tar.gz 6499986 BLAKE2B ab0d34f4e8a0b99f695380cc07c886ca292bc0ab3cf34d0b2bc6b6c24e42cb6f1b134997f13843d312964e25a66d62be615d19e005ac1e230172925552ca7bcb SHA512 2c8c7c031f368d329826d00f4e507b532b58dcfc6c75b792a027923b5d916c2a43fb2d4e336d3a6d047a90c0280fb80f0cad3311779d6c5e0d74bcd002cbb246
-EBUILD rocksdb-6.14.5.ebuild 1131 BLAKE2B d9c9e434bf00f96c522ef7c7969e6a6f0cc340ea89d20116d7fd387a138437fd6017863254a5c28109655e8afbc96950dee0a8d8346036e7b2072effcdce720f SHA512 607163c646486d3706e376f838c19f236a49d5ada63a4a2479c589fbd91f11e03fc2f34dae70bb24c8963eacbc80ad09458b964f29a8a6cd1eecec7c7eb2a9f7
-EBUILD rocksdb-6.14.6.ebuild 1135 BLAKE2B 37312256839a7bed793f2051579a6756e5a5996350fbc827b3aa2ee9f9202c9f2459c7d005172cdeb7e7c2d105c8ff38fdf6eaf8b73659f1a3df1d75c0529204 SHA512 51ef260e5b176bbfebf40273c4c44d6ec6f3a84434b68058a12b9be18333a8b82bd8903401adf4a2d0d3f80683d5f38680a6311743e5aa328bc75c1801da1df8
-EBUILD rocksdb-6.15.2.ebuild 1135 BLAKE2B 37312256839a7bed793f2051579a6756e5a5996350fbc827b3aa2ee9f9202c9f2459c7d005172cdeb7e7c2d105c8ff38fdf6eaf8b73659f1a3df1d75c0529204 SHA512 51ef260e5b176bbfebf40273c4c44d6ec6f3a84434b68058a12b9be18333a8b82bd8903401adf4a2d0d3f80683d5f38680a6311743e5aa328bc75c1801da1df8
-EBUILD rocksdb-6.15.4.ebuild 1136 BLAKE2B 4adb963c7f85e3f666ac72c51fea0fc0878e092f2db7727f76b01926c4729c6bff78f12e43ce8d75a771604d7c1c47c815587c3fb2cdbb6398bcd590d165c5ae SHA512 4577f5b87913f31e4ea88b8e4f89332d34afdf5a820d508cb21fa1e788c627fe2f157832eca745db387523d5853571569ac2dfda4ae8fb5371fcc482d81e9cb6
+DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
+EBUILD rocksdb-6.14.6-r1.ebuild 1096 BLAKE2B 627a65313bfc642f1fa77f3cc0e20324d7b62b17e9464d9436285b4ebee5d3d932183ef521f43aa545f5ef5bc3b727bd520b373348672025005af75e29c294d3 SHA512 7a43c3752950b3d884c537f3378a823747f366e2ec896478f7a40ae002083cbd8a540e0189f28ba788f1a3cd471014ce579740b4744e2c4039911548fd0f3d3a
+EBUILD rocksdb-6.15.5.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
deleted file mode 100644
index ba80cbff8eb9..000000000000
--- a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Embeddable, persistent key-value store for fast storage"
-HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	dev-python/zstandard:=
-	sys-libs/zlib:=
-	jemalloc? ( dev-libs/jemalloc:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DFAIL_ON_WARNINGS=OFF
-		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DPORTABLE=ON
-		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
-		-DWITH_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}
diff --git a/dev-libs/rocksdb/rocksdb-6.15.2.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 380bf0d081a4..52fa5972a51b 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.2.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -14,18 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
-COMMON_DEPEND="
+DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
+	dev-cpp/gflags:=
 	dev-python/zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6.ebuild
deleted file mode 100644
index 380bf0d081a4..000000000000
--- a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Embeddable, persistent key-value store for fast storage"
-HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	dev-python/zstandard:=
-	sys-libs/zlib:=
-	jemalloc? ( dev-libs/jemalloc:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DFAIL_ON_WARNINGS=OFF
-		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DPORTABLE=ON
-		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
-		-DWITH_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}
diff --git a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index 82c631ca50fe..eca7931e3752 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -14,18 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
-COMMON_DEPEND="
+DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
+	dev-cpp/gflags
 	dev-python/zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 32e0fdd76e02..479590361cc1 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,7 +1,3 @@
 DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
-DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
-DIST serd-0.30.8.tar.bz2 590817 BLAKE2B 31a485fccfb13e54e124cde0626ad16f3cc7f9c1f8d8c051ace7a98bd2bd5d6a2d159943f15f5734e028a31ce5eeea9d602f55bf6cf1277d532ae799e0c1895f SHA512 d12c4dea1a15b2aed9fb9d640affae23a4fbfb53b7f873af30b462ce96f3c22ee464f5b111f87a221e6ac51f4885c23bba023892331ab10d0a8aa0e27fcbd0fa
-EBUILD serd-0.30.10.ebuild 1167 BLAKE2B bc22cdbef974d5eb5a9e9ca1e748c9f40f21ad07e51fc14ff1fc53eadb2cd995fc68a53ed61ad65861e216589452833793b26f16db5adf8d9f0f592735fa753e SHA512 3a0137701e73f601a4dd6357fc99c8c5331db7abae487c088a8148fa5400db06c2bdc0b54991f98bb8888b3aec8bf05a6c790ce6de05efe3fd47f54c834ff27f
-EBUILD serd-0.30.6.ebuild 1148 BLAKE2B 984ea62565d9d9f0144530abeb9e661d27c0dcc19bfb7524b329121a90c3541963dd587aff1daa5e1d44f45fba7cfbd3cf113fb406ddded129c45f6b615e4d61 SHA512 ed85e0e64491333816921cca88f0f824f6c4d5322fcc1c323f3e27e7a5b8099aa48509a8a70b2e28000b8bd1eb57734e92b4ddf4dd25def359c34ff1d85c178e
-EBUILD serd-0.30.8.ebuild 1167 BLAKE2B bc22cdbef974d5eb5a9e9ca1e748c9f40f21ad07e51fc14ff1fc53eadb2cd995fc68a53ed61ad65861e216589452833793b26f16db5adf8d9f0f592735fa753e SHA512 3a0137701e73f601a4dd6357fc99c8c5331db7abae487c088a8148fa5400db06c2bdc0b54991f98bb8888b3aec8bf05a6c790ce6de05efe3fd47f54c834ff27f
+EBUILD serd-0.30.10.ebuild 1160 BLAKE2B 4064514166996e16e1cb2b76ae1216fc395551a41cc55fd04609f8d8abaf6514633589825d4af6c62ec430e1767783c1b8493f5d12b30357e68483000517fd45 SHA512 dae9b7079a7a8803de4f776d4f7c8b3e319678e6a1cd9826be5c90a845b0a680153a68c1071f78973f2fad55718cad451f077c17ae5b8ffa123f1816aa57a8eb
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.10.ebuild b/dev-libs/serd/serd-0.30.10.ebuild
index 4449d2045d4f..6ddc6a973c0c 100644
--- a/dev-libs/serd/serd-0.30.10.ebuild
+++ b/dev-libs/serd/serd-0.30.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/serd/serd-0.30.6.ebuild b/dev-libs/serd/serd-0.30.6.ebuild
deleted file mode 100644
index 1c9126b0856d..000000000000
--- a/dev-libs/serd/serd-0.30.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/dev-libs/serd/serd-0.30.8.ebuild b/dev-libs/serd/serd-0.30.8.ebuild
deleted file mode 100644
index 4449d2045d4f..000000000000
--- a/dev-libs/serd/serd-0.30.8.ebuild
+++ /dev/null
@@ -1,55 +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='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 68beadc50a9a..62850e74a3ef 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,7 +1,4 @@
-AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
-DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
-EBUILD sord-0.16.6.ebuild 1207 BLAKE2B 5dd477d558144bba5f42212393bdd61c4484f9b860404970dfa89d04570055a23059e96896e11295111a9a6ec4cea05f001f28b2361d466fecfb73e00695fd88 SHA512 7618731c519bcef759234e6c545320d120860b73aca0be480fe4b975667d437c4ee4f92f3cc8597049ec8121ae3657c2c3b486fab8ff09ea4e421bc06e3354bf
-EBUILD sord-0.16.8.ebuild 1176 BLAKE2B 7d836ced3ff39d09a0caab144cdd30700af279d482b085ecc900a7882f6bfa92dee2cae8b576002489167ea60b4f6c45521096ccea3cc6da5465bbbfcaf0c8bd SHA512 74bd66a198b62aa81cf463ec27c43116dcc78ff8272ce78a75ca1e433e32c9bff3dac961190e8b8dd2e8b1fa912ba2c6a1bb0a9274c6b36a620461cf5dbacf4a
+EBUILD sord-0.16.8.ebuild 1175 BLAKE2B 4e2cb2c54f6b80c968b090d384ebb154d23d8c531cc395644a5933f99a896feab71195b06d67a2946efe4e3b5cc60d4a01a73c3cbc2d9aafd2fb49c73a0791fa SHA512 951e2799df07c7946207332eb18a7c8bc9ebc3418aa9b1c1b2af9ccb79cf853be8f86f1a11b04d05642453a0d31d3e9a813cfc53c8951949a4d525b19806b915
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
deleted file mode 100644
index 3effc4d44dc3..000000000000
--- a/dev-libs/sord/files/sord-0.16.6-x86_32.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/zix/digest.c b/src/zix/digest.c
-index 889cfde..00b9fcf 100644
---- a/src/zix/digest.c
-+++ b/src/zix/digest.c
-@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- {
- 	const uint8_t* str = (const uint8_t*)buf;
- 
-+#ifdef __x86_64__
- 	for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
- 		hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
- 		str += sizeof(uint64_t);
- 	}
-+#endif
- 	if (len & sizeof(uint32_t)) {
- 		hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
- 		str += sizeof(uint32_t);
-@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- 	return hash;
- }
- 
-+#ifdef __x86_64__
- ZIX_API uint32_t
- zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
- {
-@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
- 
- 	return hash;
- }
-+#endif
- 
- ZIX_API uint32_t
- zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
- {
- #if UINTPTR_MAX == UINT64_MAX
--	return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+	#ifdef __x86_64__
-+		return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+	#else
-+		return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
-+	#endif
- #else
- 	return _mm_crc32_u32(hash, (uintptr_t)ptr);
- #endif
diff --git a/dev-libs/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
deleted file mode 100644
index f15be86b7b66..000000000000
--- a/dev-libs/sord/sord-0.16.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/serd
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-x86_32.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
index f01afc0ba67b..26bfc0bacf6b 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0273548fec2b..c657b47a6bfd 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,6 +3,6 @@ DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a9
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
-EBUILD spdlog-1.8.2.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
+EBUILD spdlog-1.8.2.ebuild 942 BLAKE2B 212a53fc12941ea0c6038e5adf5cdcade14a026b23fc74b0845686a3bf53b284dfeeea742b5e5c61793592db6241d920c3ac5d210f880ab52331c986b2ea2815 SHA512 8cf5e21c6f1219251ab90b607965b5c657caa7c8104344933516886906f2b0313399dc87d9c26b1f9e9b46a564b85594230b65e581e41a41e0bc53f62137d2f9
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.8.2.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild
index 0cd2105637eb..e1e3064adff2 100644
--- a/dev-libs/spdlog/spdlog-1.8.2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.8.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index f3572566f4b4..6d032d080459 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,9 +1,9 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269 SHA512 48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013
-DIST tree-sitter-0.18.0.tar.gz 521866 BLAKE2B 16fdfa721b6895f4945f02875f6ffc8ba6931bb822ad0c7666e302d9a67fa0260ca09e8add6eae5cd5b37a3251dbfca7feb9581a78bb8385cf9466fc07745f49 SHA512 ba090b5136330e24ff3c23f3f9f98af197bddf5ed56fb4930fbbfac317ba5ebd02488afe6c1f35afa45e324baa785569f4fbdb1b8ca020f4bea5e22d9fc76aa8
-DIST tree-sitter-0.18.1.tar.gz 524193 BLAKE2B 500ad9dbb40bf7fbc3fb1da9012c7a3236aa05397571040a08494ea48810d491fe15593106b1f4dbcee45ecee3765b088e1e41afd2def3487acf2273cfce5bb2 SHA512 b78af07f29bfd53e394103260bfc8645ddd5d3247429cbb9b00b8a79a8006f2b0c98ab66fa6f59ab1312cc875aeb9f3e17f3c05ca65aead8e5f6e3ba7eb1cca3
-EBUILD tree-sitter-0.17.3.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
-EBUILD tree-sitter-0.18.0.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
-EBUILD tree-sitter-0.18.1.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+DIST tree-sitter-0.18.2.tar.gz 2856990 BLAKE2B 31bb67aa1645d06b14b5dfd3b45c978da8850b42352204174fb7966b3185adf1301e9c8150ddb999f074d05ef965d1e26555a750f7f77671e03e6a2821a89cef SHA512 fe385f28ce28d96538d0779d3d69f49c6183732f48ae0e979d41d1298e7c87f259604f9f2eca2a07c424a4840fa29a38051845ead797325f748d251250ffb836
+DIST tree-sitter-0.18.3.tar.gz 2860203 BLAKE2B 77d0fe53140602759a1039fc0bb600765ee4115e30fa26290f19c296f2b3941d0d42986344f11916266b6c46ac0250f94d1a1b01a6f074da36cee34c1c942165 SHA512 b669a499f826eb51fe51cbf93fd9bee6cd17ec3d628a2b7c4359c6b8d60390ce9d348a9d7470d5faa82c937d8afb720b596ce5e7b553943345cf1f79d74a2d79
+DIST tree-sitter-0.19.0.tar.gz 2861471 BLAKE2B acb1ff34c2ce4bc3995f59569f1ffa153c76013701eb04b834ac041efe6a533397bf2d540b55c27182194a0dbe285698927f29a2be001add8235ae4357e15e2a SHA512 c5315b1b452303d0a2ef2e710cb282c303649464c0d0ca41380fef2a26f551a6b6166991f6fcf48a5a9c046871d368c062d1354fd0e1f327509c4b554ac8731e
+EBUILD tree-sitter-0.18.2.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+EBUILD tree-sitter-0.18.3.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+EBUILD tree-sitter-0.19.0.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
 EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
 MISC metadata.xml 692 BLAKE2B e8a04ac2d2dbe16214d82067944baef692a4e8896fcbad7feca9e54565e603b0e5308bb4f1e4bc5aaf39f41b1ca0e10fa5710159ed1012c6ed47f2007fa19a69 SHA512 a319341832c189a845f1a757b17bbefc10a7c4b00c49e80b49745061112b91ebb80f2f96a99de27ed6aa5799f25bd56ddec3eb41bfb2507b037ee8e965525053
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.2.ebuild
index 62e7c8355b29..62e7c8355b29 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.18.1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.18.2.ebuild
diff --git a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.3.ebuild
index 547703a2d329..62e7c8355b29 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.18.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild
index 547703a2d329..62e7c8355b29 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index e252d025277e..09cb19ea044d 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,13 +1,7 @@
-DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
-DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
 DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
 DIST userspace-rcu-0.12.1.tar.bz2 527626 BLAKE2B 56fcea0fb81573dc55a0a80064e92ea837efdbd8743879d599424b4f6b140c0e9b0a88ff9a42d9643fa25e914a5fc67e1a26e101c25aa5c67582caa5da4d746d SHA512 c0c14eede77358904dfb10774390fd86b4fa9e0ab25d278c869728d40eb263bfa7e489b20ce7198169e71d74fe41bb5018fc1553a5e0654840c9765e088c83db
-DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
-DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.1.ebuild 701 BLAKE2B be57518f89cac0573946ed0b4fd4dfab7f89c21046f5ee1a39bf77ada69b6177ca3465421e1185755d19307a6c15bbe8304d28d4766f703bf62858f73c50a0d3 SHA512 3e961d874e0dbbe16bcb7d4f74f02e5fb3aa8aa82387a7f7199f1e3c2b6a3b7528bb13c974077e8b2c7041fdb10831e7e0300ecc0ceeb3cbe69e136cc0d8590b
-EBUILD userspace-rcu-0.10.2.ebuild 707 BLAKE2B 590e0ca861bce65d2fdcf719bf7c286109c3210bfa2a5e81a981fc2f0db7409807a334dbd6d72fedf75c39009f6760344b8163adb5b90cc54efcfd00702d9473 SHA512 5fc4eb2befa1a2f9e4bbc1bd8b0c5febb9f172e304f46687389b8c9bfd705ab2b66707c5cbad0165f918993e0bf10fac93e0ff05241133b58cb38fad0c67e2a8
+DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
 EBUILD userspace-rcu-0.11.1.ebuild 700 BLAKE2B 34b0c77a1c001de1b7f17576d566f844342bb83f5a03474ec40b1daa7bba38736ca42bf4a4a29d43f7ee5fc94e634387b8ebe35ac44c48d08401776d27643096 SHA512 f1fec987b003fdf73bcc179e96b4a82e4a0159348a52b07cc9d439eda42f608d4dfde931f022889f6f04c9d28c9e7dc828ca7554b5f9129ddf0cf0baceb18b07
 EBUILD userspace-rcu-0.12.1.ebuild 707 BLAKE2B d6df7f445af5b7bf3d541b24650ee6c91c26a45f670d4c98b2cf6bd92cad8b3c1f14582012f4a7c8f429f3224ecd5eb7b44f3aa5bc4e8ed7a4edb4337e54538a SHA512 b9c0462a8a72b9e0590fb77128ae6692ce20ceeb5346bc2f069541d6b8779e4ee5bde9baae9577551dff8552c0a4dd0d4922cf1f96a5e8507e71aa754709eea7
-EBUILD userspace-rcu-0.9.1.ebuild 768 BLAKE2B 7948591ffb013f689b5903d5017f8db99366b6cd214d5042b776ddb175f9557974992d4133c9ef763906ab6ec699292b5995c26186052776b0004906e6eabf60 SHA512 ba53d992aa6f9c54603d1e7ad85fcd79b169b132b5b497b4eb63a42f3672a475db0a859c39d6dad573af1ac92535f113093277d84145fa8c0c120bfac710d075
-EBUILD userspace-rcu-0.9.2.ebuild 773 BLAKE2B daa3a0f6575c41a25c92932d4823b5387b4c9895ca984373a8a2bd770b078986c6519a0ebaa360544437878a335d26694bb48c8cd3308ac672f9514d9f0126a6 SHA512 6e1ce7780fb22d2f0d382f3d3af5872162c6ded4f434fd1b300249bbc410b1d431beed61469b3c6a1a55518c2843a095da1308963f60aa95c1eb0bb36989c4ad
+EBUILD userspace-rcu-0.12.2.ebuild 707 BLAKE2B 100a45de2603b238099794018c42c6ebe41e4d35bc40b70a9780efcd1a29c88f2c11a630be02e492827f0f8272e0aeb53a24252d16a2be6b86bc9a227a29af2d SHA512 b79b76dc220840ac7d54385a7f99cb7f8cce799a96c0e534bf3e78572388914f88e59f2de93c26887f4d97d77b007bab8aa465941e20204404b10666462f784a
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
deleted file mode 100644
index 31b1212593f7..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	if use regression-test; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild
index 981b27090047..74ef772211de 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="userspace RCU (read-copy-update) library"
 HOMEPAGE="https://liburcu.org/"
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
deleted file mode 100644
index 29f07a0559d9..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname version
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-# tests fail with separate build dir
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	default
-	if use regression-test; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
deleted file mode 100644
index 6cbfcf9a4f55..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-# tests fail with separate build dir
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	default
-	if use regression-test; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 2cfd77479a10..3d69de84005d 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,6 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
+DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
 EBUILD uthash-2.2.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
+EBUILD uthash-2.3.0.ebuild 660 BLAKE2B 36b753eb27f7512f96727da8ca0267a32b537d27b3a3f4300bc5e2c9f3873add8ae61156bc8078c77b84d39c79ccb686af62b5e9517983340efcc297bd1ea5d7 SHA512 e96c1b2b3ca7b748c98e0005f8502ae6071dffdf0048463871136f59c9b1d173004e5083aa00e4ff6d87def2c06f17804b5c56451c82d5040d09c89c40b5b302
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
new file mode 100644
index 000000000000..5e4ed934d4cc
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
+)
+
+src_test() {
+	cd tests || die
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 277dd31e2709..8c3f2068b9ae 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
 EBUILD weston-8.0.0.ebuild 3637 BLAKE2B 1f83a82dabf0a8a983ae5ba19f758fb70523ab165e779d582abc0168136d3b0fdb5d6bcf78fc931dd4d737d42b66811c7d9e74994ba03d4689d6aeb0e352054c SHA512 dd22694d1a80c1df40f47b5162bc452c0ec7c50cc286a92e4d7b3e2ef31bac7b3bf1f74f25e268a72da489c2156027a76f8a7764d582b094c3a42f85accedf49
-EBUILD weston-9.0.0.ebuild 3711 BLAKE2B 574fae5ecb5ec4991b301fb1856ce5177256135a8c4ee05bfac8fb76cd3ca8238e0402ca71fe7d22cdd78f55d30fc9e27073813ac96a7b0bc37ad39c9c90fc70 SHA512 ec1e7ea53bacede54423fca8abfe4207531f4938a4d8ac66ae947c8de008551571856328f7b93af6032ce7b9d513cb739b27d03f72f062897d4cb1755477f6c6
+EBUILD weston-9.0.0.ebuild 3710 BLAKE2B 616a4cf8651eca3d747b988228bb2d9de249bf8266ead128812459b17a629ac1449c15f4cce1402e9a41acf5b1113caf4d54d230e65f7cc4603b7350142ddb99 SHA512 4f2ffb41f949662ce40a50a3233c1ec0bb1dcdbe960f72d41a36af43110e951ab0ee4d71cd97247890e573f0ccb9af889127dee09122f346c68dbcb315f4e71c
 EBUILD weston-9999.ebuild 3706 BLAKE2B 82ba0bb4bf3889b07f5e77fca64f5ef4a09b6a395b2d2f481864c739a8aa8c67eab59a431e0bc34d499d5869f0c4565b756703ec064610c434124513a367327c SHA512 c4a69d7b0e83b7d29fb70a15e6e7e10bbb0f64185ab45f668f43cd9d44e14f5f8bcbf84551cc3ced92f05cbe9865a09008fce5dc66f41a26c2adec8786ce84a1
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index 4f98f5bcab67..d9ca85977e50 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 928580e422a7..f18ce914fa3f 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,8 +1,3 @@
-AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 BLAKE2B d26e051b264d2db4c52e192a5a904c410d761e563f9d102249d0127652fc19764d7ab71c1d1ad2ac6a8dc45681bfd769855a56941e15cc247b172ab853981d9f SHA512 e39c694f8fed9f2b55592043cdc6776260980e0e6751362c15026f82c2a777e37183f6a7d42e7e2ed36b4fada5124f3fd3c7d6104dc447ef494f4bf82e5dfe04
-AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb44367fab1082340162e9d9929f6b829c612071b8535b36fa41a4f22488e0717febaaef64e4c51e7abf4fc46772aead1278 SHA512 b5182181f7c0ffa150c977b6e206c2fbfdcd979369dbf55b2c4197378edb7136629df02bb7cc5f89df522451fef3c04a7b901dc3f34bc895f55020f8d5e03ef6
-DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
-EBUILD xmlrpc-c-1.39.11-r1.ebuild 1906 BLAKE2B ef9e533ca06556fe561364b1ad2e824e0ffc44b7a8a63928640410ac1f7d608764b94387bcc892ea37ad2ed61482cf8cdb528a46fd2ba6b289b888c191536f40 SHA512 9543ea33b4e23c035491d94ba1046ce8fb355d1bced2acd99827d969c09cc719def5d11842d0ed6733ae95c45bd23c86a7bf8126ac3f0e0941f51d7666dfad42
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2068 BLAKE2B c7de028c5dfceead7bf888f480c160167bac9ad092f2b2e181ad0734ca362309ef81f9ca9e64e73a55ae3b7f5cac763259c28f5f260385a1cbf312b8402d780a SHA512 0709cc0616abc1c1da8bcb145bcef5725fd3d38e135b3c0e5e90f74a3e1b03b4feeb61a87c85b53e025faba8ed8a9ff66b687dcb214794caf775a990cdc07741
-EBUILD xmlrpc-c-1.51.06.ebuild 1811 BLAKE2B 051cdaabaf2ea0476a92e277e4421c03299c6211305685fbef1ce23ec7ecd1c8f4f2015bd19582f956d6e017a383b14538c15cc3bd9f89e2b4f8f7f3bfa05194 SHA512 61e7476b123b33aeba36d6b85cc97b2a334211224786e031a1f9e5624064ec5cd0146b16d27f64781f29f85f0aae8bf74284c0c83ae16997be7dc698ad95dc21
-MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2066 BLAKE2B 81fb24b30acd61c0368cebb20a1c48bf9c3d68c4851a3e0747675e2609d606433ee4c411c9a1a929c208c8c948240d7b6294a256f5b17468d8bf74706bb1350b SHA512 99e66c349960d4e7b0614d1abbaba7595e0c4cc505e5ee5ce5c0cb9a4cfd90d8e7e58cfa5e88080c02a5c8d9ba393db1202658a631986c0cb3370e23bd23df70
+MISC metadata.xml 616 BLAKE2B a37477d1d3b750b6fc69897bf5face2706969bff7aa38cf24a4dff667d3374f9e7469de35fb872a39d0e3d67379075115de6e26fc4052a99adf6b661e35dc4a0 SHA512 59973e62c502b138f2081b7f7284e3e9488d8dde0a75e566398b374f3d6535a8fc3f623a4442d748fd4f88fb47412af586b79d5b3e784d5b7449f471d8bb9c39
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
deleted file mode 100644
index affa917f7427..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/common.mk
-+++ b/common.mk
-@@ -17,7 +17,7 @@
- # fully made.
- .DELETE_ON_ERROR:
- 
--GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef -Wimplicit \
-+GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef \
-   -Wno-unknown-pragmas
-   # We need -Wwrite-strings after we fix all the missing consts
-   #
-@@ -27,7 +27,7 @@
-   # on -Wuninitialized for all the others.
- 
- GCC_C_WARNINGS = $(GCC_WARNINGS) \
--  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes
-+  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wimplicit
- 
- GCC_CXX_WARNINGS = $(GCC_WARNINGS)  -Wsynth
- 
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
deleted file mode 100644
index 64de06b3bb28..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/Makefile	2015-12-30 07:22:14.000000000 +0300
-+++ b/lib/Makefile	2017-01-10 15:17:39.410000000 +0300
-@@ -9,7 +9,10 @@
- 
- # Build up SUBDIRS:
- SUBDIRS = 
--SUBDIRS += util libutil libutil++
-+SUBDIRS += util libutil
-+ifeq ($(ENABLE_CPLUSPLUS),yes)
-+  SUBDIRS += libutil++
-+endif
- ifeq ($(ENABLE_ABYSS_SERVER),yes)
-   SUBDIRS += abyss
-   ifeq ($(ENABLE_CPLUSPLUS),yes)
diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml
index 3a51b3edd302..f2d28d82d359 100644
--- a/dev-libs/xmlrpc-c/metadata.xml
+++ b/dev-libs/xmlrpc-c/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="abyss">Build the Abyss mini web-server.</flag>
 		<flag name="libxml2">Use dev-libs/libxml2 to parse XML instead of the internal expat library.</flag>
 		<flag name="threads">Controls whether to build the Abyss web-server with pthreads or fork 'threading'.</flag>
-		<flag name="tools">Build the xmlrpc* tools.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">xmlrpc-c</remote-id>
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
deleted file mode 100644
index a374aa200693..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	curl? ( net-misc/curl )
-	libxml2? ( dev-libs/libxml2 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.32.05-Wimplicit.patch"
-	"${FILESDIR}/${P}-cplusplus.patch"
-)
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-wininet-client \
-		--disable-libwww-client \
-		--without-libwww-ssl  \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable curl curl-client)
-}
-
-src_compile() {
-	# Parallel builds are fixed in v 1.43.x or newer
-	emake -j1
-	use tools && emake -rC "${S}"/tools
-}
-
-src_install() {
-	default
-	use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index eb7e22e545ec..133b8ddb93a2 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.51"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
deleted file mode 100644
index 8cb323596f52..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx )"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	curl? ( net-misc/curl )
-	libxml2? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-src_compile() {
-	default
-	# Tools building is broken in this release
-	#use tools && emake -rC "${S}"/tools
-}
-
-src_install() {
-	default
-	# Tools building is broken in this release
-	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 0c4c16709de0..924b6fe418a1 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -2,5 +2,5 @@ AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
-EBUILD xmlsec-1.2.31.ebuild 1454 BLAKE2B ddda57c716158a60039edcedd03c3dfa2f7d2f454f30a6b8f99800bebe8af259c8de06dc64adf67d4355868f98b92033e43dce1fceefb5be7b35634d23c7453c SHA512 3ab54a0b41148d4ecc79b94d5bd503080ea63809771505f68db24b80223615fa3f1c3e35a455c3d3b723948ba692b127ecb5fac541bec598f3ebca2576d0146c
+EBUILD xmlsec-1.2.31.ebuild 1453 BLAKE2B 9587b817f19489d7dacad979a5710781fb2cbf3d9336e248830ea262f81f6364a5be4b95a3afd2ab1c32846b6f67b97f19f603e7301968e2e4689203e4717521 SHA512 c1de5fc015c592ecbce76f77af957c980035c103de1d275467a9ab3217b07c7a9a071a8d0470a11fcc503da8dd5e26c39abb69c7979582f5c9f7e0b76840a991
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index 08c8ae220183..a52fbd446c66 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 289efb9e129a..ce64d5c42bc1 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,16 +1,3 @@
-AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
-AUX zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch 828 BLAKE2B 3d9ba078b5c8a681ad0fd9edfa26f87fd9552b8dc41b8faec854e3d07a86415df95647b6e24a5c28b837131e8c7089922b6ab776bcf4b700ad543c6454790394 SHA512 2fc96de80f6bb54ea03245dae4d07f9b653cfa0eb4497834b380732ff0c0667d14358affb82c8c3c75c27be5554c57f571a9e0e3fc82392baf50f7de1a105bb2
-AUX zziplib-0.13.71-copy_directory_instead_of_unpacking.patch 2180 BLAKE2B 6b93641fa1aa0a1941e741a465236d92a006b89eadc9055937e5f703957be8365a62d543a5ac6002d2fb7455e16569ab237c3df330cf6d0c9183c18ab593352c SHA512 744f605157bf15ea6228c0463702e5c4fd985ae9b957e1d92fcbbde81d09f49fcb85272fae85d7a69aefd195c96e9cb4e747727428d495e829170c3301f19efc
-AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
-AUX zziplib-0.13.71-installing-man3-pages.patch 1588 BLAKE2B f2b00692d7a1c06cee51748242211c220e9a16da8f21cf33c26a2c2b8f708faa171e63218c8bc7d789794bea6fafe198e0f713400589524f0cd9bb7e49640589 SHA512 213732d9a6b0cb9bd20ffd7563fd9b0fe2f673ad44888b4c393afc8b37e5e207cedce8d71bb776a91089f61ca084917797b9e3206f0ee32cf443d9ee4abb62a2
-AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
-AUX zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch 12467 BLAKE2B c27c09ae00e2fa85771654db7f428755edc2d5b880c2462e525422ced0f1434b6ac0d41a153c750dd5cf1781c7073f2f8a9635f023a2d3b1e737b68bea5f42d4 SHA512 5f391e1c65fbc8d8114953ea3618d4e7398fe50585b8aed40ccdbd86bae7bb2be298e12c4642c55eb0573a80bf0d405dd3a65dddbc324d70beab84fd7080977c
-AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
-AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
-DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-EBUILD zziplib-0.13.71-r2.ebuild 1687 BLAKE2B d25b7136cdd1649653e22168da5e7d5a634eb838e233995cbae2051f3517ea935d2188cc79c772883d8b5e91fc1aa1215e3a20f4a5e6ef09b0a6d55130cae40a SHA512 73827f6e7ede1e797731c2e3ce54927aac0856c40fb55e85a4acda4d8cb0a7088556bb422205d688efa5e19b817e5b04f5287e9944416303ed5d2d00cf864285
-EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 2a5ec064cf753856e95f693c3c9f9044226eae7f931f98f0fea5bd145228422c340e7ab7712e05dc98f06d9091bd5f4c7ff31fc0983a856c391887c16d7b97ec SHA512 064f7881a753eb842e0ae6b449e818652dfc2f6abc07a63230c0ea8f49c6419ca880207317d6574c4dc1790e034138448a279947c6a857cc75675eda2abcd147
 EBUILD zziplib-0.13.72.ebuild 1258 BLAKE2B bdcf7833a983bc1eae81c2da26f6159c80e63d4bce90fc3d64258020eb1508b9236323d263a7f380e86d89033c3b8c0b16c70d565074154053c53f76689e7c9a SHA512 0bddcd8386ca17dc4bf8d49c68d4a9777c0f8cd8613aa10ddc5d862c0274a13e079e5a7dbeae9e2b33ba5f0f317dff6ac6bf6b2a1ba409f2a847fc625af1bb0d
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
deleted file mode 100644
index 678ff3670df4..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zziplib-0.13.69/bins/unzip-mem.c
-===================================================================
---- zziplib-0.13.69.orig/bins/unzip-mem.c
-+++ zziplib-0.13.69/bins/unzip-mem.c
-@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
- {
-     FILE* file = fopen (entry->zz_name, "wb");
-     if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
--    perror (entry->zz_name);
-+    else perror (entry->zz_name);
-     if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
- }
- 
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch b/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
deleted file mode 100644
index 262d309d8d89..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-58_manvolnum_should_be_in_.so.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 03ddd0ce0864e629256bc078eaadb0d21d0df6d9
-Author: Guido Draheim <guidod@gmx.de>
-Date:   Sat Apr 18 02:11:37 2020 +0200
-
-    #58 manvolnum should be in .so (see other) manpages
-
-diff --git a/docs/dbk2man.py b/docs/dbk2man.py
-index 49cac4e..e0d93d2 100755
---- a/docs/dbk2man.py
-+++ b/docs/dbk2man.py
-@@ -387,7 +387,7 @@ def refentry2(man, refentry, subdirectory = ".", title = ""):
-                 refentrytitle = manpage
-             filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
-             if manpage != refentrytitle:
--                manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
-+                manpagetext = ".so man%s/%s.%s\n" % (manvolnum, refentrytitle, manvolnum)
-                 writefile(filename, manpagetext)
-             else:
-                 manpagetext = text
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch b/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
deleted file mode 100644
index 51059ed77be7..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-copy_directory_instead_of_unpacking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 31d8a958610592bce683366c0808fb610f67a366
-Author: Guido Draheim <guidod@gmx.de>
-Date:   Sun Apr 19 18:25:16 2020 +0200
-
-    copy directory instead of unpacking manpages.tar to install-man #93
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 623da24..b679f7b 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -174,33 +174,28 @@ add_custom_target(install-site
-    DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
-    VERBATIM)
- add_custom_target(install-htmpages
--   COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
-    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
--   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
-+   COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
-    COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
-    DEPENDS htmpages.tar
-    VERBATIM)
- add_custom_target(install-manpages
--   COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
-    COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir}  >&2 || ls -ld $DESTDIR${mandir} >&2"
--   COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
-+   COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
-    DEPENDS manpages.tar
-    VERBATIM)
--
-+if(ZZIP_HTMPAGES)
-+   install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
-+   install(DIRECTORY html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
-+endif()
-+if(ZZIP_MANPAGES)
-+   install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
-+   install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
-+endif()
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
--
--if(ZZIP_MANPAGES)
--add_custom_target(install-man ALL DEPENDS install-manpages)
--else()
- add_custom_target(install-man DEPENDS install-manpages)
--endif()
--
--if(ZZIP_HTMPAGES)
--add_custom_target(install-htm ALL DEPENDS install-htmpages)
--else()
- add_custom_target(install-htm DEPENDS install-htmpages)
--endif()
- 
- # messages #######################################################
- 
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
deleted file mode 100644
index 6c62442c5dfb..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..c1b8172 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -47,6 +47,7 @@ endif()
- 
- if(SDL_FOUND)
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index a9f6e3a..2cdd275 100644
---- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE
- endif()
- 
- if(ZZIPCOMPAT)
-+find_package ( UnixCommands REQUIRED ) # bash
- add_custom_command(OUTPUT compat/zzip.h
-    COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
-    COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING'     > compat/zzip.h"
-@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h)
- endif()
- 
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zziplib.pc
-diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
-index 220d93b..d0bf1ae 100644
---- a/zzipwrap/CMakeLists.txt
-+++ b/zzipwrap/CMakeLists.txt
-@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap )
- target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
- 
- if(UNIX)
-+find_package ( UnixCommands REQUIRED ) # bash
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zzipwrap.pc
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
deleted file mode 100644
index 55fb4be7a51c..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index b679f7b..cafa6b4 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar
-     COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_"
-     COMMAND ${BASH} -c "chmod 664 man3/*.3"
-     COMMAND ${BASH} -c "tar cf manpages.tar man3"
--    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true"
-+    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true"
-     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
-     VERBATIM)
-+if(ZZIP_HTMPAGES)
- add_custom_command(OUTPUT htmpages.tar
-     COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html"
-     COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml
-@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar
-     COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true"
-     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
-     VERBATIM)
-+endif()
- 
- add_custom_target(manpages DEPENDS manpages.tar)
- add_custom_target(htmpages DEPENDS htmpages.tar)
-@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES)
- endif()
- if(ZZIP_MANPAGES)
-    install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
--   install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
-+   install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
- endif()
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
deleted file mode 100644
index 7597f989dcc7..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb
-Author: Jan Tojnar <jtojnar@gmail.com>
-Date:   Thu Apr 16 20:09:11 2020 +0200
-
-    build: Produce more correct pc file with zzipsdldir
-    
-    Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5,
-    the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply
-    appending it to \${prefix} might not work.
-
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..6a4f860 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -49,9 +49,10 @@ if(SDL_FOUND)
- if(UNIX)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-+join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
- add_custom_command(OUTPUT SDL_rwops_zzip.pc
-    COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc"
--   COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc"
-+   COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc"
-    COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc"
-    COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc"
-    COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc"
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch b/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
deleted file mode 100644
index a2567720bfad..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-commit 5583ccc7a247ee27556ede344e93d3ac1dc72e9b
-Author: Guido Draheim <guidod@gmx.de>
-Date:   Sat Apr 18 01:39:56 2020 +0200
-
-    reorganize ZZIP_OPTIONFLAGS and make install-man ON by default if UNIX
-
-#	diff --git a/GNUmakefile b/GNUmakefile
-#	index 3571fd1..53077b0 100644
-#	--- a/GNUmakefile
-#	+++ b/GNUmakefile
-#	@@ -10,10 +10,16 @@ default:
-#	 	@ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
-#	 
-#	 .PHONY: build-am build-cm
-#	-build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
-#	 build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
-#	-cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
-#	+build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
-#	+build-nj: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNinja
-#	+build-nm: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNmake
-#	 am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
-#	+cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
-#	+nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
-#	+
-#	+build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
-#	+cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
-#	 
-#	 new: ; rm -rf build; $(MAKE) default
-#	 
-diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
-index 7ceba4a..c0d68d4 100644
---- a/SDL/CMakeLists.txt
-+++ b/SDL/CMakeLists.txt
-@@ -14,6 +14,15 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
- 
-+if(UNIX)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
-+
-+
- # Zlib library needed
- find_package ( ZLIB REQUIRED )
- # pkg_search_module ( ZZIP zzip )
-@@ -46,7 +55,7 @@ endif()
- # pkgconfig ######################################################
- 
- if(SDL_FOUND)
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
-@@ -64,5 +73,11 @@ add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
-         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
--endif()
--endif()
-+endif(ZZIP_PKGCONFIG)
-+endif(SDL_FOUND)
-+
-+# messages ##################################################
-+
-+message(STATUS "installing SDL_rwops_zzip example headers: ${SDL_FOUND}")
-+message(STATUS "installing SDL_rwops_zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
-+
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index d1284e6..623da24 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -9,6 +9,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
- option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
-+option(ZZIP_HTMLSITE "Generate site html pages from docs" OFF)
-+option(ZZIP_HTMPAGES "Generate html manpages from sources" OFF)
-+
-+if(UNIX)
-+option(ZZIP_MANPAGES "Generate man3 manpages from sources" ON)
-+else()
-+option(ZZIP_MANPAGES "Generate man3 manpages from sources" OFF)
-+endif()
- 
- # Zlib library needed
- find_package ( ZLIB REQUIRED )
-@@ -132,14 +140,24 @@ add_custom_command(OUTPUT htmpages.tar
-     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
-     VERBATIM)
- 
--add_custom_target(mans DEPENDS manpages)
--add_custom_target(man DEPENDS manpages)
--add_custom_target(htm DEPENDS htmpages)
- add_custom_target(manpages DEPENDS manpages.tar)
- add_custom_target(htmpages DEPENDS htmpages.tar)
- add_custom_target(doc DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml site.html)
- add_custom_target(docs DEPENDS doc manpages htmpages)
-+add_custom_target(mans DEPENDS manpages)
-+
-+if(ZZIP_MANPAGES)
-+add_custom_target(man ALL DEPENDS manpages)
-+else()
-+add_custom_target(man DEPENDS manpages)
-+endif()
-+if(ZZIP_HTMPAGES)
-+add_custom_target(htm ALL DEPENDS htmpages)
-+else()
-+add_custom_target(htm DEPENDS htmpages)
-+endif()
- 
-+# install ########################################################
- 
- string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
- string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
-@@ -168,13 +186,24 @@ add_custom_target(install-manpages
-    COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
-    DEPENDS manpages.tar
-    VERBATIM)
-+
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
- add_custom_target(install-mans DEPENDS install-manpages)
--add_custom_target(install-man  DEPENDS install-manpages)
- 
--# install ########################################################
--set(mandir ${CMAKE_INSTALL_FULL_MANDIR})
--install(CODE "execute_process(COMMAND ${BASH} -c \"set -e
--   mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir}
--   cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar
--   \")")
-+if(ZZIP_MANPAGES)
-+add_custom_target(install-man ALL DEPENDS install-manpages)
-+else()
-+add_custom_target(install-man DEPENDS install-manpages)
-+endif()
-+
-+if(ZZIP_HTMPAGES)
-+add_custom_target(install-htm ALL DEPENDS install-htmpages)
-+else()
-+add_custom_target(install-htm DEPENDS install-htmpages)
-+endif()
-+
-+# messages #######################################################
-+
-+message(STATUS "html site to be generated: ${ZZIP_HTMLSITE}" )
-+message(STATUS "man pages to be generated: ${ZZIP_MANPAGES}" )
-+message(STATUS "htm pages to be generated: ${ZZIP_HTMPAGES}" )
-diff --git a/testbuilds/centos7-build.dockerfile b/testbuilds/centos7-build.dockerfile
-index 4509b68..0b7b656 100644
---- a/testbuilds/centos7-build.dockerfile
-+++ b/testbuilds/centos7-build.dockerfile
-@@ -19,4 +19,4 @@ RUN mkdir src/build
- RUN cd src/build && cmake3 ..
- RUN cd src/build && make
- RUN $no_check || (cd src/build && make check)
--RUN $no_install || (cd src/build && make install)
-+RUN $no_install || (cd src/build && make install VERBOSE=1)
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index a9f6e3a..2f7eda5 100644
---- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -18,8 +18,16 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
- option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
- option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
--option(ZZIPCOMPAT "Build compatibility with old libzzip releases" ON)
--option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
-+
-+if(UNIX)
-+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" ON)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" OFF)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
- 
- # used in zzip/_config.h
- set(ZZIP_PACKAGE "${PROJECT_NAME}lib")
-@@ -27,7 +35,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
- set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
- set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
- 
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
- find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
- endif()
- 
-@@ -193,7 +201,7 @@ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEAS
- SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
- endif()
- 
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
- add_custom_command(OUTPUT compat/zzip.h
-    COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
-    COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING'     > compat/zzip.h"
-@@ -212,9 +220,9 @@ add_custom_command(OUTPUT compat/zzip.h
-    BYPRODUCTS compat/zziplib.h compat/zzip-io.h
-    VERBATIM)
- add_custom_target(compat ALL DEPENDS compat/zzip.h)
--endif()
-+endif(ZZIP_COMPAT)
- 
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zziplib.pc
-@@ -235,12 +243,12 @@ add_custom_command(OUTPUT zziplib.pc
-    BYPRODUCTS zzipmmapped.pc zzipfseeko.pc
-    VERBATIM)
- add_custom_target(pkgconfig ALL DEPENDS zziplib.pc)
--endif()
-+endif(ZZIP_PKGCONFIG)
- 
- # install ########################################################
- set(outdir ${CMAKE_CURRENT_BINARY_DIR})
- 
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc
-         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
- endif()
-@@ -264,7 +272,7 @@ install(TARGETS libzzipmmapped
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
--if(ZZIPCOMPAT)
-+if(ZZIP_COMPAT)
-   install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h 
-           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-@@ -289,7 +297,7 @@ if(ZZIPCOMPAT)
-   endif()
- endif()
- 
--if(ZZIPLIBTOOL)
-+if(ZZIP_LIBTOOL)
-   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-     set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-     set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-@@ -340,4 +348,12 @@ if(ZZIPLIBTOOL)
-         ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
-         \")")
-   endif()
--endif()
-+endif(ZZIP_LIBTOOL)
-+
-+## messages ##############################################
-+
-+message(STATUS "lib zzipfseeko  to be compiled: ${ZZIPFSEEKO}")
-+message(STATUS "lib zzipmmapped to be compiled: ${ZZIPFSEEKO}")
-+message(STATUS "lib zzip symlinks as by libtool: ${ZZIP_LIBTOOL}")
-+message(STATUS "installing zzip compat headers: ${ZZIP_COMPAT}")
-+message(STATUS "installing zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
-diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
-index 220d93b..8ae0587 100644
---- a/zzipwrap/CMakeLists.txt
-+++ b/zzipwrap/CMakeLists.txt
-@@ -13,7 +13,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
- option(BUILD_STATIC_LIBS "Build the static library" OFF)
- option(BUILD_TESTS "Build test programs" OFF)
- option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
--option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
-+
-+if(UNIX)
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
-+else()
-+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
-+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
-+endif()
- 
- check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
- # set ( ZZIP_HAVE_ZLIB_H 1 )
-@@ -48,7 +55,7 @@ add_executable(zzipwrap ${zzipwrap_SRCS} )
- target_link_libraries(zzipwrap libzzipwrap )
- target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
- 
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
- join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT zzipwrap.pc
-@@ -69,7 +76,7 @@ endif()
- # install ########################################################
- set(outdir ${CMAKE_CURRENT_BINARY_DIR})
- 
--if(UNIX)
-+if(ZZIP_PKGCONFIG)
- install(FILES ${outdir}/zzipwrap.pc 
-         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
- endif()
-@@ -79,7 +86,7 @@ install(TARGETS libzzipwrap
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
--if(ZZIPLIBTOOL)
-+if(ZZIP_LIBTOOL)
-   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-     set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-     set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-@@ -95,3 +102,8 @@ if(ZZIPLIBTOOL)
-         \")")
-   endif()
- endif()
-+
-+# messages #######################################################
-+
-+message(STATUS "lib zzipwrap symlinks as by libtool: ${ZZIP_LIBTOOL}")
-+message(STATUS "installing zzipwrap pkgconfig files: ${ZZIP_PKGCONFIG}")
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
deleted file mode 100644
index 582a1504ee03..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 75e22f3c365b62acbad8d8645d5404242800dfba
-Author: Guido Draheim <guidod@gmx.de>
-Date:   Fri Apr 17 20:47:59 2020 +0200
-
-    #88 use shell $DESTDIR instead of make $(DESTDIR)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 442e877..d1284e6 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
- string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
- add_custom_target(install-site
-    COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
--   COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir}  >&2 || ls -ld $(DESTDIR)${docdir} >&2"
--   COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/"
--   COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/"
--   COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog          $(DESTDIR)${docdir}/"
--   COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES}  $(DESTDIR)${docdir}/"
--   COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES}  $(DESTDIR)${docdir}/"
--   COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ."
--   COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html"
-+   COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
-+   COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/"
-+   COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/"
-+   COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog          $DESTDIR${docdir}/"
-+   COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES}  $DESTDIR${docdir}/"
-+   COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES}  $DESTDIR${docdir}/"
-+   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
-+   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
-    DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
-    VERBATIM)
- add_custom_target(install-htmpages
-    COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
--   COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir}  >&2 || ls -ld $(DESTDIR)${docdir} >&2"
--   COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar"
--   COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man"
-+   COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir}  >&2 || ls -ld $DESTDIR${docdir} >&2"
-+   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
-+   COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
-    DEPENDS htmpages.tar
-    VERBATIM)
- add_custom_target(install-manpages
-    COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
--   COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir}  >&2 || ls -ld $(DESTDIR)${mandir} >&2"
--   COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar"
-+   COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir}  >&2 || ls -ld $DESTDIR${mandir} >&2"
-+   COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
-    DEPENDS manpages.tar
-    VERBATIM)
- add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
deleted file mode 100644
index d2436ae90120..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit ddaa538e8cfa46413b0e92613b54123e4b759616
-Author: Guido Draheim <guidod@gmx.de>
-Date:   Fri Apr 17 20:46:30 2020 +0200
-
-    #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile
-
-diff --git a/testbuilds.py b/testbuilds.py
-index 756e77e..35ac70c 100755
---- a/testbuilds.py
-+++ b/testbuilds.py
-@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase):
-         cmd = "docker rmi {images}:{testname}"
-         sx____(cmd.format(**locals()))
-         self.rm_testdir()
-+    def test_431_opensuse15_ninja_sdl2_dockerfile(self):
-+        if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-+        testname=self.testname()
-+        testdir = self.testdir()
-+        dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile"
-+        addhosts = self.local_addhosts(dockerfile)
-+        savename = docname(dockerfile)
-+        saveto = SAVETO
-+        images = IMAGES
-+        build = "build --build-arg=no_check=true"
-+        cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker rm --force {testname}"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
-+        sh____(cmd.format(**locals()))
-+        #:# container = self.ip_container(testname)
-+        cmd = "docker exec {testname} ls -l /usr/local/bin"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker exec {testname} find /usr/local/include -type f"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
-+        sh____(cmd.format(**locals()))
-+        #
-+        cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
-+        sh____(cmd.format(**locals()))
-+        #
-+        cmd = "docker rm --force {testname}"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker rmi {saveto}/{savename}:latest"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker rmi {images}:{testname}"
-+        sx____(cmd.format(**locals()))
-+        self.rm_testdir()
-     def test_701_centos7_am_docs_dockerfile(self):
-         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-         testname=self.testname()
-@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase):
-         cmd = "docker rm --force {testname2}"
-         sx____(cmd.format(**locals()))
-         self.rm_testdir()
-+    def test_9431_opensuse_ninja_sdl2_dockerfile(self):
-+        if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-+        testname1=self.testname() + "_1"
-+        testname2=self.testname() + "_2"
-+        testdir = self.testdir()
-+        dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
-+        dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
-+        addhosts = self.local_addhosts(dockerfile1)
-+        savename1 = docname(dockerfile1)
-+        savename2 = docname(dockerfile2)
-+        saveto = SAVETO
-+        images = IMAGES
-+        cmd = "docker rm --force {testname1}"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker rm --force {testname2}"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600"
-+        #
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz"
-+        sh____(cmd.format(**locals()))
-+        cmd = "rm tmp.local.tgz"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker exec {testname1} mkdir -p /new/local"
-+        sh____(cmd.format(**locals()))
-+        cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'"
-+        sh____(cmd.format(**locals()))
-+        #
-+        item="{}"
-+        end="\\;"
-+        cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
-+        sx____(cmd.format(**locals()))
-+        out = output(cmd.format(**locals()))
-+        self.assertFalse(greps(out, "---"))
-+        self.assertFalse(greps(out, "Only"))
-+        #
-+        cmd = "docker rm --force {testname1}"
-+        sx____(cmd.format(**locals()))
-+        cmd = "docker rm --force {testname2}"
-+        sx____(cmd.format(**locals()))
-+        self.rm_testdir()
-     def test_9711_centos7_docs_dockerfile(self):
-         if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
-         testname1=self.testname() + "_1"
-diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile
-new file mode 100644
-index 0000000..8a46dd4
---- /dev/null
-+++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile
-@@ -0,0 +1,24 @@
-+FROM opensuse/leap:15.1
-+ARG no_check=false
-+ARG no_install=false
-+# -DMAKE_INSTALL_PREFIX:PATH=/usr
-+
-+RUN zypper refresh repo-oss
-+RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar  libSDL2-devel ninja
-+
-+RUN mkdir src
-+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
-+COPY CMakeScripts src/CMakeScripts
-+COPY bins src/bins
-+COPY docs src/docs
-+COPY test src/test
-+COPY SDL src/SDL
-+COPY zzipwrap src/zzipwrap
-+COPY zzip src/zzip
-+
-+RUN mkdir src/build
-+RUN cd src/build && cmake .. -GNinja
-+RUN cd src/build && ninja
-+RUN $no_check || (cd src/build && ninja check VERBOSE=1)
-+RUN $no_install || (cd src/build && ninja install)
-+
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
deleted file mode 100644
index 9782c484590f..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-		app-arch/zip
-	)
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
-	"${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch
-	"${FILESDIR}"/${PN}-0.13.71-find-bash.patch
-	"${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
-	"${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch
-)
-
-pkg_setup() {
-	(use test || use doc) && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	(use test || use doc) && python_fix_shebang .
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # bug reported upstream
-
-	local mycmakeargs=(
-		-DZZIPCOMPAT=OFF
-		-DZZIPSDL="$(usex sdl ON OFF)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
-		-DBUILD_TESTS="$(usex test ON OFF)"
-		-DZZIPTEST="$(usex test ON OFF)"
-		-DZZIPDOCS="$(usex doc ON OFF)"
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
deleted file mode 100644
index f18a88e5b776..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-inherit cmake flag-o-matic python-any-r1
-
-MY_COMMIT="3921fc43bca7283f126bfb2e47ec7e7e24b5a5ea" # master Oct 21, 2020
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl static-libs"
-
-# Tests require internet access
-# https://github.com/gdraheim/zziplib/issues/24
-
-BDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch # https://github.com/gdraheim/zziplib/commit/5583ccc
-	"${FILESDIR}"/${PN}-0.13.71-58_manvolnum_should_be_in_.so.patch	# https://github.com/gdraheim/zziplib/commit/03ddd0c
-	"${FILESDIR}"/${PN}-0.13.71-copy_directory_instead_of_unpacking.patch # https://github.com/gdraheim/zziplib/commit/31d8a95
-	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch # https://github.com/gdraheim/zziplib/issues/93#issuecomment-616219417
-)
-
-src_configure() {
-	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DZZIPSDL="$(usex sdl)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DBUILD_TESTS=OFF
-		-DZZIPTEST=OFF
-		-DZZIPDOCS=ON
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}