gentoo auto-resync : 03:12:2022 - 14:59:58

author: V3n3RiX <venerix@koprulu.sector> 2022-12-03 14:59:59 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-03 14:59:59 +0000
commit: 529abfa74a08ae5099db9780bcdf8250aa52ecb6 (patch)
tree: 2e2d1a9fd6e89b4872499afea3dc57490271e69c /dev-libs
parent: e6ba529df30e3fc9dfdf55ec5797f2f764df6e54 (diff)
73 files changed, 104 insertions, 1659 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 588ad112a384..c487eca7bd93 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 2a656e64c295..7c3b3f286b28 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,9 +10,6 @@ AUX boost-1.80.0-python3.11.patch 1285 BLAKE2B 070def79a53193d7e181060da15d072fb
 AUX boost-1.80.0-unary-function.patch 757 BLAKE2B 25fbc3532add9a0fc9c90e6690fc13ac13ac8e14fb7c6b62e52c26c8e46127c75ad20742ae90d72dc073945df6c1d392d48f65de4e8454b26cda25b19637ebfd SHA512 a07a5bf9587789216395ef246d1411fff31f4488b033ebfe2b1ffd9f88fab3f73b14b9027e2717fed7237fa9b49b8b80779c3901ea1ff67d699f4309a93e8fa4
 AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca12982ee4a7dca9a605195492810c952918185c79d7d326d9eda063c0ede7a3a2c86b48ab2dc2a92b8debe4e0ee00d3e7a29 SHA512 bccdb2b136c5d99a4bfc60445ff0aa07ecffccc522215820336d55a6c4cb1a0b5636a98180e3f1af543722d4977bc2c6ce1e2b9d6156b4ecbeb398fab7a3fcb7
 AUX boost-1.80.0-unordered-ftm-malloc.patch 897 BLAKE2B 5119fddcf5d84e907a3366e38b0f30be0c4547cf65e57c781515e8770e6980746572c3f3c94a461416bb1ee6821f2a204e77b09ae4791f0889fe8b35bcc90842 SHA512 994c7fa578240c9d5c85dde57de5011c9ef1c8c3f540c6ccf3f89dafd43b377d6f09d61ad1f0071cf589a46a2f4374738f119f16a067290014b88cf0d6f1a480
-DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
-EBUILD boost-1.79.0.ebuild 10641 BLAKE2B 44e43c096af4e3e30d96cffbd21df7111f76453f53b5cc604171addeda32b9cd05560b0c375f8cede3223c95ff07afc9efcfdd8faada0524dd45b4330ea6f591 SHA512 b81c002b0493a966ff11bad777cf73d5a4bef08f6ae4f3a68aa9de82d2c86cf33af89dbfd62a9a502b123c9c63f3f497fa5b6959e9fa1172f114bc5d800ac05f
 EBUILD boost-1.80.0-r1.ebuild 10947 BLAKE2B c732831b3038c878e5abc369548c412872795d7ba0ed8dbc2845ec84819e14d3842935dccfda8544f4322dcdb07df4f47bbf8cec46301c30fac6013adc849283 SHA512 0e9aa0bf2c3aa9038cd25a874841fba61d49887ad88c7010835279e09b9f501b83f6225700bf115fd5725d59e00959fca115ef468a131ba1dd03d83f6dbfe058
-EBUILD boost-1.80.0.ebuild 10855 BLAKE2B ae757ad46ddb78e622a9dc23af7c11a34659f4373f46466c44f0061a6e11c9de91cd430a74a784ea8df7509b6c147154988acf1386914f6727ffc362c06412f3 SHA512 ad270ecb27d0f30b01c03271776662b3bdfd7d1531481c35318cdb6242d3bc4687865d4b2acd94ce330d7cb5a81500932ba435f785fdb1df7916b4cdd01a4f58
 MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild
deleted file mode 100644
index 844f6d24b1ff..000000000000
--- a/dev-libs/boost/boost-1.79.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~loong ~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="
-	!<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.79.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
-	"${FILESDIR}"/${PN}-1.79.0-CVE-2012-2677.patch
-	"${FILESDIR}"/${PN}-1.79.0-fix-mips1-transition.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/boost/boost-1.80.0.ebuild b/dev-libs/boost/boost-1.80.0.ebuild
deleted file mode 100644
index d70b29fc1bf3..000000000000
--- a/dev-libs/boost/boost-1.80.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-
-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 of the major version due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="
-	!<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/b2-4.9.2"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.80.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
-	"${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch
-	# (upstreamed)
-	"${FILESDIR}"/${PN}-1.80.0-unordered-fix.patch
-	"${FILESDIR}"/${PN}-1.80.0-unary-function.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"
-
-	# We don't want to end up with -L/usr/lib on our linker lines
-	# which then gives us lots of
-	#   skipping incompatible /usr/lib/libc.a when searching for -lc
-	# warnings
-	[[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "${icuarg}" '--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/b2/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++17 globally as of 1.80
-	append-cxxflags -std=c++17
-}
-
-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/cloog/Manifest b/dev-libs/cloog/Manifest
deleted file mode 100644
index d6e027df2476..000000000000
--- a/dev-libs/cloog/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cloog-0.20.0-notex.patch 1326 BLAKE2B c0a6b0961b46523219bbe55ad962ff3b7cf3f335dfe9a3cb7d0c783573026647317c74e5fefd7dd7c7ef7f16a4a5de4c317fd82be692fd31f8c36e4538b448b6 SHA512 4c011cedb37d0ec2ba97bc0904721a463197fce789eff657d05372b31df639af54bb2830729c32b78f9c4095f97a994fa9b1118de17ded0f0a00f9d4bfb9714f
-DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347
-EBUILD cloog-0.20.0.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
-EBUILD cloog-9999.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/cloog/cloog-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild
deleted file mode 100644
index 590340afe675..000000000000
--- a/dev-libs/cloog/cloog-0.20.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/periscop/cloog"
-else
-	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
-	S="${WORKDIR}"/cloog-${P}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/isl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	AT_NO_RECURSIVE=yes eautoreconf -i
-	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-	# sed to avoid eautoreconf
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-
-	# Make sure we always use the system isl.
-	rm -rf isl || die
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-gmp=system \
-		--with-isl=system \
-		--with-osl=no \
-		$(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-src_test() {
-	emake -j1 check
-}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
deleted file mode 100644
index 590340afe675..000000000000
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/periscop/cloog"
-else
-	SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
-	S="${WORKDIR}"/cloog-${P}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/isl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	AT_NO_RECURSIVE=yes eautoreconf -i
-	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-	# sed to avoid eautoreconf
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-
-	# Make sure we always use the system isl.
-	rm -rf isl || die
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-gmp=system \
-		--with-isl=system \
-		--with-osl=no \
-		$(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-src_test() {
-	emake -j1 check
-}
diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
deleted file mode 100644
index 72c75a1820d4..000000000000
--- a/dev-libs/cloog/files/cloog-0.20.0-notex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 9edba30..fcca42f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -181,19 +181,6 @@ doc:
- 	@echo "              *-----------------------------------------------*/"
- 	doxygen ./autoconf/Doxyfile
- 
--#/*****************************************************************************
--# *                                   Doc                                     *
--# *****************************************************************************/
--
--if HAVE_TEXI2DVI
--pdf_DATA = doc/cloog.pdf
--dist_pdf_DATA = doc/cloog.pdf
--doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi
--	$(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@
--endif
--
--doc/gitversion.texi: @GIT_INDEX@
--	echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@
- 
- #/*****************************************************************************
- # *                                   Tests                                    *
-diff --git a/configure.ac b/configure.ac
-index 88d346d..fec9b04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd)
- dnl Configure needs an empty install.sh file with this, i HATE that...
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
--AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
--AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI")
- 
- AX_CC_MAXOPT
- AC_SUBST(CFLAGS_WARN)
diff --git a/dev-libs/cloog/metadata.xml b/dev-libs/cloog/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/dev-libs/cloog/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index fad101b39ff2..f10ff34b5c5c 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,8 +1,5 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
-DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 DIST icu4c-72_1-src.tgz 26303933 BLAKE2B 0eeaf6cf61c98ab93f2c7715607209b7741dcb806a98749a7172d004210b98c3528f84ca3c53400f7ed06ed90c6f6f3f55df3fead033c66c7e948697907343f9 SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8
 DIST icu4c-72_1-src.tgz.asc 659 BLAKE2B 1d28948ee577ed9fe694c1e151da124df3567d81352465c76e8910848bb780e9fc9505c4a3795fde8f2f6e8f28a631f887fdecdc536286341b2b23ce423a7cbb SHA512 8b5e841a3baa317a13cadf7deb3582a80cfab8e5bdae6bd04612ee7be3006d9acf07b015de01a94990fa350109a3c11e547482e4cb4ca986161cc701a8cd427b
-EBUILD icu-layoutex-71.1.ebuild 3582 BLAKE2B 440d45060033cae1471af4cfec6f3443317e3b369fd7d4fbbf272b95c09ae68db809d422b00cf8a8f8f9c5826aa8d286c80d6d631ef68a27e83aee78b6cb7e50 SHA512 d9ec562af9007fa798a148a53c6bf6d5ba4dd8747be2ddaf7014c274c63074f2cd2cfc2966ee90e04a383b92845f056439810d30e2b5bb48c2fa3d4012ccca6c
 EBUILD icu-layoutex-72.1.ebuild 3851 BLAKE2B da98d161a653864abd1594556e511a80de91cccd15c4be7e605e3621583cde375c5ee1dd11560f91b2d11ac0ed4a1f5d93a48e7996f47e1481aba23a813fc98c SHA512 30b848c3fbdc1aa75f27a4b0f295ac521462d156c271afb8029185f9ba8b6fc26a23192564f7dad3b5da31f06769408942de855d52127b1791bee2ec27f9a9b6
 MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e
diff --git a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
deleted file mode 100644
index 0a11ebb6f4a1..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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() {
-	# ICU tries to append -std=c++11 without this, so as of 71.1,
-	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
-	# we still need this.
-	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-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index eb6689f57f61..5ef908ce6f10 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,6 +1,3 @@
-AUX icu-le-hb-1.0.3-icu68.patch 1931 BLAKE2B 56bbb65821e575e2c270759f5ddd5107a2e4935295b0320dd6e69d902fb47bb851290d99704c609f82e9efaf35fd7dffe2c52ea0393bfe63abff20930883ea5d SHA512 1e2f8c079b9e1340d857bf09670958894c427eac20a29f564ef1d91b82b3eec7331b79dfc41ce172a95e2ab6678e41a42098e6af0da2af93ac5646415bbea010
-DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
 DIST icu-le-hb-1.2.3.tar.gz 45191 BLAKE2B 14ad8592a27ff8673d9609a689bedf5094c127bb9cb638a1e65c1fcb6e22e8c488f89e55af5578cd4961a34feafffd5df9cdedb20dfc7edcc4d6f63aec1eff0f SHA512 c1450e28c1984a409cacc2b675ab91fa0e80edfbbfb201913cb83e435fd30f3a3ad78ca32f8cf092c5f056f2812b899ceb4471b36ef975faf5be892d305a1efd
-EBUILD icu-le-hb-1.0.3-r1.ebuild 997 BLAKE2B 5d9f3c36873c92979446af89d380011b40ea49e71f445b66be269ab4dc2535c1b62596342ec74178d740a7c0ea0db78fe73322382157896b2ba22f7fcdbb685d SHA512 32227df85699bf34502005e2477b0d569c674bfbfc5747fe405c310dc6afe63c06f249000bcc89d8a9e6a49316bc5bde4e25f85a82aba2e85a52a93b477d8f25
 EBUILD icu-le-hb-1.2.3.ebuild 930 BLAKE2B 2c47175319af505270f9288983be71081a117eb860d082b5b67b8ee92f467a9fa3f1c3464143482b28bb188f5c834cc7a132d5a75e6d6693c0ea5d2904824205 SHA512 7bb39728993d9710969fd150eb6acf4aa42088efe1b0f4a599e66b213e440e301978a37c5db2021fb646d8675e2eb3cee007506cba2786a47f4a76abb21a95ac
 MISC metadata.xml 347 BLAKE2B 546d769021cbb1aa5c9f7f1c05d2c90297ad28d3af1218e9bd56e0d02cc2561b5ccba7f1cd29cbc72c942e41633671a8efc2e48ef4edf6554e81230f08617b56 SHA512 fa2a772deeb8249f17c85df71f50977ac50aa0fbce4c93cd6982e724bf74e1dd768edb6ec503507daed56d216befae024c2997e0c1d71800071e5d03e991fe6b
diff --git a/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch b/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch
deleted file mode 100644
index 9aa6958faff9..000000000000
--- a/dev-libs/icu-le-hb/files/icu-le-hb-1.0.3-icu68.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c0a0a85833cdcceb636dbe986f39a43ac40f839f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 15:04:44 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/LEFontInstance.cpp  | 2 +-
- src/LEGlyphStorage.cpp  | 2 +-
- src/LEInsertionList.cpp | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/LEFontInstance.cpp b/src/LEFontInstance.cpp
-index e5595f2..89bc3ed 100644
---- a/src/LEFontInstance.cpp
-+++ b/src/LEFontInstance.cpp
-@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset,
- 
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
- {
--    return mapCharToGlyph(ch, mapper, TRUE);
-+    return mapCharToGlyph(ch, mapper, true);
- }
- 
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
-diff --git a/src/LEGlyphStorage.cpp b/src/LEGlyphStorage.cpp
-index bac403a..b537676 100644
---- a/src/LEGlyphStorage.cpp
-+++ b/src/LEGlyphStorage.cpp
-@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosition, le_int32 count, LEGl
-     // just got replaced by the insertion
-     fSrcIndex -= 1;
- 
--    return FALSE;
-+    return false;
- }
- 
- U_NAMESPACE_END
-diff --git a/src/LEInsertionList.cpp b/src/LEInsertionList.cpp
-index c64b8a1..3e39952 100644
---- a/src/LEInsertionList.cpp
-+++ b/src/LEInsertionList.cpp
-@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCallback *callback)
- {
-     for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
-         if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
--            return TRUE;
-+            return true;
-         }
-     }
- 
--    return FALSE;
-+    return false;
- }
- 
- U_NAMESPACE_END
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
deleted file mode 100644
index 216af66e6d62..000000000000
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="ICU Layout Engine API on top of HarfBuzz shaping library"
-HOMEPAGE="http://www.harfbuzz.org https://github.com/behdad/icu-le-hb"
-SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="icu"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# dev-libs/icu is not linked into icu-le-hb but the latter still needs
-# to be rebuilt on dev-libs/icu upgrades (see bug #621786).
-RDEPEND="
-	>=dev-libs/icu-58.1:=[${MULTILIB_USEDEP}]
-	media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-icu68.patch" #751931
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-static
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 5c9e3315d1fb..496f30787861 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,11 +1,7 @@
 AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738b988eb449138c7c88f30c9781286a6a490278f1d8dc59b99725370e63757329bdf180604ec4e9d2b47684ce SHA512 69f281d363c8dab769701a6715cd21ec6958376fa7bac3b5eb5b8b3dc011a354fb439905d68e6aad67129eb01b8a306b184b94a86a5401ded1fe0002e8cdaa5b
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
-AUX icu-71.1-CVE-2022-1638.patch 8694 BLAKE2B 2277f0f066609817d0c5ef78f50f33f82c8575152b185a4c79d334a79c38ad902742c9f0558b90a33191d913df46e4b97356c0d7914d5f7bb4451fb388815c97 SHA512 3c6358120247bd094fec7a8e73f51445f979da5eda87c3a272f4df59625e1345237fe924d94824ad6f0785c8c1d70ee2ecb8a54abf9078c6510bee088adda2c8
-DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
-DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 DIST icu4c-72_1-src.tgz 26303933 BLAKE2B 0eeaf6cf61c98ab93f2c7715607209b7741dcb806a98749a7172d004210b98c3528f84ca3c53400f7ed06ed90c6f6f3f55df3fead033c66c7e948697907343f9 SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8
 DIST icu4c-72_1-src.tgz.asc 659 BLAKE2B 1d28948ee577ed9fe694c1e151da124df3567d81352465c76e8910848bb780e9fc9505c4a3795fde8f2f6e8f28a631f887fdecdc536286341b2b23ce423a7cbb SHA512 8b5e841a3baa317a13cadf7deb3582a80cfab8e5bdae6bd04612ee7be3006d9acf07b015de01a94990fa350109a3c11e547482e4cb4ca986161cc701a8cd427b
-EBUILD icu-71.1-r1.ebuild 4192 BLAKE2B ed0cda8aa8f81fe43a3456a59781fbcc235e89eeafed4850e680cde0b6d94829eeebf66e38451e9cd44ae92ed3333da147cf2d7c00f76df0e6502ea649569eb9 SHA512 f91539e7c78300e389c320ff67f106be66f508f9c8f066945a8037eac7207cd5dc40c13d53c1b77f0189049c605cd1ca4e47c4b5cb947537cdadbe640cb55b63
 EBUILD icu-72.1.ebuild 4390 BLAKE2B f95fea04a8ec0f941969a898fa20be97a34bf02a258d2f6b7dbdcc8dd7429007233bb3068328eb9e27883a0d0c4e89ec28ed3c7e5a775618bda748e17100b452 SHA512 0481e88722d7bc49d4c51d2db0537dad9e778b131c00088ce150181f26bffdcb8569619f25807e1fcff7dc92dd070821f792925b7a6be882682e70df7d996016
 MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e
diff --git a/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch b/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch
deleted file mode 100644
index 216ed7894473..000000000000
--- a/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From e96e9410bde06962c211fa6f21c3d91263a90f86 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Fri, 29 Apr 2022 22:50:33 +0000
-Subject: [PATCH] ICU-22005 Fix int32 overflow in FormattedStringBuilder
-
-See #2070
----
- .../i18n/formatted_string_builder.cpp  | 55 +++++++++++++------
- .../formatted_string_builder_test.cpp         | 41 ++++++++++++++
- 2 files changed, 79 insertions(+), 17 deletions(-)
-
-diff --git a/i18n/formatted_string_builder.cpp b/i18n/formatted_string_builder.cpp
-index 734078644b8..628fbea8711 100644
---- a/i18n/formatted_string_builder.cpp
-+++ b/i18n/formatted_string_builder.cpp
-@@ -6,6 +6,7 @@
- #if !UCONFIG_NO_FORMATTING
- 
- #include "formatted_string_builder.h"
-+#include "putilimp.h"
- #include "unicode/ustring.h"
- #include "unicode/utf16.h"
- #include "unicode/unum.h" // for UNumberFormatFields literals
-@@ -197,6 +198,9 @@ FormattedStringBuilder::splice(int32_t startThis, int32_t endThis,  const Unicod
-     int32_t thisLength = endThis - startThis;
-     int32_t otherLength = endOther - startOther;
-     int32_t count = otherLength - thisLength;
-+    if (U_FAILURE(status)) {
-+        return count;
-+    }
-     int32_t position;
-     if (count > 0) {
-         // Overall, chars need to be added.
-@@ -221,6 +225,9 @@ int32_t FormattedStringBuilder::append(const FormattedStringBuilder &other, UErr
- 
- int32_t
- FormattedStringBuilder::insert(int32_t index, const FormattedStringBuilder &other, UErrorCode &status) {
-+    if (U_FAILURE(status)) {
-+        return 0;
-+    }
-     if (this == &other) {
-         status = U_ILLEGAL_ARGUMENT_ERROR;
-         return 0;
-@@ -255,12 +262,18 @@ int32_t FormattedStringBuilder::prepareForInsert(int32_t index, int32_t count, U
-     U_ASSERT(index >= 0);
-     U_ASSERT(index <= fLength);
-     U_ASSERT(count >= 0);
-+    U_ASSERT(fZero >= 0);
-+    U_ASSERT(fLength >= 0);
-+    U_ASSERT(getCapacity() - fZero >= fLength);
-+    if (U_FAILURE(status)) {
-+        return count;
-+    }
-     if (index == 0 && fZero - count >= 0) {
-         // Append to start
-         fZero -= count;
-         fLength += count;
-         return fZero;
--    } else if (index == fLength && fZero + fLength + count < getCapacity()) {
-+    } else if (index == fLength && count <= getCapacity() - fZero - fLength) {
-         // Append to end
-         fLength += count;
-         return fZero + fLength - count;
-@@ -275,18 +288,26 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
-     int32_t oldZero = fZero;
-     char16_t *oldChars = getCharPtr();
-     Field *oldFields = getFieldPtr();
--    if (fLength + count > oldCapacity) {
--        if ((fLength + count) > INT32_MAX / 2) {
--            // If we continue, then newCapacity will overflow int32_t in the next line.
-+    int32_t newLength;
-+    if (uprv_add32_overflow(fLength, count, &newLength)) {
-+        status = U_INPUT_TOO_LONG_ERROR;
-+        return -1;
-+    }
-+    int32_t newZero;
-+    if (newLength > oldCapacity) {
-+        if (newLength > INT32_MAX / 2) {
-+            // We do not support more than 1G char16_t in this code because
-+            // dealing with >2G *bytes* can cause subtle bugs.
-             status = U_INPUT_TOO_LONG_ERROR;
-             return -1;
-         }
--        int32_t newCapacity = (fLength + count) * 2;
--        int32_t newZero = newCapacity / 2 - (fLength + count) / 2;
-+        // Keep newCapacity also to at most 1G char16_t.
-+        int32_t newCapacity = newLength * 2;
-+        newZero = (newCapacity - newLength) / 2;
- 
-         // C++ note: malloc appears in two places: here and in the assignment operator.
--        auto newChars = static_cast<char16_t *> (uprv_malloc(sizeof(char16_t) * newCapacity));
--        auto newFields = static_cast<Field *>(uprv_malloc(sizeof(Field) * newCapacity));
-+        auto newChars = static_cast<char16_t *> (uprv_malloc(sizeof(char16_t) * static_cast<size_t>(newCapacity)));
-+        auto newFields = static_cast<Field *>(uprv_malloc(sizeof(Field) * static_cast<size_t>(newCapacity)));
-         if (newChars == nullptr || newFields == nullptr) {
-             uprv_free(newChars);
-             uprv_free(newFields);
-@@ -315,10 +336,8 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
-         fChars.heap.capacity = newCapacity;
-         fFields.heap.ptr = newFields;
-         fFields.heap.capacity = newCapacity;
--        fZero = newZero;
--        fLength += count;
-     } else {
--        int32_t newZero = oldCapacity / 2 - (fLength + count) / 2;
-+        newZero = (oldCapacity - newLength) / 2;
- 
-         // C++ note: memmove is required because src and dest may overlap.
-         // First copy the entire string to the location of the prefix, and then move the suffix
-@@ -331,18 +350,20 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
-         uprv_memmove2(oldFields + newZero + index + count,
-                 oldFields + newZero + index,
-                 sizeof(Field) * (fLength - index));
--
--        fZero = newZero;
--        fLength += count;
-     }
--    U_ASSERT((fZero + index) >= 0);
-+    fZero = newZero;
-+    fLength = newLength;
-     return fZero + index;
- }
- 
- int32_t FormattedStringBuilder::remove(int32_t index, int32_t count) {
--    // TODO: Reset the heap here?  (If the string after removal can fit on stack?)
-+     U_ASSERT(0 <= index);
-+     U_ASSERT(index <= fLength);
-+     U_ASSERT(count <= (fLength - index));
-+     U_ASSERT(index <= getCapacity() - fZero);
-+
-     int32_t position = index + fZero;
--    U_ASSERT(position >= 0);
-+    // TODO: Reset the heap here?  (If the string after removal can fit on stack?)
-     uprv_memmove2(getCharPtr() + position,
-             getCharPtr() + position + count,
-             sizeof(char16_t) * (fLength - index - count));
-diff --git a/test/intltest/formatted_string_builder_test.cpp b/test/intltest/formatted_string_builder_test.cpp
-index 45721a320ac..57294e24856 100644
---- a/test/intltest/formatted_string_builder_test.cpp
-+++ b/test/intltest/formatted_string_builder_test.cpp
-@@ -22,6 +22,7 @@ class FormattedStringBuilderTest : public IntlTest {
-     void testFields();
-     void testUnlimitedCapacity();
-     void testCodePoints();
-+    void testInsertOverflow();
- 
-     void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par = 0) override;
- 
-@@ -50,6 +51,7 @@ void FormattedStringBuilderTest::runIndexedTest(int32_t index, UBool exec, const
-         TESTCASE_AUTO(testFields);
-         TESTCASE_AUTO(testUnlimitedCapacity);
-         TESTCASE_AUTO(testCodePoints);
-+        TESTCASE_AUTO(testInsertOverflow);
-     TESTCASE_AUTO_END;
- }
- 
-@@ -308,6 +310,45 @@ void FormattedStringBuilderTest::testCodePoints() {
-     assertEquals("Code point count is 2", 2, nsb.codePointCount());
- }
- 
-+void FormattedStringBuilderTest::testInsertOverflow() {
-+    if (quick) return;
-+    // Setup the test fixture in sb, sb2, ustr.
-+    UErrorCode status = U_ZERO_ERROR;
-+    FormattedStringBuilder sb;
-+    int32_t data_length = INT32_MAX / 2;
-+    UnicodeString ustr(data_length, u'a', data_length);
-+    sb.append(ustr, kUndefinedField, status);
-+    assertSuccess("Setup the first FormattedStringBuilder", status);
-+
-+    FormattedStringBuilder sb2;
-+    sb2.append(ustr, kUndefinedField, status);
-+    sb2.insert(0, ustr, 0, data_length / 2, kUndefinedField, status);
-+    sb2.writeTerminator(status);
-+    assertSuccess("Setup the second FormattedStringBuilder", status);
-+
-+    ustr = sb2.toUnicodeString();
-+    // Complete setting up the test fixture in sb, sb2 and ustr.
-+
-+    // Test splice() of the second UnicodeString
-+    sb.splice(0, 1, ustr, 1, ustr.length(),
-+              kUndefinedField, status);
-+    assertEquals(
-+        "splice() long text should not crash but return U_INPUT_TOO_LONG_ERROR",
-+        U_INPUT_TOO_LONG_ERROR, status);
-+
-+    // Test sb.insert() of the first FormattedStringBuilder with the second one.
-+    sb.insert(0, sb2, status);
-+    assertEquals(
-+        "insert() long FormattedStringBuilder should not crash but return "
-+        "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status);
-+
-+    // Test sb.insert() of the first FormattedStringBuilder with UnicodeString.
-+    sb.insert(0, ustr, 0, ustr.length(), kUndefinedField, status);
-+    assertEquals(
-+        "insert() long UnicodeString should not crash but return "
-+        "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status);
-+}
-+
- void FormattedStringBuilderTest::assertEqualsImpl(const UnicodeString &a, const FormattedStringBuilder &b) {
-     // TODO: Why won't this compile without the IntlTest:: qualifier?
-     IntlTest::assertEquals("Lengths should be the same", a.length(), b.length());
diff --git a/dev-libs/icu/icu-71.1-r1.ebuild b/dev-libs/icu/icu-71.1-r1.ebuild
deleted file mode 100644
index b611c9d0a72c..000000000000
--- a/dev-libs/icu/icu-71.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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..11} )
-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 ~loong ~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"
-	"${FILESDIR}/${P}-CVE-2022-1638.patch" # bug 843731
-)
-
-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() {
-	MAKEOPTS+=" VERBOSE=1"
-
-	# ICU tries to append -std=c++11 without this, so as of 71.1,
-	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
-	# we still need this.
-	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 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/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 57f4a308ea4d..7696fead36f9 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,4 @@
 AUX kopeninghours-22.04.0-boostpython.patch 3555 BLAKE2B 1d22b48e5574ffada0b89a0828bf5258321b57161061534939e95256ab3501a887a026231568e09b1d20499238284107c34c6835d33853096be62e1345356cde SHA512 562b30fe66a9e8904e79c95496c4b06e50dbbb8d328db93a655ffa7f8829ff70bc8a6b0ee7beb7840e7046b74d4d858265ec67703c6317c3fe4c87b54b40a349
-DIST kopeninghours-22.04.3.tar.xz 69160 BLAKE2B 8875d1ee869c6cae8730e83ff8144e45a6ab24aff02ec85084022ab30f9274a2f7c5bd4e0bf88f27c3626ee580a6fac9e2446fa711823011b305ba9bdf1d88c9 SHA512 68e49cd35db2f381cfd88787ed2085e69c6485de87c2cd5783675784cb169d274115d9bc36cde6ed447d6cff6922278330ac1aa819a0d996f2a5b861f6f1bf7e
 DIST kopeninghours-22.08.3.tar.xz 70540 BLAKE2B 76ac44a67b29133e0b499f0f11808f61e6c05b820eaaa7d0ef2656d1340e17b7663df1d4474f0735880f448c1fc0b6ee41cb86f3366afe458697edec8e269bbb SHA512 1874e61716f2e02e0df6e34e8ff451541e2e34649426ca610a5d7947df8f42dea1dc3067fb07221150fcb6dd3d942727e3e3c135a8ec76ed16ff1acd2ceebf6b
-EBUILD kopeninghours-22.04.3.ebuild 1265 BLAKE2B cf672a29a4c8eb78ed36ae740d53316d82ba56c63d7fb530896aa648655d3bfc96817cab230e6cda8ba555c1eac0dae89fc6942fc3ae80117bc22fbf6f34e142 SHA512 eb2fbb5457c9775f627d569c6e1d4b4f927705e99e9902aedf9987737f9d0990c454dfed6da5ccce19fc4e037158e499d2a5508bd8b208e7fd537000ff1c9ef3
 EBUILD kopeninghours-22.08.3.ebuild 1265 BLAKE2B 224878ca397dfd1792f8bd20aaad1e3ab26b18e765faf61041a57c9823faab3566144433105cdedd3dce5379c3b8698b275acc54b10171ad87903dd4abc56a9e SHA512 797a23909435628e6aee67ea9d96a9b120010a4af6284c2eaa6beb3816d0f4adc6b5f22e3e3525d0afa60e04e473539d975d4ca0e1621d663ba98054b2a0e0b9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild b/dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild
deleted file mode 100644
index 784f135542ed..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-22.04.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
-PYTHON_COMPAT=( python3_{8..11} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
-HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
-https://invent.kde.org/libraries/kopeninghours"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	python? (
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package python Boost)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	python_optimize
-}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index b07e6ab197bd..a0783bdf5306 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,3 @@
-DIST kosmindoormap-22.04.3.tar.xz 351256 BLAKE2B c18ff31d5cd2b5e2d92bed51b6e6e7addf3319381ee3a200b372a6659aa4ac80d01d63898e2d29705374a23608d16463ab2f4daa77179fefa78038f34058e59b SHA512 f272b250142a4ae6275b0234ff3ebbadb1eebe2302d28286de47c230363bfd7f153574fad4a7f2ada3507db80552dce1f0fc49ae9db5427d144ce0bbc3052b5f
 DIST kosmindoormap-22.08.3.tar.xz 358936 BLAKE2B 947e915db5df274aa6f1ea5126d5cb43a5ef1530803774f67fbf10dbeb3e1efe1b6bffa8814533cf6c09a2d5e4869320b19ad39b6b1dbd3434399845a21ed319 SHA512 925376ddea2b950bf435045193acbf2dca77601af16a3656acd9bb20d62a98c807b658cf6f5e85dcff56b749985e88537b194e03c619f70acc017761c2482ed8
-EBUILD kosmindoormap-22.04.3.ebuild 1052 BLAKE2B 4d0f5e5a6c0206bda57fbf0a5f699fef029a42cd1d31fc6d0e23c165f9fa32eefeab5c751cf86aa62ea2e5305ce6ca7851889ba9c3f46292539b083185a9b048 SHA512 70351da859842acd0a6654977105e457a7b8dd2b7795bad7e96e8506c7c65fe25f6b708b30b8f5d4fd0851c9db5e93a5e8df568cbe2f243828e3023ac1ef2dd1
 EBUILD kosmindoormap-22.08.3.ebuild 1052 BLAKE2B ae32385e6df11b2d4121088babdc0b42f4dba96bee29a38b5ceb0b1cc16e5483e5642372524744869660c67301018e565587865ee0450544c8352c4107c6e985 SHA512 8870c6e4cf45641383d36460c530d488eb64b350c5d194f461628cf2c6f6f2f9b152332fad96b154722207a9efa25df5481e02a41ca57aaddddb44271e71ba16
 MISC metadata.xml 436 BLAKE2B 7b97cad83675445e816a4f92d2e9c2c4167457df244fd166b6388be7c9336b4852c3873fff4e9d18bf1cccaaeaec849a1b340fa92a15e54180652e53cb023859 SHA512 312c58bb9ef49585287db38ff0f4e6cb6486477f4c84246610c443fb07ced2129017462ef91fab147dde7d69b0923605dc5b68fe71f6cd80f0ed1115b4a9ca6b
diff --git a/dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild b/dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild
deleted file mode 100644
index cded6c4e567b..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-22.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+openinghours"
-
-COMMON_DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-		$(cmake_use_find_package openinghours KOpeningHours)
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 9ec18647b2fe..d625526b8490 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,3 @@
-DIST kpublictransport-22.04.3.tar.xz 485844 BLAKE2B 20fb25f8af055122e03e6219dacd6b40e1d79ec817cdfb4054ed0764a323c9e1435e4adc639ebd3ab68d7a0ceecb35a65554fadba0d3b31f40dd0150a64e5f87 SHA512 5d02990746d167e6f835119c32aecfa9a40fbf03fce803a2d32e8aa9ba34bed579b9804d8abfe54b2b996389a4920dbb724e8da19cbde32af56fff3659c88d25
 DIST kpublictransport-22.08.3.tar.xz 489620 BLAKE2B 01aa9a92ba13a1060c08a5e2b6a1f2671c468c52587fded5f70dcda90977ecead2b3bcf8a333746400ac4b4a11061bbd56894bc335972f15fd29755f0ae23e15 SHA512 9b6c18395a0d8b9033a2b38d5912e3fcc649138a7ceb594d6d5d01534087bf01b6d4d51d2284f1212ae5574487c1c2acfd0d0b76deef0c181d64a56fed686b19
-EBUILD kpublictransport-22.04.3.ebuild 815 BLAKE2B 006112b8645f01fef88e5de0ba3198a5c2c4c920cf874dda924f575b30b4f32cb98e9d9cd45069c69c4d165047ff8a6742e874beb2eb8fe271cece512739af37 SHA512 5455f5e02a802b583945ce5011a257372c4dc8fadabd0adcbef2a42b1f427f940f6463a4bd2400e58551b4df457aa954737eecba3ada60f39fa9ea69f6db2535
 EBUILD kpublictransport-22.08.3.ebuild 815 BLAKE2B 67534fe92dc24fe5caf5b5a355e8c1fb5ca0b63ef2339a098d3236575f804f64a0f0114995d0b792383861663d34435b455139eec338ab60b4b9334e2838fe85 SHA512 9026230c033864c8bba243b26fc65b0dcb09c18cbf7ec9501a041dd222537664fa6d02e147834429f4249f821ece11cf6e086201c020464debbee5e3e4b19391
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild b/dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild
deleted file mode 100644
index ae29ee206cf7..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.92.0
-QTMIN=5.15.4
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing public transport timetables and other information"
-HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
-	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index aaa08811cfb7..705dcf4a124a 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -2,5 +2,5 @@ AUX libebml-1.4.2-header-fixes-for-gcc11.patch 599 BLAKE2B 850d5eca5b6126a791bbd
 DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
 DIST libebml-1.4.4.tar.xz 64116 BLAKE2B 641cf6b63b4c8c4fab9e746bdf11d35024d5250f4a493d491ffc27441d9e453e58dfce028f865b8b4f200ccf58562d94b07b1593a4d53995ceb6fb2eb37bce1b SHA512 24f2bf51cd71f583bdd3bb33dbf20b5adeb8e96345de3abf3014f3ae1b0610c1bd04b802f26b4a1a26f884a696d6accf784bed1510f12538a6664cbd9ae51d6d
 EBUILD libebml-1.4.2.ebuild 696 BLAKE2B 34d323e315321cd96bfba608db8037b64eb5ee5f0c6723d2229aa6e4b6cd0f73c6995f8ca9625512835bc6bbe1b4fa88bcab08ae6cd9303150f3eebea9da42c1 SHA512 42df09d9f40bf3e1765de0fa32b755ca2366708e392afe893c52616ab2d26ad687e3da1250b5e956aeb3574d44cdcc0af18e9b0d879406d6040f13a58f549fb9
-EBUILD libebml-1.4.4.ebuild 518 BLAKE2B 79a9952ddf6f0f7bbcc32be781ae03e57b0fbbe312b568de74840d8d22768b763d112aa7572761f4bf3dfdad8652289ad01ad3fa93aba0c70d679b37003b52ca SHA512 4601cc0a7be053c35e3af51d61baac7c75541596fcc0f7829e5a81c3bbe88ae1e4fce2b82765f730d592b83aedec2d30432cb692d8d8c4786443d96de40a8002
+EBUILD libebml-1.4.4.ebuild 513 BLAKE2B efc60b250df9a5193c327f4418c1a4c681da5534e987a22894a76c49d3fc5e63692fd5f8967f330fa663f30fb0245a2df921f2dfbad0f2bbc6dca7540ce06226 SHA512 48999482920a6befeccfd1ac9cc388727fcce693079e436f9e50e153618e4d8d67886bed1b0139f8c3fb912a9013673c1dcedecbf54c22d4af34425d4ecabb5c
 MISC metadata.xml 317 BLAKE2B 9cec3d87965cab02baa170724fc9f9b6742f4723985d1e8f3d75e97d990ce080f9daa334d5ca019a67d92c70e2b9d0cc8967f0e4817d8dc8f93bf0d03992237a SHA512 b05b64e9380e15165ddbe70592a4e9a0b50f8eefaafc7be6c16a34aa39b632aa7e6ea0a2beccb16c6638909e71f888daff7cce575f024c1dfed0805fc1646233
diff --git a/dev-libs/libebml/libebml-1.4.4.ebuild b/dev-libs/libebml/libebml-1.4.4.ebuild
index c97ad557c8fd..92ac1b85bd78 100644
--- a/dev-libs/libebml/libebml-1.4.4.ebuild
+++ b/dev-libs/libebml/libebml-1.4.4.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index d21912d21e9f..5496e6928048 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,5 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
+DIST mpc-1.3.0rc2.tar.gz 773419 BLAKE2B bae9db3a4207f470e896a570f571c70aee9f7caa02500828aaac624ce95b165db2cd4afb5944f07f4ba8756a5cccce6d58630866adb19a7cad9955ab0258e047 SHA512 eceaf08a622e9ccf1744f5965acb0283b17fb4347a3ee17a8f96998f2d8807fe49b6cefa0754291938a26fb3d18cea32625f0f0978a3ba32a3cd388ffc95cfee
 EBUILD mpc-1.2.1.ebuild 907 BLAKE2B b56827cc6a774e09e4ce46ba7e04be151f563c733eae3952f474d7ed6ab3cbdc80e5ce6fcdcb4d7873dc19aa1750c342619a198734707e0185a6c26b605826c4 SHA512 b853fbbed5a89c823e66a65dd84f550e0f9c054eafcc4027f5bc8fd4f2c6584f0a2e9b1b03d93f87bef52dd264751666ab11ca3325ac833129004466670d2dbd
+EBUILD mpc-1.3.0_rc2.ebuild 1051 BLAKE2B df9b0084406c9c17e6c952a2cc3ffed5e3e8fc1ccb4d3ea53011c6f026bd972c747e3c679a2d3fc6b31be1d2ac1b4cab48c7a87ce685deefe8d9c75a62defd4f SHA512 fbb40a58fac8074a9713ae88738ad26528c03067dbeb1820755cf10c535ae2fdd4e5503360618f568100639990052821b0f7206cb6afb828715133f7c5867bf2
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.3.0_rc2.ebuild b/dev-libs/mpc/mpc-1.3.0_rc2.ebuild
new file mode 100644
index 000000000000..deb382f0c2ab
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.3.0_rc2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="https://www.multiprecision.org/mpc/"
+
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.gz"
+	S="${WORKDIR}"/${P/_}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/3" # libmpc.so.3
+IUSE="static-libs"
+
+DEPEND="
+	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-4.1.0:=[${MULTILIB_USEDEP},static-libs?]
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest
index f3999952b754..ad87137652cb 100644
--- a/dev-libs/tree-sitter-c-sharp/Manifest
+++ b/dev-libs/tree-sitter-c-sharp/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb
-EBUILD tree-sitter-c-sharp-0.19.1.ebuild 287 BLAKE2B 955334d8a5e4f597c84e5dcc24836295e07a5541d0d862ac77b92f2ca5a72979b21590712afcd4abffdb0f22d5cbd697c9dcd1ba0bb1c5f0f644a2db248cc814 SHA512 8cfe6ce538dd8ad974df564cbfc919f3716a2510cbfcf9cc079eb81e0a37fb0570133f0bf06524b20703aa3514bf07ad4698267c688a8561c33409db3719e003
+EBUILD tree-sitter-c-sharp-0.19.1.ebuild 286 BLAKE2B 65fa0aa0c5955a828c3ea51090de61d4e87ca76186f8ae5d18a14bef3afc5987afb3e94f5b5bf5635d00f69df81682a8a7d7c5812131ba649cc8c442aa2f9d3d SHA512 9cedbaa8cf88149fad9993b24151abe39daecd3fceb212a5c4222a13a51710d5bee758ffe69f07c5c4205ab42736f4b2f0d50b17639c3fa5adeb51c8115f910e
 MISC metadata.xml 562 BLAKE2B edec236ce7498fcfda35b5ffd6b5236557d610f57f7513072217eb6e1bfafe9c9dcf3071d12954ff3347a556307bb107d7ac1f7d82f640dbff798cd0bd437018 SHA512 d79d52cef2c77dd7529fa8edf0d27f39d1b1b12602d3d2faebd9bcb812157b3f54353cf8d94a09b27b45f1370e01f296d343b2200252e4537286923d517a8e5a
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
index d849ec835360..e7c1c44ee2dd 100644
--- a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
+++ b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.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=8
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index bf6dd1563516..9f7f5690739b 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-c-0.20.2.tar.gz 249711 BLAKE2B f5f0ef1b15ba0fc216c082c973d6a52e79affb6075bc7fcf04e7ff93209b4624f4e9b414440fe6d20c0ea0bed5f3d96f538237c2fa365b919d6c280f98cc54b4 SHA512 ac559ee1d29bb77ce3cade02cfa4ed95c24cea7b84844df6521ebbf6213894c6f91499eb782e04e5e778091300f0043d59b9324a78d72d9bea4f40cc67d56cc1
-EBUILD tree-sitter-c-0.20.2.ebuild 280 BLAKE2B bab7c214cf78d4b44ad03665139162c6a1fea8e3e33f8b68bb07b2ab02163d61966bc964ff19feabdef3e65d850b69d46aef5a2b08889d3888399abfd8470544 SHA512 20a5b181c585ff85f7ade897da0eefe56f612424f94f693c4474cc9b3297f6233d5daf05df375b4a2a076aac61af232b15eb63167be5d141d96bee764aecafec
+EBUILD tree-sitter-c-0.20.2.ebuild 279 BLAKE2B 8757865c54efc07ce2ccb58d1e6d339719e96baff411eb01509f666a6d47c48c289587176c81c597935b26149cf307115d175736e237099ca3e187502cb462ec SHA512 3ee2ef807c64a515ca4a18be7bfe557f62762421978ea43207610c3d49f0fec8d23b536e8119a14a5e096a606125240824b423c7483fee7c1000684fac635ed8
 MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild
index 32ac75f4a397..3f5211827dfa 100644
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index 76e52a41b18e..35dab250c525 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-cpp-0.20.0.tar.gz 504679 BLAKE2B 654f72f7a56a66dccf437ba5a2b2b5f627358ae58aeaafe9a507e0876443937d42b244ddb34b8a72a6723c28e6c10c95851b1fdb2775b3080c344426c0386e4d SHA512 c97d02c8250c93721ed5b951c97cdb1cf6558e20cbef353a33c9937f6b3116e328bbdd4e9e7a70a23dba3e144cbd6318e37ebbb9b6345ac085c62100d09ff34d
-EBUILD tree-sitter-cpp-0.20.0.ebuild 284 BLAKE2B 53024727167055f5937e21ac3299b35338ccda64cb8f4eed2fdebe4cfab6f88ea08646260ece28858aa2a0a61b3d19e46c539a08d5623343c645ca1ee94de10b SHA512 81baacab2371a65d28e5d2e055d2bb7b4c814f5eb9800170d0a229f5c63c1b1806a8acd7cecdf28302088c9ce78df6c886cc7f76bde1655ae38e18a280f39afb
+EBUILD tree-sitter-cpp-0.20.0.ebuild 283 BLAKE2B 8928ba2eab785fa3b308a608c6b621607631306f1f2e2e41f1d5bc54cade5b0c15ff9ff1377437ee0f0fea22c349b6bc45a040bba78b4a163bb35f806ee49ddb SHA512 1f49b605e4fc786167fe2cc84683958384c30429a74d001301d4b76dc2b4bcf234d8c484b78e4356a9fdf55216ba9f6521d20c2cca6de04790264b2a453610fe
 MISC metadata.xml 445 BLAKE2B 38d48d1eecf642f04f8e069f60c9676668736864260ba6e59bb0ba1d67992a18267afbd2854e9455974d8f4db3179c7cb78c34411f8b838f677494023a87e6c3 SHA512 525b59cf53de56d7168998af64fa2b8bbce684defc2e3cecfcdec6e68aa8fa0adb45a4b2afcaff7dc5f4678a69db124785d9d1ca21dd73702bc90a2f3cd6e207
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild
index 93a7bffb6882..dd3045851377 100644
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-css/Manifest b/dev-libs/tree-sitter-css/Manifest
index 0027950d86a3..cc17f19812a1 100644
--- a/dev-libs/tree-sitter-css/Manifest
+++ b/dev-libs/tree-sitter-css/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-css-0.19.0.tar.gz 80823 BLAKE2B 5a011981bea8dca3ea51d3615c88eeefb2e0dafae52a947b58a930f9521cfd5759ff22812d4f49283453cc86f52372a798dd507b1982fb55dba086156a5842fb SHA512 8811118f8506ae6cc25bf30285361b751902cd4af9d25cd64eccacd1721cacd8b66277c7c950c825fe6e72ac3155dbd39c24ee94090faaae9ee8b67ce61fc1c4
-EBUILD tree-sitter-css-0.19.0.ebuild 284 BLAKE2B 650b39baa9cab66509899d209ff06597d2fd5b7730df80388148a29104561e3c95f8aa0cd86aa301e05708e9f4bca6753838dee1e43651a89d69891bbae798b6 SHA512 fb3c44f8736e2f280e6324a5df69f9340aea5ff421d147bc7618a705d248288a73128cda2b0b00b4c8bb063725963ec5d7d9933ee0b3ace2b650ab7ca463cee9
+EBUILD tree-sitter-css-0.19.0.ebuild 283 BLAKE2B dd89f97cc81570783acf2abf6213334e8b8cb485abfd8d93cbc08d169825019e76c540633c48d6e11113037577db44914ecd9ed4ee301bb8b1dadc9947297239 SHA512 ecba3028ba643b35e2cf3821ec67703e3c13f2da80238e2955a2c78b1231b59d4017f95727415d0be882fb4d8d055887221d5167f1c9b79c0b87107ed3ba8616
 MISC metadata.xml 445 BLAKE2B 6a62ef389271d5683d7933c2c136fe2e43e29e83d6c0db40fcd61b8b5305336958c00977c4c55f9aa93ac31e90fa9877d3e9dcdcd8c210b3501a8089d4955208 SHA512 c31782d8cc015829477f33d73cf3f09ec96d4c26e57ba6c8a40f77c5456be9a4526bb1184c67f5ee798ec0d69de65fb7f7a27bfb0bdf4a885ecc190f5061d107
diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.19.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.19.0.ebuild
index 1f2bd9b4c2c9..db311c39a97c 100644
--- a/dev-libs/tree-sitter-css/tree-sitter-css-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-css/tree-sitter-css-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-embedded-template/Manifest b/dev-libs/tree-sitter-embedded-template/Manifest
index ef5b19ad73a0..910777595653 100644
--- a/dev-libs/tree-sitter-embedded-template/Manifest
+++ b/dev-libs/tree-sitter-embedded-template/Manifest
@@ -1,5 +1,5 @@
 DIST tree-sitter-embedded-template-0.19.0.tar.gz 11228 BLAKE2B 31d2e6afb4ec82db57266f642c8e7ec1794dc74e2b86853f069dc0673b3651a736bf5b86916b00be2bd4ee3e1ae75375b994c46fac5c00a732cee43aa315be4b SHA512 960db15be1e740908e1ee623de1371a82ca13a240cd7dff9f4e8490cad5168252880a2f4cf432e8537fa826585a55a0f1032c1becbea868a6b1971ac480cf839
 DIST tree-sitter-embedded-template-0.20.0.tar.gz 11679 BLAKE2B 552c64a499b80f1648cd568fd87d5f2774a28cb3d2a61bfc0ec1f9a73910df41921e06c8f94ac5500a3a5b7668a2b8fe641b2ecf13a9b06b7a119daeef4e3b1a SHA512 1c4a63f85fae1ebb9fa90674a4c27d4402ae0957268faa08dd77c5ec6103720c80befd009d04090a80d994377676b103e2efcc25bd291186efc0c1f4962be086
 EBUILD tree-sitter-embedded-template-0.19.0.ebuild 338 BLAKE2B a8af61c9b2eb4c6ab29d84c16ae572ed517c4a64720ff0391b276fe0195a29cb57982d9d464d07d0be521664d606ab7714e56ac7fbe2a59e739664501a3b0553 SHA512 de89f284d268130813079bdcb1c9548f8a019f5ca15a32b2809fbaccb8a029f0e1e032a8b3624d2f4667e767da91a9c246c4e689632150bbc58785fcf2860c4f
-EBUILD tree-sitter-embedded-template-0.20.0.ebuild 338 BLAKE2B 2c5e25939ae098a832922701ef7482517674faf0d2773f5474a76fd064d0a6fa93199a55a2d225e1c57188482f775a2aa84f60b9641f1d282903ef4ad5e6c58e SHA512 c043afc74179e8128a8a43d64a04d5c9322992057f56a4b38e696ddda0a6b3d47f54f002cb06c660fde8d3b153979d955a15924a4c5f44cd9a86fcb9e216d18b
+EBUILD tree-sitter-embedded-template-0.20.0.ebuild 337 BLAKE2B c0572180ea206856cb8a6d5b265cbb6fc0876c9377f039ce6aa369f3c57ec82696b92c52cb96a134fb186d518a5f99e0404d2d4744f29107e53af18dffe0e692 SHA512 c20c72ab784721eb90812ade1240eea20500d8d2b350153e67eb77af45691c0ac5e77ac8f9e9085c140ae16d13b690d877c50eb214460b22f7dd3f0b326d778d
 MISC metadata.xml 572 BLAKE2B 4f979caa05fabc1532d361b72150754fa14569f20b9fd8b40d5e6cd9b5bd5a2db1a5ea7d5910aec0da4e1fae56b1ec96c9a30ca7325d3f3d886cae2d3cf349a2 SHA512 a9e9cdd8d73cbf1dd55fe58580f1f8ace11d13105332d0055b5b0be9b8b4eb99911845e726c1d30cdb728af733ade3bce264a399efdda7213617b15951f96623
diff --git a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.20.0.ebuild b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.20.0.ebuild
index 9591e80600a6..b93b8dc54271 100644
--- a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.20.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-embedded-template"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index b705a8e4eeee..bfe05dafbe06 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45
-EBUILD tree-sitter-go-0.19.1.ebuild 300 BLAKE2B da6f61f1df0427b01886ddb7db912827e5ac61476da9a37a8ac88da979f87cd8e8ced343b0f0cff06eca9a229651fd2f84d00e9359f6711fe4904a888839c492 SHA512 812a7e62a4eb07a9f3009c4f7eb049ff581c0447f62c3d2c3a5aa88c827168a591c132e6a2d5c0f5f597a36408b4b2aead0d01483cf0b196809a9d162a2295b2
+EBUILD tree-sitter-go-0.19.1.ebuild 299 BLAKE2B 4fdf4bfbcc4a8ff5e79eaa3c23ad4ccd4b7186e849164557076bd97cbd15a1efe6d9004892206759ec6a97dd61aa8784c02c19914e201a51370314ff70a2fd7a SHA512 242c0256830fbdbb67ca6f05ca6e4af4e4b6e31eea5ee0549436f1a256254961b6df93c618b5e0cbb9ec1d374c9ab069d333938645a12bd52e72e1e19bcc17ab
 MISC metadata.xml 444 BLAKE2B fa5fa7e6372e8bda6a7bc00aa4b7904f721ce2cfcf11cf9df7f582846a304f31750d23c6090b1e93584500bd1cca2b528c3ae14ac85bf31e7999ccb557ad8807 SHA512 372434b52dba0f7a4adfbc7ecd975fe161852a9b9c1c599cef12d3071c973a514e546e9182e0f3bb840a4d71109df5ab3e9ff6e1c86f72e6112551c8e37c0f57
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild
index f6c48c89b4e2..4193e530e8c5 100644
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.19.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=8
@@ -11,4 +11,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest
index 4a07719ec51c..57f38d1dc171 100644
--- a/dev-libs/tree-sitter-haskell/Manifest
+++ b/dev-libs/tree-sitter-haskell/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa
-EBUILD tree-sitter-haskell-0.13.0_p20211114.ebuild 342 BLAKE2B 1f0ab8a065932c5d5a8b1c596988f2e0e2aeb6a1b2981c4dcf068afd6f0ba31828dfd65835c8d07616339e8e93f5637b73415d77ddb50d1e140d34c2913f56e1 SHA512 fa96c6fd3d0720ae3e8580238c57a76b8f8db5f83c609d3ada52e8e59e11bc382d47cad64e6551a9769c0284c9f3b795872cd1aa99114c263ca6281b660467d2
+EBUILD tree-sitter-haskell-0.13.0_p20211114.ebuild 341 BLAKE2B 66bd99bcd586a37ad07e854b0c63aeb2ae93f37134ed553f3c3a7b166656b2bd22ede061c31915f0d16282c1e1f26f1a72b11ba04f7076c2a08ba5fe25b37616 SHA512 fcc39d2e6215575cf3d674b9f8b22d4ee7d73bbc59b215292f327752f1db704dbcb4d4cd0f261ea83edb8aee1f3a7df2b7101cf2ab5dd65d7c97c81076fb87b8
 MISC metadata.xml 562 BLAKE2B ab519db8453fcd7f3609a3704a7ce3da66a02ce806720c329d6866f8258adc0a332f1cb8ba25cd4d0ff9286224f2687926b2e54a761beef81ae7700a03269b28 SHA512 36c67807b4105ecf2fb1b7b160ad87a3078fe639d4fa8fd3266d6bd3cf4edcd117d3d658f6de047d19bdbcf1c3b9fb0ac633885f58fb54d967dae80bc1eea00e
diff --git a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
index f051d384a9ea..b025bcb78ec8 100644
--- a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
+++ b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.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
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-html/Manifest b/dev-libs/tree-sitter-html/Manifest
index 6896f880ea0f..898922600600 100644
--- a/dev-libs/tree-sitter-html/Manifest
+++ b/dev-libs/tree-sitter-html/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-html-0.19.0.tar.gz 18785 BLAKE2B 40a2f8a1b4d9943ed15003073e8499fb58aea00979359f793c30c4e7d431905620c20f8e77286a56dbc040642081effa61a7ed9fdd3d61d44bfadfb327793ed1 SHA512 7816e5f4e74c7a64a4fb715000123f5350dc3c6ebfbf5d71ea6dd660cd58a7b4327413ef3e8efa8c177c7308f43bb8b4d60fddbcf518a99841148a37aba95b71
-EBUILD tree-sitter-html-0.19.0.ebuild 286 BLAKE2B b55976efc335ac22200bc5793413405a2035d04861ede52ae1e432eadee1d5a00c2a78aab42cae289eb9144837dad862a5b348bb215dfa2109f7a79f60243d4d SHA512 d74129cc1faa140a8c07121483bd694805c9f704152bc6c48fa7fe2d270f31f9fd6c4cf6c7e0f01e8e13df86a754787840bdf5135ca619861c48b526104600f5
+EBUILD tree-sitter-html-0.19.0.ebuild 285 BLAKE2B 1e2c597c71a61952f705f0ffcf18f27c6cea6dda0bf565a7d9dcfe1be588cf420acec17d94c47b06df638333c63a2aa00e6526fe0d4b49c9fa7ff52278b9f45c SHA512 6cf983fdc8a38b4b4c824dfdab7ac832f6e4e782aa66572dbb2d42f94cda6cc23fc1f44dc1a912fb2828f4b3d19ae53ae568f76ab7e1b5416621e053c0d7dd8d
 MISC metadata.xml 446 BLAKE2B 493337923f0020a5c4e9355839d4884641a18f52df0ca852544870bb7153da875864124190e60dc2968491aefa012ee311fba1b873c045d31e401b07fe3a470f SHA512 c0b08417107266ab03dd705f565cb2655322191c0783cf92e41cf81b3f51f6af843ab37c37e286075aeee714fac52c8917e01f1fef80e11fe26a5d2c8f6a4105
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild
index 58325e67b281..6a8921210e57 100644
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-html/tree-sitter-html-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index fdc34d6f79cb..b9d4a45c8591 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,5 +1,5 @@
 DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb
 DIST tree-sitter-java-0.20.0.tar.gz 166695 BLAKE2B 6a618894746f113692997ba683fd3185e0f321f82bef3a7a11226a81f28e40b9973f74cc7010035983da1f5a6f2cbc493688c8bac47381fcd1d1010d03d4db5c SHA512 e6a341879e0eb889be7ff26a7f675e8bcb6f85de040f7d09029421b43bf4069a62889fdc7bd6b8e4afabd2b93df1bdfd86853b1cc6c2daf69f84ea68ede217d5
 EBUILD tree-sitter-java-0.19.1.ebuild 286 BLAKE2B 68e4ac588efafbd6712ced67283f4b1173e5c3e372764e67832fd17bfb5933c3aec53d7d48bf006fc814af230f08128888519d4e5420a7a1feac615c0e7952f2 SHA512 ed6cf11b1f47cb45e92bae6ab85f26d2ff806470c4c73993884b5aee4c2b9b95110aea0420e52d60b7dd8b43c150279daf3bd1b501a4844f9a373a22ba525d93
-EBUILD tree-sitter-java-0.20.0.ebuild 286 BLAKE2B 7b3d6976c11d189c59e8431b4ceeac0ebdf0ab28148889fb8022bcb740088fc3cf62d5615ab074e0d8986ab013d486015e6eb5a6576cb15ecd0d2691b6999344 SHA512 bddd3f7f6c1e28c879f2ba263f2afde41d815316842b99605a6086e3c0fb4bb4ceb9d003714f57a1bec15ec7c6ec6f6c8714c7f30c4b059cbb80a71ec99a12ef
+EBUILD tree-sitter-java-0.20.0.ebuild 285 BLAKE2B 704c96bd866def1093110b5c937a0593f359186e7db1bca2a0f18ddebc35ca69b2a7c2d30be4881c22848d049335a674609fb479858db4f27cec0e18fc0f5acd SHA512 cab186d1c6a63bed9d3c13ad2d6447efcb166376727499df20720830efe5df49e3b04ddf5f547df6f1d5a1f33133f2c793cbc343030a5f21f8b159f265c9f364
 MISC metadata.xml 559 BLAKE2B 2a33b73a90591c3af8e0023e8cc6ad0be46b007255e7c3137fb5e2a0763f22493d89f70463ba59c9250a62aaef680271bb8a876926a2b967a3f9fec3647c3e25 SHA512 22e3de0937611b46f49706bbefc34fe902a0ab284ec41e04e0312859cf20e51168a49564d6a4c4ac8959312a1e5755b03f9f88885ee14d5e0ffc3569f4663ad7
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild
index a6f428b51f5e..5b79a06f012a 100644
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index 147c1e4e9d1c..0703ef067dc2 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff556d4cb35e91d93a2ab645a24b9492217858278adc1f7917a7dc5033bbcfd84ca7ef41a3e7ebb1ff934bb09b79c8923469110e1de SHA512 778e0f2f5bf276d7ffb6eab0fe3f7473b56605de707c8e2f491fbb5826da94067b9f1bc476306013267001b5ecaab11a956e896b78520cdedd27006fac97fe41
-EBUILD tree-sitter-javascript-0.20.0.ebuild 316 BLAKE2B ec26c68d8bc15867219be82ad963f91e2d4194a01e3da51086a1a3e22a14ce4b3ad928401e84807e6fa87fa3b1ad9975535f853fb46e00dee5fd52d6ad1301b8 SHA512 4274f3adc06c523da6045b0f59e3937d394dda54560647f2fd6278ae9cbaf81a535f94fd4c5a645c489e0bc002cf11611dd000707f0f9584e0cd95d211dde22b
+EBUILD tree-sitter-javascript-0.20.0.ebuild 315 BLAKE2B 2b9f5a9c4b709644a5c5c3794a70246704199b5626a48d3ebae585f6de8d69e31be08ff3023ff63bd995f520c73268d95d5f376d35d098594230501c030bd87e SHA512 2641dfcebef2c291114997f80fccc9ceefd352559b726ca3ea198382dfd055225705c4797eb4b33f5a20cd29c34a5511afbc53bc85acef3fffbd0df62fbf7c64
 MISC metadata.xml 452 BLAKE2B c0a1b41f1e185ed114d88bd150adb7c0db6b3f4519a40bf84947706621725cc592f31d30d83a2068458026fc920a6e273a480a63f9d90a136f7afab93cac4481 SHA512 e05141731ca0a84b6d6037e73c5ffe3a11cc6bf86f8d2c4642333ba05dff558eb93d8fb062cc67059e3ebe4d9b75041eb6f1ef3f79b38b1dc1abd9fc4c6fc77a
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild
index 2bb0883b6d99..a082528027b0 100644
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.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
@@ -11,4 +11,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-jsdoc/Manifest b/dev-libs/tree-sitter-jsdoc/Manifest
index d7eba2508b1d..f93b6e9c639a 100644
--- a/dev-libs/tree-sitter-jsdoc/Manifest
+++ b/dev-libs/tree-sitter-jsdoc/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-jsdoc-0.19.0.tar.gz 13214 BLAKE2B 25a8d06201d0edfc3243a0dc178cc2074141f9df24482535c4accb6e23b7493abb7b3b0d7b2a73b5bb25f1d261e214cdab5667c09fe9114f1837012f0fcf3085 SHA512 abffccff5f5b11aebee1226db87fa79d87e675111b32f8d1651679d7d68634201b2d74e3993bc514de03c5b93440e73bdf2ae6c1c879a7dc361c8d6ae550e972
-EBUILD tree-sitter-jsdoc-0.19.0.ebuild 288 BLAKE2B d591d0b8c372deceb86434e9a1bd27bb49de32774ae3c0f7f148f73cc4beda4a3e6880c1dd2144e059cb1c3d098633b6060f77fc691406d7ed145ff0c71f5431 SHA512 a14ba6fad38415b2c070d40240b85ba25325084ccb63430bb68f28d1312c554d8037374ab580ed197769ac65c80708f32cc5e50c818ecf06b32d626939c773f8
+EBUILD tree-sitter-jsdoc-0.19.0.ebuild 287 BLAKE2B 3230d33fd5144e9744f156664b81e8a61c2bd43f166e97b485f97e8efd8daaf94b3c2f54553d967176499d812f392663ecb754a4132260eb375d67316c5aa3aa SHA512 c9bfbf36d4c892a9e6381a2a8489df9308f4343560654c91f07f29700f0c3cb7b1704a281ef81d1e7e18edae3a2c5048396550fa402b5c9531949700224eb18b
 MISC metadata.xml 560 BLAKE2B 26916fd19039620cf51f880e88a994fd1441b7f6f0c61ac387dd3797621be3a2b1d0135824ce44da275f6bd9ead861c1cedb096b968a8249b48a9e7d9d9f3d40 SHA512 12381a0ef5063165b6d780121f97e57a4c79b9c3e1fd1c6c902e2172b3a7bd0af2928e653c388d0b62de01d09f9d7d4a9394fd58fef60a124134f0703b8b5dbd
diff --git a/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild b/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild
index def783cc6812..71cb143446fa 100644
--- a/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-jsdoc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest
index 5103d68655d0..3d5d0cbc8f37 100644
--- a/dev-libs/tree-sitter-json/Manifest
+++ b/dev-libs/tree-sitter-json/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6
-EBUILD tree-sitter-json-0.19.0.ebuild 286 BLAKE2B 6a7b2a6cd58fa6dffecab733401ba2e38aef795ac1b05abca04f4c239e595e29cc16fbe250ee5b60147228cefb6a4e3fa8276c393471bccb1a2dc71f99d62d59 SHA512 814c82acf65dcc92d38c69853a1f8aa00edf19cb8a363e28903362a9fc4ab06bdffd7a4a7a1ad1ecca175802c6ee2e2e776315fb87bc87b1a0f79e7183417f46
+EBUILD tree-sitter-json-0.19.0.ebuild 285 BLAKE2B 719f9d13482f8ce44d19c71d1affc34d502152d8269db5a2f74a87f4c36f9be8bae473e6607f0a0e781b19b690a6039317c7a53e7a112f1f4438c263607d492b SHA512 4fce073ad4671b74f9644fdb0753beef5696d530433de49a728cb02b3c152befad08cfb1504332e0697ef3039675c2ad52397b81badcca182627e232f7abe6f2
 MISC metadata.xml 446 BLAKE2B e0b0f3f8f0cc350e914c6db53993b1c73ad53448cc6bd9691de39fb0f7b8cf49a14e0803721a36bf027ac33ba29a2b3666325d2ed9bee51d3832137caffa084a SHA512 d05f69c9d9f838b94cd16cb8b937b7798a7d61139cc13b2056b343070a4a197558c9e01fb8a27a2d8b90f8a15037e7b7bf08dcc9c3d636bb9c09dfd84b538b32
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild
index ca446b8eaccb..6e3dc239628c 100644
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index 06f4d31fed1b..1bd5c601bf75 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a
-EBUILD tree-sitter-julia-0.19.0.ebuild 288 BLAKE2B b93db5b8625d5235e48a25a0de7860743e64481139cc5930a52230a99dd3e2469ccf86027caf57b4d48b252f0b76b631b25c380e603dc2df496205bc70736fc4 SHA512 be9b1b51f03b43a0006d3f66ce209930fb5011ff662883952324b74f0155f358588a0336e4e893de71cf1fa1448b175b973758b12256bbdc8b4cde27c4635820
+EBUILD tree-sitter-julia-0.19.0.ebuild 287 BLAKE2B 764e14d71f85527f67daf0c4de9169f9c2fc564b6dbbc3c1017f3aa7e9eedfa33c3d89be49eecead18c22d2248680add12625512992762b3913f9dda0a901e2a SHA512 3f3a119aa3508193dc4fc0b6d9ffb2b27f1d4b2e87bdc20d95d93ea649da0457c0343045b1312613e853f5dfd0c658e5763b73a521022c78db5be0136b0f6758
 MISC metadata.xml 560 BLAKE2B afcf7a33574a8bfd53ef9e9fd0dccb8c3b28bfa51b6a4a66c856fc84962710f387af304e6cbe098acfb448f2aaebc0f184c2a87333029219201268fad2622c01 SHA512 4460f6793e83fbadc9dd359211c2cf7d153b9f450f1133cdf2e19e38b1bae33f7010f8420cc81ab2f072674e19595042a22582304b7a67725668c4d517da65a1
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
index 50f64d0091a2..a98d5d0a3b62 100644
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-meta/Manifest b/dev-libs/tree-sitter-meta/Manifest
index 08890b898e87..f3b11dbc67d0 100644
--- a/dev-libs/tree-sitter-meta/Manifest
+++ b/dev-libs/tree-sitter-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD tree-sitter-meta-1-r1.ebuild 950 BLAKE2B 9a081ac05e3123232fb60b573b5c9c6774ff352bcc7946161f69e713a088b0ed2b49607bce9e2022c660e36e96d63f88616676c58b56826eca58a31f235e1bdd SHA512 4adfaa3d76351a4a94c61fdf50221189545038f962b9c31b52bc34d0d5b0cb0ab7ce1512541f0b42f9ff78a4fb54cebd504a53c3871191b67332436460df45f7
+EBUILD tree-sitter-meta-1-r1.ebuild 949 BLAKE2B 6e36ec719265505f6c2e2d14fc1120ddb4a55fc7a576d67e053ff8eda8a529930130f43c09eb612c27f24a917b71ba9e7df75c48ec35d4bc82be90e45d89dc19 SHA512 e22bc9c51930383c01fd4d9f14ca69d0eb5992e680a9a0b33db9615c2d24162e1c333bcd2b7be935db52d8df90027d73203fa0f8a34c926f0033f500d5f39984
 EBUILD tree-sitter-meta-1.ebuild 631 BLAKE2B 258966b03e18ecf79927eab5378a2e54a9e2358d970078635d51153dc0d167487bcbae9ffb406ecc6e78083e0e04e1673030695d0bde575ae328465077b6890d SHA512 21f4d32458d18bc02aabf9dcacbce05ac81145a5cab4c9b031d8c4787ad878a265cf2bd6c21cb78ce56874a5972d72ba0a5dfb23e926a0f40836639f1dbc8f73
 MISC metadata.xml 353 BLAKE2B 37c7e076c05097bd49ad4b4a74ba03c9626b746f5b69f168d72331ddf98f266cc9fad580803a56f6ab12e4a1d25aca5cae5d8e6a343e571b187365e853fc468e SHA512 450c7c6f5d38fa9f31781c098b724d77b45ecb25f0ad2dd5525c66d185c77351c1a50cb5b4af50040c842a5729bbc8652ed000d818caa6539f8e6e30be022fd1
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild
index 7a83a7ae802a..58a50eb0a10e 100644
--- a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild
+++ b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-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=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/tree-sitter
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
index e5ab56e1dadb..e471dd59248c 100644
--- a/dev-libs/tree-sitter-ocaml/Manifest
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
-EBUILD tree-sitter-ocaml-0.19.0.ebuild 319 BLAKE2B 4aa49f72bcd9d4634076a5495d5c3bdae9808fa8435c12592ce944fd3c524314ad831c936f44d485f1e8a53fdb8c1474179925fd2af30264de9b72bf66ef0b2a SHA512 f1bdfe01a9a52566d6a63c33678393e823330883350c7eab618a1fe5ff7608bedbd5f4c70929bef950f079072d9ba07f73346e1bf39cc21a01ae15c32944464b
+EBUILD tree-sitter-ocaml-0.19.0.ebuild 318 BLAKE2B 9b0c72a32938b3f4f99bec3c84267d92c5f4522b7a67ac79e6f35f501062b8d13498560109a8587db1271fd814aeab6a433e4c8ac6f2d8f6e4cc542f42b289b1 SHA512 d5070cc56ff257abe8919f283d891d1ee8f3871d6e8338b24fee2541d9e1fc6eb046877105c7063da2e3a1b3e32fc25fa5ff73920b05f465c1f2a23a1c46aecc
 MISC metadata.xml 560 BLAKE2B 550bcbe717df1b3ba199b5895fb4cf884c3297713602f2f891445647f4c1dc574b371e3b5346eafe25ea4fe7f4290cdaeead02a70b05714a05f55ff2caa2e107 SHA512 4c56aa12beacd6ae57f60372fce8997e49a73b95a3b94487d9dff5a25ad42f771ae3b0af1a4f20d0e1e05c150bd16047c180d5a3e46db4f3a73dff51e9e0e3ab
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
index adc64bb944d1..41143977b462 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.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
@@ -10,6 +10,6 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 S="${WORKDIR}/${P}/ocaml/src"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 7bd33d714a89..068a492876e8 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-php-0.19.0.tar.gz 155930 BLAKE2B e78b0a719f2e8cde6398a5645023c09135f61bbe138abeff8160bb1688bab84fa7ca51438e380d79fc0e05efa2e4897a7ff05fd677ac0b8cb4098e27d576a10a SHA512 bf82af3a4c0da96f58e93aaee2724f327c11e297bcd455998e0863aa64ab6ae85d1d212afa51b75c8e8ab998568cc71b0309ee3d1d41b632ef0283478ecc5711
-EBUILD tree-sitter-php-0.19.0.ebuild 284 BLAKE2B 33836d9eed4c3bfc1e34cad53193863f6fbc92486c523e4c713b8f832c9986566b723703cf562a52a2fea426aa81ec0860911254888481998b3853ff4be727c1 SHA512 f591cfbb19333261184f0e7a16a13b948c9bae6a994b1d44139a2b22f9b66df9aae3edf9e958097f291f2dba1666ee7e3025a90bc82f539bf00ae319f70e8a66
+EBUILD tree-sitter-php-0.19.0.ebuild 283 BLAKE2B 7fd49e6859ed718c48aa3e27627aa4d5559f3a80384aff787139ab0405a059c4a071aae9372f0de468cda4dd81fe8ef0aacae8eecca19a2577230226372f076f SHA512 95e3316405803ec023590c6483bedcca2599e350d0bff9f8a754ff1797345d43e0a7f2787a3fabb2fa3664fb6047f7238373c9e58a89b68a63a914fb18fe8ca1
 MISC metadata.xml 445 BLAKE2B f28e6b9a54a45fe0e9b9965b2388bf049ec819fb8c7599fa9faca7815074edc962b64f90b5cb3feccc566a88c8ff4b1d91db7dcd4ca576957f5a6d738f56ae00 SHA512 2fdb1e35a5a68b9f582f16c96810c507e6b96b897fc82c13c3b6d2f1490f1d021a673086d499221c5ce03e868469350fcabeeedc553fd126680e58ecc73ea45e
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild
index 88b916096b59..dd916334a06c 100644
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index 329f4bffbc8d..71d5b8871aea 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
-EBUILD tree-sitter-python-0.20.0.ebuild 290 BLAKE2B 684139dc89752f3e9610de4b72ed0c5e327ec1cec4fe9f6ecc22bafc1e9853f508dfd415f7cb868d91519c5c1605dba9d4aea9fa12dc41539dd055695b292058 SHA512 fa9ed2ea177cc82b4fc4f0102cf9950cf57d8c2515a218494fdc5ed77329aa4a63fded54fa47bfffd93d1cca4423bfcdec030cd2ba5f946ff5b16697eab7e0ac
+EBUILD tree-sitter-python-0.20.0.ebuild 289 BLAKE2B c83db424f10b4431de9fb8bf8c340ea15d214b8bfea4797d2a2190542f59761e005fa157709c7c1d8fcd7d929465e73eb276837f4d68d11aa493ef98e8e2871e SHA512 78147d4ab4df1f45161c726672a73f73a91eff2d9cf59dad051f8862c49f7dd2976e7e250fa707fbdb40571b9cee58b73e5923740a69747f07d44ddc6328eb28
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
index 8088400764ad..a852b6c0e872 100644
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-ql/Manifest b/dev-libs/tree-sitter-ql/Manifest
index 8b19d1f7814d..0820ee4fd8a5 100644
--- a/dev-libs/tree-sitter-ql/Manifest
+++ b/dev-libs/tree-sitter-ql/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ql-0.19.0.tar.gz 105323 BLAKE2B 3f19ba4b8f0504eb3857a69ea01a81bf22e26861390cfb964d80c6fb6677edf1c3683e29821f4becd548b4ddcc9a038407c74d945179a63acf3eb3bb7fbee80c SHA512 12ec3c85775dace0d80f426675bf27b06ffd96d4ffe4bac1e3018be911cf97184efce92a6c373ee4198639323a453e21350496074fbfaf82519a972acc763455
-EBUILD tree-sitter-ql-0.19.0.ebuild 289 BLAKE2B eaf913162960b0fd510a9dada333ae6f71ecc06bddb349b7cdecf52f70be2de4b885ff75f37e7e4824ebe9dfc2b963cf4f3620dafa695ea5c346bbae947072ec SHA512 50dd06c54d5a58742c1fb9f6ce5273cf731926b318a5a612a4366fd9dd754dd3f5de3539db99648bbd90e76a0065ba866a8291293237fb75257ae0bdddb77bd2
+EBUILD tree-sitter-ql-0.19.0.ebuild 288 BLAKE2B 004250d1e91e8befa345d5c17f32029c3675a43cd832551d86beddfb0876b3b33f58a02249aed351b99025e11417b4ad519935308637c114c11ed482c345ebaa SHA512 70c5b08763370673b0c8002fcf4911106d3c4b50696875362bf310205b7824914ab4eda4f170cffbb0b257caad271dba2f5105fc4b3d00b67e1e8dea13ab7710
 MISC metadata.xml 557 BLAKE2B 70a91606dd454977c1e6bd3889673da3599dbf5f0896d589ddcaabfb165d3602f603a254f861dc3b1510f1993e1de79b0ad24db83af9e8d2ed8de636ef97fb94 SHA512 e2ee45dd1f3814816309edf68b8b142634a3b9b6e7b4769f2db406f3e0233affc5ee990bbdc14b9baae3ad2aecc643c2cb721195c1deedad1609bbbe158d9e25
diff --git a/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild b/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild
index 64e8ead45e85..5a2eea7b528f 100644
--- a/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ql"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index 8e8fc8e91484..d3c16af961d5 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b
-EBUILD tree-sitter-ruby-0.19.0.ebuild 286 BLAKE2B 69415d6531792f875c976424dab2282e2897447979ee3ae53d4c2b186d976e9f5b3b452008b592f748da5e09cc302a6531ee83ae6ff079e4edec9ce38cc95f2b SHA512 e4f6da080fc8cf8b56b43fe065f5c1de41ae71d4598a8056679752d34687f8b457f5494413fe55f0feb8a07e216f5ed74e03dcfd3e76ee2990c83d4d8e175a5b
+EBUILD tree-sitter-ruby-0.19.0.ebuild 285 BLAKE2B f0eae4cb4a9e979353a83e56897ebd87c616877c292b03d1506f1a46fb05cf117e303a60245d213f97bbe429b6e6a32e4e5851618147ef59db694a7c7c4ffcc2 SHA512 4f50df5ca7ab14990741c761d98af7b3e7f812690e4cf97432a7294a567aa521d07603ee385484df72176fe0f53e914504c40795dc389a9e2ca42fb65a2d6592
 MISC metadata.xml 559 BLAKE2B 152613d9b7937a08857d96b4f66803dee57788dce76181acb149bd2a372c1647035076171da2fb0b0745d1762589dd829486536befd1245ad0e2d917fd646d28 SHA512 5c353e6872add822be369b693ec38c2cc797be4c57c23c5a43b144407b7af987f0741c3dc56a173f6ebf05e2d3fad1484f7d8b45393d211ea7e1ae1c9d6281a0
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild
index d8c9f660754e..116225a7b7ce 100644
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index 255be0e805d9..c7b5fc09f9a1 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,5 +1,5 @@
 DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07
 DIST tree-sitter-rust-0.20.3.tar.gz 325621 BLAKE2B b5d2f15df3550e22e380c26a3fa6270a897f4555efb2778e54ef9262145ca919bf933ee739674e02a2086f58d707174c3a2cfb545d879a2c67decf508793af47 SHA512 9732a6e9782538c1a7f7a265e185aece659e164284eac61f65f3d174845aafc697ec2758d6dddb52c8a6ee3856be67493339d680f963ee383894f1d3789d96d5
 EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
-EBUILD tree-sitter-rust-0.20.3.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
+EBUILD tree-sitter-rust-0.20.3.ebuild 285 BLAKE2B ab14276d41be429383d5bd7991339b42a4cddaba5f092b5b6e38e610b2bf3a3f1f93c7d2e2dcfcd625224a125f8dce14ad2e8db285c6a7e18ecee1fc3d7af41e SHA512 7e210db8e4834c21cf1600691a534234c513564ff0a5d459aff9994548d0dd20409bc8e5a203117226249021262a2d1d876c058a647c5a6c99c1f3b7dd2be125
 MISC metadata.xml 559 BLAKE2B d585950ceaa197145c3a2df759e97a8a50114c0caf0b7492e3e16f26251751f694000acaf6231ae826cfa57e99153eb27f09773d2805af40df4dbd3825dbe46c SHA512 97b7d3b6bcc3da3c7fc6d4111e2a1e02fd84ec778a18a22570ae303052d01b4beebba83eb6df0174bd6fc29b8101d88ee20a5f78b855ce713311d87e1c0be312
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
index 36fca638c421..7c4fec4db433 100644
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-scala/Manifest b/dev-libs/tree-sitter-scala/Manifest
index d151361b30f9..14426e979d13 100644
--- a/dev-libs/tree-sitter-scala/Manifest
+++ b/dev-libs/tree-sitter-scala/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-scala-0.19.0.tar.gz 127779 BLAKE2B c0cde9adf3bc4dc25b84bc57d02e248613f42caf1531ad4eeb58e226a39c2323e28553154eb1a5a6d0ba1359cea847ab8e0dac67060d35df1d017bf475524acb SHA512 5845720ce7181f0272fbd9b5980258680d5cb9bf5f8276e4be28f4dad15694f79a2184e46ef94909ac54f510e44ffc67a9632f9767866034f5fa2a9945311661
-EBUILD tree-sitter-scala-0.19.0.ebuild 288 BLAKE2B 160db62e43fe4990e7163e6eb99822553d3726d0f5581ab397da158c73cd0b5d82aa030ca08ff9e96ebafcebfae66c4cca60934466e65d452fb04e9f5a207fa2 SHA512 949619e71073e90a062b2f8e063da08134d084aa9dfe8ed0eaab9b1f3061725a4d2e338bcee35035c7b7de1b0c5edd6706614fd295008908b17342e4aa9d0e9a
+EBUILD tree-sitter-scala-0.19.0.ebuild 287 BLAKE2B 66d70b6586a1025306e3d055e6b1a22634a05cfcc93aef49ec34c6b6727f1dc26e9f4b8981d8c947fbf89a00b8b5c174072582c235aa2fffd13cfb6672c3e3e9 SHA512 81f897f9164025a01587aa0cc3cc0e9a207b0107b2ac9c9fc804b7d98f0475c6e9ab99924fac83b2ae066f506470903a6e6a5d723611011ef9e9424bcff4a82c
 MISC metadata.xml 447 BLAKE2B 562205a9f7e68770539a5b350fd5f0e20d2284d46a24d560e9b9181e99741bf774fb1870080a8b17043ddfda6fd868842d1bd7db9e86b2185483c80001f9514f SHA512 25726d1046d5fdf5c55b5cd6b7f2bf2cb109fb3cea5d76b95ae93bd1ea9b326c19624b021a73a360f86e2071071bacff955d1e1825cf54e4e00d87b5a524260b
diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.19.0.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.19.0.ebuild
index fc450f552199..d9083f607d6b 100644
--- a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.19.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
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-tsq/Manifest b/dev-libs/tree-sitter-tsq/Manifest
index 3e0f44f45ab1..1befe06c492e 100644
--- a/dev-libs/tree-sitter-tsq/Manifest
+++ b/dev-libs/tree-sitter-tsq/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-tsq-0.19.0.tar.gz 15030 BLAKE2B b6bf4e7915dcd7089d1b536aac6df963638df63d7a9a5e94615eba86da44b8e9a6240699dc237fc9f018598384c05af8730ce7d5a2cdd090a5190f2cc5a582f8 SHA512 2150af3463ca56da50c9212d3830e248c8088ae63e914967cdbf77ca72d535b4f09950f71c2d814844d4bc41fc0df36ac00ae391e579d7be9d6ee7e939ebf2ba
-EBUILD tree-sitter-tsq-0.19.0.ebuild 551 BLAKE2B c253b30c876c3fe2df08e9ab319d4276268ef6a2b3b0bc5bcab15feaadca42388a44c671787413a7d8422e71a741a2186266599f925464658ee346e9d80a1cdb SHA512 4d25bfe0ad482278f24d439c1ffedc812763b3be0e7f666162d8ceabb3453f63a3448d9fedc30e04880c937ad8636f03eb8dd8987648d3f004290e01edf40207
+EBUILD tree-sitter-tsq-0.19.0.ebuild 550 BLAKE2B 396e0a5618f2a47ff2bf34d0d53a7b2a33191b83e9ef66166878b53e5e385cabec86272dc9dd4596330e83326228b37e9aa5c5194981982d97bbdd96a0381545 SHA512 f4c5e133ebf104e0bbb4ed002bc4e979c8204e1ddd9ebd19f7a0e4d53704e9fe25a97ba55a4b494273928a827ae749df97330e3d9d220d6fbda11875c99f14b2
 MISC metadata.xml 558 BLAKE2B 0caa98b365021e85b34530a2f8e2a092a06b77554d28f1f41934727bfc0f02b4c3adf9c0d409e99c6b448237e5292a00109632b3177458e85552840979d68f83 SHA512 ccb6360afcc0f0fc1e165e61ea91c61121e52f86472f5378cc846de4cd0b3d33200cb63cf517e9cc8482b38b857526a230c7f46f44ea1ab755140511e817758b
diff --git a/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild b/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild
index 30c1ea20d279..47bda74ea2b7 100644
--- a/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.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
@@ -16,4 +16,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-tsq"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 59fed9c17a9e..981aea394fd6 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
-EBUILD tree-sitter-typescript-0.20.1.ebuild 340 BLAKE2B 23e05366c098a727c7e8f9551de9bc766959cad872a35b2bebeeb0ed6f140b571a1962775fa9350f925d29c1bc105a9ea1382c3d70e46520b234c566e7cef008 SHA512 7511b7e7dc9190b7143790ce9a134d9b44eb69729e5d5ce39a782305981f7cd0fd65bad58daa476e4c9fc5809064f1341d880373b7b8d369fd3ede70325175d3
+EBUILD tree-sitter-typescript-0.20.1.ebuild 339 BLAKE2B 2e85a828b757db9a150980ac71aa8da12a31180344f145f66bddd2a69da709f3cc8c7e0e2c509d64e1ca5480ac9afc6f46cfdd2914091f1338cb083d87c36466 SHA512 ec25ddc8e69f09965106b9068788a71cc28f6cfc38434c54a6eaf38661b0a1f8c64fe74d212e47fe3f825ba909f689f13bf3fdb4646e95bae84093d87013d55a
 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
index 3b2e19104ead..91c68ef697e0 100644
--- 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
@@ -11,4 +11,4 @@ S="${WORKDIR}"/${PN}-${PV}/typescript/src
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
author	V3n3RiX <venerix@koprulu.sector>	2022-12-03 14:59:59 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-03 14:59:59 +0000
commit	529abfa74a08ae5099db9780bcdf8250aa52ecb6 (patch)
tree	2e2d1a9fd6e89b4872499afea3dc57490271e69c /dev-libs
parent	e6ba529df30e3fc9dfdf55ec5797f2f764df6e54 (diff)