From 0a0b191c7ee5ca47c62135b3a271b619567c1fba Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Tue, 25 Feb 2025 12:34:19 +0100
Subject: [PATCH] dev-python/tree-sitter: Sync with Gentoo

It's from Gentoo commit fcbb79699132efc69452a63025da0ddd1f52caf7.
---
 .../dev-python/tree-sitter/Manifest           |  1 -
 .../tree-sitter/tree-sitter-0.22.3-r2.ebuild  | 58 -------------------
 ....1.ebuild => tree-sitter-0.23.1-r1.ebuild} | 10 +++-
 3 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
 rename sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/{tree-sitter-0.23.1.ebuild => tree-sitter-0.23.1-r1.ebuild} (85%)

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 504c4cfbad..a0d5a62778 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,4 +1,3 @@
-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
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
deleted file mode 100644
index 4c211891b9..0000000000
--- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
similarity index 85%
rename from sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
index 453e180d3b..7daad9224e 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/tree-sitter/tree-sitter-0.23.1-r1.ebuild
@@ -22,10 +22,10 @@ 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:="
+DEPEND="<dev-libs/tree-sitter-0.25.0:="
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,6 +52,12 @@ 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
+	distutils-r1_src_prepare
+}
+
 src_test() {
 	rm -r tree_sitter || die
 	distutils-r1_src_test