gentoo auto-resync : 21:11:2023 - 23:10:38

11 files changed, 392 insertions, 0 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f71f44342720..4c7f6da1e0d4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 9f6a999473dc..80f4464c782a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -25,6 +25,8 @@ DIST openssl-3.1.3.tar.gz 15561739 BLAKE2B a279a5c80191b95ca735aed20beb56ab899ee
 DIST openssl-3.1.3.tar.gz.asc 833 BLAKE2B 27427a4523c9fa9f9ffc0e00d6492e4bab4cd0d24ebf903fee05197c5089c4d201a76ef0073e856bedd86abf54ae01491e78d259eedf21a4797eee6c9cbd8fcf SHA512 0b8f12dd8623160f7358c24a8f36edb5d8c3460d1f7d711e1367051b172d9ac90c2c7c4980da1aa9f9c89d72384a034fe888b109650156fa197c363a14337127
 DIST openssl-3.1.4.tar.gz 15569450 BLAKE2B bd6a3ef458f86dd5173e87b10432bd81c1570e1848da3c4d7a06eb021d2f67e4075421885c402f6ea792e383e756d78757c17ef060094e840ed5df6faf3d7f9e SHA512 a69df4a018f57dee7d8a57c8003a6869eba11f1eaa394518976642a993780d0de3326019e92dea4c679c6c581fef568ea616ec541afc0792800359c606dffcd2
 DIST openssl-3.1.4.tar.gz.asc 833 BLAKE2B 9f4c2365617b3ea21c8d4f4281befe584e8d39d5f0546fb17d151b21b20615e5d20ed9105881ee981948e866a7629930a7544263c124dce66a9df4f19e16708e SHA512 fc5fa55a54e3da5d48229f25073186613ddf6bb3907999b53ed61832cce9acef00c79d45357bc8590eeeeffb04a829d45921d982924300da16d84eb5333c1512
+DIST openssl-3.2.0-beta1.tar.gz 17624092 BLAKE2B 3bb38ddce0345b13193669ec950af4d13da4aebba07dd31b258bdd973a94ddc4dda62391ee7dab3e7b99fad408cad1d82ad9ea03b4638234b786ae0416e0ae4f SHA512 07ce7d1c5c84371a1aeb64a208fbc74f89275765f9bb00a0e3262fcae7ecb83cdd73cba30a01fe44b60a0616b9c6bb4c9c42c43fc42ecf0b6fdde57a621813c6
+DIST openssl-3.2.0-beta1.tar.gz.asc 833 BLAKE2B e651499cb40790ba2f03c3af804bf2a76bc698982c096c6ef96942c5e66ec3f3c485547c52f9b83cf5857deeac22054517301350201d68b907d3a490f91a3f56 SHA512 15fd8d41669ed90292b36bc4408186a6dde0444e3bfcce4dc398968cdcdaad014c7d348ae88d368c9a7ec2c7995adc011706a97aeb92f62edde47d9511d5d75c
 EBUILD openssl-1.0.2u-r1.ebuild 10122 BLAKE2B 7b0ffeca5863fbb162d179e55a6f2ad821b725b71668824e1f91e7a3d903a1bf6737596471ae41a76de1eda23bca8dc185d1c9e838e9ccbc0cbb2c0fb124b052 SHA512 77a71985a021f31d10f27673c22a946d106c5d54801b5c95a7626014014ea35304df1ae1558fb337ed2171afc4e40940c6371f07397e969c339f62d62fabb7c7
 EBUILD openssl-1.1.1u.ebuild 8173 BLAKE2B c16b697781239d462a08127773cbf1eb6f6b2cd90df76a6b3472ae8d05fa667339f917445069755729e394dd31de61649043dd5087200642c19babc13f0b66a6 SHA512 3d33752c12cf4ce9480838fb9ce52f667bb7baa6cf70bebc53f652e8da7a9e313ea77809d0569b15956d9224c4e213da7fa979eb4ea0c995dcf81a0526ee1556
 EBUILD openssl-1.1.1w.ebuild 8181 BLAKE2B 122000c7160310c67cf7c23407858c2b57ba290fa224a21ca0b2912b0d167edc0e405d82de6a5942e1de3f1aff42f994c3b373842b262c6956c7ac6f78098b99 SHA512 504fe58b5b00c55d54055ace08d576b3895e7d9135dbc1574f4bce9eb9ea64bb56e8d0503e0a5a7d05063b8d0ab6b0dcd7784be92d7ae9b9e10b7951af13e2f8
@@ -36,4 +38,5 @@ EBUILD openssl-3.0.9-r2.ebuild 8717 BLAKE2B 649faf16a11897fe4fae64aa1c6d682569dc
 EBUILD openssl-3.1.2.ebuild 8713 BLAKE2B b020424f2ec10e98fca790566672bd5c997756a86f508ddaa2e42d1bacf0f320bbdd645b7e8d830d0cc75759e083af643f6230183805abf460666f7bdb732d32 SHA512 6157a855926cfeb3c25813581bd4cddd7420f2ede63a62a5ad2e49bcfae777e3b7b751d68f703dcf51d808bb26f77e040870f3b532649b1cb9ae9392a2434f99
 EBUILD openssl-3.1.3.ebuild 8713 BLAKE2B b020424f2ec10e98fca790566672bd5c997756a86f508ddaa2e42d1bacf0f320bbdd645b7e8d830d0cc75759e083af643f6230183805abf460666f7bdb732d32 SHA512 6157a855926cfeb3c25813581bd4cddd7420f2ede63a62a5ad2e49bcfae777e3b7b751d68f703dcf51d808bb26f77e040870f3b532649b1cb9ae9392a2434f99
 EBUILD openssl-3.1.4.ebuild 8713 BLAKE2B b020424f2ec10e98fca790566672bd5c997756a86f508ddaa2e42d1bacf0f320bbdd645b7e8d830d0cc75759e083af643f6230183805abf460666f7bdb732d32 SHA512 6157a855926cfeb3c25813581bd4cddd7420f2ede63a62a5ad2e49bcfae777e3b7b751d68f703dcf51d808bb26f77e040870f3b532649b1cb9ae9392a2434f99
+EBUILD openssl-3.2.0_beta1.ebuild 8958 BLAKE2B 6035bdff201485350355eadea310f0b5631b731836d9a0e8a8ca187733c5673b37c6f19907c29da7ee02b9aff2d4de2946369d9d8f7a3d1c886718d9e0baa19f SHA512 02f4ce09c2f46f95175357840bf8bcaaa5cca708f9339d3cf22e81f19ff1e2f9582b670f029f3a851c8c95158b3f03a6feb77d26fe3abfbd982fc981e867cf61
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-3.2.0_beta1.ebuild b/dev-libs/openssl/openssl-3.2.0_beta1.ebuild
new file mode 100644
index 000000000000..cbd8ca5decd5
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.2.0_beta1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 -j1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/tree-sitter-cmake/Manifest b/dev-libs/tree-sitter-cmake/Manifest
index 8203f781e1ee..405cc640c527 100644
--- a/dev-libs/tree-sitter-cmake/Manifest
+++ b/dev-libs/tree-sitter-cmake/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-cmake-0.1.0.tar.gz 42425 BLAKE2B a6d609b9baf297265bee4355c2f8d11853d393461e708475c53ce8ee067f668550a31cc75142d5ddd8e34160a03308388f01661b13fdb8a22a0c3cf95a0105a6 SHA512 5d228fde691b7ef9f4043ad41a852541551c31392ad5beb21580e6902039c5fa1adc2a42642644603871e373011ef3c9f4264bfc40e33fd0d3071a716b5d61cf
+DIST tree-sitter-cmake-0.4.1.tar.gz 50091 BLAKE2B a91fdeedca3bad83b1e8006ff464a09d761ba9d46601216f21885062c3559891837fcf0db7960b69382b117073a3ff937ea26e2861922133c8660e5c2043b6c2 SHA512 25318e305aa42bfaa6fd09fb515988a31a00247f535e4d881573226d862d72a74eb30dfdfb3bd2b985a9be96cdf6da6a8a9b945d9c256870755015ae573edd9c
 EBUILD tree-sitter-cmake-0.1.0.ebuild 369 BLAKE2B bc58231fb7de1932507b18032017c93db9d26523eaac3ad6cb28d1730081384fcee628f098c1d23e83150b7fc3c558eb4ad83f8989f6164a779170a3b1ce1728 SHA512 65e814350945f4fd67a641122e818da00298972cc71100f08d522e2081113d3312022bdf633cbc0a76c638c3dd448f5479c3a81fe3e2eed5c74a432cecdcd565
+EBUILD tree-sitter-cmake-0.4.1.ebuild 370 BLAKE2B 51d32e3791084d8013ff9c2786323a6cb530c1dc14921527545399da408138ac61f4c157ab875dde79011a2a748b84828ef59c19c4a084d51ee7973e7f2f5f97 SHA512 13f4c0581c3dfea1199e7ed4769a396a6e306aac7353daeb02d9b9ea2d9ee3b58cf6ec5d81faf0964728889c423928cade17ae9959ef0388971b9ba75eb73da7
 MISC metadata.xml 335 BLAKE2B 2c8a5ca17bc26e1c3ba8ed381ac080dbaa4720e2584c47507fcdc261de207fccce5abc14874fea0f49009cb5932f521ed927c9a3dee871df88a2ffacc6df2b41 SHA512 5ddea708b1a74c670ee79c9b2223fb0a664a609eca2891f355e25b36cf97f21b88e8a9e6b6cf34cdbc051a0253a5a3e9e756b0c8daf6af7910f0c6ce9a9693a6
diff --git a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.4.1.ebuild b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.4.1.ebuild
new file mode 100644
index 000000000000..513baef93b10
--- /dev/null
+++ b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.4.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="CMake grammar for tree-sitter"
+HOMEPAGE="https://github.com/uyha/tree-sitter-cmake"
+SRC_URI="https://github.com/uyha/tree-sitter-cmake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-meta/Manifest b/dev-libs/tree-sitter-meta/Manifest
index f3b11dbc67d0..460d147e92eb 100644
--- a/dev-libs/tree-sitter-meta/Manifest
+++ b/dev-libs/tree-sitter-meta/Manifest
@@ -1,3 +1,4 @@
 EBUILD tree-sitter-meta-1-r1.ebuild 949 BLAKE2B 6e36ec719265505f6c2e2d14fc1120ddb4a55fc7a576d67e053ff8eda8a529930130f43c09eb612c27f24a917b71ba9e7df75c48ec35d4bc82be90e45d89dc19 SHA512 e22bc9c51930383c01fd4d9f14ca69d0eb5992e680a9a0b33db9615c2d24162e1c333bcd2b7be935db52d8df90027d73203fa0f8a34c926f0033f500d5f39984
+EBUILD tree-sitter-meta-1-r3.ebuild 1006 BLAKE2B 088c7a474c33a4fa6c1716e3a5b4e9ea8ccbecf35db30cc6d58c9d94af4527f351b6c1a3fd13d12b1abc40b086f35acdf9248ee613a80d56b0145d0cfb9e38ff SHA512 c6c74b9b29b2ceb0725cd352318164d551fcea5966314058140de984b8af9daa885c1ebdef04a04d5c027c2f9bed9ed13c31b0d161cd86a88b2eb6dc96f52048
 EBUILD tree-sitter-meta-1.ebuild 631 BLAKE2B 258966b03e18ecf79927eab5378a2e54a9e2358d970078635d51153dc0d167487bcbae9ffb406ecc6e78083e0e04e1673030695d0bde575ae328465077b6890d SHA512 21f4d32458d18bc02aabf9dcacbce05ac81145a5cab4c9b031d8c4787ad878a265cf2bd6c21cb78ce56874a5972d72ba0a5dfb23e926a0f40836639f1dbc8f73
 MISC metadata.xml 353 BLAKE2B 37c7e076c05097bd49ad4b4a74ba03c9626b746f5b69f168d72331ddf98f266cc9fad580803a56f6ab12e4a1d25aca5cae5d8e6a343e571b187365e853fc468e SHA512 450c7c6f5d38fa9f31781c098b724d77b45ecb25f0ad2dd5525c66d185c77351c1a50cb5b4af50040c842a5729bbc8652ed000d818caa6539f8e6e30be022fd1
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r3.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r3.ebuild
new file mode 100644
index 000000000000..773308fe55d6
--- /dev/null
+++ b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Metapackage for Tree Sitter packages"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/tree-sitter
+	dev-libs/tree-sitter-bash
+	dev-libs/tree-sitter-c
+	dev-libs/tree-sitter-cmake
+	dev-libs/tree-sitter-cpp
+	dev-libs/tree-sitter-c-sharp
+	dev-libs/tree-sitter-css
+	dev-libs/tree-sitter-embedded-template
+	dev-libs/tree-sitter-go
+	dev-libs/tree-sitter-haskell
+	dev-libs/tree-sitter-html
+	dev-libs/tree-sitter-java
+	dev-libs/tree-sitter-javascript
+	dev-libs/tree-sitter-jsdoc
+	dev-libs/tree-sitter-json
+	dev-libs/tree-sitter-julia
+	dev-libs/tree-sitter-ocaml
+	dev-libs/tree-sitter-php
+	dev-libs/tree-sitter-python
+	dev-libs/tree-sitter-ql
+	dev-libs/tree-sitter-regex
+	dev-libs/tree-sitter-ruby
+	dev-libs/tree-sitter-rust
+	dev-libs/tree-sitter-scala
+	dev-libs/tree-sitter-tsq
+	dev-libs/tree-sitter-typescript
+"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 068a492876e8..5d25b9182c93 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-php-0.19.0.tar.gz 155930 BLAKE2B e78b0a719f2e8cde6398a5645023c09135f61bbe138abeff8160bb1688bab84fa7ca51438e380d79fc0e05efa2e4897a7ff05fd677ac0b8cb4098e27d576a10a SHA512 bf82af3a4c0da96f58e93aaee2724f327c11e297bcd455998e0863aa64ab6ae85d1d212afa51b75c8e8ab998568cc71b0309ee3d1d41b632ef0283478ecc5711
+DIST tree-sitter-php-0.20.0.tar.gz 290518 BLAKE2B 5ba7dabf79665ceb2be737906493bf774e51a0233a62bdb89d84a6a9204745a99679322e047a9115d95e92c3dbb34c5da591497223bb580522b587bedc933d10 SHA512 0ce3e8b2a7cb26b8fa2210e2ac8b133c0ea8450b7504f93422a7baa0ee6f5217c72b9ce0cbdc5ac1e85deb2ab08fc6b968e74f124dce13ebfb8ad9b0af2afb8f
 EBUILD tree-sitter-php-0.19.0.ebuild 283 BLAKE2B 7fd49e6859ed718c48aa3e27627aa4d5559f3a80384aff787139ab0405a059c4a071aae9372f0de468cda4dd81fe8ef0aacae8eecca19a2577230226372f076f SHA512 95e3316405803ec023590c6483bedcca2599e350d0bff9f8a754ff1797345d43e0a7f2787a3fabb2fa3664fb6047f7238373c9e58a89b68a63a914fb18fe8ca1
+EBUILD tree-sitter-php-0.20.0.ebuild 284 BLAKE2B c0379a37a9a21c00c17d4893c2759683e3edeed5f4b9c5057a59b1e676fc58ececccd9603f2aaab71ed72dddc978ef52ee30a7a79f3dab8ccd41bc593c5df9a1 SHA512 7e91a5e3e5a2a45f9ef23c50461c85038b0ecf6aec6b0c78eb59f4e0bbea4056c551f032f04378c11196dd2b3f637bbce3774fe72a258a7fc51ef547fe1f3eeb
 MISC metadata.xml 445 BLAKE2B f28e6b9a54a45fe0e9b9965b2388bf049ec819fb8c7599fa9faca7815074edc962b64f90b5cb3feccc566a88c8ff4b1d91db7dcd4ca576957f5a6d738f56ae00 SHA512 2fdb1e35a5a68b9f582f16c96810c507e6b96b897fc82c13c3b6d2f1490f1d021a673086d499221c5ce03e868469350fcabeeedc553fd126680e58ecc73ea45e
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild
new file mode 100644
index 000000000000..1788cdcc7fd4
--- /dev/null
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="PHP grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index d3c16af961d5..52e76f281c8b 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b
+DIST tree-sitter-ruby-0.20.0_pre20221101.tar.gz 575761 BLAKE2B 17daf39dfd812ab0993cd2a3ad728603d629c2e177261fa60d237a1dfd504b2a087611824cdffb03e95c0b304d9f6991ccf36aad1f18db4aa3177c082c6e275e SHA512 ff6eb4a28e5313cbdebca0f939d209d7c15016fef4ed864e64ce2e6f30023e15a88483c5bc90673fcee42df75c6e003b69fc2e5f81b72ecf1a506c836eebeba4
 EBUILD tree-sitter-ruby-0.19.0.ebuild 285 BLAKE2B f0eae4cb4a9e979353a83e56897ebd87c616877c292b03d1506f1a46fb05cf117e303a60245d213f97bbe429b6e6a32e4e5851618147ef59db694a7c7c4ffcc2 SHA512 4f50df5ca7ab14990741c761d98af7b3e7f812690e4cf97432a7294a567aa521d07603ee385484df72176fe0f53e914504c40795dc389a9e2ca42fb65a2d6592
+EBUILD tree-sitter-ruby-0.20.0_pre20221101.ebuild 527 BLAKE2B 7d908781741ecb427db514b1bf96028d9df90a09fe5dbef4815b607633d69b3375d606af8d078bd4582a3f7597e6f4b7b79bbb34d9370effef07081980c38803 SHA512 ec4399343a09f65df0b9e8900b9ff7d886a0ae4bf258d11bd181017a031e25cbbd77283914a500e738997e66b1e6e9b536800d833252652b89b26e116db341e4
 MISC metadata.xml 559 BLAKE2B 152613d9b7937a08857d96b4f66803dee57788dce76181acb149bd2a372c1647035076171da2fb0b0745d1762589dd829486536befd1245ad0e2d917fd646d28 SHA512 5c353e6872add822be369b693ec38c2cc797be4c57c23c5a43b144407b7af987f0741c3dc56a173f6ebf05e2d3fad1484f7d8b45393d211ea7e1ae1c9d6281a0
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
new file mode 100644
index 000000000000..c22308dfb087
--- /dev/null
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/tree-sitter/tree-sitter-ruby/issues/232
+MY_COMMIT=c91960320d0f337bdd48308a8ad5500bd2616979
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Ruby grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
+SRC_URI="https://github.com/tree-sitter/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_COMMIT}/src
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"