7 files changed, 148 insertions, 100 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 639d3a851104..1651c632c8bc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index 0ee09a27b500..1028aefbcca7 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -6,5 +6,5 @@ AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036
 AUX b2-4.9.2-respect-user-flags.patch 461 BLAKE2B e5a9e0293afb7bde189c03677189ef11e0c1c07b8e02d598dc7e4d02f9fe1bf7079e94adb4150cd551ce0bf39b8c5710cb2f6b4bc685588900c4644127836fb2 SHA512 54af91eecd42cc8e5a079e29f1f3d9a8ebc8a6587254038167f531ddb217108d49161689bd45e1ed7e92eb7cfed53addeee2971e16e41d02fe3904b071bd96b9
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3
-EBUILD b2-4.9.2.ebuild 1854 BLAKE2B e17af45defc21419b4248ff77103d9da3eedf3b0245066c8594a5c03c9108b1172124928078ed8f6af636f7691eedd280cf2de1e9cc30eb8568ea5f2839ea36e SHA512 bab0c0fad7228f65110f1a98bcd90779c047bcd7d9e81730e3763ed92facff62c44dd561df2fb8a6bd31059fbc6c6db4166dd3ecce3a937efe60c12cd7d84abf
+EBUILD b2-4.9.2.ebuild 1853 BLAKE2B 04efa1b777c6726d00f91c41f33f4186c02d91052c7bb696c2c27985a6da37fd3aec28fe2f760f6404fe0d244bee4938df961d6e8d835f544a3e4b9d5498da70 SHA512 b0e2605e25e769b84c402fcc2bc816e40cd21e470330ca84558f808c66b7a3df429df994a64b76a9406b6408b193c08e50aaf6711007dbd033c0600bcc2bb8af
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-util/b2/b2-4.9.2.ebuild b/dev-util/b2/b2-4.9.2.ebuild
index 4ba3473c4327..d099df235ed1 100644
--- a/dev-util/b2/b2-4.9.2.ebuild
+++ b/dev-util/b2/b2-4.9.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index fe2650f605aa..90a4fb72e686 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,7 +1,6 @@
 AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282e5d9daf588dbf2c3ee57b71489d34336933a56b9638e5672d70f0d8649b2e55d90658b718e6a917bad74e6e6f0596819fc06e14 SHA512 487bc63e3951e06ffc4b55bed770f6ef82cd8465cacad21ef26c0642547e0663dc879d9b9f8021abf4242bfbf537a24d1e83f97def84511dbd50c88d0cb37480
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST bbmustache-1.12.2.tar 17920 BLAKE2B a91df2d85533de4ad2df661b19e5dea67e84b73fd0192ecac43b8c9163beeb4444872af605ad298b104725687f2a5a2107b0d142a4654213f7b817903c06aca2 SHA512 aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
-DIST certifi-2.8.0.tar 153088 BLAKE2B 1718b805a2c340586c908059bd1e38cc5175f534136efcf6022ba970cd6f00100ef209953aa2718f2b25e76b895ddcf57c71690660f85ea519eb353d24ec612d SHA512 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
 DIST certifi-2.9.0.tar 156160 BLAKE2B b2599590e18da52685fd953b62f54ec1db7fac749d202bd4ec865a5477348bbcb93712af89b9206723da7bd33339461205a43b4cd30f486074b617ddd92ab8cb SHA512 d8c2f62b3b5a626735bbdaf3fb553bafe2cd1c736a378240633f0970c35079ce610ad3458d3e43c79f244c670b5e197554ddf8a71944bdc0975213db693a5583
 DIST cf-0.3.1.tar 10240 BLAKE2B 0a13aca11772ea8b7a9ed6a5908a013b82248a64ca633c616ed75b3ccc0e7d52199480e53519f96c1767ceef9c863da16840ad90d1d7c6235cb6ea3291d35b8d SHA512 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
 DIST cth_readable-1.5.1.tar 19968 BLAKE2B ecaab32aec9e327a2e39ab7312bbaf07c5ab4a88916ed6d84e064897d49f148486b9d95a761d9243cbb8b3cc0a779c9075f1eba179db0ec5e22502176e8c10e5 SHA512 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
@@ -11,12 +10,9 @@ DIST getopt-1.0.1.tar 19456 BLAKE2B 9b9deb22ddb10170603d4743190f80f7152b70b1eafc
 DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86ed3378ec00e023ee63b729e859dfb3aefd521eb50541d4fc3ce70f1425beae8dd32d2dd2adb68618cc57 SHA512 adcfd3fdf69d4926dc1d9c2f0b477c8977bddba8b8ffdbfedcf1b5dc3c1af47b39b1c6263c922a43efede90f145f009d71b27178597320522960c5ebbd84a15a
 DIST providers-1.9.0.tar 14848 BLAKE2B a50e97faee63bb62335005e61e63de0a1b9ebf467f61e316fd0002485fbc6a102689bd0881878db95972a367ac2ee56c603bfcdd0b8e5efc6dfeee7e177fea8d SHA512 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-DIST rebar-3.18.0.tar.gz 436403 BLAKE2B 827fcb8a3fb9f3b93a19260696546697f766ea83a498cf79943568dd811c2afcd05a1c666b6813116428d0c1e6f522617244b69fe19cebda2701efdc3ec68763 SHA512 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
 DIST rebar-3.19.0.tar.gz 442286 BLAKE2B 834bd25fb301a3362ba281638ae5680c1d7315971e85ba1b90cd3f0452ad1d1f6064c0d197d960c1a88af539ddda955bbef6747d71c1c69103af2938a9b28a04 SHA512 43928e2b96ca9361af2ec0b6ceb82f4429e29990054e1cbe2f1d4e293748243d16a8d2b809200ce443408a82fd3227b2cfe02efc14941d1cdd3d3c9a689fa0ea
-DIST relx-4.6.0.tar 75776 BLAKE2B 1e9b6043781ee2835f2cd7ff37755456de63e34702fa1e2d8c5326bc58f953700f1a5acf4b1bf073b4d30ff2587d4fdc505a0c1dc0848675ed98a10b9277df1a SHA512 a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
 DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a670da96c62852df75c9d68236bffee05ce84390f63cef34ee305fffc864bb2a5a4c2acfd02cef2122c27 SHA512 cd7bc3535d012f8e2bf98cf9a68c03425903c137557c18599a27d80722471353623e616787fed791760c0ec6ec51379e060a57777521be33ef84b37b3693f9c3
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-EBUILD rebar-3.18.0-r1.ebuild 2462 BLAKE2B 9bdf8762c0a0dedf4ebb5626b5403dbcb847b97cfaa18474fa91d815a816b7c9f926a7e3fd78be27c8fd03f81efaa131e391366405ce053171bebc6c8bdcdd8e SHA512 a005414b5f1fb40fd17a5fa4e0233d50e20d7750cc5eb95831af2090a136fa2f09a1d841690787814636ada855b760cb3303fc0c547ce7af7ee8bbd2b334287c
 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.18.0-r1.ebuild b/dev-util/rebar/rebar-3.18.0-r1.ebuild
deleted file mode 100644
index 06e277d964b5..000000000000
--- a/dev-util/rebar/rebar-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN}3
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
-SRC_URI="
-	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar
-	https://repo.hex.pm/tarballs/certifi-2.8.0.tar
-	https://repo.hex.pm/tarballs/cf-0.3.1.tar
-	https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar
-	https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar
-	https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar
-	https://repo.hex.pm/tarballs/getopt-1.0.1.tar
-	https://repo.hex.pm/tarballs/providers-1.9.0.tar
-	https://repo.hex.pm/tarballs/relx-4.6.0.tar
-	https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar
-	test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
-"
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-LICENSE="Apache-2.0 MIT BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/erlang[ssl]
-	!dev-util/rebar-bin
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# The build directory (where dependencies are usually stored) gets
-	# cleared before each build.  Make the fetch function first look in
-	# a _checkouts directory before going out over the net.
-	"${FILESDIR}"/${PN}-3.18.0-bootstrap-vendored.patch
-)
-
-src_unpack() {
-	# Unpack the rebar sources like normal, but extract the hex.pm
-	# dependencies separately.  The outer tarball contains another
-	# tarball named contents.tar.gz that actually contains the code.
-
-	local archive
-	for archive in ${A}; do
-		case "${archive}" in
-			# Assume that the .tar files are our hex.pm dependencies.
-			*.tar)
-				local dest="${S}"/_checkouts/"${archive%-*}"
-
-				mkdir -p "${dest}" || die
-
-				# Extract the inner tarball
-				tar -O -xf "${DISTDIR}"/"${archive}" contents.tar.gz |
-					tar -xzf - -C "${dest}"
-
-				assert
-				;;
-			*)
-				unpack "${archive}"
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	./bootstrap || die
-}
-
-src_test() {
-	./rebar3 ct || die
-}
-
-src_install() {
-	dobashcomp priv/shell-completion/bash/${MY_PN}
-	dobin ${MY_PN}
-	dodoc rebar.config.sample
-	doman manpages/${MY_PN}.1
-
-	insinto /usr/share/fish/completion
-	newins priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins priv/shell-completion/zsh/_${MY_PN}
-}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 4ce20735cf54..73a20c936105 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -83,6 +83,7 @@ DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
+DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab SHA512 dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
@@ -107,4 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
+EBUILD tree-sitter-cli-0.20.7.ebuild 2898 BLAKE2B 4ffc144fb80272cb2e461f19c0c01d060ca1925b41799402e61853280c3116c04f6c3231b117777e64ccf93df480a1a4914d8894e21533bf8b7264499c242429 SHA512 175579886d081b8862c09f46542750e689a59a87e5982249ce92b9ff43d5118e85e2057941fe7c15bf023bb8143cb9f05bcce5cedfd2850d7eea658e8e931b25
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
new file mode 100644
index 000000000000..6ee876a33d2b
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=tree-sitter
+MY_P=tree-sitter-${PV}
+CRATES="
+	aho-corasick-0.7.15
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	anyhow-1.0.40
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	ascii-1.0.0
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.11
+	bumpalo-3.6.1
+	cc-1.0.67
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chunked_transfer-1.4.0
+	clap-2.33.3
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.8.3
+	ctor-0.1.20
+	diff-0.1.12
+	difference-2.0.0
+	dirs-3.0.1
+	dirs-sys-0.3.5
+	either-1.6.1
+	form_urlencoded-1.0.1
+	getrandom-0.1.16
+	getrandom-0.2.2
+	glob-0.3.0
+	hashbrown-0.9.1
+	hermit-abi-0.1.18
+	html-escape-0.2.6
+	idna-0.2.2
+	indexmap-1.6.1
+	itoa-0.4.7
+	js-sys-0.3.48
+	lazy_static-1.4.0
+	libc-0.2.86
+	libloading-0.7.0
+	log-0.4.14
+	matches-0.1.8
+	memchr-2.3.4
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.7.0
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	ppv-lite86-0.2.10
+	pretty_assertions-0.7.2
+	proc-macro2-1.0.24
+	quote-1.0.9
+	rand-0.8.3
+	rand_chacha-0.3.0
+	rand_core-0.6.2
+	rand_hc-0.3.0
+	redox_syscall-0.1.57
+	redox_syscall-0.2.5
+	redox_users-0.3.5
+	regex-1.4.3
+	regex-syntax-0.6.22
+	remove_dir_all-0.5.3
+	rust-argon2-0.8.3
+	rustc-hash-1.1.0
+	ryu-1.0.5
+	same-file-1.0.6
+	semver-1.0.5
+	serde-1.0.130
+	serde_derive-1.0.130
+	serde_json-1.0.63
+	smallbitvec-2.5.1
+	strsim-0.8.0
+	syn-1.0.67
+	tempfile-3.2.0
+	textwrap-0.11.0
+	thiserror-1.0.25
+	thiserror-impl-1.0.25
+	thread_local-1.1.3
+	time-0.1.43
+	tiny_http-0.8.0
+	tinyvec-1.1.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.17
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	url-2.2.1
+	utf8-width-0.1.4
+	vec_map-0.8.2
+	walkdir-2.3.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.71
+	wasm-bindgen-backend-0.2.71
+	wasm-bindgen-macro-0.2.71
+	wasm-bindgen-macro-support-0.2.71
+	wasm-bindgen-shared-0.2.71
+	web-sys-0.3.48
+	webbrowser-0.5.5
+	which-4.1.0
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+$(cargo_crate_uris)"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Test seems to require files (grammar definitions) that we don't have.
+RESTRICT="test"
+
+BDEPEND="~dev-libs/tree-sitter-${PV}"
+RDEPEND="${BDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
+
+src_prepare() {
+	default
+
+	# Existing build.rs file invokes cc to rebuild the tree-sitter library.
+	# Link with the system one instead.
+	cp "${FILESDIR}"/tree-sitter-cli-0.20.2-r1-build.rs \
+	   "${WORKDIR}"/${MY_P}/lib/binding_rust/build.rs || die
+}