gentoo auto-resync : 19:02:2025 - 00:15:15

31 files changed, 560 insertions, 290 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8773043a2f2d..2c34530584d7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 6aa9f9b79d60..ccb224ffac01 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,4 @@
 AUX appstream-1.0.0-disable-Werror-flags.patch 1297 BLAKE2B e8b9bc262d39332f5390f7292b26d2c832326b96f0698b872c3d04b8f86ad0a492d0583f91886ee14698e84f91606c1944210eef858c892c9164b768aa912d1b SHA512 e5df79dda5f433c67dd0b02c681e04cde22e6648a4d438a50314575e37353686fbcbc4fd56ee209095f71498d0e553b4d061e328fcc740b19ab7ae9281b85423
-DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
 DIST AppStream-1.0.4.tar.xz 2719900 BLAKE2B e8b3ca6092d4cddf73e5f902ac9d5e071d9eb31d8b206fd814e2078f5bcfcba1683e97beccaea9e7024da0285d77c63fb426e3b3d17f15c3add332e964e313d3 SHA512 ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1
-EBUILD appstream-1.0.3.ebuild 1924 BLAKE2B bee6229d4bb3d6e783b110e08b386d004ca92d5b8aa8f0b74e19735ca0202b705c90ef602937436e8d9447f9b6a715625a30d51bd2b4cdfb4f922c54d0449e11 SHA512 b1e5a10202f3680ab18d34f534c72a05147e4090f06c678fd9a32c88ccd366c4abe007e09d81df78a1a5c3aeceb52a4a54928fa60c04a71725d8007b281c77c7
-EBUILD appstream-1.0.4.ebuild 2294 BLAKE2B ea33759a8ab259fd94e4ada3ab2fd077bd1807ff1d061b954df327d63147380b8d1467b7c5cd308cc57d795015b09f16eebe530149090761a557f453f14a60d9 SHA512 562874479867d4bf4550f535130f5eda9e0b743058fcc463325e21dfcd9b81a8bfc6f563aaf506426feb44468bd3aae9f7362097134c421dfb3d726cce521034
+EBUILD appstream-1.0.4.ebuild 2289 BLAKE2B 0badc4ac7395b955cdb8174a70ee862ad1a0764f303406f444a5a84cf1907ec1acd5771374624ca6277d3eeef90b018399e03f5be66220fb726fa6c88f88fe31 SHA512 69da10d56cfc45c60ff073fbdf05298739ec0c702636a2cac66f4bc1977c9b24ca0b4928a81e417fe464af13dfc8b293da2b761f6bd280cdcd80240cd1351823
 MISC metadata.xml 455 BLAKE2B 8786bd83d39c561453a1c2c34638e0f430b2e29ee0fb06cfd88ae2c3003c49abfe4a70f2777f12b0432c33af4beeb4db441f58cc8d9739372c665d47e18ef1a6 SHA512 44d38cf7dfbc2a9969ff120a73aa08a296a72d669fd11593ec5486941548fdf1687f5aed844d27a82c6c30767db7e4ec14574f9c8959a8d4cd4c5cc89ce27ce8
diff --git a/dev-libs/appstream/appstream-1.0.3.ebuild b/dev-libs/appstream/appstream-1.0.3.ebuild
deleted file mode 100644
index 294c4e494c00..000000000000
--- a/dev-libs/appstream/appstream-1.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/5"
-IUSE="apt doc +introspection qt6 systemd test"
-RESTRICT="test" # bug 691962
-
-RDEPEND="
-	app-arch/zstd:=
-	>=dev-libs/glib-2.62:2
-	dev-libs/libxml2:2
-	>=dev-libs/libxmlb-0.3.14:=
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer:=
-	>=net-misc/curl-7.62
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt6? ( dev-qt/qtbase:6 )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/qttools:6[linguist] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dcompose=false
-		-Dmaintainer=false
-		-Dstatic-analysis=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt6 true false)
-		-Dsystemd=$(usex systemd true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-1.0.4.ebuild b/dev-libs/appstream/appstream-1.0.4.ebuild
index 8bb10a1d8dac..f671a63c3dad 100644
--- a/dev-libs/appstream/appstream-1.0.4.ebuild
+++ b/dev-libs/appstream/appstream-1.0.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/libgrapheme/Manifest b/dev-libs/libgrapheme/Manifest
index 87a560cd5583..f107277b2ca7 100644
--- a/dev-libs/libgrapheme/Manifest
+++ b/dev-libs/libgrapheme/Manifest
@@ -1,3 +1,3 @@
 DIST libgrapheme-2.0.2.tar.gz 846990 BLAKE2B ade6c3ca8481bf3c3e1b1512a3c02caa9f7f2bcb3e9a59f0f3c5af7a1603c2ff2bf4f689d25e47e156d663d95c4e9e209e03504fcde27a9daf1791bc4954663e SHA512 640fb0926f8f46ae98aaba708f8bd1539f7485f150d4b8021195268813ff361ebfc05a49f27ef6eaca9f2051e648912e70b9dac7fbbef84cedefdd4f2cdcb45e
-EBUILD libgrapheme-2.0.2.ebuild 1050 BLAKE2B 0028b916ef5b4e69639940b825b673cb0d0474ad2fa95ba0e3b8a4ab09ff278b1003391acbb80154d77e7621258a641110bc21d4914be52d5855bb198709fb3c SHA512 e22af12a45eea5154207a9b9b372282ee53d58565d96122a006e25a9a917ba685af436dc6972211af129ef06756324cbb58cc091870fefda27f7d0bebc179d20
+EBUILD libgrapheme-2.0.2.ebuild 1057 BLAKE2B fbe49679c76edfae63f313c4acfde9ce1d7f8d29bb12346ae93e7b4a59a96131b62115d3f846fc487bafab5a6e374de26f36acb33cfda44663e6d1959556f00c SHA512 bcd62127fe3502000a3bb2d85d2f667a31cdd9a85e78520408c105b2b55b60363927cdc5a2ae027be2e6954b5e32ce9c49b3e8d2500d681eb50832a06a929b8d
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/dev-libs/libgrapheme/libgrapheme-2.0.2.ebuild b/dev-libs/libgrapheme/libgrapheme-2.0.2.ebuild
index ace2ec18de4b..4a34264e8ba2 100644
--- a/dev-libs/libgrapheme/libgrapheme-2.0.2.ebuild
+++ b/dev-libs/libgrapheme/libgrapheme-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/libgrapheme/${P}.tar.gz"
 
 LICENSE="ISC Unicode-DFS-2016"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 # upstream suggests keeping the static option, others have requested it too
 IUSE="static-libs"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 0429e47065ca..cfd39a462ae3 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -2,13 +2,17 @@ AUX libxml2-2.11.5-CVE-2023-45322.patch 2030 BLAKE2B 2262b1c532b0b59c4982fdea129
 AUX libxml2-2.11.9-icu-pkgconfig.patch 930 BLAKE2B 59eb0810baceb8874657fd168753a7b53d70518f8625b6c461fbd235c1410e261a6e3a344b128fdeaaddcc8db8cf002c40e571a977ac03a118f0f8d63cc4d5cf SHA512 e2a8d965ab3459c426bbcb9fa9ff70795bf00110ce90580d7b5d61171a00d81ecb2b5cde4ed2f8a0119995d80dd14a7615d76630acadff8a6611821ca6e21707
 AUX libxml2-2.12.9-icu-pkgconfig.patch 1074 BLAKE2B a676f25de6c96ec5056b472a4819d65ca944dc5befc40c708a5c0d982d29912fcb3c602573f172abb3e62baeed3ae222dc594dc8d7f69031e86080427d86f98e SHA512 613e3b853ad734f789704b6523d402eb996f01688edcf7ca96a753f79dc0cbd2057df1cc9b6cc80c664da4a3acf4be75ce88825371060ba51e151c6b643d8eaf
 DIST libxml2-2.11.9.tar.xz 2627500 BLAKE2B 3ecab5df9017673f31e8bbf737273d72cb4475c3a6f0d0669e7f074b0e4d378460df2e175fe4991c675d8462a2e4d4607c151ed11937a0c8a3a4e81107102f67 SHA512 d5c34ed56525f4c6b61d7055fe4219d7a3337077b4fb27081682e9f8350f1542b4476ac42f2754e590b371a4d9a00921cebf20c10b299371b05b8391e7fa7c33
+DIST libxml2-2.12.10.tar.xz 2483708 BLAKE2B b0e68457650665967936799c5b8f550a74534a820ffa1ebcf580c025681ab7f0a0941aea8e3cec93dc056e9cbe53266864635d991f8ce7662cf7b66b2c49abbd SHA512 7bd04375321a99c9b7a82d6a72d9412ab45f958b923f1e2f75d9dfbb1a053eba3e0fd067a53753f9a343b4dcb2d9ab5cba894d4194a5f9fb7108f7c545224791
 DIST libxml2-2.12.9.tar.xz 2643456 BLAKE2B 769ff564e62c1c0167e5334879ac9e912491c651b6d48a9d21db569002ae86bc4e4490098710a614bc90bbefc44a9dd0af6b02958041dd3bffccf8b5ddc0f7ca SHA512 6e4544ed3ab36d6cb7481d465ceabf223444739d7f41de3e1927309b8716a5eac85520b9bbaf69913f53e052fbfaf68bf27372074daaa24dca9463ce728b4173
 DIST libxml2-2.13.5.tar.xz 2586872 BLAKE2B 46c280630638e2c8009c593bbbcf90ccbfffe9ddcc99987c4d91c2223043759f2b4d6511b31b2357c5250ac3b40d96ef05c17b4d2adc61972665f8a0d899dfe8 SHA512 acaecd4e3e95136d1c621f9e5f33976ebca87dfbf83859459e339597c3c57fbc47508a7de16af7fbf0e7e7c59fd6f9a82b2e732e1dd12efd79d666bac64ecf4e
+DIST libxml2-2.13.6.tar.xz 2423476 BLAKE2B b21f2946dd6945de4a47c993e93bfbbc785b51a501782bf44c234ad69675a58ccdbf6a255301c4d69e92ba9a9ed6670156e55b4d8100215f2dea015c943931ff SHA512 1d4fc3c58df28834ceeeefd49ab90b263b62823d2f0870ae38d11320da93cfa2a18d979c605293c91ad985cb702e7395ddc0ec00b4785dab35ba6d8c33d5f6a7
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.11.9.ebuild 5320 BLAKE2B 677e7ebb285ae739f8759520d01c7ec6c1148f1257dca62e3d9f7209eca0643ffa9c0fbc91764d99483f22814a5f5e89bcf49da0a3f25892afeffef2b2407bf2 SHA512 04049159608bb632bc93214b6b064e1ad05b3be8178268f7913739d63ccdaac4bae1a90468be099024874e173ffba341d32695b6f0f9d399faba2bda08ca7593
+EBUILD libxml2-2.12.10.ebuild 5260 BLAKE2B e21936494a522b582ea6b45e0ae901733b07e3a1f6bc95bc87855cdcebd8bfce1e73eb99203a04241b0ffbc9751c60ac8dafff0f2c5545ddfeb1ee6c9121ee9c SHA512 8883d4314b045b0051d4e633328b83b17a1ba3aad53c827e128ee42a7e37d118ce82a875e24324670dcf8b047551ec5b82247a71dc3a24b79623c8c687853f21
 EBUILD libxml2-2.12.9.ebuild 5252 BLAKE2B bea5a28bf64b15b8fde7d5ecdceb941887c2523698400e18bf24f43a8ead46eac7d69e652bd12e1ca17fea0a07008dd37e5c3826843c141393e0f1edb84ccc98 SHA512 8deeee835aa558693fe92a9dbeb3e76a82ecc19462d1b1737296a5442eaeaf9bf39f0b1d1360249cd9b4c9a21791bdd802978e11bb30fbf0f89f1358bcfaf788
 EBUILD libxml2-2.13.5.ebuild 4929 BLAKE2B 0e75032d107098974e34c27db656ddfad94adf50dc8c439196958ae5df0011d8e7499ed9e222b0ba4dd1c5848805ab81639a26a63c4ff5cfb4ea650ee5648357 SHA512 fcb2596dbada2f58aaa143100acb0bddc463892ac429efadeb447dc840cfa8f109c72fe7f26724f0cc52327addce47bd2e6017a746c13bfb18ee43d16c81b967
+EBUILD libxml2-2.13.6.ebuild 4929 BLAKE2B 1e98eb39829d6ed01c92f9b75aad1cef911ed4859d54e51cb8d3e844dfb4428259b29ae28c8745341f36c3857801a8795512c0679823d63ee54e8103135367bf SHA512 d5e27d276bc6ba5eebf8400eaf5b58dc0a236055dbab358172bf34be105f74bdd463b59fc0dd362f7f50499ae6a764d485e94ac55f619e764c449f4900d37f69
 EBUILD libxml2-9999.ebuild 4919 BLAKE2B 3e0f278498216f9318528bb2ed2b522309acf5c67e34e36725defe944b09aab9660a6284f948b1e45dee1af588512e605c5dc1e2eb84e6bebead6d857c0795c1 SHA512 47689ae3e3b5d3bd2e5fb92f4ffd20b8fdd5a2550fafe2cd88a1fff7f2946b970b99e379e44ff3f72e4423f62c4b2a5a3ea5b480dca8e431c2177ef69d779b6c
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.12.10.ebuild b/dev-libs/libxml2/libxml2-2.12.10.ebuild
new file mode 100644
index 000000000000..5d93bd5cb693
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.12.10.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit autotools flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit git-r3
+else
+	inherit gnome.org
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libiconv
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-build/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.9-icu-pkgconfig.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.xz
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	#elibtoolize
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.13.6.ebuild b/dev-libs/libxml2/libxml2-2.13.6.ebuild
new file mode 100644
index 000000000000..b53e73fe0023
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.13.6.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit autotools python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit git-r3
+else
+	inherit gnome.org
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="examples icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	virtual/libiconv
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-build/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.9-icu-pkgconfig.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.xz
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	#elibtoolize
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			--with-legacy \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 3691d7fa5e81..db00cc84deaf 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.14.3.tar.gz 50948 BLAKE2B 4f2189b2d6a1faf7b5041baeb1c2f00498d0297a8028799ab646aa92189d569114c76b45528d15a72d7cee8dc6252797bebd3e2849034e703709a3b41f74a805 SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a
 DIST qtkeychain-0.15.0.tar.gz 55584 BLAKE2B e12b69a7fbc60a6cda75b06c5e8ae435b9a6e15a9564b71590cd3d5a8c491526e8bf840eaba0cadf36f4e7518dda1d6b45c0090aa26538a92c668c29d4646350 SHA512 b1068ae513d5eab8f300186497ddcce4075e11a2a569deddbc949177efaa27970ed7bdce0b1aff61a021144540e942f60c9259b975601a92c60b8a742754624a
-EBUILD qtkeychain-0.14.3.ebuild 1536 BLAKE2B 66108fdf560b85eba1c915adb7b3780c2e858850b1bc0bc7e0181901f7af5d7a65091375f922562ebb8fb5e8850691bcdb8577efd51590623300e469e7e723c9 SHA512 54fd75fa2dbce374aaff44f5139992f82ef535dfcb1fd0fe59bb58b7eb9fd879e11cd21497fff3c5d4b055bccb3689819c3a8defaafac80eac9533dcf422565b
-EBUILD qtkeychain-0.15.0.ebuild 1727 BLAKE2B d6a0214dfa1c327e3a3bf9f04424cf199ab5bb269769fe2b3314ff0205f03ada16e984403c283987a9a7f4f9d08752627b350a003766d2267896a9eccb288937 SHA512 1458170e30fcf977d6183f427f3c746defc9b15a7eb2169e077407b9c2c8bdbe2f16cce93feea76c91db7c972791af231fbb30de043e459c6d1791bfaa1005de
+EBUILD qtkeychain-0.15.0.ebuild 1724 BLAKE2B 6ade19740b9fdf6aa70e1515516c1b0a88f25ed6e0d22e6760a654cb3105131c371c6e797e90e3e0e1522cd5716beaa2ebd6a049c5dd58236a009a5280c8d2c3 SHA512 6f5b48d2b985751e06f51b30aa1eb91568710ca83de1af157721cd60c2dae7932200571206dad7feae71892f605069fb5e82a8aa52152ffbdcbf28e6e774531a
 MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild
deleted file mode 100644
index bedbcc0a9bcf..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="Qt API for storing passwords securely"
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="keyring +qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-	)
-	qt6? ( dev-qt/qtbase:6[dbus] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-
-DOCS=( ChangeLog ReadMe.md )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DECM_MKSPECS_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs
-			-DBUILD_TEST_APPLICATION=OFF
-			-DBUILD_TRANSLATIONS=ON
-			-DLIBSECRET_SUPPORT=$(usex keyring)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
-		else
-			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild
index 400dbfc6db2c..85d8a5a28a7f 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 6496358dcca0..c05ee88c8aab 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,9 @@
+AUX re2-2024.07.02_optional-benchmark.patch 2244 BLAKE2B a3e0856e0d11ed31b4abac8cbb918a2be3d5d2d9046fe86c0df46c35a80e94121cd944bb2902e5ac78e03b32ee5e03ac91439d99bc1d624b977cead4592340b2 SHA512 47bf835b23e1a187bece585d0dd996b63eb3c20f67cdc27eaa86459e3abd3eca216c26fe62a962ba7054792c3a259eea080c7ed81f2cab8eab1e44ea6c908d60
 DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 DIST re2-2022-12-01.tar.gz 382554 BLAKE2B f3b3f00e4a991db90695510a8820493c42605ce91278c3e7e5de9f0736b8d7b627921672905d4404a252425f619c8d27f81b05f4d69f33d4c23225ac0c44fe2e SHA512 783f856e6556ce60f0e9a15b2366cb4df21ca019cdc85ef7ad47a11d0345935300dede5da61892bdc77d2642da82ddc81b6670049eb87f357a64a9c684140ec9
 DIST re2-2024-07-02.tar.gz 390672 BLAKE2B 86b915dc0b8e68b35fd0ed20bedd5e9c5781826442f332d115166a9a70f34b7e9b4ef60206264035b82652230d42a3c6aa2b91a774fca3b1e415ce65ace2ae96 SHA512 3776383355ccfdec85e0cdfb3ce980c6ecb3c336d603dd34c0a547c7c06a6243947a13cb352372335edac12d4f28cf1b7a51d034f5b34db3e46cbcac5e3f7479
 EBUILD re2-0.2022.06.01.ebuild 1353 BLAKE2B 77b4bc83b35006208480b1e46b1ec935bbdceceeaa967bd671a4c2c24e79598b75968f18d1dee39bd131f0f3698bd67acbb19429e7dd6e49e0110d2f4367e2c3 SHA512 9446c0b67873ea7d0433279c2e5e11c9c9d590f5cbf87b4c3fda7577bc62ddd89e4c08828be1bb9b7d11b5baed19afb8c16eae5093e6e59acad52c3369868568
 EBUILD re2-0.2022.12.01.ebuild 1353 BLAKE2B 3c28a0b44229708276cc0b2364e77b8ecfd4fee6b32159599e934e47377f7a6d0f0ed378cdc2dde997970074682108dfbe31481b15e43407ae478a2088465aee SHA512 89878bf4505faa20da73138c205962fe9cb6c5cac12d5530b8514c987177b8c1a87ddfafad1eb91351ae32fc986da06d3e9b6abff5e2039b173e1076cbeade23
 EBUILD re2-0.2024.07.02-r1.ebuild 1803 BLAKE2B ca14b9135696eeaebbaa1b99f9f0e6f4e445787560d71f07e45b76019b11ea9e9684f2a0af5f82fc5b2bd481b8df06f04f16b29478146ad369bf752352e869c5 SHA512 64463c27da635c1504f7b469e22ada63475f6b2d6597b223134904cb348d8ffe72d76f193fdad432460eaee132216a2e09bdbae54f981395ed7ed59c2b023606
+EBUILD re2-2024.07.02.ebuild 1106 BLAKE2B f862732d48383bb26878b02805c478c155a7ddd45c188b12e02ca32d06c40d05d32609cc3ded898612dffb482ccfd08996d1ed05b3c45060225fb7b502a8941b SHA512 032b71ab08683e9ab2d38f199d5278bb7addb233376adcca1ba1b748a820a0e346e7c8d8a3e82a9212c31367c8c4e0e4f7a5c26bfcf7aba59113946dba569aa4
 MISC metadata.xml 703 BLAKE2B e1b025447de661823b20426ea9ced01a41d1897ce037d3feaad1042f5717b319121ee54a77cbff831fe9c868131c4b1548850fa94d590d990e4c97c4bba8ff25 SHA512 83ed980012d4f0ee055f14d9c64a32a30f83ea685a8822dbc185e1f328a7a04bf54df95dac53c1d5d85dd14ee040a5dd43dac30e671285da75a38ba511f5c009
diff --git a/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch b/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch
new file mode 100644
index 000000000000..65edc800705e
--- /dev/null
+++ b/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch
@@ -0,0 +1,63 @@
+https://code-review.googlesource.com/c/re2/+/63530
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 14 Jan 2025 12:08:26 +0300
+Subject: [PATCH] Make benchmark building optional in cmake
+
+Some Linux distributions only requires testing but not benchmarking.
+Make benchmark optional to exclude excessive dependency on building tests.
+
+Change-Id: I1ce8bd1b4f6132efb295f71d43a77ba36ea58dc5
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,9 @@ option(RE2_BUILD_FRAMEWORK "build RE2 as a framework" OFF)
+ # so we provide an option similar to BUILD_TESTING, but just for RE2.
+ option(RE2_BUILD_TESTING "enable testing for RE2" OFF)
+ 
++# Enable benchmark building.
++option(RE2_BUILD_BENCHMARK "enable benchmark building for RE2" OFF)
++
+ # The pkg-config Requires: field.
+ set(REQUIRES)
+ 
+@@ -167,8 +170,10 @@ if(RE2_BUILD_TESTING)
+   if(NOT TARGET GTest::gtest)
+     find_package(GTest REQUIRED)
+   endif()
+-  if(NOT TARGET benchmark::benchmark)
+-    find_package(benchmark REQUIRED)
++  if(RE2_BUILD_BENCHMARK)
++    if(NOT TARGET benchmark::benchmark)
++      find_package(benchmark REQUIRED)
++    endif()
+   endif()
+ 
+   set(TESTING_SOURCES
+@@ -227,14 +232,16 @@ if(RE2_BUILD_TESTING)
+     add_test(NAME ${target} COMMAND ${target})
+   endforeach()
+ 
+-  foreach(target ${BENCHMARK_TARGETS})
+-    add_executable(${target} re2/testing/${target}.cc)
+-    if(BUILD_SHARED_LIBS AND WIN32)
+-      target_compile_definitions(${target} PRIVATE -DRE2_CONSUME_TESTING_DLL)
+-    endif()
+-    target_compile_features(${target} PUBLIC cxx_std_14)
+-    target_link_libraries(${target} PUBLIC testing benchmark::benchmark_main ${EXTRA_TARGET_LINK_LIBRARIES})
+-  endforeach()
++  if(RE2_BUILD_BENCHMARK)
++    foreach(target ${BENCHMARK_TARGETS})
++      add_executable(${target} re2/testing/${target}.cc)
++      if(BUILD_SHARED_LIBS AND WIN32)
++        target_compile_definitions(${target} PRIVATE -DRE2_CONSUME_TESTING_DLL)
++      endif()
++      target_compile_features(${target} PUBLIC cxx_std_14)
++      target_link_libraries(${target} PUBLIC testing benchmark::benchmark_main ${EXTRA_TARGET_LINK_LIBRARIES})
++    endforeach()
++  endif()
+ endif()
+ 
+ install(TARGETS re2
+-- 
+2.45.2
+
diff --git a/dev-libs/re2/re2-2024.07.02.ebuild b/dev-libs/re2/re2-2024.07.02.ebuild
new file mode 100644
index 000000000000..766cb2a878e2
--- /dev/null
+++ b/dev-libs/re2/re2-2024.07.02.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MY_PV=${PV//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+# NOTE: Follow SONAME variable in CMakeLists.txt
+SONAME="11"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="icu test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20240116.2-r3:=
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+PATCHES=(
+	"${FILESDIR}/re2-2024.07.02_optional-benchmark.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DRE2_BUILD_BENCHMARK=OFF
+		-DRE2_BUILD_TESTING=$(usex test)
+		-DRE2_USE_ICU=$(usex icu)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index c16d4bc2ac44..f9efb8876375 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -5,5 +5,5 @@ DIST tree-sitter-bash-0.23.3.tar.gz 544232 BLAKE2B a7f2b8e73fcf99f29771e2952b10c
 EBUILD tree-sitter-bash-0.21.0-r1.ebuild 388 BLAKE2B 4a5a331b804450eeac880ee7017a1dea881451d8c940b324372b88c6fd7dec593bc0308eb81c9314b032f78f3286ca5ef92e39d9b89e56f2a4ad052fc87b9a64 SHA512 9c0b0b3c14443099f4c21de3c2541891d408b683323c96b696156bf55d288054e33eac247c802191085df33501ed5e763a5fef179a4be17424d167240b783fc0
 EBUILD tree-sitter-bash-0.23.1.ebuild 388 BLAKE2B 4a5a331b804450eeac880ee7017a1dea881451d8c940b324372b88c6fd7dec593bc0308eb81c9314b032f78f3286ca5ef92e39d9b89e56f2a4ad052fc87b9a64 SHA512 9c0b0b3c14443099f4c21de3c2541891d408b683323c96b696156bf55d288054e33eac247c802191085df33501ed5e763a5fef179a4be17424d167240b783fc0
 EBUILD tree-sitter-bash-0.23.2.ebuild 396 BLAKE2B 8ea6b43a01f09ce1f84ffe2f9ddddbde2c6d65722918b725add5a060626cf50a44ee37cab18a0a57e56aa96aec0dc2ea7a3c3ff4736223e35c2168cf14ef1942 SHA512 f6a6fdb85de538d4371d5138ceb4fc900675acd3641d2b1492b328a6237efcf5d65fcbcc2516383ae004d616c9aadb98258850451fe0b43fd2ef5587c01aa083
-EBUILD tree-sitter-bash-0.23.3.ebuild 396 BLAKE2B a17a219bd307ff90ca10ae0eb9feae4aaaadd585406c595a4169c62952b85bd332ef572158e105c1aadb0fcb3150770968928f628b4a74f2269e27f1624b3df0 SHA512 8cd378d6e4e497a2cad8e80b63d3964927e88e34260a583613d3899e580a10db35ced55e59c58753f6e36e8d0b318e113c57c1f83c9ff9773b96ff6055638ebe
+EBUILD tree-sitter-bash-0.23.3.ebuild 390 BLAKE2B 4167692635a90034230e1965ac494e03de092164ee1be1b3ccd3bab7598292a3589b4b8920fcb1345fa632b0936aa4ef271f8ac7a999ef2ad198fce61fac7569 SHA512 4558eae16854e67a8b811444621d4db62cef67e777d14c7340aea0e28afc5213b7d6d54f574ef9910c9ad02a02e137f84dfb8c7af70400657ecd429c047cc1c6
 MISC metadata.xml 444 BLAKE2B 5a79ed071d8acb28777a9f255c6d7e3dd8317bb2c2502423925764d0b170aa7b8fdfed40d505986986b3bb5d573efd2a300bf3f76b34fccfd5a8380b03fdd1b6 SHA512 0fcdb129e5f90034a21d041a77f2c1ec480a05401def273c074ed31c078cebdee08eb41282b8bb16bc17d125e610b5c1e3348e219a4c108712b6b015a2649d63
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild
index e066f715a0ca..ed7e277b3a4a 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-html/Manifest b/dev-libs/tree-sitter-html/Manifest
index 213808049a09..82529ff4d74b 100644
--- a/dev-libs/tree-sitter-html/Manifest
+++ b/dev-libs/tree-sitter-html/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-html-0.20.3.tar.gz 45084 BLAKE2B fca267fca9ddfb0651b1e596f422d9093852e0b06391f192f9b525df379048d2e74fab472bd4ecfb0fa229ff34546d648a644bfc3f746e8ecb24ad8b4558419c SHA512 572cbdeca6c57d8fc389b8736acfb6a4ac2b3bd8704445ca7a006d75e0a3c37faa9abd75ead54d586e25b5550f72324c407271b451dd5ed94fafb09e8a6ad352
 DIST tree-sitter-html-0.23.0.tar.gz 48671 BLAKE2B 2cb04036ec9c69a93a90e79eabbb7cf684d94c5c8bd6db8124ec54d2040acbf94b787e146d38902fa865851b1d7ce33d1510b036bb4e88180d29a498930d9719 SHA512 6ddbe3cf5c978f3a525c04fa82029eab522dee86b088375e3062ecaa70c2a9920b22c4e1021ca55c180c160919180c36f7e961acda3c8e7ea867214eb161f19a
 DIST tree-sitter-html-0.23.2.tar.gz 49879 BLAKE2B 910c4bd2b9094063173d49dc9e08c8d6aed106a4844e3f558c0ffb12a0c7dafe0f887a4c4dc805ad92a605d32dfde15110e456cd36435f18d09b7e271dfa8a00 SHA512 71b8eb2907d372c55a3a28f1d4323fe86b7fcdc028e89ba471bbe49b3b3ca77cb84c9ef41543db44d24dc824625ec2da9767894267104c4386071334023b0f72
-EBUILD tree-sitter-html-0.20.3.ebuild 371 BLAKE2B e0b4d143a0d37fdadee936993f2dc43af66d176aa201c718d77710fe950086c3380be658b7a5cc47a866e6a2bc22bb912ffae209eb46e79c66ee5d7ff534b551 SHA512 a5cbff755410a5b65f3d08156f537d3aa27b6667cc7a8646c0f722f939bb203b41623bf82d6207bb77895d72c399aefd6882514b95a5f3b8f45feba4f7076d82
 EBUILD tree-sitter-html-0.23.0.ebuild 377 BLAKE2B 22053bc8b2f5dae137fc649332e61459f1b7cf213413a9faf8abb386f82ea43c50f1fdebb597ca7068010583a0b0af4ff8b36ec859352beaec68cc1c2f132ad2 SHA512 c44a6e71fadd6653eba2aec3282642b9c5a662b22882fb5feb31349df66873cbb807a3f3724e3d54671879fb0bd3813b6a87c56d6ed1a4c840e9482caaca1d3d
 EBUILD tree-sitter-html-0.23.2.ebuild 385 BLAKE2B 1c893e7a248a1ccbb96e86089514907ffc78c16c6b4d0d1a5325ae8e55bb12b93869e358d469b5fffaafc423710382eef29648a939303d7a60f312e5cb910c97 SHA512 5fd7a371063e8a88cd09e6c6d2166c0d7983894c81344e76f4c06da3f3d12c44cfdecdcda3106ca8da457efffe386b257a33a58ccd19281192f8dc10b8d5d5af
 MISC metadata.xml 341 BLAKE2B 6c53dd005637c277649ecf2ba32e0407b0996a5cd5d8e08b5d9224611759d0b41d15d92aefc21626d2b22ea3f543c12b230be8d6761e2a13994518a4b279ed3c SHA512 f0d2b7d43a5c60bd9b2c0e53eac71dbd4911d6a328f9004323ed6b07b1c1ee8abaf8786a7a9b89ee3e605bed7aa11ec6fd396dc3d731f4d0f8844f31531d3f0c
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.ebuild
deleted file mode 100644
index 75c5c61ec078..000000000000
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.3.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="HTML grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index c06574151baa..4647c00d692f 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6
 DIST tree-sitter-javascript-0.23.0.tar.gz 292398 BLAKE2B 6826656b359484a9d4edaf6ad4911002c74a6bc2735c38d1e6fc548ce95d45ef0e1add93d95c2b50a4d73f154d54470d14ca2c4ee8ca3cb47242426658d439ea SHA512 fd116f00a694b18f67143df57b80ce29547c5bebc64e02b11f5a2d0c1c01347b68a963830e5bad837856fab1437faddd14c09f63733b52cf00d44825451ca110
 DIST tree-sitter-javascript-0.23.1.tar.gz 290550 BLAKE2B ae706b657b328c726cb95ec4ddbdfdeeaae131a74930c0c90219aeb66ff0888863af145b80cf7623892e73529efcd6aad28666cf38d45f317a8277f80f198768 SHA512 85bf8850f6f9cd13e907b1536691c4e34ed7d4410460d6d848f211ebe3900ef589616bd4d4e04825b1c9f091eb6daa4dcb8772cff78aedd3b97c8251d2b9ceee
-EBUILD tree-sitter-javascript-0.21.0.ebuild 383 BLAKE2B b1ae71151c71f37d94e8245feee10124d75f2b7670516474e0b0d79c69bc6caeb717666664b7cd4dc8f585e2b8e6cb69913d84ba7963a6c74f9f4c6fa6795202 SHA512 1625fbefcaafee71f1c3cf6ae868b1cad7d64f7e0c2ca0880a089acd3a4c1223d20556cb7dc1576068f2f9841f427bac4c7c7b9d23ece18703ae08bce8f32471
 EBUILD tree-sitter-javascript-0.23.0.ebuild 389 BLAKE2B f06809eee3d63ba7c081857ef1a3dd5c49b765a034e3b5c96d0e8f599e3a09d9e5eccc3e6e6e115873213a8074c8cc311d94d8d2c0a3f3263860e3872d24281a SHA512 b2109b511a3a8953441ae8752f88cfe612d6bd69461b1c9e0b6df4bdbd83003392f276daa9e2f9d91cf8333a06f27549d3dd79aa606fcc9a39227470b83134b6
 EBUILD tree-sitter-javascript-0.23.1.ebuild 397 BLAKE2B e9b97a19c179d79cc4330a25987c4a58a148a03be243d7c0c95c32209c8a7407bab37bc3a8d90d774b9d96665c6023c8e09f47a8166cf9ec8ab1e6b783fefad8 SHA512 f489382054ae428fc3b86a9bf2bb1e52d6000be87ac1cbed0686e3297e29a9b23b03c70a01c6e01a54498a495aee6c6305f9362a7ce81b2275e51dffc2886b77
 MISC metadata.xml 347 BLAKE2B 7ccb60b46c03a8303d0b1a83e5c0da4140c670c2896c57f681a13e177252030b08cd8fe6cbf34a909e26b4cd948a14d17e020a9b3550ab3e5d2bc7e1bb8c893e SHA512 56d779a607b31e820075c5369e63a32a5d5740ddac678429eb60b4062de82d1a36fd86828024e247ae01aafc45467984f12cf857f2b866635c35645304168d66
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild
deleted file mode 100644
index e3fbd8183595..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest
index abd67a664742..c80ef06e77e1 100644
--- a/dev-libs/tree-sitter-json/Manifest
+++ b/dev-libs/tree-sitter-json/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-json-0.21.0.tar.gz 34737 BLAKE2B 104229cd039b41fb79ccdab3b30e0e59a96a3aa46c060bf50cc093acfe4510150ad5caaf39f49045d478d9f67f863ff6289ba7ab59aaa27871ebb77ffc66a453 SHA512 37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2
 DIST tree-sitter-json-0.23.0.tar.gz 38503 BLAKE2B 5b196d82e7b1d10fd65e106a14754c04c64e9486ff97015d8f39028099c2ac609a8ca0dd353b88aae9945332ad672896629082c78a20041f77a57995d2c3f2b4 SHA512 eca9fad305306762b6095fac0e20915300760fbd45bb86d224bf8e6efa3c207418ab9cffa59bbfbb6018e5d1a8d9a2262b82a5687c261c1dfbf573a5e2d4df58
 DIST tree-sitter-json-0.24.8.tar.gz 39832 BLAKE2B dea4febb26ee0a5565ca0aaa69933c489d647a3c3bc5c99bd6b5280a4257871e2956b32b8efeab58cd4ef6d48093cea9241c472ccce2955d207a21dbb1da78a4 SHA512 0027c5d85498575bb10cfe739023b27b19e730be1921c52ef141948ad0d003e5318c8fa3a3440af86c53affa236834fa200cbf09790f0b85e5cdc264ad3e2f3e
-EBUILD tree-sitter-json-0.21.0.ebuild 371 BLAKE2B 859ffcac629eea8eaa18c89f238ec0966227c1cda46ce7ea46219e7d3af6cdd9a65bb515732f5157699d46d9ec3466b372fd6ccf523cce1f88e9dd93efc1588a SHA512 1ed021e9302f13126c0769e00e107aeb5782b6c4725b0a8d0c78ae1a204e9c4148f52503e9eada9e7574b0eb66d7281deb49e947ea4db2976de9eaf63fe79f9a
 EBUILD tree-sitter-json-0.23.0.ebuild 377 BLAKE2B 68d61db06b07aa9c9fa6fc1a72994b3e64eb86628373711bf4f55fab81a3784f0da9a0f446ac395abaf88a59b00c60225c75d41ab6e5c47a901d92f10b097dfe SHA512 ef0f9e871b5c1ffc3cfbce5491c29a45a6b77687e0e3349bf5debd1f05b6f4bc584cc9a2b4e2e4732fdab77aac004b2629d95c2e28ab1a957d64128f7368ecfe
 EBUILD tree-sitter-json-0.24.8.ebuild 385 BLAKE2B a5a77aaa31a9c782088c428d887688701f1ba5782943fa6930e8f448aa905fcfd64d344958f3f8bc4c49b731b8ff7fcf61f1a7e6b116bfaf18217cefc2765f0c SHA512 481dfbd0930f081d802ce27de70d20efcd72565d4c790885e13543783d17882b06b3531558fba47a58b098e159d34a24c13031b4f9766fbc45da470b82ba7fd7
 MISC metadata.xml 341 BLAKE2B 463a6e33220f59efd176484881442aabbf41357bd1e723b05ff3d0bae44f87ee6687e283d3080c0e95e46ad6ab0bd6799d33906d1e160b0ff155e35c0e1d9e34 SHA512 43753d864de59af1764b58dc69f94e91b0ef46f38a0b4ab8d8313f828598f2dc4a3156a3f330d4b2e293f1915fb63cf4c4dd54a5319114b4afc3824eb556494f
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.21.0.ebuild
deleted file mode 100644
index 180526cf9d01..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.21.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index f427eda17695..041dcc8c0fe3 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,7 +1,5 @@
-DIST tree-sitter-rust-0.21.2.tar.gz 433742 BLAKE2B d929baa23ef85bdf0b22ea1878699ef8b788ce43ebba93552f473fb695502d6e8bde5f378ef053702ecfaba2e859143d093f3f7b46e302160212eee89f6cbac6 SHA512 304b232683ded9973a94ec872401151a5900e3423c7bff966b3f5ec4a71122405fb3790f71f5fb445b8af72a31176349cb3ea8bc7d1b1a042ee574420472e19e
 DIST tree-sitter-rust-0.23.0.tar.gz 434858 BLAKE2B 05dd1878652ce9bbef5e4c5bb252b6bf1a55005e39042d9297cd070e6bff24c034b4ba61cd2645e44794ef01f3fb893b935d50f6754908c4a3a540af1cd90ed4 SHA512 2f683ea8c4c194c7dbdd1a1e78343ae908175d403c2cf2fd4d6ab318f7383a8fcb5760f6ae55ed7ed2123a93f4cf93912c759f2d39eb7d75c3e54cd89390c91a
 DIST tree-sitter-rust-0.23.2.tar.gz 442917 BLAKE2B 6107b29b39d8a817bdbaeafaadf2c95c5cb5b7c290c1f7d826b3aafcf66a36ab12e18fa4958729d6dd3910ab799cad74f37a1e7dc070b93c5ba9224c4616a854 SHA512 0b1d65e417738d1199345314013ab886befd5680e4e83c2332fb50d713254f9a9a45c1ebe42bbf38305fd6121cfa755c18ad8e6e9498be306e90e80567b9d64d
-EBUILD tree-sitter-rust-0.21.2.ebuild 371 BLAKE2B 06778f064d99e8ee9b3f3f845e04cbb359599bf4b4b2940f7bf3be46cb36cfad3b061bae255efbcd911fae2cfc672e1c53910fa8c1173b78ac98a1f7482eb03d SHA512 43ef02b9484333f8f8be1b6b9a2b73526398ab3cde6c64d44d20651a03c74a8a89ddf1218e17494c91a1089c8515d4f0bf1858d214891229909a9b451a13a6bb
 EBUILD tree-sitter-rust-0.23.0.ebuild 377 BLAKE2B 71ab71d1edb573c142aaebaf44b03361d181a3a3eef62c97cbf4cb6543c64fdf41a4e0a2a4780a06a1cb6adc27a7a4c76842a84af1d98f16a3c45400c001a136 SHA512 19dec18ab8a8bd9aca025ecaeeb0a650664d018076e29244b46595a02fb19bd2ea80edf2f911f542823a669409159280a3b588c1cd6786d3f746aa4a4e305187
 EBUILD tree-sitter-rust-0.23.2.ebuild 385 BLAKE2B aab5341f02d0fd41dfe1a5650f5371070716d74f99c9992940bc0652b4fee46b92dfe2774d58e64eecbf2a4da26358389c06b96d5d1077fbd6fc2d6a19fc9308 SHA512 58b105c8a7f1d80ac995913fd4baf3ce7a72557c548c2693b1c9b4860aff3cc0ecf85503e29e0e5bd70b97bab5d9c193ede59e529e99aaa21ccb8f16d8407bc1
 MISC metadata.xml 341 BLAKE2B 624d0c998266092a28fb506b00e3ef4c5a19e5f9f64d8b65f276635480f84ff098d101a2eea547fcff358538609d6822b0dafd5f4e381ea545eb453da7a5569e SHA512 b9e79fc80951938a560f8aca7292604faafd90fb99ccf7babd6ec5d4c9c02fc869f6f445b6891f6f3e094d41ef5f1c8d78e49bf1d91b0098f5c4468d21529dc0
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild
deleted file mode 100644
index c0138d0d44ea..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 8bfde67eb8f3..e078e9e78f06 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,13 +1,11 @@
 AUX tree-sitter-0.22.2-no-static.patch 952 BLAKE2B f961ad07850be8c7a7535eac82e234aa236ee7499d2a6e2ea5ee23636bb92f78017b29e74a3ae452f0a4f13611838a5ed4d1b397b1410749264f7e80715d8ac6 SHA512 7d06011b5f5068eb94891d9e116a5d6a3d3023fae999a9766cc19309ae2a4a33d4722074d313efcd87231794ef79d18907e468299da7de4fc4edaacbb9cbc9eb
-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
-DIST tree-sitter-0.23.2.tar.gz 2980520 BLAKE2B 54b4ad96948fc3ec6142da998306f9385ce9107a7c330915bbb733c5886a0baa869a675602be99aa4a491c58a1121d30f654856ce0f2dee0eff4c4fcce370f24 SHA512 393fa62fe6bce51ff5498f977bbb357fd896aaf98d80f08d4faed6dcf8fd5d41012a7489816c662c1873595108c30d0c18d7721a535c69d9904b2220fef8f858
 DIST tree-sitter-0.24.3.tar.gz 3018668 BLAKE2B fa703b6250e11274d0c5ebccb741cc41f521cc5e882383d8f891369540ce6b3b4b048eddb4d0c88186e57516e2d01977e76b42352f26759b3f6093a339cc6a11 SHA512 2d934c03b0ee71419654d03bf6e4ca759b4ef3217b8837fcaef64ee5b4bc8ea8298ff685ae4aaa477b615d11d538ff960b92529b11f13e936b85bad52e369cd3
 DIST tree-sitter-0.25.1.tar.gz 855493 BLAKE2B 6b9e4bf454c50e9b7341aa94d5131d333f45a0a047090ca04da71bfc54357568d0c098c6f7df65ee9d20ede7050537342fc394e281f4070f2d021a7e4134cedf SHA512 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af
-EBUILD tree-sitter-0.22.6.ebuild 1241 BLAKE2B bc8ad59cee96fd6125e5e4ea523d28e70312ab86beaf1460c187dacbd03f1bcc5acffdc0ec45b5191045b446c81350fa3612baade638ec9a5c4434cd0a36793a SHA512 efe4fd10c292f2d64167c64227c5891408246b41b51ffd457c7329b7a98989186b9a8e341a36a4869362d614dce53b01ecd1b473a3f1ade1c54ba5af6e66d97f
+DIST tree-sitter-0.25.2.tar.gz 855826 BLAKE2B 5c2cdaeba229c58d40f5d9b2c4af920d4e1d9fd60ce1d49e632cd660d441d3c32632864b1e226e4c99b4e8f054bfc0082a80c2eb1cdca0684f899b913378a17d SHA512 8acdb410c8b5c2552e9dd5524d80ab1d529e418f408d7c495619e6781f3b70ea2d61b6f69b5b3d1ebd753b739c0f9dd744302808d9a3051b5c7dcf68dba30002
 EBUILD tree-sitter-0.23.0.ebuild 1241 BLAKE2B bc8ad59cee96fd6125e5e4ea523d28e70312ab86beaf1460c187dacbd03f1bcc5acffdc0ec45b5191045b446c81350fa3612baade638ec9a5c4434cd0a36793a SHA512 efe4fd10c292f2d64167c64227c5891408246b41b51ffd457c7329b7a98989186b9a8e341a36a4869362d614dce53b01ecd1b473a3f1ade1c54ba5af6e66d97f
-EBUILD tree-sitter-0.23.2.ebuild 1249 BLAKE2B d681c9bf1fdb3c36d9835fa9d20a9872a3ecb88a5096df826e83a0c867511b4a223b248274371ba703e261baad625e79359b0788556b2433b11965e032a5c69b SHA512 25c3ba53544d06643e4361188995c2bb56e58b883954e13cc033b454c8d6a8ef2cbfde1142feb1418f00d55a9c8b2504d85cf70445bedeabbf7e0f08a1a48ff9
-EBUILD tree-sitter-0.24.3.ebuild 1243 BLAKE2B d16b7bae6d60e35be8c699565c15dbc11a312c9522876d3e81617688087153bad0c048df50fb5cc3394bc6be672c6add007d44ff7e9f0b90260efd9bd90f44b3 SHA512 d2cb13f2c0d5de2d7098889dfdb0f6eabea47a5a6aab03e508c5b855a3d1227a10879fba185f369e5d254f3def199daa50b4b0d5315faaba1099ea7a17492f49
+EBUILD tree-sitter-0.24.3.ebuild 1242 BLAKE2B d504ecc45d2e9cd3366dd41cbaa16bee08be953cd642b238fe9dbc905168bc7e6d1c4df1661e288f0af6fcf0bc174706356022639c22541b06a0a52213591370 SHA512 88aa172fe4297ee956bbfbc87a563f988f3f557fa6fd28d0838fa5bdf290bf59cb4616ce6aa0113cf3e5984dc54d0bab2e731037e4e47d43247811de19459772
 EBUILD tree-sitter-0.25.1.ebuild 1249 BLAKE2B 6818f5964e470f3891424f9f786006687d457b9434a8e4e2611d8195e3a987bb65597062e328d0edffc1b2649e8f746cf07373651fe6eabdc6ab7093ff79e729 SHA512 c44c6bea100e9bf7262871e4519aa23a65e9f9ac21581261d2d3ff7f799d4431ba1227c056f9518ed3f1939a9878c493785562bfb376d64f903379c2a7a59611
+EBUILD tree-sitter-0.25.2.ebuild 1249 BLAKE2B 6818f5964e470f3891424f9f786006687d457b9434a8e4e2611d8195e3a987bb65597062e328d0edffc1b2649e8f746cf07373651fe6eabdc6ab7093ff79e729 SHA512 c44c6bea100e9bf7262871e4519aa23a65e9f9ac21581261d2d3ff7f799d4431ba1227c056f9518ed3f1939a9878c493785562bfb376d64f903379c2a7a59611
 EBUILD tree-sitter-9999.ebuild 1243 BLAKE2B fab065045722c41fb421ed07e8c31025355d92505f8188f915a722a99eb5606f9a77fe11404d46a53c7d29a3601bdc3b4d3bce9cd9cad4a418d6d832d195ee53 SHA512 5c941e9beda07f69606c1e6ae6e1d519238e10274c4efa5220952725f3324e6d184509089d7a6993b7772e1ddc0d6d69696c5167687ba25cdc0b71bc2cd06d09
 MISC metadata.xml 812 BLAKE2B 293a5ccd060986ec80222f3938637611a933b943d588072034cc4984b34dcff6830a071ebae4b70da1659da901e484cdf6f1a8680debb2ab68c7f35c1d494de7 SHA512 afbc5f7e9a06574eafa657dd84c22c5ddfb5d0c0721fcc98d73bce6ada1b6702a6818ddac5e0dfc32de7b764cbdbff266ccebe08168a05d409a07dc8156130d9
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild
deleted file mode 100644
index 1d00b3ac7395..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.6.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 ~loong ~mips 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/tree-sitter/tree-sitter-0.24.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.24.3.ebuild
index 20863acffab5..d8e3393bf88f 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.24.3.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.24.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tree-sitter/tree-sitter-0.23.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.25.2.ebuild
index 765a16ffae30..7121e61d8794 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.23.2.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 1159170932de..61130f0f8b37 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,8 +1,10 @@
 DIST wayland-protocols-1.38.tar.xz 102648 BLAKE2B b07abed74b2f83247f3746414dc1f9e317793f9bc6ae7c1cb955d94149577964dee2ed0d658d4b9d9d7bd446509966393f4060b85db09b56292ddd9702bd1aee SHA512 43fc36d35bedb245deed0e2de246f42d2bbfa6ecafa094f2a7fb103d6df8ae28f3cc200bc5aa24745b9131a28381883c24779da0a6d9ac954753bd5ebb1405db
 DIST wayland-protocols-1.39.tar.xz 108844 BLAKE2B ca0350acdce8e2b3803ef4582576fd2db61228f54cebfa232ebbf85377a7201ceb9a96650c8940dc91c193681fa70a0fcb3d5fa9e541acfe77ae07448e998f9d SHA512 480a195ec0846400d93160e3d0a7ba12948ed841835ee4661f54b0101ae0027affd9c0f660a73244786fecd70e4f609830489a6b95e00d750cf2379734aacbe0
 DIST wayland-protocols-1.40.tar.xz 109104 BLAKE2B 48f5540088dd0c7d4c7824f95707c33eceb7d474f4925f7395040f5364dca58c5638e2d2c1c93de7d8c1e41870f6be11d635d1a8b8da496e6ac3a592c02cf143 SHA512 f9bbab39d5df593f292da7bf44e822b53530d47d5ca63ecb0f454680722c4d39ccae2be88ba97a644f79b4a3cce2af111cad2a8f75fdc199f858dc7eda0cf820
+DIST wayland-protocols-1.41.tar.xz 120224 BLAKE2B cb24920543041c7194b7c9fca8185c130c06669df67119b3102f37ca245c31e03534e5431274869f871780306b8e1f75e08279dbd82c2a7ec13e227ccedc8275 SHA512 6122fe4f20a1a0908abd631ff31302b56018050e5e835c1413d5b40a527980c30859ed9cddf595213f7d5eb1d50baaf6adc312cef9279d60b8a15e447e259863
 EBUILD wayland-protocols-1.38.ebuild 769 BLAKE2B c2a4d37a807bba72de674824610a0a8128390d876af363e86ffd6f2234a5a647fa36e85ec358c0bc8768dd46e2e7f9ba65a809a871144cd57e9b3ea63353de5b SHA512 cb18b4fc2ab33815005544ee2b2cd2f69b633e70c57aa4beb94d21cd51b266dba7821f24cdc0f2691f1ef6e85c83b2fa0ec2e1c440c8419bbf02b23c7ba13796
 EBUILD wayland-protocols-1.39.ebuild 781 BLAKE2B d3a333af6dc0d796c19f269313d246d47ae92c154f14b2c2728e664d30092bbeeecbc4e96b5598363f020e9a3de069fc9cfd9094f1f07ea305e2855e61af61af SHA512 f68d8716f8d6f6dee8464b7a22515565bdfe7528714d2f1b8fab4a84905b8c1ca979de03ca633632c9053af1929494c033a791fcb6dde9951cf1b446aaaa7241
 EBUILD wayland-protocols-1.40.ebuild 785 BLAKE2B 516aaa8cdc7ddd6dea0ba637007fb9cebd0167ab621f69d7eb5fbc36ec23c91d395054d4aa1d414072542039c12746e6819f294944aa36874d054ae260fdfe84 SHA512 c25aab9122161bee4ebd8d903726a445946413ed3cc897fc1f0da1f4112cf70a0bfc7267102a5c908fb32b981f84394db32a57b014c9e6bfd49fba6147516ba0
+EBUILD wayland-protocols-1.41.ebuild 785 BLAKE2B 516aaa8cdc7ddd6dea0ba637007fb9cebd0167ab621f69d7eb5fbc36ec23c91d395054d4aa1d414072542039c12746e6819f294944aa36874d054ae260fdfe84 SHA512 c25aab9122161bee4ebd8d903726a445946413ed3cc897fc1f0da1f4112cf70a0bfc7267102a5c908fb32b981f84394db32a57b014c9e6bfd49fba6147516ba0
 EBUILD wayland-protocols-9999.ebuild 785 BLAKE2B d6d355660e85518b18aa11ab4cdd37ab7e496ce6f91a92cece804e02c4b212ce98ac90e817767aa9061fb3a2ff7986a8b3e71a5f987fe6bf622787ecc94b28e8 SHA512 00f6eddf096ba24aca61fc25200f8e9a8a6bc1b1101b464445f98067bf81b4b078436d25d9d6f5b0f44b0fd3caa54acf6c90848ab548f3130e40f0da695314cb
 MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild
new file mode 100644
index 000000000000..88fd7ea8817d
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.41.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( dev-libs/wayland )
+"
+BDEPEND="
+	>=dev-util/wayland-scanner-1.23.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}