8 files changed, 17 insertions, 122 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7a69778713e0..069140f96d88 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index c2bcb61975fe..8dc3884c815a 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,3 @@
-DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
 DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
-EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
 EBUILD mimalloc-2.0.6.ebuild 698 BLAKE2B 3eb6400c93be33c1f752156d6e851ae072fcf9029b0d56709e793b84a65d8543c8a6ec729887f10b1d3d0b2982e2a7c789c3279962161725c01c474e91dac547 SHA512 4b6fa39b2283504cf306463614b3d6700ec0170b4c02317911056133c2cef9a7e106c1a874f86d555f0aaeadb01755e0961c905bc3510ad5172dce94c0e33b4d
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
deleted file mode 100644
index 8710584db2d5..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index c7aa570e04a1..e8e63b7f1ecb 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -6,6 +6,5 @@ AUX ossp-uuid-1.6.2-hwaddr.patch 4535 BLAKE2B e91cb616e6f60f410e6d214359da6f785d
 AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee6a624dc96e226f9f696e5db9380b5132a0b3b0fae528fdcd6d8281f60fc94c34d4f67a4525399ff85310c243b0d72 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
-EBUILD ossp-uuid-1.6.2-r6.ebuild 2173 BLAKE2B 4b519dfedca832601ec5c253f3c05bc9f591116dc651fe7d4b2ae77f6a77a44bb10acfb512164e5cf43ecb4bd86270116e8ed4c77979d4411021da03c7d5f958 SHA512 b01c2e04a003a85a469417c973bbfd03f2a1d164003a50c137c8f08e37cafbb8f9260086edcae22c6f8045cf55c2787e649ceb285ab7bbafe8998b5910fba78a
-EBUILD ossp-uuid-1.6.2-r7.ebuild 2180 BLAKE2B 44776a7c4da5d2c4dd9c2285d6f1a42c15fe6ab2c3939edfd1479985f91abfb7b7ae394504cba433d2a8d50c5ad6efe34828cf324b89d7989aa1fd254dd39302 SHA512 dda413f7fb52f9bce8e267ba2ae29d10f551fe180562f7559f5d66991244a0d4e4329fb58edb5bfb508cc77c005e2ec62ceca67c3eef79eaea413f69f54ca3a3
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2176 BLAKE2B 1ad5acdcea2441b0871535f059ab129017bdd92ac5f5d58012d67320f53feba0097a7bdb4cd5b239d2ab304a9290394e7703dd8a64c59376a2bed0177ff0f3a5 SHA512 2d5edd80e85d22fd4294acc193387a62534d7ad7d8eafb43db88839fc08bdf4aea822e23a75a746a64fda0f2e85a2746d543f3843fddf81c82a7e911f9f6f72d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
deleted file mode 100644
index 7afc78c9b5c8..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="uuid-${PV}"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+cxx perl static-libs"
-
-DEPEND="perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	eapply \
-		"${FILESDIR}/${P}-gentoo-r1.patch" \
-		"${FILESDIR}/${P}-gentoo-perl.patch" \
-		"${FILESDIR}/${P}-hwaddr.patch" \
-		"${FILESDIR}/${P}-manfix.patch" \
-		"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
-		"${FILESDIR}/${P}-fix-whatis-entries.patch" \
-		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir="${EPREFIX}"/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd perl
-		# configure needs the ossp-uuid.la generated by `make` in $S
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
-	default
-	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
-	if use perl ; then
-		cd perl
-		perl-module_src_install
-	fi
-
-	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
-
-	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-
-	use perl && emake -C perl test
-}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
index 7a9a0a1c12aa..6aa8c6c2d688 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+cxx perl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index ea6da0643df9..3e07e2ce0412 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,5 @@
 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.20.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
new file mode 100644
index 000000000000..8088400764ad
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"