gentoo resync : 20.03.2022

4 files changed, 2 insertions, 107 deletions

diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index f930e16794fb..b9d96eda481a 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,10 +1,6 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
 DIST py-tree-sitter-4f39f6919ca3be8efb420a338fd2cf9b8b68b156.tar.gz 14075 BLAKE2B b9a7a2247114c34e211f5098f04c456b25a3aee6cfde6d75bdd83427a379c5f339f1e897a3246ef7dafb2b512442bd0e7da18f391bc8283545e060dd00481421 SHA512 21629a147cda0c95a054c31223b082afa2d12491fee7a0d720187e5c390d9771c2e9b7d85fd35a56a2cf97a7addfa5332b58b3a36893aab2d7487f9522c5cddc
-DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2B fa7e7f969a9136286ef18220f5776def84404121f9b7cce35422c925e194380d4a5a3fadc3da50d2d52d85f4100abeab1456e9749f93be20af9f3dd0854d5177 SHA512 4de7084928990ae61628599a8d6440606d70589b8becef6ee58ffdc1ac632660d050cab3947727dab6161dd74ccf6b9f74e83bfe4ff30c41d01caf25fbf6b8e5
-DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1292 BLAKE2B 68477c979202614447523f41f75439b389a10dcaf5dac02f28b656898ebeb210f19264e05da11fda0b60e18987abce16a5bbc6c83658a9c61480959acfadd0a8 SHA512 1e353aa082b645354550ccbd90e683366967af2968942175b462c7be8bcdf0ec2fb7c27724a10175dca15ee27f66849353c82c8ce3db0631e8b5f88b206a2020
-EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
-EBUILD tree-sitter-0.20.0.ebuild 1324 BLAKE2B 5b03cbde9e2ead5664dec0aed459283a779d742aaec7a0a51226f6e75606f6f88035fd1d0ec1a696f79bd8559345a9bea9a4737919e2238c621263cf713473d7 SHA512 387c294a3eb072b0df16054e65aa00bd3568a1089c7ec4d397c5893f3318e888c509e41ce09148fa14577ac1c1048911df24005b896cd3907604caad06be3d05
+EBUILD tree-sitter-0.20.0.ebuild 1316 BLAKE2B 4b8e3cf92e906403ab7699ccc45505e241c3d59024b59bf731e26d90899ddbfe42aa9bab3e0e04eace0d8fda2dd040d685c70a601b5729d71e878dc296b4df86 SHA512 009152bc3ecd186bf313d37830e00c33cbeb5066193f426ff74dc16b1c79aa1098ccdc5615d97b5740626822e541a8d7d68147ca34b91ceb37c98160652884f3
 MISC metadata.xml 393 BLAKE2B 15f673391ad9e9aab93808392449ddf99ccc35fe1b345010a4373b46a56c8dad461042e0a2dd735e4d53f77059a5f7920fc3215f939aacd1455c61f0ecdfa3c0 SHA512 519fc8d6fbbf3709820b26b1f4786b16f6679e569ae4adafdc5e37b2dfbc03351bfd9c6750264300a0309406ffe20868d48c3ff488dde22f900d59e1813c15ef
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
deleted file mode 100644
index e1f289115be9..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-EGIT_COMMIT="b4db17e4d43f27a040b4bf087695cc200512e4ea"
-MY_P=py-tree-sitter-${EGIT_COMMIT}
-FIXTURE_PV=0.19.0
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
-SRC_URI="
-	https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.tar.gz
-	test? (
-		https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
-			-> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
-		https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
-			-> tree-sitter-python-${FIXTURE_PV}.tar.gz
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-libs/tree-sitter:="
-DEPEND=${RDEPEND}
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_unpack() {
-	default
-	rmdir "${S}/tree_sitter/core" || die
-
-	if use test; then
-		mkdir "${S}/tests/fixtures" || die
-		local f
-		for f in tree-sitter-{javascript,python}; do
-			mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
-		done
-	fi
-}
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
deleted file mode 100644
index c82239603325..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-EGIT_COMMIT="b4db17e4d43f27a040b4bf087695cc200512e4ea"
-MY_P=py-tree-sitter-${EGIT_COMMIT}
-
-# TODO: unbundle
-TS_PV=0.19.5
-FIXTURE_PV=0.19.0
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
-SRC_URI="
-	https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.tar.gz
-	https://github.com/tree-sitter/tree-sitter/archive/v${TS_PV}.tar.gz
-		-> tree-sitter-${TS_PV}.gh.tar.gz
-	test? (
-		https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
-			-> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
-		https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
-			-> tree-sitter-python-${FIXTURE_PV}.tar.gz
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests setup.py
-
-src_unpack() {
-	default
-	rmdir "${S}/tree_sitter/core" || die
-	mv "tree-sitter-${TS_PV}" "${S}/tree_sitter/core" || die
-
-	if use test; then
-		mkdir "${S}/tests/fixtures" || die
-		local f
-		for f in tree-sitter-{javascript,python}; do
-			mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
-		done
-	fi
-}
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
index 544fbb9e087e..39fabb2b5dd4 100644
--- a/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}