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

3 files changed, 10 insertions, 62 deletions

diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 1257a419693b..6f8f59e99f66 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,10 +1,8 @@
 AUX tree-sitter-0.22.2-unbundle.patch 819 BLAKE2B 2190f524ad43240e90269ef475a7290948080d99bf49e0431c0334affa902a4aa6682f9ad723862722606ebf76988089c22adbbcba7d01024a93e96c438dbadc SHA512 4fd8e0b642277c7ea44dfd93d4c4bff46ce8f11cae558d7c5ad189fa69d9676949bd8aff3c468b2fdae4e74a63c08e96f2e1bf8152c58380b2bc66971079fdd2
-DIST tree-sitter-0.22.3.gh.tar.gz 164914 BLAKE2B 7ab97203fed17fc8d18c40d5a24ff60cea4757353a4124c832cc52bff93ed8af913dbbab682225eac309762a26e90c216d2e1058dcaeb860ebd467b4c9655939 SHA512 8ac729b90f942eef07de97c4ebd070c1040f338c1f57a2203b6aa4f3f8db863fdb5183c9b27d5be2ec270d7eefba7665800d6cc4e9265cbd4b4715af4c4d3921
 DIST tree-sitter-0.23.0.gh.tar.gz 167761 BLAKE2B 694e90f608f51fe4f9add476cd5ebcd0ce04a7b027efc4948ce49a6cc0f05ebf4f15e0fe3f365f89f3e04cfec542cb3f1db1e5b05ff7ca23d3134561ea3dcf36 SHA512 67a6f3359c6283c58afcdbe5b6a521cdfcf2585a5361fb69a55eff82941726a143528a402e6d609286d8846c77e20d0a38551525d761e35abb21045ad9c5a2f8
 DIST tree-sitter-0.23.1.gh.tar.gz 168079 BLAKE2B fe3f8d9dae426d7771eab7775d78a0af72e59bf3448005cec1e597a3263b2ac89d7b2c1a80aa12da42db54b242da10d0395673412257d57dff557b2cf4763869 SHA512 39ed2d5d8a737bd72d539701a2dab5abc501b151a3666180f127645895582757eba2ec98607bbeb07bf90377fccad4a93cb385ce16565ed3420908129cea4f57
 DIST tree-sitter-0.24.0.gh.tar.gz 170141 BLAKE2B 3d7f076f947192105be2fc9d93831eb331c1ec189619f6db860db8b6b6c1f2f33cd03edf315c09a5de6637d870351d06d5507d9c0de8a4dadc4e9e863ac233e8 SHA512 471d605cc29bcf7fd228eefe8a3bc2dd39c163d584e941cfd8ac0e498ff1815c7cadb9a7a45c643f704b8c9f12932bcc53597c835e23b5988da087f9a6a59067
-EBUILD tree-sitter-0.22.3-r2.ebuild 1357 BLAKE2B 6ef441096e7b783bf59e5f82b9b021cb903dfeb19982d53fec89de7ff5a7f3094f1fd8ac01d2a1459ab073ff1d840b1e1f59766a763523538b148a541465cc87 SHA512 8ef0bcd3d440797fb7c31c4df0e43d2211394bf1b3c7c8a5eb74abc03b47316fb937dfa7b1da3e7bb4703b62efa3ada72c26e969b1f1e731a3d21c9c066110b7
 EBUILD tree-sitter-0.23.0-r1.ebuild 1508 BLAKE2B d6cb8e272e35d43a5dc1f57019cf3bfa370620cc418b9da4fd08dddaa7be8256ec1fcfa64f5a2711f7694278da0b435379513ebee1afd68a0ae6708751634ac2 SHA512 1cd5ed248ed239100530638334498d11e04b27c56af82d2923a15270e3d790929974c1236d642365e7013bf0c06baf848f53ff26a23b0dcfd45cb70b997bfaad
-EBUILD tree-sitter-0.23.1.ebuild 1359 BLAKE2B 019f820908c811d865c7f4c8cf061490bcb79b749738d081e941cd63f83d8e22aa0902c4901aae9777c1849ba3e3a287ca39c0b6d54836921052a9d700ef0ec9 SHA512 b01a3ab163c799773d9d1dab43fd6228dc133a75231f3a9e4f4799b8efdc2b5e69601cab5b3b28c9203805ee4fb2cbf8539c508e2ca100f3f875258eee9e2fdc
+EBUILD tree-sitter-0.23.1.ebuild 1623 BLAKE2B 54642734c2bd4e23d34ba49cd67c56680a47614ae590c8ba630fa6f056d7fb513b72cd2719736437a84eeb417ed72ab46047064f620b9502ee555bf59148a058 SHA512 7100eb02756056cdc49c592a83e0a288682131c740a82eea55cc24b2ac47c09ea4833ba3ad83a3662a85eca521750abbb95114443617683bd764aadafe8a0e3f
 EBUILD tree-sitter-0.24.0.ebuild 1635 BLAKE2B 4939f4334c8cb60e9eae4bc05f5c2a871dd4fac61d11f886c750566cd7bc8df959cca12cff55b3baa5ed45cf8c789a3b9383bd15a0fa29e452b908e0be02d17f SHA512 e33fb60ae926e3533371af7ea2fd129330f84f1c7eb1f599b22152d3b56207e128ffe53a73722e62e39c14771b00e6dd6f4e5f6debafe5d409eac7761032d21d
 MISC metadata.xml 502 BLAKE2B cad33788db5ede6c0c2ea8dd8b80da09f2f8ccac8d77a1a18d65ba639a91eb9d8a89036a52886777024c4a6dc8775993beeb6eaa790562d698123e5b5b261435 SHA512 fb56c5f39e390363c8a3c80bddff9babcf30c74b86192234153f03ba62e21f1a05b1db925e51a3f4b7876a61a606b051a5314f5475d4ba7092a3f89696a78ac3
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
deleted file mode 100644
index 4c211891b937..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="
-	https://github.com/tree-sitter/py-tree-sitter/
-	https://pypi.org/project/tree-sitter/
-"
-SRC_URI="
-	https://github.com/tree-sitter/py-tree-sitter/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/py-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# setuptools is needed for distutils import
-DEPEND=">=dev-libs/tree-sitter-0.22.1:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
-"
-BDEPEND="
-	test? (
-		>=dev-libs/tree-sitter-html-0.20.3[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-javascript-0.21.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-json-0.20.3[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-python-0.21.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-rust-0.21.2[python,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.22.2-unbundle.patch
-)
-
-src_unpack() {
-	default
-	rmdir "${S}/tree_sitter/core" || die
-}
-
-src_test() {
-	rm -r tree_sitter || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild
index 453e180d3b38..1cec9f1c06e0 100644
--- a/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/py-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # setuptools is needed for distutils import
 DEPEND=">=dev-libs/tree-sitter-0.24.0:="
@@ -52,6 +52,14 @@ src_unpack() {
 	rmdir "${S}/tree_sitter/core" || die
 }
 
+src_prepare() {
+	sed -e 's/ts_node_child_containing_descendant/ts_node_child_with_descendant/' \
+		-i tree_sitter/binding/node.c || die
+	sed -e 's/TSInputEncodingUTF16/TSInputEncodingUTF16LE/' \
+		-i tree_sitter/binding/parser.c || die
+	distutils-r1_src_prepare
+}
+
 src_test() {
 	rm -r tree_sitter || die
 	distutils-r1_src_test