gentoo auto-resync : 04:05:2024 - 00:00:19

13 files changed, 199 insertions, 112 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ddf2cd1dec3d..44362e7b5c5b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cjose/Manifest b/dev-libs/cjose/Manifest
index 24255a9e15d3..d4e03bfc60f5 100644
--- a/dev-libs/cjose/Manifest
+++ b/dev-libs/cjose/Manifest
@@ -1,3 +1,5 @@
 DIST cjose-0.6.2.2.tar.gz 498461 BLAKE2B 4914019652f47ac12745cb3b8914f66cb41cb8da33f83735d866cac816dd8f6475d12fde4a6e3f58456c463cb7c6c6fdfeb4928c232f94e3fa6b1b4c8e5ef132 SHA512 71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c
+DIST cjose-0.6.2.3.tar.gz 500613 BLAKE2B cf5f7f7bcb3e7cfa643a9f9f0e88498874a78cd8799be961a5c1c1ac03f24ef75ec8b0624a7ec4ffa8f9ebedda0e4c35fb0dc72547620b63ada5e719dfe2f778 SHA512 193434afef21fc4889902896d984bf57c64240346de27be94c229491d43e1d309bbb11905be4899fc7f3c1885323ee9480bf30499f37f3174ab9a1e282f5841f
 EBUILD cjose-0.6.2.2.ebuild 767 BLAKE2B 509095bc7568f074ba56e4765bda60800236f870f25408d445b161bfa4396021edeb0988a3e72ff369594665ec0dddb4a233e11530c531789847045821f5c189 SHA512 bec2ddf2e3e04b3b006db61c95e2a8691856145dbb8ff429f5f098a2533f7266a51663b3511a4fa0237385ee57c3b9b685c4696bf3b23b4366fa250888c60de0
+EBUILD cjose-0.6.2.3.ebuild 869 BLAKE2B d8036251059254dcc41afd12feb36065873d61a60f3f83d6b1380b18236b8b1259b69ab7cde2f36b934e5fd0088f1e9addb231bdddae89e290fdd2aff778d6b5 SHA512 fcb8fdcd9e4ce2791b75513480aeabf71533d43dcb3a40fb3795be2c2530f6fee747017ce4ac564a976d824bc724ecbc87a71261b35a26e48cf0c6107f7a2066
 MISC metadata.xml 416 BLAKE2B 01af853bde854a3cbcf4b8e60a5b3528d7e44a296a5cd7957c823db83880abc12caa4595553eabb13a2b4e02c2e19f54c9ee271bdedf73e5f1146da2c3abed9c SHA512 172932aeb3438b969f0d175212817b87079011befc8324aeb60b6ceb958e9f2523a66dbce3df7f194efefe0427b97d76dc2da91daf0c54acbb78c3e8d5b8df91
diff --git a/dev-libs/cjose/cjose-0.6.2.3.ebuild b/dev-libs/cjose/cjose-0.6.2.3.ebuild
new file mode 100644
index 000000000000..e4fd2351b19d
--- /dev/null
+++ b/dev-libs/cjose/cjose-0.6.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library implementing the Javascript Object Signing and Encryption (JOSE)"
+HOMEPAGE="https://github.com/OpenIDC/cjose"
+
+SRC_URI="https://github.com/OpenIDC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/jansson-2.11:=
+	>=dev-libs/openssl-1.0.2u:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=app-text/doxygen-1.8 )
+	test? ( >=dev-libs/check-0.9.4 )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror from the build, bug #922461
+	sed -e 's/ -Werror//' -i src/Makefile.{am,in} || die
+
+	eautoreconf --force --install
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index 0e4d75a3c976..ab8f5752b6d1 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -1,5 +1,7 @@
 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 288 BLAKE2B b0d187c38d6c181e00f2c90e37adffbcacd3d891ffa5cd1d06828a86c43b623304685fb8bf9164e717e2cc93350f6a3a0e02d4679411968d21db4d991a0d5d89 SHA512 386186e2beb2c8dd96a67dd2526e22c18d3e44221e6efef40f019a672ec0f1479c3ed6e936cb5b76e7abd0f23789765a8864370a2f1e42c6a7771e29680b785f
 MISC metadata.xml 560 BLAKE2B afcf7a33574a8bfd53ef9e9fd0dccb8c3b28bfa51b6a4a66c856fc84962710f387af304e6cbe098acfb448f2aaebc0f184c2a87333029219201268fad2622c01 SHA512 4460f6793e83fbadc9dd359211c2cf7d153b9f450f1133cdf2e19e38b1bae33f7010f8420cc81ab2f072674e19595042a22582304b7a67725668c4d517da65a1
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild
new file mode 100644
index 000000000000..c0b00dfcb6a3
--- /dev/null
+++ b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild
@@ -0,0 +1,13 @@
+# 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-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index be3eba602112..995bf25fe7b1 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -2,8 +2,10 @@ DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db3
 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 317 BLAKE2B 5b9adc9136385435beb6e02e3086e2022a5ae41a52200ab9ce550f49b71fbd556a83956774317d8d8a067e4547d8322a2de700f5a3c66f19d1402e8a849371e6 SHA512 541fd096f8aef532cb988f7a6251ed169b78eb54e528808584466d1bc42545126dfdad91bfb6ffbb5e9e3853277d0e1468fa32852a6207f3ea82b2a276f644eb
+EBUILD tree-sitter-rust-0.21.2.ebuild 317 BLAKE2B 5b9adc9136385435beb6e02e3086e2022a5ae41a52200ab9ce550f49b71fbd556a83956774317d8d8a067e4547d8322a2de700f5a3c66f19d1402e8a849371e6 SHA512 541fd096f8aef532cb988f7a6251ed169b78eb54e528808584466d1bc42545126dfdad91bfb6ffbb5e9e3853277d0e1468fa32852a6207f3ea82b2a276f644eb
 MISC metadata.xml 559 BLAKE2B d585950ceaa197145c3a2df759e97a8a50114c0caf0b7492e3e16f26251751f694000acaf6231ae826cfa57e99153eb27f09773d2805af40df4dbd3825dbe46c SHA512 97b7d3b6bcc3da3c7fc6d4111e2a1e02fd84ec778a18a22570ae303052d01b4beebba83eb6df0174bd6fc29b8101d88ee20a5f78b855ce713311d87e1c0be312
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
new file mode 100644
index 000000000000..9eda069afc34
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild
@@ -0,0 +1,15 @@
+# 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="~amd64 ~arm64"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 3d8ad3b9dc0b..2b53951f1b37 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,13 +1,9 @@
 AUX tree-sitter-0.20.9-no-static.patch 756 BLAKE2B 26b67c972575d3fce7d9ac841828e66d395c6b4d81b99023332649e72bb2a0a515b9c257a9927dcb654fbdf20c4b538b5ad39c18f063f47f3de171a2258eecc9 SHA512 0d624ae97d7bbde0a035128b372dc175eb9d0a41871270fb43179356632d040d7827d2d6a073a1f7ecff537c1ec1a647df907c5ee39ab6b8840a1827b7f1808d
 AUX tree-sitter-0.22.1-no-static.patch 858 BLAKE2B 0f3ea5693f55a80af02597c740beee5371b98cbf3c671c203fb5eb916f0454916c995fd3f53cd64942db2efef500e9473edd4ead7320d082b98f14bbb7fb0bed SHA512 90edc87e5cf6039ef86e7e3e3906acea2fc3066f37fffa026c832904effa7c3df546143b7b2465de0f979b3f8750cbb89778f8780b1cce0b529c542af7202f1a
 AUX tree-sitter-0.22.2-no-static.patch 952 BLAKE2B f961ad07850be8c7a7535eac82e234aa236ee7499d2a6e2ea5ee23636bb92f78017b29e74a3ae452f0a4f13611838a5ed4d1b397b1410749264f7e80715d8ac6 SHA512 7d06011b5f5068eb94891d9e116a5d6a3d3023fae999a9766cc19309ae2a4a33d4722074d313efcd87231794ef79d18907e468299da7de4fc4edaacbb9cbc9eb
-DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
-DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
 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
-EBUILD tree-sitter-0.20.9-r1.ebuild 1328 BLAKE2B e4432d8bb3b9781b1ff1daf21c85899450cabaa22021826758a10a4750bf28af87da4ac0c55e4f63521fa6434bd45ab79bc7470ac0148cf8f10d17ae4c4d255e SHA512 2ecbff6a41cf5549c5dadadcfdeee21e5b488eba99ecde07225aa1a5939b3376d3e744d0d1eb14e2ecb0e1d6b6470a8661d2e2989c6bea49840d985c93f49807
-EBUILD tree-sitter-0.22.1.ebuild 1150 BLAKE2B 046ddf28b24a4bf7c4f58e09106dafee717965b7a890ec07124689c3126cecc470b9177c87708d2dadda0998cf17066635f56ba9bca8209205979544727f03ef SHA512 6c03ec0d32279d19198922f8a373f8faf3933c932b372526c1360e4e51d46327ea30e8c647161dcd153b74ec3e6011fc1c6a380d98d4d4b45308e96cdfdbf8bf
 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 1249 BLAKE2B c6e591aa89ecdc32bfcdfed3469cf0d43cbcceabafe86b98e9d89a0674c6359fbea3014590796651d6795f2cb672acf2018c668a866415ef72d1fec1d7f3f7c8 SHA512 138216c37fb57110956423627e4a72593dcfc147cc6f78796aba7268df7ffa1ef770ea06cf6a9d0f8d5a45a05a6e3033872a9e3bd9b4fbdec6daaf7a4f90858c
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild
deleted file mode 100644
index 3c51e4f49aed..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.20.9-r1.ebuild
+++ /dev/null
@@ -1,55 +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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.20.9-no-static.patch"
-)
-
-# XXX: Please, don't forget to check this on next version bump.
-# And, maybe remove as non-needed, if version in Makefile will
-# match the release.
-# ref: https://github.com/tree-sitter/tree-sitter/issues/2210
-# see Makefile:1
-QA_PKGCONFIG_VERSION="0.20.10"
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP=""
-}
-
-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.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild
deleted file mode 100644
index 05b74b9f9391..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.1.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.1-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/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 810aeec2923d..805fe985f7dd 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,7 +2,9 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 737 BLAKE2B e0bdf1021d574b20f29793a757772b9229610ed7f7abf81f13f841c765f05a70e90286f58a904653a05c33274a193408a09b71cf733dbc7ed9c5b19e9c0f4e31 SHA512 8825f9387d7900c2486ecc0d196a3df67333fe27ae9ca83683a56ea57b79248d3da62f5a553664e2d348fb9ad05b651566eada56d26157b471e76b95a81df9a8
 AUX xerces-c-3.2.4-strict-aliasing.patch 386 BLAKE2B e46d17919a85cd4316a8de7f3694523d02bba740a39f2896677ea224e86854ef315b174d4cbd33d67dea445be8b8718c353535a592290e35e70d21213cb53c68 SHA512 fae2dac2de67d5f564088f1d810a26cadf00699a77146f2caed1ddddcd0732d518ad0ab6c1f052d30431da3e3fcf8721f0fffa011c354a9925066cf4d4683f0f
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
+DIST xerces-c-3.2.5.tar.xz 4274820 BLAKE2B e0926660bf29e35c05843aae683a7a4f2fe5a6f5f68c76ce16fde975a24277c0e50465a02bfa785f96f4ebec3c7d411785793914491f112ce19477b5dd59e351 SHA512 77b80148b0a3dbb61af648e2571855d59040512dd0c739a892e8ac6a6d7ddbb43b49850c87c39fcf374f2c7658a9c795b3e3fcd4785efbc6226f831b938d5300
 EBUILD xerces-c-3.2.4-r2.ebuild 2830 BLAKE2B e45c73a6f2639505c25d401f1291133df224b8f8dc95f77e97a607105fb683874fbc53500ad7f6756401e8b857b4782a6cc80534dc1135d86eb9435e809d1974 SHA512 97252a94fdf378e99725cbc9549326892fd89454d29c502509e093f0b2a5c8f7aead9aa49eed387bf8c956efa22348bcb3ad341c2063627416cca6ed546f788c
 EBUILD xerces-c-3.2.4-r3.ebuild 2961 BLAKE2B 96a7e8ee1cbbcd3178d439e51862bcd322e3e46fe7df80de709190bd1338ddc7838f55990a1fd5e778f84817dde55fad8a8dbf9873bffc92e72bc6f6d8b0551c SHA512 49f588de6a49b7f98ec7976a4beceb84c205f37600372972e0d142804d8363de407bf2c88c29c12545284afde03c9db602180e658d24d5cd6211cca97e22ee8b
-EBUILD xerces-c-9999.ebuild 2961 BLAKE2B 96a7e8ee1cbbcd3178d439e51862bcd322e3e46fe7df80de709190bd1338ddc7838f55990a1fd5e778f84817dde55fad8a8dbf9873bffc92e72bc6f6d8b0551c SHA512 49f588de6a49b7f98ec7976a4beceb84c205f37600372972e0d142804d8363de407bf2c88c29c12545284afde03c9db602180e658d24d5cd6211cca97e22ee8b
+EBUILD xerces-c-3.2.5.ebuild 2911 BLAKE2B b9b699470070dc8f225f0dfccfc85c122e0460c5288f0fe59cfb9a2cfd34b81812eade9347fa38028f24d40f92949609798933224909feb5ada062d651e36eb8 SHA512 139d4edbc70dce0bc595cb29a1e0e4244638cc97f4e42b0f5f052221a7f8f39a4ef00f0c1090e40696de342b2a1875686dcc54c77ba25d64c19955878ff75e8f
+EBUILD xerces-c-9999.ebuild 2911 BLAKE2B b9b699470070dc8f225f0dfccfc85c122e0460c5288f0fe59cfb9a2cfd34b81812eade9347fa38028f24d40f92949609798933224909feb5ada062d651e36eb8 SHA512 139d4edbc70dce0bc595cb29a1e0e4244638cc97f4e42b0f5f052221a7f8f39a4ef00f0c1090e40696de342b2a1875686dcc54c77ba25d64c19955878ff75e8f
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
new file mode 100644
index 000000000000..2ff3cf44a5bc
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
+
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
+	inherit subversion
+else
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:0= )
+	virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-text/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+)
+
+pkg_setup() {
+	export ICUROOT="${EPREFIX}/usr"
+
+	if use iconv && use icu; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU takes precedence."
+	fi
+}
+
+src_configure() {
+	# bug #856100
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor
+	if use curl; then
+		netaccessor="curl"
+	elif use elibc_Darwin; then
+		netaccessor="cfurl"
+	else
+		netaccessor="socket"
+	fi
+
+	local msgloader
+	if use icu; then
+		msgloader="icu"
+	elif use iconv; then
+		msgloader="iconv"
+	else
+		msgloader="inmemory"
+	fi
+
+	local transcoder
+	if use icu; then
+		transcoder="icu"
+	elif use elibc_Darwin; then
+		transcoder="macosunicodeconverter"
+	else
+		transcoder="gnuiconv"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-Dnetwork-accessor="${netaccessor}"
+		-Dmessage-loader="${msgloader}"
+		-Dtranscoder="${transcoder}"
+		-Dthreads:BOOL="$(usex threads)"
+		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build doc-style createapidocs doc-xml
+}
+
+src_install() {
+	cmake_src_install
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		# clean out object files, executables, Makefiles
+		# and the like before installing examples
+		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
+			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# To make sure an appropriate NLS msg file is around when using
+	# the iconv msgloader ICU has the messages compiled in.
+	if use iconv && ! use icu; then
+		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
+	fi
+}
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 4e7bce5e9e18..2ff3cf44a5bc 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -34,7 +34,6 @@ BDEPEND="
 DOCS=( CREDITS KEYS NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch
 	"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
 )