gentoo auto-resync : 09:09:2022 - 16:40:34

18 files changed, 117 insertions, 69 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 98fadd0d2c8f..0f2c71e45d2a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0aa4dcebfe85..f0d462954aed 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,5 +10,5 @@ AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca1
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
 EBUILD boost-1.79.0.ebuild 10641 BLAKE2B 44e43c096af4e3e30d96cffbd21df7111f76453f53b5cc604171addeda32b9cd05560b0c375f8cede3223c95ff07afc9efcfdd8faada0524dd45b4330ea6f591 SHA512 b81c002b0493a966ff11bad777cf73d5a4bef08f6ae4f3a68aa9de82d2c86cf33af89dbfd62a9a502b123c9c63f3f497fa5b6959e9fa1172f114bc5d800ac05f
-EBUILD boost-1.80.0.ebuild 10807 BLAKE2B 247d471e76f02fbcef7a1de9ee0dc104a39a8c57f4cec5fea1bc8686a556a55a1a3b7c135a7cc81ef607a729cf9f23222473fe1ac954608acc9edb8f8947ded7 SHA512 ba08bb9728ed5c1327f6bfa71a22eb64c8b99646b8385de25701853ec487c4661b76eb8c19728dded07e7ea0bd1c3578e7fb0b101492df5b8088cc935253ae21
+EBUILD boost-1.80.0.ebuild 10806 BLAKE2B 58ccdd3dc1ca80d2584d650e7579d806d1abecc819858d8e509e1c76a146bbb470284afa1c856d6d4273c71f1883299852d8efb226cada0a5ae5f456730a9d87 SHA512 f7a9792a1b15b63691f9e8d7b08c83457a190f32739d7b7d6ac6735033009757ae304ea90cec2d00f5efca88e6f9bcc375e6ed6177fffc8a5d81dae9e4713eb7
 MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65
diff --git a/dev-libs/boost/boost-1.80.0.ebuild b/dev-libs/boost/boost-1.80.0.ebuild
index 81b191cdb53f..e0c8fcaf0060 100644
--- a/dev-libs/boost/boost-1.80.0.ebuild
+++ b/dev-libs/boost/boost-1.80.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index ed1b7d62b2f0..94e4d75b524b 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,9 @@
 AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40
 DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
+DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
 EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
+EBUILD ell-0.53.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.53.ebuild b/dev-libs/ell/ell-0.53.ebuild
new file mode 100644
index 000000000000..8cffe5864e18
--- /dev/null
+++ b/dev-libs/ell/ell-0.53.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
+		unit/test-dbus*.c unit/dbus.conf || die
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 685c88263c92..25642c69c59a 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,6 +1,6 @@
 DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
 DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
 EBUILD libgpiod-1.4.1.ebuild 1165 BLAKE2B 190c2b8c0bfaf71973fb722717798b663ca73486f2b9724bfe53f4931169cf055451a7bf7fdabccc0689c5e0e148c99596cf3081b75ebdb759de4c562c07ae55 SHA512 b77d0c3b7f7354b99bb648312fb794253cdda9bdf333d29c34e563e4965555a35c201d3568a7881cd123a81fe7a8f48568680c60e2cdcdb728128eb1057a3846
-EBUILD libgpiod-1.6.3-r1.ebuild 1245 BLAKE2B 44b84731ba022664d4ef008a1e4c09d36fb97871b0f34ffddc2d5398d2a2bf7ba1d35b688faf8cb96526d7183d73b8768a94044e7c806df4e60a35c25f63b628 SHA512 f73e26192b56c9727972e9cdd645b97d029e517a2dcd8e9670efd6f8a2f8056137993a83ad924eb20c559052b1261e2d5cce8c9498f704b68429ab536dbfc271
-EBUILD libgpiod-1.6.3-r4.ebuild 1057 BLAKE2B 900e49b3e673c8d227e650bbb54329bf5a25be79714e3ee4ba81099b1b3891648d62d4fc2a31f9de5a4402ca8dc58b9141ad20705d7e454ba6a1fea77f61dc01 SHA512 37e8aa6b5f1ba0df5824d2c51118c3de6de8b49859673420a9c57d52151065aa014b700b7a6a31a951c6c183864bf70ff58ec8ea35d0d3c552b73990a594bb2c
+EBUILD libgpiod-1.6.3-r1.ebuild 1242 BLAKE2B ba051b6fa13eeca8250040d2150343826cbd99369bc5be1db7779da86aada258e8173294bb369a9c27e882825f6b959f4a9e992de477ed876273d37ff6a76c1e SHA512 3f8eb6bf52e1d0505452183d6659f3d50b17b2192d643a0a32c8840f1e6a4cb17c124709c71a2e36a12ba8b93974efe34d6c5c19fb66695b4bdbea4c211459c5
+EBUILD libgpiod-1.6.3-r4.ebuild 1179 BLAKE2B 0ce08199599057a55bb24552ff41837b460117a7795cb9eb8c8caa1e666260a94925978b51ff489638d59d89a7bdfc6a46fe423fa48c47519c1be7f03b43b341 SHA512 783afa3e15506463f07ba91ec9cc292d0e68ff82afaaf897066fecf9e9f98e1faa107f8e128b42a26a0876a698af2a32aa0c72e67a69168d2f0bc9573ffa96eb
 MISC metadata.xml 344 BLAKE2B 3c4f791ae16ba0fa5e2d061ee5aa6795f39b4b2224643b564fcb5f2368a42e349a8d1fa57413a475d48f7038371af321d4758be99658842246403212a22321f3 SHA512 b2d8068c46c3478e2d2251d74f81657c7fcbc320b8d35a56f36e609a118f6858eb62c7905da35ba39c0ae2c98a6bcd0c13418bb9f14176c0d887b5df505a4374
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
index 8830c7759db5..2cb895596af0 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="static-libs +tools cxx python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
index 98464819a577..cf58ecdba373 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
@@ -19,6 +19,14 @@ RESTRICT="!test? ( test )"
 #  --enable-tests          enable libgpiod tests [default=no]
 #  --enable-bindings-cxx   enable C++ bindings [default=no]
 #  --enable-bindings-python
+DEPEND="
+	test? (
+		>=dev-libs/glib-2.50
+		>=sys-apps/kmod-18
+		>=sys-apps/util-linux-2.33.1
+		>=virtual/libudev-215
+	)
+"
 
 pkg_setup() {
 	CONFIG_CHECK="~GPIO_CDEV_V1"
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index 57b9210acd20..bf6dd1563516 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-c-0.20.1.tar.gz 244061 BLAKE2B 94cb11c80fd54a89b3c6c3ebc7937fdaa077a11c5128866e0e43c970bacc3b7f14743b3f19ceca515ef70d4499d2d3893fce6d948ce9a42bf2f499c58844a8da SHA512 b2f5b6d54fe05e7706708b50a5dd821a5669a121c916da4de3f80b6c57ebdd99f12f37c80051a8719f9737d4b0c00542aee62b45823dbb878acd4e02974f7a67
 DIST tree-sitter-c-0.20.2.tar.gz 249711 BLAKE2B f5f0ef1b15ba0fc216c082c973d6a52e79affb6075bc7fcf04e7ff93209b4624f4e9b414440fe6d20c0ea0bed5f3d96f538237c2fa365b919d6c280f98cc54b4 SHA512 ac559ee1d29bb77ce3cade02cfa4ed95c24cea7b84844df6521ebbf6213894c6f91499eb782e04e5e778091300f0043d59b9324a78d72d9bea4f40cc67d56cc1
-EBUILD tree-sitter-c-0.20.1.ebuild 280 BLAKE2B 2ffa82c71779586e1d17db3d0e8b075ad53d49927aab613a936653b1c70e3227d60481e1a78fcfca200718a1f526fa1704362907097a146e79abf68b3304edab SHA512 c0791c8673d269daed621431aa4ba38a9f28ad13a012cdd3a9d41df0d0b1556fec4ddfca48067eea94b13b159256d9c0eb8f99f7bc8dfbcf5338544f38efe8a3
 EBUILD tree-sitter-c-0.20.2.ebuild 280 BLAKE2B bab7c214cf78d4b44ad03665139162c6a1fea8e3e33f8b68bb07b2ab02163d61966bc964ff19feabdef3e65d850b69d46aef5a2b08889d3888399abfd8470544 SHA512 20a5b181c585ff85f7ade897da0eefe56f612424f94f693c4474cc9b3297f6233d5daf05df375b4a2a076aac61af232b15eb63167be5d141d96bee764aecafec
 MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild
deleted file mode 100644
index 5ef6110324c0..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index 3e07e2ce0412..329f4bffbc8d 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
 DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
-EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
 EBUILD tree-sitter-python-0.20.0.ebuild 290 BLAKE2B 684139dc89752f3e9610de4b72ed0c5e327ec1cec4fe9f6ecc22bafc1e9853f508dfd415f7cb868d91519c5c1605dba9d4aea9fa12dc41539dd055695b292058 SHA512 fa9ed2ea177cc82b4fc4f0102cf9950cf57d8c2515a218494fdc5ed77329aa4a63fded54fa47bfffd93d1cca4423bfcdec030cd2ba5f946ff5b16697eab7e0ac
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
deleted file mode 100644
index e24b3667a61c..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV="24b530ca158d2782ea9046e756057a412e16b52f"
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index f58ff6efb92a..79d3d24a97a4 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-rust-0.20.0.tar.gz 308481 BLAKE2B cb5e8b210ab58ae0a771deb82f1963a8001310673b44203df20425df443f179289bff29dbab9f58e5450f0d1a2ec377ba7601204ffeac7c461c03be90789fc5e SHA512 1c7283e973f50989980a5a05217d664e87665c5ea2338978deaf0cf88f624c45fde8162848c68bb3b8836d32cbf9be80b1da6fa7aa03fa3cab8d8efb49e3694c
 DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07
-EBUILD tree-sitter-rust-0.20.0.ebuild 286 BLAKE2B cb0ea2b972649a98f1ba9ea4865090950bef36c95971b0694fcb6f6bb85102c54c116b5d4f30633439352137b55ba8c0971ac34d57e68146eb1c78393d54686b SHA512 0d683371ab4a696625e4583e6f7c4f02c8067d80085f074f678ef82d8c16c3ea4b79fcab47b02c9e240f0764ef6c1e7304e145ab34d1b8f4f0c31692271fda2c
 EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
 MISC metadata.xml 559 BLAKE2B d585950ceaa197145c3a2df759e97a8a50114c0caf0b7492e3e16f26251751f694000acaf6231ae826cfa57e99153eb27f09773d2805af40df4dbd3825dbe46c SHA512 97b7d3b6bcc3da3c7fc6d4111e2a1e02fd84ec778a18a22570ae303052d01b4beebba83eb6df0174bd6fc29b8101d88ee20a5f78b855ce713311d87e1c0be312
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
deleted file mode 100644
index b23c7b8febda..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 8d3f8758344b..59fed9c17a9e 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-typescript-0.20.0.tar.gz 769336 BLAKE2B 12f5ac1f29963eda7a34d08832ca263cf91fd6a8335c998d9d1795851bd30d4a43ade36d004ffcb287c73b63e691582a79d640e24050df4f778fa308f5b0665e SHA512 99cbcabf58717eb17346b2139320f0d13846f1f335a81ed01fee6e748cd0d867218a9cc8d216162c3b9b9da86487024bedbced67e91adadab207633c25dc7e1a
 DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
-EBUILD tree-sitter-typescript-0.20.0.ebuild 361 BLAKE2B ef413e5a555ca0965e07abac101f18b6b8505bb8a85562187f395c97879ba24cb3e59e33e549b7df9a5861b93238fd80ee41c4a26b43488ac0b5ba5ccbba2c26 SHA512 a79de0d2ec96f2f4ebf3ccd503178e72a90125f45285dcdfe2bb733619d64c10245c773bd1bd6bed1a91cc0252cac1eea68477d656135d3bd3eb6a676b2eeeeb
 EBUILD tree-sitter-typescript-0.20.1.ebuild 340 BLAKE2B 23e05366c098a727c7e8f9551de9bc766959cad872a35b2bebeeb0ed6f140b571a1962775fa9350f925d29c1bc105a9ea1382c3d70e46520b234c566e7cef008 SHA512 7511b7e7dc9190b7143790ce9a134d9b44eb69729e5d5ce39a782305981f7cd0fd65bad58daa476e4c9fc5809064f1341d880373b7b8d369fd3ede70325175d3
 MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild
deleted file mode 100644
index a504afd74bf7..000000000000
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV=rust-0.20.0
-inherit tree-sitter-grammar
-
-DESCRIPTION="TypeScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${TS_PV}/typescript/src
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index d0f522667ab8..0f6ba5b5e38d 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,7 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 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
 EBUILD tree-sitter-0.20.6.ebuild 1021 BLAKE2B b36aa0a4a1563751dd8315f27f01203693f543f22513d21e269087050898d5a9cfc67c856147ef407718257634214678e12e820af645217a52deb26229a4ce3c SHA512 c229498f68a38d73b7ed14c3d0ecb8261c789651b858a6c73a70056a6b12b36d1dac69f1af82258052dd309543aa0da2dcff6329b08715bb3c7127732a316f97
+EBUILD tree-sitter-0.20.7.ebuild 1076 BLAKE2B 25214314f76ee0a4a72ed0ad997467ce5b98c409738fda4eb4ded2b715cbb03cf653a58e98dd18405193817d82890ea666c81b7e82a117582832709f4b87e125 SHA512 5e3cd25beefffc779bea70a7442e90cb4679e3582a6453188c9268c5bac680e505b821785c5ed295181046a87eb241ba96e8eaaf1768c5bcac71b227eba7d315
 EBUILD tree-sitter-9999.ebuild 1029 BLAKE2B c335042cf6c9155c2fad5c9c3eb9b508956b077cb22ee9e20f2f612a4afb2e0ec3797b149bb2b085c70e9d9110b6cdcb818aa4b66afff9d8fe54b40a5921699a SHA512 3284675110336a56485f5b4577e5461cbcf2e400deb4a4de5b107b248d8271f5e382dd247d1679c0be70e0ffb5f8820592e54c83f37807ae301b21f63d17b3de
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
new file mode 100644
index 000000000000..c768f2c14017
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
+
+# see Makefile:1
+QA_PKGCONFIG_VERSION="0.6.3"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}