gentoo auto-resync : 07:09:2024 - 12:29:07

author: V3n3RiX <venerix@koprulu.sector> 2024-09-07 12:29:08 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-09-07 12:29:08 +0100
commit: 6c1090c8458fa6e15fd24227293d60bbf356eb60 (patch)
tree: 26a7d6ff13e906f3f47a6aca8e915c84b8f25bd0 /dev-libs
parent: 8bf02d8edf7e8947a205e2dca77bee4c4e31739b (diff)
103 files changed, 289 insertions, 1322 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c7c2a073ab71..9378bfabb978 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
deleted file mode 100644
index c35539a464e8..000000000000
--- a/dev-libs/libappindicator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
-EBUILD libappindicator-12.10.1_p20200706.ebuild 2256 BLAKE2B 5fc0b9f20c8366c9803f2b3e1bab5ec40f8225fdeffe952fe0bffc0abdad98334f8277544716b78d1f402e7b5c9ccf8713e1535d788a557660aca65a71a5ceaf SHA512 1847462dec5d60cf945f93a1ed8f3ff72ebbcaf22af7af0115aea0ad6d507dcdc2f92463fa441845c488d5fa48c6c9e6acd2178e89463fbf88c4e57d323e7a21
-MISC metadata.xml 251 BLAKE2B 71830962e48cc35616817c1673c47891acadbeb1a79efa3b4c84d9e7057762d05d3577a5f46cc52fcc85d15ea8e2e5531a49fcef8c7080777f14cbaa8c40e10c SHA512 343a6329f93d5924cd8f3c055b83e5c8a97ead6c0991d6c9731e49617c4ca16b4261ebb5130a6da6dbec3e0d5a5dc016ea5f5f215f334d1792f8fd1c8335aae7
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
deleted file mode 100644
index c21d074835d9..000000000000
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools multilib-minimal vala
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="https://launchpad.net/libappindicator"
-
-MY_PV="${PV%_p*}"
-PATCH_VERSION="${PV#*_p}"
-SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSION}.1.orig.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.35.4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}"
-# dev-util/gtk-doc needed for eautoreconf
-BDEPEND="
-	introspection? ( $(vala_depend) )
-	>=dev-util/gtk-doc-1.14
-	>=dev-build/gtk-doc-am-1.14
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )
-"
-
-S="${WORKDIR}"
-
-# FIXME: tests keep trying to access dirs they don't have access, feel free
-# to report a bug about how to avoid that
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Disable MONO for now because of https://bugs.gentoo.org/382491
-	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
-		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--with-gtk=3 \
-		$(multilib_native_use_enable introspection)
-}
-
-multilib_src_compile() {
-	# Was initially reported in 638782, then fixed, and then fix disappeared.
-	# But I facing it every time I (mva) trying to rebuild it on my machine even now (Sep'21)
-	emake -j1
-}
-
-multilib_src_test() {
-	# Prevent tests from trying to write on /dev/fuse
-	GVFS_DISABLE_FUSE=1 dbus-run-session emake check
-}
-
-multilib_src_install() {
-	# Fails in parallel, bug #795444
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libappindicator/metadata.xml b/dev-libs/libappindicator/metadata.xml
deleted file mode 100644
index 77ed12f2f4b4..000000000000
--- a/dev-libs/libappindicator/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">libappindicator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
deleted file mode 100644
index 49f74914ad57..000000000000
--- a/dev-libs/libindicator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libindicator-12.10.1-no-werror.patch 5307 BLAKE2B 8c4c9a4277968c1598b0d5f2084727b5236afa729568f767e561225cf7e532d65a9cd3a8f916a47b401ee0e6b76560adc79d138310568ef02e46355c32948a7c SHA512 dce99a58fec589633ccd86b94558a89a5d42145d514ded782828fd8545660ce659d0c3eb469b32a67220ec20ef8b1a60b1074bc50282cced18960a948fac9424
-AUX libindicator-12.10.1-nonbash.patch 573 BLAKE2B ae6b2806c99d99c83b36056b0ece7335ab673339e8ba275366efed3bc68413563ef4baffed64a0e3113473e8ae6dc0a143ae388e5280abdd7b84be97ee9f2afa SHA512 8a436dc62fb70d857b2bf3489e576e72fe9e06639a6563cf528686b6646adf2dbd5418c0904d986e44f5a3f9bf41e3687ce7cb2ff7895680a0d2bac792c2bb74
-DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1362 BLAKE2B af1856a0dcff13426d85530e178a7b8aa200342107d6dd14cb169664306b656b1fafa7fabda7f3237a78ed04abd2fca6551958bd4c5ed133af96179edd90b089 SHA512 2560bb73a841f80b401d0607e0843eabf2765f0f1e44483ea47dcd93a5dc98baf971b1aaa08e68308591fa0313787712e9d1d77d437880ba6e1730bd87540a78
-EBUILD libindicator-12.10.1-r301.ebuild 1291 BLAKE2B f9a9881c3658fa72bcfc55f03e9c3335b6e09570ea07503f4411be833ebe1c46572e3ebc6773efaa9726b662fbd6bff34568a105bc847b9afd95ba9d111943cc SHA512 e321ec2c9cd8afcc25e5370e3927e3d6878e1bcf47fe7980b3fa22df89afe860fd5c7e5884b205c6452e8f79739244557991f4389a7e79a378064fc51996c506
-MISC metadata.xml 248 BLAKE2B edcdd1abd2798a2c7fa20cbb2dd76cda916f88cf47f447d4455c52f0f70d3efc68733e8db830d366d72daed401f3dcdd0abeb130e5d897ca0f5ef1720123b7db SHA512 8e2c70684f63199fd8117d04a580d8cf31c6c3c3ea0e52723fbca1ca328a1250f2477408648d712e32f523258be0a851548091c96b12c40b41be064a8853b633
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
deleted file mode 100644
index dcbf50b43151..000000000000
--- a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-https://bugs.gentoo.org/698774
---- a/libindicator/Makefile.am
-+++ b/libindicator/Makefile.am
-@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
- 	$(LIBINDICATOR_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
- 	-DG_LOG_DOMAIN=\"libindicator\" \
--	-Wall -Werror
-+	-Wall
- 
- libindicator_la_LIBADD = \
- 	$(LIBINDICATOR_LIBS)
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -38,7 +38,7 @@ test_loader_SOURCES = \
- 	test-loader.c
- 
- test_loader_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(builddir)\""
- 
-@@ -57,7 +57,7 @@ test_desktop_shortcuts_SOURCES = \
- 	test-desktop-shortcuts.c
- 
- test_desktop_shortcuts_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	-DSRCDIR="\"$(srcdir)\"" \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(abs_builddir)\""
-@@ -91,7 +91,7 @@ libdummy_indicator_blank_la_SOURCES = \
- 	dummy-indicator-blank.c
- 
- libdummy_indicator_blank_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_blank_la_LIBADD = \
-@@ -111,7 +111,7 @@ libdummy_indicator_null_la_SOURCES = \
- 	dummy-indicator-null.c
- 
- libdummy_indicator_null_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_null_la_LIBADD = \
-@@ -131,7 +131,7 @@ libdummy_indicator_signaler_la_SOURCES = \
- 	dummy-indicator-signaler.c
- 
- libdummy_indicator_signaler_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_signaler_la_LIBADD = \
-@@ -151,7 +151,7 @@ libdummy_indicator_simple_la_SOURCES = \
- 	dummy-indicator-simple.c
- 
- libdummy_indicator_simple_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_simple_la_LIBADD = \
-@@ -172,7 +172,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
- 	dummy-indicator-entry-func.h
- 
- libdummy_indicator_entry_func_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_entry_func_la_LIBADD = \
-@@ -192,7 +192,7 @@ libdummy_indicator_visible_la_SOURCES = \
- 	dummy-indicator-visible.c
- 
- libdummy_indicator_visible_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_visible_la_LIBADD = \
-@@ -214,7 +214,7 @@ service_shutdown_timeout_SOURCES = \
- 	service-shutdown-timeout.c
- 
- service_shutdown_timeout_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_shutdown_timeout_LDADD = \
-@@ -240,7 +240,7 @@ service_manager_no_connect_SOURCES = \
- 	service-manager-no-connect.c
- 
- service_manager_no_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_no_connect_LDADD = \
-@@ -272,7 +272,7 @@ service_manager_connect_SOURCES = \
- 	service-manager-connect.c
- 
- service_manager_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_connect_LDADD = \
-@@ -286,7 +286,7 @@ service_manager_connect_service_SOURCES = \
- 	service-manager-connect-service.c
- 
- service_manager_connect_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_connect_service_LDADD = \
-@@ -319,7 +319,7 @@ service_version_manager_SOURCES = \
- 	service-version-manager.c
- 
- service_version_manager_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_manager_LDADD = \
-@@ -334,7 +334,7 @@ service_version_bad_service_SOURCES = \
- 	service-version-bad-service.c
- 
- service_version_bad_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_bad_service_LDADD = \
-@@ -349,7 +349,7 @@ service_version_good_service_SOURCES = \
- 	service-version-good-service.c
- 
- service_version_good_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_good_service_LDADD = \
-@@ -376,7 +376,7 @@ service_version_multiwatch_manager_SOURCES = \
- 	service-version-multiwatch-manager.c
- 
- service_version_multiwatch_manager_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_manager_LDADD = \
-@@ -391,7 +391,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
- 	service-version-multiwatch-manager-impolite.c
- 
- service_version_multiwatch_manager_impolite_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_manager_impolite_LDADD = \
-@@ -406,7 +406,7 @@ service_version_multiwatch_service_SOURCES = \
- 	service-version-multiwatch-service.c
- 
- service_version_multiwatch_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_service_LDADD = \
-@@ -432,7 +432,7 @@ service_manager_nostart_connect_SOURCES = \
- 	service-manager-nostart-connect.c
- 
- service_manager_nostart_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_nostart_connect_LDADD = \
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
- 	indicator-loader.c
- 
- indicator_loader_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(builddir)\""
- 
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
deleted file mode 100644
index eac1e73aa288..000000000000
--- a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/777087
-https://bugs.launchpad.net/libindicator/+bug/1502925
-Thanks-to: orbea <orbea@riseup.net>
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
- 
- AM_MAINTAINER_MODE([enable])
- 
--AM_SILENT_RULES([yes])]
-+AM_SILENT_RULES([yes])
- 
- # Check for programs
- AC_PROG_CC
-@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
- AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
- 
- LT_LIB_M
--LIBINDICATOR_LIBS+="$LIBM"
-+LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
- 
- ##############################
- # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
deleted file mode 100644
index e5cd461a3d61..000000000000
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic virtualx multilib-minimal
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="https://launchpad.net/libindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )
-"
-
-PATCHES=(
-	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
-	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
-	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-flags -Wno-error
-
-	local myconf=(
-		--disable-static
-		--with-gtk=2
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# bug #391179
-	virtx emake
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	rm -vf \
-		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/${PN}/*indicator-debugging \
-		|| die
-}
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
deleted file mode 100644
index ffc9b7d517bd..000000000000
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic virtualx multilib-minimal
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="https://launchpad.net/libindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
-
-PATCHES=(
-	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
-	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
-	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-flags -Wno-error
-
-	local myconf=(
-		--disable-static
-		--with-gtk=3
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# bug #391179
-	virtx emake
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libindicator/metadata.xml b/dev-libs/libindicator/metadata.xml
deleted file mode 100644
index 38903ed6bdfb..000000000000
--- a/dev-libs/libindicator/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">libindicator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index e28fec29b8fa..247a86b9e7b5 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -9,5 +9,5 @@ AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
 DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823 SHA512 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6
 EBUILD m17n-lib-1.8.0-r1.ebuild 1905 BLAKE2B 9656dd865cc442e8bee1561af21db97fdc86b374ddcddca1b23659f5bf9ef6dc5a5eb54da6424d806d011dca5eaea56348bc796984675f5e28b5fa01d0e002e5 SHA512 aa18b9dd39f7b1068a9f51f4f0871799e26adfa6fb0f493302b9e000f6743da0378388aa9403b183e9ff5f58208d8b145617353bc259d88a3cda8f026c700cd9
-EBUILD m17n-lib-1.8.4-r1.ebuild 1766 BLAKE2B f696d03704511c4f5aeafe0dbd07e841dfac444a135a28bf299a692bcdce2947b7107d91eaa54ffa6e0f9210b40264019acbffb7dca1ccca7e2dc09ebc5aab1f SHA512 e764844c208b9a4ff2f02c75df3670737cf2456e1944dcd680ce54f7c617bb80a0689f7d4e4e7f11291805c7286d7965feb258c6b50e0acded288431a3be461e
+EBUILD m17n-lib-1.8.4-r1.ebuild 1761 BLAKE2B 24a47110b627759575a7132841bae242639e04e7f89a450a201df103eeb3c51ae91545e50625254b8bf19eb4d4cd098f374da33c284d36919381d7beef2983ed SHA512 19f2f84f7e08cb21f4a2392130bc092a5c7ec370ed2b7218039e80f4c518b9feef7bba9cff9d4965ccfdafda0788687a2b2da25c3e5a0835f8e7f1f4e5066c91
 MISC metadata.xml 889 BLAKE2B 4fdd373094410c6fac69020e36d1433b10eae0ff3530e666f1445819175e118c8266d6000145e1be27912c530162ed9a76e71014bb37998c11a1355b125d1665 SHA512 fcecdbf2fefbc637a023c3f3b03922dbb6708a6b540e5555242d415e4d70b5ef73df3f9cccc14536aa237a018b9b23e3a5a3d04141d93401fcc06984b542754b
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
index 9d9d1f79ba11..cff5e25d1994 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND=">=dev-db/m17n-db-${PV}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index c571307826d0..c93cb56edf4e 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,5 +1,5 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1744 BLAKE2B 32351a6e34899b05e21a57dec40716524e11e42dc3f47fc1fa42c804808b602459e0a66c3c0c764c241a25ebc1cc585ad57aef48f90de76b4230674b1f79c863 SHA512 e3c887678dc1e365fae8066a37416f5fdafb4f5d211366412b7c4d12ab8806c7ba723adf2b8837817fb310aaeb6cb3be0d4d239c5d6fbe5393495df857945553
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1750 BLAKE2B 0e02a86094700c23529a032e1e778d88f4d2a990c164e29ca5053fc409ca08964f51e02def1e4a5988f794fffb50154beedaaebc2e513bbf64ef0537b9514adc SHA512 3581c4e3efb8f8e4e8505ba84dc39f935d65e197b656a01cb710db05c94f897b521c96cae0167e5674132016419d6a94e3f72d78f4c736937bacb90f02b8fcab
 MISC metadata.xml 431 BLAKE2B 3ee55515a9f7f687044481bd095b4ff18f9d7fe815ad967efab4745dc29a8a09c26ada6d16f2911c8850564b3f6d605b864d4583d34dc5cdc727d9644e7cea77 SHA512 6c5fc0aa9eca8f7d35a7847e05e2c74508d8aa11333c2730eb833b03147d58091d880683b0468f8219be636f1135b201f94efbdb0b31abd6c19e8733576e5ef2
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 6f64ba4a02ea..2ecb5a8807e3 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-build/libtool"
 
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 890d7aab6b64..979ba4681116 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
-DIST tree-sitter-bash-0.20.4-2.tar.gz 444183 BLAKE2B 31016de876ed84ab991ebc1e531dd750c416a86db5f91097db54e7362de673ea89bbf8863a9df487f75386f19a7e8ddde48a2e727af918d1beea8acad3ce67c6 SHA512 074f659ea475c7a442957a3df234f967ae9a6ace885ecfad6548a1d0f2af7535e5460d81bcd160a04bda1b902af0a9f741fc0c7b22309cd1d11ab2bc33ff0a22
-DIST tree-sitter-bash-0.20.5.tar.gz 525750 BLAKE2B 2508ede3ac6b0a7bac3f46af35ea018916b5cf6b0acf593e546146277c1a619dba52eac6064e3e0431e0f5e41bc80b441e0ac8886287ccce5bdabe3924a036e8 SHA512 bc1c4ec816183b4a4990decd45f3c46a424e29d4c417b762f3f761b6396faa984c6eb05237cb4921070e0b478485146889176a862b0935b4b345a704675bef22
 DIST tree-sitter-bash-0.21.0.tar.gz 557096 BLAKE2B bfbdb4db0f75c292567043a47d32e26c6ec119ed70fa9b77675eb57e686c072315fc114befecc430730c8eec20238544d13836402f2264a1b6657e0387d4987c SHA512 9585ea80f85bc7010444a91142bc943486ade68982c7ca367a6cbe65619af2bdaa1acd8b6ee698cdf74b84d62a7f44acc4676ddb4b6007035eb9eea4768f122d
-EBUILD tree-sitter-bash-0.19.0.ebuild 364 BLAKE2B aa9e2ebb88fc9b7cfc560a1363d7f6627f3a15e4be9d050a8c86ce394fb31717cc3bbafa1bd4be4e72d7a1798371743952780f96cab888fe5166312dbe30431e SHA512 08d01e57e92bcf1f0fd0f745b05e547e82655e15aba70a93b43f6893c9f1db4ed0faad844b3ad8d1a9d63eac7124c09237b58a9ec6c02bb0688db57ae2428a75
-EBUILD tree-sitter-bash-0.20.4-r1.ebuild 512 BLAKE2B 73fb15078b2830a9e470d2ec10c2da386835ca91cfeb22a54b1108b86f09122ca43478a94cc538e36df10f127db79e3815dd7736c3d3ca150351a4ea7b3eade8 SHA512 afdf6aa801ad1d8a7af0567a0901755cb659bbaee8f1fb0e03102150819747f70a930fd90cee2e877e46e52814726c52a9f28888eb4a5ca67ee0f7de6be4a11f
-EBUILD tree-sitter-bash-0.20.5.ebuild 364 BLAKE2B 2046737a627bfce8cf821b97fe10365c2bce44389f21b669ee24bb6df6dc6758ce9a409bcb4d57460f362a95c0f7006d7a32b1a8dc48e925b333bdf15644a0e4 SHA512 b98545066d6acc380dcfd16030417af37b26067b4d9f7a85e79660acdf8d3a5e2287728a4ecd418be1d230f15d5dc36f2473673ef4f69a7c8c0a793c79cd16ea
+DIST tree-sitter-bash-0.23.1.tar.gz 542859 BLAKE2B fbcc788a241b740e128d1ac7dac6292411121c67239c2656a74514f016b89882e4bd6371fc287b9d94b4b78f2b8e968ba3029de67e1c307e99ecce95bfe83dc5 SHA512 1ab59105a5f0a74a17b415420fb8da072cdd2765f776a4f1b0297ca4a4637055d625753c502b96928e9cdf56fd9f175589da4acdeb338daa9113df94c4aa6581
 EBUILD tree-sitter-bash-0.21.0-r1.ebuild 394 BLAKE2B 9741da3de07419376bba9c794abd9c874d697158e88ac8fc19b92d32038751c52823c1b20c6160b27d2e9bfe9d82c423e60b81286fcf3314f1e306edb49cdbdc SHA512 dd06d8c5bc81ed217a1d9f07506c9580dbc4714f11e95af3e34b743a64ca10797bd4b65c422eb152a122af97603e9ae8b1ec5424aa01bec6739d770e3f2d94b5
+EBUILD tree-sitter-bash-0.23.1.ebuild 402 BLAKE2B 6ffdb812837414339edbd50de840df74f7ddfaa0ce53f162f8fa90db3f55235de52908520546646845911b76ae36239a4d8ca6df8cc8f5877d16caccfb073559 SHA512 9c62a982866b39bace667acd30741a61c9749d7a64eafa73af0bcc67c5121a76fdb24e0bfc2c030b09a79defb56639508108b48d7d5fe705ec212f374894d890
 MISC metadata.xml 444 BLAKE2B 5a79ed071d8acb28777a9f255c6d7e3dd8317bb2c2502423925764d0b170aa7b8fdfed40d505986986b3bb5d573efd2a300bf3f76b34fccfd5a8380b03fdd1b6 SHA512 0fcdb129e5f90034a21d041a77f2c1ec480a05401def273c074ed31c078cebdee08eb41282b8bb16bc17d125e610b5c1e3348e219a4c108712b6b015a2649d63
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
deleted file mode 100644
index bf87fe76c9f8..000000000000
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Bash grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
deleted file mode 100644
index 8d2e42a385d4..000000000000
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Bash grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# Override eclass SRC_URI as 0.20.4 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.5.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.1.ebuild
index fa2574fde717..bb660768a312 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.5.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+TS_BINDINGS=( python )
+
 inherit tree-sitter-grammar
 
 DESCRIPTION="Bash grammar for Tree-sitter"
@@ -10,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest
index 29fb6cb30b1a..a67aded2273a 100644
--- a/dev-libs/tree-sitter-c-sharp/Manifest
+++ b/dev-libs/tree-sitter-c-sharp/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb
-DIST tree-sitter-c-sharp-0.20.0.tar.gz 1050470 BLAKE2B 2ee76331cffcc60729537a72c0e9e9d1fd65ff9292724371354085c1eec03769b1664a09dc75bfd2abdd16b4ef2c12006bec3acfe7b4f31fd59afab1b8167cee SHA512 31530ff57d02b84c8e7e7183abb927c40839500afc225cfdbe685495962c3f129ea459efaf73abbb76951bfc14b890cbdfa9a847b3ae92c8db495d173d0e0e08
 DIST tree-sitter-c-sharp-0.21.1.tar.gz 1576411 BLAKE2B c89cd47c93ff96a01fdcf5d55971bb49326ec4cb4f37438247f0c5a0a7a083e62265f07fdb3a6b7d18f2ac13e8afa5705a5092cf7ff90f92f8fa0b9d9073a3e3 SHA512 43fe2c31ae73efff91af15d40f9b3d4b468c5b118de7b029c5c2338885bc27fedca21fe6361700012a1d5c80ff7426ef9ce2f7226da44be8302d727858e7aebb
-EBUILD tree-sitter-c-sharp-0.19.1.ebuild 286 BLAKE2B 65fa0aa0c5955a828c3ea51090de61d4e87ca76186f8ae5d18a14bef3afc5987afb3e94f5b5bf5635d00f69df81682a8a7d7c5812131ba649cc8c442aa2f9d3d SHA512 9cedbaa8cf88149fad9993b24151abe39daecd3fceb212a5c4222a13a51710d5bee758ffe69f07c5c4205ab42736f4b2f0d50b17639c3fa5adeb51c8115f910e
-EBUILD tree-sitter-c-sharp-0.20.0.ebuild 286 BLAKE2B 3951e05dc8e667fe41e4af863f747261d1e0f28c984176b1a798bd21b97969f0796e9c69b46bb4dc43ab50d1b46ac62752f7871cf72a67137a8866afbba4dd12 SHA512 6628d8e835925e4cc627e6734cf63506104a25dbc8350b67cade3c2c81ef97c8f0c24ceecf637e46820706c6d58824f281705f037237f039a7d0a0c35495b7ce
+DIST tree-sitter-c-sharp-0.23.0.tar.gz 1559431 BLAKE2B b24828f6abc371bd6397933b6b3cd586fc60f2c03c5d8607e0526e419b673667e12a697d21b1fbbbf2a2492986d7b2c81bc5c300db103467356375f1503b9465 SHA512 998d15ac285f000bc96227853933f7518ce6250dbb04cf44f7859be8dd29226ca1340e46aac51f3ef7b9d8bca385bd88001789081801bf4a8428ee5195064a5d
 EBUILD tree-sitter-c-sharp-0.21.1.ebuild 286 BLAKE2B 7e87c1cf475c6df487dcd104027cabea587afb927fdb3efaab1a6a2267cd1180a2e9d0b35868f2fffc05a936ff2aaaa217c20c5af5b4e558e2c4af2a31d6f151 SHA512 6a00db9b811a3816f9d945d7e3a1b6530f23ee61954cbd4363ba69987c6ab38b61b8615e1499d786791f42eb6f14d2a4220736abf75397994508b9cf5fccd7f0
+EBUILD tree-sitter-c-sharp-0.23.0.ebuild 287 BLAKE2B cb0ccffa70ee9ba72d61e2e41279379b1d60a31234d8d9d42834f912425a129ec38ee8e6cdbf62966f315c65a835adc74a93038737bf622b0e3c6ac6f32abafa SHA512 2e0b4ebe44c0e5889c7cd2f503aaf1fb0d2127ea88dd46d180ddd7fe06d50e93d3d361719924e773102d34345bbc34020f10c7de5b606cdba173d6f32da5858e
 MISC metadata.xml 457 BLAKE2B 25f1dc01f9dd1da79ee2d7f63e2ea3c088e23f623a796c6ed90bb5592f6baee66930d91cd55e30461e6c59a42654281e160974423068d93e2cc1363623d4183b SHA512 2dfa8bf3f65c42b1244b6160a402ed7d8cc129dc68709d23cd1ac2d90d1a4d20f12fea2bfe03b4fcbcc79f16c765bf318bea05c23e34362721070ebd074dd1f8
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
deleted file mode 100644
index e7c1c44ee2dd..000000000000
--- a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C# grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.20.0.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.23.0.ebuild
index c54d7faffe49..c1e7e5bd3167 100644
--- a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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 12b83281709a..e6c9139065e5 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,11 +1,5 @@
-DIST tree-sitter-c-0.20.6.tar.gz 337801 BLAKE2B 96dfe37535aca85d2bae15af0a2d59a99bd6861a9a32957b6ae9a4fe02ac1a8e8c4f649760e5eccf68f224b30992aa1656a8b3e11da8a3bb43e07c62f4b26063 SHA512 047b47ef9190f3894083be2b8b26dd33c06d87bba6b960e63e9787112b374a76e2239171b89bb346a27b886396c2054a4ecc1e42d4f83a23ab62060907fe2198
-DIST tree-sitter-c-0.20.7.tar.gz 377856 BLAKE2B c18e23d010a6d2db9c6171134ae536c299e6fdb51b1d4c8693475b1249e6f1420a352d8e1aa3e10281a230acf4953196ab0e59248da7f9ab9995c8e9576da1e8 SHA512 42199156796dc6fb427b57c67c1fc5105c315b812a5ade813466dddd76b1b5c37957c071b52a58e4f46b5a55f189de13eab92ff8b6adea45ce07aa2322c5c357
-DIST tree-sitter-c-0.21.0.tar.gz 426566 BLAKE2B dbd2cf89d2ac79e5c6ec7b6e16e588d74b6ed0b467beb411fa32643ed70434193a155510d1649cd074efc98d4e04acdb1a3799c99c8cc6e836bacc444836fff0 SHA512 1ed2b48b6adda606c7074da650c089040e04873bfb666ab08f4c7f67e8077de3760e0b1610c2519d69d3eb48c101cf8e441d2b29622a075b4a6992efbc324abb
-DIST tree-sitter-c-0.21.1.tar.gz 367056 BLAKE2B 062bfcc3c5a8a2db00423592186ca8b4d0928bdcd00bcd086386cffa4ce906c3ad098725f2e3632f941c47ddc8a21015ccfc9d5e3547399582d4932c4ae4b640 SHA512 d8eee9ee78434809068f7030e9f5c27d425d746b877d70b0f7680b4349577a155b13a03bdf9e4c37e927af33a0d4e4d14672ab5fd86a27bfe1fc18b300eb5fcd
 DIST tree-sitter-c-0.21.4.tar.gz 362462 BLAKE2B d3c37bc04e344df7b13d06e941cdc3d0dc6fa871ad02c090fb786086cd561429cb439335a7ea2745746b4e0e4ba938ed07e8fccb9313a2af0cee63b18dd89bb4 SHA512 941117c22b2a1dd46b7e8a9a0552fc3d28d21c22c44687dc67487ab7b136f8f5fcb05c8dc1429e4c56f619c52f7496ba6e07280751e49d8c5e2d36e2a807e19b
-EBUILD tree-sitter-c-0.20.6.ebuild 303 BLAKE2B 69f2ddfa226985160b79d2d163324e9d6692e7cd9aab2d3e32bb02bedc48756c6bf758955d0a61480178947e96c6b6e1ff426104d35fa79ddb8ab965fb514904 SHA512 ed23643f7a6bef1974768be4176e410565f69e94ab9ffeaafa7983b642fc5422a0b13f6b7eca6827fcf28b1d2c06d9de58842e6f8ab45ca8a0e483d89d2c4e86
-EBUILD tree-sitter-c-0.20.7.ebuild 304 BLAKE2B 5abc55c6a3a6f59d1d72bc675b660cf74c8f9ce55061c6551d2576eb88904286dc98dc55b5f627f8e8121690f59730c086e5347c6275a09c77dcdc4877c60569 SHA512 b5e245d47657873c1301853ed3499e90e32598b96067194cea439d206b66721032743aec7c982624ce13e175e9544ccf1532461dd73618b14c9a6c22d6253cea
-EBUILD tree-sitter-c-0.21.0.ebuild 327 BLAKE2B b29764bb3eb4af91e79ffa1de86181390d9f8314f99917347da35c360b1111be1742456f92fc84856ccfd71e4359cd2523c229c89ecd3aa5f2c77e079a4a9441 SHA512 6fc0b95b06b9406ea8aabe64185fbd69048090d19260865b5ae972d2c5fbdd7a1466a4cbd08b2a77c4819977b08b161f5ab9bb67848ca213a49257010af8515b
-EBUILD tree-sitter-c-0.21.1.ebuild 327 BLAKE2B b29764bb3eb4af91e79ffa1de86181390d9f8314f99917347da35c360b1111be1742456f92fc84856ccfd71e4359cd2523c229c89ecd3aa5f2c77e079a4a9441 SHA512 6fc0b95b06b9406ea8aabe64185fbd69048090d19260865b5ae972d2c5fbdd7a1466a4cbd08b2a77c4819977b08b161f5ab9bb67848ca213a49257010af8515b
+DIST tree-sitter-c-0.23.0.tar.gz 370699 BLAKE2B 261b7ef1e7ebe1dc49780a95679b921bb7c67cfac6f0eba057199c0e3c9e833a40cc871fdc170ac4689aa19f65feed3c122cf5a6681ec22c619e1129eb26cae8 SHA512 9e4b453c64cc3ce8e6d060ceda1fa579e0339bbddcef7192c3f8bc0cddd6df76286d126e3e3cba476cc1f98d7f84e8b7b896837da8ac0646e3d6f95f6c78bccb
 EBUILD tree-sitter-c-0.21.4.ebuild 339 BLAKE2B d8a83349f12def58bf579d0125394abf75d0254973eba39aea4f0c97b59476dac7cfcc8ab11fd8bf19d567cccd5e4ea25c98b9d1a6aa0853e26954b4647b9d04 SHA512 af8dc9000f2f98923772f6ee1115768f9deb525bc485570a58c0133702705235954fee2c39eef674ad9028db25ed951372100fa56362c4b33543d289668dad36
+EBUILD tree-sitter-c-0.23.0.ebuild 340 BLAKE2B 30cf3cd08becf30034b622077af5ce8c5d209f2bb19567ef1b9d9f6f36f800c147c360dde0aa0107110be8bf47fac129551914c1ba4ea0037b3f7d2096929617 SHA512 d0af167af9b75b2d7d7b52e34b2565410c753ffd6f2fec212386873a0eae33d74d547df87bbe17c3fb2c94e6b3272fce10be5c886723bd76a5392998c7574454
 MISC metadata.xml 338 BLAKE2B 63a1d0c3a464e26c64f0928e3e18369bb58dadf0046be1b1af619954230ce17c30113648226542da7c9db94c3ffb6539f8c07252f3eb4872528a090bf9182ca4 SHA512 7da1caca88d1e8afa4268c903aacf1227781a3238157994777ac762efc6cb8652fffd716d23ef124dea8e0980590d7af7d62d7d3853694e3a0630f514f4eb277
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild
deleted file mode 100644
index 2a9f71629a50..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.ebuild
deleted file mode 100644
index f3801303a1d1..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.23.0.ebuild
index 7acbae161e6d..21cb9b0c4c49 100644
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.23.0.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-libs/tree-sitter-cmake/Manifest b/dev-libs/tree-sitter-cmake/Manifest
index de6db903bbe6..0920f5fcb05b 100644
--- a/dev-libs/tree-sitter-cmake/Manifest
+++ b/dev-libs/tree-sitter-cmake/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-cmake-0.1.0.tar.gz 42425 BLAKE2B a6d609b9baf297265bee4355c2f8d11853d393461e708475c53ce8ee067f668550a31cc75142d5ddd8e34160a03308388f01661b13fdb8a22a0c3cf95a0105a6 SHA512 5d228fde691b7ef9f4043ad41a852541551c31392ad5beb21580e6902039c5fa1adc2a42642644603871e373011ef3c9f4264bfc40e33fd0d3071a716b5d61cf
 DIST tree-sitter-cmake-0.4.1.tar.gz 50091 BLAKE2B a91fdeedca3bad83b1e8006ff464a09d761ba9d46601216f21885062c3559891837fcf0db7960b69382b117073a3ff937ea26e2861922133c8660e5c2043b6c2 SHA512 25318e305aa42bfaa6fd09fb515988a31a00247f535e4d881573226d862d72a74eb30dfdfb3bd2b985a9be96cdf6da6a8a9b945d9c256870755015ae573edd9c
-EBUILD tree-sitter-cmake-0.1.0.ebuild 369 BLAKE2B bc58231fb7de1932507b18032017c93db9d26523eaac3ad6cb28d1730081384fcee628f098c1d23e83150b7fc3c558eb4ad83f8989f6164a779170a3b1ce1728 SHA512 65e814350945f4fd67a641122e818da00298972cc71100f08d522e2081113d3312022bdf633cbc0a76c638c3dd448f5479c3a81fe3e2eed5c74a432cecdcd565
 EBUILD tree-sitter-cmake-0.4.1.ebuild 369 BLAKE2B 1be3f57f599a5af83cf70cf8531821b1488cad537db30d625751c97a06ed76eb0531db1f1a09272f7f42e0858e832409202bb7e4ce630af8bade675f33dc1de8 SHA512 7b2354ff02ad6bfd048032d915d89c0785786ffcb158287e8b28dec024737900b4ff7cd5a3fe2c8e7c72c3f322695257c2a5e87d97fa161e11b93691e8e6b62d
 MISC metadata.xml 335 BLAKE2B 2c8a5ca17bc26e1c3ba8ed381ac080dbaa4720e2584c47507fcdc261de207fccce5abc14874fea0f49009cb5932f521ed927c9a3dee871df88a2ffacc6df2b41 SHA512 5ddea708b1a74c670ee79c9b2223fb0a664a609eca2891f355e25b36cf97f21b88e8a9e6b6cf34cdbc051a0253a5a3e9e756b0c8daf6af7910f0c6ce9a9693a6
diff --git a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
deleted file mode 100644
index 4ac4989f45df..000000000000
--- a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="CMake grammar for tree-sitter"
-HOMEPAGE="https://github.com/uyha/tree-sitter-cmake"
-SRC_URI="https://github.com/uyha/tree-sitter-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index 4fe3f200b0bc..ff977fef87a4 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -1,11 +1,5 @@
-DIST tree-sitter-cpp-0.20.3.tar.gz 1056333 BLAKE2B 3b1fc2509da265b2f49ec1a9bef7b005b06eba0311432af9e2e97977ec3a568a8ee531375f5330e624675f5b12711c4cf3306959ec82d21f1017380fb6e28b7a SHA512 62630953cb873dccbf6203b90ac6bd62fb596a615c71603c93b4fdc1e21d456c8f6ba74576e9e86732dbce2b7deaa082ea35eddf7fd7387d1ba13236757dfaab
-DIST tree-sitter-cpp-0.20.5.tar.gz 1442677 BLAKE2B ee9e058cca7727d567869d58568b3808efad7b1f4059089682b31ac39fd623213111078250eb034fb66be51f502f693f65686fb89ba8865866ded7ed1f195b5a SHA512 0afe19dc868bce8fef7114c0553ed3af2c479fc84257959a617dd6acf695fb13a91468a3daddafd39cac11f7d5a72ba988bd29d7d7f1987d7486ae4d1dc7f746
-DIST tree-sitter-cpp-0.21.0.tar.gz 1482410 BLAKE2B b15467c3525416fcc925fd8c3480200362ee8ae41528757cebc113090d5678dcfa47bac4b54e32e791dba954de15fd3bba68e6ecdedbc55bb61095487de386c4 SHA512 70be7b446e5acf0f439fbf1d4c9d649e8e8bc8ea044d0d3f3644e3047eaa5468eabefd5552f98fa39d34030cce654db25371008ddbc27a64d3df14611ac3061c
-DIST tree-sitter-cpp-0.22.0.tar.gz 1253356 BLAKE2B 6834cba10f8f5f0981620d69c3ebe2b4efe6815bfd35e00ef333ef96900d418b0204375b93f84989e826c225849cd6f7e8520bd8c2f4195f6e2ed8db41dc1b6d SHA512 68ec7378a6abc3154090bf7f14b95f646c44ac09e309ec5161906f42641e568171412fd4c30360680982af5e621cac4d51a1cfe03695117560a3a5eeed73d22d
 DIST tree-sitter-cpp-0.22.2.tar.gz 1064580 BLAKE2B c51d848f27eb7aaee9e23da6ff375eec9da0fc17c0ce6dd7b128003703a37cbdc8e66664558892629da76a5889a60f77988fa1846e45085441da69f6ab62a833 SHA512 33a885e43ad578697087ffc6af35366f9a7ad8d46e9b10fa3190bb02368d978fa432d56a5e1d8e66858fa6c79f5ff614b1cd2bbefd58eef2532bf88988c14373
-EBUILD tree-sitter-cpp-0.20.3.ebuild 364 BLAKE2B 1b939a3c1dc73e0b3ed1a1bc29f006a3b1f6de0e3ed24f516a7b8dcbabdc4cf086f1df22f9bad3fe7882d90b50eb4af477dd58593de49efa11e4157028e3675c SHA512 b8845db80d1d907977bd31810771e751f05fb47a574b12a0a462b05cd9409def079fbe2accdcdc15128527c8591640c7665ac0c56fcd839b04ad63ea9777d0b9
-EBUILD tree-sitter-cpp-0.20.5.ebuild 365 BLAKE2B d322db0859d60d93b102baa7be27dfc6c369ee5405c742353c02691cc35b20164925e22d6bbc91549a88c8545ef3ddeb715110acb98f1547e1859511eb87b955 SHA512 5e41161ea28bd89632f785c01598d833d03d7d087adb976b7411b60f96d1d8b1b861f7cd1740bd41ace6f22dc72c404fea42aa65fff61298812a62f75b76de2e
-EBUILD tree-sitter-cpp-0.21.0.ebuild 364 BLAKE2B 1b939a3c1dc73e0b3ed1a1bc29f006a3b1f6de0e3ed24f516a7b8dcbabdc4cf086f1df22f9bad3fe7882d90b50eb4af477dd58593de49efa11e4157028e3675c SHA512 b8845db80d1d907977bd31810771e751f05fb47a574b12a0a462b05cd9409def079fbe2accdcdc15128527c8591640c7665ac0c56fcd839b04ad63ea9777d0b9
-EBUILD tree-sitter-cpp-0.22.0.ebuild 388 BLAKE2B 9e6ac9c3486571a8f532420d3a813c6677eca1dcfd233c41a4c03a0c5decc1a8778b6b9ffd386e7ecc8490bd6d9500d091aa4d7f3327b44994b1e50e22fd8d4c SHA512 a5019f5a47263841063f558a03a67a129ded7bb2c215e12066ad0b2fc4ce6da9eb135821d5b8964859d8cf8bc98c3833b2886b258dcd093c7d88c110537fbea7
+DIST tree-sitter-cpp-0.23.0.tar.gz 1091170 BLAKE2B 30e5aec24424afabcbeda237012e3e2e9f2d01650bb27621277c27a8ac7f7de3d18018149f1a640d62a35b192f85e6c2b28b5e88d1ee440de393b22d7be7ee89 SHA512 bf0a141f3fca00df59881836072d0db171ad9cca72a473d4527e6e59c3b5a5811c00b4345bda4da1817f95410808c5e56e886396e8301a8f95667ca4cc7329b7
 EBUILD tree-sitter-cpp-0.22.2.ebuild 388 BLAKE2B 9e6ac9c3486571a8f532420d3a813c6677eca1dcfd233c41a4c03a0c5decc1a8778b6b9ffd386e7ecc8490bd6d9500d091aa4d7f3327b44994b1e50e22fd8d4c SHA512 a5019f5a47263841063f558a03a67a129ded7bb2c215e12066ad0b2fc4ce6da9eb135821d5b8964859d8cf8bc98c3833b2886b258dcd093c7d88c110537fbea7
+EBUILD tree-sitter-cpp-0.23.0.ebuild 389 BLAKE2B f44e161f47c3570c93ee4f4bccfa84f8afc4ca6075b55e77766d55c693da75bf94c453f151fa55c09474714fbe0e72c3b2463fe9112c18ab75fa843b5c0712ce SHA512 0365d552159ad89b9199bac4509f7bcda62e9dabc63d52395abe8b4ab3b998cecf66aea77320dafa8deb8df07678ad60a3aec042975c8b07debfba125480fd48
 MISC metadata.xml 340 BLAKE2B 4c468b5cbcfef24638d2f6f5ecd503392225d5f3b11297818b1f6be4ccdcde61a0cb71719600c7da8ccb551392e2a1714a075d908a14c2f12e4edd2494e4f43e SHA512 644036a25ee8079f1351988b1c6b811c0272d4fb5659a78eeb23da0b7d2ae893e63c741615824c16ca9020d3229900dbe7cadb1e7230a1527a83a3926d6c1d26
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild
deleted file mode 100644
index 18804881eaed..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild
deleted file mode 100644
index 18804881eaed..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild
deleted file mode 100644
index 40d03e0e7ae2..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.23.0.ebuild
index 6fa20973c00b..011d04ce711e 100644
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.23.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+TS_BINDINGS=( python )
+
 inherit tree-sitter-grammar
 
 DESCRIPTION="C++ grammar for Tree-sitter"
diff --git a/dev-libs/tree-sitter-css/Manifest b/dev-libs/tree-sitter-css/Manifest
index 1c336d4feab8..dffee24e8f82 100644
--- a/dev-libs/tree-sitter-css/Manifest
+++ b/dev-libs/tree-sitter-css/Manifest
@@ -1,6 +1,6 @@
 AUX tree-sitter-css-0.20.0-test-selector.patch 389 BLAKE2B cf0243812bc999a62d2190ebd177a83018af48f81fced8303372301c394da70aa5139a6027f07a72b8c74f8b6c1f53b603b23800e078cb1ad34351fba84a959b SHA512 a169364c2ba5f420a1ca4e1f06d39eb6440230dfb0f2a4fee8926747a2d74cbb3140d037d67f43111d30625186afcc3a010b16fea27eecd530f54212cd986f93
-DIST tree-sitter-css-0.20.0.tar.gz 93887 BLAKE2B 5f5962de37fa6a65dd531a54515b24ccb78932f17d15884adfe00cb1098a86ece3894c2e7f54a8936ad7fa1c76e5dcb89453999e3ffd3f3d894c9e112407e4a2 SHA512 0b4c45de304a5a18834a85665b5da5eaf7adc968c509de6cb95b98a08b2987be7b13f2cbb7181da04cf23e199942d9daf788a12cd2f4b8d85767ef1250196825
 DIST tree-sitter-css-0.21.0.tar.gz 114817 BLAKE2B 6a1acfd884e764903155fae31921fccd878ed858f73eae799d25c603c7740aaa908b5d746f66c429940c55818c279bba21ded5638999c7c96229f4adbbfd8d6e SHA512 2f653e74293516d950ced883ece1ed3f6ceb7e895e54207a561c3ae61e63284a4001ae138aaf75afb46fc2efe8e50e3e551c469cd7f675f8cfcc3415e89d07d0
-EBUILD tree-sitter-css-0.20.0.ebuild 448 BLAKE2B da7858f5295d590bca1921003f245690cdb133bc7163f0cd978e99b26034b8f61398c9ccedee6e7dfc78e8dceefdd857a214c60e6d0455260c83d22fe20ae83b SHA512 f52308682ec5f8d0528db18e5bcc6fac8b4c24dd5d05ebcf167aa718a4bf46cfebf71d1af7a0804b077bdbf5defa865ea1ec5f8152441119441782f06d25e1cb
+DIST tree-sitter-css-0.23.0.tar.gz 118618 BLAKE2B f47f345a5892fa98b44466fa667d25dfe3ae5ec6eb974e1a4751bba733a985c1eb2dfc69f974076709c7b3e0f5024fc3ced655a74455b822665c72879abfbb3c SHA512 a78e18bb6036cd9183525671decd45911887db6acf449d4965e20ab1607df616bfa028d5d84a33ba2b87757e16b4c0dd672c8981a53bf286d81b8dc412512725
 EBUILD tree-sitter-css-0.21.0.ebuild 448 BLAKE2B da7858f5295d590bca1921003f245690cdb133bc7163f0cd978e99b26034b8f61398c9ccedee6e7dfc78e8dceefdd857a214c60e6d0455260c83d22fe20ae83b SHA512 f52308682ec5f8d0528db18e5bcc6fac8b4c24dd5d05ebcf167aa718a4bf46cfebf71d1af7a0804b077bdbf5defa865ea1ec5f8152441119441782f06d25e1cb
+EBUILD tree-sitter-css-0.23.0.ebuild 449 BLAKE2B 456406b4c2e937ebc2a72f2e56f80ad337bfa76c64d290adf27a5ceb582ee63bbbbfab283160751c1d50adb490df094c32a05c968b96ee6fe0093e95cb2371f6 SHA512 665a7b92a470875e821f6a8042b3840fbcfa68a5ed4f4e41bf6afea3a259f39aa96e6262505ef5e4606efd4404891c3edc8f7bffc08308b4b80242b3d843c657
 MISC metadata.xml 340 BLAKE2B a2906ecbfa48a374d76ee5b6c93677162f64c1f0657f1cb687b9113ab13248bc1a65db2614b0870ed9361ba9ab77619346b5993ba1ca6d48d69b22f98d860cfb SHA512 f4a51bcd64582a787d5bb7775889d21642391c6d76882a23fdc8ff4d3c4d14170bfa7e809a5c0bfa711dfa4ee3e6fc8db23bc11d6cd3e33b4e1235197fd5aff7
diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.23.0.ebuild
index 632f1a55a2fa..195fe7aaff43 100644
--- a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild
+++ b/dev-libs/tree-sitter-css/tree-sitter-css-0.23.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 PATCHES=(
 	# https://bugs.gentoo.org/928010
diff --git a/dev-libs/tree-sitter-embedded-template/Manifest b/dev-libs/tree-sitter-embedded-template/Manifest
index ae476c631760..d5f409966aa8 100644
--- a/dev-libs/tree-sitter-embedded-template/Manifest
+++ b/dev-libs/tree-sitter-embedded-template/Manifest
@@ -1,5 +1,3 @@
-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 337 BLAKE2B c0572180ea206856cb8a6d5b265cbb6fc0876c9377f039ce6aa369f3c57ec82696b92c52cb96a134fb186d518a5f99e0404d2d4744f29107e53af18dffe0e692 SHA512 c20c72ab784721eb90812ade1240eea20500d8d2b350153e67eb77af45691c0ac5e77ac8f9e9085c140ae16d13b690d877c50eb214460b22f7dd3f0b326d778d
 MISC metadata.xml 467 BLAKE2B 676b20e4e6c3d8c1eb64666e710d83979012d3205d3b78ceea49ca918aad46e0cc36ac821da99896ba07ad14c3b5519f22ec19e90987c120f653d924d044d1e3 SHA512 bddaa653e200851bc4c0d37e5781df36b6418ed712841a9fb50998b43280004c49f58b06c5cc446a19b3b8d0e1bc7a9fc160000dd906ac62dbb46e0899aa442d
diff --git a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
deleted file mode 100644
index e158f8374e1f..000000000000
--- a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Embedded template languages (like ERB, EJS) grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-embedded-template"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index 82f578a25735..a6e4697453ef 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836
 DIST tree-sitter-go-0.21.0.tar.gz 210048 BLAKE2B 3589922c610d6a8f32fb753cb91f2c925a2bd4d63dc5b32cc37bb7723b7b6eb7339135cc2dd1629c6aa42684c4fe376dd1364bd928fc8c48100471203b68b627 SHA512 c12725c85ab6836fc6554edc64bc2f005d62e45c3d69d07811138cd09d29635399f70ba5837ead05f5827a327a1666bb4134475c99e2f8da81bd3412e4946a59
-DIST tree-sitter-go-0.23.0.tar.gz 199905 BLAKE2B efd70e7b4d1b20fa7e10fd9f33eab5cd1459731d307d2a9ce47d320d34870daf6e776f78001c5c663090e73f32368ca312371a1f44a9e6256e465987f5507557 SHA512 d3610a9a55c61244ab5f8ce961abbb7b351b83f94291fb571f7f82af8b5b297d35032a5f778a6de5fb02a56c22c2faca902167698827dbfbd509a55825c9cc07
-EBUILD tree-sitter-go-0.20.0-r1.ebuild 436 BLAKE2B 7d57ae3c83ce1854ec4f83b9cd7ea5d1bd7442684ad69c7479857ee0781f8e457a0b2c0ffba6e9087f13f86c757e32da4c0b605436acc4cda15e64ff782658f8 SHA512 def4723c1ef76c1d4e5847f73d515acac0ab5e5626fb50069e2d9c1ae0d25ead8fb7ed7769e9e4c8e4bce42d842c7830c6fa584355ae176a3282b3728cf0797d
+DIST tree-sitter-go-0.23.1.tar.gz 202860 BLAKE2B 2b23ae0e186bc8e7e1d266cbfa616f5d377bd3f50f26d7a9a5bd4f62fe7a361199d4a5156b319d78f08d35810661076fb5ac56459d62c73f34a383f10b418126 SHA512 843bd5a462105f840f266f4c3250f06c0557fe6a875c886f3dd30ba9f0716f7962ac6a1a900bd340d675a9ed93970970312a68e4597ed3a1f61d9094188d9f07
 EBUILD tree-sitter-go-0.21.0.ebuild 288 BLAKE2B c11c35038ccbe85e1714b21fcabf05c86b11700c1ee7fe736e47dce5dd4fecca0632098b88ee9cdc6627d076e6005332b71246b4df2c14bdf0ae00baada328d8 SHA512 45a567ff581875328a08acabc06fd75f86742830c4e412ad957288ba74a085774b375a0d7201343d7678f2e7a3add45100d56024f8fbde250b160c2371e3993f
-EBUILD tree-sitter-go-0.23.0.ebuild 289 BLAKE2B 9ef68003a4f5686c1ab88ac4f615f4b3f619129fd204f2afd03f24d9036c9935007e6b42122eaa35e9a35fbb348a5c00be75889b540121e70c423c0745c27c7f SHA512 a462042356227d7e11067c65695da83daaa9ba051c5cefeaa8d7d6a94c958b711a3f7dcba9efbd1bc74553d600fe54718442970ef6f2ee133aae7a1aa286e073
+EBUILD tree-sitter-go-0.23.1.ebuild 289 BLAKE2B 9ef68003a4f5686c1ab88ac4f615f4b3f619129fd204f2afd03f24d9036c9935007e6b42122eaa35e9a35fbb348a5c00be75889b540121e70c423c0745c27c7f SHA512 a462042356227d7e11067c65695da83daaa9ba051c5cefeaa8d7d6a94c958b711a3f7dcba9efbd1bc74553d600fe54718442970ef6f2ee133aae7a1aa286e073
 MISC metadata.xml 339 BLAKE2B 9dc9dea694a2bfa94e190710b4e0c049dd95a636c76e32c6ad33046dbb9b2586e95a97b5358d67f800d6bd17e6ffa13463c1d57a186792a4aae8490699f68447 SHA512 395f9551bbb1fb57e6804f3752d3f752222a5b72cdaa7f9ba4b5ebbaaaa7c760189e1e58d104a2619ea49853856d5468c61f7520f434bdc875cb2d0c928a278c
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
deleted file mode 100644
index 1d5e61986362..000000000000
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Go grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-# Override eclass SRC_URI as 0.20.0 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.23.0.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.23.1.ebuild
index 322cb405b4be..322cb405b4be 100644
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.23.0.ebuild
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.23.1.ebuild
diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest
index eac01df73983..cb51ac7bd42d 100644
--- a/dev-libs/tree-sitter-haskell/Manifest
+++ b/dev-libs/tree-sitter-haskell/Manifest
@@ -1,5 +1,5 @@
-DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa
 DIST tree-sitter-haskell-0.15.0.tar.gz 1574593 BLAKE2B 47559f768d3c03da63d74b02aba9cb788a1f20223187d2ba67730b3cf2921036ccf9f3df22d82a958adb1b46022f76f148dd251f7fe0483e482bd877d789a9bf SHA512 22368c46cd6e0652ed717c954b55f582125489a410bfe17027b7d0d0d7854789c342140e4908080ad5bd177e14ded928215daf514b7954bc6a31ab7fa19016f0
-EBUILD tree-sitter-haskell-0.13.0_p20211114.ebuild 341 BLAKE2B 66bd99bcd586a37ad07e854b0c63aeb2ae93f37134ed553f3c3a7b166656b2bd22ede061c31915f0d16282c1e1f26f1a72b11ba04f7076c2a08ba5fe25b37616 SHA512 fcc39d2e6215575cf3d674b9f8b22d4ee7d73bbc59b215292f327752f1db704dbcb4d4cd0f261ea83edb8aee1f3a7df2b7101cf2ab5dd65d7c97c81076fb87b8
+DIST tree-sitter-haskell-0.21.0.tar.gz 1026868 BLAKE2B d8a8759edce95dff41d5e6def0f1324e38c9a7b6e1db80752ca73d4c4a72531cc2201b5235a8ec3b763be7cbfc5e0dd3e09fa09bd3c485cc43eb7e399efaf8d0 SHA512 c1a34bb15553598055306f168504c4e091ed822f9b798fb1fe2a7d9d79ae56a69751379a02f9f59fed6ed514381133d195f83d8f11d3cccc96aca15f34af542d
 EBUILD tree-sitter-haskell-0.15.0.ebuild 291 BLAKE2B 129f0c2e87cb0d58fe946bf2a4c1464a9b96c823df6cb1322d2141b5751c542cb0faae94c951e2080fdf77e90c345b99ae14477bc9aa188a303060dae0c42a73 SHA512 0a9bce4996c6810da8d28641be150a9f8c086526d5ed1760caebccdcad2facf0a740bc31aa32a555f62751f8c44f1c13dd2e94de552ab759614fa1bdd98946f7
+EBUILD tree-sitter-haskell-0.21.0.ebuild 292 BLAKE2B 0d95b7655aa37928bbae83df8ba2640930539070569e46c6d0d9f21b6c1b518759441e5975d4308b0f1293ab874b8c89c28974fb8c6dda8ccc5c7ea73f46f774 SHA512 dc46e5baac26993cd3064fa9e3842de3ff2535c5c218fb3e3870b59f3b270652e81d7e3aae100fd40f290445ef5bf88183e1dd65331cfc0311373aa25b28b5e1
 MISC metadata.xml 457 BLAKE2B 794321b6eab3af4f40ce8b2bb815b1507c6ff959520f38ec99632db475a4601136ed1042741dd74841e6352e60ac3e07d97c1a150eac600dba8fdf08d209f017 SHA512 4e21759114fb9da4adb56f803ef782ffc244cdcd4666afb5eec860e7a63374c630a134d7d3e5cece09f9b51995bbb00e1493f6e201d1b3ae316806317576751f
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.21.0.ebuild
index b025bcb78ec8..f94388adb390 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.21.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-TS_PV="d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02"
-
 inherit tree-sitter-grammar
 
 DESCRIPTION="Haskell grammar for Tree-sitter"
@@ -12,4 +10,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 6bcf8872d37e..da37a22314bc 100644
--- a/dev-libs/tree-sitter-html/Manifest
+++ b/dev-libs/tree-sitter-html/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-html-0.19.0.tar.gz 18785 BLAKE2B 40a2f8a1b4d9943ed15003073e8499fb58aea00979359f793c30c4e7d431905620c20f8e77286a56dbc040642081effa61a7ed9fdd3d61d44bfadfb327793ed1 SHA512 7816e5f4e74c7a64a4fb715000123f5350dc3c6ebfbf5d71ea6dd660cd58a7b4327413ef3e8efa8c177c7308f43bb8b4d60fddbcf518a99841148a37aba95b71
-DIST tree-sitter-html-0.20.2.tar.gz 28880 BLAKE2B 0c17bb4a29174535cc0789221b631889122bc89e9a3883d53501acadade7723bafd15aae8373fb9c6135c0fea485202ea68ec45a855e21c2d7b7eda3fe0e0c58 SHA512 4ebdc4cdff525e54d774bde6b53ced5d8d0e2fea5cd54f006c39354544752856c520ce7b53eb268b6ef60185236102b8003b5de389fdb85454126b6ee689bb61
 DIST tree-sitter-html-0.20.3.tar.gz 45084 BLAKE2B fca267fca9ddfb0651b1e596f422d9093852e0b06391f192f9b525df379048d2e74fab472bd4ecfb0fa229ff34546d648a644bfc3f746e8ecb24ad8b4558419c SHA512 572cbdeca6c57d8fc389b8736acfb6a4ac2b3bd8704445ca7a006d75e0a3c37faa9abd75ead54d586e25b5550f72324c407271b451dd5ed94fafb09e8a6ad352
-DIST tree-sitter-html-0.20.4.tar.gz 45091 BLAKE2B 7b5bcbf4616472e3b035b26ebddcb54c9f3b209cf7ee184978b971d20663cb4d614083565ef4cb5aefc2e6bb8dd8ce51be672e611d232ffb40b3b8a4d62dd000 SHA512 33aeebace2e353af43710635a3fceac7cae89c70ff3f4c665df9175bb12d0639d1d75908b865da4bf6a576ef2daba0678b995c97be1968d912fc5c3c417aa364
-EBUILD tree-sitter-html-0.19.0.ebuild 285 BLAKE2B 1e2c597c71a61952f705f0ffcf18f27c6cea6dda0bf565a7d9dcfe1be588cf420acec17d94c47b06df638333c63a2aa00e6526fe0d4b49c9fa7ff52278b9f45c SHA512 6cf983fdc8a38b4b4c824dfdab7ac832f6e4e782aa66572dbb2d42f94cda6cc23fc1f44dc1a912fb2828f4b3d19ae53ae568f76ab7e1b5416621e053c0d7dd8d
-EBUILD tree-sitter-html-0.20.2.ebuild 285 BLAKE2B dc3f2ca9db90bcedbfc96856199a3c29c92a54eeeb4e03aea14bbf45fc5575db8cb016bfaa524f8cba143d317327ba1ec8c4c9f2acd80542def92580c1492172 SHA512 b654e8aae1c8de913a5ad5d947e1e94945c1ea63b56bacbaae61aeee7212f2290d3bdf45d059db40fc7b735beb3b309ae1a2f4fc204303287cf822a101ecff3c
+DIST tree-sitter-html-0.23.0.tar.gz 48671 BLAKE2B 2cb04036ec9c69a93a90e79eabbb7cf684d94c5c8bd6db8124ec54d2040acbf94b787e146d38902fa865851b1d7ce33d1510b036bb4e88180d29a498930d9719 SHA512 6ddbe3cf5c978f3a525c04fa82029eab522dee86b088375e3062ecaa70c2a9920b22c4e1021ca55c180c160919180c36f7e961acda3c8e7ea867214eb161f19a
 EBUILD tree-sitter-html-0.20.3.ebuild 378 BLAKE2B 3473cb786b04e3016d29f83909bb2f3d10d0d2db836150f4f2cee49fc2335bc5b4ae7bc89306ead6f8366e0dbcad57150ea13bc702586d4276374e9f18603d7c SHA512 0e829453bbdf7388b65cdb72fef3c74eaf6283b7f478dd553f1aaf9239fe861dfa428e78fcd11e18d178d00ac5a1899397ac6c6e28a9c440a791e6602a3d93d0
-EBUILD tree-sitter-html-0.20.4.ebuild 385 BLAKE2B 479b9e456d3e3d28ef70764d70838a062c3b54174f6bf161bac0dd6895beea90d09d07c559c411aefb1965d18a21b263811277681e1a0ad79327c9008e6604fc SHA512 9d29acec662dd02eefcc2b64a5de691ce621537eeca3e2b37dfb23d49b9638fa02aaef5f253387b999196512eb436c68c03c80c2a5aaec978b28711e9f69af36
+EBUILD tree-sitter-html-0.23.0.ebuild 391 BLAKE2B fbc1058343bffc5bdec9ba75233a8686bf526e3b90730dbc8886f7c120cba57592c8461f556e4d6bdf453dd411c14a02e50a11718b2269242cf4e2e48d65f867 SHA512 db4427b7493e2e6bfc3cf0125b46f7e7ec13ba7f7cab79ce3e6e5262eac1cb304037a4b189823e72b922ceae80364e53a79bee68164bffe8dec6377e03508670
 MISC metadata.xml 341 BLAKE2B 6c53dd005637c277649ecf2ba32e0407b0996a5cd5d8e08b5d9224611759d0b41d15d92aefc21626d2b22ea3f543c12b230be8d6761e2a13994518a4b279ed3c SHA512 f0d2b7d43a5c60bd9b2c0e53eac71dbd4911d6a328f9004323ed6b07b1c1ee8abaf8786a7a9b89ee3e605bed7aa11ec6fd396dc3d731f4d0f8844f31531d3f0c
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
deleted file mode 100644
index 6a8921210e57..000000000000
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="HTML grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild
deleted file mode 100644
index 55a42a78b64c..000000000000
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="HTML grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.4.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.23.0.ebuild
index c0e50d23f099..09d198cb3b8a 100644
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.4.ebuild
+++ b/dev-libs/tree-sitter-html/tree-sitter-html-0.23.0.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index 61489d44930b..2ccfb0b644b5 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,5 +1,5 @@
-DIST tree-sitter-java-0.20.2.tar.gz 200727 BLAKE2B 03c9b805ad94b852fc9e02f1e266cae9010636cd33ffd2a7f3da1076843aced2358f95022476476edd0b201efb87b164f31bdd610654f182cc627fd762c39cb8 SHA512 188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c
 DIST tree-sitter-java-0.21.0.tar.gz 218672 BLAKE2B 8138dbfdb76aebd1067be3a6c97543c71d601b3b5475e14b050251e163a0f1fff97003505ef4c3f997b34f588470acd5e46df70e54afead8dc2f80b020cb41a3 SHA512 236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9
-EBUILD tree-sitter-java-0.20.2.ebuild 285 BLAKE2B f3056e1066f06069884cd76ce85d244822689108cc4a4fc3cda88d12ac088f4be69fe7b1d7bbd32609f6933b37ee708d3889dd26e763e82c87a37eca77ebc58a SHA512 014ce7de05f5a508b1d3ae459b359e3409fbb2fb01b95f987c4a414f5a11e4642800e148ac5192904b73fde40ca20a7dd326dff0a274972cc6157036f6ab05e9
+DIST tree-sitter-java-0.23.2.tar.gz 212482 BLAKE2B 78beabf585033b1de42e4d85c1be802e5918d6885dcc3028be38662ef16acebbf0a3fc7c7f9b94ac314691e7b17244bbbbfaeedd5bfa8081c351a0240f11e6af SHA512 745dac6b5c6512777d3dc8f8652f967461e0a5354e18318851ff9e37d934552c6fd528a617fd795f201e3e4e2c8cd1eee1fb86efce2e0bcadceeda200c6d0c78
 EBUILD tree-sitter-java-0.21.0.ebuild 285 BLAKE2B f3056e1066f06069884cd76ce85d244822689108cc4a4fc3cda88d12ac088f4be69fe7b1d7bbd32609f6933b37ee708d3889dd26e763e82c87a37eca77ebc58a SHA512 014ce7de05f5a508b1d3ae459b359e3409fbb2fb01b95f987c4a414f5a11e4642800e148ac5192904b73fde40ca20a7dd326dff0a274972cc6157036f6ab05e9
+EBUILD tree-sitter-java-0.23.2.ebuild 286 BLAKE2B 844246381114db6780cb5d1f6f2983c2a30cf37aae1d65213e74c833c9c930cc40759770d6bb77704f60f0aad44bd40f6837b6887a5b3f735ea7dc67860057a3 SHA512 39fe6bff5bfcaa40f974956afa2413d42c1e95923650f36809d3d6186bf272c2fa78a2e364bfd861b2de9952e378d338f567507ab1edeb5b200afe1ac7081817
 MISC metadata.xml 454 BLAKE2B 031dd7990d34e3ca58e95ef9e23d18cf68109c60634103b1608b91036d05ebc2a72261fdf0d09eb0020d66eb39c7ef01e348f2787a866e747cf407ba093aea3c SHA512 7e4d17292fbac109f4216192250c4305cd93dd7a797ac65967a4c0ed179a0d4496a897f5bfd59e843e631e2e1a6c6daece4fadb3b6e8efd12f90a2f59e0988c7
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.2.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.23.2.ebuild
index 21de8dbc5b4e..e09c03cd7396 100644
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.2.ebuild
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.23.2.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 13fc659348eb..c09f93bbb70c 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
-DIST tree-sitter-javascript-0.20.4.tar.gz 396452 BLAKE2B b33c4c44fb59985af7809ef9bd015d12dac185999993570164de4ac87a60cde28cf4c1232a06dd3e312ce256f2b021ef5fa500fd9e0772a3fb657f74256500a4 SHA512 65171e5af35c9c5cc9a6c54792d2194b197e130ec277b35e67e04b654082bcb1b98cb9bbe497bbe1dde69f582e5cdca01cba4f40682b7b587fd19e89b88f3dd6
 DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6
-DIST tree-sitter-javascript-0.21.4.tar.gz 286293 BLAKE2B 4194597de857f36c6be0f352bf344de1d36892b0de5aebbe04ddee54fa14b031b27ba5d2e065c41b9317f4cf399785e6dc4af4a618cbb9da0488994135d8e94d SHA512 bdc8f5102147a609547ae9be4836af3452ff4e929bad6128c8126d017e911b263d20fe860983eb8fb85703c3e31d9b8326e92d8778daa8e8bc26bf4540e46ced
-EBUILD tree-sitter-javascript-0.20.1-r1.ebuild 445 BLAKE2B db27d411dbee91e8ce15ca9d093ed7d197dafa0161af52faf6599dccb4307c0a0298bc7a7fb4b69feeea9fafec95588d6f237dc02e9fccf6a8618e968a0b4eb2 SHA512 18f36b40a18ce2ee7863de12fc58522eab2e0066a5aff8d0f67feb8ed6d788fc52df3d3d97407efbb9c9cfd2c707eb8a206e65126516d7cd544e6fe94719a793
-EBUILD tree-sitter-javascript-0.20.4.ebuild 297 BLAKE2B b5ccacb5d2b7c59368102b9e50a75277ae897a3ddb835b7734a706f5515a3deedb3a5a44e0363880e3dc71095853214ba54d6289afed46c7fecb94a30195a4d5 SHA512 aea64eb736afa5aa2e93438ec885821c8a683d976cf4ac5bc6abe90f543f8cd3cd18c6dfe0f37f47c0bfe308b483402c510bfe17f2432357ba5dba5e619510ce
+DIST tree-sitter-javascript-0.23.0.tar.gz 292398 BLAKE2B 6826656b359484a9d4edaf6ad4911002c74a6bc2735c38d1e6fc548ce95d45ef0e1add93d95c2b50a4d73f154d54470d14ca2c4ee8ca3cb47242426658d439ea SHA512 fd116f00a694b18f67143df57b80ce29547c5bebc64e02b11f5a2d0c1c01347b68a963830e5bad837856fab1437faddd14c09f63733b52cf00d44825451ca110
 EBUILD tree-sitter-javascript-0.21.0.ebuild 390 BLAKE2B 7bf81484a3cedcc5b24da66e30fd56313c3e2eb3058cd89621fe49a113a534cc4ceab1d6fcd2dad9c62ad9a4f41290653e86e753eefdc4ae82a74a6dab3864c2 SHA512 dbc23991b07a8b5a148af9f04f4b54f1755c3033903340c6f9c33da26f9a65c5b7987c7a2c91319180aab4c9ae048ba778789f1aeb84595110a45454bfbad351
-EBUILD tree-sitter-javascript-0.21.4.ebuild 397 BLAKE2B f6cbd33013b044c5b7bc2d0bb5b1b23d4aeae651fbe657050af78955f11103294eb9c0c03bd9b1f42e07f6d4e79994a3e0f48c6b6e87a5e7a153e3969318215a SHA512 2f9d25e8d9a311f5ac745d46948ac2f11936f0cc4d6f24c0138b4eea7700751729039f76f58bb9e52fc68387abdd4e8847b0a1443025a5ab70aa44b144b5ccab
+EBUILD tree-sitter-javascript-0.23.0.ebuild 403 BLAKE2B c3b42350de226730638bffd440e7e266fd84caf438060a2303fd4a84605898609949da7104156cc1236472d289ac0eb768b9f1a1fd637fc8e699633ed0acf441 SHA512 c11531b1d9bcb1ede5a93fc007f846e942b62806dfa0e9a6315696b67cee28c352b926205f84013b13809bb9e4246c48b559d47068da32a40b01b8e215bdd5aa
 MISC metadata.xml 347 BLAKE2B 7ccb60b46c03a8303d0b1a83e5c0da4140c670c2896c57f681a13e177252030b08cd8fe6cbf34a909e26b4cd948a14d17e020a9b3550ab3e5d2bc7e1bb8c893e SHA512 56d779a607b31e820075c5369e63a32a5d5740ddac678429eb60b4062de82d1a36fd86828024e247ae01aafc45467984f12cf857f2b866635c35645304168d66
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
deleted file mode 100644
index e1d5ee9003fe..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Override eclass SRC_URI as 0.20.1 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild
deleted file mode 100644
index ec9248a60d3d..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.4.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.23.0.ebuild
index 290a7110ab3c..79446ab32826 100644
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.4.ebuild
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.23.0.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest
index 4823292eeefc..02c2f3a0cd17 100644
--- a/dev-libs/tree-sitter-json/Manifest
+++ b/dev-libs/tree-sitter-json/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6
-DIST tree-sitter-json-0.20.1.tar.gz 15576 BLAKE2B d6b9d3c931453440c2557814184b629640e4a0dd9b763ba8aec51aeb8322b021d0bfd8e4385445ef527100f67db507d3c934480457a7a5ed60a2d035fda44f13 SHA512 30ae91cec4c9e63acfd2bd0c62b313d48a50ec722ff5c793b8b51910a02a9c6f8697a866ec7bbde3c7f14b2bdcfc12be3650d7a8e6f23fde80527cc235a3768e
-DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5
 DIST tree-sitter-json-0.21.0.tar.gz 34737 BLAKE2B 104229cd039b41fb79ccdab3b30e0e59a96a3aa46c060bf50cc093acfe4510150ad5caaf39f49045d478d9f67f863ff6289ba7ab59aaa27871ebb77ffc66a453 SHA512 37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2
-EBUILD tree-sitter-json-0.19.0.ebuild 285 BLAKE2B 719f9d13482f8ce44d19c71d1affc34d502152d8269db5a2f74a87f4c36f9be8bae473e6607f0a0e781b19b690a6039317c7a53e7a112f1f4438c263607d492b SHA512 4fce073ad4671b74f9644fdb0753beef5696d530433de49a728cb02b3c152befad08cfb1504332e0697ef3039675c2ad52397b81badcca182627e232f7abe6f2
-EBUILD tree-sitter-json-0.20.1.ebuild 292 BLAKE2B 9a66a6c3c9f89107abdaee3446d4e5970833ef50279ab41cfd7235ecdf492f075dd6ee0b493a332355644f2d26c8c59190d82418db42ba466765b100b558ad13 SHA512 2c4ef9e87b4b666917f95ac05f1cc4cdc88094ca9f828a55a8b09215657b4c4ae6fbf00d163ddaf7b971353eed27169b1f036b6c13ac93a0100deb7594ac52fc
-EBUILD tree-sitter-json-0.20.2.ebuild 292 BLAKE2B 9a66a6c3c9f89107abdaee3446d4e5970833ef50279ab41cfd7235ecdf492f075dd6ee0b493a332355644f2d26c8c59190d82418db42ba466765b100b558ad13 SHA512 2c4ef9e87b4b666917f95ac05f1cc4cdc88094ca9f828a55a8b09215657b4c4ae6fbf00d163ddaf7b971353eed27169b1f036b6c13ac93a0100deb7594ac52fc
+DIST tree-sitter-json-0.23.0.tar.gz 38503 BLAKE2B 5b196d82e7b1d10fd65e106a14754c04c64e9486ff97015d8f39028099c2ac609a8ca0dd353b88aae9945332ad672896629082c78a20041f77a57995d2c3f2b4 SHA512 eca9fad305306762b6095fac0e20915300760fbd45bb86d224bf8e6efa3c207418ab9cffa59bbfbb6018e5d1a8d9a2262b82a5687c261c1dfbf573a5e2d4df58
 EBUILD tree-sitter-json-0.21.0.ebuild 378 BLAKE2B 16e3150f36612be80fdee8b8016ccbe88c6ab8d72aaa9686e644c955c016050809f500a6943daf08ced55eeb30213c853b35b2f524b10a28557bb4143a396e27 SHA512 67a6b00d800a40e0a69c4d243d12f2198f38d4cc061239e7b40df3b884f264b20b67e6de59cb7a3ef79cadfeb311748c21af59c70026fe025bcbe74732cc14c6
+EBUILD tree-sitter-json-0.23.0.ebuild 391 BLAKE2B 923ed000f1154fe704d7b672945499a0c8fa616f2358ce03509c42d291762f60628d17011833b303f3addead5bf0cbb9b592231691d6c738d3d159a9356d6db6 SHA512 9f605f5304c59435e908a6ad680cf4dd44c033404d440075b9f18f4ac3cfc46fef61adae9ecebb1eca50886738ea026e7b3f016a59ac5a97613662c47cc13b79
 MISC metadata.xml 341 BLAKE2B 463a6e33220f59efd176484881442aabbf41357bd1e723b05ff3d0bae44f87ee6687e283d3080c0e95e46ad6ab0bd6799d33906d1e160b0ff155e35c0e1d9e34 SHA512 43753d864de59af1764b58dc69f94e91b0ef46f38a0b4ab8d8313f828598f2dc4a3156a3f330d4b2e293f1915fb63cf4c4dd54a5319114b4afc3824eb556494f
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
deleted file mode 100644
index 6e3dc239628c..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild
deleted file mode 100644
index bc7df5806d4d..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.1.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.23.0.ebuild
index bc7df5806d4d..75d5e2c77ce7 100644
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.1.ebuild
+++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.23.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+TS_BINDINGS=( python )
+
 inherit tree-sitter-grammar
 
 DESCRIPTION="JSON grammar for Tree-sitter"
@@ -10,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index 71b092c35142..654faceddbed 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -1,7 +1,3 @@
-DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a
-DIST tree-sitter-julia-0.20.0.tar.gz 4032821 BLAKE2B eac1ec80509c8dfb75a68f507a615eaf69366e42fdf2ff9a74fb7acc8281f55fa5ba45cd4a1b050e5277614a14b5bd39145115c74de83ffb7669701ed709c04d SHA512 173e990ba6353e8b3f124fb3b1e1e5c281882d7fd6f7d53b3f40304db0f5361c0220017af51dbc569ddc2debf494ae8325877fc3c5de60239da942299a054b3d
 DIST tree-sitter-julia-0.22.0.tar.gz 2792109 BLAKE2B d661b9d84b9d1903d7fae9e4073fcc1fd52030e7a264929cf6eb3aa33745cc51c094beb6e4ddcfd11725989fc82a5e21b20a66b01bc60c8f06c522f732bcff6a SHA512 9687875f641eb0f599a15a5c9ced0a873c81a2d6ad36528f2c29120126a92ca5d6a51c97f736c1c1e46cd8af32e7c5739c694b0372fa62ca840f39f0fbd6a387
-EBUILD tree-sitter-julia-0.19.0.ebuild 287 BLAKE2B 764e14d71f85527f67daf0c4de9169f9c2fc564b6dbbc3c1017f3aa7e9eedfa33c3d89be49eecead18c22d2248680add12625512992762b3913f9dda0a901e2a SHA512 3f3a119aa3508193dc4fc0b6d9ffb2b27f1d4b2e87bdc20d95d93ea649da0457c0343045b1312613e853f5dfd0c658e5763b73a521022c78db5be0136b0f6758
-EBUILD tree-sitter-julia-0.20.0.ebuild 287 BLAKE2B c96a852746642c569b725dbcf67e3a08b788a1b173a9c7ed6c0581ecce0d9428d3ef57b07f22685f1c434225ef4825d53b71a086d59fc7801edff0587d36d1d5 SHA512 018cc7f804854ca347b22fb48d43630bb50d797bef379c91ef312520ab5312c8d33b3b67e1ed0f2aa601be2e5bf9a59e8a083c4c7f8530ac986eadcd45ef12ad
 EBUILD tree-sitter-julia-0.22.0.ebuild 287 BLAKE2B c96a852746642c569b725dbcf67e3a08b788a1b173a9c7ed6c0581ecce0d9428d3ef57b07f22685f1c434225ef4825d53b71a086d59fc7801edff0587d36d1d5 SHA512 018cc7f804854ca347b22fb48d43630bb50d797bef379c91ef312520ab5312c8d33b3b67e1ed0f2aa601be2e5bf9a59e8a083c4c7f8530ac986eadcd45ef12ad
 MISC metadata.xml 455 BLAKE2B 676a32b8ebda870753628532dc311d20c5ea54c544d24e7600611d9d69b9e541d0caa2c164dc8eeee12519fae4e607809cb4da5db48ef647ac6065ed5e10fa5a SHA512 23e5e6af7fd8e1b1a1c96153e26ece1f2670bba9d5500d4ecea21f969f3924f90e133adf32d0166a801ac01189eb56eeff8343ae9d2d732349382b4894f53719
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
deleted file mode 100644
index a98d5d0a3b62..000000000000
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Julia grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.ebuild
deleted file mode 100644
index bdfad03a9860..000000000000
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Julia grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-meta/Manifest b/dev-libs/tree-sitter-meta/Manifest
index 697b1225c39e..0f449e81cb91 100644
--- a/dev-libs/tree-sitter-meta/Manifest
+++ b/dev-libs/tree-sitter-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD tree-sitter-meta-1-r4.ebuild 1033 BLAKE2B ed41e052327127433e517e5d52c2775ac07c5cb43734caa64a177ba8d8d8b68ca0aae5afa5f0833ff7ec026adbcd4e6c629e0dbe0f0b5a21c4ba9b6054345266 SHA512 685a74e92735b761ed4cc3adbe77162f852cbcbb9fbf72c8c3c923f84771e1c2fbeae3833064b016216d28cf3d08950765569868a09a60a3e818d0db8a20ece2
 EBUILD tree-sitter-meta-1-r5.ebuild 1237 BLAKE2B 1a151af2f74abe4dbd108ea13ade0238d997a0f68d90a316a15d6ee2ccce0c6eee57539894d77db9728f3b6d5008623fafc2739d1ea5b2bc00327c016ac42491 SHA512 ba7b0ae176a990a16e219881355c78b55a9c4f63fb9022a996218f3d2c30cbd68e4b5fa4d5fea817db4f04099282c19db7c2dc5d52d8b8e4b097096f2d8f197a
 MISC metadata.xml 508 BLAKE2B 935d790802211e592e00a391343476f99c2416e2958e9b045119add71f8fb7f1dec445bfeafe991de8c8467e7cfe5e54ca873c8451161db0456bbe22120a06fb SHA512 1ebb19ad3f3968badabcf8cc182b3a616e02327ae74072b5610bbe105f9d2830c467c433f3c09415afddad85ac1aef094581b6b07f7fcc08a2bc7d27daa028d4
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.ebuild
deleted file mode 100644
index 7f7a837988eb..000000000000
--- a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Metapackage for Tree Sitter packages"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/tree-sitter
-	dev-libs/tree-sitter-bash
-	dev-libs/tree-sitter-c
-	dev-libs/tree-sitter-cmake
-	dev-libs/tree-sitter-cpp
-	dev-libs/tree-sitter-c-sharp
-	dev-libs/tree-sitter-css
-	dev-libs/tree-sitter-embedded-template
-	dev-libs/tree-sitter-gleam
-	dev-libs/tree-sitter-go
-	dev-libs/tree-sitter-haskell
-	dev-libs/tree-sitter-html
-	dev-libs/tree-sitter-java
-	dev-libs/tree-sitter-javascript
-	dev-libs/tree-sitter-jsdoc
-	dev-libs/tree-sitter-json
-	dev-libs/tree-sitter-julia
-	dev-libs/tree-sitter-ocaml
-	dev-libs/tree-sitter-php
-	dev-libs/tree-sitter-python
-	dev-libs/tree-sitter-ql
-	dev-libs/tree-sitter-regex
-	dev-libs/tree-sitter-ruby
-	dev-libs/tree-sitter-rust
-	dev-libs/tree-sitter-scala
-	dev-libs/tree-sitter-tsq
-	dev-libs/tree-sitter-typescript
-"
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
index 73f0c3433f1b..60968abadd2f 100644
--- a/dev-libs/tree-sitter-ocaml/Manifest
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -1,7 +1,3 @@
-DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
-DIST tree-sitter-ocaml-0.20.1.tar.gz 1509589 BLAKE2B 965980ce37b27bde9771308eeabe5117bc7997f3a5429e9774eeb885b81199e5d8ebc471bc5cd10d3e15e2cbcffdf6f887f0623b61c3595deca06492d22c78a8 SHA512 c3a070367ddce3186ea09c705f4c08279f0fbf890669ce6486eef5b9564ea2c3a88041b3227ac9210fdb9257d4971697e6ceebea672fe37e7fce038cd9a09838
 DIST tree-sitter-ocaml-0.20.4.tar.gz 2849217 BLAKE2B e96ffaa2bd72b849f215a9d843fc8b27003917878a32eb5471a3ee4547a931a5dd4b991872d913f514d6519b9bf78b7b57bc501c89f360265a36abb695ed229d SHA512 517f1bf1ff989be4c0853eae20f3c7bc51ef3f68bce1a850d80c6ba150cccac820b6ead00c45e53acb2dd06e9b2e7646dda219353ffdad16be3329f2bd33593c
-EBUILD tree-sitter-ocaml-0.19.0.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
-EBUILD tree-sitter-ocaml-0.20.1.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
 EBUILD tree-sitter-ocaml-0.20.4.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
 MISC metadata.xml 455 BLAKE2B bd6f69bf0d97d17f42f6862cd16cd56985b57e705d1984885ab7f3669510e3edddf8c32a77661c01722833782d7e9bca0c30b8d159f1929f9a34ce616f40c0b6 SHA512 ac36f44f364a4f0046aa1bb864ad81219eddada256e4b6e08354ec91ce11f633de0954332453b85ce13a5d0159240b535e1eb006a423ead61c836aba27fc9b09
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
deleted file mode 100644
index afc9708cb318..000000000000
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="OCaml grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
deleted file mode 100644
index afc9708cb318..000000000000
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="OCaml grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 4bd18647a135..ad75cca2943e 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-php-0.20.0.tar.gz 290518 BLAKE2B 5ba7dabf79665ceb2be737906493bf774e51a0233a62bdb89d84a6a9204745a99679322e047a9115d95e92c3dbb34c5da591497223bb580522b587bedc933d10 SHA512 0ce3e8b2a7cb26b8fa2210e2ac8b133c0ea8450b7504f93422a7baa0ee6f5217c72b9ce0cbdc5ac1e85deb2ab08fc6b968e74f124dce13ebfb8ad9b0af2afb8f
-DIST tree-sitter-php-0.22.2.tar.gz 541599 BLAKE2B 5e98d7d9226900c16b8681ec408bafb6a4c4c281fa0d97b3b9c06b58657f69166df6700ecd127406efff430c0f79a56ff08cc45ca48b483ecd6579cfe7263a05 SHA512 0592d145f92f9f93524b5d6b341b8141234784c03d9e0384311cd735f4b8216e0dd3d5ff27daef6127d3a079b16043b3957e7fd0f8759e90924539bb42f4f306
-DIST tree-sitter-php-0.22.4.tar.gz 555466 BLAKE2B c95870d3079053cf8ff0ce07ce3019a4c33712f1be21734ddf52b9c47f2721387c4c024c4e53855c7449cff386fd46924a5fccf149437a06263e732378e8b0d7 SHA512 5baf5f454769407789ad2e84065088da2aa4a404ac518ba77078d421c38a08a622884c6c6a8e2e77d38c441de36d6e778a5073cb575fe649ab92e9f7420a32b3
 DIST tree-sitter-php-0.22.5.tar.gz 553995 BLAKE2B 63d786c34d5629181dd3a32a3f76a4fcb0c82f2c104e080e35f6f8241dcb6c35cb782510f0b09d7ef0dae295879675ee3e0a82557dd1ed4271b20aaff14079b9 SHA512 ad8492e9e371d21aa00f0a0cfa3f704042661d7f96e736dbcd44b8a1f738d9de2eed14d5be4c7fdfdea9a82256339f5e0b03bdc3f77cb185dd6c660aa8a394df
-EBUILD tree-sitter-php-0.20.0.ebuild 283 BLAKE2B 18f47a9336e24639c5a4041aa31ed0eabadba61ae9e617e05441b4490a877ee3f4315ac9211cacf13a9e99e7749711b5b385b4b5411680bd5ecdabad9f7ebc7f SHA512 69cb5ea6c7cc0987d1ccef4539b798ca90334c25a17e8973bccbcc80483f0c061187220c3c85997e96a1aa4894daa5199e49d0ecc49c3e1bafdaaf694c74a469
-EBUILD tree-sitter-php-0.22.2.ebuild 307 BLAKE2B a7c616c24d4231e3f9270a455e5583fa8020bbf6c8c7b88f48b91ccc6dfbb0a43f45d94891f3ae714fbce7ef5bc039d16d0548f0a5731e02a878849b8fe99bb7 SHA512 69a963c34d0f89a86a63c2cee7ee1f94f6eb451ae9e892fa09b0d2e6bc864afefe6fb055d33d27326fb4927bd355f7954138a7b24e1b2438a2c3629df541a573
-EBUILD tree-sitter-php-0.22.4.ebuild 307 BLAKE2B a7c616c24d4231e3f9270a455e5583fa8020bbf6c8c7b88f48b91ccc6dfbb0a43f45d94891f3ae714fbce7ef5bc039d16d0548f0a5731e02a878849b8fe99bb7 SHA512 69a963c34d0f89a86a63c2cee7ee1f94f6eb451ae9e892fa09b0d2e6bc864afefe6fb055d33d27326fb4927bd355f7954138a7b24e1b2438a2c3629df541a573
+DIST tree-sitter-php-0.23.2.tar.gz 580616 BLAKE2B b8055ee6b2a5104d4b4a00c45d702cb8d6479cc32c3e195c47ee8d16543f0234df703a4c33687af9a076bd10eca4166a20e16fbe44b1dba9ec45b80fb1a36275 SHA512 ed8c8fddeb6a8f5304cd7419af67a41c94f5d2ad6ee259428eb34109e8afc54a41b1076cfaabe93d311cbc53c82048b98737281816058e6be02077d086f84fe5
 EBUILD tree-sitter-php-0.22.5.ebuild 307 BLAKE2B a7c616c24d4231e3f9270a455e5583fa8020bbf6c8c7b88f48b91ccc6dfbb0a43f45d94891f3ae714fbce7ef5bc039d16d0548f0a5731e02a878849b8fe99bb7 SHA512 69a963c34d0f89a86a63c2cee7ee1f94f6eb451ae9e892fa09b0d2e6bc864afefe6fb055d33d27326fb4927bd355f7954138a7b24e1b2438a2c3629df541a573
+EBUILD tree-sitter-php-0.23.2.ebuild 308 BLAKE2B e218d14f0453ce7f4435094806d82c499e3434b27479cab67f2fa7ec1120f1eae7c58426766e4a7afc31969e92ced3a47d95d75e23f755c9224888a8e0a07c90 SHA512 85ac60f1cd94db9d3221263f22a02dde1a9c4e355f6338b6ce32a1d2fd68c3935569851ad768f11cb5232db444d4e98d64501edd66d5cf1182bd2c587450b7a0
 MISC metadata.xml 340 BLAKE2B e675d30a1059e7529f8fbb59734b3d9e607a7241597d2630647061a2b830a2ea82984d2ab3612a42935f7182d73432c66580475335e78c645438a03f3cab9f10 SHA512 247d85ee81240a6196b9087a610c9ec325ffecef70d4e23ffdb2d81d4e79548eafbef6e97b3bb543d123f09b86fd27936925f4f1548b21dcf613804fccd10f0c
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild
deleted file mode 100644
index e331a8f2ea6c..000000000000
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
deleted file mode 100644
index 75450e8ef333..000000000000
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
-S="${WORKDIR}"/${P}/php
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.23.2.ebuild
index 75450e8ef333..13dc08afbb50 100644
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.23.2.ebuild
@@ -11,4 +11,4 @@ S="${WORKDIR}"/${P}/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 620e1b0dac58..a49e2b1ad490 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,9 +1,5 @@
-DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
-DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
 DIST tree-sitter-python-0.21.0.tar.gz 275770 BLAKE2B c595476144931fbb08c404fd72d981ad8170333fcbec98cb4b7637932860dea3967abee712ce6afe1c6454ca02cd67e6c84e969ca0b5f593d6822ec1ee623afe SHA512 02410d235473a3e9a108b7820f146cdf8df5794814ff1e2ce8ccac1e38a727fa3e133bcac6718ade2a0d0f0965e879bb3cb9652d1d30f738969f458add53dc50
-DIST tree-sitter-python-0.23.0.tar.gz 268006 BLAKE2B a237a68f32c8353e8155eecfce0d4276b0f6e7f529e3ce5ece304c082c38cde0514cf60422126499f5a8215ce67693fc4fc6e8e2915259769812ec9b7e4c7feb SHA512 a7fcd36e2c9dd5e62a476342c89437f23ec3fbca234361c5c1eb86ebf142acbfabdea86db35aebd0e806b22c38fc5379d55b6167edf56a40541bb17a83f12b3e
-EBUILD tree-sitter-python-0.20.0.ebuild 313 BLAKE2B 7daef9f803f6abf6261a2f5887c035485e581b26d054742676a5003e04ec090b1f0c98783c11fb160ac9e65b5dad1ef8c3a72dbb7e3157145e9cd5401208f749 SHA512 bfd8e60b322d9c49b2c6f0d124ae1f4cc4dd71d594fe8a3f04bcaa88906f0a7d1c8adb58876475237dd28e7df8e8600bc69f9475edebb516e964edcdce62d3f4
-EBUILD tree-sitter-python-0.20.4.ebuild 313 BLAKE2B e1b33ca7ea816e0da8151840451a11e5ba6f62c70ef31ca4b274b9e22f20246f08916787adab77feaec9507d66454f7213932bc9df26e4915cdbd8958cce902a SHA512 186a2485768e9034dfafc7471b702347ba2aadf8f3a47906a79552640feae5689b63fcdf61d12905b418de7860669deb836e8dc5d8f61759c48e56caa44f8eb7
+DIST tree-sitter-python-0.23.2.tar.gz 266482 BLAKE2B 1f91086f2ba5ab98eaac262745a7cd9d9965bb5fdc5e585cf1ce35e175eecd1ad0a462395351c1a5bfd82e89a09af469f217acdef0f69ac27d2748ec62ead831 SHA512 784e1157de886044bf0e3bfae1a12bc5fefc0316ca2e7d5cafef4c9cbdff7f2e6c376b838e0319dbb45eb51661bb9d30b8f8feba5b8575bd40858a3cdd6e58de
 EBUILD tree-sitter-python-0.21.0-r1.ebuild 382 BLAKE2B de9dd7f977255d2f9cb22d792ce448a4b3f46a5e23b6e3f692d199508246a98415ebebe15594a3b38c5f9a058b7e5134105d0fdbbb2e545af9902deb2dd85678 SHA512 cdac204563731283f498f4e49148558b1a52aece5db8ee7dabeef29ab46096dd1e3386bd1e5a2fe5dfce8ecd52d7d7ea21df0be91c2075076c2c537b919b730c
-EBUILD tree-sitter-python-0.23.0.ebuild 389 BLAKE2B 1db1cd93a0be9f763799f59d676e6c21ff462750d326939de238645b76dd5e15643fc1be26b074db5e2f326578f240d32d7caf9868a5d9b8e909887ebeabe34e SHA512 73f58fb7c74814fe6f6521d611618d659d37b5ed628b9d4fdf32e34ab208228c51ec5f95de0f42d784df25b2982243587f8ff1c6ad461da15b7558dd3cf5d832
+EBUILD tree-sitter-python-0.23.2.ebuild 395 BLAKE2B ab2ea8bbd213a6a231029b85f4707148f079f5941f3419110f31a22e4961f18bee7b239e09b427676bad5e821cf3e47ca18bf7c64158cba968e2772b92bae472 SHA512 717f9be110d76cf3c33263f2f2a57c6474e13206628bc24209915969386a59c3225a0c1a3330d2bae95fec651d190894d82c3c4fee1e331106a3475c3fa27443
 MISC metadata.xml 456 BLAKE2B adf2e4be8b502eae133f17ab38ef77448d3391d3d85b1b8246cf7ae029b846e62eea48d5390e54f43a7cd20b9831b75bd01728dbb005ab4d06b719e2e53b45d1 SHA512 3b2f5470323fb9dd300ee911c120e727726e0a882af1018e0a944eec504c7bee16c38774232dc98522b11ff68b1cb1dc373188d2bad3d6503c9ecc5a91568c6f
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
deleted file mode 100644
index 57ccd11b1fcc..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.ebuild
deleted file mode 100644
index 5cec91fee1f7..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.23.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.23.2.ebuild
index f17247cf0020..a1824f941b83 100644
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.23.0.ebuild
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.23.2.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-query/Manifest b/dev-libs/tree-sitter-query/Manifest
index a51ada0e3b3a..ee4aa75cd206 100644
--- a/dev-libs/tree-sitter-query/Manifest
+++ b/dev-libs/tree-sitter-query/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-query-0.3.0.tar.gz 43274 BLAKE2B 59bf626d2a90c4f4296424a0858f99dd482c5ff730b1564d78eb462d155cc8265cbcd7eb0f64b16794b4e35cbf37ca12a20602ec82b679268fc323211f57c08b SHA512 aa7ae99da889c707ec8d0369cf832f407cebde3795cddeb942e3159e4a15f0e7978f0a2ff5d0c0a71f34b0c98e2cdac551e571a14a206acbda0fa035cc29c85a
 DIST tree-sitter-query-0.4.0.tar.gz 42944 BLAKE2B f323ae7a7443dd7deffd08c54e36e542578405ae93a4b028705dd36b33b6fe4e78a519ea6cfc1495fc7c3c89f83105d8b6d47f69ab98176223d4564acd831048 SHA512 e5c771c9e519b2cf3ecf99a5708d2389d63366183d877ad2ddd396ab5cde1b4a2e57837924da3f32fd050bd70f20e2445fbd414b0f82b0a8ce112f8466cbccca
-EBUILD tree-sitter-query-0.3.0.ebuild 438 BLAKE2B ec521fbb542762779e5c00a710e41db8e528aebb434737ca1beefe419fe08fc69345397e04de5ce22a3d70f0024eaf284ef5f53fa58c4d9352aa9ebac8a68b98 SHA512 cd990080ea6fad1fa2eb25dc14af4a14be4d8205e27d085fbb7f77af9a9738c2dc54fdceb3b565c0e28caa00fce745dfa09bd96f4853022b1ec3e02a3ec257d8
 EBUILD tree-sitter-query-0.4.0.ebuild 473 BLAKE2B cd637b9bdb5e9734a51acec732f1978dfe9c9029fad5a45fa86415c904d66c23f5ba675754b40f5d543ddf76d5c0b389f296d0b735d7557c6a69efdbb3fcdb93 SHA512 67027b877a62fc4bdea8b5e211694e623f55b205051137526a79a1f48d40e40eb77c42e5b04fbe7d6ee29f725f084ef27b5617d472db6576dce12d147f9b3fc1
 MISC metadata.xml 611 BLAKE2B e5d5c40c9cc01fd5e408da22b7b3ab7f880baaa9dae0b0e5a1f4dda1acb1b81d3942ed82fbb301e6f3ae6d9cd0fc397871cdbfb50c3d378e39e934b90ae85cae SHA512 1ed3c117382872cfb6805431466853d84dca62d1d55e26faf0656731d0395f9b09039674dda4acefd132a81850bddeaa9230eda1917010b7aaff8f1ba8ee7e0b
diff --git a/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.ebuild b/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.ebuild
deleted file mode 100644
index 50cac920993c..000000000000
--- a/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Tree-sitter query grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter-grammars/tree-sitter-query"
-SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-regex/Manifest b/dev-libs/tree-sitter-regex/Manifest
index 273eda02918b..ccdbd2afeda5 100644
--- a/dev-libs/tree-sitter-regex/Manifest
+++ b/dev-libs/tree-sitter-regex/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-regex-0.19.0.tar.gz 17452 BLAKE2B a1a4db494b685c9e4df3dba790b8d4938d604c02c419c040d783aa11093fb1d988f807d002b798ff53e6b64f294df6b24b6774642bb331ad0dc2a9a61f2ad88c SHA512 d2ecc9637f7e130b16103b375592e449f3b58afcce7d284e269ba7a20e96ca5d6c118a8c99819e7c9d0f8d4ceeb139ba493fcf6e001da25610a70030db599991
 DIST tree-sitter-regex-0.20.0.tar.gz 20283 BLAKE2B b5c71d9956736c913d995631e3051ff20594b059d5fd736d57ce3ae29499b9dc41127f25fd88f7d9c81702e74383157554eb418f8aad88d6e8f46ae4b9f2a6d3 SHA512 35c8e51539ae8135f7a3ef7c3b5c736e0ef7dfcaf7a97417c0228e47fb2500833e1e585805dfe7a4552b5ddd2cc6bba394aee34845cf419f467747ab10f94988
 DIST tree-sitter-regex-0.21.0.tar.gz 42108 BLAKE2B 3407ffdcaef634044889d3ed9354ea029a917d939915b15fa0902b20f97459f98b45c9bccf3bced16f78440dbb9863fcf9b283fc8578a4e5c00339f40e9bf16c SHA512 cd4c7e754dd9a6cfb001f2770f9103cac06ac4938118041037e48d0a924768350930b1d936fadb06c966fbd5b47c4bff2311c21b9e29e57d79d101da755f0383
-EBUILD tree-sitter-regex-0.19.0.ebuild 302 BLAKE2B f4e626c555ae7c2d6d3fefe59edb743043fc9eef0bfe3abeca925922a4578204461f094bb7ec46debeba97b9f7e065b68f2fb230a84e899c7a4919676f1d186a SHA512 5bf9fbe04ff1e795109567b91e6b9ee22a15567c3d8e27ba2c3622ce4b9defb3ae5be7e726d90e56ecc42a165a994625ac53b1435512cda69ca6100fff76b8b1
 EBUILD tree-sitter-regex-0.20.0.ebuild 308 BLAKE2B 8520058b6da0e24f3f0e151284972214147a6587701c0a926c9747b3672c9ada2f7d529bf81699114306c487f5966ae3165cd58d9540a9ac63399e2df15ebfc9 SHA512 d87e2e09e4bf6dca270d4a063fbd443e154842e2c9c20e95c5355174a7b35c4b419c419852f63b05741ce6c661b6578c69ccc7c75357cdd83550894ce08826b6
 EBUILD tree-sitter-regex-0.21.0.ebuild 309 BLAKE2B e0703d0da90a67bf94f38120c6afb410d1ee182382285e28d44885cd61815458cec2235a232558837553ff68c79445f23b0d0db1c78a992355d839dd44b8c3ff SHA512 b81ed4aeaa1f434ef9bcb814dee9c4489d8baae276f02dd94758f01174c3782947a6018bae32c058b91672e4fe4d7cb2c3a683f8a55a362382e5829b169e73d2
 MISC metadata.xml 455 BLAKE2B c5bf25b88bb237a349e83d3f88934c805f4c97ee8cf691d3a9d0c10e4570f5de38cd596d7263678254ed9cf2c6a0a61b50fd79a0621a9e9e7a5085ca0153334a SHA512 ff45f6ddf29e6b129f98376ed4677c8cd25c693e25bb18e538332f9e24f449fd51867acd05475e9c387fb3d79259bd384e3272eb94e40c69d3732e7cd34901e8
diff --git a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
deleted file mode 100644
index 8c5c1cd0a4e6..000000000000
--- a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Regular Expressions grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-regex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index b2412025180d..254099f4d5b4 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-ruby-0.20.0_pre20221101.tar.gz 575761 BLAKE2B 17daf39dfd812ab0993cd2a3ad728603d629c2e177261fa60d237a1dfd504b2a087611824cdffb03e95c0b304d9f6991ccf36aad1f18db4aa3177c082c6e275e SHA512 ff6eb4a28e5313cbdebca0f939d209d7c15016fef4ed864e64ce2e6f30023e15a88483c5bc90673fcee42df75c6e003b69fc2e5f81b72ecf1a506c836eebeba4
-DIST tree-sitter-ruby-0.20.1.tar.gz 601038 BLAKE2B 29174a74a96f0b93d803eb9455ae1ceb7e4ca78be215c062ca341485c19f595a29cafe7c9ee75b95239045497e8d4695648c3ab1503d96039ec7c5a3c64c9883 SHA512 96d68cb7c557d341def9cbb9a51ecf12b7572bb46b9588bd3dab6f2598b6ce73df2fbbae8f0aa08737b34bda55e98eff8499921ea68f7389a7237fa32f62793b
 DIST tree-sitter-ruby-0.21.0.tar.gz 618006 BLAKE2B d296dd901e426642383594f9bd45cabb8cff3193b5e83ab17f5c199e954b912da4b398ff57337b9439780bff7565bd4b396cf5bba69587e4714d5563fbcebb02 SHA512 d8f2059f60dde221466b1428bca11aa815129c9247789ba7de79f837050225687699cd9a3316e3bd8b1f28da339b68a4f73c5765710c238d88a213521297e604
-EBUILD tree-sitter-ruby-0.20.0_pre20221101.ebuild 522 BLAKE2B 184d0aa99d2ae86b8abd2b2206fc279c01495f9e49267b64559e7d2bedf88ccd9173bbd846984c2fe8add00e0b1f89a1c102febfe7439a9b58d28f0838e1c7d7 SHA512 da273e117a0fee8ed52c99143923abb72225cf8c29b7d03aac502cd731ba0e012cabd2fbaf34542ccf3cab410a946126c5648201808b5a48f573bc5b0ce83231
-EBUILD tree-sitter-ruby-0.20.1.ebuild 519 BLAKE2B 7da9ce5b28666db759e146e1d0abf319d541589e340a24b93ef0e4b3e90623cda3152c55b67a4480cfc3413a21763958d631d32b54b5438f67951de9f2e07a3c SHA512 dd86775a200cacd4df0d6deb36fdae5b79c6715b2804c01100ac352106012934f8580aa63dedc573931dda21dbf9cd5ed652dcfdc6044b4e29e265609187092b
+DIST tree-sitter-ruby-0.23.0.tar.gz 627423 BLAKE2B 6da63076e0f0652c2be9173bfaab8010e69bf119157a6376b9bf1c12bffef1e5f4435fe955b72b7036b5c00fede09c61ea7949ade210a39466cae862136042d2 SHA512 bd6a0d72613e923ce262519f32524ae79abf7d8e66a8877ea7c1e21e0056d65fb28255b62ecd78f86081d2e71f6142efa1a851bc9107af359b65a71d536c2516
 EBUILD tree-sitter-ruby-0.21.0.ebuild 309 BLAKE2B ac784a7d2205c1e5258536a4d0702b0b1134a14a21a77ac577a536c62d16f4755653f995cf1f3ea5f9f09204aa438cb34927c008bcac75ca4bdf6257342eb0fe SHA512 aedeb1148359da6694153e5a03ccefa3b059a6867e213c6438b9f9c5749fdfe79ba1f1f3ba2479b72a7f4cbbf713dd95588e636409e4ddc9f3d27cc35493098d
+EBUILD tree-sitter-ruby-0.23.0.ebuild 310 BLAKE2B 4f15dd23d3452816c7be532f10a56930cbbf4df44e6baef1b1fc85bdb9bb231dfe4f41c620ff3d6d1bae279cb8ed695298dc902f1b57b1b8cf2811ffba6da710 SHA512 3138846fea611e5f7853d4ebd6b7e3e2623a0d71af727f3ff40735f57663041d9b830f52124457418baa97cf5670b04209c6a781e9e89b3434303e5079eb2b33
 MISC metadata.xml 454 BLAKE2B 46f685ed106b6ce4f859cb7c73a9136949c231da93db7894caecbe16c15d78ff72b220779b2eb2e44ceb5379714b8c8917599fc7812ebca5801a5a91d98feeb4 SHA512 9f415cf157db35083c55d0afec0af666bbe2b0b3e4486fed9659cb916a89d586090e3cdcbc3e86a5e164215b8813ffe4bc1675726097a45fd58f8689f8c2a530
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
deleted file mode 100644
index c0e7e24609c7..000000000000
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# https://github.com/tree-sitter/tree-sitter-ruby/issues/232
-MY_COMMIT=c91960320d0f337bdd48308a8ad5500bd2616979
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Ruby grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild
deleted file mode 100644
index ef5a0db4369b..000000000000
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Ruby grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Highlight tests failing in upstream ci too. The parser works, and
-# we do not currently install the highlight queries.
-#
-# https://bugs.gentoo.org/923987
-# https://github.com/tree-sitter/tree-sitter-ruby/issues/253
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.23.0.ebuild
index 7acbae161e6d..ee3d1223746f 100644
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.23.0.ebuild
@@ -7,9 +7,9 @@ TS_BINDINGS=( python )
 
 inherit tree-sitter-grammar
 
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
+DESCRIPTION="Ruby grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index 86170f4d75b2..e35c1e40a8c6 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,11 +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
-DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
-DIST tree-sitter-rust-0.21.0.tar.gz 448170 BLAKE2B ecf13ff1358a64383feaa973332be7ff7d7551c414fef9bb3773f1ca975db97f6e0e6076ea572094771c25c59641a58aeec70c41fea65533b59fc436fd143938 SHA512 f9cd32e43b544a18eddfc0b6f8210f1fbc3e7a5d6e9b72c482a536df1e215ceadb41545a65f0c6fc791f6063adbe51957d4e20f7c8fa07a5079a4338a0351bf3
 DIST tree-sitter-rust-0.21.2.tar.gz 433742 BLAKE2B d929baa23ef85bdf0b22ea1878699ef8b788ce43ebba93552f473fb695502d6e8bde5f378ef053702ecfaba2e859143d093f3f7b46e302160212eee89f6cbac6 SHA512 304b232683ded9973a94ec872401151a5900e3423c7bff966b3f5ec4a71122405fb3790f71f5fb445b8af72a31176349cb3ea8bc7d1b1a042ee574420472e19e
-EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
-EBUILD tree-sitter-rust-0.20.3.ebuild 285 BLAKE2B ab14276d41be429383d5bd7991339b42a4cddaba5f092b5b6e38e610b2bf3a3f1f93c7d2e2dcfcd625224a125f8dce14ad2e8db285c6a7e18ecee1fc3d7af41e SHA512 7e210db8e4834c21cf1600691a534234c513564ff0a5d459aff9994548d0dd20409bc8e5a203117226249021262a2d1d876c058a647c5a6c99c1f3b7dd2be125
-EBUILD tree-sitter-rust-0.20.4.ebuild 292 BLAKE2B 6d64269dd86995fc6b4b59f51af2b2e490fc77091a706f1b496d7db18e63ac62bdddefee7ed3a36fe41c8fa3c047923d4b39029d40cdf127b5ddde713f393b6e SHA512 98675c8a77ec97392626ecfa1c7ad36167e257f9e4941268f187d28b31d21e546fc15a77b56485df1c9f44c61acec9660bf15609d98d8aeff9466d6bf6e89bf1
-EBUILD tree-sitter-rust-0.21.0.ebuild 316 BLAKE2B 0def3279f955501e0e9869e616337dedc35dbf792df42dab4c35458b8f5a9286b48dfe0df2ef2385f5629581cd6206c53279425ce204c3532381b059d7661002 SHA512 7a146210afcff000a4fb7a475baa28d91de162e18681f7baedd8b9d579321ba1228e05e186c0b1c4d352bdbcf0d253c5054a644c03ba9493d4728f201786429a
+DIST tree-sitter-rust-0.23.0.tar.gz 434858 BLAKE2B 05dd1878652ce9bbef5e4c5bb252b6bf1a55005e39042d9297cd070e6bff24c034b4ba61cd2645e44794ef01f3fb893b935d50f6754908c4a3a540af1cd90ed4 SHA512 2f683ea8c4c194c7dbdd1a1e78343ae908175d403c2cf2fd4d6ab318f7383a8fcb5760f6ae55ed7ed2123a93f4cf93912c759f2d39eb7d75c3e54cd89390c91a
 EBUILD tree-sitter-rust-0.21.2.ebuild 378 BLAKE2B 94e8fab3ca52f9907538694718baa3daeb839c1b85c3ef9a154e69b2c18b76e1895d03cd3e699252ab6ce7081ae32e868ac22d1cb43285fe0b05194a5cfc82e9 SHA512 8f44dd173fa7ecb89c9c5eacccdaca0c0cc250c3709dea1af8dcbb152321234f8c51a254f25183cd374de0253133abb2040537eeccbe0411add80063d5c1d285
+EBUILD tree-sitter-rust-0.23.0.ebuild 391 BLAKE2B a40ec989e20c4b88cb9cb3684bdb12ec678671fbc22d89a6c2e4543b2873693eca8c15b34e9693209e9b620d091fdf0cfaf0545a55264fbd27f468e8195aae19 SHA512 8c84817b6938f92909642ec601117a5bd8cf8c43144edb45e5c91caf1ce35571673b6a7087c6c3640d5e5987ce0fcf13bd479cb8b60d1418b2a120d52ff5c576
 MISC metadata.xml 454 BLAKE2B df4600703910499937c219b24c9cff15d08277d6e88253c31ff1a2ab42f52e0e20654cdea17696f2f05194276e8255900b24af6143fa8a7b206604405784e49d SHA512 d67191b96b3a146610dcb62dd037e9ab3b85933a788ecd23c8cba02fc53e7c87cf0d47bdcaf3893931bee3723d50983567941ccdb1885cc12fa8018cc0937244
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
deleted file mode 100644
index 36fca638c421..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
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
deleted file mode 100644
index 7c4fec4db433..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.ebuild
deleted file mode 100644
index 91e3f0de8370..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.23.0.ebuild
index e602dda97d5d..4277cfc5dd1d 100644
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.23.0.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-scala/Manifest b/dev-libs/tree-sitter-scala/Manifest
index d37008124800..68b978a51072 100644
--- a/dev-libs/tree-sitter-scala/Manifest
+++ b/dev-libs/tree-sitter-scala/Manifest
@@ -1,5 +1,5 @@
-DIST tree-sitter-scala-0.20.2.tar.gz 1305216 BLAKE2B 6fdfd74975f60794ca27b986250fdbb196b08892d48aca4fe034e8d2f9a18c1244538e03bd6f5618372ffdba64299c8431ce2bdf95d27578fa262c75516163b1 SHA512 7dba7733c126877c26a4da82420cd6fe8bb933d7694dfbc7a64a9195b33014ab6fd74de6a659ed79eb48dd46767874611713dbad8cea1e7b2fc13a124e7e4e38
 DIST tree-sitter-scala-0.21.0.tar.gz 1339069 BLAKE2B ae3406b49da3c7d349b0689b1f6d1ef037f5c6e5326016b64abef00174da0b1fe489579939150bd065fa82546a5782c04232ac144eb596855b59e263afe72ed0 SHA512 4d76e496c68993babe3c11315d6ce2c2a15cf576f55197358d718b0d16d1ee2c7e498ee45f793729b03faef7f35b8dbbe4d3692e4255f9aedb9ef69d49cdb189
-EBUILD tree-sitter-scala-0.20.2.ebuild 287 BLAKE2B 66ef777ec8256ef0032a6fdd4eb171eae8667d202affeffdafd6be910b5b17f9f7b40a73f2e1e6c20dc2dfc14062a7d45bcd1373bb7eefb3dfb2c918eb9ede20 SHA512 b5fdf9e35810d6189b1a68545a5c3b673360301a4edc9fd2c7e5c0d3d0f196a7db0ae4dc47b713c0871f9389800ec78bd0598d873e8238be7fe089c14913fae6
+DIST tree-sitter-scala-0.23.0.tar.gz 1240380 BLAKE2B cbe0774baf0fb46a50bce4f49d0506ea8d5c1d7454c116935937a213e6e2496a56815bbadb7465d74ac8a43ace6e3d97a9b5d8d3cebcf99935083316a2e33c16 SHA512 e47263a8c77108ea348ef8d4d0d34cf37330df2c54471f98767dc085f8839836662bcbe2b9495fbce8ff21e75845c88e4c9cc8496aa016c351af00fc0607b520
 EBUILD tree-sitter-scala-0.21.0.ebuild 287 BLAKE2B 66ef777ec8256ef0032a6fdd4eb171eae8667d202affeffdafd6be910b5b17f9f7b40a73f2e1e6c20dc2dfc14062a7d45bcd1373bb7eefb3dfb2c918eb9ede20 SHA512 b5fdf9e35810d6189b1a68545a5c3b673360301a4edc9fd2c7e5c0d3d0f196a7db0ae4dc47b713c0871f9389800ec78bd0598d873e8238be7fe089c14913fae6
+EBUILD tree-sitter-scala-0.23.0.ebuild 399 BLAKE2B dfd43e74c9976353be76503e83a25b987941470de72187e62f09d9a393da76d040f0526690fc8bbac74e395921c846ed66ee8a5a66329ae7de5bc33540a40e4a SHA512 e1a2fc9df0ea0d17714a940114487984333e1a413f685db4a11e8bc7e9cd649a8fd9053c2794e24044a0b2397847f3ef5f8115474718960b2b83e336cd8d2fd4
 MISC metadata.xml 342 BLAKE2B de444582ed5c254117430d3daff6fa94fcc4ab6c5bb1b9267524f7cc74051afd4466f4363c746d4a908ce839e6d60c762d7556cda179524b26cb58fc59cfba7c SHA512 76c0ba3d74603eb1dfa04ecbbc57fd117cc3628b0c94be2dcca8c075ef5300cf6a4d61455b3a5b5b0e0cc5777c1185750ccdba0ea95dbd040b64abd9bd11c3f3
diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.20.2.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.0.ebuild
index d19d0d446e2d..847f1680606f 100644
--- a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.20.2.ebuild
+++ b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.0.ebuild
@@ -10,4 +10,11 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+
+	# Fix incorrect paths
+	sed -i -e 's:queries/scala:queries/:' package.json || die
+}
diff --git a/dev-libs/tree-sitter-tsx/Manifest b/dev-libs/tree-sitter-tsx/Manifest
index 6a7b47bbcee5..2cda4ea59a98 100644
--- a/dev-libs/tree-sitter-tsx/Manifest
+++ b/dev-libs/tree-sitter-tsx/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-tsx-0.20.6.tar.gz 1564217 BLAKE2B bc4d26bd8e4e9ca14ddf4b175cc2a2e7a81dac67e114a6e01f59ff55c5ecd63a0a359e03d78928aa965363e9c4db154a9b1917cf3aafce9fdaca3a58d60bfcc1 SHA512 f30f38aa269302eee5f738422626187111c14c7ba07982d619b200a58a20a08849f8a0e79358cad331d689afd5ab389a88b246bda30031ae354f93433e85b763
 DIST tree-sitter-tsx-0.21.1.tar.gz 1566667 BLAKE2B c6c24a60b97c092189dc54ceb12b75ee28085eb7f2cdd38673b7107db1fb57e6282e7a5254a26f6bd352195a23da43d3a36df756ef78c959e037f9e696a02f4f SHA512 8768b8bd17d90b26de4bc20c3aae34141eec87ace0a4de3a6c39ee9654954fe4ec0d6ef829edddd48ccced5e4f92e3e886870f6bdc50b6ebe6ca568d980b5f97
-DIST tree-sitter-tsx-0.21.2.tar.gz 1057030 BLAKE2B bbb16ab56123e6fa7bded8db8a5b076cd7a291578fb6f9437538c7132fbe3a01ca7ea5c01c8cf9d87f74a72c5512696d90fb1f5e8553b90fac7dcebf748d002e SHA512 8c1ea600da6b34054f486554d82982f62802a5d6f050a0001632a84c51c0e544554ddafed48e09af4cae1b77def11a7a77fd3a9bc191db40daf9a89e88e5c2e7
-EBUILD tree-sitter-tsx-0.20.6.ebuild 564 BLAKE2B f0c6f93e55985591260e89c965bfe26dbb9e1930a36f9d9a1ffa6759a41f6866ebd2bd99e497a9dc7d2c426d8b00b52883f9f5823add3b36c80cf3602f2f14d5 SHA512 0dc5406c6c5251cea56132a3ce96640f3413a4df25e5b6b0226e23eb75d2c5813d5bfc9e9af2669b9838ad69f3c3ec13392097a09c0f5163254da33c5afa573d
+DIST tree-sitter-tsx-0.23.0.tar.gz 1028628 BLAKE2B 3a849d1a9ece7c1246ae8e43727faecd5fc7a4cf61d6570fd05740b8a0c91fe3cf84d0ca0d4336693bfa9915036b0d54bd470a61db13b6e2da7551595165c7e6 SHA512 5ce5c7cf70c40027ac957a47756896fbdc3936593471d959459860a750fe8d47877f4d8be21140edcd49d9daa4fe715af15545ace5dabf3d2b399d380172d37f
 EBUILD tree-sitter-tsx-0.21.1.ebuild 563 BLAKE2B 35089a2d062df63c07799d1b3145c9bd98a96b615d3188f60cb2eeec2aef7cca47902ce192ab5471471155cca3e3d810eab42530caa33c404106518118ee915f SHA512 4e0968fd737c4148c12384b034cf6d70ced8ee8c026a13af297e7cf3de77e3d4a1d0d7ba69eb203b239f85f83f554f1eaefe86266ac8e1c6d852cafb91f365ab
-EBUILD tree-sitter-tsx-0.21.2.ebuild 564 BLAKE2B f0c6f93e55985591260e89c965bfe26dbb9e1930a36f9d9a1ffa6759a41f6866ebd2bd99e497a9dc7d2c426d8b00b52883f9f5823add3b36c80cf3602f2f14d5 SHA512 0dc5406c6c5251cea56132a3ce96640f3413a4df25e5b6b0226e23eb75d2c5813d5bfc9e9af2669b9838ad69f3c3ec13392097a09c0f5163254da33c5afa573d
+EBUILD tree-sitter-tsx-0.23.0.ebuild 564 BLAKE2B f0c6f93e55985591260e89c965bfe26dbb9e1930a36f9d9a1ffa6759a41f6866ebd2bd99e497a9dc7d2c426d8b00b52883f9f5823add3b36c80cf3602f2f14d5 SHA512 0dc5406c6c5251cea56132a3ce96640f3413a4df25e5b6b0226e23eb75d2c5813d5bfc9e9af2669b9838ad69f3c3ec13392097a09c0f5163254da33c5afa573d
 MISC metadata.xml 456 BLAKE2B d685987fbe092282fc76b01da5c6d0b5bf4e83359ffd09df9d5f1676a3ccfff8b6bb23b6889cb4b454326755bf5eb5fd34ffb6e3212a24e3c633267f2711b843 SHA512 411f31e7f58127fa31164b9fefcf72fe456b1f432287707ee7bb89060c29147c8f355d81fe81bd81f74e193bbe9a3c9a0fd13f6deabc551134396ea34a780861
diff --git a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.ebuild b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.ebuild
deleted file mode 100644
index 0eb1d05722cb..000000000000
--- a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-MY_P=${P/tsx/typescript}
-MY_PN=${PN/tsx/typescript}
-
-DESCRIPTION="TSX grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-SRC_URI="https://github.com/tree-sitter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}/tsx
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_prepare() {
-	# fix test corpus path
-	ln -s ../common test || die
-
-	tree-sitter-grammar_src_prepare
-}
diff --git a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.20.6.ebuild b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.23.0.ebuild
index 0eb1d05722cb..0eb1d05722cb 100644
--- a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.20.6.ebuild
+++ b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.23.0.ebuild
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index d224c55b9580..ac6366109542 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-typescript-0.20.3.tar.gz 843881 BLAKE2B a8b01a6fef435ac089ff716be400e6f55b89256a0b170cef3d6103eeca301f076d909180db61534dcf58bcf703d607871193f0a517d34398d81131c6dcb0e977 SHA512 6dacfe3d329acfbc80dd798bc900798cf3bad06441ece0964adb51117876b8c54be7d88303deb3abf139d7241b60d45c458a66f6079a149c010a3cd55581065b
-DIST tree-sitter-typescript-0.20.5.tar.gz 1556573 BLAKE2B ae4d71cc8e4745a3b6899f3f28fb31f0d31b0b1f749a73485b5f0b9e81257bde1b3338650e72e7c0082386cabb3b04bfc6bf8a603305aa8fa44c1e08e3843aab SHA512 5b0f9b5725766069d1535e39f3a4658b5200a2a33c3b4881f4876b741a6c13f9140429b73621949e2bd1e06ab0ee147893fffcd3c5349df337eb923a649b8867
 DIST tree-sitter-typescript-0.20.6.tar.gz 1564217 BLAKE2B bc4d26bd8e4e9ca14ddf4b175cc2a2e7a81dac67e114a6e01f59ff55c5ecd63a0a359e03d78928aa965363e9c4db154a9b1917cf3aafce9fdaca3a58d60bfcc1 SHA512 f30f38aa269302eee5f738422626187111c14c7ba07982d619b200a58a20a08849f8a0e79358cad331d689afd5ab389a88b246bda30031ae354f93433e85b763
-EBUILD tree-sitter-typescript-0.20.3.ebuild 328 BLAKE2B 01d9ff54b43b4cd657a314a2a05391a4de2c4edcbb9d83bfeb0e80bb5b56609db61a75b35fe5821c685e4ff93ffd2bcfb1adda9b1b0919aa4d4033ac2d6491e2 SHA512 e02b7e6633aea88bd36b8572d1fb338e98b37305192e39e51a892e6b8a45554d823dfe07e98c964d46da8fb622a7f77fe029d103578986c0f1534ed560634894
-EBUILD tree-sitter-typescript-0.20.5.ebuild 329 BLAKE2B 6a90eae0930c5633cb889012474daab79a05d202983739074fb0ca1786684362ddeedbab74e127baaead89ac431a66291f4650cb0805aeec15279659130a1241 SHA512 ed5f14e64d2b0372f6c79a84732d57c310ae43ab59ab613d6ac6c8795aeb969451f2e4b6ccf804c4c28dcb5a6696781e986089ddc7f5a73aa00488ff6713cb8e
+DIST tree-sitter-typescript-0.23.0.tar.gz 1028628 BLAKE2B 3a849d1a9ece7c1246ae8e43727faecd5fc7a4cf61d6570fd05740b8a0c91fe3cf84d0ca0d4336693bfa9915036b0d54bd470a61db13b6e2da7551595165c7e6 SHA512 5ce5c7cf70c40027ac957a47756896fbdc3936593471d959459860a750fe8d47877f4d8be21140edcd49d9daa4fe715af15545ace5dabf3d2b399d380172d37f
 EBUILD tree-sitter-typescript-0.20.6.ebuild 434 BLAKE2B b0a741c38f1e03c8d8d0b96a76dc3650daa1d90a2d6b656e1c8e9d32e68de82bd269bde1ade7b8e292c25bdcc6d88bef9b8e1067d609b39897168e059b1cbb3e SHA512 6e7392790b37b9cf1a7bfd5cb3ab65c5446a07708000d9987259469b58ccc3245042447ee2b8e59249a175d3f8e13f4540a7102492bad562db7102ac37ab10da
+EBUILD tree-sitter-typescript-0.23.0.ebuild 435 BLAKE2B d9fd36193512a0b30fec0be1d2afc25354c89fbf1ccdc1e0d4c178f2c8ae34018666c7997a8d129d9345ae0af0149c1d9f41cca03d93cc379e7012317887b6d9 SHA512 9fc85aea68d9ea24ac5a5f50294007dac7c02a0469f5fefa342135cdfff7a3ef7756c1f258a3caed28d5b65f1e226ed3c6d24f55c892e222de1177487eb817b7
 MISC metadata.xml 347 BLAKE2B 55f3f6cba43678982d03cb7d741949ce540fb0c2dc67ca4ca6929e8d0c8be726ac8c1bbee87e67507c33b1ed490a923832fe6203474c209d14c8707b45b1113a SHA512 63c8ebb5ab81a650f3a9f7958febb84016b1b166657e43984afe9610e367ffe1c3f35238775a8c81bceb7fa0dee30159e8812135e6ee2c0f29b807cf55624d93
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
deleted file mode 100644
index 3826613aff5d..000000000000
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="TypeScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${P}/typescript
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.23.0.ebuild
index 3ab5b3028d0d..ac1c2721a6f8 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.23.0.ebuild
@@ -12,3 +12,10 @@ S="${WORKDIR}"/${P}/typescript
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+
+src_prepare() {
+	# fix test corpus path
+	ln -s ../common test || die
+
+	tree-sitter-grammar_src_prepare
+}
diff --git a/dev-libs/tree-sitter-vimdoc/Manifest b/dev-libs/tree-sitter-vimdoc/Manifest
index 72c7b9492822..2bb3e9c9d515 100644
--- a/dev-libs/tree-sitter-vimdoc/Manifest
+++ b/dev-libs/tree-sitter-vimdoc/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-vimdoc-2.5.1.tar.gz 57430 BLAKE2B a493b738744d198d36932cbcdd7a7ec3d5ea379eac175ded9541e830e0bb3dd68bf545715d65cb096a13c54d561fe04a8a7d37d1fae00a5245d734f3467445a7 SHA512 26d4f2c88709914947e855df96f17366bd04d1a10356e2f5b093135498210dad831015bbd4e251d32fd31c1e90af829e6941ee8e9243ec13517b1f17e4a89962
 DIST tree-sitter-vimdoc-3.0.0.tar.gz 58110 BLAKE2B 21713b7c75e988be0c92f181dc33bd4616346a618f11d34a90e26b39c0a6fd7b97f18154982fb41287258fbe436522e04753f9f19d6e61cdc9405057ae247142 SHA512 2305127de360a34f10706002793ffc52d220b950105dcb1d54afa1f291e86be7a9188390de9b92a1edc8083a8d270a9e8b641b15b43e161f29c1117f93589763
-EBUILD tree-sitter-vimdoc-2.5.1.ebuild 401 BLAKE2B 036788d7f1db65c072c58423ee2cd62f670543d6002554e3df8fc939b61c137b7d2747a0b8067d09ebfe4af80bbccbc26978174fe18f554c66a653f832ca43ca SHA512 647c84b0d774caeeef116e0e00286fa7aa7b4757fea798d5ec669a0148ca1b7e0eb5f129ccc16e02faf2c1cd917fa387d91c4ac1b4340479b57d62f5a38221e3
 EBUILD tree-sitter-vimdoc-3.0.0.ebuild 436 BLAKE2B b20fd5f87d22bd8002e6abea751e5df43200af16b3c23504cee0a5ddeae93b5a3f612bb5493bd1211e739d07708ebe442b622d0430551b355aa7933ad541b151 SHA512 ba4afed76552bc1337c31c42a7384df578860a858e421b54c1ca77b1f9c0f01d07c510d3a77155f0142a7ac8e04844680a789c382ebf40d3f59bad9fcff04735
 MISC metadata.xml 612 BLAKE2B 128f25e94c5fe81fd54795203d856162886137c9b1f99c14ef8316baa702a2650adf77b7fa55ea192dfab66e67869f8a67ba57e41444f0990180a615f4f1f9d2 SHA512 3bd322f19f7ac179abf97a85925fc8a92a1090751677623b2395289646c521c6cece08683847c7e3dfa7cb6dae166c5b4b6803fd7b662db36d04f76a110e949a
diff --git a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.ebuild b/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.ebuild
deleted file mode 100644
index 80b5c046b96a..000000000000
--- a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Vimdoc grammar for Tree-sitter"
-HOMEPAGE="https://github.com/neovim/tree-sitter-vimdoc"
-SRC_URI="https://github.com/neovim/tree-sitter-vimdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index c7006f8d402d..8599a9561f33 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,12 +1,6 @@
 AUX tree-sitter-0.22.2-no-static.patch 952 BLAKE2B f961ad07850be8c7a7535eac82e234aa236ee7499d2a6e2ea5ee23636bb92f78017b29e74a3ae452f0a4f13611838a5ed4d1b397b1410749264f7e80715d8ac6 SHA512 7d06011b5f5068eb94891d9e116a5d6a3d3023fae999a9766cc19309ae2a4a33d4722074d313efcd87231794ef79d18907e468299da7de4fc4edaacbb9cbc9eb
-DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856
-DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
-DIST tree-sitter-0.22.5.tar.gz 3035094 BLAKE2B f54b16e2421ad68fd34b5bada767010be4224652f5a138f7afcdbc15ebaae98dfe3cc8ac77e5e8e5ab12cef516464d29e38a23fc895fa966d5a03a9569fa5ffc SHA512 cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c
 DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a
 DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f0bdb17c5fde796d8d65f8bc84a6e054d86c18a42e66e8effef865f95013c38ff6bd6ab5498a680ae172d7d57020604e SHA512 ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9
-EBUILD tree-sitter-0.22.2.ebuild 1142 BLAKE2B e42075b38192191fccf183543de4b502b074c09bdac20c050823f43bdacf130b6bb55681f6ff30eaab2b6f4aa682a36ff9340bcfb202ac90d37ca0faf8e06ded SHA512 8e4b1ba04249d49d972cf775b319ab48ffbb83bdcd15ec90cee536578669c8dbb6c3c0919ddad52e40f90f35d98bca39c062cb3d05be6b14120e73b0c22a3adb
-EBUILD tree-sitter-0.22.4-r1.ebuild 1167 BLAKE2B 0c741d26c7ddea422b5a5a5a94606e6b0c6450f1e7b8d3dd59bb8e685f8cc83606969ff519b7668e64f4acb4dee8f33e15b73d4b3cfd98c1d2636372ef77f746 SHA512 21f01d2f7139b5edf50de4c363da3d2943a73abe984daa66833c965b72232d930fde2b07281b7967e07abc8b5f88cad45d8d87b3f303ee312036e2a986158ac9
-EBUILD tree-sitter-0.22.5.ebuild 1241 BLAKE2B 2648b6c2c4e6ba75d7cff187b146db2376ff11f54fcb43f260060cc9d146e23fb33e56b8291594e1f924f63e021b382474e709574fee4cbb344a171ac8f78ef6 SHA512 9e51593853075a6d7e6c2223ba80133d81acd8fa8b0e8edc99b371c004b7b22e8b1513950c172fe2234f28ff9f8b2e545ba2c53725f2b470ed72b2e55b790e6f
 EBUILD tree-sitter-0.22.6.ebuild 1247 BLAKE2B fa33f9f66f7aadce2694bfe878814792a8ee5cd5edb236993a1c4687087c02f0c9ab5df8a6da6b64b978738d9b2ac288470957ba54536805552f6fa2f1720192 SHA512 4aa73984020ca74092649a71e62e6e1c075bd50bf97046bd4ee123245b51f932cbc725fdfbc2b632e37ef8996b04f5d393779df7ce84f80377aaf560f04c7f4d
 EBUILD tree-sitter-0.23.0.ebuild 1255 BLAKE2B 60b4fcfd12718c9fd9885de2c7239a993e09593e7863afbd1a417e89ea97c6ebaff9ca0c0a917e168de2389dc2f3d843903a684c78ffe2ac6d3cd988bcd4313d SHA512 cefa12c8a8ef0f352ca979c22f7120f019a480d4c71deb30f1fb575c010d868bcdd88088b8954708f63fb0213f88f0847ef4c8665261d0fa25696d63d397f1da
 EBUILD tree-sitter-9999.ebuild 1249 BLAKE2B c6e591aa89ecdc32bfcdfed3469cf0d43cbcceabafe86b98e9d89a0674c6359fbea3014590796651d6795f2cb672acf2018c668a866415ef72d1fec1d7f3f7c8 SHA512 138216c37fb57110956423627e4a72593dcfc147cc6f78796aba7268df7ffa1ef770ea06cf6a9d0f8d5a45a05a6e3033872a9e3bd9b4fbdec6daaf7a4f90858c
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
deleted file mode 100644
index 66553bca39a7..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Bump tree-sitter-cli at the same time.
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild
deleted file mode 100644
index d9718e3f31d5..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-# soname is .0, but abi was broken unexpectedly
-# Bug #930039
-SLOT="0/1"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" # bug 930020
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		  PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		  install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild
deleted file mode 100644
index 15f132d978a3..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-# ABI is not stable. Revisit after tree-sitter-1.0.
-# https://bugs.gentoo.org/930039
-# https://github.com/tree-sitter/tree-sitter/pull/3302
-SLOT="0/${PV}"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" # bug 930020
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		  PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		  install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index d84d10884803..d0ab7fb8a799 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,9 +1,12 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-kiosk-test.patch 1289 BLAKE2B 6099d17062dfcaf45f877f3d51632d66450734a450c0765ed098e5ce8439e4f3dd11e03a3bed8b1efb56af34d3da1d80970878b8c373ae8a82b3aa96e7261e67 SHA512 d4b267ccfa95ad59b0c49f1a6105f95246bc0334ee012c2137ff35c2712ba3d518ec7c6578c9f4e837128885d88d2a146daab056f4982d8e48b2a3d0c14d9fdb
 AUX weston-musl-basename.patch 2369 BLAKE2B 87b49e150f4f390bb9ce131f9cb85198d95a4916ea2ed3597ed521e0d09d747f961045cbbb1fb56356f39b71b76cda20c37a80f49f74137770f4b5a060c2ab09 SHA512 25c6abc04f9c2af541e8428d63c83c7e35eef5275839afb0fd347926b06e39064e835543d68e7bc4652eed946be2c4080b7e5ed593bae75214fd06f7e456a9e1
 AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc SHA512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb
+DIST weston-14.0.0.tar.xz 2043020 BLAKE2B 1a92e3b04677f3ba1f2c02f15aba64511774dd08738c2a490135a1ca7200a846c1b5102349a36c76e2dd6a9e39bd041cd25c2552958741e96f8291fd3029046e SHA512 8bdeed91befd5cbb0bde0f1860ff7775c1835a5fa8c3bf26e99d2f0c16e81255fcf35bf338ae02d7826463d0efdf41ba3fe78e38e4c27787831dfa331acafc08
 EBUILD weston-13.0.0-r4.ebuild 3900 BLAKE2B e25a59fc19fc49062d60d3019e177a013b8ae6904217fc22d8d6ddc0d5ced4f3f275529400914478b0963ca5bf88398a3ae56cd1a4e23d3620a77e75f4c7b491 SHA512 10c7c387c7cfcb348d076bf60714b0c6d503a93526c7238c28a113dc92bd85bf53105718cf57c6430d5074ece581a66399db6841465a2e012c2b4fcb4de52ef5
-EBUILD weston-13.0.3-r2.ebuild 3952 BLAKE2B 6488d110b01e811375261ac2987bb0371f07e5da0839a876b089e1590b7603fa0e7c5b4cb1e25ed0aff59e0afa1c4b9693a9e1c6d28a43033a96190588fb7bb8 SHA512 e72266d2ea2d9eb49e46cbcbe90e9b5b4fb68bc493f10c8834b3ffdbee25afc22c798d8be77b662ec8575ffc1ed2634ae1e8fb493a08b7ff58a79aae1b716bc0
-EBUILD weston-9999.ebuild 3852 BLAKE2B bbacd0bdc0a407968b27377dcc7613e3ab498aabaaeca77e93fc89c11c3fe7758d05386072d56a3f372f2ff69535dc4519773464a5febcf8f56627bcc2bfd780 SHA512 c8721ee7a517842ca3c254e4287663fbe560d70ed834872650bfa2b1394219b2e9d079697eca5e992e9165f51adc70b251604527bb49a9f82f4bdfe1d052c5aa
+EBUILD weston-13.0.3-r2.ebuild 3800 BLAKE2B d66550354c2bcaf7159ff5a27414c08f4805c1ca923074978a300de538a9cf571c6872f3e511bc9044ad51cd6d222f0d9a2c0777a1363603775e5805f5a582d2 SHA512 5ef291a76145a5a07caef034363959b05da4b54b5eb2880ba50b55fa01099f4d79bfd8af0f9717d478d67b6cdcf3f2fc221271fedb7861b26d0bab39f747c009
+EBUILD weston-14.0.0.ebuild 3773 BLAKE2B 6f98cfaa8a575bb9c59a821a72f2fe7d0c6d5d4dd9db6ce95530dfd568ab52664df2608a7bbe5e9a86ed1ea0cf5a2051cbdaa4519a85bc345349b6d8b8e4b0ee SHA512 d7b13e9d5ad4a5ed32d476ef2a45c68ce73dda20a1758de45b9d50d811d1cdd6ed4ee426a89cf778636b475da6f905232aeb6c870f69374bb6f8d628984988c3
+EBUILD weston-9999.ebuild 3722 BLAKE2B 6fb8f45f7535f65e2345ee7a6f8687e4362ef53f7cc0f95ef8ef091b43efca0bceac43d2a7df8eb72e5ececb92ebd20e4865927582dcd4c794599a6aa43e9b1b SHA512 36ff766083c63f8d0da654fccddc3bd67ed07c5f06d143654b1fbcfd12d3b3c1f31fa7d5b2d328829a372e4c919ba8e38e18d99c27829c19e187f44b4e808f0c
 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57
diff --git a/dev-libs/weston/files/weston-kiosk-test.patch b/dev-libs/weston/files/weston-kiosk-test.patch
new file mode 100644
index 000000000000..7fe340a75bb3
--- /dev/null
+++ b/dev-libs/weston/files/weston-kiosk-test.patch
@@ -0,0 +1,53 @@
+From 4d5224027c941224eb9a7aaa71c949558f2b4796 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 6 Sep 2024 23:15:05 +0100
+Subject: [PATCH] tests: Make the kiosk test dependent on the shell-kiosk
+ option
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ tests/meson.build | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 45b475c3..4b52cb29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -180,14 +180,6 @@ tests = [
+ 			input_timestamps_unstable_v1_protocol_c,
+ 		],
+ 	},
+-	{
+-		'name': 'kiosk-shell',
+-		'sources': [
+-			'kiosk-shell-test.c',
+-			xdg_shell_client_protocol_h,
+-			xdg_shell_protocol_c,
+-		],
+-        },
+ 	{
+ 		'name': 'linux-explicit-synchronization',
+ 		'sources': [
+@@ -427,6 +419,19 @@ if get_option('shell-ivi')
+ 	]
+ endif
+ 
++if get_option('shell-kiosk')
++	tests += [
++		{
++			'name': 'kiosk-shell',
++			'sources': [
++				'kiosk-shell-test.c',
++				xdg_shell_client_protocol_h,
++				xdg_shell_protocol_c,
++			],
++		},
++	]
++endif
++
+ test_config_h = configuration_data()
+ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir() + '/reference')
+ test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
+-- 
+2.46.0
+
diff --git a/dev-libs/weston/weston-13.0.3-r2.ebuild b/dev-libs/weston/weston-13.0.3-r2.ebuild
index abe7074e3de7..13dab3d0aebf 100644
--- a/dev-libs/weston/weston-13.0.3-r2.ebuild
+++ b/dev-libs/weston/weston-13.0.3-r2.ebuild
@@ -91,7 +91,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
 PATCHES=(
@@ -99,10 +98,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-musl-basename.patch
 )
 
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
diff --git a/dev-libs/weston/weston-14.0.0.ebuild b/dev-libs/weston/weston-14.0.0.ebuild
new file mode 100644
index 000000000000..8ec8a16498ea
--- /dev/null
+++ b/dev-libs/weston/weston-14.0.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		<media-libs/libdisplay-info-0.3.0:=
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/libglvnd )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.33
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-kiosk-test.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 3df7fd4b2e1c..d64755bcdb23 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
@@ -49,14 +49,14 @@ RDEPEND="
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
 	drm? (
-		=media-libs/libdisplay-info-0.1*
+		<media-libs/libdisplay-info-0.3.0:=
 		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	gles2? ( media-libs/libglvnd )
 	jpeg? ( media-libs/libjpeg-turbo:0= )
 	lcms? ( >=media-libs/lcms-2.9:2 )
 	pipewire? ( >=media-video/pipewire-0.3:= )
@@ -85,19 +85,14 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
+	>=dev-libs/wayland-protocols-1.33
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
@@ -126,6 +121,7 @@ src_configure() {
 		$(meson_use examples demo-clients)
 		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
 	)
author	V3n3RiX <venerix@koprulu.sector>	2024-09-07 12:29:08 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-09-07 12:29:08 +0100
commit	6c1090c8458fa6e15fd24227293d60bbf356eb60 (patch)
tree	26a7d6ff13e906f3f47a6aca8e915c84b8f25bd0 /dev-libs
parent	8bf02d8edf7e8947a205e2dca77bee4c4e31739b (diff)