From 74ed5f718d631f744e0bd22a299d8673da3ecba6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 3 Nov 2025 07:07:59 +0000
Subject: [PATCH] dev-python/tree-sitter: Sync with Gentoo

It's from Gentoo commit fc5c2ddd32824e93238cb9ebe7734fb214094237.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
---
 .../dev-python/tree-sitter/Manifest           |  4 +-
 .../tree-sitter/tree-sitter-0.23.0-r1.ebuild  | 67 -------------------
 .../tree-sitter/tree-sitter-0.23.1-r1.ebuild  | 64 ------------------
 ....1.ebuild => tree-sitter-0.25.1-r1.ebuild} |  2 +-
 ....25.0.ebuild => tree-sitter-0.25.2.ebuild} |  2 +-
 5 files changed, 3 insertions(+), 136 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.0-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
 rename sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/{tree-sitter-0.25.1.ebuild => tree-sitter-0.25.1-r1.ebuild} (96%)
 rename sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/{tree-sitter-0.25.0.ebuild => tree-sitter-0.25.2.ebuild} (97%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/Manifest
index 335acadcc5..d3329791d7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/Manifest
@@ -1,5 +1,3 @@
-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
-DIST tree-sitter-0.25.0.gh.tar.gz 173820 BLAKE2B 63dbb9992fb6c4212a7a7cffd44b852d94d78a9699ec856807ce333ac494409f7dcd5cf3d8b0fdfa03c03a484ed3d5b0ee51c3847667474a04c811ae561f0918 SHA512 357a0aa1c9393f9ec1a056e87b54e5178abbd6b2525a863b2ed5ba788337a9ae555a52092fe89803215487d324e287f2c2cbe2d60f878e1c053cf6b41a387eeb
 DIST tree-sitter-0.25.1.gh.tar.gz 174288 BLAKE2B 2580e7909e28ea05dfe8a015eb0e26d465318a0962666dc8de3d82d80c7647a62398abee093ccea13a04119e685dac3365ed098a70f7c50fac383cef34f7cb62 SHA512 37a6035921d44a13ef2128c8ff5dd7d8424dd50c1b5089a143ecfd921848304d91339d17108fa9e2f7ea0a6755b03413061ed6a6561ef1d8473534e8cf4636ef
+DIST tree-sitter-0.25.2.gh.tar.gz 174357 BLAKE2B c136098245beff521e7bf26b58b0cb4adfcfbec05ad59f62949c422c414cd879a973390875c285b014593790a5fb243863cc2b82dbecbf3297f24b394b06350a SHA512 ee0ee294cd3380442bb6f4f62413590818bfa4afbde1601bb89c777e97dcee885a22a06e529913c2fb08d082f5de775ced9403ffd5d2ca35dcfd0b19072ee452
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.0-r1.ebuild
deleted file mode 100644
index feee18f4ef..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 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.23.0:=
-	<dev-libs/tree-sitter-0.24.0:=
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
-"
-BDEPEND="
-	test? (
-		>=dev-libs/tree-sitter-html-0.20.4[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.23.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_prepare() {
-	default
-
-	sed -i tree_sitter/binding/query.c -e 's/_PyErr_FormatFromCause/PyErr_Format/' || die
-}
-
-src_test() {
-	rm -r tree_sitter || die
-	distutils-r1_src_test
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
deleted file mode 100644
index dd869eeef9..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2025 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.25.0:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
-"
-BDEPEND="
-	test? (
-		>=dev-libs/tree-sitter-html-0.23.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-javascript-0.23.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-json-0.23.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-python-0.23.0[python,${PYTHON_USEDEP}]
-		>=dev-libs/tree-sitter-rust-0.23.0[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_prepare() {
-	sed -e 's/ts_node_child_containing_descendant/ts_node_child_with_descendant/' \
-		-i tree_sitter/binding/node.c || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	rm -r tree_sitter || die
-	distutils-r1_src_test
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1-r1.ebuild
similarity index 96%
rename from sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1-r1.ebuild
index 48db0a0984..545153ac49 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.1-r1.ebuild
@@ -25,7 +25,7 @@ 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.25.0:="
+DEPEND="=dev-libs/tree-sitter-0.25*:="
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.2.ebuild
similarity index 97%
rename from sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.0.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.2.ebuild
index cee8a94c10..0a78ecfd47 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.25.2.ebuild
@@ -25,7 +25,7 @@ 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.25.0:="
+DEPEND="=dev-libs/tree-sitter-0.25*:="
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]