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

2 files changed, 17 insertions, 28 deletions

diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 5d3fa86a966b..3214087d2016 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,23 +1,17 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
 AUX tree-sitter-0.21.0-unbundle.patch 516 BLAKE2B 9bee97b5563088af7ff31aaa9da2e2a0a5ddb54b84d5520994df5a6e9e8472e166ce50c23c7c77e1f495cc3139a532c710dc95e17c5ddcb35c56072538931a99 SHA512 9a583f4c4eb614afb7e6d6961cdf0390a0d45f54b0860a59fe6f2dc4fe0fdce0767fb2c5bd809ffc5aa7ce153c79b162dcbb41e05e0d7540614ab23da5889c74
 DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
-DIST tree-sitter-0.20.4.gh.tar.gz 36177 BLAKE2B 617b649c33c73b313034269db7adb7eaf7294195d7c7eaf91182db6844111877fc9745f31185af1c6f2406fad3d0379c4776f76bfb6c43037be918fd34cef12a SHA512 28a2042fa9f7ed43202548b9844126383b36796650e1eb815c138a25538dae12b16512c3cd45f02fa99b32a29c8c7257bb84d901da1e5ebbf6445e3778d7dfa1
 DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
-DIST tree-sitter-embedded-template-0.20.0.tar.gz 11679 BLAKE2B 552c64a499b80f1648cd568fd87d5f2774a28cb3d2a61bfc0ec1f9a73910df41921e06c8f94ac5500a3a5b7668a2b8fe641b2ecf13a9b06b7a119daeef4e3b1a SHA512 1c4a63f85fae1ebb9fa90674a4c27d4402ae0957268faa08dd77c5ec6103720c80befd009d04090a80d994377676b103e2efcc25bd291186efc0c1f4962be086
+DIST tree-sitter-0.21.3.gh.tar.gz 38504 BLAKE2B dd8ed0047763d92babbdb3fd34a6fe6b7a9299b99067600f473bf16b9754a98ada141d96f9b6b26abcb2ff178dd4ec34da547c9cdb7b3449f7b98a44ad10476e SHA512 61f3d4cb15a4106eb350be2adc6ad39de31bd5b2656f35acf2cdf828ababac37b6197d5565ee74b0b2c3a161619163bb98c38108ca3db616fee633e6e2a835a7
 DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
-DIST tree-sitter-html-0.20.0.tar.gz 26098 BLAKE2B 524aed631fa7a2e6da59fae05af99b74019222d7c93c44f294af5f36c7f2c8582c847324bcef3b6bdc719e5fde1d015bb2633a81d3123eb1120ba0909282af28 SHA512 fa688d8c5487d894ff9bfdd549095cc9bf01dbf667cc3f05c07a1d10343178666802deae79ad1040866ba74d26bf415814bb5324632ce0ea8c1b4c663252e649
 DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
-DIST tree-sitter-javascript-0.20.1.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
 DIST tree-sitter-javascript-de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz 396570 BLAKE2B d80cecb070bd1c82737ee1d38fff293ac4c96fde02563ecc910d30c920b902bd5c25a7ac50585f8cb7a26203d98f4a9e6feeebd4ac0d54bede9486ff642e03be SHA512 4a509a886ebeae0d960360113aff89fb56090f1fe4bb5a7866952736a04838a8b6421cc7d19473acc48b135bca4615325c59c0f0f7f3734f23a78fff9cc2050e
-DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5
 DIST tree-sitter-json-3b129203f4b72d532f58e72c5310c0a7db3b8e6d.tar.gz 15580 BLAKE2B d31b38f959fed785e8f26782e7de3da94502cd3c65de2caf4ad0621287d80e95dcc317b4f224461fa70b59f7a8ca933a235bdffbbcc1d9ca8d7cc0b31b3b2862 SHA512 90dd3e757d384d1b95cec892c5b465a0413ba61df35669fd7afc47037596c8d6b72b4f0fd9a39512ebda0d5d078ce7a408455ae11e535591e1515740cdcf9f6f
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
-DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
 DIST tree-sitter-python-03e88c170cb23142559a406b6e7621c4af3128f5.tar.gz 272632 BLAKE2B 72f2e7f48456bad7b495605171c1c5ed3aa2790e832a4bc152ef522ee2ce210a922f7d38ad1154c58a8c621f81739071ab3404135dbb79a12ba28ca7c97ff3c7 SHA512 7ed72e6ad464935423aaca1a829c51eefd4a4b5651eeda4b7f1ed2a67ec4088f17267796872a1e1cf5666fc8a920c2b1763a9cb4cd82924ee7214e01d7fe8ab8
-DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
 DIST tree-sitter-rust-3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz 419237 BLAKE2B 681b9656c872bcd15abbf11923d07df61b80b36b2972461a29f249dc53915e6d18a6dfdc65d71c863f7b38a27c8b3a47376f590d86afa44caa71f103e710fed5 SHA512 a8ce10080b984aa469d952ff8e862165676e10dc30c3d1762f7141d9fe83734aec3cb92c48552cb8f24575b538dd53fe0a80f1337f5d0d4c8767dd6bf564143e
 EBUILD tree-sitter-0.20.1-r1.ebuild 1472 BLAKE2B bfcd5ebcb8b1a1a1e799de1918da3c786e8da7e6a729f0054c1e49c0e0fdf273d58522896b54b385cea4733fefea5c01f39261de90156ef7dfd7a9503eb225a1 SHA512 2f9a69474f454d0e24e669f6bffc577ce5073cc20e8d8c3e609d048e8ef9e4eeaa6d3c8a39b3b9c066f8a67598aaf6171fb414cf20088f12d685127c515ddb5f
-EBUILD tree-sitter-0.20.4.ebuild 2136 BLAKE2B 80e60108f41f61da2709ff43f7163c4af34582c301d0291b6ac0fe37777f924b1a1e80e2a4938a46056b197dcd56ec00ddafd24a97ef679c86ec72b26e731a2c SHA512 cd290179f968897298c4f262ad68915dcfe4d8ff64f8b526752d6a8c208622bef6949d7c96b722819cfa16255713f44abfce72dc60ed52a22e92e781c6687c66
 EBUILD tree-sitter-0.21.0-r1.ebuild 1974 BLAKE2B c07f2e9198a614319aa32dcb055cb34dd563546635606db5edcf296d0455e29fd8e6d6c69c285d3b5da6a0bda336de18e91817c3d5bdad5196d3154da68bd559 SHA512 7dd20fedd2de6d0e5ee546d6ecb14c145baba58587ce68dbcf50786ae06a2b58ac26dd0c423fad23e86a3b9cc635859afad118f1ac375275e7687b3f36453ecc
+EBUILD tree-sitter-0.21.3.ebuild 1981 BLAKE2B dc55662ac169854a85d177ac9d23007ed9c4bb52e10e8729da68991b9e7d5d70df5979b008e88052d01072f4655e0f419879b28653faee49f79b41185b3ab5ce SHA512 2a1de2831590e26cee3b053799cf32b228e33726bd0cc83d0cc619f237ac04d605f4240e382891f468818ecd8d6558b50f822ee7305417d9172cbf3f891e6c43
 MISC metadata.xml 502 BLAKE2B cad33788db5ede6c0c2ea8dd8b80da09f2f8ccac8d77a1a18d65ba639a91eb9d8a89036a52886777024c4a6dc8775993beeb6eaa790562d698123e5b5b261435 SHA512 fb56c5f39e390363c8a3c80bddff9babcf30c74b86192234153f03ba62e21f1a05b1db925e51a3f4b7876a61a606b051a5314f5475d4ba7092a3f89696a78ac3
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild b/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild
index 504c48453be6..2a0762d99fd0 100644
--- a/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild
@@ -9,15 +9,14 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
-# If you get failures from using the latest, check the language used for
-# the failing test(s) and roll back the individual fixtures one-by-one.
+# Use the versions from the submodules under "tests/fixtures/"
 declare -A TEST_FIXTURES=(
-	["embedded-template"]="0.20.0"
-	["html"]="0.20.0"
-	["javascript"]="0.20.1"
-	["json"]="0.20.2"
-	["python"]="0.20.4"
-	["rust"]="0.20.4"
+	["embedded-template"]="6d791b897ecda59baa0689a85a9906348a2a6414"
+	["html"]="b5d9758e22b4d3d25704b72526670759a9e4d195"
+	["javascript"]="de1e682289a417354df5b4437a3e4f92e0722a0f"
+	["json"]="3b129203f4b72d532f58e72c5310c0a7db3b8e6d"
+	["python"]="03e88c170cb23142559a406b6e7621c4af3128f5"
+	["rust"]="3a56481f8d13b6874a28752502a58520b9139dc7"
 )
 
 DESCRIPTION="Python bindings to the Tree-sitter parsing library"
@@ -32,7 +31,7 @@ SRC_URI="
 SRC_URI+=" test? ("
 for fixture in "${!TEST_FIXTURES[@]}" ; do
 	SRC_URI+="
-		https://github.com/tree-sitter/tree-sitter-${fixture}/archive/v${TEST_FIXTURES[${fixture}]}.tar.gz
+		https://github.com/tree-sitter/tree-sitter-${fixture}/archive/${TEST_FIXTURES[${fixture}]}.tar.gz
 			-> tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}.tar.gz
 	"
 done
@@ -41,19 +40,20 @@ S=${WORKDIR}/py-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-DEPEND="dev-libs/tree-sitter:="
+# 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)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 PATCHES=(
-	"${FILESDIR}"/tree-sitter-0.19.0_p20210506-unbundle.patch
+	"${FILESDIR}"/tree-sitter-0.21.0-unbundle.patch
 )
 
 src_unpack() {
@@ -61,16 +61,11 @@ src_unpack() {
 	rmdir "${S}/tree_sitter/core" || die
 
 	if use test; then
-		mkdir "${S}/tests/fixtures" || die
+		mkdir -p "${S}/tests/fixtures" || die
 		local fixture
 		for fixture in "${!TEST_FIXTURES[@]}" ; do
-			mv "tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}" "${S}/tests/fixtures/tree-sitter-${fixture}" || die
+			mv -T "tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}" "${S}/tests/fixtures/tree-sitter-${fixture}" || die
 		done
-
-		# In 0.20.4, this test has a comment saying it's broken, and changing
-		# tree-sitter-python (grammar) versions doesn't help, so presumably
-		# newer dev-libs/tree-sitter broke it. Revisit on a newer version.
-		sed -i -e 's/def test_point_range_captures/def _test_point_range_captures/' "${S}/tests/test_tree_sitter.py" || die
 	fi
 }