gentoo auto-resync : 28:08:2024 - 12:00:19

18 files changed, 570 insertions, 209 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c8a2b332784f..ce1efc9e7387 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 15fa131427a3..e869d4438df9 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -2,8 +2,10 @@ DIST conan-2.0.16.gh.tar.gz 1000880 BLAKE2B 0ebc7df66e97a8f29ade9d1ffbde5b0f6ed4
 DIST conan-2.3.1.gh.tar.gz 1078426 BLAKE2B a3a92342a2cfabc9dd4c22d1665d092dd2a33be8fdd4c3e7243557b845fda8910d713bc34b59d1e4c2b2ead957ef0ff8ad0d23fa80804c9d842b5f9c944323c1 SHA512 405d9979bc79b684509aa756c2aa50decd1b9194e5c7b847b6a9755daed9941c7b9615cf518aedf920eeea0de6dfc194e36b90c2919060a3f276f53692a3fe5c
 DIST conan-2.4.1.gh.tar.gz 1092566 BLAKE2B 7b97f9a274075bf3e9396eba9e3dc4d155c171685fb204c885877ad10dba3f751cab5a28e220d3df3b803aa8f80d080c63c37801ada4b1691724bb8988f34c97 SHA512 b51d491be8202eb7fd60e5d2aef63bd9f43311da73f36edd615210222c32160f35af81ec47351e7762b6583a6d3f6230020130866e0450320d87047439de2767
 DIST conan-2.5.0.gh.tar.gz 1105167 BLAKE2B 2a4a3aba324b3aee968dde721e3659470912ce82eada0c9ffc37c4ff0b4c4b78b2927e3e9cde1f52b1104a3f3e8e32b3d7450643a83c14958c035051a63386a1 SHA512 685cafd0d1ba179d84b7e0e37d0ca5ce95e320e025132e62f3a128a68b085eabeff47bbc0b129d5b8cee17f2955014cb4073b7e648d9f9ccf56c1ee377625e18
+DIST conan-2.6.0.gh.tar.gz 1108424 BLAKE2B d9883900e4c09c2332bc6c3a186c2e010cde237d2b20249317ffaee3bfb182620acac7ab40303fd00810d6420a9676155d09693c89fe5c8a8917144ed654bcac SHA512 7deb8498d992fdebacd8ce8bc77e63089c9389200f010f0e099c73beb22c524c2d288ae643cdddc0cb3ec8494c1f7365fa834ec159c015063cc6fa936e6eb312
 EBUILD conan-2.0.16.ebuild 1607 BLAKE2B f48a0c2670d21944a56e7b0027fb58cdb52a0fb278cb2ba73f328bfc4290d72968cbae2baaa38dc9d782dfd499694894fe97e181b7da5f387cbeda51782464c2 SHA512 3cc9a804afb6ef2f4666d781b2f8fc983dbce1219fec4b97f0be408e27894954caa78373c3fc86c5e5c1405fca76df7b0c16285b2b840dae8cb927c07564516e
 EBUILD conan-2.3.1.ebuild 1279 BLAKE2B 3d9760ef60261ee50e5ca4a7f7a05b95d47a43f609ac8c72080c523eb1a17dfca7845412fec409dd5a63fe9ab810a663c4742d97f40ff739979aab601dc817ee SHA512 0a880e35e07b38d04dba7c2f5a943703c58213cbd8be58207ebb6fe6a27d41685fac17f258e5e8ba92a1077439f8b129d4e08dec1ce3ca2b0c3fa0f84769648f
 EBUILD conan-2.4.1.ebuild 1414 BLAKE2B 96b85c18d157692034513d4eff1a8527ed40022f1ebda293ad2209bad0cd470d309a349c72ad872ac314769d2300cfe2e2b6a6e8f95dd04eb5f15792ae7c37ff SHA512 dd89909c5431bd38bec2c499ae6758904a93af0a3f596eb208ba9349b979a3615127ca43a32e1b3d03814b63624dd4465d33948476a23ae87102e8c1a74a7b44
 EBUILD conan-2.5.0.ebuild 1414 BLAKE2B 96b85c18d157692034513d4eff1a8527ed40022f1ebda293ad2209bad0cd470d309a349c72ad872ac314769d2300cfe2e2b6a6e8f95dd04eb5f15792ae7c37ff SHA512 dd89909c5431bd38bec2c499ae6758904a93af0a3f596eb208ba9349b979a3615127ca43a32e1b3d03814b63624dd4465d33948476a23ae87102e8c1a74a7b44
+EBUILD conan-2.6.0.ebuild 1414 BLAKE2B 96b85c18d157692034513d4eff1a8527ed40022f1ebda293ad2209bad0cd470d309a349c72ad872ac314769d2300cfe2e2b6a6e8f95dd04eb5f15792ae7c37ff SHA512 dd89909c5431bd38bec2c499ae6758904a93af0a3f596eb208ba9349b979a3615127ca43a32e1b3d03814b63624dd4465d33948476a23ae87102e8c1a74a7b44
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-2.6.0.ebuild b/dev-util/conan/conan-2.6.0.ebuild
new file mode 100644
index 000000000000..81aeecdcf691
--- /dev/null
+++ b/dev-util/conan/conan-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
+"
+
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+		-e 's:==:>=:g' \
+		conans/requirements{,_server}.txt || die
+}
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 636fcd004719..608920bd829b 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,7 +1,9 @@
 DIST lttng-modules-2.12.5.tar.bz2 317002 BLAKE2B 9f42f8641dca7ce55e7445495c747ce340919458a23b4d471998fe2a28dd26bc7dfa5edbccf0b11877176091dee0c4d63fdda919c03afc8dad3fcfb7e9529c33 SHA512 81524dac513384852555a6f5619dc10286a2f7d4e3032ee9ca33705e830ee3bc3dc8c96b89a9c09dd5df2bf29944e3e566d1ac1a6cd6be83718af9836e043991
 DIST lttng-modules-2.12.8.tar.bz2 319450 BLAKE2B 0ce5c6675598c1a4b6fbc0dfaf51d36638f12fe2e07095c37a811db8d7ee65bb242164cf02b1854c27b6894f0b4c73867e8ee1b80dd007290e0db203ea429f9e SHA512 5918a54d08a12cec567cdad2909846ba529d5e665a3592a69384d9546f6f3e23e7975876fc11feaef65604d36889b0598b1cf7b5f2badb4e2b11b255a2e7ca99
 DIST lttng-modules-2.13.10.tar.bz2 350692 BLAKE2B a7596586adb63e3d7cdd849b4e6a4812409749c7e84f081d5367f3d5393884f8ae3e945597500336befac14191e84179decfd5153dff6cdcaed2d041055c268e SHA512 21c21bc186c0cf8465e411fdeeb09ce9f11fc0499915abaa086a2143ddc69905805b83847dad7e7c54aef4e61a9fc5507af5f25e478b2edd387309c7ca525b6f
+DIST lttng-modules-2.13.14.tar.bz2 355555 BLAKE2B 477947e83daf4f838453d82292f73cb24030639b1394fa586271285e0d1604d8098b1869c5cdcf2a1f55f9916e98a2f2e0dd005ca2d17c76db5362e38a29e993 SHA512 521c19cbdfa8e6f9d06f1a06312aee201823e1a7d1987f3de5d9dae08163cc8b51daff1bcbcbe79261ed8ded7232857136e7d0d4ebc05a3380b7377d43c1ee38
 EBUILD lttng-modules-2.12.5.ebuild 1003 BLAKE2B f832e877110422709d9b00c3b0dfdecf26d76e2c1d9e3d09db14aeef0a2b5b1709b3717b0f6997d4c9500e13c898e708bf24629ee07f09af46d78c42d290b804 SHA512 5575233587c9ef25a6bce7efb18a0a561f33be5eee32dc4f6151f50ab83bf722c7c6bafff3940bc66678cf89e5166f819c1781463b00641fe131c4740169afdf
 EBUILD lttng-modules-2.12.8.ebuild 1005 BLAKE2B a8e08c5a03b608ef3797e7311b25a0a240a4b488122bf6e7687b948d426b110028ba697b6768931e79832cc4c3cbe559211e90f8255854e9b683552f6ae13249 SHA512 99a879768a3be075681fe53e4654b0cca58176179e89ae23f68010c4b762583cd0983d5141ffc19db8bbeed631bb5d887354e28230cb4846209fefcbd1131009
 EBUILD lttng-modules-2.13.10.ebuild 3243 BLAKE2B 3c71de7d290e32ec9d55ae6c87e1ad76094605902ae9f8a165cf3ada0d980e1ddaefa4d87ea9682b3014d5284d31186522eed4ad6f3bca16c7e6a5682e043d55 SHA512 cfc3d7f10bd2ccd896b81771232b6ed155159cd4b00c9e26605f2cc9a70bc72b9dde47a1b17b12837659d3d9a0718fd156d6c4816c6c17eba548ca7f97596436
+EBUILD lttng-modules-2.13.14-r1.ebuild 913 BLAKE2B debe7ec3ff43d6937ca9ecd7e60ed209e99af067c73f710341b5449386a4741e34bbcda9c8d33b4997ca5f142db004a0ee8c87d6e0cd28652d5514c3a595fc3b SHA512 1b4b423517c1abd93dd85c2bbe5c68c840806a932d6e6dc7d932184bc83f4edd21789f5724153a2d05d9f267f4f3b62cd85a45580074252c21aafe4ddaaed6f1
 MISC metadata.xml 706 BLAKE2B 69e1d3140cfc273f7a25098d0223a06548be4ff8d311c8b4cdbd9149d3bf0909d28c1c36b004ee055fd5f900a6c695bf64ec70ae74683da7677d2730d4096935 SHA512 15557b8ab069ff67273e7d05a836ae0875220705109150f2f1371e31eed5d4f398c46549a418e06651aca48f72a2b2411a12aad5f21f9544398cd8e217ad5162
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild
new file mode 100644
index 000000000000..3309c26ea9f4
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump the following packages together:
+# dev-util/lttng-modules
+# dev-util/lttng-tools
+# dev-util/lttng-ust
+
+inherit linux-mod-r1
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+MODULES_KERNEL_MIN=3.0
+
+src_compile() {
+	MODULES_MAKEARGS+=(
+		KERNELDIR="${KV_OUT_DIR}"
+	)
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" INSTALL_MOD_PATH="${ED}" modules_install
+	modules_post_process
+
+	dodoc ChangeLog README.md
+}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 014de8ed8107..0e8532a821db 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,4 +1,6 @@
 AUX lttng-tools-2.13.9-slibtool.patch 4024 BLAKE2B 38aae443574440c9efd3b895c55e7a2e482d0dc1ba27f0bddfe43170a5b1fc20b8be436ce31005bac71c33bf9c312197bde07f20a7e721426f2ed943309a5890 SHA512 186ec460c30de9696685769e0bdba8dcf5f55b13e0bbf1565f087f7ec5381cf4de90795d6fa703136ed0f06ab51931911f30518ff8c6088753d91323be20e3b2
+DIST lttng-tools-2.13.14.tar.bz2 1932238 BLAKE2B f079051502d01ffc67c4f8f0bbcdf3a4428546c652dcc352918c4908a37aeb510dd66309306cec835297c8d2f276e5cbd22ea4efef6866d3c0c0cf8651d68ef8 SHA512 61bdebb539cfb4eb61c9806e98742f39dc032d849b03d90cdb98d1891bd5bfbd0cb1f54bbc7bf79a11505ce7fee558497312d650bb41f11f739884e7cb8a750f
 DIST lttng-tools-2.13.9.tar.bz2 1892293 BLAKE2B 51c4824435164196a77c8b6b3072810df83caf488c5fb692f9990b8d743ced2b07bffffa1e5a671149c75f3d96267f9c92f042c6c13503e03894f4c352c1733b SHA512 ff7a395d9af3fc44561be24163a84ce27ddd1338f7df2805037645b98c4ad17496553f17b8f0ede7bee967d630b53000c080a91ea8e1ced25ce86b010941b94e
+EBUILD lttng-tools-2.13.14.ebuild 1095 BLAKE2B 3e6b77692cf793d257946a422a51497211ee0b574d13d8b8f07d89fea0fe5fd006e8da1ae6fe1240cfd737eb289c95a526a18effbfeab025c07a1716c0e4ed5f SHA512 4cf128f283305260445a1dee09ebf89d8cc1eb37df404eb947bafd2b8fb851810e5e1d399891411f1fcad9493ff261101c2dcfe04a35b3807a34e488c8a3756a
 EBUILD lttng-tools-2.13.9.ebuild 1275 BLAKE2B fb7f1d283dd76ce53f640d0c9792fac41b2098b7550119191ee6137647f8b25bf3c0226a2374770064d054b57a53a2e42e3ba57421dae276c5950b3666ea9e2d SHA512 67c26d3b67801b2c4651c08f40eea7ac775278e712e87c1ad564ff0b8a5dc5f8a7cc0d9e5112de0266207428491bc8e77ec2e597fb15698f82ee440af13158e4
 MISC metadata.xml 502 BLAKE2B 3c29db929f2a3cbc9c72d07f5f0eb9e830879c044f2d902435c21e0e36801cd84999dd4723f129145a3d82a467976236539c75ac07ea2137a461c87d49e396a3 SHA512 9669dcfdfac9097ac2196456c2ae71037f9c0afe9fdaa67a9fdf1b55ef30b3a1b3cc482b7632c3bca72a02ae933dbadcaa328bcbe88e2083e4ad0ce0b60b97fd
diff --git a/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
new file mode 100644
index 000000000000..5c8ab318c0d8
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+# Please bump the following packages together:
+# dev-util/lttng-modules
+# dev-util/lttng-tools
+# dev-util/lttng-ust
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="
+	>=dev-libs/userspace-rcu-0.11.0:=
+	dev-libs/popt
+	>=dev-libs/libxml2-2.7.6
+	ust? ( >=dev-util/lttng-ust-${MY_SLOT}.0:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	pthread_get_name_np # different from pthread_getname_*, not on linux
+	pthread_set_name_np # different from pthread_setname_*, not on linux
+)
+
+src_configure() {
+	# bug 906928
+	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
+	econf $(usex ust "" --without-lttng-ust)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 3b8844c470f3..8f953dfbc06f 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -2,8 +2,10 @@ DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
 DIST lttng-ust-2.12.9.tar.bz2 800795 BLAKE2B 467500f7fd0f473a5cd7af6c23e8f0f83516d57ad573f92c48354bbe1ea1d2fea08bd20d7675e7698adf2284a5069fd23d3a929bc11df0ba157a99091b543777 SHA512 5edaa6c015bccd710e7bfea136398e8bc784946c22933a011f4b31b9c13fa772c4f03d0c42543bf0d08a810922498ff1fa56d4bccd9c5b8c4b14925c849c6c9b
 DIST lttng-ust-2.13.6.tar.bz2 1351915 BLAKE2B c350a7302e38035ef7c6727ea942907ec606c88862ae875bed0a7c833f233b4159405bcb7a41549dccf3d79491151066d593c52d9f06b95b61c345ccbace62f5 SHA512 15458f8dd0ad6fa96a9cf7569ffabadfddcaa70b822b69b39d4d7dfba3701c9489706b06f12f9d7e376147299fb3cfc6fe1213d46d510bdb7b3dc834271da55f
+DIST lttng-ust-2.13.8.tar.bz2 1358168 BLAKE2B f4f623c9c1a37395312270803c7e845ba76d6075c10cc6bdcfdd6f35d0cb6db9c303a9fb8c33a50e201c84fd772ed60611bfce9e962e27c4d5820b6ef0ac2d66 SHA512 f61f7e1633051a4d515ba28d4945b96a84eab8a8143ef698bbb6857cbaad1acbe238041e43f04d9818bac43f59023be3f3c2154ecf75f180d8233c9d7f65c555
 EBUILD lttng-ust-2.12.0.ebuild 786 BLAKE2B 64652ad07761ab57fb396473ff814fa72b54d55db53ad0fc3c1c50a70c4e13915e8d5fa02e275ef99a8942bd9a1602b87642b411ed6abceb66be2cb8d0ffe344 SHA512 db5de27798866d4f880930bc55eee11499f9e518fc04f07058b4cc2922fefc00630ff5d0e9dabeca42844d4a97079ecba6a3fc9c700e3c1f3832ab5674e0e010
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
 EBUILD lttng-ust-2.12.9.ebuild 851 BLAKE2B cfc7ef0bf86b6c7d20338c87909022300b8c31161d2dd920c3ed0333661739b7043182242087a2a3386569167eccb43b250f3f7ae1692933ee12db72c5eca8b0 SHA512 9ce90fb2ade836dfc0e8431477989c74ebbb568e1ed5d2404fedfa0e0c789cae12ce7dad23ea3ed3a3e4a67d88ae7f32a8259108f112495b4edac002784ff2a6
 EBUILD lttng-ust-2.13.6.ebuild 1113 BLAKE2B 11e734550e4c5519be93725f7ebb6809acde583c405ce3e01379bd8e54375cecbb9c9b3f1dcdbd1d8232c35891d7f00762fd7d7bb22e4fcbaf857e1c059e1969 SHA512 fde8ab7c76fc34eca64a1949722a6f0671b0317f4842ae930663c9b7a9b7a99a292b3d5af4aa73dfc50136ac09f018df1de12ba831531268feda1578f1fd2d2c
+EBUILD lttng-ust-2.13.8.ebuild 1128 BLAKE2B c1751c23feb0f67a32d1619add80422d59cee981665b78a527d39fb50daab6af3a40a1a178767d9b485b841cf5593e35c3682767f6acdef4b306d3ac17d323af SHA512 6ba047676f10282ea366dff6e1dc38c415733bc3bc0906a4b4e188b53bc0e942dbc6f8b6a9c10d5b83e0051be1d0c493b724fb1c92b83c20b46090a30e9dde02
 MISC metadata.xml 708 BLAKE2B 8f87692839d2a77928c1f09ab4b7dbbf49c94409621833b2d01cf3b44b5d3fd456359bec1bc53c834cd96657fca9d4e6e403a924039d9114b89aeabc519115d7 SHA512 b4bb08c738e6d2e0f813b220f14c70f83074ee34180f997bd72569710ec0ff0374d079558332ee9e2addbc526d0c38441f2c1b06bc8de193edde5cf0728434e0
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
new file mode 100644
index 000000000000..35566d1089b8
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump the following packages together:
+# dev-util/lttng-modules
+# dev-util/lttng-tools
+# dev-util/lttng-ust
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/userspace-rcu-0.12:=
+	numa? ( sys-process/numactl )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	pthread_get_name_np # different from pthread_getname_*, not on linux
+	pthread_set_name_np # different from pthread_setname_*, not on linux
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable examples)
+		$(use_enable numa)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index e6801039a24c..f47beed97c75 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,10 +5,12 @@ DIST cuda_12.4.0_550.54.14_linux.run 4454353277 BLAKE2B da339a44ac21799a88b4573e
 DIST cuda_12.4.1_550.54.15_linux.run 4454730420 BLAKE2B 643513a673e72aeab2e0268c4f91b504132aee378e5e483c46803ed9b1b109274e23bce0cd1022de1220e81dbfb0442c9d84370ad9c6a17e14fe2aaff23ccf13 SHA512 340fab9aad2f3e03fb773c2ec1d4f2c3b1428b350c2072b02263f68f3c521b7ec42086ae7b5e66594a0b91862cc165d8519e4c92e428268bc1e98adcfe106d42
 DIST cuda_12.5.0_555.42.02_linux.run 4294677299 BLAKE2B ffefb576feb9f8e6ea8975bf74fe7277902364035e5dcb27f7b4bdc1d73ea44ce8e057087d670ec18eb49727a9343484bf3aa234c045b91684c70141cf8162e7 SHA512 84fa3ad278217a0fbea97d2d880f625e7e7074a12e98d50d664daaf8298d7d8dd7b222c6f5815636e484df8f1e75c062c70c09f744d139652d960ca8c064114e
 DIST cuda_12.5.1_555.42.06_linux.run 4311634770 BLAKE2B 3546faeb24687dd11ad0a61a4f02cfbd97119d9e3cd3e24ea294b81ed488de7dfef03607c69d7b5a8087db10cf794205936add7cfa8ccda207e3aca315be48df SHA512 604843e09717c2af0873b2d5a2e242ff1b99122d515b6a7a29e70c55ab605524744359781f5b642059550b4def57877597111914965efe7d3a1a1387c9dbb1a0
+DIST cuda_12.6.0_560.28.03_linux.run 4333105923 BLAKE2B 533e9080dbf087a661ab6e59548e48ca0d2b514f47c3e97ac89b628f79197875a7425ad69c4d271b5fa8243561c1ccba698e3bf322b194b29a5f7fa031ea8f06 SHA512 fe5710c168298d2283a3f636ad5e1e212970fe8d9554ab450aa61d786536f50efb9d9e9396b6ac59638bd4204faadb5a99ec8a8c02e2c57a18f479123aaff3c9
 EBUILD nvidia-cuda-toolkit-11.8.0-r4.ebuild 8044 BLAKE2B 54995f4f2a8a1998539a6798ff2a68bbfed1943c3e6da27eff58458853db006e105bb39e5bb1935b11971539dcc63fb552ce0b280860ba46ce04f04e98890568 SHA512 df7eb92e74e80302e0fd966ba1c2a97a38f97e3e6bba4bb0a1a389e1336c13d3c9a3603f7079a597d2ae723f7088e83ff708e8ef5d2ba503de0469bf25e1c1c8
 EBUILD nvidia-cuda-toolkit-12.3.2.ebuild 9504 BLAKE2B 6abf260006cfd3471665526df049d3f80d956f6a849e8e73c0914aa32faf86ff68d659aa8fcc5a4e95eb6890bf271a2d40edec67aeadd5154444d66e8d337c5e SHA512 3660334d48205d952fd73e688742d700db4b9594920d42d289c581d10af34af516fd8920993650dafacb983492ae72d6b4f3b0ce51d3301d66d6450b34c0c7a9
 EBUILD nvidia-cuda-toolkit-12.4.0.ebuild 9515 BLAKE2B 270c9952890a529d17355d5456d6d2422740f69eb9af1b88121e0c8b7a0a9632a39647fc69da4e3653cba4e4cd60f3afc20fce2095743ba128aae8a15f0676ab SHA512 949e4ad4b2d1758279bb620c5a2ba0ea90c93e852f862c448490c689d8d4f522891cb6a772a65894a4f9867be1c8dea1facf87616370bdd0f45987f9d437a3ab
 EBUILD nvidia-cuda-toolkit-12.4.1.ebuild 9515 BLAKE2B 2fdc866adfe7f552349bcce9b62c2a56186ef859efcc455d4e829f12f71a63cc1ef74eae08a9dc6bbb508aa398679e74a9668353dc3166109157b312fcb0c291 SHA512 58c85d9ee76f180039fd0ccf7e377a4f22bc2d9b92451a54909ddecc4e177c07fc95bb29cfc74b28c9472a64a4c167319be0bcccd6c536296d2105cd88775770
 EBUILD nvidia-cuda-toolkit-12.5.0-r1.ebuild 9535 BLAKE2B b8b50bede8a66a8bce76f6677991b0cf433c3338e89dc82597473dc63874810b9b7461de97d9abc55a471b38618445b7c6dc8e37c18caa8c7d0e3fb9cbdf835e SHA512 8f983c2dc5797fa82f144008ddce2b7eb4b2aaa66b1cf439be25a67fba4a0b4ff5af3480451d53bf0375917e1219facf48e69e7d213aca1e3acbb984595a4d41
 EBUILD nvidia-cuda-toolkit-12.5.1.ebuild 9535 BLAKE2B ea6b46070159a18d8f541af47d648a79b75f7f964d689418220e4eaf87c56fc000eb39fed84637c161aa5f18e5f7e03f0615cbec6670517fd2efefd83139a0a4 SHA512 47bca7b76aad3842f37d8da4fbbdf646a1ca2cc93bc7ae870d8e164a05f735974ca28d69a99a6d0ffcd331e5134025b3819360f27c65dc6c27338756bfc74ba8
+EBUILD nvidia-cuda-toolkit-12.6.0.ebuild 9535 BLAKE2B 984ec77cc39675ba22703339ecbd5596452a5631c7303e4db492bad0b80496ea13151cb25f87a7c0e39d9d2a173be7ad9469a91acfd785abb83632caae230297 SHA512 efbf2fcc39f60ca1f35f15202e924146618b4441c090d26e07048e10dee6ddd79f10640b1c6d8d2e84a218edb6a1382f2398eaf182a503d5dd6dbce250844af3
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
new file mode 100644
index 000000000000..26415acb96db
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="560.28.03"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different.
+RDEPEND="
+	<sys-devel/gcc-14_pre[cxx]
+	virtual/libcrypt
+	examples? (
+		media-libs/freeglut
+		media-libs/glu
+	)
+	nsight? (
+		app-crypt/mit-krb5
+		dev-libs/libpfm
+		dev-libs/wayland
+		dev-qt/qtwayland:6
+		>=dev-libs/openssl-3
+		media-libs/tiff-compat:4
+		sys-libs/zlib
+	)
+	rdma? ( sys-cluster/rdma-core )
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+BDEPEND="nsight? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="15000M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump, see link below for supported GCC # versions
+	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
+		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
+		builds/nvidia_fs
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
+		eend $?
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
+		fi
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
+		)
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
+		fi
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# fix broken RPATHs
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${ncu_dir}/host/{linux-desktop-glibc_2_11_3-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${nsys_dir}/{host-linux-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	if use examples; then
+		local exes=(
+			extras/demo_suite/bandwidthTest
+			extras/demo_suite/busGrind
+			extras/demo_suite/deviceQuery
+			extras/demo_suite/nbody
+			extras/demo_suite/oceanFFT
+			extras/demo_suite/randomFog
+			extras/demo_suite/vectorAdd
+		)
+
+		# set executable bit on demo_suite binaries
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+	else
+		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
+	fi
+
+	# remove rdma libs (unless USE=rdma)
+	if ! use rdma; then
+		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	# Remove bad symlinks
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
+
+	# Remove dead gdb plugins
+	if use debugger; then
+		rm "${ED}"/${cudadir}/bin/cuda-gdb-python3.{8,9}-tui || die
+	fi
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+
+	# https://bugs.gentoo.org/926116
+	insinto /etc/sandbox.d
+	newins - 80${PN} <<-EOF
+		SANDBOX_PREDICT="/proc/self/task"
+	EOF
+}
+
+pkg_postinst_check() {
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 1f1b6c80bce8..7dd545fcaf7f 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,12 +1,7 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-DIST pkgcheck-0.10.27-git-2.43.2.patch 1193 BLAKE2B a91d51e939e524682eccaedc4489c44661f5ed28e76c7074c16f001bf8a968c0ec4485e2a71504e86e081334ee0de02d70573f6ee910c52d636cda1955747686 SHA512 26c81364f7ef875fe3fb1ff77ccde6bd0892160b0ad8ac929f146950473596be1967883ffc5c25fb05ee4fd19870b470fdcfc536667530b89983ce1035b0007f
-DIST pkgcheck-0.10.27.tar.gz 806381 BLAKE2B f4acf72e85003f4dfa244c843464ab40a93df64a7bec68682cf39413552a51989a3214cab9c340318cebb39a8cf33c497fd72335cd37772f8e4d6e87838e413b SHA512 581109fdc565852d0407d770634864f809c2860ccfa03675afc8273199bc00af1c632c0fca27904c3262b1e851f3b8939cbda466cb3876ac228cddf74016fb32
-DIST pkgcheck-0.10.28.tar.gz 807874 BLAKE2B 12fbbf4a4482af9e27983fe7b32c376542551fdd5512fc13325f42234f714e49944475960cb23fb525c6b7d7637189bbde8a2e288c9ee360b58595dfc8bce5d7 SHA512 fb13d01ee8d29415afcf267635b8eb4e5c16a5f4fc5c83f3d6ce99a5aadb5d2ee4b31bde9de67fad9a093f10f881604cf0f1abff6ed47c35a23ec17527d8e9f6
 DIST pkgcheck-0.10.29.tar.gz 377521 BLAKE2B 91a1a25e6ef173582fc9082b92baa66489fd43c7addfbdd8516b5ea93febbb92b7155de88283ae4a1bb09047a44336ab5c336c5d0808c915eab99e8aa4461576 SHA512 339e332db24ffd716b658a40c66f2a90c6905071827da84ce0d633d882d75cf41bb853725ca30fe2abc8d7535f546925aedc8853fa7f1737854cee251a0ec3ab
 DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d670be596312532b88940fbe1cfb1c7e14a877a955fc4f21fb003a2ee5c6095c2c6919475cdc95db9be0736050b50 SHA512 078ba2275e39e645eca22a265c9f06c6dd7d1cb310979ab5e48bb86a374b42edc50c0ca8d0bd671a3b51341b7fae80ff2c9adf2dc2eeabd93a545c84373902b4
-EBUILD pkgcheck-0.10.27-r3.ebuild 2416 BLAKE2B 32b890aa40bb2827a074ba30f8a3db9d3958ca918c5cb3c16cf48aa49dcec56382221a0843898ffb2b9b996cf5f32fe60c325162dabeae5c4234e375ffa0d02f SHA512 fb062ca539a2ee5bea0ea8980b7b6f923defdbef2dbba1039c6f4665878dd6d3c9124987b80be0e576f6c66699841ac10928c449ebfcc43827144b582f7fa59c
-EBUILD pkgcheck-0.10.28-r2.ebuild 2331 BLAKE2B 0090512494d2ff2741d938d688f57eadbbe013c6708fd71af673669008673fd9eb660698a3576a10b4b02c4cf111aa1d142c08d80f44a7e0e6a31eb28fad89ca SHA512 d9de08af50e69d9ea98e1bee8bed0447fed65cded57fa171434df92fb4e15879cb18027667365d0bb98d6dc283d172ce6ef4117323eabba9cdc08ff6a52c255a
 EBUILD pkgcheck-0.10.29-r1.ebuild 2265 BLAKE2B 07df3c4de9de91102c70f4da1ecb42ba9e607afc1ad542038b6f97607c08f099ee3902a320cd1ed9c31186c418d85dde89249bb3f502c2f1c34eed93f34f2c91 SHA512 b8d3cafc37a7c978ec70a1c614f2c28f61f48550af70677e5c90b1157d548c3c4f1e8f55766f8d9dfe149a172bed171716771371164974a12e976f6a7e147f14
-EBUILD pkgcheck-0.10.30.ebuild 2211 BLAKE2B a4befeb95ba78b9cfd3b8984cc813ccbad8979a0614b90d0752ce77f19903d9ac88df4f8c97731ba3255722c4c4f57fc888bae547044e0dabd13bfdeaf4f8c25 SHA512 f0cfe316eda417f648d9bd8aedbfd233cb909f610e073f8298aff4ed449daa3fb3e34009013dd6ce24933e34ca6b0b0efc233b4a38606842bd0393542715361c
-EBUILD pkgcheck-9999.ebuild 2223 BLAKE2B 4981c0f78a1723d2de4c58c8d41ac5f8a104f55e928dd113c86f670b0d8abb675b6011951202b564470529bea692f8515e9c7a91261238dc3db44b0c858bb0ce SHA512 d0c59363ec3ddfdb14ec9b4acd2a71440d2fc973b852a0a7a7922ffb38e76b42321f134a48cc2e746b0aa614374db5f12240296cb536f35202268976a2ff21b1
+EBUILD pkgcheck-0.10.30-r1.ebuild 2261 BLAKE2B 42b17babdae6859a01f5060fff33a8db225f72ae504e86a32401a49a48881e1bddf8fc20b505df3f7d5cfc71e2190a11e5717cf373c8b9a4b266985c40fcc5d6 SHA512 6d760335a718136be5bb0344cfeb7ed33f5a13acc20dad0281fd324bfbddec23c8d9bedc21c49a7ee0dd253d0194ac00956dcdf34082e16af8d461977cdce830
+EBUILD pkgcheck-9999.ebuild 2273 BLAKE2B a2997d902855073376174f423ffab586c257ace6f3a289ef726649a4e88d520d6f3384fbb0ab225c74c4ecd64d6467f6656f7571360b7be88df5c8199c973b44 SHA512 c28c51621f8ff65b19cb59c2d720442762f6d3921881d962240ba5fe2776c2933b122c3efb25c65513f3a43ff5476dc00e0da476e3f52ac7e2bce27438896336
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
deleted file mode 100644
index 458ca1eade32..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-	SRC_URI+="
-		https://gitlab.gentoo.org/pkgcore/pkgcheck/-/commit/9103513e26f9f2aeade5b563a49697c0e2665e3e.patch
-			-> ${P}-git-2.43.2.patch
-	"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.21[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter:=
-	>=dev-libs/tree-sitter-bash-0.20.4
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-git-2.43.2.patch
-)
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
deleted file mode 100644
index ae9618919930..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.7[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.25[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	>=dev-libs/tree-sitter-0.20.9:=
-	>=dev-libs/tree-sitter-bash-0.20.5
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.20.4[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-EPYTEST_DESELECT=(
-	tests/checks/test_git.py::TestGitPkgCommitsCheck::test_missing_move
-)
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild
index 7b1c7d6a3044..012ec9c2756e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild
@@ -39,6 +39,7 @@ RDEPEND+="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	>=dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.23.0[${PYTHON_USEDEP}]
 	emacs? (
 		>=app-editors/emacs-24.1:*
 		app-emacs/ebuild-mode
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index cb978064beda..00c68119471c 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -39,6 +39,7 @@ RDEPEND+="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	>=dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.23.0[${PYTHON_USEDEP}]
 	emacs? (
 		>=app-editors/emacs-24.1:*
 		app-emacs/ebuild-mode
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 1adfc4b01be9..c69f77a2685a 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -2,11 +2,14 @@ DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd
 DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
 DIST tree-sitter-0.22.5.tar.gz 3035094 BLAKE2B f54b16e2421ad68fd34b5bada767010be4224652f5a138f7afcdbc15ebaae98dfe3cc8ac77e5e8e5ab12cef516464d29e38a23fc895fa966d5a03a9569fa5ffc SHA512 cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c
 DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a
+DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f0bdb17c5fde796d8d65f8bc84a6e054d86c18a42e66e8effef865f95013c38ff6bd6ab5498a680ae172d7d57020604e SHA512 ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9
 DIST tree-sitter-cli-0.22.2-crates.tar.xz 21937812 BLAKE2B faa8e5d5627397a9f613078ab25bc12a7103ceb16ae195f687c47c222139ca27833d6ed16ffc7bafa30b7eeeb9aa206b23f0e45cd11bf34a265861ec3ea15cd9 SHA512 499dedb899a6fc3847be59d0cf5f81a4c93aacd9a12dc1420a0667842fccae5b2ad3e790e89d9b813b6dba4e1a6d7add3b0c4e7f1590402f3b49bfff07e15999
 DIST tree-sitter-cli-0.22.4-crates.tar.gz 51254931 BLAKE2B 1cc056f503353ce594726af8c5d7aff2e85d8c79ecb691894d371586735b80a3a7fe278516a43597121f6c4613a9d31a2acd85573fe3a0f0719f64ab1829c1bf SHA512 6a031c9ca8b0db10281d59579120b972c9f9d3899762222bfc8018c0d74b5e339bcbb1d5349a95385571aaeb975080470a92ca685d0f9037550f73bdf503d7de
 DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca
+DIST tree-sitter-cli-0.23.0-crates.tar.xz 18131480 BLAKE2B 796a05ed87ce0f248491600bee4af9d14ba6a244ce04d4cda3192226c5063be921e2a4c5e454c91f712f629481c6cca160544a457cf7635c6024d0d10291e3a0 SHA512 98472d6603d973c34f1cafc042219495228693a0fbbe9af920120d8cf27fd78e5263052fb784c79b38e8b27f9b881d18205ebb439de15945c3f10410590ed76a
 EBUILD tree-sitter-cli-0.22.2-r1.ebuild 941 BLAKE2B 083d1e90da8b718c64a095f314c63fd04b0eead49a2910c9dbfdc9fe97d02ed02bc0c2c496f105a09d62002abab498a934a6eea58699ac332c9fb2f91a287ba8 SHA512 e17e5aba1710fea46144749fbd2317b4e8c2c9785439cac272234612bdf634ac5db7e6a259b2b51b891140ef65650689dd6b65d9115fd69584c26bbd911ab651
 EBUILD tree-sitter-cli-0.22.4-r1.ebuild 899 BLAKE2B 2ca614b84c2ac24af555512aa96cc9704f4330ec69324ea930f0509e8b14c664aeba4e93e90f60f14ce906b802ed26d31351d8a7eeab23df45635f083335e544 SHA512 4d70728d73ab197dadc096942483db7e4798f97bd1b0b70175dea18ec11f4652fb1d11afdb92ae2f5831e2fb116d9baf926a552af7e9cd7bcca74d64281af95b
 EBUILD tree-sitter-cli-0.22.5.ebuild 900 BLAKE2B e7ef5e9995e838b1f4a32d04113c75bf881486f88649cc17c6760b3f132b879493cab04025b91a3fd523c5316a7f922760b145bddc92dca0e046831c0d7d0306 SHA512 448e0e275386cf4c6eab01f8fc170fbb65161676c8d0aa32dd159dab02f39f4aef7463ddb2e10d6b256f49d43e5fabb59f8a0c73a7598e0f797f2aa9d18e53df
 EBUILD tree-sitter-cli-0.22.6.ebuild 909 BLAKE2B 5a7d01cf494ae8551e36ba9b1509f5c0bd0b0b86cfaa2377750099988c2e7250924996880fea53a8e1101363646d3a543625b83b01941efc637ced4f5f074f75 SHA512 d45b4ed49fa313db416873451dab644baf65844e9985d9c91e8fa59438003283a48166b23dd73719d52a43c046ee498025daba3ee9b0c4e9349651bdf3cf2011
+EBUILD tree-sitter-cli-0.23.0.ebuild 932 BLAKE2B 1fafee04e28f32ad369d6cf635070d4a7c5d2d08c097d47ee9d7140f82aff0f46e20644df3e2f3f1666f4436875266cffd930ff9e5338d4ec472e657e7c761df SHA512 297f451158cd1cc57c0d3822889e7d6f48e2d7225dd3daca1365df3d7d8facfd378af2b0b70d7d1d2b77c23d0cefba1a97dd0374cbe7dec6f1f78b28d139059f
 MISC metadata.xml 575 BLAKE2B 947ff8b1c885927a6b51e08f761706ecace1c18177e3b455ea25b1cb17eb5c1fbe5aeb6ce68bbffdf626dc968a99f8cf2792356c8e90f27ab8f0fc23d618f09e SHA512 2f19b11f3aff1313d5983697628e1df2e04505611d20d3bd0331d4265cc0f569fd2694a61edb67c6834885e2a61d7d9ef650731a72be04c96d00c574e7d9ba09
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
new file mode 100644
index 000000000000..6a58631548ac
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+MY_PN=tree-sitter
+MY_P=${MY_PN}-${PV}
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# 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}"