gentoo resync : 16.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
commit: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree: 464c922e949c7e4d5d891fb2cdda5daee5612537 /dev-libs
parent: e68d405c5d712af4387159df07e226217bdda049 (diff)
129 files changed, 2149 insertions, 672 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a4bab2f1c6cb..95ba7e9aafff 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index f3e2648e801a..32f897442c8e 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -9,6 +9,8 @@ AUX boost-1.78.0-interprocess-musl-include.patch 676 BLAKE2B 4278a20b6494a8653c4
 DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 EBUILD boost-1.77.0-r4.ebuild 10891 BLAKE2B fce56456f1ae6b23af5836ee5a1e7ee6a3a8bad63fece1f4b18d8188f289a7df758de128059a734a09512262c52d994526a5992eddaf341e7c2b831a361a1c80 SHA512 825bcafe7fc201600d46fbf10355577bee3cce3e7a9ba2e542af1c4e75c99167197d6521adedf7f73320b72f5e7a3b93c55b299cca47c10e48ff0d49a2a05423
 EBUILD boost-1.78.0-r2.ebuild 10677 BLAKE2B 4691c074dea43225dabd192e2978fe082468b8decb355b87f7c9007f61bc6e981568a53b1849b518e70d5b583bb5d6960856a88a87f01ed85c5ae0c0a6385f34 SHA512 cf01098cfe185ba42f70817fa328179c40b0698e75a4c72b5bccec0ef35ca205d44109d874fdc94df793aca2b677a16f4900d5b0deb0736cb5f4c068ee92226d
+EBUILD boost-1.79.0.ebuild 10633 BLAKE2B a62b79854e004ff0631fd89327d28f0745e71861ac15df9630148ecf718f0f6eaa8c39a585861e569f1871472fb5df0d40b45524576108a97c8547990dee0e7c SHA512 2a1dbf67d8408ef4dcb41146e216102e45b408e54e37a35eb0cea1bce2e03be9f4bf540003cf1d163de69ab6fe0df1e7f4c1370cdc946969a07fa7757ff7df54
 MISC metadata.xml 1296 BLAKE2B 68366717e95027dc72733a63960c674a710cd3f05ca6adc4d0ce96d1da03725800c39d11b788e063401c1661b67b27972a729861c6d7abecf42a343df889d990 SHA512 52ef93567f2ea6ff7be566eff974407d508d3c1b05d691f8753b6dafb39afaf03ca1d5b0d4d23e6f411099aa8b8a177a0b6b05c668c1cfb387c87d5df5342cad
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild
new file mode 100644
index 000000000000..7b6ced2073cf
--- /dev/null
+++ b/dev-libs/boost/boost-1.79.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
+REQUIRED_USE="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? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+#BDEPEND=">=dev-util/boost-build-${MAJOR_V}"
+BDEPEND=">=dev-util/boost-build-1.78.0-r1"
+
+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
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.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}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
+		${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')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=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 \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	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
+}
+
+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
+}
+
+pkg_preinst() {
+	# Yay 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/cl/Manifest b/dev-libs/cl/Manifest
index 0b7ef351ebda..a041d3dcc168 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -1,3 +1,3 @@
 DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630eae0fb2097f4b2ae0690e41bb96d3fd947186d90b88a68982f5af03bf0cf0f6375304f6a1d05395f018701 SHA512 f7a7f24abf6c374b42f9aa809984c818ac2514d013ff224b3392b2b5df1ba75f2b393ad0bcd822c4118dd0034ed4e815f83041f0b2350ba71def1b33b42e8801
-EBUILD cl-1.2.4-r1.ebuild 613 BLAKE2B 8d1c780c4ab8a412365c9fd7c289affb63cbaa9217b8cfee01d62626d8b2ae41cfab37e313e43cb1ec46e56ae1b9ec0b4fdbd5fff1af0c066a78552978a603a0 SHA512 677644fb6c3bceffce02c680592fc8d9bcaf80ce9ff0f1cf8c5e38ff36cf27fc4d139ceb836bb25e6efb7d3c3779987a9e9c5827be3459817029eb03dafe8fe5
+EBUILD cl-1.2.4-r2.ebuild 617 BLAKE2B 10dd6583cd4a96faf84d07fc09b6754e7cb4a4184c8daa8b3a935c32c005cbc4b34bdcbe79a58bf69394d53118ab716434222e441a429c05b05b75a9ef193b69 SHA512 850b57791223cfea4b1e67a9910d5a73dcd4b75d28c875a7c4883e28dba5cc8a37a728826e4a0ceb0439722d9299853f0a0fc806f1bcb66648ee50c5ab846690
 MISC metadata.xml 243 BLAKE2B 98d944f206eaca5c6181b4ab23118637693b1c29cbbcddb66ccbf2277bffabd56329d978f401d2c911bc4c2bb9af9861c955a9532fa74017c00a1dee0980ce85 SHA512 8526dd024c32c289fe5a96ad71279f71f13da9b14aefb45cae54e7a56d2bb84d7fb92693d9818047d583c7d47c8543bfe6bda28792da0832e487f1cfc9aa535c
diff --git a/dev-libs/cl/cl-1.2.4-r1.ebuild b/dev-libs/cl/cl-1.2.4-r2.ebuild
index 8d9a8d858935..94c50104bc4a 100644
--- a/dev-libs/cl/cl-1.2.4-r1.ebuild
+++ b/dev-libs/cl/cl-1.2.4-r2.ebuild
@@ -13,12 +13,12 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-lang/erlang-16
-	dev-util/rebar
+	dev-util/rebar:0
 	virtual/opencl
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}-${P}
+S="${WORKDIR}"/${PN}-${P}
 
 src_compile() {
 	rebar compile || die
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 48a71caa03a4..23ee51b5b144 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,5 @@
-DIST dqlite-1.9.0.tar.gz 160222 BLAKE2B 7a6179e87ff8e37d19ab28a11bcd02531297095f83fffc936aa8b719be737cbba359b62daeea8de6d4bc599a4bf579a3471ab632fae27186d5f2358324b518df SHA512 eeb759cdca6ef44d3c8d7d032b277dab57c24acfab29ead218aecf826c71631fad22244cadcea7337002049857a8b5cb3b5dcd39d611e41a463128e1e09472e3
+DIST dqlite-1.10.0.tar.gz 170908 BLAKE2B b65cd39a4eb175a016934a174f27043ff1e9fc5404f5324030ddadf15567390edb6388e42b83ab76a0d1d3262343f8a4407d7756b85af30cf281a4b5076f87cd SHA512 f7364d968d0d2aef0bbd59f55bb7f775b41d509b0d1af106357bdb470703e143081649742870491e5c75760d3f6159568395b4a671c446a26df744fd4f631d33
 DIST dqlite-1.9.1.tar.gz 165507 BLAKE2B 275ad91e99335c311c55a51a2228d5674fe79ba2e0b4d1fbb00b62134cd2130c1131fefcde71985cb2a4c90b706ba7f9048818f0711e762f1437f0c263ed1927 SHA512 996767bfdcc4dd5f360b71b16c99b16c6dd3c630cc87746de2df6fc6e74dcdd4ecb8223097f5d85b9c78a4856440c83d3b067f6681f26487a88bb4f511cfe41c
-EBUILD dqlite-1.9.0.ebuild 832 BLAKE2B 89907060fb4691d7303b578dbe83333a18212222479282accfa70e320c91f05630be252ad328a8e8f93d23a2bfb949465f0b0110089da04f953e08646200ddc9 SHA512 73d0734783f7b28957e800c763a0f2ddcbb9bffa95b821efcae55d4d917752f70ea77180443b8f2f56b2b14e9da68f81b03c8ed41598c289188ff04ee0eaeecb
+EBUILD dqlite-1.10.0.ebuild 842 BLAKE2B 73c455d17c797a5689fdf4313a7f03ead033bea538ff86b1be44466e0c016de169544a3575f3fe9ebe47d843293637facda6b1f0bd520808f2b5cf34ebbac524 SHA512 e0e6a7230d3a25d563e170ef43e12975ab9a23213f310aedf60e67d3d84d97d0d4b512fcf7d136ec5faf294449e6d0a8869eb1d2ade392bba70224664c54d5fe
 EBUILD dqlite-1.9.1.ebuild 832 BLAKE2B 81a66a66456fe95fddfc5902d2dbe2e49f88780d00793b8de55cf1c36ae03a4d2d54d85e716445a58961bd26c4f6968c9e42610a5b4ef2b0ea28f7c1a7f9e234 SHA512 11686a22ca5f38b772915c623d5c962fca66a39daf4012f13e5dab7574830895993de13e2c957f1f7c4dedcc42f658d67d6574637224203fd751f229e476d00e
 MISC metadata.xml 865 BLAKE2B 3489de10f0de21d57146940eed0f4b69e637b0226b4be0127f33232dc6d8648ca4c169451948c31296ac5c41d163c8e65e983992f5baeb24db7d1b5dedfa4d22 SHA512 fc5c1fec36820bb855569c5e8bf7bfc3b522f00892489b20062e95121e6bd4e45f6b87a2d7c6d7a2e6b6c92e3dfd39b66705c58920207cf601e029d330b580ce
diff --git a/dev-libs/dqlite/dqlite-1.9.0.ebuild b/dev-libs/dqlite/dqlite-1.10.0.ebuild
index d40d3cf1073e..a3fe7ae6c8ba 100644
--- a/dev-libs/dqlite/dqlite-1.9.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,15 +11,15 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3
 	dev-libs/libuv:=
-	dev-libs/raft"
+	>=dev-libs/raft-0.13.0"
 DEPEND="${RDEPEND}
-	test? ( >=dev-libs/raft-0.11.1[lz4,test] )"
+	test? ( >=dev-libs/raft-0.13.0[lz4,test] )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0c44bf7ff3e3..04a2674f2da8 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,6 +2,6 @@ DIST elfutils-0.185-patches.tar.gz 7625 BLAKE2B 92aff147aa7e45976863e8129e25ecad
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
 DIST elfutils-0.186-patches.tar.gz 3323 BLAKE2B 360365597d3a08d6f4fe843d04bcddd07a44ca93dae2034615abc450517e1be21c81a55aa379c409902e134ae795b38bb7461c65cdba3934ac7ef1e4e0e53091 SHA512 e2d427be505fdc416751a1fbc3bb4f39577859d94ce43990faa83c135fe36be2ddb3a2ef0f1020cfa37060e6d43dc7b8cf3db0d07d62b31bf29cb9a4a5945ce1
 DIST elfutils-0.186.tar.bz2 9230491 BLAKE2B 49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9 SHA512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78
-EBUILD elfutils-0.185.ebuild 2541 BLAKE2B 9e738dc82327c18d3c25870d93e23d238de5b8b384435f4968bcd681bf9a55c31ad5d0b6ea84b03336071ab49dda55fd8fb61ab052895dc3510ed9bf89ad2861 SHA512 05871e419814fc92098dc2ac8b9614b9f62e02fa758aaa84029805fc3513f56347006ef495ff8c56a3811d98992e1de3e659565d15bbe2084637b72ad0a29107
-EBUILD elfutils-0.186.ebuild 2543 BLAKE2B 587869754dda7c7930ac592fdcb1f957ed20408d59802068e9d8b8e0021e3e3b20ca7b250e598b2bb007521ab6b01d44947178e2cd4ef9d308447ba6628757ed SHA512 6ae077a396bf737d3c272e564fb5dff9082039f6bc1ce1fc08155d8972625730cfe3f16596aea3647e2c7318cb39086a0c79a9228464423d58fa4d5b513e0042
+EBUILD elfutils-0.185.ebuild 2553 BLAKE2B 814831c9a53e59cf1029350ce9da041a8bc6d7890af8b24dd3f7c0b9257c9906edc90ed394bd88733504f1f7b8849d9962098017979929ae8f99bddec709fb37 SHA512 9fd9f9fef8b6d73c83bac2bec4b8b69d9cf9bcfd029b21ef409a1f4974656004dd1dd059514b250b13b8806d7038fde18961a41e28bcae3a841e995104d47c2a
+EBUILD elfutils-0.186.ebuild 2554 BLAKE2B bd9055bcc73d88d089ab7c002f421c8721b7c2af222d9f4dba8691d73221319f77250ff967e4d231ca5be99e48773142156cd3c34072258afab2f2f043141d3a SHA512 2c88af4389bc319f8de9430f71a1be4f426be0db2a1b66651579c55a6ec1bfd1701b522930360c3c4c29356e139a03dff59d659d4ffa06b4766b93b45b04da3b
 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index 26aeca00e2e8..85bc9ecded89 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2021 Gentoo Authors
+# Copyright 2003-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
+HOMEPAGE="https://sourceware.org/elfutils/"
 SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.185-patches.tar.gz"
 
diff --git a/dev-libs/elfutils/elfutils-0.186.ebuild b/dev-libs/elfutils/elfutils-0.186.ebuild
index 1cb034762231..1c83e5eca374 100644
--- a/dev-libs/elfutils/elfutils-0.186.ebuild
+++ b/dev-libs/elfutils/elfutils-0.186.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="https://elfutils.org/"
+HOMEPAGE="https://sourceware.org/elfutils/"
 SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.186-patches.tar.gz"
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 50e8aab05742..a8828d09ca38 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,8 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
+DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 EBUILD glib-2.70.4.ebuild 10120 BLAKE2B 9bac993665ff720a570c18e4eb71ad256f2906f903fa4887deddc80f75ac311854fcc555afe1c053e96df649eae3dc7b6a461ba2afbc3dd0aaba5915f6553bc6 SHA512 cd2348fbfa1087494d57f711483db6a91939438b396eebee128363a3eb46c145713b52aa3a4154b260377f0c520011e90334727b60e87eab554850fa2e0315aa
 EBUILD glib-2.72.0.ebuild 10128 BLAKE2B c6b75fb3b147ef69a9b0df00b83a768f0c5ca900627d7f985f76567e173d820a20aed6ddddea06961d8c046444850cd34cf1a7afdcd228ff16179c1a90322149 SHA512 78a350e8d9bdfc0cbae09bbf04642d5915caa6d228b790731ae86dc1835d8685792748fa7249d1290f00550a44af59a79c453c8d46eda27729695287808012ba
+EBUILD glib-2.72.1.ebuild 10128 BLAKE2B c6b75fb3b147ef69a9b0df00b83a768f0c5ca900627d7f985f76567e173d820a20aed6ddddea06961d8c046444850cd34cf1a7afdcd228ff16179c1a90322149 SHA512 78a350e8d9bdfc0cbae09bbf04642d5915caa6d228b790731ae86dc1835d8685792748fa7249d1290f00550a44af59a79c453c8d46eda27729695287808012ba
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.1.ebuild b/dev-libs/glib/glib-2.72.1.ebuild
new file mode 100644
index 000000000000..49fab3db4863
--- /dev/null
+++ b/dev-libs/glib/glib-2.72.1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * 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}] ) )
+	elf? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1: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
+
+	default
+	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'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+	)
+	meson_src_configure
+}
+
+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() {
+	# 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/gmime/Manifest b/dev-libs/gmime/Manifest
index c50c972cfd1e..063036a3fc2e 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -2,8 +2,8 @@ DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791
 DIST gmime-3.2.11.tar.xz 2230984 BLAKE2B 7a1758d8b7b3e4a3b27819b3cd4002247209b0d979813b3071d7423341c0a5786d929110c18d23bad5fb74cb15a142382eb63afc1bc019b1da148ed8a0acd524 SHA512 0d61ce2c7716de3fec2b6666937f01b880b45a1fe7b6c40b5d253e8510f8a4af3b274473b0da4319018747484df35df7ac8fe0ebae019b2f956c525182cf30f8
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
 DIST gmime-3.2.9.tar.xz 2230284 BLAKE2B b6dd81adf939fed8fee70880e2c3f907d9eb8fb33efb90c78d6e6c93754e310f44a1affa8c59ac980805be42bbd5f61353633ac071dfa8fd89b65f2f23cbda24 SHA512 00b92ff5e2001644bfac50d1736203dd478c3a44c8f325a216105c5b354540807df9a6025bd0313d1e60793d8388ed4f5ff72685e116e3f36e6ca8c6b326a19b
-EBUILD gmime-2.6.23-r1.ebuild 1446 BLAKE2B 2f33b0c77267916299e67120a5bcc2009917ae3adcea844d6e066d0901e1241455e1f26cc72fdbd5db400b8b08344d267450664a380fd1b2be1d57fd4c4824a5 SHA512 33a21fae9e9cadb9a7de26a593ce4b684bf605812ff280d3b1a933953cfefe0a07d93061427ecb5d943962ff8f3de783d2211208a41b5b2d4b429076ee5bf8e8
-EBUILD gmime-3.2.11.ebuild 1643 BLAKE2B a7673007086416b8c927306a22a667f0e88e0e6ced815c87896c2ce654cd77f8d778d8bc32e973f223f9d965cdf0e857e4ecc0459df1c62bf939a88a97357ee7 SHA512 cfbc8018fd2a07d014bfa475d687ffb9bce7332a5bc66d4bc6133a93bb639a6ad1d0d3d80dc937bb9bd963b80ba5c1576c3b41bba8df008ab36f9c58a621d5b6
-EBUILD gmime-3.2.7.ebuild 1578 BLAKE2B 0296a81dba65f0e16229ecde33060b905279c716684925eaf94d87b0d736658c9fb7a22039177dbeb3ef75ae40da6d718efae5fedbf621d7e4123458714f08fc SHA512 ae274233dfb71264e83d1a9c432ccc6cdaaea26fb375ab69be1998e24b232a76772658857cebeaa190ee87789744d493e7fdef6ed16693415b1c7cea8a912a91
-EBUILD gmime-3.2.9.ebuild 1643 BLAKE2B a7673007086416b8c927306a22a667f0e88e0e6ced815c87896c2ce654cd77f8d778d8bc32e973f223f9d965cdf0e857e4ecc0459df1c62bf939a88a97357ee7 SHA512 cfbc8018fd2a07d014bfa475d687ffb9bce7332a5bc66d4bc6133a93bb639a6ad1d0d3d80dc937bb9bd963b80ba5c1576c3b41bba8df008ab36f9c58a621d5b6
+EBUILD gmime-2.6.23-r1.ebuild 1438 BLAKE2B 4308360fa149361b0873b37c1ec5635e8f2ec089b2e6b01d98ffd085e896d8cad936c12adf2c3ac5add7638c00eaa7f253a2aa34a0f6a690382f1487e3d59c40 SHA512 5af6e472477b49f6fcec7bafa259e84af13c84ce1ab9fb1b1a4bbbfaace36fb0c470af2cf9dc9a0e3be7c75d8b9dd27c424c2bcbb95c6d84bd36f93ad60db72a
+EBUILD gmime-3.2.11.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
+EBUILD gmime-3.2.7.ebuild 1570 BLAKE2B 8d149cceed3227e8c4339af56951feb260facd7c8cbcaddd0d9fc621ebf68aecf46524ebcb27a8ae083cbf7c8dcb996f2cc7783641d221127a4351961da63454 SHA512 67336a0a1eacc742b8fdb6d5071ae168f391ee80a634d516727458722ef1b34b9858f1234e16cd62bb0bfaa53ca4c5f90ccba5350d953e4641cc86dac903afcf
+EBUILD gmime-3.2.9.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
 MISC metadata.xml 408 BLAKE2B e340c8e376fb1fe428478c937d8e018f5b8c475cde16e947467434a7f86227d07ec0d1f9d61226e7f88c763a1d292f39cf4886569d218b4107bbe0b8465b35f6 SHA512 b75375be09c0f37a41d0a1f1ef0abde6880fce81e8318c480df27b954e39aa5fbb69826ff9243f029af2eb959d50641330f31f4bbdfaa6531e031326099cfcc0
diff --git a/dev-libs/gmime/gmime-2.6.23-r1.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
index 2a6e0ed982f4..cbeaa7bf8361 100644
--- a/dev-libs/gmime/gmime-2.6.23-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
@@ -6,7 +6,7 @@ VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala flag-o-matic
 
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
+DESCRIPTION="Library for creating and parsing MIME messages"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
 SLOT="2.6"
diff --git a/dev-libs/gmime/gmime-3.2.11.ebuild b/dev-libs/gmime/gmime-3.2.11.ebuild
index ccc807d2d80a..a7eed9e822c8 100644
--- a/dev-libs/gmime/gmime-3.2.11.ebuild
+++ b/dev-libs/gmime/gmime-3.2.11.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit flag-o-matic gnome2 vala
 
-DESCRIPTION="A C/C++ MIME creation and parser library with support for S/MIME, PGP, and Unix mbox spools"
+DESCRIPTION="Library for creating and parsing MIME messages"
 HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/"
 SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index b875e0ba71af..a4abd373a114 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -6,7 +6,7 @@ VALA_USE_DEPEND="vapigen"
 
 inherit flag-o-matic gnome2 vala
 
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
+DESCRIPTION="Library for creating and parsing MIME messages"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gmime http://spruce.sourceforge.net/gmime/"
 
 SLOT="3.0"
diff --git a/dev-libs/gmime/gmime-3.2.9.ebuild b/dev-libs/gmime/gmime-3.2.9.ebuild
index ccc807d2d80a..a7eed9e822c8 100644
--- a/dev-libs/gmime/gmime-3.2.9.ebuild
+++ b/dev-libs/gmime/gmime-3.2.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit flag-o-matic gnome2 vala
 
-DESCRIPTION="A C/C++ MIME creation and parser library with support for S/MIME, PGP, and Unix mbox spools"
+DESCRIPTION="Library for creating and parsing MIME messages"
 HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/"
 SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index e9ed43501e0a..dba68ea83af2 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,6 +1,6 @@
-DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz 7637646 BLAKE2B 80a2e5fba2c5d75903dec43eb663d4f354c55317efe2f0c0e5b53bcff3ff17d17ade605a1219550a025335cfa75eba8e6b38af01ecfdf989de7741a36cc37d4e SHA512 db786cd38eb5deb77a6c189ebd8425618a6281c7129355011295517020cb57982f0d568dc0f77bbf2bb709e6e05c729e0ec50351fd7951909723173fe89ccd26
-DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
-EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 1b3067f397b59fe1ad908f8b2206ce0f96e28a7bf8c76314c5e8f3f98b647ea6395c760adeec6cad47d1e58f1560d05f83b940d24ac227b45436a980034ae3da SHA512 29aefc32fe5c14277eac2bb80c6c48c01055089e50fae0a87951b944a3dbb5fe58beaf277c353eb2dba952ff01405f700892dc084ce39d0515cea9d513159fa1
-EBUILD gnulib-2022.02.12.16.27.05.ebuild 920 BLAKE2B ed0e6932dd1065be5f8fbbe33b19455648f16718b7c93bdfde70de0887eefbf07ad85fe656258be8d4fc3cfa9bbf6842718604b5c7e57978ebcfa8618bc4a01a SHA512 05701287a1795b14a67b43b8fbb1fe675068dc169745a5c971f7c6828014b854f863d3918038f11c5484e83b49fffde822f04f3573e0fdcb3f3f362d4a2ab9f5
+DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.xz 4711472 BLAKE2B 901fd3b3388210f090825829d1de43395819ee907574e2cf7c6586c93ef72afd26e68abc7ae27d1e462a703f1d3bedf37ffcf4d8924fed32a95bc94ae83399d5 SHA512 04ab346648a23a4f58dc2d818955ae145bc9c21c3b24a1719cdf48bb8116e3765de675bcf19747d64d43432db1bb406f403168f973f24811f9d126deadea7e7f
+DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.xz 4104308 BLAKE2B 099ebb4f4a7745e5b7367f48d8d9cc11d3ac1c03b59aed2801f684fb6433e3dc1efd6b801a864308f440edd6068c7d1bb1763887bcabe2da4f927f5507fa7f89 SHA512 ed97c589b8a39b1d41c0e2e6c0bafda4df99191b8aaae3feb5f46dffee5787d16ad2c4ca62bf50e2964f36691ef446f67540657b1b0cfc5c775acb88816fffb5
+EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 6a362c257853e60109ea1c5e5ead6f9132551f066862fc6fa74e27f8c284ef51581894ac9ea7afb0389d40c8b5dfee70708e501fe238f6b9bae64d635e63f204 SHA512 9f6e29ad602bda13257304435c78d32bc9d412648fadcab689838105ac7161d050022fcec292979a199c5639dbdd69aa5a76d1369109f578879d16907ea9bc2d
+EBUILD gnulib-2022.02.12.16.27.05.ebuild 920 BLAKE2B aaf9cbf56b57e3829844a2a650a0af3c920f3564876a9d0b9b4c7cb32615063a1c8ab3eaf4cf19a81b4a4c4a1219f5cda9f222457ea04cc5ef83ef1894d290da SHA512 dbede04293836c00551e8db17baf92a1e27de6493879e7ca8fe4cc76dd0522eb6dd511b33a00a7c29bdb16c033768b00806c227ed3423f35528ca0db08ec7432
 EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
 MISC metadata.xml 244 BLAKE2B f599747a5c4b523305b9895669bb3171446bd4edf7339753b21ca14524c010a83bdb41e83851df393240077c31891fefa1a9bd876bda37cf2ef77731a76eca80 SHA512 7db5efa0f85d76e9ff76fd6a0e83908ccb9d5486b2994277166976ff531b9eb88806ca80cd3cb070bac89f383872733c8470d04f86a67854d1b023eb24b4e2b5
diff --git a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
index f8ff711142ef..b703f1d17da7 100644
--- a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
+++ b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GIT_TAG="b451121ab45497e78cb6f612c8673a9705193391"
 
 DESCRIPTION="Library of common routines intended to be shared"
 HOMEPAGE="https://www.gnu.org/software/gnulib"
-SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.gz"
+SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
index 302bd8f7f895..cd8850df2d95 100644
--- a/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
+++ b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
@@ -7,7 +7,7 @@ GIT_TAG="9f48fb992a3d7e96610c4ce8be969cff2d61a01b"
 
 DESCRIPTION="Library of common routines intended to be shared"
 HOMEPAGE="https://www.gnu.org/software/gnulib"
-SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.gz"
+SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index d1c7eac46ae9..69e2fa8fdf08 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,4 +1,7 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
+DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
+DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
-MISC metadata.xml 380 BLAKE2B 8ce5a87c902267e85bba46c378db4430060c8a6d66e7ad869373bd533bcf88ae8870f1814350e76713d54545518b3650ffb7b288e29e504b82fcaf1ef1880fb8 SHA512 6cd44c60cbe48e130cb58d330deeeee325131080e0bc366ea7a1a969e269bd366340a815984fb7dcb3e47b70b81cfe837f601e1c20d358ea6931142d27f4c040
+EBUILD icu-layoutex-71.1.ebuild 3444 BLAKE2B 0cca2c97c0dae9b172ebefb2cdb2f0db91c7e8b43bac4a7482591c43313bfed47c7ffa04282f67c7bbdcb9e2e7d061a617ac55646d2904368e6e7d882a33b070 SHA512 be69692c69d6ca047affea7516173b9fe8a004bfe7356325594bdb62fa5d2f1cd0c15eab15fb35294db29c1391d5080d32a10099d3abae861b106e988b3f9fac
+MISC metadata.xml 262 BLAKE2B 5f01484e6cd16c1234d97ca24813fe4b74cafdc61d6e3c1ae58ead74558909ef052e406aba4abd7440f8dc45ff6548aaf4a863f0eb46c23e1e389ba52e0c1353 SHA512 3d2f08eb53da96ec680d73c3fad400ac4c2081db37d104647fc53008abef2dd78fab180d6295f850469e0c5da2375b083577a9713ae7701c046eaa24c0115ca2
diff --git a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
new file mode 100644
index 000000000000..d66b5589337f
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/icu
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="https://icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )"
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-icu )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" )
+
+src_prepare() {
+	default
+
+	# Disable renaming as it assumes stable ABI and that consumers
+	# won't use unofficial APIs. We need this despite the configure argument.
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		# We want a minimal build as this is just for layoutex
+		# so we disable as much as possible
+		--disable-samples
+		--disable-extras
+		--disable-icuio
+
+		# This is icu-layoutex, so..
+		--enable-layoutex
+
+		$(use_enable debug)
+		$(use_enable static-libs static)
+
+		# Need tools for tests, otherwise get this in configure:
+		# "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests.
+		# ## Expect build failures in the 'data', 'test', and other directories."
+		# ... although layoutex has no tests right now anyway, but let's keep this
+		# for the future.
+		$(use_enable test tools)
+		$(use_enable test tests)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu-layoutex/metadata.xml b/dev-libs/icu-layoutex/metadata.xml
index 9d1459047c12..ff67d627248e 100644
--- a/dev-libs/icu-layoutex/metadata.xml
+++ b/dev-libs/icu-layoutex/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
   <maintainer type="project">
     <email>office@gentoo.org</email>
     <name>Gentoo Office project</name>
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index e809d14bcde7..e1894fc8c1c6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,5 +4,8 @@ AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d1
 AUX icu-69.1-fix-ub-units.patch 866 BLAKE2B 29b849c08bd0ddb19ee03c37f34873819307a0daa53c00724ea27842829acc895a9a9fffd7a0ef03d5629d17f15399be3df7a2f0270dbbf65512dbfc0f41f66e SHA512 d3d72909643ffb2d3f4407d6e9259b661f7ee033bcc8b35a7a771d8c2c6295a7bf1139ad8b6aee14f3a2291d15c3dfbbc847aeeb1fe60c64c4f2dc202e34d88b
 AUX icu-70.1-fix-ucptrietest.patch 1086 BLAKE2B a61919181c015c5f4673ba7ca6513f50e3f6ac3b5a3fc4541ace854cd44b8d77fc4752c91c90c0275647a65b83f56061619726c714296dee7db6906a5f4b7e8d SHA512 57c08fc2fab69050b338f3830581087d69311ae1a622b1b48e7986822219fc728c981b1434c30fa15bd21c528a64672ebf5dcfbedbfb0f8ab401c3d1278dd4a1
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
+DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
+DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 EBUILD icu-70.1-r1.ebuild 3694 BLAKE2B 3e47d60528a8330807d3238de5c4e55c5179d77b676ead14bbe421289424758199967665ce2236a98636ee252e6245c8184e5535e1aed922043860c3b785c2f2 SHA512 9abfec28beb93afa6a7faf3eb55ab7e4c2492c1e433e12b8d7bf8b65fbb89478fc18f5dd732245d932009f070aec70321800bbe0649570e6dbbc1fd970352cc6
+EBUILD icu-71.1.ebuild 3971 BLAKE2B 624969a7943c57afdc83805abe713f61618a8c8f6c5c3124fc915bf7f8af0384c1ebe0013e086b4cc660dd73afc5fe44f786a0bad05ec11a8e538c3e44127a1b SHA512 09375e80cd12d68fe01ccaee755338c5c187b0af9a5d3f017938808465c70284342c8119d373e454ca69405e76fec19a2386427a8d0f56fa5d8a23d3fb4d908b
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/icu/icu-71.1.ebuild b/dev-libs/icu/icu-71.1.ebuild
new file mode 100644
index 000000000000..e721330147d4
--- /dev/null
+++ b/dev-libs/icu/icu-71.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/icu-layoutex
+
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="https://icu.unicode.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )"
+S="${WORKDIR}/${PN}/source"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	verify-sig? ( sec-keys/openpgp-keys-icu )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Disable renaming as it assumes stable ABI and that consumers
+	# won't use unofficial APIs. We need this despite the configure argument.
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# Work around cross-endian testing failures with LTO #757681
+	if tc-is-cross-compiler && is-flagq '-flto*' ; then
+		myeconfargs+=( --disable-strict )
+	fi
+
+	# ICU tries to use clang by default
+	tc-export CC CXX
+
+	# Make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# Probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( ../readme.html )
+	einstalldocs
+}
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 286c8c5fb4b2..241f1f000b1b 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,5 +1,7 @@
 AUX imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch 719 BLAKE2B 3919766914fb929fcadfca3d77a3d025522c6210e99654a68b7d0a580d59fcbd3a09403260a4da7dd80bae7d1e74c12ecfe6fec9190f0447b5e16a462d69f159 SHA512 01fc0ed3cf07ef58caa0321922b2e4882be9e7b1e5bf554ab6f6ef236197e95a48ade658f34abd04748604b62c8e5559257503cffe9fd5079d237ed7de46aa8c
 DIST imath-3.1.4.tar.gz 572214 BLAKE2B 6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e SHA512 f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
+DIST imath-3.1.5.tar.gz 570875 BLAKE2B f78c8278a3ecb40afaa291b74c50c2ce01a5cba594e690041a57cfd3a65f9fe0842a41d600906ed864df239c2753488dedca53bdfa65a90c13513111a8068ca4 SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d
 EBUILD imath-3.1.4-r3.ebuild 1793 BLAKE2B 64fd0eeeaae148a21d7f58e2df9c7adbc84068534c08a0a23a232075abd298eca9b1b378f0c69077044361685cdfe4b931e2f80a1ef90e94c5b5e14fea2a8b59 SHA512 6e4c9e4ac06c85db01969131c49f76aa93e59ca8358f61c422407e4dab3a5fd4f4bbf7efa2fb22f0f931d4fb8d47cdbd2fe4d509535dac63feea4fbc9007831c
 EBUILD imath-3.1.4-r4.ebuild 1877 BLAKE2B 2c4fd6c647157f06445b0f2c9547bcd7ad90ad019d0112163f9e263aaf012a5f3a6dd06b7568cad764bf9c15b8bfdebe1fa26b292744752057b695be02027a50 SHA512 efff61f4b210287e5b9ce128183d45a54fa145e90815258d8a2d40b7302c0dc5d6215ca5d674d16b6d4f906d4ae80329df881693db791551081dcf5c3fb8bf32
+EBUILD imath-3.1.5.ebuild 1796 BLAKE2B e2c0c6e94cd0fcef06cc67befd0e326b726d5558bfd9365bb6f1ad99d849cb791a673ff7e134babbde89953340927cb229b7e12ba623170068f7b14cb1df5e50 SHA512 f4f6bdf78258bd99f1cb2dc459fa75c81b7cbff527b7bac080adbf820f1237312315b79034c0b462cdc8d35957ac147aa31d1168c6d0cbee66fdbbad856c87bd
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/imath-3.1.5.ebuild b/dev-libs/imath/imath-3.1.5.ebuild
new file mode 100644
index 000000000000..9b40568f036e
--- /dev/null
+++ b/dev-libs/imath/imath-3.1.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="${PN^}"
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="3/29"
+IUSE="doc large-stack python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# blocker due to file collision #803347
+RDEPEND="
+	!dev-libs/imath:0
+	!media-libs/ilmbase
+	sys-libs/zlib
+	python? (
+		!dev-python/pyilmbase
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
+	python? ( ${PYTHON_DEPS} )
+"
+
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCS=$(usex doc)
+		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_USE_CLANG_TIDY=OFF
+		-DIMATH_USE_NOEXCEPT=ON
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DBoost_NO_BOOST_CMAKE=OFF
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR=$(python_get_includedir)
+			-DPython3_LIBRARY=$(python_get_library_path)
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 4b5288fbaf1f..28ae8efe4de0 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -3,7 +3,11 @@ AUX intel-compute-runtime-22.12.22749-metrics.patch 1567 BLAKE2B 51f69ba75dca353
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
 DIST intel-compute-runtime-22.12.22749.tar.gz 5234659 BLAKE2B 162c4781561a131af51779108817d2a39ea9676e3772a776603c1e7670b03eddd800593a6e9d77d852476b2401582f3ff87c8b9582b5fa0769ab5ec48be6ba70 SHA512 16e4c76a38284d4e1470977845d338dc05195351ac53d63528e93f1990b81d03a8f1a31c53c665fb8e19b5dc9f4ce38ff392ee1158769780de7a7cb83b2b361b
 DIST intel-compute-runtime-22.13.22789.tar.gz 5252140 BLAKE2B 81fe85e75b1f6257771950dd2716e48f8db61dbe62f747c13ed00be7385c9e6a2f2cd2a5d50cf4253962d13bd1fdb4449a5e646fe3a8b10af228f746b9880210 SHA512 e4d22d8f73463300424b2df9a9634f0b5ac341131de33e57d46ffd52ce0b3fbdbf62cf591876d2143ca14caeba42ec95f5aef201eb9895e5d36b2279b15e661c
+DIST intel-compute-runtime-22.14.22890.tar.gz 5290076 BLAKE2B 9a6ec8ed142a183d270006726d34492adea989bc2db9eff53046f4c247f7d5089e4cbb6448513b54eeaf7079f990f9a3b6d31cca53459bc2fcd1ced5d2b1bea1 SHA512 78c195832a0f55ff0bf64519234a5f70f1459263000804db1cc73a72c4c07e12c540a9fa0a574bf382713deb132be50b6e6eb7b4abfd264f707889bf02fc1af7
+DIST intel-compute-runtime-22.15.22905.tar.gz 5301399 BLAKE2B fd2d2e6e284cceba4b2de5d56cea537784ae774b047ed1b67f17f92acbc821579ab619e509aa67de9802bb94bdae215372e64575c2590b24d69a0c9c10d63b66 SHA512 9976d762e4851a48bb72e4c59ec4c557a02b34c959bd5c602eb31232d473501e6ea6fe925385a579df6a120537b1efde2c0bdc409c94b2b2072a14761b293973
 EBUILD intel-compute-runtime-21.46.21636-r1.ebuild 1387 BLAKE2B 7a927c6d9cf7d1d4b80b4586fbd989e2cdf8877036c79df2db01054152d5db346f63856b0a37cd4e3bb800d38f918daaf44fc34d4306fb0f06287954ad281c3a SHA512 0fc688519ac6251963974264a7ecdd1f721c4ed02338e6358a25f84a036a81cca4a8e44c7191f5082cd3d687e7064e559f018b722267a33dcfbc889b756955bc
-EBUILD intel-compute-runtime-22.12.22749.ebuild 1703 BLAKE2B b5bfcd69ed035bd4c07d74424def5b1f2d284f84d4cd8335d92efece424cd2131a8642d2b62ab70b2b7b886c89c4e6b5ec48caf615b12364566c3c2c69f99727 SHA512 72eb8e2a5f0644242946d3057a57a8c70e525f0cfb465cb4f0bdce5d1e104b54e8e1411a976db5030c33f260551c9d478dec371f63d3b7326585dcfc342d76ba
-EBUILD intel-compute-runtime-22.13.22789.ebuild 1644 BLAKE2B 6f6d93437ecc6904ee436f1c126c67a65ecf44039ed3de0e68f014841006458208d7e7276d93a3bcbfbe1f3d27ef55a29754bd928f8fc3f7cbb9063634773631 SHA512 fc63c5e226862c5c8ebfe7870cbf3af2797cff83c07c18a7dddb492eb2c7f343f2edffa337c9ee4dfc0eee2ea63359c75d1976168279519a176a5c06f4a74b09
+EBUILD intel-compute-runtime-22.12.22749.ebuild 1804 BLAKE2B a8b1dedf6ea95429b62aff4e71fc1c7c589deb67d31f9f6fe3798596b908b40508dac635431d2e2c65d9b1347f11128c32221888675b70d00ba3c09da9d0a122 SHA512 de4fadf01f6c676c7041beb048ef3acdc4dd369442ff65a2115083e63423a9a5d2c7ede0fa4ef3dbfc44ecc948aab8272aa05e4521812e60ba32fc0caa7e5f7a
+EBUILD intel-compute-runtime-22.13.22789.ebuild 1745 BLAKE2B 6c24f50404791499cf3dbc3d095d6436819c5f3c857c4da90be6f849a4b060f71ea7faa59101cbe79943c6d4866145397ac1634cf51f627da6034c302bb71a8b SHA512 1f163d8909fdbfd090f61c3369ea38e7364ff99a5dda6d5681f74733463d97bcac23809878b0523ca87a17d74ab5fc6271fca10b69f8486a8de3ded172f8ebf5
+EBUILD intel-compute-runtime-22.14.22890.ebuild 1745 BLAKE2B 6c24f50404791499cf3dbc3d095d6436819c5f3c857c4da90be6f849a4b060f71ea7faa59101cbe79943c6d4866145397ac1634cf51f627da6034c302bb71a8b SHA512 1f163d8909fdbfd090f61c3369ea38e7364ff99a5dda6d5681f74733463d97bcac23809878b0523ca87a17d74ab5fc6271fca10b69f8486a8de3ded172f8ebf5
+EBUILD intel-compute-runtime-22.15.22905.ebuild 1745 BLAKE2B 6c24f50404791499cf3dbc3d095d6436819c5f3c857c4da90be6f849a4b060f71ea7faa59101cbe79943c6d4866145397ac1634cf51f627da6034c302bb71a8b SHA512 1f163d8909fdbfd090f61c3369ea38e7364ff99a5dda6d5681f74733463d97bcac23809878b0523ca87a17d74ab5fc6271fca10b69f8486a8de3ded172f8ebf5
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
index 4b6c563cdd2a..fb7f4bdf494f 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
@@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE="Release"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
 HOMEPAGE="https://github.com/intel/compute-runtime"
@@ -44,6 +44,9 @@ DOCS=( "README.md" "FAQ.md" )
 PATCHES=( "${FILESDIR}/${PN}-22.12.22749-metrics.patch" )
 
 src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
index a58424820a2a..eca15c13bd28 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
@@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE="Release"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
 HOMEPAGE="https://github.com/intel/compute-runtime"
@@ -42,6 +42,9 @@ BDEPEND="virtual/pkgconfig"
 DOCS=( "README.md" "FAQ.md" )
 
 src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.14.22890.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.14.22890.ebuild
new file mode 100644
index 000000000000..eca15c13bd28
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.14.22890.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.10713
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.7.15 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.15.22905.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.15.22905.ebuild
new file mode 100644
index 000000000000..eca15c13bd28
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.15.22905.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.10713
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.7.15 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index f28140224819..af85f7a71611 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,3 +1,3 @@
 DIST intel-metrics-library-0_pre20211123.tar.gz 227022 BLAKE2B c718c5972ae1cb8d36c65f541832a36c7107af1299c2cd4101df1180325a97fca5ca2066574ee0bbc31eaac35286c27a00b2c292058453b5fcf41d745585a0ad SHA512 e54d68c5b31c59258086f89d56ea819ed4a680901d65862361dd17e172be7806cf21be9999d907a0f59fe8c3295cab541402dc0f7c41a944f4aee1481356c2a9
-EBUILD intel-metrics-library-0_pre20211123.ebuild 621 BLAKE2B 63170347699c62c4b1c963bd7c0e250402601ea0a1675f450c21f2709cf30f018470df2d2c70866023d8ec6a46cb91b50f3e4aed942442d17e5f8485981513f2 SHA512 8ccebafcdf472f1d069f4932f49d103efb1df52e96efc605bde79d1eef797f2a8042ac35b0523dfe6f2bc6f82d73aa70785f6156d52363ef3e5256df50a0f94b
+EBUILD intel-metrics-library-0_pre20211123-r1.ebuild 620 BLAKE2B a6816bd671a47bd149b7ed2fdfe9c6b34854fd826ea8a0560a62278c8b7e29742f420af6dec4280df2974c47e17ae43621d2cf059fdc5c233907f5cab5f718a4 SHA512 d833c9fe47587147455d64810c4c9d3012f9d9beda34a025cf851f99dcca2e83b279a5c230ed7edad6a14145006fc039111dabd73b2d779c2f89f17a8c5c8442
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
index e06f9566edbb..72b126c35a7b 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
@@ -20,4 +20,4 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="x11-libs/libdrm"
-RDEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index a2210985f13c..8e09c791e355 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,3 @@
 DIST level-zero-1.7.15.tar.gz 396788 BLAKE2B 794b1ee0955ffaa8671918cba8b31f388bfd8464bd59c3e041cc976d36831ee8e11ec64b1428613bd1621a6118b7794c908071756060f1bd8f2239e77f3c6817 SHA512 84600ff4fd18abffc8765c071454e7fef7a49d7ff711c97e326bae4a8e4295f2e611fac99bcaaf7ad555916d7078b36dd91b45cf57a00bd9e995fc028a40fd2e
-DIST level-zero-1.7.9.tar.gz 396946 BLAKE2B c0b09e5318d5ba430b760d28d0f0943f8de910eaa0acc6477947ef4d6e0dc8af6ba3e1f8b2728e6fd9e763f038d1a22acd8c1d23eaac2e6fafa1f1f6913a91cd SHA512 65721d00de32d4b483eeca2b9f803a05724619afc46f664d6d5fb344fcff6a053a9a23daf24ab0fa05f598c7fde3e91c6b350fb9e8bf6ea38c596dbfe42fadc1
-EBUILD level-zero-1.7.15.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
-EBUILD level-zero-1.7.9.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
+EBUILD level-zero-1.7.15.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.7.15.ebuild b/dev-libs/level-zero/level-zero-1.7.15.ebuild
index 84d0079b1c54..af873cd942fa 100644
--- a/dev-libs/level-zero/level-zero-1.7.15.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/level-zero/level-zero-1.7.9.ebuild b/dev-libs/level-zero/level-zero-1.7.9.ebuild
deleted file mode 100644
index af873cd942fa..000000000000
--- a/dev-libs/level-zero/level-zero-1.7.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
-HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# According to upstream, release tarballs should contain this file but at least
-	# some of them do not. Fortunately it is trivial to make one ourselves.
-	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
-}
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index fa306b74b052..a83dd522dd3f 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -5,6 +5,6 @@ DIST libarcus-4.13.1.tar.gz 32077 BLAKE2B 8a75de1ccd0879db817cd67600f83e765e00ee
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
 EBUILD libarcus-4.12.1.ebuild 1358 BLAKE2B 3cd3af7a1b25a29159f79f6cb5e5e10af181504206ed8cc8f100b4e8748e1853020c72b2c22bd0af288b3007475ef46e2f5713fb671257ff8ed28048cdc3c06f SHA512 9e63dccc5817e5e65f3a7e23a4db9b1d5490b4f8002f7c1bf70c2afa2f7c6a27e0012411a7d547d5bfaeb06ce7ebd72bf906d9d43119b97f7a7c88ecff5bfcbf
 EBUILD libarcus-4.13.0.ebuild 1359 BLAKE2B ae3a4eeb376b9097cd770f6d882484ae19f8d6805c6b6100acd47c57d8d9a6e2be08ac2441b7b814b3d9d9fe475a4359315bc765e6a8e485e06956199a075354 SHA512 72af8d29e2f2c886fc98cbc839807c692f9f6d340db89fb9ef3a53eb61425b596383bfd3f3a3c6b0886ca35d5f656ef36a10cc35cea77397fabc92e7706b22a1
-EBUILD libarcus-4.13.1.ebuild 1359 BLAKE2B ae3a4eeb376b9097cd770f6d882484ae19f8d6805c6b6100acd47c57d8d9a6e2be08ac2441b7b814b3d9d9fe475a4359315bc765e6a8e485e06956199a075354 SHA512 72af8d29e2f2c886fc98cbc839807c692f9f6d340db89fb9ef3a53eb61425b596383bfd3f3a3c6b0886ca35d5f656ef36a10cc35cea77397fabc92e7706b22a1
+EBUILD libarcus-4.13.1.ebuild 1358 BLAKE2B 3cd3af7a1b25a29159f79f6cb5e5e10af181504206ed8cc8f100b4e8748e1853020c72b2c22bd0af288b3007475ef46e2f5713fb671257ff8ed28048cdc3c06f SHA512 9e63dccc5817e5e65f3a7e23a4db9b1d5490b4f8002f7c1bf70c2afa2f7c6a27e0012411a7d547d5bfaeb06ce7ebd72bf906d9d43119b97f7a7c88ecff5bfcbf
 EBUILD libarcus-4.9.1.ebuild 1359 BLAKE2B 103675b40d9849aaa5c9b1a077a3ca0efd2f2c539f6e7caf53115411996f8a36c4a58ef5b512076cc9c95b9c57e2ab60aca458f4f804b67c9e9de93e5ff48856 SHA512 19789acb5e8e7bd6b7db4354432372a4feffb588f48845e2ddfcef64d642570bf3396b6292ca454fb6bbb90754a29b26190fd76e0cc231fc56365c91c9101756
 MISC metadata.xml 1286 BLAKE2B 149e6008ee050d64c46009c12f18dd2e18234e4f19c1093fd0c557cc3d9369b547b07f7397975ab74b58d96ce39210f6a213b2f750ac2f844da579ff9f4ba8e3 SHA512 d6efb7fab1d6072cf8ad1ce5d2a33956eb9a8ac78992a434201d89de444b29382223e91f3c25475128a07fc81cfd4382bd396f9f16044f33b5ec4cdac8612b0c
diff --git a/dev-libs/libarcus/libarcus-4.13.1.ebuild b/dev-libs/libarcus/libarcus-4.13.1.ebuild
index 119faccb2d4b..0490a9cfc427 100644
--- a/dev-libs/libarcus/libarcus-4.13.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.13.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="examples +python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libax25/Manifest b/dev-libs/libax25/Manifest
index f029f9ca0480..7abfc47d39e5 100644
--- a/dev-libs/libax25/Manifest
+++ b/dev-libs/libax25/Manifest
@@ -1,3 +1,3 @@
-DIST libax25-0.0.12-rc5.tar.gz 360123 BLAKE2B 55b1797977e5bb508aed67b43665cefdb7b296c6f2fc5d68f2e59e20da4833cd19030c1fa6deee4d463135a5eb4a944c2c779a47570e5cbfb10fd640f8c00bf2 SHA512 01aaf1ef5be7a347ec702f890e26e7cad02eff1cc8b4932fe9452cab8012bb0d7cd25f74871d83f188f22a3a5fd600ec57131ddb540a6c746908bf47e42f958f
-EBUILD libax25-0.0.12_rc5.ebuild 561 BLAKE2B 0d5b69d1acaa0bb1b57bbcc9fcc40182dcb034ccc23b66c9954fc608c6627afdd76c5681efeff9951c8e43167a716a1936efe48c4a2d8ce47263db2c5853053d SHA512 f1c5927d147fe5b1718fc59c2f340ffba39e9eead7d23916485003a5e6a4c21feaa1f895af68f9969a82531d0cee4b946292328231fc9ef2d580e41c115d7b56
+DIST libax25-0.0.12-rc5.tar.xz 247072 BLAKE2B 9d39e1fc5489e9bdd78b8f5a3eb033e7561922a44de8da4c08b14a890c1d2bf24e5ee63dbc3cce4ec8195ac857948a262e40bf379341e24bfb8f1d8a4c391ab4 SHA512 2e5b46b065763a47ee1d92866ee108390661adbd0ac9ececa5abf3e34ebf3bc9c8a1d082b16fc89e0bbc868b551dd894991c687f4c753b67e533e81b80dd1da0
+EBUILD libax25-0.0.12_rc5.ebuild 561 BLAKE2B 1e127ba15af2d862e3530e358273c6243945a5ee9fd2d36f7781239cb663b29e5ffc02af479f90b5165057a42e8a0bbfa1d1400c289ab667a29dd6ee761814f6 SHA512 6659e92c9956c5115c6e6f09ab0750683612d5611b08da1181af2a57912215f5065c20ad5143edd91ff06286767f8a878568aed4b27e353a7d7ceafff6568759
 MISC metadata.xml 256 BLAKE2B f5d5a93344d150a5211f11075344a863ec1b6b11b1ac9acb15364a05f23b7439d9688ab2a153af32e610e4ed5120cd8a044558edc48e5ee0d91f96ed9ba9ed71 SHA512 1971736573e03d6f2bbc45273991f004e8766d076ccf6369c6bf96583afe3a98665a1a0cf51cda40d678e9ef38739453837395c3f1d50c637c35d395a392ca15
diff --git a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
index 8e5aa531773e..7b1d1c34fbd9 100644
--- a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
+++ b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ MY_P=${PN}-$(ver_rs 3 '-')
 
 DESCRIPTION="AX.25 library for hamradio applications"
 HOMEPAGE="http://www.linux-ax25.org/"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 447225a8fb6c..a349c017c6c2 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,9 +1,10 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
+DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
 EBUILD libclc-13.0.1.ebuild 1432 BLAKE2B 59269e3486b7baf86062f3734ba52750acbce0a8d93b6a925e5654f24611c2d9055306518b60a271857d9735591c102f86501b21f034135ab6afb98183a2bc45 SHA512 948fc251abdd2ade60a4b0fb57cb9c9a365c3c0082535e00c24c54c489aeb15e33735099c76054b8c71873eb0953910b12cfc883203538b8514dc34a3437e865
-EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
 EBUILD libclc-14.0.0.ebuild 1454 BLAKE2B 54132208e71e9b4493ef2d96019beadc96766ab66e94647b9fd8a8948ac51fea34a0652aa88b045a8426c6fca7f5e68ced700e61ccc270d5951cf54af31c4264 SHA512 6b077e52f4ce6beaebf5f450ad200e6cb74784e97773efb7fbefaa9189bf03d73ee9eabf21f6b7743a6645915e06e5381e2c1461451507738cd2d2e5dd4e12af
+EBUILD libclc-14.0.1.ebuild 1454 BLAKE2B 6ab617ff1ac0ce7f190015bbd78a2116bc0d2c92d6ff87b9f5e093ec81cb91abe17da8d2f6bc2e97cbefd6bfc1a45249a082c01e654a4f87f2ea5ad635c2340f SHA512 4dc33086bab44e6e9ba6cbb98a7e985c4f0a776baa0ca4df81065ab4b0a0a26dbf42e516682df995c996f982a930d94311d2bad1c73cea5133c76e06780b21af
 EBUILD libclc-15.0.0.9999.ebuild 1464 BLAKE2B eb3defea1ec4f77f431b772f9fc0f8695344e4d80a0a42a9620e983bf12fe6c965380fd26bfc6b17bef66ae26893cd2d63df948dee58981492c1e4731e3fb838 SHA512 6c06c48e42969f10cff381407be3d8d1e02752529ea8dc9944fb11d97f680a687951f83900225585d8df0a37d1341c33c18f3f3a082119e8b8b9045b411040cf
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-14.0.0.9999.ebuild b/dev-libs/libclc/libclc-14.0.1.ebuild
index 6d6bb11fbe0a..4c6e2d1857ef 100644
--- a/dev-libs/libclc/libclc-14.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-14.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake llvm llvm.org python-any-r1
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index bb41067a137b..fab8f09a7ae4 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,3 +1,5 @@
 DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5
+DIST liberasurecode-1.6.3.tar.gz 210599 BLAKE2B d0e9ec0a28d99e109d7dd130283bf986d3fb2f2b0960567ca91b1380ce9c2a12eb14dee683cb2f994f5b3b4820b449c65f5b206f123101b4c2ed7f8910a44627 SHA512 d5daa962324ef19fd195cfa842ec375d9dd5e62e3391b4a1cbf49a850b852b18cfc9be929ab18786d6b839139f6260d5cb4c88a0ba440c06b0e54e04ffb1bee1
 EBUILD liberasurecode-1.6.2.ebuild 749 BLAKE2B 7588c93b64cafd2142beeb9026b77a2d75ba580b7f01bbe2d8cd354c152c4da6ba3333157e174c06ee985854bed5e740525fa6efb22074c5510eacb46816f590 SHA512 56102f8c6d59c6a6d486ef4970f0c5dd9aa2598aba0c161c9aa88e63db344a91d457c7b0c78ded67b765ef791487f88d110b80104c61822333dfb2af7f05f305
+EBUILD liberasurecode-1.6.3.ebuild 751 BLAKE2B 45853749b034ae8f6cba56c2738e5b1df9252303491ad560042aefd76a59b942ac04466cd1c542f497ddd6bcd5be7cd5a05874181196b8d9cc47f306b416b1a6 SHA512 aaac9ffed4978e2f4fd33999d3441f4f266deb654e35ba9c68f21389c8b0b18229fa6c7002cce83aaa309f331a751691ca8638b805f2a89ce71ed64266699117
 MISC metadata.xml 465 BLAKE2B 92e3cc53cbbfcbfc2b99df3a02b64e08076fd6c3f435c4617074f628b17b589d33ca76ace9ec47efd05eae9b1cdfe6205048f92aa286a6eccca2307c58c9e079 SHA512 461b346bd7a354bdfbb1ff45dd578e9b2fa7c4121897db9b5308622a9cd058aba8a9a75281e1c81b51f94ac60caaf0f13d78be3241741c017f25f6d6bb0295cb
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild
new file mode 100644
index 000000000000..b6d909c7d973
--- /dev/null
+++ b/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends"
+HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
+SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF} \
+		--disable-werror \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 3d204b11b036..2cc542768599 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -7,6 +7,7 @@ DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab7
 DIST libfilezilla-0.34.2.tar.bz2 595072 BLAKE2B b7c5db16ff74ee218eb38e69f029f6c2cad7984f7f27795ec67f9250eb544b259941cd34fc30bc8222aa0fef51e275d4ca0587754386807ecd916ab7c56b6688 SHA512 a749635f7526e307b93002c4044debdcae948bebb73c272ffc98d1997cf160001a7edc6c776656ea927254614c5a3067ebab1ffc92d7b9f97cf5d4542dec8df9
 DIST libfilezilla-0.35.0.tar.bz2 597061 BLAKE2B 3b7e54a5c999ca7a52d90bdc71a237940c7909ff2ca63c28e0ed76e743a15209cfddd66d0de54c157b42524a460079f05cc3af93a54d4b76c2d44e623bab23fe SHA512 685ed22ab8e4c197f26488751bac2b28e72e5dddce0fce4795afabe59a9c1c7775ac92958ad9c15b0717a8e9f4cf4bf44eee61179d8a2194cbc11a7e2564a5c4
 DIST libfilezilla-0.36.0.tar.bz2 598327 BLAKE2B d578b7c83cbd440acbb3efe2994c7140bfb0a11271e68a8bae52ac53f10e1ccf428c50d07e8cfc79f63beb0a3bffe8fbffd962413725817ac9df14e0b3b3a1cd SHA512 c6b0240c560afb87426f7ccf01e34eb92975b043697be89f26a12dcfaf4a109d308eed200429f986b14f80111573ea5a869194375c844fa7b666d173e9629a0a
+DIST libfilezilla-0.37.1.tar.bz2 608419 BLAKE2B ae76a1d9d9829061ec95ae3b94e282a32835db19b85859c39db5b089a478f93b511fce4a798ebe79bf628bcb6b30f3ea40ff34aacfe2201bfa93887d4f8ce48e SHA512 1bcf9da8ec0fbac1ffada95d8dc1e4a67fbd77fca9273fa9e67418c7e89c74139683535fb917db4fa750bd263cb45a8f230e32b6ab890f3ca5ef5af39ef8ecae
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
@@ -15,4 +16,5 @@ EBUILD libfilezilla-0.34.0.ebuild 1215 BLAKE2B f28398b8f2649d074e87cbaffa0cb8713
 EBUILD libfilezilla-0.34.2.ebuild 1215 BLAKE2B baa509341d723ebeef377336bc5e57a55542e389928d0c706c6a32d39765c86d47ad0c610f96d69d8c885ea4e7525b3fd66e4940076ed2c615e5952363fcc03e SHA512 5368eaf24194e528ccf327c25f216b4de6831974d1b72949fa7dc27f2b905c6170c85e4a08a0f5b0994aed0185b2a771c9c769f61c93892035a89ec1bdfbb292
 EBUILD libfilezilla-0.35.0.ebuild 1222 BLAKE2B bf0a613ef3ab50f39bd6ab90bb0809ad91806abf7708fd6a660affce5761e9c60512f885ea5aafe6af39f871f92d10c8a493f9b65ed919b2f3b3a0166d40e64c SHA512 4d2c996fb8d87c4f4828b1e5a3ad0a96919d142cd8ea23fdd9ec56bface99f9d551bb34819f1caa3d3f53d6a86e1f0a3c18b91049e29af08d16b49be2b06e375
 EBUILD libfilezilla-0.36.0.ebuild 1222 BLAKE2B 23380de6addcfbea936664a00c729998070f74baa62323e9bd7527d8ce7c3e4a0a5074e0f75c25dfc0cd8f4f16ed33e0e99b6486e7684888c60079ccbec1e184 SHA512 df49e81fed431b8d56e96f6fdc13e08a691cfef2a71e3a965e75664877f4831985502b21fcc1a12fcdff2833f55c3a04441809c66b7d591a581dfab5169550fd
+EBUILD libfilezilla-0.37.1.ebuild 1222 BLAKE2B 23380de6addcfbea936664a00c729998070f74baa62323e9bd7527d8ce7c3e4a0a5074e0f75c25dfc0cd8f4f16ed33e0e99b6486e7684888c60079ccbec1e184 SHA512 df49e81fed431b8d56e96f6fdc13e08a691cfef2a71e3a965e75664877f4831985502b21fcc1a12fcdff2833f55c3a04441809c66b7d591a581dfab5169550fd
 MISC metadata.xml 1136 BLAKE2B 9db086df9b33ec49950324ad327f9746b79667dfd61028ec173ac71fe16000549cf6bcf2270f7e8c3f85e1ff2de88620867db9f52cd6530716154cd1ede8902f SHA512 2ccacf35e9b6f503ac4e46c6705cd032ba4895c02c8ab9f3da6898ac20f4dff999bb8a649f71d4a222fca4b9237b0a7d819d6929468390df92806fccb82be781
diff --git a/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
new file mode 100644
index 000000000000..106c52d6facd
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/24" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 1dec877f1f8d..5bf509858f24 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -9,8 +9,8 @@ DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2c
 DIST libgcrypt-1.8.9.tar.bz2.sig 119 BLAKE2B 147fd4701eb5c91c43e1ca21f56b36f8d999c5b1a23bb2f454a05e1ef657a4a96c06b27f2d5c867c8adb9764b9d6d80480a69160b2cd2ad1704c1ff18a37fac5 SHA512 785cb3b3950e6b7102d81cee3690b99b11aa60102ab4333370e60874ad8bbdb2f89ce1b5e0ce9215adce1cdc2a3fe84bb7a92a80830594aa3f74e4129d16ad95
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1.ebuild 4977 BLAKE2B 7add0ebe773b2457ed1adaeb533ee7693452de606eda9fd678d58bf27092d17949bb466feaa44016b38572ebf26451fa679b88fcc3c79c20e79e0a73fb621d13 SHA512 8045c4cd0c9d06d904c333fda7f91ef6053c39769277d40edd0d6efd882a06ad09827d7ada770b65089ce1d2df14be85d65fa738e555a4b894d22411e251a15d
+EBUILD libgcrypt-1.10.1.ebuild 4975 BLAKE2B 19bf72708616e402914bd47e8f44f3240f6475e1d43d346af7bf34b28d4dd2f623a6aa95e52bc0d395fa55acd00b121c04c391e614f25672658e10801ff12afe SHA512 4fae55fac4979a6f87a8ab6c43a5679cc335f31cf60be70ecfc237f3f4f4e6d4f7d4ff2cb482a190a6b14758bd2d23fe0c6b0018fe639fddf99a23c1ff3a4a2b
 EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
 EBUILD libgcrypt-1.8.9.ebuild 2934 BLAKE2B b9b08095da2b6a5e42d986bac58c47ebfc2715cb15e2ac7bec4d45d35a50e164beff508aa57502e15bb5e4c15dd1578e0dd0456cb5f3820f325432b232887609 SHA512 fdfe2903216563309ca7e36d15182b31ffa7b273d70f392cfc3257839204250b3d53be5329e6c8ffabac00bf97a14109f1ead74c698336a758e7d01a2f4a485b
-EBUILD libgcrypt-1.9.4-r1.ebuild 5022 BLAKE2B da966c552e2b4dc96e7cf799246d94bc14588545bebdec3f1e6609ac3926c7b1f9cc0fac8ba1ca2b43d6499d9ae9652ec60b6ceea4b27f88cf6bf3aa535b8efc SHA512 412ca793fe764ce72614e7c3547ad40714f55d12a86d1971da0f175432d53fd5ba3b9f591a9453d4785e15f1288fd2595bb80226ee13572994517aff3639a632
+EBUILD libgcrypt-1.9.4-r1.ebuild 5021 BLAKE2B 6b299d1f1da112370b285d13bb3b5ae21f266ee1410781e776239b82553d1b5e0c70347db286f15dd9b1f5af696f6da4fe8f4d5ab98a4306dbea459f102c7588 SHA512 904493a1e5cd8a5a2c1c72e08b1654438803fbc0a4dab25124bfdfdf97fe97a4839530a7e647bf0498b492970fef04b4db96301073e045edef541505c67d344c
 MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
index fd9f8ebaf6e8..00b641cf2b84 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 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_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 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"
+IUSE="+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 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 static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
 # If changing this, update src_configure logic too.
@@ -92,7 +92,7 @@ multilib_src_configure() {
 		$(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)
+		$(use_enable !custom-cflags O-flag-munging)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
index cf2e518df50e..8a228b0fe2c4 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 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_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 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"
+IUSE="+asm custom-cflags cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 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 static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
 # If changing this, update src_configure logic too.
@@ -93,7 +93,7 @@ multilib_src_configure() {
 		$(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)
+		$(use_enable !custom-cflags O-flag-munging)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index c98e5485591d..beda1e375b57 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,10 @@
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
-DIST libgit2-1.4.1.tar.gz 5629087 BLAKE2B 7c8316003c168c4b366fa4376d5e4dfa0a70dcb0cd0cc0b4ac7287f7b04eba50127cca89c4bcda94f86e5331b6a2951532b5108d5376a2a3fed7a68c31472151 SHA512 66943d82811c5e24687231696bd1ce8d7d58f44081c00a7030e01a69a7c920605a427c315a26af6c57c9bd7c1d1d31ab857f80615fce1ba4b981d01f733215cd
+DIST libgit2-1.3.1.tar.gz 5602265 BLAKE2B ecf1fb30fbc40b09edcd3862d0831bc7d4d1da1aa8e738c78cf77bda5a0bd5d9c6a60fe7ce9827e058c04ac88d89a7d6c05c54c01bd77d1a8b0b091495bbf871 SHA512 012ffda7e8b9557923758fdbe68869875977d419bfa60b61f90adadc056600e2b1cc2db1c2a003315ea0e193c0145c1f431054f7bd960c5e6e14fa541e46cba3
 DIST libgit2-1.4.2.tar.gz 5629585 BLAKE2B 61e269fd08beb9579838a13b661b4270f1e8d2d3d1e67f6b8357e92a5ee4aaccbe637644dc87cc8b04d9c181e37808352077b75fed8753a4b2d8868eaf248b62 SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
+DIST libgit2-1.4.3.tar.gz 5631981 BLAKE2B 9308100ede912eae9d1fa4011c67f88f225aa11a49adf845389559fcbc213f31b0f91e4a5b496d282d42ac7f843f03c4ef7236f2d200331c615013d1250f6c31 SHA512 3dfa16c1c705b99fbda55e5e86e67703621d6f8fb62a03cfe998c834d242f33f4200fc0b6bc5d32fe5254c8b8e845259688e4bea9c2dbfc2b7df91841c335d28
 EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a0b4ffdc20274788d174de2735afa3d5a2cde3ec248e07e9c843a62547c240514edd9897f4dab1cd4a8c4455c8 SHA512 c3c00367cdd0f9d4699fc017f760eb193c324ed280149b8264d8f2680824308948437e771ab0ea901185e558a9fa535c13e906ffa0aca732fe2480874492554f
-EBUILD libgit2-1.4.1.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
-EBUILD libgit2-1.4.2.ebuild 1652 BLAKE2B eaf07d61f3304ef007041617c60302484af1886de11f16eb98bc4d4327b43ecc05a3d9447bcc2188dc065855614103cd3492e698069e75cb8f98767da959cd94 SHA512 d773a05d502924ecc28b61c2a7f1312ad05547d6d9d46dac015d5abbdf9e607630d252a9e0acec3477df14cc9c7ad48a3cffcbd57458cde0f72c28321ae6cbd6
+EBUILD libgit2-1.3.1.ebuild 1704 BLAKE2B 6e01d5495917e853b232f06e34c20d9bda631e706262aeb19d4db991065817f30852290247aa13dbdc581cb007b559bb644b5dd66adfcf758fa940e7a9539a6f SHA512 3eff6e6deebf5f2aea88d1b971a00db1b54fcbea98f722576f66736076255115dd588d8efe9dbb7985ec3b63a6bb680ffa4dc03897013f56fa7f40e436fa4fdb
+EBUILD libgit2-1.4.2-r1.ebuild 1654 BLAKE2B e3f7bd625d0b8b0907419152e36efb41fa741ceb86b0a1054e5f46051e3738e7824d1c256b180b08d46035211b4b9bc17c1c8ff0af81aaaa47e3a5ed1bb5a0c9 SHA512 c37e36aee1b72ddf33bf190b4e7ee39d80b20e5e8d3297185aabe4af1db35a6de97e5eb7c3ac3c79437b493371e1001f798ecbae6fd7da10ee5131e8a482873d
+EBUILD libgit2-1.4.2.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
+EBUILD libgit2-1.4.3.ebuild 1661 BLAKE2B c96b1c5fe64fefe7cad34acb93e5d782052823687c394785b3b58cc4671839f883ddefced357d29a1f28cc0278ee9b98b0689beee210af43cbd74f2a669e9327 SHA512 73659ea3404950f2e82cb09e9547e97e34d2973f8f2c3fa5a2caf0c268f04758d6f2c0363ed5ad40b2e13d3907a3b1da76629d93ec57479974cd464c2722535d
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.3.1.ebuild b/dev-libs/libgit2/libgit2-1.3.1.ebuild
new file mode 100644
index 000000000000..6dcf108bf85f
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.3.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-1.4.1.ebuild b/dev-libs/libgit2/libgit2-1.4.2-r1.ebuild
index c607c9e82f59..1e4d9b1196a3 100644
--- a/dev-libs/libgit2/libgit2-1.4.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.2-r1.ebuild
@@ -13,12 +13,12 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/libpcre:=
+	dev-libs/libpcre2:=
 	net-libs/http-parser:=
 	sys-libs/zlib
 	dev-libs/openssl:0=
@@ -43,7 +43,7 @@ src_configure() {
 		-DUSE_SSH=$(usex ssh)
 		-DUSE_GSSAPI=$(usex gssapi ON OFF)
 		-DUSE_HTTP_PARSER=system
-		-DREGEX_BACKEND=pcre
+		-DREGEX_BACKEND=pcre2
 	)
 	cmake_src_configure
 }
diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild
index 8727c6dbff6b..c607c9e82f59 100644
--- a/dev-libs/libgit2/libgit2-1.4.2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.4.3.ebuild b/dev-libs/libgit2/libgit2-1.4.3.ebuild
new file mode 100644
index 000000000000..55dbaa51683d
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.4.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index de1cc6aa9d67..e0d67455339f 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -2,9 +2,9 @@ AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba8
 AUX libgpg-error-1.42-cross_compile.patch 785 BLAKE2B 91dcb2dd4d44776dbf0f1bd0b7bb7df2d8855625e1de306583cb42a14f74b2daa015605a8af46fd2a659a81da9f312d20d02f49ff6042ec9ce8ab40f42b9776a SHA512 76a9bdfa85de81ba60eac771022f0b1daedc97097e281ca954381ed54b30a00e84ca2f0970f252ee735b1ef6f1ea2071a4df25ae1fbef0d380d964c577e2fd22
 AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
-DIST libgpg-error-1.43.tar.bz2 999006 BLAKE2B 22c5491ebd43b8010cdd4e82a58443fb8d19d51de9a033d0bb44634a82f033916d5d9fcfe47eb47e64a513521b01ff088838a8979f488cde74e5944c28dec0aa SHA512 36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c
 DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8b08373a0b6d04b13c882bbcb43c4d0e05ecfdfd7788c89b5799082f4d15386efac5eb1762a48ae1ab70b554d0bfbb36 SHA512 a0eef310b9d44532d1ae6e7266226ea3e82d908aa31f775a026e56a7f8303b78adfdceb3ae5a40f7d242987635e764c539a024ce8dc0d66590e1a3fa50f6b784
+DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
 EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab
-EBUILD libgpg-error-1.43.ebuild 1866 BLAKE2B 35f3821ccc218ba18946c395fe549620ff420da72a6cc4a42316da38c6ac4149202fa4d5b487b0f61c1d3dc28f6e921f92490fc8ff2580ede2a975441ccaad76 SHA512 d6375a17977429462e8f2564940a8ff6e005a90236ef6cdf0f701c6f83d82ec86bbdeb71c010c72f7a3009078147a6268b14a1a950bbb535487f1b7bc75b22ef
 EBUILD libgpg-error-1.44.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c
+EBUILD libgpg-error-1.45.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c
 MISC metadata.xml 414 BLAKE2B 3d1e1094b2527b3462c9791d278b82e0003201c1ac9a4fca2fceb1f1265384b6a0cb3617bf2e6416afd2a1044564e6cb2beeb7df926017bfdeb88fa61177faa8 SHA512 2254c2fb4aebd808a733fc5264c722b374e85ceabe540257ab7ecd4f46d6ce6a12bfbf4c4ec59af62c8a1601189d693bb33eb69eb28a7a6fdf8210458d173fb8
diff --git a/dev-libs/libgpg-error/libgpg-error-1.43.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
index 2c2c4571892f..5347656622a7 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.43.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
+	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 709911a3dc2e..b9655c6bf770 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,3 +1,4 @@
-DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD libintl-0.21.ebuild 2055 BLAKE2B 8044a0388cba8e2e3e6d5b3f321a7e6c3279b15840b63c0ca97604fe00e31c0ef5dcff6235a7a11815f4d8ca8af281d352a747a9d0a4c2600eed9a4ee7931ab2 SHA512 706442a85464e74c23aaf02d864e4452a31fc52efb4c4e64dd1de41c2de05130462c8524d5ab522c11720625b2fcc2f9899e05c1eae1d0cb0a6296d9496f3941
+DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
+DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
+EBUILD libintl-0.21.ebuild 2262 BLAKE2B 4c096f1e4b627f8791d4898dc88296305666c5d58f9d95c9910f29b8f0e9231453556a4e147bad9058ecaa963efa00edefaf426450553fe1c481589e28eb1d9f SHA512 303a646e0737a1ed5af394f344e0d2de8f9af9841db6b30da99e7cb40667f5baab5b28e67be15c5f3ff4672043652a9123df758c73a11e088b75f9868513e4d7
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index bc6709653098..54944c9356a9 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -6,12 +6,14 @@
 EAPI=7
 
 MY_P="gettext-${PV}"
-
-inherit multilib-minimal libtool usr-ldscript
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
+inherit multilib-minimal libtool usr-ldscript verify-sig
 
 DESCRIPTION="the GNU international library (split out of gettext)"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
+SRC_URI="mirror://gnu/gettext/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )"
+S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -24,8 +26,7 @@ RDEPEND="${DEPEND}
 	!sys-libs/glibc
 	!sys-libs/musl
 	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index ac1d7e4de10a..0d4f9846dbb4 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -2,6 +2,6 @@ AUX libixion-0.16.1-clang.patch 621 BLAKE2B 2ab9add51942858edfa7fb6ee65747a0723c
 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
 EBUILD libixion-0.16.1.ebuild 1252 BLAKE2B 75b64af1f6eea1a0d4dd256cfa579137555e9c0476e485ea70b3ec5dd4c65a39a78080bdce38ac49575219e03c7e37595e0647cd7efff43fa664d7a35d7c7de5 SHA512 c13486e9162c1b0e81ad859f65fee8cba74128ac8a5cbddabea96ae7787f248468fc7d10b797e600c2ea8e10b1a4e6dbdbd4de472c84005801e41f06137b4030
-EBUILD libixion-0.17.0.ebuild 1282 BLAKE2B 549a1c593004915a7aa169c4efbf544b8db36052ec7ff25e8f27127d8db9aec8890bbf031f9338e234c83cedd9ab873583f8092d766a150ca609732ada2cf802 SHA512 ac7472d5af05f8d58581fc657ca83dc96583401eff67cdf6edbbd22219a33108e4823012540041854a10563ba181de1de933e9312f847e8bd79a4fd4cab18235
+EBUILD libixion-0.17.0.ebuild 1210 BLAKE2B 27e9e5b70bf6e76177367fbad12eb8dc68e050b814c3817907f1dc47583a16ba064143eeaabddc0de6a92e80c343e0d81e77c80d40ae47340176ae1fc4d810c5 SHA512 ceb3291c9d5b1a7a6da3d2efe081d71aecb905908f592275a51d770bb6dd0353a2ba8ecb705fd47ec637bbade0c9494333afd18a08784d82de2a60a254128cca
 EBUILD libixion-9999.ebuild 1211 BLAKE2B 4c7340dc18b7640b81d83c1ac6c3e0f9063c50c84d6d0f000b6889ec44833a165eaf5a1bf5c28b758cbcf51b03254826f20a74990a8ec9385ad00ae069efecbc SHA512 344450f3e309eec3b422792a21478a9714379828abe6a7c8890ed690d5b32147d6ce8227db867570b8cc98dcc2799a538b9089b7484bf663968643d20cc720c5
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/libixion-0.17.0.ebuild b/dev-libs/libixion/libixion-0.17.0.ebuild
index 806058a7ae4f..b5ba56d21851 100644
--- a/dev-libs/libixion/libixion-0.17.0.ebuild
+++ b/dev-libs/libixion/libixion-0.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -16,8 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	# Unkeyworded while libreoffice has no release making use of this slot
-	# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index be7d9eb25fe2..f8cc630fe841 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,8 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.10.tar.gz 68126 BLAKE2B 7e8bd2dd42f784bdf0c067ea870c8095a0fc9579f6041bb9a984d45d46950861d285238d49181243cd320f83c25f443300dd405fb0c1d50c8055fbd5a0af6b90 SHA512 437a792d438657e5b92dfab332d16eb430d8c3be2a8f0d82f1f1cfd5d3a0db1a0a1175dabb87dcd57ac7cddc8017e27c00f7a959cb57244a1e63fb963cae445b
+DIST libjcat-0.1.11.tar.gz 68455 BLAKE2B 7414fcff85237a2a95ea50569470a0f35d18e201b351f2a67ca83276b76975983c23b1dc3ee0090e582713d120635bd9c92b43389a7f78529e22bd18ff88dfb9 SHA512 02c5cd1e8d7e59a171ee878bd2538858830f0b4f7b27c337db77d84a30f66cae83f1a4832750550c1f5ba31a312837a383e0af489aae476c2f54687cd28064e4
 DIST libjcat-0.1.9.tar.gz 64884 BLAKE2B 30e7c9f6c5fc971144f27bc495443928b8406a199e3a03399f2081a5ec3d09d10261bec6804e8d92c8c4a44ad31f821f302954fee66abe16a6b0b0400b627036 SHA512 d4d51d95edf1223d5876464feb476d3e9a47f60fed7724690d247cb3b759c5adaa04ba71a0221d5e520d0077d52ea6610c0188f2e5c70a323210ad68c134e83d
-EBUILD libjcat-0.1.10.ebuild 1460 BLAKE2B 766f9d7e7025246ec376ab943748abaf97c9d863971113dce07119bb1dd15a88cb91338592bb8e0408ae74a171fcefccc61f6487a33ee09155bd0717f0eeb711 SHA512 4bcb536048ffccdc8115c518d443bb8a6a3aba79f1023d950ca6b367f9792e085d7c5d859b46b7f1b0246086e26e69f6804b3311ab7c371763a791fe3c9ad65b
+EBUILD libjcat-0.1.10.ebuild 1458 BLAKE2B 84b75cfd715fe91612b8ca871c3bd8d3a799ba917c33caf5a35b304bed88c24ec05d8bbe1911ae9492ac237d7ec825fe3d83b91fb597997319e5e767d858e813 SHA512 2007a285263841bb3a018a71a2af8af754c2f68f607887d75630532b533eac6241617468322925959b4b3bafd8247eeb808472a8c390fad61096c707422a7e9b
+EBUILD libjcat-0.1.11.ebuild 1471 BLAKE2B f0a42585dc4c4955d5f9d85ee64f81ff6411b95b293090e91bb68a814d991beb4023a96df7dc9c039184642eb175e0a68f76f9c3f87e6007c8da889e911473e1 SHA512 b48d55075df68bcd30cfe80142d75a8a8164d620a0413cce5d278738cb6c7b2d9dae5dc48e97103f1e6c183805606fcd81902c2d9e3f5a5f28b5dff462b83f44
 EBUILD libjcat-0.1.9-r1.ebuild 1458 BLAKE2B 84b75cfd715fe91612b8ca871c3bd8d3a799ba917c33caf5a35b304bed88c24ec05d8bbe1911ae9492ac237d7ec825fe3d83b91fb597997319e5e767d858e813 SHA512 2007a285263841bb3a018a71a2af8af754c2f68f607887d75630532b533eac6241617468322925959b4b3bafd8247eeb808472a8c390fad61096c707422a7e9b
 MISC metadata.xml 937 BLAKE2B 95095d1f33b1ebc992688672e5084d67fcc8fadb33e31b367576f4bc73b4fc2baba435a78a0ceb863ae3a2075dfa3d6b936922bcc3890f367ef67fc7afa16abf SHA512 3fafd34b736ec15cd9f202afd1b64df241699a24d5b938422a95e05ef1acaaf6fffd5e95815f8dccbe414d83b47ea98308d375078f02aefef771b23cf23a7bdf
diff --git a/dev-libs/libjcat/libjcat-0.1.10.ebuild b/dev-libs/libjcat/libjcat-0.1.10.ebuild
index c386fbd02fa3..530eb115d6af 100644
--- a/dev-libs/libjcat/libjcat-0.1.10.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.10.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libjcat/libjcat-0.1.11.ebuild b/dev-libs/libjcat/libjcat-0.1.11.ebuild
new file mode 100644
index 000000000000..12f4aa418263
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.11.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+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 ~riscv ~x86"
+IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vala && vala_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 4c019c56ba11..c18f93545f0a 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,5 +1,8 @@
+AUX libnl-3.6.0-static-tests.patch 1100 BLAKE2B 1542484bd0e87fa20587f3f8507d9d1b9ee44b0aceecfb1358eb737140f42ac34c519da0585e65773d3bca27b6e4f73fc28d19cab6698c51178e9b73dfe8629e SHA512 eaf3f6cd77179cd4e6e0890443cb6fc6d572c71db1c48ce61729a06c6555bff414e1a5bf771eab01634e61686e9ebf7fa20ade6f9f1e96a3290345c95da6ca23
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
+DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb9774327254718257cf162c14574ece6b0da20f03a587830b21a2481d1da6e9c90482d71d8f9308f1eeafa605c90d0847a838c SHA512 7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b
 EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1
+EBUILD libnl-3.6.0.ebuild 2606 BLAKE2B 9d14b7426d68b9ec4b847b207f09f40079bfc20f5c52d616ecfdbe7b7c80637af19e68e85b37ad4156aa9ed98b131215e0acbae2e32e1756a31d56f50ffa43fd SHA512 af09f8e9247961e4b5aa049a0087bced21da0a352bd38f736a5b7db4fde474cb518636b4073f9ed9ebdc5aab2ee0285f92226f5bcd53055c027656d6de46b67b
 EBUILD libnl-99999999.ebuild 2402 BLAKE2B 686bd0c10f0e881efe5587d244311f06efd6eb6ecc7a307f1be85c08b6b1173468b0e42576d7376ef08cafa3fda00956c63a07eeb29f036bdcbcd04299ecd623 SHA512 8f83dc6706a7ba4aa42b5411a36ed8d9d18b3db2de0b34405ae2d925bb5944550726ed2a35c32f1d4353628341c13065cbe3ddb69bc611e456e8ba6111706bf5
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch b/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch
new file mode 100644
index 000000000000..be406705e1d7
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch
@@ -0,0 +1,37 @@
+From: Thomas Haller <thaller@redhat.com>
+Date: Fri, 15 Apr 2022 13:29:49 +0200
+Subject: [PATCH] build: avoid building check-direct with --disable-static
+
+"check-direct" needs to statically link with the libraries, because
+it wants to test internal ABI, which is hidden in the share libraries.
+When configuring with "--disable-static", static libs are not build
+and the test tool cannot be build.
+
+Just skip the test in that case.
+
+https://github.com/thom311/libnl/issues/306
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -984,8 +984,10 @@ tests_check_all_LDADD = \
+ 	$(NULL)
+ 
+ if WITH_CHECK
++if ENABLE_STATIC
+ check_programs += tests/check-direct
+ endif
++endif
+ 
+ tests_check_direct_SOURCES = \
+ 	tests/check-direct.c \
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,6 +107,8 @@ else
+     AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required]))
+ fi
+ 
++AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"])
++
+ AC_ARG_ENABLE([debug],
+ 	AS_HELP_STRING([--disable-debug], [Do not include debugging statements]),
+ 	[enable_debug="$enableval"], [enable_debug="yes"])
+
diff --git a/dev-libs/libnl/libnl-3.6.0.ebuild b/dev-libs/libnl/libnl-3.6.0.ebuild
new file mode 100644
index 000000000000..5c1aeb096def
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.6.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1 multilib-minimal
+
+LIBNL_P=${P/_/-}
+LIBNL_DIR=${PV/_/}
+LIBNL_DIR=${LIBNL_DIR//./_}
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
+S="${WORKDIR}/${LIBNL_P}"
+
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SLOT="3"
+# Test failure: https://github.com/thom311/libnl/issues/308
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+debug python test utils"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? ( dev-lang/swig )
+	test? ( dev-libs/check )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( ChangeLog )
+
+MULTILIB_WRAPPED_HEADERS=(
+	# we do not install CLI stuff for non-native
+	/usr/include/libnl3/netlink/cli/addr.h
+	/usr/include/libnl3/netlink/cli/class.h
+	/usr/include/libnl3/netlink/cli/cls.h
+	/usr/include/libnl3/netlink/cli/ct.h
+	/usr/include/libnl3/netlink/cli/exp.h
+	/usr/include/libnl3/netlink/cli/link.h
+	/usr/include/libnl3/netlink/cli/neigh.h
+	/usr/include/libnl3/netlink/cli/qdisc.h
+	/usr/include/libnl3/netlink/cli/route.h
+	/usr/include/libnl3/netlink/cli/rule.h
+	/usr/include/libnl3/netlink/cli/tc.h
+	/usr/include/libnl3/netlink/cli/utils.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-static-tests.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		# Unset DOCS= since distutils-r1.eclass interferes
+		local DOCS=()
+
+		pushd python > /dev/null || die
+
+		distutils-r1_src_install
+
+		# For no obvious reason this is not done automatically
+		python_foreach_impl python_optimize
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index aa310a34f5ee..3256541aa564 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -3,6 +3,6 @@ AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e689
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
 EBUILD liborcus-0.16.1.ebuild 1477 BLAKE2B af207820355c3f6839538034fd406335d1cf2ac1e426ceb4aac19baadd953e2ffc45ccff7c965779bd21b22aa7e0a5a235ce0505ac7a59dcdf5c55775a146f62 SHA512 cb189f615cf0c5f040f5cefbc832c4ca3322de32015907454d479e9c1e60048f8c1db912a74ef0e2b6e003ba6645936c73b5b4338181fd375328dbabba934117
-EBUILD liborcus-0.17.2.ebuild 1458 BLAKE2B 86c55feee736e9fc96aab3ec1081334831dd4e9dd763656dd17261d46c6509cc8f0e6ec280d89da38aedd0390ce0d28e9f87c3f92e6c29b571df07fd0fc859a4 SHA512 f4c01b9aafe21079858a96ca664ea71dc14421166f95d0d5679b136ea476addb83835b41a94f3bd034fdc3183c817bf01184e1353ddeb9eb7b05e68d4bd94e02
+EBUILD liborcus-0.17.2.ebuild 1384 BLAKE2B 57aa6f1c137b255ce6e5bd78adc6b8608490059533442254cdbd02f8db6b6204356316cefea0f2ee00cf0c55507efd9fe1cf65f2e7feaf9432a17d9f099d7678 SHA512 0760430d4b71a1caf15bbd3190f9d4973ddc8a9f33eb48ecb513a56f724b32d2e3710ecd9c72982b0ad5f6822301277b5644299b025de8bff2c04ff6c09380a5
 EBUILD liborcus-9999.ebuild 1449 BLAKE2B c993233e271bb4cfc885bcae0bdf8422267e949ccf0bc3f411edaa2a0773c1c8e8980387710c87c3d1605a86a60e8011df471cf04574e74c14a59da9cf82f6ae SHA512 89e0d1acb0be5ab01e179f43f9dae77ce1f3a161f7e28adec10961ceda4201eefb5e1ea9c6bb303f31fdc2efecff381f2a081cb192ec43f938b1d169a01d3b02
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/liborcus-0.17.2.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index fe61595a66fa..c46193512eb9 100644
--- a/dev-libs/liborcus/liborcus-0.17.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -17,8 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	# Unkeyworded while libreoffice has no release making use of this slot
-	# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 1daeb333af5c..c28b85db5bd8 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,4 +1,7 @@
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4
-EBUILD libpcre2-10.39-r1.ebuild 2540 BLAKE2B 9ade286d148d36182f0c31efdd8fe0bba41cca7768d101c1d3007e5c03cb54e05e839462466f4c79377cab34aaff16bca51bc88f3470ddda4061b0a5838278dc SHA512 a78040e5a5a60df14c9e8aa13222f39fcae851d6180c775d34c99f9ce21129b642b3af0627398ca345ba62f9ba9b54ec12dc6707fd3ba244706a4e78b5583ca1
-MISC metadata.xml 1079 BLAKE2B a7d0068409819b13a8216b72b4cbf4241db6ff180e3b0f13cdce8c669cdc4f8be156ad6020b854df349e4ffc4166a8119c582e4d0b90d93a09bade43fa8a1273 SHA512 ad273d7f89ed478186714d388b555b163f6424a9651c6673aa5bc89dc81f602a4add30cf22d8481b70eb079c71cf4d15746a15d6e4ba8ac483e5408aa3415927
+DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
+DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
+EBUILD libpcre2-10.39-r1.ebuild 2496 BLAKE2B 45e155d23a3acf950aebf15fc4b6763adbd11a256a869ed5d0800ea4365747e5bb0bda13db9d818919793389584566fc60070721a1d67910b70a58693afed663 SHA512 828e75bbf8b96ab59710d91a9e618ad09b56e72fd1faa4cbba77e7230928b3dda1ce32f5ce1474a98b07049cc07564fd0fcf55b663a014630e508090247d4a2b
+EBUILD libpcre2-10.40.ebuild 2979 BLAKE2B 2347e104a150c5836be24f86e11c35c90792e314de14ae3bd07acc63824e98eecfa5d6de65076bc809b12b1e7ea537408884ceb5737f5f98bf85e5f4f0d71972 SHA512 6c7f17d3cf58194ce4129d375ea74c5cfdfab21af5bdedcaab211669b02ca1da634d144fe377e6d238726e2867d1277a1e78f11b093bfbafe84ea90a3598b691
+MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
index 6add5be7acd6..9a9a699cb929 100644
--- a/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
@@ -12,9 +12,8 @@ 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
-		https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2"
+	SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${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
diff --git a/dev-libs/libpcre2/libpcre2-10.40.ebuild b/dev-libs/libpcre2/libpcre2-10.40.ebuild
new file mode 100644
index 000000000000..fc85567f8d74
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.40.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc
+inherit libtool multilib-minimal usr-ldscript verify-sig
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )"
+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
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so 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="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-philiphazel )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	if [[ -d "${WORKDIR}/patches" ]] ; then
+		rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
+		eapply "${WORKDIR}"/patches
+	fi
+
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(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_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml
index 1f00cd29ae6b..66bde795d3f1 100644
--- a/dev-libs/libpcre2/metadata.xml
+++ b/dev-libs/libpcre2/metadata.xml
@@ -26,6 +26,6 @@
 	</slots>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-		<remote-id type="sourceforge">pcre</remote-id>
+		<remote-id type="github">PhilipHazel/pcre2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libportal/Manifest b/dev-libs/libportal/Manifest
new file mode 100644
index 000000000000..b0f0de456052
--- /dev/null
+++ b/dev-libs/libportal/Manifest
@@ -0,0 +1,3 @@
+DIST libportal-0.6.tar.xz 63816 BLAKE2B 396659bd1fd00885b49363a3f6fc0ccf5324c87417cfcab48c966ef61ab2fa35d300be84656261fdf4313b77fc13058d7b7c9aadb0591c1ef17b80434f8ec19d SHA512 f5f76a0dd0c66521b745c276e41f298addbbd41dd5fb3df9381ea85c122387878cb0e51ffac1e17f9e82548ab222d2c2fe92ab0d018de8a9ae9b2dfd65e454c4
+EBUILD libportal-0.6.ebuild 1687 BLAKE2B 959aa19822de7d93e2f844de9bbc7321b69f1cd3586e063f518b805b6f4636305856186d56a67c2b9b49082f602cb6b99b9602f20fb06160c3f08d8a74367ddb SHA512 73578b0af3ce0bd236c8969ad131fa4ee57da0697a9e7e9c0860ff255b6749590e21b71f664571beac09b6e101e325516c7d818d3ecd0c0c00040373b9f64bca
+MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libportal/libportal-0.6.ebuild b/dev-libs/libportal/libportal-0.6.ebuild
new file mode 100644
index 000000000000..22a66ac299bf
--- /dev/null
+++ b/dev-libs/libportal/libportal-0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson vala virtualx
+
+DESCRIPTION="Flatpak portal library"
+HOMEPAGE="https://github.com/flatpak/libportal"
+SRC_URI="https://github.com/flatpak/libportal/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0/1-1-1-1" # soname of libportal{,-gtk3,-gtk4,-qt5}.so
+KEYWORDS="~amd64"
+IUSE="gtk gtk-doc +introspection qt5 test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	introspection? ( dev-libs/gobject-introspection:= )
+	gtk? (
+		x11-libs/gtk+:3
+		gui-libs/gtk:4
+	)
+	qt5? (
+		dev-qt/qtcore:=
+		dev-qt/qtgui:=
+		dev-qt/qtx11extras:=
+		dev-qt/qtwidgets:=
+	)
+"
+DEPEND="${RDEPEND}
+	qt5? (
+		test? ( dev-qt/qttest:= )
+	)
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+	qt5? (
+		test? ( dev-qt/linguist-tools )
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+src_configure() {
+	local backends
+	use gtk && backends+="gtk3,gtk4,"
+	use qt5 && backends+="qt5,"
+
+	local emesonargs=(
+		-Dbackends=${backends%,}
+		-Dportal-tests=false
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc docs)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Tests only exist for Qt5
+	if use qt5; then
+		virtx meson_src_test
+	else
+		# run meson_src_test to notice if tests are added
+		meson_src_test
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/processor-trace/metadata.xml b/dev-libs/libportal/metadata.xml
index 115e9d64a669..7b343b06be8a 100644
--- a/dev-libs/processor-trace/metadata.xml
+++ b/dev-libs/libportal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 1d483a23a965..427e0b666bbd 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
 DIST libqtxdg-3.8.0.tar.xz 76044 BLAKE2B c49f1317c55ea09c4fe9aaea3e96851c4e5dcbc797e97a8db58dd34b35151e18c654327b71566b5578319dd7a01862627a52a02ce3840951e15fe01b57666dcc SHA512 e9e8d163fe1a60a2d03787ec3feef6ff6e89dfea4df7c0c7b3a72784992baf49ffeb352894d3cb8747ec0cd49576562f7dae3abbde932d13374f51bc77f14ea1
 EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2
-EBUILD libqtxdg-3.8.0.ebuild 1172 BLAKE2B 6d55d5dc704982b176c24c70507568f209c3c62a44f7973c9fcdeef950bed42394aa5ec304520974bd63248a943596d0d5ba83f7f1fa5b9183cbdd06a93cb2cc SHA512 e20cf6461d74d51bab745d62cf05bc0cfce5af66a92459e991611ac7cff4e3fcf7bb31df4cef6a0426c5342f4043bb1be3aeaf724d387693a843441195e9d657
+EBUILD libqtxdg-3.8.0.ebuild 1169 BLAKE2B dff2e3805870839fcc595143e4e63bacbd1696dedbb0d7558ce02733f4628037b623f3c4df013d2e91ef14e585099c43e5eaa9e69ffdb57506b9ebaef3ac09ad SHA512 f5aec3e2c9c36261a2eec1a81b05018f5696b0c81d226dac213103fbb2d34787db99b46d067969ad5703507181955d1ef36dda5ce808e425fe8c504906daddbd
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
index 4d53d7eae82f..88e466a39c13 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 87523ed8695a..12b07a164f4d 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -6,5 +6,6 @@ DIST libspnav-1.0.tar.gz 31578 BLAKE2B 535cdf588b4b1de8f37f9239a48df10e755d004fb
 EBUILD libspnav-0.2.3-r1.ebuild 1228 BLAKE2B 3ebb19e747735af2df2a4bd7e7f484ef45f2dc787fbea11085fc14728e9b3fa3127275e11c3195f208775678163caa6e53aa4ebe16044164f1cbfa296b7bc451 SHA512 d81c66fb8cb2651f44824f2d2a739e146aa700b83672dc4d5ea935f20fd6487fe6e06582faaa4798ae1f7a77854de02552d7155deb08bfef0976a922dc668ba8
 EBUILD libspnav-0.2.3.ebuild 902 BLAKE2B 2ad55473d8968bdb60f8524277cbb63f9f396e981a7f4325af10f2c89b827e3f732325b1cfb0723dc4f8ff8e3bc1817561cd025e37c6f7c71a178a4ce3c12c24 SHA512 673f746c05b2c3ef44452f9206b4dbbd03c28203e952228902972f380c71e8d437f58e83ad42546876dff5362c9ec041eb8bf35f28a5bbb1aca4f50ecfa92093
 EBUILD libspnav-0.3.ebuild 1211 BLAKE2B 2217b4a605a93d11c9664ef1f60f3829cc335163c031e8786a02d83d5ba2411e801745d9a443c075e636ae4202d18f9321b294a644dda35ecdafa0d6c75a172e SHA512 bcd9c916186729183d0f37a4997f7f1f3640f7c4c8e3aed181badcb1f209de2697b27e48e104801a51c5e112caecaf34fb4714e00a6ad92087e19f86fe4fc9d3
+EBUILD libspnav-1.0-r1.ebuild 1359 BLAKE2B 27c60afa4e05ecc15c343133d0514ecdfb17a5201c20aa49096975d6b5bcd61e568370eef1e0b2e670d146a53f00e5c59e1fa0d98b6f6ea5f9f6cc647b8b95e4 SHA512 4da4f15dcc9011bb35cbbed471b05169e3024d3ea1b7d05c9c49ea79e3bf9b758c164501d2749365560743fd4a2cef453b66cb076cb236ddbf01e11c81dfb938
 EBUILD libspnav-1.0.ebuild 1266 BLAKE2B cce3280bf16efec11288f11f143cea93dc0dbbaa4604a6dfe5c6984639cb59f1c624fdff2efe6d4151c82c6919ee17d82338ec995c07c3647b727efef86a01ae SHA512 a2b7670dc558eea8c88a34069c129c10de926af49d04b8a48c6961dc64fad5139648c3677bc6e4c18d36adf5cf21bf368506675a4f72bec123286d377e60588b
 MISC metadata.xml 812 BLAKE2B ced6d51e37b17056923b89e2bbe6eba4a8224690d97826db96693c01b3c97442997a61a36f020114a65191ac9a6d2cc99098f42ca65882dbec955ee44168bd77 SHA512 55fd9c851ddce1d70eb22d30af4f8d185d3fb3dd037d4739d698ba79202ec9a4e7389f29f4fc763cd24304fec26bc1e5607ed15e0c8c37a458d4c6b9da0b05f2
diff --git a/dev-libs/libspnav/libspnav-1.0-r1.ebuild b/dev-libs/libspnav/libspnav-1.0-r1.ebuild
new file mode 100644
index 000000000000..c11540c54500
--- /dev/null
+++ b/dev-libs/libspnav/libspnav-1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PN='spacenav'
+DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/libspnav/releases/download/v${PV}/libspnav-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="static-libs X"
+
+CDEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="app-misc/spacenavd[X?]
+	${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-xorg-compile.patch
+)
+
+src_configure() {
+	local args=(
+		--disable-opt
+		--disable-debug
+		$(use_enable X x11)
+	)
+	econf "${args[@]}"
+
+	# https://bugs.gentoo.org/838349
+	sed "/^Libs:/ s,/lib,/$(get_libdir)," -i spnav.pc || die
+}
+
+src_compile() {
+	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		incpaths=-I.
+		libpaths=
+	)
+	emake "${args[@]}"
+}
+
+src_install() {
+	local args=(
+		DESTDIR="${D}"
+		libdir="$(get_libdir)"
+	)
+	emake "${args[@]}" install
+
+	# The custom configure script does not support --disable-static
+	# and conditionally patching $(lib_a) out of Makefile.in does not
+	# seem like a very maintainable option, hence we delete the .a file
+	# after "make install", instead.
+	use static-libs || find "${D}" -type f -name \*.a -delete
+}
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index f5cfa5ca1f35..a939b4911b1b 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,11 +1,11 @@
-DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
-DIST libstrophe-0.10.1.tar.gz 520649 BLAKE2B aa5cf0c972d7ae8731752f351dc3c1d6d230b8a1411417a81126543dd47e79e324a8c258cbc4c2e608c748d62211dcde3802cb92bb3612c6a33bcd2209182a90 SHA512 1ee3cb76cdc76711b4928d69fb8add974ab8359b729ec12003d73530c93492f4e8d208cacbd50f8db7509bc01f56a9f945348bc3a6fdd18a7080b751fff8a783
-DIST libstrophe-0.11.0.tar.gz 537506 BLAKE2B 895531e86a5b0d6410d26cf96558c2f99ea1bab803c8333a2f69d72fe7d154013ef3844b44215cfb1a5134371961c00cf6e4fd7ab9dc82846df01a37c4339c39 SHA512 e4b0d4a80e0ab5ada451ce55e44ec9247d4df5280ebe6453e49450aa7fa371461eb42fc9f39a0df12637146c6ce4202a1f770378686777228790c0213941d9ea
-DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
-DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
-EBUILD libstrophe-0.10.0.ebuild 1031 BLAKE2B 30e399cb399c0de37a462b9cdce10ec4e19a9ebf81299d787e10d4b8ae468ecfbc39086ef156ce13b442cf5d0184fef0f64d8864df702beb967a459f1fc9b451 SHA512 946c25d4972f929288fbc62346283187bcec07d09c98eba02d634ff4fd9d04be72ce2d2053055e297d2695616c12333295a34b06ce194591228317f53dd5ad48
-EBUILD libstrophe-0.10.1.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae
-EBUILD libstrophe-0.11.0.ebuild 1126 BLAKE2B 063ec4da784b4ea66feb4a0a0a0e50d265f26c1e8ded2ffcdd5d696d99cef18990086e9f313b263dcc6045dc6f23a8083bab85beade42459d22d889a2074fdc1 SHA512 1908b73ba5922ee015ebb66ae63f06d991758cda531125fabb33aad0b7edb0dda2ec0d3cfed83e0c90e90b007204875d762564288fc8c68e2a11ea98b0a5c902
-EBUILD libstrophe-0.9.2.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae
-EBUILD libstrophe-0.9.3.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae
-MISC metadata.xml 592 BLAKE2B 9d452fcd753f268f15f71bd027c2617884041f24917fc26d634b098e1841028153c09129b85d1aa6106585acd54c80313359f68e923340602b127b9e9414bade SHA512 570c61d64869dfde667fbbe0b989463460cd73bd24a42a9f94f2c19e4eb442866ba4c08c301b39c66a9572b74094909fe678079d21c2baca2637834aa252b6e1
+DIST libstrophe-0.10.0.tar.xz 357896 BLAKE2B b457c1556b7bd8012fd0b0badb962c0002ca38884e246911b25c8e01fa785a08c316a18c84e8f9e124ebeed636c586097a2dacf56c7c94062ac262e44f9473d0 SHA512 cffd71f3c83f53a4f0681916249842cc17e11fc28afa940e29a786ee02c5294a11115c115b12d200e185a62520623c68e1d4514ab374423e13e26b9438d80ea8
+DIST libstrophe-0.10.1.tar.xz 357960 BLAKE2B 5fe0652073736620394d09d3095877cdddc8e0b4d7ec07ce323714e3604280166c8ad0a3953d804fb592dbb0885afb476ee185f68e12468dde4d74e35b23220e SHA512 a81398065988ac5468f4e0bc1ce1a864f3ce97d0696de8170185113eecbd582dbf30c9ae4dbbcc9ac472c5b62b8e9530f7bc88ef2a582640279f2f777d6bc833
+DIST libstrophe-0.11.0.tar.xz 370740 BLAKE2B 19f240383e81ea2733505b8361ba061ba69b09227eddfb958aa3027d7c3aca2f1739977e003b980ecf5501fde5ffa2bdb0a0618aff70637b11f94dbd70fce3a4 SHA512 3fd3fc395d1c86787cccf9dfb54805a56d650687db17ee28107f4fd610aa250c40cd6052d5c8c48110d69a8bceddb913570efca24874733d3e9a016dd90df65c
+DIST libstrophe-0.9.2.tar.xz 343820 BLAKE2B 0c2ead2b70d0e171dcdd475d05413d2b85142f3916b3cb1610a929cdc1bed8c86b587e7a0103d80c2ea9d3ebced7d39e23537a3ce913c309c70961f2d9703fd2 SHA512 bc4e63cec45007e44e1d3732a41d71973a4410bd697ddfececeb761b6e4665e563813a27e6b8550b6ab55db31b872772bf4b94a652579e63356948f9300a211d
+DIST libstrophe-0.9.3.tar.xz 345232 BLAKE2B 045f2f60b92b4a5435cdd0d1210f39bd507113fae486f67e1ce36511b8cfbb38a63e22f79ffc968242d7c424995d344ce8f636a4b738f3bc3d3582a6d61cba08 SHA512 a1ccaecfa471f3edf7843676e87f0300871cd18a14ceb930276513a2db0c04c2daf76a0f136b2e633770865f3bc43abfb07b8c5e56586d11cf90fce7d80a4ec4
+EBUILD libstrophe-0.10.0.ebuild 1031 BLAKE2B ce23a45158b60eea0eb871d385068ee46a2b98a53c26d8112d68da6a9f671e9c2c46ee1872d4740fba554443919426d10e423801d96a8dc0284ae7e2801d5135 SHA512 6b77e7f6469107bbd0421582aa15ac9e80f9ed9f4a107edc26d3edff4c17675fefdb01306014559f243f5887b8ce58f5d252011c7e13eb0895d18413f7a0b0f3
+EBUILD libstrophe-0.10.1.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
+EBUILD libstrophe-0.11.0.ebuild 1126 BLAKE2B 293a2cf7750e6d4317f6d4c1829776d6f0dc86dfde5a83b9ecffb202215948107b69ac0fd17d8f6f8d44a9829e50e7d9ed2d8e1cc5e7a46b339897d9a15465ab SHA512 86d44f69dbe511b7518c448471b22b8e82151a13906e368f04e8557cbc1f31046f3cd030cfd1f12b094ff5a12e70e3400e8e87fe9da34910a91fa00f7c7de82d
+EBUILD libstrophe-0.9.2.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
+EBUILD libstrophe-0.9.3.ebuild 1032 BLAKE2B 918cfcc17ffbdcc00f3d35988d18a58798be04303e7ee0a498dc6ea1b157a0f87b9e66c456159b2a633cb21b71799b7153f75d9ea2abc6b921457248dbac0c29 SHA512 9e9d00deeb89f7558d5fd5f20bcfd101e7ad7334f6337740e638b8f87fbef8cd3f410fa6746914c127b2a7773b234e120e5742449955c4bdc794cce1ec19646f
+MISC metadata.xml 508 BLAKE2B 91087d88baffbbcab4ae6465948eaa9d8e37f1c099b8039f8ef9dc05255d688d893001b3f8912c1157c53aab2264b4d60b8a38082dd5354d5983feaa1d639912 SHA512 9f39bf674714f1a2ac85ef8a2355fc0304eef3364ea0f2d971c0cd96e5cecda87c08b4ed27defbbb45b9742fe79c43c370a893b171fafab26207f008acea0368
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
index c7dd5320b926..f21e11c5814d 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
 KEYWORDS="amd64"
diff --git a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
index bae3fd596e3f..884905d63baa 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild b/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
index 4a33b68fac17..89ea2f1a6f63 100644
--- a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
index bae3fd596e3f..884905d63baa 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
index bae3fd596e3f..884905d63baa 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/libstrophe/metadata.xml b/dev-libs/libstrophe/metadata.xml
index 14ff3e6ce479..73fde1e3319e 100644
--- a/dev-libs/libstrophe/metadata.xml
+++ b/dev-libs/libstrophe/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">strophe/libstrophe</remote-id>
 		<bugs-to>https://github.com/strophe/libstrophe/issues</bugs-to>
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 5ac30a474c91..485188410806 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,5 +1,5 @@
 DIST libthreadar-1.3.5.tar.gz 443192 BLAKE2B d8e06c7b58636b51bd2ffd50f51a8a024780e4955693a28085296ccffeef8ad2866ac12e53b3c78b37a650c4b1c54b5fa8dcbacd1002577cdd7b30eccee2ef69 SHA512 c4c34036a7882d1ecdbc025e0d927b6712fb067aaeee8bae5bc740a5259c5f49d651a8ad6323ddf6cdf13fd2e5e7c396f9c134ef3447b3743ae8e64abd646850
 DIST libthreadar-1.4.0.tar.gz 445672 BLAKE2B ce4165bfa507f27ea071dab067e1cda61e0812fd106ab80f0ef04a53ac68ce866a3d7c5ce6a26d6e9fc2c2085de7b8636492711a15a7103cc16b773d0a87aebe SHA512 3665817cf6327d4d24792d8cc2bd0a458bda1651b471e3440c1f63c22f397cfb4c8d81482f937e13f67f5ff1414662b1f69d9c311362a0a7a9249e8bc0236751
 EBUILD libthreadar-1.3.5.ebuild 487 BLAKE2B 82d3fabecec2c763e21f2296315270c01d554b47540afc6780cc47e336e2716a9d3495aa7aaf91a5adad33147a03465ea6930c4deb1cdee6f7222fbb6dc01afb SHA512 15584e850b6870de765c9598f175fb346ab55301c51e1d7fb3d92bd744e86ac3fe0bf26beb66f9a6b0a7b192692a6bff0fa795cf20167b84009279c3ca1bada9
-EBUILD libthreadar-1.4.0.ebuild 758 BLAKE2B 44a9dd935c10306620e16791d67126030a3e400cd18b1d31179e4cfd76e21d061e87f0e0fc67363413552257054a14dd948a32e28908e1328268c8d57287f0d0 SHA512 f6ec66407de9d4b882912f7e3fc6c7359e9070860def473292f7683d13ff7f29e4aa1145da77f0bafb033f23a1db69a2e307772e72ad745b9233d364f00ea0d7
+EBUILD libthreadar-1.4.0.ebuild 756 BLAKE2B a1249e23a29a6746de0a403a194a7b29bbcfe8475db75acc4888414966f5d2450763cfb846440da3baf18220d889e2ccf5d44bbf1d17085958a795438b0923c1 SHA512 91946885b676bbe69352dd14069214273d4eb0d42f1896042b8ae015b84bc878ee0175c45c4e4533d63b8bddd4fe4c9f4048470dc348480524545fb90b6a5bfc
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.4.0.ebuild b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild
index 7ad10216fc22..f8fb39519a62 100644
--- a/dev-libs/libthreadar/libthreadar-1.4.0.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index c44005b555b0..ae4e710702a7 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,7 +1,7 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 AUX libunistring-test.patch 549 BLAKE2B 2ead1452792a3786ccfb22382d9fa59d5ed873ce4fd7fb791f928f960ddb98b37ba4c3ba8386369a303b1c8be28cd9f22f964dbb9064858d9078b1555631fa4c SHA512 3312cb67ac033f9ced3dbb4c6ac5c93f2d93fb7bf04e996f2087c3f25ad0795c4dfc09b59c23bfd59a1b35b0938f50abb6c720b1f29f8b292f7b63848d3d704d
-DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-DIST libunistring-1.0.tar.gz 4214306 BLAKE2B 177f21d9fb6d81ea6bb2fd05f9ca31cd6cecb5a16be273de8817a8fb6ffac997421ebf108acebcb3392b8df423b7e3e150f24a731e0909e2ba171b4bae2fb53d SHA512 6125e3911d15bea8fea5c0b97864f928eab8c8476f1a24c7349b0552e2d11d9b73c1fa0fcb354917e42407d4e5adea55d0c8012121fa0a53c60faa7b0911aef3
-EBUILD libunistring-0.9.10-r1.ebuild 1034 BLAKE2B a829098b2dc18731a31de741925b1a0220de3bfaa3ab6d7576e97b9edd279d46af5419a72f7f1ff3fea1b7d9c32605c8c87b033e817e440dde71748579696624 SHA512 fc22fbe238b2d6dd130e44e6686662f79664edf07cd6bf09f9648d769523b311b3116bd23285bb834321b5a2d7530474e85338a1f882977f3261f6093b509cfb
-EBUILD libunistring-1.0.ebuild 1008 BLAKE2B f9df2a8e674d9e0e85f5623557a35bd458a7c4885e44513f2d2d56e9526ab9108f288ca9bbf0ffee58a7dd7378376dc6df9bd6c436288109813e589940da32b1 SHA512 6853df2d760e998c7890901fbaf0d4306132484ac0487cc1e88f275cbadb283981854f5b30fa910d47829cefdf34b5dedc9ef7c910fb0ff1af663b2e6f70331f
+DIST libunistring-0.9.10.tar.xz 2051320 BLAKE2B 25d162d9d510cc35ad4209acceb9b06bcc0553b8ce56e94f8df12c4df64d91abfc4a9e15b50b5c8d5b9672939305a394a7e83f1892258defb7ae5ac2ccf79dfb SHA512 01dcab6e05ea4c33572bf96cc0558bcffbfc0e62fc86410cef06c1597a0073d5750525fe2dee4fdb39c9bd704557fcbab864f9645958108a2e07950bc539fe54
+DIST libunistring-1.0.tar.xz 2367800 BLAKE2B 8208fe33d4ac2f015b0efb56b0c7dd87afc4bb1c6ca4eb3ded86d7e2101d7b7f68bfd8991af4b6dd408282ec73f134ee0b884e761ff6d52e8a1e398326aec420 SHA512 70d5ad82722844dbeacdfcb4d7593358e4a00a9222a98537add4b7f0bf4a2bb503dfb3cd627e52e2a5ca1d3da9e5daf38a6bd521197f92002e11e715fb1662d1
+EBUILD libunistring-0.9.10-r1.ebuild 1034 BLAKE2B 12a4f6cdb696d052166e1475a536be7b5e689fdbcca82b8a683c640f5921795777c0bbdfadf0814909cdd5b73b4f790a651b0a8b4b8228710aef6e828a25d678 SHA512 792b02dd7025bfdde692437f558305a4281e77f11622cbe9c707eb7139b98032bf1416754e3a145c1f5d22052143cfe67817f8cafae84e91d27ac3bb5d85545f
+EBUILD libunistring-1.0.ebuild 1008 BLAKE2B 57b4077fd26ba96a3d847103a3735b802203be0bb85be8d7b2ba1a4fd43fc4a5bc020e37026aeb981c7e00debabf9ee9bcbfe8b5949f9f50da948a42d9941d00 SHA512 70428005aee43533987fc8593ec4d73633f845c4b430cdd3f7ddf3b7a1ce41ea4f18aaca080fd687d5cb6ad57fb78722ef4f47de888ca3375258eeb43dadf187
 MISC metadata.xml 974 BLAKE2B 367ac9d8c34135ea5c1b1a7fafb89254ad3c25deaa183a82f40ab4289c76a311eff909e4d1a2cbb361104706786471f24bfd0f9a1da20e1eb20bec3178c43b5c SHA512 89ea5c6b84a94c713ef72b9c3b921fddb3a87b8d0ea72eb924d379eb7d46974cc9b60e350007752aabf802bcc0fcb5fe6437d11e15d1b74d1efd0a537a474bcf
diff --git a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
index d1ebd5807547..14579ae83fdd 100644
--- a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit multilib-minimal libtool
 
 DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
 HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 SLOT="0/2"
diff --git a/dev-libs/libunistring/libunistring-1.0.ebuild b/dev-libs/libunistring/libunistring-1.0.ebuild
index 2f294b42e0f8..36bcd1dba9a1 100644
--- a/dev-libs/libunistring/libunistring-1.0.ebuild
+++ b/dev-libs/libunistring/libunistring-1.0.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal libtool
 
 DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
 HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 SLOT="0/2"
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 802fef920db6..676122efe75a 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,6 +2,8 @@ AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599
 AUX libusb-1.0.25-fix-O3-warning.patch 1156 BLAKE2B 8bb4a8fd0edf73036439511c78c69ea9a022e01a1f1c6faa7963624faa1e59848ad91b0163d9c3b601eb31ec0251bcbb79e7e0ca64c7a35d66b8abe4b39ab98a SHA512 0547d439f9bf30b47df97227f03e9504a3b53b9a859505ebe17443380b923770812e684f76161cf1f3425af25502dbf8393c312ee7f3a6206f5a808b9bff2cdb
 DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
 DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
+DIST libusb-1.0.26.tar.bz2 620534 BLAKE2B 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081 SHA512 fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71
 EBUILD libusb-1.0.24-r2.ebuild 1772 BLAKE2B 8ce1e44dc5838e83968a70c5a165468eb39bdccf1f818a8604fc0efacd8d1f0dbbeb222f65d3e4416ae988c7b327acfc46b060ba02bd580c418b897ec8f1b87b SHA512 0e851aac8a4012a6d89acb2f797ebc462f00c0c6b1dd9f1a673ade1a056ea802d2dc6204e83d20b606b0366f9562d7be0f5960240945e5acbe911232fbcda2c6
 EBUILD libusb-1.0.25.ebuild 1742 BLAKE2B 4b8b8529f03c7027d20549ffb8ff4b3380fe295ca6a915f9fe5ebea8faca1a3a865a3b7453650dea22a2c24faf0e28f892288cc1f6ff6c54edf0e9fcfa6a1be8 SHA512 8f6b87c28fc05e17be1877087e0fbf4bb5e6faec1f0c49b1c31dde56259b4159da6b802ab3ad86ffbcc69ea334b4c2af9667ef722f127211cea16d1d9e4aa249
+EBUILD libusb-1.0.26.ebuild 1688 BLAKE2B 6330e6be3ddf43cc551d3196aa1b45d212e6a2c2bfb4f9a084baef0f559ab30a077238c66008ffea950d3e7f8406197130bce567af1fbd3255bb1c991d4f4cc5 SHA512 5673513eb6023e471f77822bd12629d21635340d46b5153187b6c4a966fe32a1dbbe463c400b9044e2bcbed0f14a1a581683e63cf286619f65ce774f33763ef3
 MISC metadata.xml 336 BLAKE2B 8598a5e3d01ee5d7efb7ef2d48fcde99c13ee9e5915d3fe4fb2b16689482dfb31ea23d27d75e638aa7e429f725b876e834f3319eccc188f4af6704d3fed14c4f SHA512 8bfb8a1c4a2185393c1cc00b6ba17a9e04276e7708ab5c590209eb7c522212c8b45981dd935ef15421f5865ac7861c5dadfbc7d8f53ab4a42b3f0315696b3713
diff --git a/dev-libs/libusb/libusb-1.0.26.ebuild b/dev-libs/libusb/libusb-1.0.26.ebuild
new file mode 100644
index 000000000000..328fa227b1de
--- /dev/null
+++ b/dev-libs/libusb/libusb-1.0.26.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal usr-ldscript
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="static-libs? ( !udev )"
+
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	!udev? ( virtual/os-headers )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable debug debug-log)
+		$(use_enable test tests-build)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		use doc && emake -C doc
+	fi
+}
+
+multilib_src_test() {
+	emake check
+
+	# noinst_PROGRAMS from tests/Makefile.am
+	if [[ -e /dev/bus/usb ]]; then
+		tests/stress || die
+	else
+		# bug #824266
+		ewarn "/dev/bus/usb does not exist, skipping stress test"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		gen_usr_ldscript -a usb-1.0
+
+		use doc && dodoc -r doc/api-1.0
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h}
+	fi
+}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 7733e105f339..80f55d77f49e 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -3,5 +3,5 @@ AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec12
 DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
 DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
 EBUILD link-grammar-5.10.2.ebuild 2953 BLAKE2B 48c814085ec491e5a806bf83d9005435ef02c2fb4f9bfbd58737c6abd1773b7a84a5a3777d4d7f4f171cc831c9bc0c005c22ada79ad6812da0e78d02a1a1c981 SHA512 f2ea6cb09dd955b6ec32a4b8e65688667465abdc3cb8a28af9f1143508a7ecfed9d91bc86e81ade810d612a9734c056f066f8c9cef9a0c25f7cca70e73437a8b
-EBUILD link-grammar-5.10.4.ebuild 2923 BLAKE2B 8559d949ea26e420c97628d02f9f9ce5b467cc9339fdd59ab60c406af6807177ec2cb4f046d039d8e2d3fdb124320a7e6b53b121caef5524b7c0f719c97a5bb6 SHA512 635ebd792e697ac282ab9451c8e95dfe2e46064aa7f5919c5ee62927c347c77a1dc6739d2f09be266dbb39307aa7e955461250e215581e999ad3a8e40a971951
+EBUILD link-grammar-5.10.4.ebuild 2921 BLAKE2B a8f4961b5360995d58b9d52d15357717a038f417ecd61941007bd5aadb324f2bcee9b33d53a161ffa682c3bef7ea68f9813fb1c52abf2e3602f025a10f61959e SHA512 6fa2c1ab5d2140c425b3f68f59760dc61eed86dda635616a591bfb3860a2a0a57d41a1c3f0c688cd02a8e3401c7ae865505116c927f4a8da856b0bb475ca9bb6
 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
diff --git a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
index 9cd72d301f29..aef4f10b4a0c 100644
--- a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="aspell +hunspell python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index ad4e691ebe97..f605bd6f05c4 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,4 +1,6 @@
 DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
+DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
 EBUILD mimalloc-2.0.5-r1.ebuild 776 BLAKE2B f969d9c42f6aaf6d1dfdd2e25033bae22e17ce1eac11b8bc542d6709b05d15e8a9c88601f8b3cbe3b3c9552ddeee5f8d0f72f2f5c6870551b5fde9c26ddd3d5b SHA512 816481dbb9515bf7f792eb9232f76d42bda9d8cc461455536973b6caf46dbd541c21e655f6756cba7df0a60d6bf95170a3f94f991c33fc73414710182c194049
-EBUILD mimalloc-2.0.5-r2.ebuild 686 BLAKE2B 55f12eef6f5497a8fc91eb5b923a45fa94297914b5d11c1caba285cb4c68c5e07178e53629bf7f9d281722b57a02a4016aa18d236f9c0e833d318c2d3082798e SHA512 687d66edd0c82eb79dd421a6cc02258446c45c8a8ed32a9876ee11ce8638e247ccbf661aca37109ccb127826ce5c0e280bf6b935312caa54bf382d1057aecfdc
+EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
+EBUILD mimalloc-2.0.6.ebuild 692 BLAKE2B 8f4983f6b998772290def656f53e5fa8be762ff8d4ee167112ef383bb4fcd42a9d5fe7548dfe7679314ae46953a9bf52a93877504be5fa052c9195aab8cdc89a SHA512 df7f7822fdc3244d78fe13f2ed0db3df9c443af5e19610585dff4642e4fcf86149d989c0042e60311a5dd25186b2ed4d2921845d1e4e6375960414926c34cb96
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
index a165403d4ed6..8710584db2d5 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/mimalloc/mimalloc-2.0.6.ebuild b/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
new file mode 100644
index 000000000000..2edb208e732f
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: build hardened variant?
+		#-DMI_SECURE=$(usex hardened)
+
+		-DMI_INSTALL_TOPLEVEL=ON
+		-DMI_BUILD_TESTS=$(usex test)
+
+		-DMI_BUILD_OBJECT=OFF
+		-DMI_BUILD_STATIC=OFF
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 35cb7f7758e9..75132eac6771 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,3 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
-EBUILD mpc-1.2.1.ebuild 895 BLAKE2B 9a642d89025cad75ab3e62c076f96dc181cd8aeae6a7429467fe2059873e13d586d510c73a235120c1fe2fa38f014a2bc8563f9e3d72b6d99a7de00184563be9 SHA512 f864f95a874a05147636d1e00eebcccc0d8ad56fd6ce98f5116d8d5fdfc9cc9c61689150efc9f14c450e90b407871a6899da1b795cd6d912c20bd4e974fbc5d1
+EBUILD mpc-1.2.1.ebuild 900 BLAKE2B 29fed497b0eacb4d500e188d4d88b0271638b1771b95d8b6b99712c7269dca9d1c1d145829722c61ddcfc551ab47ed549a43beba4d60f66ea8f626a5868b7d93 SHA512 7a6fef2a4e99ce29198d331831d8eda8ecb3521dd622a592a89f40b2d783d52c70a3954061e941d370de6745a30b465db16c2a5623d6f3560b8933c323918e0a
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index f2b23959fc05..2057137f920c 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="http://mpc.multiprecision.org/"
+HOMEPAGE="https://www.multiprecision.org/mpc/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 3251a573556d..24c6e8d903d2 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe51
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
 EBUILD newt-0.52.21-r1.ebuild 2229 BLAKE2B 974b87429d91ba6d6a9565e13e5c1d569c02d244638ec99e4dc2a620098687942596b54deb9a4662e4c9f8ad16f7feae38faad0e6b9ba48ce7df1892fedc235f SHA512 4d5baa9a7179d6853b19cb6a8157a32105a697079985d39cc244efa0278270399dc3f511bea2ff250eb6b3bd4997d3ebf095dc3a2a245f51fae731e39fb5a533
-EBUILD newt-0.52.21_p20210816.ebuild 2334 BLAKE2B dce1b9f84077bf0f3f421c84940948b86f648a1832ef1c3376f00cc73417b6cdc568678ec13b410a5ac749817eab2fcc4e6166087b41709bb1e39cbfe05b7dea SHA512 dee9f71df13ff7d255dc9fe6813297559fe04a6a562fafdd1eb5e3126a12dba57f00d89130803a9f20aad838591b747843120c6ad777474e572c80dad05483b8
+EBUILD newt-0.52.21_p20210816.ebuild 2327 BLAKE2B 98f0b73570e5fbb11ae4f0507654cb3a80d9c9c4ec0d723fbc0535348046de8942f15894d392c212108fbc90e94e3ad57c0018016c99766e8de13536b3d078b7 SHA512 fe266a81de20688292feac0831102530f8d179b97fa533f8444354cc810452b42a3f7a1ea223b67c36134bec7685f8213a08bfac402162fc347ff0ace43324d9
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
index f38fc22cf2ff..595cac42ebae 100644
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 4fae796b9348..402a5e460c3c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,13 +2,11 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c33bb77909d9752f069b2b8bc5bb3ddc3da286b5f0d4f3901c990af6ad308f7b5523103e35d72cfe18e031c2 SHA512 b3f39cb0c9d91968b3dd45fbdbd4de841e17e9b97790c574d8dc6a43e8fa59f3add77125c1117092d4600ea6a89659b0a8a26ff00cdb92165d107f47372ef862
-DIST nss-3.68.2.tar.gz 82406396 BLAKE2B 0542278f63770e9d4f3ce51516d7786680f2a869907ec91b2c4160f9fcad60703dd0e2a77bae91306349ff56908af0020e9479815e2b15392da7b14b27f8c7bc SHA512 31fe62f9e6f1695546bf8b087ae35ac2d3f39fde6be6ab3fcbc81ef66cf6290fc34b799e3809fcba4e913d0e305c476ee8ee1f22d0f957ec6978025920bdb9de
 DIST nss-3.68.3.tar.gz 82406947 BLAKE2B 92461f20294a9dce8c8a7eead9d06a4159e66afeb2d42a3313983fc5606a5f97321e038b9c25a7c7a361506910aee027ec91efd3096efdbf62096556d40896de SHA512 70fa8ab48d45249c04424979640583e8bc867432b7e3f26c1602db49a13861dd070f081ed82660bb7451f835dc859b5788ae12a67f9ddab1f6bd1a7afb1174d2
 DIST nss-3.76.1.tar.gz 84626067 BLAKE2B 5112b208f3b9528a34b1d8e3e669db067ecb79719ad16793b8cd556a02910cc29f899f2a57e959c50048c5d2b94eb3b9855208dd3c20646a719c971561f6ea4c SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54
 DIST nss-3.77.tar.gz 84592839 BLAKE2B a63770f550b062549901afdcc5dc2a11c4648cef6875b023895da01ef53d6afc8c618291de96ac0af3a2c2cd7aa7986f93b4f10102a3c5aca1aa1447c148c393 SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.68.2-r1.ebuild 9291 BLAKE2B 28a867ab12837bfe8652a31a8feaa2cc9e915a875c23a4ef361677a6ad8af5c52b73a31c658113bb9f8be73f2a63635db205fceaccc15c3082f3b0cc3b418e26 SHA512 a976cd29fbfbf8f6b68f36dddfce37d037a84445b088adc056896bf063fb2ce9ada41cadef964a41eecde473e6e2c42ce263c3290a882209e3aaed1beaf5e451
-EBUILD nss-3.68.3.ebuild 9330 BLAKE2B f3a480ad8cec62827ed7d0e5b7620dc6481e70f2ccb1dedddf36db9779c663cd1f94e54e68d87913725a8826436d961b4b5ca3367e74e49430313dbab6c53263 SHA512 fd59bd3af658dbe667df692fa6f21035509ff68c82bcfad4c567c106e836ef520683ce3116f666af032fe8dc556596e09747560defe504b2756cdc9cbdf7985e
+EBUILD nss-3.68.3.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
 EBUILD nss-3.76.1.ebuild 9355 BLAKE2B 12a792836a1636697b48e86924af063fabc25d6beda356b73b35a90ae6934bc0b948b32a5ebddb17ac3ace16bb82ac02b4d15db20bd9726240ab6a23f6fb234f SHA512 3ad0df015300ad377632b44a0dc71744a02e6be72f499a563cb8e73a25d887bf0b34eb5cbda374f0c3b927f757c851cf2f1f2ec3da0d43fb2dfb1dc4a14cf20c
 EBUILD nss-3.77.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.68.2-r1.ebuild b/dev-libs/nss/nss-3.68.2-r1.ebuild
deleted file mode 100644
index 8d2e934a1557..000000000000
--- a/dev-libs/nss/nss-3.68.2-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2022 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.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# 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}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	default
-
-	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-	fi
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		*86*-pc-solaris2*) echo "i86pc"   ;;
-		aarch64*)          echo "aarch64" ;;
-		hppa*)             echo "parisc"  ;;
-		i?86*)             echo "i686"    ;;
-		x86_64*)           echo "x86_64"  ;;
-		*)                 tc-arch ${t}   ;;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	# explicitly disable altivec/vsx if not requested
-	# https://bugs.gentoo.org/789114
-	case ${ARCH} in
-		ppc*)
-			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
-			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-			;;
-	esac
-
-	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
-}
-
-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/nss/nss-3.68.3.ebuild b/dev-libs/nss/nss-3.68.3.ebuild
index 1a0aceed903f..a3ff3dba2827 100644
--- a/dev-libs/nss/nss-3.68.3.ebuild
+++ b/dev-libs/nss/nss-3.68.3.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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index bfd72b17abb9..5bbaf7225210 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,9 +1,6 @@
-AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
-DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
 DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
-EBUILD ocl-icd-2.2.12-r4.ebuild 1212 BLAKE2B 8b39938a7bc2b83e4e3b04021f2d913d1e894ef8b89b655f93b56009ae0ed05b0e66144a5089d8b38c6f9b0fb6e6fd8bc606504f9cf10ee5c090fd941d8030ac SHA512 c2b9c70e2a62d6b6bc8974813715d1e6754e716d5eef7adb314a5f334d9c7ba748d04de3c25177231b0a74e5afc4c43e549af340633646627268af46eaa9452d
 EBUILD ocl-icd-2.3.0.ebuild 1524 BLAKE2B e738dd830515e756ddcc34bbc3aee067ac118e5d88ec07bafa37229cd7f1fc798576061e72570a63b626ff8c92d652fcdd80cb78e3afa6c1dfc9aa739d72e234 SHA512 16991b86d0d3be933f226e1dffd23c3d388b6c524426fb43a12267ee19ad681a4b6911798a305420ad65c4c1df1a8c51618b6136f1dac862f8a8c553ca8db0f1
 EBUILD ocl-icd-2.3.1.ebuild 1475 BLAKE2B dd1ff1e709bbdfe7fb3b7463864b9ca7ea83bfb153e7335a91c8ef27e1400af22f796265763eb652e0a95249b8cbb0c379b751246e05a0acd1a147c1760275d7 SHA512 3d9aaa113f9b703cc8d98dce446f306189e38ec316e6cc8e6975f1f6d710317ef772871830b3c964c6d08a08a35643f07dc2cba8795e5b086ad192d568064888
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch b/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
deleted file mode 100644
index 64948d5b05e3..000000000000
--- a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/706098
-
-From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 22 Jan 2020 19:38:23 +0000
-Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-libtool: link: gcc -shared  -fPIC -DPIC  .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \
-    -ldl  -g -O2   -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0
-ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226:
-  multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Anthony Parsons
-Bug: https://bugs.gentoo.org/706098
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- icd_generator.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/icd_generator.rb
-+++ b/icd_generator.rb
-@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header
-     }
-     libdummy_icd_structures += "};\n\n"
-     libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n"
--    libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n"
-+    libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n"
-     $use_name_in_test.each { |k, f|
-       libdummy_icd_structures += "typeof(#{f}) INT#{f};\n"
-     }
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
deleted file mode 100644
index 3cc734b6f736..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-inherit autotools flag-o-matic multilib-minimal ruby-single
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Does nothing now but by keeping it here we avoid having to have virtual/opencl
-# handle ebuilds both with and without this flag.
-IUSE="+khronos-headers"
-
-BDEPEND="${RUBY_DEPS}"
-DEPEND="~dev-util/opencl-headers-2020.06.16"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
-	# does is disable the use of the bundled ones
-	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index e09e2b73d0b6..a76b5a053b9f 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
 DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
 EBUILD opencl-icd-loader-2021.06.30.ebuild 887 BLAKE2B 152f167a5385e89f7e6929f78186aa8472abca2bfac911ffa223200f3c8231455b9e9d83de56ec36f9708f7a4d27df7c169e01061db30c0b6a4a342c777d3d2d SHA512 1d26f1fb0fde5932ed82a935b6893e0762d7ff8aa419f0ed1afbb69f02b7e72f31c0ebccae5aa7255ecf717b7d1d70dcfaa400e258b298615c93245e38fa60dd
-EBUILD opencl-icd-loader-2022.01.04.ebuild 889 BLAKE2B 74508f06d68773e9c5d8b98abc8da9278976fe70d818a4b202dc0b6bfdab2629de3ea79f62b42f88df2b1b5212f5d095b04fc3843f085baffbfaa55224aa35c8 SHA512 de1befcae806ea5fdf9a8c55b3fac8faa3a7dae09b4aeea0f454eaefb684a96293283d46405c02a71bc5ef8af9d405746e4a1b86fed270298f628978705ec22f
+EBUILD opencl-icd-loader-2022.01.04.ebuild 887 BLAKE2B 50f97b3dc2211ebbbba28ad436bc40527e4e5e50e5962bb3dc3ea1a65c48a1eaf2aed843f9b82af66259e672a52bbdfbfd5aa986f806d4aa4fb891c8d8be6ecb SHA512 35084b36b4d681c70d0df9895fd46873ec1f997aaf6700d0e4bc863936adc88c961b1e948568d2dbcc91898ac3714914f834f6bf80bfb0e4cf3d58f078302ea2
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
index 6a053ce77bbb..be0c974d8632 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f96a0e186304..e41bcd81ae32 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -21,8 +21,8 @@ EBUILD openssl-1.1.1k-r1.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8c
 EBUILD openssl-1.1.1l-r1.ebuild 8467 BLAKE2B 5416eaf449db4d7e785cf8ba2b83a829a9b57237c9d561900029ede389205a3905411b9b19d170f801d781fdb7ff3f8e562c0b037a87ad1cb48830cdac8091f5 SHA512 826f4e77f5388fa0b3cdd754c5d39c049987f4c7c038fa416da1611e084c866339ae95ccae722fb2058689953c60ed56562247feb11baaaf869516eea5a56b00
 EBUILD openssl-1.1.1l.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
 EBUILD openssl-1.1.1m.ebuild 9036 BLAKE2B 998fbd22a08de53c635cb928dc236827e0982e5758f51d179d92a087771f46fbff227624868bb0a682d0df2daec093d7c64bfb3812a6c5035f529030bbec7e8e SHA512 d976a3e28a9914a6ca0cba3d6a852c787f80d51b381bcb400ab88bcbc9d6e956c60dbb439781cfbffe47d1227301aa4ceb7729718f49a239f784dcc239815f93
-EBUILD openssl-1.1.1n.ebuild 9240 BLAKE2B 272e5a33356c2dab0d681998d52843bc817ec3d717a05c0645f6948a48758a5f3f93bf14164068da3c40a001727d52c309ecc3e2534354e27b244a7be2f58198 SHA512 9b9882975b1082b8a141206d9178a969b3301eeffee30415a1d9417f74e63310fe819bdec191e9d22d41d9c8036ade9eb1d0eb0c52428be65d9bca968811ebf6
+EBUILD openssl-1.1.1n.ebuild 9289 BLAKE2B 50fe702a2a3872ac9c54c68dc5ebeb7eedef4324f3e0fefb077a13072e4cd6d4279c5ef25512b48bb35b5af2e1c93408da2cfc09cdeb93f238551281abeb3266 SHA512 7eb28d1c27b89c9051e221b8f7dea53517c2307d5656874d4a12fc0df7e359d005963348102faf779893cddeb217d51fe10ba2e1609eb3e99097c0bf30cab057
 EBUILD openssl-3.0.0.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
 EBUILD openssl-3.0.1.ebuild 8464 BLAKE2B 8e024cdae9836cb5135089482d22617b0a90b9617bc5b4f9ab79669c9b28a8c623218de11a452e2525ba29456a7ba9be7ac16724eb0dbcafd2d653b26fd77e4a SHA512 28e4e5be320a1a0c2ea726ec0872d6d42c79f3b5eea9ef23a2501e24e1ca6ff27226ad7720a7717e61642399a4a0d5d98ef406d8b8856ef98934ea7c3015d1a5
-EBUILD openssl-3.0.2.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
-MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
+EBUILD openssl-3.0.2.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
+MISC metadata.xml 1585 BLAKE2B 104cd90ff54c6789edddb7f433252731754cb600ea663c6da66b28ee988541b9fa5f8b3086684841946ca8c4928c8768a1ed11d39419a26c039da840912a66ae SHA512 13cf734d5d1685135e0f1c488af0e4a2f1295eac33c45d65b1dbdd1b04100b1ca5f3d5d1c9938f4100f8df548ba739c9ade56c72176de92cb7f9c2cc2da818cc
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index e0b7df73655d..7aeb3cfc9e34 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -15,6 +15,7 @@
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
  <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
+ <flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
index af9f45ed046c..5a7d16cfa51b 100644
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -17,7 +17,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -193,6 +193,7 @@ multilib_src_configure() {
 		$(use_ssl sctp) \
 		$(use_ssl tls-compression zlib) \
 		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl weak-ssl-ciphers) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/openssl-3.0.2.ebuild b/dev-libs/openssl/openssl-3.0.2.ebuild
index a42efd8d9f4e..2ef0aaed3200 100644
--- a/dev-libs/openssl/openssl-3.0.2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.2.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -180,6 +180,7 @@ multilib_src_configure() {
 		$(use_ssl rfc3779)
 		$(use_ssl sctp)
 		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
 		--prefix="${EPREFIX}"/usr
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
 		--libdir=$(get_libdir)
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
deleted file mode 100644
index 8f0f57d77cb7..000000000000
--- a/dev-libs/processor-trace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
-EBUILD processor-trace-2.0.ebuild 571 BLAKE2B a5077681da3182ef6a2fd8f3e881b81e166730d8f214343370b616bd9664794a70836b19d47bace9643ca6fdb23b4fbf8622dceb5e81af446b7cb35eace3e11e SHA512 70553ee2b00358a367a3f7b1edd676e3e775b54e733dd53c3dbe31463064da66cc1d40a7246f638f62860617f009f1bd3ed5f2384a9a849d910f0552a5c623cc
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/processor-trace/processor-trace-2.0.ebuild b/dev-libs/processor-trace/processor-trace-2.0.ebuild
deleted file mode 100644
index 9d3e61966693..000000000000
--- a/dev-libs/processor-trace/processor-trace-2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Intel(R) Processor Trace decoder library"
-HOMEPAGE="https://github.com/01org/processor-trace"
-SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="-* ~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-text/pandoc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAN=$(usex doc)
-		-DPTUNIT=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 32d6f2b841e2..0805299f211a 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,8 +1,8 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.11.3-disable-automagic-check-for-lz4.patch 2819 BLAKE2B 132e07bd4dc447bb67b2521c89e06c697dce9554d1f2b737aa460a22be9f7a2999f39ebd1b25f81863ebd764ef127856dceeadcb2a12aecdb01cf01f1cc22bc0 SHA512 9de7af38c778366e63e03991fa147844695dd0b4cd2e62559c5f82a0a2e914abf1bab5b905ad3cf26512d6d48670bfdb40a0683ef7dd1383eb0229f6718a70a4
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
-DIST raft-0.11.2.tar.gz 325098 BLAKE2B d9366547440b431edec75a22bca3a50bb6d714b5d950c061723f0585c5ad33704d23c32f2e325dc566ebeab71e15e10f07932c854657837e190901b52c9b4950 SHA512 8be47270cf3b888ff6adeeec2480ccd5065b45c3c546da089cbb326cf429f0bcd4396001e20fbf52587c00d5757337812c834ec5064fafa4815a978a7cf0c35f
 DIST raft-0.11.3.tar.gz 329571 BLAKE2B 08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38 SHA512 7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
-EBUILD raft-0.11.2.ebuild 1031 BLAKE2B c1bb5e5a07ec1d08b60dea5193de4561fdc3e8edadc737af4e6fffdac0d07ea2b204bfd9af9ad62f7e86c9486e978629848773033fc1c1d5a027ed8566c23c52 SHA512 c8322b60b347c6e40fd95c4f54918b5812833e034fe8eeeeae0821ddca0cf76e1b173001b786d42330113353ec742f1a0435b338b9848eeb034791ada3142a1e
+DIST raft-0.13.0.tar.gz 332490 BLAKE2B 8d14e07b12d4f5a7eadb626b72a90b4defffaee26804a982f257ef80f75ff47ccf434a7dc6b62f36177120cd12ce8c772a6f293e9ad48c61df277b10c0df1854 SHA512 1d65f21ac85deb36a6f8681bd506656a34994164ba51f7c23aa523673024dacf5616bbb3f706c0da4df38c0cc1a00b330459209c80d404545686525da2916afa
 EBUILD raft-0.11.3-r1.ebuild 1095 BLAKE2B 075d92ab1d95dacff2027da82952aa8f252eeb43b8ff3c4aaf0c5c10eb8df3f810a96c456dd7963ed04554f59081b3f864769bdb2e4e61003dbfe38e2e8e492d SHA512 31a64647fc3e944d2f76ec095fde4d5c2b28995bd68e6517538563c8d7b026bfd9999e68c75d1872970d30be1b3a74696d84a9086942ccf067ff3ee44194c76b
+EBUILD raft-0.13.0.ebuild 1037 BLAKE2B cae0c8c010c63a57dc3ab146d043843b5883ebbeb818591a2ed9bbbb286f4feb3e2bf5abd2b169853693819777d9f038331b0b54c67809e04a5d668adf8edfdd SHA512 8539b565f69c8254c06a1ffa85565f104af75a9a7fff634e66baad0b499c1c3a35507af75ba1e038c72e736a5f13541aeeb4f4b8d0ec8f6e79715fdfd9e05d56
 MISC metadata.xml 813 BLAKE2B e2ee68230ca6938ecc09c7cf9a3c4acbe961c1a6c44cfc5521f5d1fca93d7b1a62c1bcf10290207288f3e5c04b8ecebb7d4ee4ba2b1a12326eb58e80e0276ee6 SHA512 e163b16c585f79757c35d5a84ed017cd173a40fdef5ea736f4a01c24ffc3db2f5f0d69486c58217d8910eee47757da5da23e8353f4254990ba13c2cd56ddaa57
diff --git a/dev-libs/raft/raft-0.11.2.ebuild b/dev-libs/raft/raft-0.13.0.ebuild
index 703d817e51f4..dfebdcca2626 100644
--- a/dev-libs/raft/raft-0.11.2.ebuild
+++ b/dev-libs/raft/raft-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="lz4 test zfs"
 RESTRICT="!test? ( test )"
 
@@ -21,9 +21,9 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
 	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
-	)
+	"${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 4ad7b78f9d27..8d3f8758344b 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-typescript-0.20.0.tar.gz 769336 BLAKE2B 12f5ac1f29963eda7a34d08832ca263cf91fd6a8335c998d9d1795851bd30d4a43ade36d004ffcb287c73b63e691582a79d640e24050df4f778fa308f5b0665e SHA512 99cbcabf58717eb17346b2139320f0d13846f1f335a81ed01fee6e748cd0d867218a9cc8d216162c3b9b9da86487024bedbced67e91adadab207633c25dc7e1a
+DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
 EBUILD tree-sitter-typescript-0.20.0.ebuild 361 BLAKE2B ef413e5a555ca0965e07abac101f18b6b8505bb8a85562187f395c97879ba24cb3e59e33e549b7df9a5861b93238fd80ee41c4a26b43488ac0b5ba5ccbba2c26 SHA512 a79de0d2ec96f2f4ebf3ccd503178e72a90125f45285dcdfe2bb733619d64c10245c773bd1bd6bed1a91cc0252cac1eea68477d656135d3bd3eb6a676b2eeeeb
+EBUILD tree-sitter-typescript-0.20.1.ebuild 340 BLAKE2B 23e05366c098a727c7e8f9551de9bc766959cad872a35b2bebeeb0ed6f140b571a1962775fa9350f925d29c1bc105a9ea1382c3d70e46520b234c566e7cef008 SHA512 7511b7e7dc9190b7143790ce9a134d9b44eb69729e5d5ce39a782305981f7cd0fd65bad58daa476e4c9fc5809064f1341d880373b7b8d369fd3ede70325175d3
 MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
new file mode 100644
index 000000000000..3b2e19104ead
--- /dev/null
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="TypeScript grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
+S="${WORKDIR}"/${PN}-${PV}/typescript/src
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 454c559c3fe3..d11061f02733 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r4.ebuild 1166 BLAKE2B 0daf06c11da8b9530373711de03dc0f6910a7644692b5906b5631bb0caf78583aa6f4f23a64639f3f5a6c45b4d06df6fdbc2577115a61d331d7e64dac13b6715 SHA512 7aa798c9d1030a9fb2ecfd294bfd88e9c7e0cf76db2b3d273e4fb4483acda272be6dd3952b28f9b72c2b3ac518115fa304b4df06b18c69d52d83d3984c0caec7
+EBUILD volume_key-0.3.12-r4.ebuild 1167 BLAKE2B 519192b1d7bbce5578629b58b4e518ece4b752945509c42c21a703dbe7d2a055a10c719dfc2da07ad0d63f2ff64dbca42fe1c688443012334807b7aae874073b SHA512 bf8c4dedf6ec1e816f3ee68e21a427b5fa648fb893a3d670bc9d9a5808ba496e40fa929162232d0044195b797075d4fcac576db72f07856742eebec6b205d949
 MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r4.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
index cc8940edb1c6..4775c44fb65d 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
@@ -9,7 +9,7 @@ inherit autotools python-single-r1
 
 DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
 HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index d6fdd6218bf8..935209a0668b 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,6 +1,6 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
-DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.3-r2.ebuild 2866 BLAKE2B be1bcc2ef37d67d8798e9b8b490d641ff66aecab74dd2fa8821ed8f94423594a2ca06a63f60966de62cd719aec02f4c459573f9a607cb684aba0b7e042be8ad7 SHA512 47581641e5d9c20faca457c989a17a7978aa99ac2d1294ecccd4411d8cdce59e672b5e8dbcf40f867c54cf58bf66b0d98e3eb148f146d5e33957c5396ff37703
-EBUILD xerces-c-9999.ebuild 2804 BLAKE2B de6e031ecd46ac02b761600bbbe2e6e8a0fc347d33619ec02803cc6c33f8cfc5c4113b0f54da97fd266a68873acaad6da3ca25a1764f0b34cdc3a69e35cb4b52 SHA512 381e3600812cacd9ffaac0de6817d3fa8936fb4571acb35b42a8e84daf7309fcf3b2ee6da19a38fec9ba1bfdc23a3ecaa44de67244298962ebe8bc98d6e442a3
+DIST xerces-c-3.2.3.tar.xz 4184368 BLAKE2B e582ecfa13d521061d0a0ba2e53b595047b325b53d5b634eadc0ed1967410733142e11951d907edf96386b1417adc938bf2f2f4eab760dcb81c0e718a48cf300 SHA512 8b8ac9a8377788753a918af2bd4437af5bb94b275e50fe1ab7cc6af88a8531248518705bc794da702a3e06a82a064cbd25e4149c2526aff7f61cf49ded4fdfab
+EBUILD xerces-c-3.2.3-r2.ebuild 2866 BLAKE2B 81021ffa4df7c138587739563d00455a7d9dfcad14f6c1dc252219a5d05fc66bb7f8b45908efc94db95519e5e845b33c4863253ddcd28b768ffa8a466ed3d098 SHA512 682b8daf961d9ff42ed709c2c773c36751ce8ffa04fc8ceaaa2476687f94d6ea4a29e0b0668d29d9e80c7489f5bb6d8eff3f0332b7c20b59de366368f82c8d49
+EBUILD xerces-c-9999.ebuild 2804 BLAKE2B 9378a2057f0a74ca660dd1bc8b6d4bfa697c2b3255aa6163f9fd891f76bb36df3e9aaf5db0df7c2eb995ce8dc5bfee18dafd23691f2b33730b153e3119bba3b4 SHA512 941f408583fb34df98dcfbfb1670f48f253fbb146ef91b304d2834a59cf95f51cf9e63a19d1b8cb64033ac09db471a89a20aeb5a4395e0a0d25fcf24f0a71ee2
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
index c72408418f20..c2f0aa30e665 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
 	inherit subversion
 else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 880626707f29..133712bc42a3 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
 	inherit subversion
 else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 70efe38f79b2..b8c9cde58c23 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,5 +1,5 @@
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2176 BLAKE2B f6b372741bbc6cddaaf967ab17433632866172f97626ea817d0ee487707b1cb9398224d3703989e96e0fe1f6e2309057aae4a92f9d3098b37acd5a748dea2e94 SHA512 b9f7aa3a4b26d1a7af841d6717c95b62d5d3f7aa77594e0e8bebe9b052107d84f15011ff453895f786da5298f14faea427c1f0847c0605205b439f3154349016
-EBUILD xmlrpc-c-1.54.05.ebuild 2182 BLAKE2B 45d6e9e9db40438a650ac2022ac151d6082e6c68c65bccabe8ebb1f8d0f8940f14a053af25ab768b778fa81f0c7211afa90750b68959f0e5fbcf71b2c595e524 SHA512 79452c94a3dd4f4fd43a6e0a88e4d3c6e08ce7db84d4e955d25f57611452122e79daa8aede48abfb8baefe714efe96108131b17040160ca6301da21724732309
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2219 BLAKE2B d8d70c722edaa4c880455eb2d70e17c736b1bd9ace3fb67f292944008fa5a4af4064e354671ebf5ff9529c1af49847fc010a58d3c874575f061686a9e6b22025 SHA512 96da498fa8b6cbd3d03c07c76a9a1ab4b557104b2a8ccc8f385b23907b0b69ef3187612f583a8d80add917ff9a1d19a63dd1dc0ffcafe71f36f69d1622d0717b
+EBUILD xmlrpc-c-1.54.05.ebuild 2225 BLAKE2B 19ca410ca4b7fdf29a3b518cbf9fe0a2bba0535325be809a8f7edff5307882e4f6346f3f056dae78e8a59d91befef32c0163042b924df42c5a88a8b61661dbd5 SHA512 a4754adca9484aab14b2ffbdb7360bf7d92468a4e2bd576e331732bef6f8c03a5909b28e12784a7ac96229b695f9c0058076593c88963df3b376325e71912bc1
 MISC metadata.xml 617 BLAKE2B b0c8cee5453b850768e8c91bcd2cbe265eb19956644798b3219c9739ec666bedb543e924d2e4fce6874bdab3ac865c4ce94ba5032775fcc2359804ede0c92053 SHA512 729a5c14973bb4bd11a138299e05db0c43dce67a58a9eb4bb60600b097c1fc479231dea287ef9e824a093c9cf15064adb9bc6e0dee2820078c2ee79d9ea9d581
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 54cf9c58c907..283f805275ca 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
@@ -64,12 +64,16 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	default_src_compile
-	# Needed for tests, bug #836469
-	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
 	# Tools building is broken in this release
 	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
 }
 
+multilib_src_test() {
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+	default_src_test
+}
+
 #multilib_src_install_all() {
 #	# Tools building is broken in this release
 #	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
index 05c4799f8bdf..d6b2720a168b 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
@@ -64,12 +64,16 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	default_src_compile
-	# Needed for tests, bug #836469
-	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
 	# Tools building is broken in this release
 	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
 }
 
+multilib_src_test() {
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+	default_src_test
+}
+
 #multilib_src_install_all() {
 #	# Tools building is broken in this release
 #	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
author	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
commit	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree	464c922e949c7e4d5d891fb2cdda5daee5612537 /dev-libs
parent	e68d405c5d712af4387159df07e226217bdda049 (diff)