gentoo auto-resync : 29:06:2023 - 01:39:20

160 files changed, 2711 insertions, 1143 deletions

diff --git a/Manifest b/Manifest
index 9d03783eaa49..ef12bb9b8d7d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29303 BLAKE2B f03eb3c3e632af1076b10abfe92d5959b3bb0237102346f8be53b0d5ce9119467ed6e21280f2108e81e9463b5342facdd0f812ebce938c803879ce5a74373bda SHA512 ad47631b9454cb8f69fd2679024ef5a5383ea48fa1f49dad8d74bf647deb4d075dec60683137d6791e9c8aee119113d2b5f8ce5e207303c0db13063e54d41c8b
-TIMESTAMP 2023-06-28T18:09:54Z
+MANIFEST Manifest.files.gz 29283 BLAKE2B 98e6887e28f823f21e0ec4169db10d7eb6ff2a5128e44288ba9b5882ce03168e2e68de2ad553f39aaa522d4e7374dc4fd8285e879d3b2b08b95720c7b8b1e3be SHA512 42d8898759fbc2ce895b8654d9b472cecc3a1657397fa77eee6d0f0681e60fc06dcb15c0ae14ef165e22d7aeb1ddb2ee81b6296a6be8c4a6ceebd33a7f425380
+TIMESTAMP 2023-06-29T00:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScy9NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZVBAAnv4NYqCmKvbJbQS3w+Amej7ndeVvi/e++zQ6hzgMh4gAEazTs92AGMBQ
-Gim+Li59mTEIykutJbdRmtIEcM77m20LIbd2nOiV8mz6F2wPBw2AFiG6en6f6J5u
-l7WK3qr0E/PraZPDgeUgCh2A88IeYvbFOdEWrYWGdpbM/y0BVE/9O37EwAVXr5Xe
-iRIMpCfxn6hV5l8aPAU/Xa32uHoY6+m8/FTr6U6Yw2gwE0w/aGEnL4x0NedD5WI2
-DZ6Te5CY0wlGU0EJAmYAAw2StrO8rvELpUTuhUAIeNP/MFSdjagqw8I7Aj2733Et
-LN6ozeR7tXDkPD2ERXaHv1or/3bTHovFpL46Tm3eZpAFIMTh+7/XGheHdc6UwP3v
-9ddXlgAWBxDuCECCvfQAk9Kwiqc/3IlNkr7C/fMY56CrxK4vk7CCWMPqUSzlRhOl
-NXWoJel4sGBoKDiewgCYPZ1LJ85j2Q66mdSW+6b9aVPBP9dS2WKzXyLwJ/YiIXDd
-nPrpVc4V1JmjwzXmElNKp05oCv5hvzKU3y8+MpX8a98Itkyr1eLN9Un2MSKUQmgi
-xqbPyLpbwoy4Hi2BzP3QZLurmxxgyZFOXiBZHa2yjj+Shc5qIbb4q5NTG72A2VTa
-y7INQGSljgJyRwZqKJj21KvIuHPz0dAvzwkaMe1dKjz52j43/8E=
-=LqRu
+klBg1A/+O/oRbRu5g4cGEj+5dSirl1G343Wm0MFfNmIyfvg+RDhxYRM7/UVlsCwu
+VZcFnnoUpYMLzoZ24JblmNR6mqHAF16jEa7eb4QhTAU9rGpN/uO0qZL4nhr4tSPS
+gDN7avkTf4aMDyH+YsPrBGA9o5aZIcCJlOZRAIGYnZoCNyQs7Vo0s5WodagcK8wq
+H6YlslX6zsKRJ6TmfvvEA7m+2vbbgE1gei11Fgn5sX9z2hkZn0jfiS5Wf2yDDPPt
+DNiC7ent6OaYIcu826Mrlz17usYpM6j2tOSjdJqxHvjDsCAu0VTGfc4qH8U/MxZO
+hBrh4KEXP1l27bKLKpLZAZGfY8a1ByYnuIrsqCKEOxfcBwAQ7vVsuIBLFFJBENJ3
+HhAzqyCfZ3FNjFWkFYuPmEHEH2fcBWG2P62r/9cHV5unNeMP6xGwaOJoqR1eSIp6
+rDM5q4k92OfouZarkZUSRK3z0fxemZV7J7OsX7dYUn3/VxsUeIRidYdcg/dQfPws
+jhtMxPaIS7zUnZbI7Uv/Ia0R6H9r+EK/HAMazJu+qpT824ck705nbgumDc/Y7/9v
+bME5U8v7G8AYGASSZlv9NQ30HO8qNHoO/NLxK5Qt5bKh7VYacOFiJhHFdrG+KOnR
++NVYUtHlgi1hsvpDpHmwFSiOhl4SFkgvmn5L3al632qd5YP9KWU=
+=eqlC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index af3606f0247b..58cdf7a311ef 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 59ec945444bf..8af7faa58482 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 233f5493a484..49cecd1ea774 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,13 +1,9 @@
 AUX sudo-1.9.13_p3-configure-clang16.patch 3119 BLAKE2B 7fe43abb439129f7f5f31c1165f92c1ef9b22c526e150019a47dce27a7260512dfe723d11c778c9dca6ae5e53a4b2da5ce939185877298886e182bb6293b1c22 SHA512 4a319e199db85a54970b09fe655b17a0d5656248ff7f004d045f3ed777a01ac1132fb77eab56483d55b995e35153ae52c0e7ff2c168baf2106bfe9d4eafcaa9b
-DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05 SHA512 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45
-DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
 DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
 DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a
 DIST sudo-1.9.14.tar.gz 5229170 BLAKE2B 5731eda1cabb23dd3b77851ce1fcde8e1b7efc1b4fa27fe65522c7b8e23c0330003eb2d4ebb47d63416fb3a52db478b2f60ca22da6a2d66cb27c52ea5264749e SHA512 33d3bc3d66b1c5412b7d579b703d44f246386d2915c1c63be851869569c7bc627211a8897d0bc718d6ebb2bdd938b093c0901f0b7912c8475f8e6fcbbc559a99
 DIST sudo-1.9.14.tar.gz.sig 566 BLAKE2B a7081ee89bf5f12b1b605133ee2f37156779377aec010a12a67933fd21d7e3c0fce9987803bfeea28a7f3ed10784cba6b22b0fee2ff89bac8d1aeec5604bfd6d SHA512 e81d5321386ddddfc58fa884f627cf60478360ab723e1ba97a7138f4b234df2b03fc5a1db5b1b9ed117b2c8ffc2ae529569e0e7364178b1c4d3eaec9c90f86b7
-EBUILD sudo-1.9.12_p2.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-1.9.13_p3-r1.ebuild 7466 BLAKE2B 6c880d950c1bc21c99e8e186b4602fc91b5511aa1bca7dcc1e21eeb93f39d8c802b7b5c1ddabc49ce9f42db9de05791c434574fb9bcca0a09868ca9135ef8db7 SHA512 4828c4aa791be701398466f7bf186321e6d1eca2eefa85142669ea6271563b566db334d2c77ad82746c0b36932b632e80a51bef861a222d55f6d0fd88c50b53e
-EBUILD sudo-1.9.13_p3.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-1.9.14.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 EBUILD sudo-9999.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.12_p2.ebuild b/app-admin/sudo/sudo-1.9.12_p2.ebuild
deleted file mode 100644
index 53d18fb3d5ff..000000000000
--- a/app-admin/sudo/sudo-1.9.12_p2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
-	inherit verify-sig
-
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="
-		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
-		verify-sig? (
-			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
-			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	fi
-
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:0= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND+="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-set_secure_path() {
-	# First extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
-	case "${SECURE_PATH}" in
-		*/usr/sbin*)
-			;;
-		*)
-			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-			;;
-	esac
-
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# Then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# Finally, strip gcc paths, bug #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do
-				[[ ${thisp} == ${e} ]] && continue 2 ;
-			done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-
-	set_secure_path
-
-	# bug #767712
-	tc-export PKG_CONFIG
-
-	# - audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# - plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	local myeconfargs=(
-		# We set all of the relevant options by ourselves (patched
-		# into the toolchain) and setting these in the build system
-		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
-		# (it'll downgrade to =2). So, this has no functional effect on
-		# the hardening for users. It's safe.
-		--disable-hardening
-
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP.md
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP.md for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins docs/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam ; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	# bug #652958
-	fperms 0711 /var/db/sudo
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	# bug #697812
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	# bug #652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.13_p3.ebuild b/app-admin/sudo/sudo-1.9.13_p3.ebuild
deleted file mode 100644
index 53d18fb3d5ff..000000000000
--- a/app-admin/sudo/sudo-1.9.13_p3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
-	inherit verify-sig
-
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="
-		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
-		verify-sig? (
-			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
-			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	fi
-
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:0= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND+="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-set_secure_path() {
-	# First extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
-	case "${SECURE_PATH}" in
-		*/usr/sbin*)
-			;;
-		*)
-			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-			;;
-	esac
-
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# Then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# Finally, strip gcc paths, bug #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do
-				[[ ${thisp} == ${e} ]] && continue 2 ;
-			done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-
-	set_secure_path
-
-	# bug #767712
-	tc-export PKG_CONFIG
-
-	# - audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# - plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	local myeconfargs=(
-		# We set all of the relevant options by ourselves (patched
-		# into the toolchain) and setting these in the build system
-		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
-		# (it'll downgrade to =2). So, this has no functional effect on
-		# the hardening for users. It's safe.
-		--disable-hardening
-
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP.md
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP.md for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins docs/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam ; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	# bug #652958
-	fperms 0711 /var/db/sudo
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	# bug #697812
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	# bug #652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 515988b1d1f7..e907f8413a64 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 4b1b5c9b00de..35e3c042da33 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,4 +1,5 @@
 AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3
+AUX clucene-2.3.3.4-fix-binary-function.patch 6521 BLAKE2B c47cdd71144eceece720dcbc7b69a489130c7a2931beba7c4154ce17b80d10d4f163d9c107ea2528d6ec9e13e203806e75cb916ce3567a9324db61dde9b2640d SHA512 bdb96fe9436297600da92db489f7044f12725831cd83b66863c6036b3f530a54dadbf059a4df3a994c1976850d30f1927680b09a695faee992088d44c4e68904
 AUX clucene-2.3.3.4-fix-clang.patch 1982 BLAKE2B 2b330b21715d29a1c825d16cb8309319af4267812a68dea4ff045c3a4aaf0e258b22457d7635dc63886bd8856bccad2f8602432b889449b67fb7490c2f604763 SHA512 26e3705682ad970a012a38188ccc8cac89ab22a509474c4401a57200c98b49423ccf63fb70ccbd57265dd62ec2944fe498b217911d1886ea924881699c9968dc
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
@@ -6,5 +7,5 @@ AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f
 AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r8.ebuild 1596 BLAKE2B f2ae2bbe041902f8339bd12a4175a2ce53a12991e3f4ea62b1489e6625322ecd3a3df710ab1606fb2d533b85f2234ed194e7945b1b01c61de3c5f0a788b58f30 SHA512 20549e2ac6fa4c1e2faef5dd6c0b3028c75c5054c2a11ef55c5aa7abbc4d7eace93c38f862a546ee06a2e1e39b7d7f203975d10c683cf8542708d7d4f3ff3672
+EBUILD clucene-2.3.3.4-r9.ebuild 1642 BLAKE2B 0753b86eff206cd6a5cdb599f38f7077ffbc9048931ec26af028c38e90413909bd436aeb537cff9ba680f2fa9ce74075c5ded0114695ddfddbf9a546483eea1d SHA512 6265485362c51b54b024e4d913acb6c94d18e2e8c258e97afcf10a2c7f1f9e433179acb1775200e9e6c625f35bd41aa7d9e70ebd682eccd13a96681f734c6f4c
 MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
index 3ee090b7f675..dee944a2e476 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-gmtime.patch"
 	"${FILESDIR}/${P}-musl-pthread.patch"
 	"${FILESDIR}/${P}-libcxx.patch"
+	"${FILESDIR}/${P}-fix-binary-function.patch"
 )
 
 src_prepare() {
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch
new file mode 100644
index 000000000000..dbcff1bb1169
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch
@@ -0,0 +1,199 @@
+Replace std::binary_function with typedefs (deprecated in c++11 and removed in c++17).
+Bug: https://bugs.gentoo.org/869170
+--- a/src/core/CLucene/index/_Term.h
++++ b/src/core/CLucene/index/_Term.h
+@@ -13,9 +13,12 @@
+ CL_NS_DEF(index)
+ 
+ 
+-class Term_Equals:public CL_NS_STD(binary_function)<const Term*,const Term*,bool>
++class Term_Equals
+ {
+ public:
++	typedef const Term* first_argument_type;
++	typedef const Term* second_argument_type;
++	typedef bool result_type;
+ 	bool operator()( const Term* val1, const Term* val2 ) const{
+ 		return val1->equals(val2);
+ 	}
+--- a/src/core/CLucene/search/BooleanQuery.cpp
++++ b/src/core/CLucene/search/BooleanQuery.cpp
+@@ -25,9 +25,12 @@ CL_NS_USE(index)
+ CL_NS_USE(util)
+ CL_NS_DEF(search)
+ 
+-	class BooleanClause_Compare:public CL_NS_STD(binary_function)<const BooleanClause*,const BooleanClause*,bool>
++	class BooleanClause_Compare
+ 	{
+ 	public:
++		typedef const BooleanClause* first_argument_type;
++		typedef const BooleanClause* second_argument_type;
++		typedef bool result_type;
+ 		bool operator()( const BooleanClause* val1, const BooleanClause* val2 ) const {
+ 			return val1->equals(val2);
+ 		}
+--- a/src/core/CLucene/search/MultiPhraseQuery.cpp
++++ b/src/core/CLucene/search/MultiPhraseQuery.cpp
+@@ -377,9 +377,12 @@ TCHAR* MultiPhraseQuery::toString(const TCHAR* f) const {
+ 	return buffer.giveBuffer();
+ }
+ 
+-class TermArray_Equals:public CL_NS_STD(binary_function)<const Term**,const Term**,bool>
++class TermArray_Equals
+ {
+ public:
++	typedef const Term** first_argument_type;
++	typedef const Term** second_argument_type;
++	typedef bool result_type;
+ 	bool operator()( CL_NS(util)::ArrayBase<CL_NS(index)::Term*>* val1, CL_NS(util)::ArrayBase<CL_NS(index)::Term*>* val2 ) const{
+     if ( val1->length != val2->length )
+       return false;
+--- a/src/core/CLucene/util/Equators.h
++++ b/src/core/CLucene/util/Equators.h
+@@ -22,21 +22,30 @@ CL_NS_DEF(util)
+ /** @internal */
+ class CLUCENE_INLINE_EXPORT Equals{
+ public:
+-	class CLUCENE_INLINE_EXPORT Int32:public CL_NS_STD(binary_function)<const int32_t*,const int32_t*,bool>
++	class CLUCENE_INLINE_EXPORT Int32
+ 	{
+ 	public:
++		typedef const int32_t* first_argument_type;
++		typedef const int32_t* second_argument_type;
++		typedef bool result_type;
+ 		bool operator()( const int32_t val1, const int32_t val2 ) const;
+ 	};
+ 	
+-	class CLUCENE_INLINE_EXPORT Char:public CL_NS_STD(binary_function)<const char*,const char*,bool>
++	class CLUCENE_INLINE_EXPORT Char
+ 	{
+ 	public:
++		typedef const char* first_argument_type;
++		typedef const char* second_argument_type;
++		typedef bool result_type;
+ 		bool operator()( const char* val1, const char* val2 ) const;
+ 	};
+ #ifdef _UCS2
+-	class CLUCENE_INLINE_EXPORT WChar: public CL_NS_STD(binary_function)<const wchar_t*,const wchar_t*,bool>
++	class CLUCENE_INLINE_EXPORT WChar
+ 	{
+ 	public:
++		typedef const wchar_t* first_argument_type;
++		typedef const wchar_t* second_argument_type;
++		typedef bool result_type;
+ 		bool operator()( const wchar_t* val1, const wchar_t* val2 ) const;
+ 	};
+ 	class CLUCENE_INLINE_EXPORT TChar: public WChar{
+@@ -48,9 +57,12 @@ public:
+ 
+ 
+     template<typename _cl>
+-	class CLUCENE_INLINE_EXPORT Void:public CL_NS_STD(binary_function)<const void*,const void*,bool>
++	class CLUCENE_INLINE_EXPORT Void
+ 	{
+ 	public:
++		typedef const void* first_argument_type;
++		typedef const void* second_argument_type;
++		typedef bool result_type;
+ 		bool operator()( _cl* val1, _cl* val2 ) const{
+ 			return val1==val2;
+ 		}
+--- a/src/core/CLucene/util/_Arrays.h
++++ b/src/core/CLucene/util/_Arrays.h
+@@ -124,12 +124,14 @@ CL_NS_DEF(util)
+ 	
+ 	template <typename _kt, typename _comparator, 
+ 		typename class1, typename class2>
+-	class CLListEquals:
+-		public CL_NS_STD(binary_function)<class1*,class2*,bool>
++	class CLListEquals
+ 	{
+ 	typedef typename class1::const_iterator _itr1;
+ 	typedef typename class2::const_iterator _itr2;
+ 	public:
++		typedef class1* first_argument_type;
++		typedef class2* second_argument_type;
++		typedef bool result_type;
+ 		CLListEquals(){
+ 		}
+ 		bool equals( class1* val1, class2* val2 ) const{
+--- a/src/test/index/TestTermVectorsReader.cpp
++++ b/src/test/index/TestTermVectorsReader.cpp
+@@ -93,17 +93,21 @@ CL_NS_USE(util);
+     }
+   };
+ 
+-  struct MyTCharCompare :
+-    public std::binary_function<const TCHAR*, const TCHAR*, bool>
++  struct MyTCharCompare
+   {
++    typedef const TCHAR* first_argument_type;
++    typedef const TCHAR* second_argument_type;
++    typedef bool result_type;
+     bool operator () (const TCHAR* v1, const TCHAR* v2) const {
+       return _tcscmp(v1, v2) < 0;
+     }
+   };
+ 
+-  struct TestTokenCompare : 
+-    public std::binary_function<const TestToken*, const TestToken*, bool>
++  struct TestTokenCompare
+   {
++    typedef const TestToken* first_argument_type;
++    typedef const TestToken* second_argument_type;
++    typedef bool result_type;
+     bool operator () (const TestToken* t1, const TestToken* t2) const {
+       return t1->pos < t2->pos;
+     }
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,14 @@ ELSE(NOT CMAKE_BUILD_TYPE)
+     MESSAGE( "Compiling as ${CMAKE_BUILD_TYPE}" )
+ ENDIF(NOT CMAKE_BUILD_TYPE)
+ 
++IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++  SET(CMAKE_COMPILER_IS_CLANG 1)
++ENDIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++
++IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++  SET(CMAKE_COMPILER_IS_CLANGXX 1)
++ENDIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++
+ OPTION(ENABLE_DEBUG
+   "enable debug support"
+   OFF)
+@@ -62,14 +70,14 @@ OPTION(ENABLE_ASCII_MODE
+   OFF)
+   
+ SET(ENABLE_ANSI_MODE OFF)
+-IF(CMAKE_COMPILER_IS_GNUCXX)
++IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+   SET(ENABLE_ANSI_MODE ON)
+   
+   #exceptions:
+   IF(MINGW OR CYGWIN)
+     SET(ENABLE_ANSI_MODE OFF)
+   ENDIF(MINGW OR CYGWIN)
+-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
++ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+ 
+ OPTION(ENABLE_ANSI_MODE
+   "compile with -ansi flag"
+@@ -109,7 +117,7 @@ OPTION(ENABLE_COMPILE_TESTS
+ 
+ #check flags...
+ INCLUDE (TestCXXAcceptsFlag)
+-IF ( CMAKE_COMPILER_IS_GNUCC )
++IF ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG )
+     CHECK_CXX_ACCEPTS_FLAG(-pg GccFlagPg)
+     IF ( GccFlagPg )
+         OPTION(ENABLE_GPROF
+@@ -131,7 +139,7 @@ IF ( CMAKE_COMPILER_IS_GNUCC )
+    IF( ENABLE_ANSI_MODE )
+     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
+    ENDIF ( ENABLE_ANSI_MODE )
+-ENDIF(CMAKE_COMPILER_IS_GNUCC) 
++ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) 
+ 
+ 
+ #Single output directory for building all executables and libraries.
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 098b585d9d7a..1a2df7c5f07f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a32a65858d48..6fbfe098d57b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -29,12 +29,12 @@ EBUILD mariadb-10.11.4.ebuild 42465 BLAKE2B 0a91fe40b6a3c86ae75f4542342f7ea421f5
 EBUILD mariadb-10.4.27-r1.ebuild 42101 BLAKE2B e81c6f5f58acc48f06bf63adc7a9a389e08ff9650ebaf36037665a5d9f2a6daeb3b3c2046571514a701ac5ea1627c0635a99bf46a6a9d08e9d0c7b95f684217a SHA512 5c209245d4bb2f6cd7bc7def08809454d5ac9d3cfa0d52365c1c96449eef42f7958f9f1cbe514227b06d2dc5b15d3457035f96a1f688d90386afd888e7be7e29
 EBUILD mariadb-10.4.28-r1.ebuild 42251 BLAKE2B 1170da78f58814201431b87aa8bf8017f2543a245e0416e02af514262063176f9bd6ac6099cae8c466b708627559c2bf44026adf9012e5ae7f9a679a6832e2bb SHA512 5a72504c992e835dfeab5a5fca6bea109577fb92eb8241803fed61006652a0c3e7f9fecbfad46039b890a1d432e30cd219edc7d662cb0154a20b4817fdee8518
 EBUILD mariadb-10.4.29.ebuild 42204 BLAKE2B a1fce5ae8cf6a67a8acd545c0dc20c6cfda568335db2356b2a94814ebda6e7dba521578988b9242da0ee89c0cf0e09383ed2fb513965555cf859bf143530db94 SHA512 9575aa979caf13894a657008a58aa88dbe5d92318524411beb5551a5b3598a7ae64cbd3e34fb6660dffa12f593e6f3ef398734e94f1aea2b8629924596657232
-EBUILD mariadb-10.4.30.ebuild 42203 BLAKE2B 3f60de736ada78f7c376c23a35d3d86befd46ac30d7316d65bc2dba0286d6e59cd3bec47c40e97bad94c9e292f5b53063b5ed2d6543fe79b74e2d0937de84d28 SHA512 afba5254cc17b14313bcfc24cdf419273d6bff63c593cc5de6c853d1e64292a8235653a264b1b21ff9ecacfbcd99a35ed7f4c87489f3ed6b8bfce34b286de1b7
+EBUILD mariadb-10.4.30.ebuild 42202 BLAKE2B d21198daf9cf3108bf5d8365f3c28cd89e5ad09ee05cd792eaa450d7c68f261cbea2694c7605e8f40351580b3f2dce1c09f4cab2a03e5157847d724470b5b4ef SHA512 8adc60ccb87110239485528f48234e8f6e6bd665fc0a0ede23cefb5bc2ff60d63c3109d878e1ce722bcb280d3a7594b7d44ad5ae10051d17c0d15b121ad1b3f2
 EBUILD mariadb-10.5.18-r1.ebuild 42060 BLAKE2B d94d8f43dbe4189eb4d05d801c9b53058b0d671ad47a5808d583ba3c3521389a2c6c946deb1a7834823135e0d62af98fb3bf2b8f2630651f51bf55ef1c3ebe1a SHA512 93cffc2fd62f343507818e237f24c6b80a08afe5126d31ac119f0b942134472825a3e75d1409e7b6cacb2e7b6c7a5680277445b0aa3bab80933b010a9b642c15
 EBUILD mariadb-10.5.19-r1.ebuild 42260 BLAKE2B 8ea6c803f5fb5d670e9c2a79bb8b0c7a6830d27974e330727b8221eadc8b901cd02c8cdcf49d0ae1750a500615ac25257ba436be1ac648e1a8d1d68ebff4c53e SHA512 dccabf1c7dcbf62585bc600820a99cd9e800a235bd47baeaaa5e3e16d7ec0fe2365f8c8c134ed57c86471f430437570eabeee7f90e2e41c2e68bf0af6e6370de
-EBUILD mariadb-10.5.21.ebuild 42163 BLAKE2B e7dc05827b4f35fd03e592c9687cfc412b89c98592395ea64c64146753ba475b8040b7599f6ecebf1dd7f11a5e1184977c8e8669485798da87be0bf0019d381a SHA512 fdfb313add7f31ce2a94d4982fbf8420bbd0b003262fe8469fc7d76f778666c78c1cc33e789b24db735de0afaa7fbe06e660b6a1986b6bd098c843909c2e57b4
+EBUILD mariadb-10.5.21.ebuild 42162 BLAKE2B 2716af37ae734b6f89f8258d4b60adb930684f3085e90fbb4d18903d628ca05594aefe6ee38a976f0f60b96fb4c59ad042dbedacc02458de57b87158817f0aee SHA512 344c62404dceef507f64f8b5a9fd0ed50886ebaacf0675851dc40ed7d203af1a982f840e13c099fbf2c28a1c90c758cfc20a681a166a92a69017e0cb5bdeaed2
 EBUILD mariadb-10.6.11-r4.ebuild 42723 BLAKE2B a44662046dd3b9afafd02c1dcfeed4c3a3c2a70d68638002b6374f98289c64a8bfeeaf502011b894263ea01dbef748ed6c22f26634d56a47ebe2572e4d826070 SHA512 4e78f69cfc56a80165dd754295bb9486d85a436f79516f835338f41da4bafc1c7ec760d0dfbb077f5295f271d657382f4e98873022464870803aeddc87963286
 EBUILD mariadb-10.6.11.ebuild 42589 BLAKE2B 5e8bbab058a222bdb92ed35dfaec0e9a8a3849b585b29f0dbecd37ef1c6396ec0f7c942108940d7a75685dab4ba0bfa62197888f4e207a422c174d2f15a9f5f1 SHA512 10cffb1fc77f316629f9c2aafa1ecc2b7b07e35ba179b14bfdbc2e89bdee0e0b6ad28d5e9b9b15895b8792b70518ee648da0675cea65a363de8787a7bf757d05
 EBUILD mariadb-10.6.12-r1.ebuild 42770 BLAKE2B 05575a0a02e2d331cc31463e29ebd73463620c471451a894e427de20d6a697914893e54bc94a9a26b80bacd4a7ac18e95a09fbd83c26dec4d3f694cabcd653a0 SHA512 33a35a52d9dd1bcbc3ed14ff8690bd7fab8e19765c99095b84c2434bf38c037d9e56253a10370f01243a2abd55e405a6d271eb9a7a384f1e92afb60bf7df265f
-EBUILD mariadb-10.6.14.ebuild 42711 BLAKE2B 20d9e969865fbc13543e6b30ec130363b202fde8428900d8050e80e0b72218cd824079038963f975ca76a45122ae67c8bd6d5d97352d94ac1635c233ab5c872c SHA512 b39528257fd34de9d158569d94af7f32f0933d82d1790298ccdd06be3289cc7f36c462cf0f59cbd06eb4acdc0ad82f54ed4c53d8b93c54bf45f2c47949b8d1a5
+EBUILD mariadb-10.6.14.ebuild 42710 BLAKE2B de5ab9de4483dc8de671b2ec0bb4f9bd1ba14d8a86805475000724c2d849e21b10f5fc0bd3fc741282d4c29a97375f365e69e5f30b122c6ed15df61510549cbc SHA512 6b90476613f43d041a86e4d44d2057a8707f512ca3d85bf417b69f3a69d39b84d6d38bafcd969ba58e42aa74fd6a3371fc9c928401869401b74ec1d58ba13d32
 MISC metadata.xml 2481 BLAKE2B 09059dd62aedd2606c213bce7f1448ab4b2888a7e444555d103310af4ecbea9a78dc83dc1ac0b695e0c201d2afe2ccdecbd42fa4b17b63917d76d2e00727f0f2 SHA512 35d6cce29ef52f5843cbc0282e93fa01d36c3911d37074af448e1db2de483633e527671cf60bfdc708bd249f6b62827b159ff77d5bc00087d95d2631bed79e5d
diff --git a/dev-db/mariadb/mariadb-10.4.30.ebuild b/dev-db/mariadb/mariadb-10.4.30.ebuild
index f48ea6c0c6be..bdfd5eeb7039 100644
--- a/dev-db/mariadb/mariadb-10.4.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.30.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.5.21.ebuild b/dev-db/mariadb/mariadb-10.5.21.ebuild
index f5477e843a70..fd0f0111fa10 100644
--- a/dev-db/mariadb/mariadb-10.5.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.21.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.6.14.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild
index 0675af87264c..b997295340a3 100644
--- a/dev-db/mariadb/mariadb-10.6.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.14.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9d4b83e7586b..da2a984ab1e5 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 2be6fc1a55ae..dac6ffe96550 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,10 +1,13 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
 AUX nim-1.6.10-testament-skipfile.txt 1210 BLAKE2B d70268fcef2edb5383ca7dc696ae393432e0894c313d17e192e988e8826b5c296d3fcdd7bc5d547d62b1450f3c721fe3655166fd9ee3755f29c9ae8390453fba SHA512 a943fa520633b513ae3c5060a79b9501b34cad81bcbebbd803780506713fe1a9fd1580736e85032d0dedcd4190ebc37666ae94f4ca73bf5d88d51df523d2c4ea
+AUX nim-1.6.14-testament-skipfile.txt 1290 BLAKE2B 90924dbbb19768e46cd9d064eb6aa54fa706a4afe3d6e05fdd6a84c453cd4e1cb846ba3a63269c7051ebc120ce8a821694de9033b3415e9f16c2b994ed43d340 SHA512 3b9bb6cd4dc0ff078064a190d9667335a250b13386987cfc9c33debdddc634de18e5b6d9a5ab267de677ab0609a4e2783947f0487c0fc51e537a735717352f66
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
 DIST nim-1.6.12.tar.xz 5180496 BLAKE2B d7c04ffdde273336770d9397dd255b7cfc442f6be9592afbfa5ceb1ac7836a8213d5cea673477ab55bd56c004cc477a6023b6a2799715f46689f3e328302e433 SHA512 17c31024ee19dfa36f25bf8a5091992b24a4adb1a817246119a2fc552075999f698a92e66243ddd5ee69d966deead37535c9aac00ebece3854c930f905eeb030
+DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
 EBUILD nim-1.6.10-r2.ebuild 4413 BLAKE2B 4a321ed1751fb582bba04413759d78e061d6d00751b6c1e15668b05ab2e57552a726bf0ac33b49355a881bb6543bd5357ca874cb39b6294d562c2a7900cd64b9 SHA512 afe55c756bf43f875d810e551f2f0d9f746bef5800de269d4a20260bbd6750647bd7da4352502f2e61e60b67f00156975eaf314e5beb373e65e0664152c7f104
 EBUILD nim-1.6.12.ebuild 4459 BLAKE2B d237b8243dcbb0ab941155e5a8abec2295f628ab98d2a92d5e8aee3d661e44d546fb71c36bfbec2fb29958a5736149d4a055a6b5b517a1ab42d3733b7d37f813 SHA512 ad440e3e94f3c91b1366e919b431ca1e51d967b94758921158799981749aeb4d7be9d953ba017811082778d8d3d5023896ea03b95551e2883cc2c90ef8afc15b
+EBUILD nim-1.6.14.ebuild 4460 BLAKE2B 2dd6af1faf63cedd9c5edcded85d27c03cce9823c75832f14dd0f5a7035d0c5e2a24005f1a9dd6dd2fc84ba1b500be6e9147a083894fdf2580e5454092fa4edc SHA512 99371a0f29a93ab01ec5ff4f7c758e450954142c367e7558120633434818c7e0b66b538fc7b843c69a98f5f88868c01bebf5b8faba83a03682c9dfd17758f34d
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
new file mode 100644
index 000000000000..b0317176ac0d
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
@@ -0,0 +1,43 @@
+# broken
+tests/assert/tassert_c.nim
+tests/async/tasync_traceback.nim
+tests/errmsgs/t14444.nim
+tests/errmsgs/tcall_with_default_arg.nim
+tests/errmsgs/tproper_stacktrace.nim
+tests/errmsgs/tproper_stacktrace2.nim
+tests/errmsgs/tproper_stacktrace3.nim
+tests/js/tmangle.nim
+tests/js/twritestacktrace.nim
+tests/lent/tbasic_lent_check.nim
+tests/misc/trunner.nim
+tests/misc/tstrace.nim
+tests/misc/twarningaserror.nim
+tests/parser/t20922.nim
+tests/pragmas/thintprocessing.nim
+tests/pragmas/tused.nim
+tests/pragmas/twarning_off.nim
+tests/stdlib/tos.nim
+tests/stdlib/tstackframes.nim
+tests/stdlib/tstats.nim
+tests/system/talloc.nim
+tests/testament/tshould_not_work.nim
+# require network
+tests/stdlib/thttpclient.nim
+tests/stdlib/tnetconnect.nim
+tests/stdlib/tssl.nim
+# don't work without megatest
+tests/misc/tjoinable.nim
+tests/testament/tjoinable.nim
+# don't work with "--hint:all:off" hack
+tests/concepts/t3330.nim
+tests/stylecheck/t20397_2.nim
+tests/stylecheck/treject.nim
+tests/stylecheck/tusages.nim
+# need external dependencies
+tests/manyloc/keineschweine/keineschweine.nim
+tests/manyloc/nake/nakefile.nim
+tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+# need functional valgrind
+tests/destructor/tnewruntime_strutils.nim
+tests/destructor/tv2_raise.nim
+tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/nim-1.6.14.ebuild b/dev-lang/nim/nim-1.6.14.ebuild
new file mode 100644
index 000000000000..c6bf55d99f89
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.14.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCH_PV="1.6.6_p1"
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="Compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="
+	https://nim-lang.org/download/${P}.tar.xz
+	experimental? (
+		https://git.sr.ht/~cyber/${PN}-patches/archive/${PATCH_PV}.tar.gz
+			-> nim-patches-${PATCH_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc experimental test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
+
+# Borrowed from nim-utils.eclass (guru overlay).
+nim_gen_config() {
+	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
+		cc:"gcc"
+		gcc.exe:"$(tc-getCC)"
+		gcc.linkerexe:"$(tc-getCC)"
+		gcc.cpp.exe:"$(tc-getCXX)"
+		gcc.cpp.linkerexe:"$(tc-getCXX)"
+		gcc.options.speed:"${CFLAGS}"
+		gcc.options.size:"${CFLAGS}"
+		gcc.options.debug:"${CFLAGS}"
+		gcc.options.always:"${CPPFLAGS}"
+		gcc.options.linker:"${LDFLAGS}"
+		gcc.cpp.options.speed:"${CXXFLAGS}"
+		gcc.cpp.options.size:"${CXXFLAGS}"
+		gcc.cpp.options.debug:"${CXXFLAGS}"
+		gcc.cpp.options.always:"${CPPFLAGS}"
+		gcc.cpp.options.linker:"${LDFLAGS}"
+
+		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+		-d:"release"
+		--parallelBuild:"$(makeopts_jobs)"
+
+		# some tests don't work with processing hints
+		--processing:"off"
+	EOF
+}
+
+src_prepare() {
+	default
+
+	# note: there are consumers in the ::guru overlay
+	use experimental && eapply "${WORKDIR}"/nim-patches-${PATCH_PV}
+}
+
+src_configure() {
+	xdg_environment_reset  # bug 667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	nim_gen_config
+
+	mkdir "${HOME}"/.parallel || die
+	touch "${HOME}"/.parallel/will-cite || die "parallel setup failed"
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./build.sh --parallel "$(makeopts_jobs)"
+
+	ebegin "Waiting for unfinished jobs"
+	while [[ ! -f "bin/nim" ]]; do
+		sleep 1
+	done
+	eend 0
+
+	edo ./bin/nim compile koch
+	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
+	edo ./koch tools
+
+	if use doc; then
+		local -a docargs=(
+			# set git tag
+			--git.commit:v${PV}
+			# skip runnableExamples as some of them need net
+			--docCmd:skip
+			# make logs less verbose
+			--hints:off
+			--warnings:off
+		)
+		edo ./koch doc "${docargs[@]}"
+		HTML_DOCS=( web/upload/${PV}/. )
+	fi
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+	local -a nimflags=(
+		# Leave only the safe hints enabled.
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local -a testament_args=(
+		--skipFrom:"${FILESDIR}/${PN}-1.6.14-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
+		testament_args+=( --colors:off )
+
+	local -a categories
+	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
+
+	# AdditionalCategories from "testament/categories.nim".
+	categories+=( debugger examples lib )
+
+	local tcat checkpoint
+	for tcat in "${categories[@]}"; do
+		# Use checkpoints for less painful testing.
+		checkpoint="${T}/.testament-${tcat}"
+		[[ -f "${checkpoint}" ]] && continue
+
+		case ${tcat} in
+			testdata )
+				:
+			;;
+			arc | ic | valgrind )
+				einfo "Skipped category '${tcat}'"
+				;;
+			* )
+				einfo "Running tests in category '${tcat}'"
+				edo ./bin/testament "${testament_args[@]}" \
+					category "${tcat}" "${nimflags[@]}"
+				;;
+		esac
+
+		touch "${checkpoint}" || die
+	done
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
+	einstalldocs
+
+	# "./koch install" installs only "nim" binary but not the rest.
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		dobin "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+
+	insinto /usr/share/zsh/site-functions
+	newins tools/nim.zsh-completion _nim
+	newins dist/nimble/nimble.zsh-completion _nimble
+
+	# Install the @nim-rebuild set for Portage.
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/nim-sets.conf nim.conf
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index aff4ab3b2bdc..e61a9d2cc232 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index f4b8a7efaeb0..3c43d8ddab38 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,3 +1,4 @@
+AUX no-automagic-manpages-compress.patch 498 BLAKE2B c803a33a5a0b8b0c4240ba05a0a9159921a32daa2e86396e85f98acaad26d22cbff814e54e4a96fab4ecfe682a4788bd7dfc263345626617064b76d60c1f0e1a SHA512 d44bc11b6ab9e30ac594982f1f2c139c7806287cd759d106f133010627201874fe8d8290b63835c240fcd0da144455f5b1e63fad8867704c3044da174189e171
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
-EBUILD libtermkey-0.22.ebuild 997 BLAKE2B dd173404749613a4c17c0126b00bc337e15ac47c091e1c66799a2bdfbf0bfe5beea20a875531ea67bc44259722e7e4123857ddd18a9ede28e887701fe769fe76 SHA512 a1eb12d557ead379d343439e315b005cffd28d41b2d31a15bda5e3b8d7ebb6c58c1a35dd29c4a4bdd2552eda97d15a3d7f2c0ece8c2f46d8ad843e95691c7519
+EBUILD libtermkey-0.22-r1.ebuild 1122 BLAKE2B 14ed571ca254c4eec72f194b0b502e32bf85e2924e4428b430b0ddeaf2ffb3fb1608395bfe12028608824e7b07536c9ae0b6b6d713045acebb9e8bbb25c53833 SHA512 cffbe895939884f531887a955761a07c8468b7915ef59626ba1670fc0a2bca3320a30d6005b3c02875ba0065f37600f2bdfe58d357ad39cc9cf3b0481113b74d
 MISC metadata.xml 358 BLAKE2B 555dc6dc5edb485ded5e2fec2eef70426c2e693853954c5feb8d39914b1cc88aed79dae13df257df86193701e9f842fad8e4686941d3a143a261e289ebc0960c SHA512 1a9faab554e113b8c3c83ad7a6e24fa71ed7ea3838a11677465cc824c7181d512d58443b5ea2fbd52492345e62db5895e3f17a47dc7e413842b02cdad85c5411
diff --git a/dev-libs/libtermkey/files/no-automagic-manpages-compress.patch b/dev-libs/libtermkey/files/no-automagic-manpages-compress.patch
new file mode 100644
index 000000000000..8f6fa34aef6c
--- /dev/null
+++ b/dev-libs/libtermkey/files/no-automagic-manpages-compress.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index 199f143..70788ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -121,13 +121,3 @@ install-lib: $(LIBRARY)
+ install-man:
+ 	install -d $(DESTDIR)$(MAN3DIR)
+ 	install -d $(DESTDIR)$(MAN7DIR)
+-	for F in man/*.3; do \
+-	  gzip <$$F >$(DESTDIR)$(MAN3DIR)/$${F#man/}.gz; \
+-	done
+-	for F in man/*.7; do \
+-	  gzip <$$F >$(DESTDIR)$(MAN7DIR)/$${F#man/}.gz; \
+-	done
+-	while read FROM EQ TO; do \
+-	  echo ln -sf $$TO.gz $(DESTDIR)$(MAN3DIR)/$$FROM.gz; \
+-	done < man/also
+-
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22-r1.ebuild
index ebdac2ff53e1..556109cfa964 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit flag-o-matic
 
 DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
@@ -14,10 +15,18 @@ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
+	demos? ( dev-libs/glib:2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/no-automagic-manpages-compress.patch
+)
 
 src_prepare() {
 	default
@@ -36,4 +45,6 @@ src_install() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
 	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
 	rm "${ED}"/usr/$(get_libdir)/${PN}.la || die
+	doman "${S}"/man/*.3
+	doman "${S}"/man/*.7
 }
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index e66e4af02b1e..58408ada4a8d 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.13.2.tar.gz 43494 BLAKE2B d90799df83e8bed7f4ee9cdf6c7f56c86b1aee7123735963c4e2f858a69bbf28bcd062c6a302f8687626b1884acde61d7f7882b985517b24a1358b57ea13cdcc SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
 DIST qtkeychain-0.14.1.tar.gz 50743 BLAKE2B 76300eeefc98a40da762a65cdf0a5a406b55cb92e290bb91e643353c3d2efdee1387168805326def60a42196d5cfde4f0d6c36cb2e0c946fc331361891af08f7 SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6
 EBUILD qtkeychain-0.13.2.ebuild 873 BLAKE2B 80303d605c6cd61ca8dbe55941540755d891e7b47acfda65b99478aaa502e679c4bbacbdbaa766eead0655ae1ab79d221c199972fc1b7455f950b582e4b3c8a0 SHA512 60bfec3a8e4d5a405824ef9e13f5c70bb8a086b672f00dd2ebd0e153734bcb2c221aa2dc600bd490971d16ff36eaa3c8269750c358485a3ab6aba0e8a77d50ea
-EBUILD qtkeychain-0.14.1-r1.ebuild 1539 BLAKE2B 67c89aaab0081183f685629868335b8334e2b9b51903bc3c60687207efb21c3b67e03b8bf1832265e0e0b5adede789139078c7c28fbc0ff5c47c769368e1e2f2 SHA512 5b65e2c6a28fa48d2401d02b3a111b827380c4baa254c516f5139c63390eb4541c0651e4a563640995115c7a611517cb2f2077de779d6148c850942908c93f13
+EBUILD qtkeychain-0.14.1-r1.ebuild 1536 BLAKE2B 84c4c592f82552082115a2c8cbbe8bb12eb3ecf5f452b6d1f8614efcd8cb7e965ee2e6e3a9daa1e8f216e7f042fd3d9be0ebc9a7bcd3717064ac0beecdc63f56 SHA512 01c1c87802424863be46a3d26c8efd4702f1b64877814ad93e4d89e4d7a6ed0f678d592148d37c50f0366f3fdc8855499973f52b2f782c25b035a93732a763f3
 MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild
index f6bdc28e5b0d..5cf8244bf96a 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1ea937341c5b..57993daf743a 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 835ea4cdf992..584778670fc6 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,4 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.2-r101.ebuild 1970 BLAKE2B 3d1305e370b779579c575ca5f17bd33d8f6323f9cfa2e6b0d7a555499bc490cfb0b1c2eb65f440d390001a8b48491dc9706932db61ced6f00dbe3e8bca1deff7 SHA512 388eec995598d7f8bc40249f88663fcc70b5ca8d12947287c69dcc97bc26a61bc2f67a27862b4bb73a2389ff7319b79eae415a1f0e87ea4e3945922b179fe46d
+EBUILD lpeg-1.0.2-r101.ebuild 1969 BLAKE2B 94ef434afb41a7f685e20fa54689a1ffe1878c4b3b560cd17ff03d2ab7ab7bf3d69ad997f83e2afcc5df48698895212dde0394688eed99098c3d93856c18ff23 SHA512 05a3f82f0362f51e1f19790f8d0793fe6ab53587d7386ba290fac58cb1e2a6c5cfeaabb461b3a4bcb49f64df7b9454ef988c295b8153a0080d96d70c336001c8
 MISC metadata.xml 258 BLAKE2B c0d0fed17412419de0d059e7ccb4289f3ffb2628a07c3d15329cba8ed726b2c52efde7ad15857b845ce71e7eeca903467f592e3e324d91147583f5178e5378fa SHA512 0dbe2c5806353798c494bddc4034ccd37181951a6f5085bbb25d15d36d4a800634db47d25d1834bc920000533e4f4db7a02840dd18bd460b35c1f77b743fa1d1
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index 411d41357574..cb9aa50746f3 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ src_prepare() {
 lua_src_compile() {
 	cd "${S}.${ELUA}/" || die
 	emake CC="$(tc-getCC)" \
-		LUADIR="${ESYSROOT}/$(lua_get_include_dir)"
+		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
 }
 
 src_compile() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9816325625e8..d8687c1c700c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ac02fcac2ac8..8a3e4f3d9778 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,10 @@
 AUX scipy-1.11.0-determinant-1x1-matrix.patch 2757 BLAKE2B a91cf26f38f7b783a98b0664f959ca2da9a0c7eb746c4e5d325562d6395eb239761049686671e5dd1e785652b582b59091026cc6c5cbae7070f18731f50d9f84 SHA512 35e2e7f650bc97a84d9a69e2985e71b43bdb984ceed098fefd16e3faef65cc8e5d31761fcbe5c826072e76956f619e87d1a154e159c283e0c9f6679402d5e1d5
 DIST scipy-1.10.1.tar.gz 42407997 BLAKE2B 807dceb1e056a1a2c0ec354e4e21f64e59cdab9eaf286cec3783bb93bf80efa00a71e7bd8d1898e8a2fdf86b614f035a0a97436dc4515574d73d9d4521824316 SHA512 767e1dee6285d98e4d58d8d8d1e3654b00e3216e9ad55455fc9473f1d044bef80ecce749bcd24d8f331367b882c9c3e6b652a6e901bb4296ddc7cc44699215b6
 DIST scipy-1.11.0.tar.gz 56030121 BLAKE2B e700bf8f9cffa7bc0f4832722010dcf2e03d8f93d13534f7f85734394c02536c1427cae5a097b59616f0873ba941579fcf2efd0baafc2037d9eca1f93362d38b SHA512 248cfbbedba73925b0461bf0f96c4a11bd4cfc7849cb18c58f6405074796ab0efdc4f056c58d344cb8833c0d2c6425f84e7ac6fe958cf98b1cc0bf16e7ff2444
+DIST scipy-1.11.1.tar.gz 56031509 BLAKE2B 456a80103f8c31c456f80e06b25d765f7ad5655dbdd49e99f476e78273f4291c578a8e99fda3f3a1e848c0e75e08629a09a8146b4a798e85edcaffb7ed1d34a9 SHA512 2859fc73c4fef713497f450b76a57d274bb46477a08ac909714823225f065a13c1e42a61ce67575cfc475e1e4612090cc4ca0920411fe32370c5b5c476352f97
 DIST scipy-html-1.10.1.zip 49191107 BLAKE2B 5163ae3a62745992bcf94ab02ca2bb13fcf6d2ae0eb2a113ba29bc37a8e8f40ec70e39fe16e6371ce0bc31d4c8f0f46746be91b4fe2ad41c68a985c6f00fb8e7 SHA512 f3252452d3bfd400890f29460de2f97bf72732e0fc864582e906b78808e856ead5b1bf97cba531f2150e396408e585499d127004231421d20108e96040316232
 DIST scipy-html-1.11.0.zip 50421508 BLAKE2B cb5e4a4f8817a80f54ae73b4a47ba22d2438df46ebfe27ef5fdc2695fdd983226f4ccae925bf82b15d01ced4f4b6807384ecadac5e1aa7700aa887ad06b7d065 SHA512 33718bbd5e828687d93fccc441a53b6a2e8f54ac4952d3b69d4c4668f55cb6ef5aba33df9acda20b2400effa5ae71767b2a5602a365ad2045a6edd24ff89c253
 EBUILD scipy-1.10.1.ebuild 2662 BLAKE2B dec183f49fdfc327173ad0a5ae329cf9621662f08f116a16d3048004b1de25e535b0ba5edaad8c21ffee328cbdc9eb233f2494dc99ab24a687bb21ca7699925a SHA512 ee9bf4e78a98402d4ea0658af6d45428144a5ddca988583421abc1d992ac7e38c3ef3dab4500ac09ac103c6e5e7190c7d4e1d7036bbe26c4572463edfbefc066
 EBUILD scipy-1.11.0-r1.ebuild 2850 BLAKE2B eb201e9c497d0262cd1416b9f9f90fc9c84195595e348ffc1341457922add3482b16577d7bbb48017d3bce1883c69ee4545fc30e6fabe8410d3e5113e56286ff SHA512 d703ab7e30a83a720cb4a3568a841e5348e021b5542b708483731894b4f7bb16e0b9cce1a93fad84f558b2b3fb812528fb72a6812b9dc888f89d853898aefb06
-EBUILD scipy-1.11.0.ebuild 2788 BLAKE2B 5ed5993b046a177228cc67096e20dacd5ba760f94db41d3df741b3473858ccc3828f272b880fe004824084d13775be17b4c57487f78bd703461a983ead7a2ccd SHA512 8d0cd0d692fe8b4c2575810e5a9cbc3eebe7db4f54d10521e5bd023dc9e0a596ee689c016cf9b1c5a93d5fbb9ce08cf6fc1edce12638cd225cbcd5a94c3a2586
+EBUILD scipy-1.11.1.ebuild 2804 BLAKE2B 584a0fe975160fcce1f8105378046957e9c16d5b7069b751af6203f3766597ea4f5a4116e3100fcfe7177f407431c953b5fc4314164203329ab0cf2e76679baf SHA512 3448c3333363688353ea1979ffeb030c9bd19a7327cf3ce445756645205321116f0877c0f6ef2be895cab41918ec81864c878a0d03a8e40a2b7db4e3a1bb229b
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/scipy-1.11.0.ebuild b/dev-python/scipy/scipy-1.11.1.ebuild
index 10bd746dd9b0..ff937ef528ac 100644
--- a/dev-python/scipy/scipy-1.11.0.ebuild
+++ b/dev-python/scipy/scipy-1.11.1.ebuild
@@ -29,7 +29,8 @@ else
 	inherit pypi
 
 	# Upstream is often behind with doc updates
-	DOC_PV=${PV}
+	#DOC_PV=${PV}
+	DOC_PV=1.11.0
 
 	SRC_URI+="
 		doc? (
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bbdc696821d7..a601bf440f28 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 8e12253e92aa..816a756e7398 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -5,7 +5,9 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f
 DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d
 DIST bcc-0.26.0.tar.gz 5255485 BLAKE2B 934b63148dc1e4f017ab97681c6df69c9d5ab1db44c2bb1608644e1d91b745c25759fb1a6c5c543888e23a4e0c4a2e5738b772e0b02ea9901f8bec1a8b15cdd3 SHA512 394872a5780cc7651c91b584ccc13f18f64585b5843364433c042d9ded70faaf15a2e1125d51498508427b089f5bf826f13004d15a1892aada1a5f228a2a8adb
 DIST bcc-0.27.0.tar.gz 5907268 BLAKE2B 83bdf7c82c9fec17deded76886b13d0c359bd7a534b7c7522e8c2749ab4615fd94a1a762459336a09ca2e1ee12022e144c021695b98fe4b81096fa5865df7140 SHA512 16df9f42444bcac3be967a43ba4183349b71e75c370957f518977051968277f9ffa8a5e3dfdb2f3bdc9b6b59b575ed82e694f5504ebc74bc0ca4cf3a4b753bfd
+DIST bcc-0.28.0.tar.gz 6148954 BLAKE2B cfd3c8d63128e050512462449ff7d467f8f809c239ac01ae8e75365e89116ec351641a68682d23472aa3b4e265547bb20ca5572084c532a40ccd3131edf255a2 SHA512 792ce93dba64b1f87390b2602dcaeba04ac8b2863652b06eb9a907b93bc6137a944b856cc6fa9c7a38671c89814740967561ca4f3b29c267babca7dc5e78aa02
 EBUILD bcc-0.25.0.ebuild 3063 BLAKE2B f60ddb01c47f5bdd3ede1ae3c7a3b1d5b331a7be2cd633a769b9d079db0b428ec10200658fe636fd5effc0b8ddb860193cbcac21f24f1204b73316378eda9518 SHA512 35734ea4c94095848b19f2f0b6449860eec7196aff3043423002c07844771a8b3ca07a89a29a0fdbc63e4f4ebc035b34c6915094749cb292d70a4fe88b1e6a90
 EBUILD bcc-0.26.0-r2.ebuild 3063 BLAKE2B a2ea90355401e3d63d18a65c7d7b4f584dedb6b41fb7ad963303f922f7565e79df976b4177e5493fa11288a5efeb6866b493bcd18776e03e84712e95fdf3bee8 SHA512 6dec1fe1971cd817cc34c41c809c62cbd52bb9f430598fcc819c78cf8a35ba004924ad7d47ec2cf03aa8aa671c4fbcd3aa18ed61a7db61df5be4a25446c49e5d
 EBUILD bcc-0.27.0-r1.ebuild 3077 BLAKE2B 8584d7eae068cca776fcb31578cd57c3d4a7b369d79c11f96462d65409d1f42eea437a1ebe2398d6398ca5a7fe75218d4e80d97f06cf01b2019f2a1036a5dbf9 SHA512 5399daed74db9173d78436e796c865f0d6afe46322139a2fa2024f7564fc72e7cfb48741b0bc1c36b5ecd98691dd2ca695e3e28b095dba40be5011168d1e83d0
+EBUILD bcc-0.28.0.ebuild 3077 BLAKE2B 67f189ca47a5c9932a680a71839bcea88ab14d1d18308e7e1c2f24b3a98d6952d84a7a8b97729cab6d86dbbef9aee041055af15a49f4c257bcbac9592a359b47 SHA512 91b87059b0de6d29b7245aa9e7a1601ac9623536532eb200cd5cbf4e8192a3a94e1e839c733885908397f0e0a0e9e43479a88a22c9f3e148ea3a994b35a32442
 MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.28.0.ebuild b/dev-util/bcc/bcc-0.28.0.ebuild
new file mode 100644
index 000000000000..25627ff05dcc
--- /dev/null
+++ b/dev-util/bcc/bcc-0.28.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{9..12} )
+LLVM_MAX_SLOT=17
+
+inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+lua test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# tests need root access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/elfutils-0.166:=
+	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
+	sys-kernel/linux-headers
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	${PYTHON_DEPS}
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
+	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
+		mv ${script} tools/old/old-${scriptname} || die
+	done
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+		-Wno-dev
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=1 )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+	python_foreach_impl python_optimize
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+	local -A rename_tools=(
+		[trace]=1
+	)
+
+	local tool name
+	for tool in "${ED}"/usr/share/bcc/tools/*; do
+		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
+		name=${tool##*/}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+		dosym -r "${tool#${ED}}" /usr/sbin/${name}
+	done
+
+	docompress /usr/share/${PN}/man
+
+	newenvd - "70${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/share/${PN}/man"
+	_EOF_
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 1da15a9714ce..693a9e63045b 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,7 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
+DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f SHA512 2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
-EBUILD meson-9999.ebuild 2940 BLAKE2B 2561a89d308e94b6815a2099b3aed020df40080c1f1ab21fe8de0a3eed439417b72512056a180087d8e3624d9d1769e9031bc08f18a7bbbc732fd85e4a6403fc SHA512 215fbf63eb8a8a1566f68aa993f5ca4075e5305f27d69a6147f29af8a49fa975516d2e63287a402f4d2fba06e357d65d449de70c479ef75aa4147ef7557a539d
+EBUILD meson-1.2.0_rc1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
+EBUILD meson-9999.ebuild 2946 BLAKE2B 0fc44fb33f5d79d53c15ab84caad219f80437530f4b3620f2c0a1f336a11710601bd2a3eb408ec6adf6204a1dafa09d97b3fe403d66a380c7017d753849aaca0 SHA512 3101b94bdb792a5bbc7b3411e5d77d7b36781d08b7746523c9e7584e65204b025ccbfba7cc924829b7f0a84309a6a90455293cc8dd0964e98de7798200a7241d
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.2.0_rc1.ebuild b/dev-util/meson/meson-1.2.0_rc1.ebuild
new file mode 100644
index 000000000000..fefd68d177e5
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	inherit pypi
+
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index c9781cdd78c0..86cedf266f21 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5b127a99560a..77b77011e5d8 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 85e310b3e884..dc951abd07dd 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,9 +1,4 @@
-AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
-DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
-DIST QMPlay2-src-23.06.04.tar.xz 1431232 BLAKE2B 7b50e7d28ab9025d7745114c7ee6036df1e1b23b34422ed4097f1ba4e68874efc58a0de68a5635e30cbdb2205777fbdc4f67f759f54cda7e2f926560e4bbc7af SHA512 7e6afb5830b5febd79aa2232d38ccb3483104dd89d20e7476027a7febfd770ccd1df7e6915543df379985d89d307bd1c3bbc8ebc8cc00f440b51e347ddbec0d5
 DIST QMPlay2-src-23.06.17.tar.xz 1432852 BLAKE2B 50512d89f443218bf89f1b54276ece0983d31cc1e563ef829396ed1fb4e5f0437cd25e5ccb3c426ecd668c334477024de8658594c59ae2781a0e54ff83653357 SHA512 62122533a9cfc7aebdbe28166d60816eea21e9c38df5f381817d01aac25a6f10bf806b5a6ccd24cb8fe4b6c7391138226c7a967fab019ad2dcd605797d8d6a28
-EBUILD qmplay2-23.02.05-r1.ebuild 3384 BLAKE2B b1aafd1b3346798f1f1b676627902ca24ccd38eee721b16fea9055698d8c5806f9e64a5e79a2a956fd32e779f904a79eb0c79c9471b146ffc33aedb7bce2e84b SHA512 efd26725ef9b00c214c506c106026e2eb99026aef1386178f24ccf073288df4c2ade3d98e9495b74835c388cab0c63807734edb4154d199f5ff7646c22d3c6ae
-EBUILD qmplay2-23.06.04.ebuild 3344 BLAKE2B ae7d7de6551f46490b7ce7e5e8a9d163c62b3b64f9d327a70c3d139f51556c2b142050fa10534f8c218f5750628f885ac3a1022291a167b806ad446d5e17c518 SHA512 c23e0a10093113e7bb4eae95be33fde3f7f4110a8aa2894c6a302163ab34213cacf40a783a4bf21573d769d2b166e078d35682d2e7bd36706fbd21ff0c5db714
-EBUILD qmplay2-23.06.17.ebuild 3309 BLAKE2B 957fdf4db921edc95266e6cb0192d36f46e2845a7f0d7ef33b955f83ac6767b0a906b79331957db84c4a5976e47fa7ff51e6dc7e98cb88d62adbab58885844bb SHA512 a6ed3fd72323b51cb4569d10eeefd78b2593725b5460451fff8f45aaf2df256e5d539b17f1b4444ec82bcc5ac432f63ddd61bc9eea3f5065ecdc6919f474a24f
-EBUILD qmplay2-9999.ebuild 3318 BLAKE2B bef41fcb3655faf0fb9d0d02014066cded54f3215db6a64944f152ef24a266cd7974894c7ba0573e6f427df1d9c715aaae369afa4a27ba49d034e97671af5ac2 SHA512 22b73ab2f2effee3cb6e494da91a421d12d30572b2343b667002419e57920af8ce93e39be5dc7d926f6222dc728db45c7e38c8cba6fcf9b9c40daaa42054e34c
+EBUILD qmplay2-23.06.17-r1.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
+EBUILD qmplay2-9999.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
deleted file mode 100644
index e47aacf22a5f..000000000000
--- a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/905453
-
---- a/src/modules/FFmpeg/CMakeLists.txt
-+++ b/src/modules/FFmpeg/CMakeLists.txt
-@@ -67,7 +67,7 @@ if(USE_FFMPEG_VAAPI OR USE_FFMPEG_VDPAU OR USE_FFMPEG_DXVA2 OR USE_FFMPEG_D3D11V
-             list(APPEND FFmpeg_HDR VAAPIVulkan.hpp)
-             list(APPEND FFmpeg_SRC VAAPIVulkan.cpp)
-         endif()
--        pkg_check_modules(LBVA REQUIRED libva libva-glx libva-drm egl)
-+        pkg_check_modules(LBVA REQUIRED libva libva-drm egl)
-         include_directories(${LBVA_INCLUDE_DIRS})
-         link_directories(${LBVA_LIBRARY_DIRS})
-         list(APPEND FFmpeg_LIBS ${LBVA_LIBRARIES})
diff --git a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
deleted file mode 100644
index 162a1b938f4a..000000000000
--- a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.02.05-fix-libva-glx.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.06.04.ebuild b/media-video/qmplay2/qmplay2-23.06.04.ebuild
deleted file mode 100644
index 1e5663f67ccb..000000000000
--- a/media-video/qmplay2/qmplay2-23.06.04.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=Off
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.06.17.ebuild b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
index 41412c90d14c..9c898d587e0e 100644
--- a/media-video/qmplay2/qmplay2-23.06.17.ebuild
+++ b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
@@ -31,11 +31,11 @@ REQUIRED_USE="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[X(-)]
+	dev-qt/qtgui:5[X(-),vulkan?]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/ffmpeg
+	media-video/ffmpeg:=[vaapi?,vdpau?]
 	alsa? ( media-libs/alsa-lib )
 	cdio? ( dev-libs/libcdio[cddb] )
 	extensions? ( dev-qt/qtdeclarative:5 )
@@ -48,16 +48,9 @@ RDEPEND="
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
+	vaapi? ( media-libs/libva[X] )
 	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
+	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
 	xv? ( x11-libs/libXv )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 131c3cf98f39..9c898d587e0e 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -31,14 +31,11 @@ REQUIRED_USE="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[X(-),vulkan?]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
+	media-video/ffmpeg:=[vaapi?,vdpau?]
 	alsa? ( media-libs/alsa-lib )
 	cdio? ( dev-libs/libcdio[cddb] )
 	extensions? ( dev-qt/qtdeclarative:5 )
@@ -51,16 +48,9 @@ RDEPEND="
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
+	vaapi? ( media-libs/libva[X] )
 	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
+	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
 	xv? ( x11-libs/libXv )
 "
 DEPEND="${RDEPEND}"
@@ -78,6 +68,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_WITH_QT6=Off
 		# core
 		-DUSE_LINK_TIME_OPTIMIZATION=false
 		-DUSE_UPDATES=OFF
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ec8fe6aee2f3..e03d9b9951a2 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 13b84ec7e979..935df0a32c17 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Thu, 29 Jun 2023 00:09:51 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 91d493845d14..891e6fadbd54 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-28T18:09:53Z
+TIMESTAMP 2023-06-29T00:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScy9JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkChAAnJYvvL0Pjbni2nH1g2+FMrBD+1EKYtwj8DN53W1wHmgjpK85IJCFKEBW
-6AtUpLyFJspDXJPNyr7AHiZZZtOmg62XfO7q+hZ0t4zLqCEe72ufkI/BvIPUXUaJ
-u1+49VGWNnm0SCP5KM9seT1FJJ5XP2At4aZsM4IGTwQ/K/DQnRVKcU1AGlq0wNHK
-ZfnlIjoxUsoFom+qFyxBruTje5soRD/bv8RYAsGcxq23mDdYIWTo6bfo8itwwbyR
-Xu/OxRWpffo4BwTmBgVokFoRBXey7OdhZn/oFE+5+3X7ZZ53p86rhH0PoRLXU1vv
-X3JhtcWn6iXG1Uq807z5m/M4+Fo0lrRMmn00uyT8giINJTZdRnnBLZyxA+/unN0e
-Ba71NNm6Lreekz/18FSuQ5NfrTsdWJTgAVHEbe9PN9WaQ79S7tI+477maPt1kTYN
-u5H+53ao0nhVvJ4AIjHbmO+zqAmqYbl3v4vxOP02Y8v6Pisja6zD08m8om+tdZf7
-allI/deryU8+JcFJ5ER5mScir4fm38KqnWOInNB2vI7uiwgyuvV+1CD2pyyhR5Jv
-D1NUJRSm7y/DYlzONpuz1+5dwPhN3x4ephFQ2ijJhL/JhWsiDnE0c/1ZiVHk3RF0
-CQgomYlba9yZGY42wNUCGl0+XsKSski2lEHQFT6BrFR22Qtmvng=
-=c5lN
+klC3kg//bdzjYuWiIyo8yJ7TPjuzTdyhj+MxgVMziblcTwt+uNr0PNXHX8kzWE+n
+PCwXlqZBz/6ra5Us1DZ2oCc2HHj3QY5zRPtZKNvFmQhCLMD4yTvpoYk7FrjO6cgk
+V67NvYZf9/hw6Ds/g3GgSSV26TGcG3fYHsvBr8rryu5bVulgW0DWUQ6TdMQZ0Kve
+OzVJ8eUXw771oEhLU+det2Lss3KfkUAYw1XoLkXhYMtEbUPESPNPdM/5lT1HucY3
+1CaMxmLrBv7hf4CHbKUyGzv9QCzFhL9p7Svi9SDyYgLWGD63DxSEZX052Up4jKcp
+F9LBAJ+QI+p/bZAFt6KlcVkq6JKGt6miUEMC21GJRq78sVBIqZxzJIwTNq8TEBp2
+g6fftBRXUEyy5T55/3SrmihaNxXFUfRpBJbb/pj/Nf6BOVpzeehGdCKGczsgX5K1
+QpTzccmpkl/EU+2yjnFC7FGzuBqdHuEG4s/AadvMxhwOeESuS/ObXYQ+E6tNEy6Z
+HMURX274dl86Kb+mwmzkDeMgJnI1FhVzLr1qojMxwTXQHJd9kyd3Ug+pUX3BQCsX
+Pnl/7p+MLUc4lMfl+derpegDpgOhh+++6QhxBOByxr4dms/mqZUbRn8VMEIoLPVZ
+7B4JMGf0BVCkUjJCr4tVlf4lNA1Vlc4tAd2kmGDl+VpIchb3oac=
+=sxRx
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 13b84ec7e979..d933b065bf11 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Thu, 29 Jun 2023 00:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 979639ba35b4..a14411c0ac49 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index da863dd3c038..4f718e71ee8c 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12_p2 b/metadata/md5-cache/app-admin/sudo-1.9.12_p2
deleted file mode 100644
index 78b8dadc3182..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.12_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=8
-HOMEPAGE=https://www.sudo.ws/
-INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
-IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz.sig )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=434a8cebf4c3800acb33af6321e0156a
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.13_p3 b/metadata/md5-cache/app-admin/sudo-1.9.13_p3
deleted file mode 100644
index c311fc3223ca..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.13_p3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=8
-HOMEPAGE=https://www.sudo.ws/
-INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
-IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz.sig )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=434a8cebf4c3800acb33af6321e0156a
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 3c028558f57e..b8eacc878ac3 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9
index 875dd9c107ac..b8f0ad8768b4 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=703550d1be945bb65decf102b51f978a
+_md5_=d6037d49543f4e5ca09c76772e4fff76
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 53dc7b51a715..0f9127467514 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.30 b/metadata/md5-cache/dev-db/mariadb-10.4.30
index b45af80beb64..99aedc4c0f80 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.30
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.30
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mariadb.org/
 INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !dev-db/mariadb:10.9 !dev-db/mariadb:10.10 !dev-db/mariadb:10.11 !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( <dev-libs/openssl-3:= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy:= ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=mirror://mariadb/mariadb-10.4.30/source/mariadb-10.4.30.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=160a2bfaf9d7866c1338552d0b6241cc
+_md5_=2eb65d2192c4da3e71391729c2574678
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.21 b/metadata/md5-cache/dev-db/mariadb-10.5.21
index ad5138d1d0bf..401c5a785501 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.21
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.21
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mariadb.org/
 INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
 IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( <dev-libs/openssl-3:= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !dev-db/mariadb:10.9 !dev-db/mariadb:10.10 !dev-db/mariadb:10.11 !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=mirror://mariadb/mariadb-10.5.21/source/mariadb-10.5.21.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.19-patches-01.tar.xz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=11d5bfaa6501a4f8a2f02def13b27816
+_md5_=cd8d9ccb52e99db71a6590fca5c55b4e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.14 b/metadata/md5-cache/dev-db/mariadb-10.6.14
index 777ececf27b9..08fd3a99acf6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.14
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mariadb.org/
 INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
 IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !dev-db/mariadb:10.9 !dev-db/mariadb:10.10 !dev-db/mariadb:10.11 !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.14/source/mariadb-10.6.14.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5df265438415c59c86a6919a48cdbd70
+_md5_=a53b92d9fd801bb1c39934f23464633a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d261960c3f63..f176499d6a00 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.14 b/metadata/md5-cache/dev-lang/nim-1.6.14
new file mode 100644
index 000000000000..35143ffb9ea4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.6.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-process/parallel test? ( test-js? ( net-libs/nodejs ) )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-db/sqlite:3 dev-libs/boehm-gc dev-libs/libffi dev-libs/libpcre:3 dev-libs/openssl media-libs/libsdl media-libs/libsfml )
+DESCRIPTION=Compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/
+INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+IUSE=doc experimental test-js test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.6.14.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6_p1.tar.gz -> nim-patches-1.6.6_p1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ce943a6ade3287a1841fb419a4c93e8b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fa368db95b9e..ffa8fedc8945 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
deleted file mode 100644
index 2e6e0fbfd7c4..000000000000
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/unibilium:= sys-devel/libtool virtual/pkgconfig demos? ( dev-libs/glib:2 )
-DESCRIPTION=Library for easy processing of keyboard entry from terminal-based programs
-EAPI=6
-HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
-INHERIT=flag-o-matic
-IUSE=demos static-libs
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-libs/unibilium:=
-SLOT=0
-SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	ad475baa777c9978fa035216c8264a10	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f3a7f5798d2bbca16225e574a6f7b8cc
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22-r1 b/metadata/md5-cache/dev-libs/libtermkey-0.22-r1
new file mode 100644
index 000000000000..6572ccc6fce7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig demos? ( dev-libs/glib:2 )
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/unibilium:=
+DESCRIPTION=Library for easy processing of keyboard entry from terminal-based programs
+EAPI=8
+HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
+INHERIT=flag-o-matic
+IUSE=demos static-libs
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-libs/unibilium:=
+SLOT=0
+SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=74c0e384f7502eae93f7a7a017a53d06
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1 b/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
index f72095f63601..088f43796cc9 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 INHERIT=cmake multibuild
 IUSE=keyring +qt5 qt6
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=keyring? ( app-crypt/libsecret dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) qt6? ( dev-qt/qtbase:6[dbus] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.1.tar.gz -> qtkeychain-0.14.1.tar.gz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5a868cfd4a1d9891bbe2ca130596c05c
+_md5_=ae472b4e28465aa6b555d2b3731088b1
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 38364023b7e6..6d5a3b56c8ea 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index f31418c2b6c1..96b93fc3bf51 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=57302fd31c8e9ded0e46d11324145bdb
+_md5_=0dff4d4f5df2faf77e58cd21ad75a6a3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b239fadc052e..4ee8a008dd74 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/scipy-1.11.0 b/metadata/md5-cache/dev-python/scipy-1.11.1
index 7461704c6b28..01f369df7ac0 100644
--- a/metadata/md5-cache/dev-python/scipy-1.11.0
+++ b/metadata/md5-cache/dev-python/scipy-1.11.1
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/numpy-1.21.6[lapack,python_targets_python3_10(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.0/scipy-html-1.11.0.zip )
+SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.0/scipy-html-1.11.0.zip )
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7b3c856d0ccf1f9dc8b66c963e196784
+_md5_=d7477ea05d370904b0d5de6d46540cf9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ae6714519a86..99662d45c7a4 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bcc-0.28.0 b/metadata/md5-cache/dev-util/bcc-0.28.0
new file mode 100644
index 000000000000..0e8a4e09fed4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bcc-0.28.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/zip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-18:= <sys-devel/llvm-18:=[llvm_targets_BPF(+)] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=8
+HOMEPAGE=https://iovisor.github.io/bcc/
+INHERIT=cmake linux-info llvm lua-single python-r1 toolchain-funcs
+IUSE=+lua test +lua_single_target_luajit python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-18:= <sys-devel/llvm-18:=[llvm_targets_BPF(+)] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) lua? ( ^^ ( lua_single_target_luajit ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bcc/archive/v0.28.0.tar.gz -> bcc-0.28.0.tar.gz
+_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b1bfdeb0479427545938c3ee6c340f1b
diff --git a/metadata/md5-cache/dev-util/meson-1.2.0_rc1 b/metadata/md5-cache/dev-util/meson-1.2.0_rc1
new file mode 100644
index 000000000000..2c4be589e177
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-1.2.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=8
+HOMEPAGE=https://mesonbuild.com/
+INHERIT=pypi bash-completion-r1 distutils-r1 toolchain-funcs
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+LICENSE=Apache-2.0
+RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/meson/meson-1.2.0rc1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=5c98fc14cfe15d91418327180e7df574
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 89f0106dcf5d..be90caf7c6fa 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
 DESCRIPTION=Open source build system
 EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=git-r3 bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=virtual/pkgconfig python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3c657080fe91b6b1b4ec1b5cf77506dd
+_md5_=f3c72bb21f585515fbf2cf273f778053
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 083dc640914d..549a47a0c048 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/qmplay2-23.02.05-r1 b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
deleted file mode 100644
index a5c3c41d69ff..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.02.05/QMPlay2-src-23.02.05.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99cad3493bc28735e6c370f65326ee5b
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.04 b/metadata/md5-cache/media-video/qmplay2-23.06.04
deleted file mode 100644
index cd064620e145..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.06.04
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.04/QMPlay2-src-23.06.04.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f8f8dd76267565a7976dc8ad4a733842
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.17 b/metadata/md5-cache/media-video/qmplay2-23.06.17
deleted file mode 100644
index a8e13718fd6a..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.06.17
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.17/QMPlay2-src-23.06.17.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=204faaee3f5b9a6bad972fd4c2e2f805
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.17-r1 b/metadata/md5-cache/media-video/qmplay2-23.06.17-r1
new file mode 100644
index 000000000000..20e9e4425453
--- /dev/null
+++ b/metadata/md5-cache/media-video/qmplay2-23.06.17-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DESCRIPTION=A Qt-based video player, which can play most formats and codecs
+EAPI=8
+HOMEPAGE=https://github.com/zaps166/QMPlay2
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake xdg
+IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
+SLOT=0
+SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.17/QMPlay2-src-23.06.17.tar.xz
+_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=20686754df2dd8a77dab60025073eb4c
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index 039f43c28eec..3da50aceb2ef 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=8
 HOMEPAGE=https://github.com/zaps166/QMPlay2
@@ -9,8 +9,8 @@ INHERIT=cmake xdg git-r3
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
 LICENSE=LGPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1b763854cf1c70b3f74e664547b279e0
+_md5_=20686754df2dd8a77dab60025073eb4c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 91c4fc303f7b..9897e599541b 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.46 b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
index 35a90beaa56b..80703d6e79a2 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.46
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
 IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static xmpp java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.46.tar.gz
 _eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=dc18229cdca9d1312377797840ac7a1d
+_md5_=7e21e872ad2a459de09859ed4559176f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.35 b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
index 58cb614897ff..83331f40c9e6 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.35
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.35.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.35-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=e89b6dd257277f892a8f8562343b792c
+_md5_=6bbadf219b30db3d922fa9304cdacb6c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.18 b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
index 03e305be4d49..56a1eb003008 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.18
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.18.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.18-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=807e53768757712518b7288e093f07d0
+_md5_=dd8f906fe3e2eb0bf9fbefe770201df7
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.3 b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
index 62fe11df6904..e455bfc61bff 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.3.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.3-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=1ee70fce2c8064b23262116cc7930737
+_md5_=1a5fa447f55eb0954ed7c820883be340
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f972050962db..eb63241d5c64 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libssh2-1.11.0 b/metadata/md5-cache/net-libs/libssh2-1.11.0
index e1a9011b683a..3a9df98b1d43 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.11.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.libssh2.org
 INHERIT=cmake-multilib
 IUSE=gcrypt mbedtls test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.11.0.tar.xz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8499164a3312cb199437955d0c6b43ed
+_md5_=24d523bf64d166e75723f5d15f8d87a8
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5696dada99b8..231bb6a0c6a6 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13 b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
index 1672ece89cd8..ec3f05243815 100644
--- a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
+++ b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
@@ -5,10 +5,11 @@ DESCRIPTION=Standard Linux telnet client and server
 EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/netkit
 INHERIT=cmake
+IUSE=selinux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd
+RDEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd selinux? ( sec-policy/selinux-telnet )
 SLOT=0
 SRC_URI=http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-telnet-0.17.tar.gz mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-42.debian.tar.xz
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0e262447b550580683c979623d4c902b
+_md5_=910466ddb0a5778c8858d9b3304cdc2d
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
index dc97bb3168d0..89af6825fbd2 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
@@ -5,11 +5,11 @@ DESCRIPTION=Telnet and telnetd ported from OpenBSD with IPv6 support
 EAPI=8
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
 INHERIT=autotools toolchain-funcs
-IUSE=nls xinetd
+IUSE=nls selinux xinetd
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:= !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd
+RDEPEND=sys-libs/ncurses:= !net-misc/netkit-telnetd selinux? ( sec-policy/selinux-telnet ) xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=aa9131454233ee3d14459fcd6c017f66
+_md5_=2a9e6d2affc3eebf07630f69430bf544
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 500cd1b43b5a..62807475dec3 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.11 b/metadata/md5-cache/net-vpn/strongswan-5.9.11
new file mode 100644
index 000000000000..abbeb4954590
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.11
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=8
+HOMEPAGE=https://www.strongswan.org/
+INHERIT=linux-info systemd
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.9.11.tar.bz2
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3cba069bf07313ece641246a007ffaa4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 275af3ec9afe..fa39bf419872 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.5 b/metadata/md5-cache/sci-libs/vtk-9.2.5
index dc203a6b0ff4..12d6ded575e0 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.5
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.2
 SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.5.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.5.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz )
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	1abaebfe913f48975739281ab7d7ab75	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=07acf06eda705a7ece0850c8ab5b2be5
+_md5_=68aa889af1b79671f3dd5fb37952f948
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.6 b/metadata/md5-cache/sci-libs/vtk-9.2.6
new file mode 100644
index 000000000000..cc5520737408
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test
+DEPEND=app-arch/lz4:= app-arch/xz-utils dev-cpp/eigen dev-cpp/nlohmann_json dev-db/sqlite:3 dev-libs/double-conversion:= dev-libs/expat dev-libs/icu:= dev-libs/jsoncpp:= >=dev-libs/libfmt-8.1.1:= dev-libs/libxml2:2 dev-libs/libzip:= <dev-libs/pegtl-3 dev-libs/pugixml dev-libs/utfcpp media-libs/freetype media-libs/libjpeg-turbo >=media-libs/libharu-2.4.2:= media-libs/libogg media-libs/libpng:= media-libs/libtheora media-libs/tiff:= >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] sci-libs/hdf5:=[mpi=] sci-libs/proj:= sci-libs/netcdf:=[mpi=] sys-libs/zlib boost? ( dev-libs/boost:=[mpi?] ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:= ) freetype? ( media-libs/fontconfig ) gdal? ( sci-libs/gdal:= ) java? ( >=virtual/jdk-1.8:* ) las? ( sci-geosciences/liblas ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) openvdb? ( media-gfx/openvdb:= ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( mpi? ( dev-python/mpi4py[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( mpi? ( dev-python/mpi4py[python_targets_python3_11(-)] ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,opengl,sql,widgets] dev-qt/qtdeclarative:6[opengl] dev-qt/qtshadertools:6 x11-libs/libxkbcommon ) sdl? ( media-libs/libsdl2 ) rendering? ( media-libs/glew:= virtual/opengl x11-libs/gl2ps x11-libs/libICE x11-libs/libXcursor x11-libs/libXext ) tbb? ( dev-cpp/tbb:= ) tk? ( dev-lang/tk:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) views? ( x11-libs/libICE x11-libs/libXext ) web? ( app-admin/webapp-config ) dev-cpp/eigen dev-cpp/nlohmann_json <dev-libs/pegtl-3 dev-libs/utfcpp test? ( media-libs/glew x11-libs/libXcursor rendering? ( media-libs/freeglut ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=The Visualization Toolkit
+EAPI=8
+HOMEPAGE=https://www.vtk.org/
+INHERIT=check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp
+IUSE=all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5 qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web java python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD LGPL-2
+RDEPEND=app-arch/lz4:= app-arch/xz-utils dev-cpp/eigen dev-cpp/nlohmann_json dev-db/sqlite:3 dev-libs/double-conversion:= dev-libs/expat dev-libs/icu:= dev-libs/jsoncpp:= >=dev-libs/libfmt-8.1.1:= dev-libs/libxml2:2 dev-libs/libzip:= <dev-libs/pegtl-3 dev-libs/pugixml dev-libs/utfcpp media-libs/freetype media-libs/libjpeg-turbo >=media-libs/libharu-2.4.2:= media-libs/libogg media-libs/libpng:= media-libs/libtheora media-libs/tiff:= >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] sci-libs/hdf5:=[mpi=] sci-libs/proj:= sci-libs/netcdf:=[mpi=] sys-libs/zlib boost? ( dev-libs/boost:=[mpi?] ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:= ) freetype? ( media-libs/fontconfig ) gdal? ( sci-libs/gdal:= ) java? ( >=virtual/jdk-1.8:* ) las? ( sci-geosciences/liblas ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) openvdb? ( media-gfx/openvdb:= ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( mpi? ( dev-python/mpi4py[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( mpi? ( dev-python/mpi4py[python_targets_python3_11(-)] ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,opengl,sql,widgets] dev-qt/qtdeclarative:6[opengl] dev-qt/qtshadertools:6 x11-libs/libxkbcommon ) sdl? ( media-libs/libsdl2 ) rendering? ( media-libs/glew:= virtual/opengl x11-libs/gl2ps x11-libs/libICE x11-libs/libXcursor x11-libs/libXext ) tbb? ( dev-cpp/tbb:= ) tk? ( dev-lang/tk:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) views? ( x11-libs/libICE x11-libs/libXext ) web? ( app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=all-modules? ( boost ffmpeg freetype gdal imaging las mysql odbc openvdb pdal postgres rendering views ) cuda? ( video_cards_nvidia vtkm ) java? ( rendering ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) qt5? ( rendering ) qt6? ( rendering ) sdl? ( rendering ) tk? ( python rendering ) web? ( python )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/9.2
+SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.6.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.6.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.6.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.6.tar.gz )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	1abaebfe913f48975739281ab7d7ab75	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8ddb283bd00bd904ffbfede0c1278a69
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1ad2b8114512..4978a5568abe 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/kbd-2.6.0 b/metadata/md5-cache/sys-apps/kbd-2.6.1
index 1a82b0128f02..485c61d3f2ca 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.6.0
+++ b/metadata/md5-cache/sys-apps/kbd-2.6.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) selinux? ( sec-policy/selinux-loadkeys )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.1.tar.xz
 _md5_=93b4173d272b1e5357e0ea4d81169a13
diff --git a/metadata/md5-cache/sys-apps/locale-gen-2.23-r1 b/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
index 60ee4c54ae34..a5758087be0e 100644
--- a/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
+++ b/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Generate locales based upon the config file /etc/locale.gen
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/locale-gen.git/
 INHERIT=prefix
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-alternatives/awk app-alternatives/gzip sys-apps/gentoo-functions sys-apps/grep !<sys-libs/glibc-2.37-r3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.bz2
 _eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
-_md5_=81990eab89fa9300ec9fab3d0f4f4520
+_md5_=52b1151e2b6b0d29f4bf17c9676b4f30
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index fa02e325eb88..cef135ea5013 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.10
new file mode 100644
index 000000000000..eab7d07ac60e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.10
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test +strip modules-sign
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.10
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.3.10 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-13.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.7-gentoo )
+_eclasses_=dist-kernel-utils	311f6fd2f4c05b584d3ff6c3e71d2b9a	kernel-build	a72a18ccb20e9bdd0fe914510e010640	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=08b5b99d601f1101a994a2e648c02e19
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.10
new file mode 100644
index 000000000000..aa8ee83e385d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.10
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.10
+RDEPEND=!sys-kernel/gentoo-kernel:6.3.10 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-13.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10-1.gpkg.tar -> gentoo-kernel-6.3.10-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10-1.gpkg.tar -> gentoo-kernel-6.3.10-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10-1.gpkg.tar -> gentoo-kernel-6.3.10-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10-1.gpkg.tar -> gentoo-kernel-6.3.10-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	311f6fd2f4c05b584d3ff6c3e71d2b9a	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=68f99116fb8734b0fcefafa3774e7199
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.10
new file mode 100644
index 000000000000..7a945c015bd1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.10
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test +strip verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.10
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.10.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.10.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.7-gentoo )
+_eclasses_=dist-kernel-utils	311f6fd2f4c05b584d3ff6c3e71d2b9a	kernel-build	a72a18ccb20e9bdd0fe914510e010640	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=2060074a9253ccead883b90b2fb483e4
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 218f1cbf5152..e9e494ba850c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.37-r3 b/metadata/md5-cache/sys-libs/glibc-2.37-r3
index 24c7e6d5f7b9..0be687e69ce4 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.37-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.37-r3
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.gnu.org/software/libc/
 IDEPEND=!compile-locales? ( sys-apps/locale-gen )
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-5.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b6c14e86d3153a3d1b6675062c04eeb5
+_md5_=78ef947ffeffb33c78af107ca51c515f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0e550b21ddee..12b3482ab429 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.3.10 b/metadata/md5-cache/virtual/dist-kernel-6.3.10
new file mode 100644
index 000000000000..40b4db17be29
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.3.10
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.3.10 ~sys-kernel/gentoo-kernel-bin-6.3.10 ~sys-kernel/vanilla-kernel-6.3.10 )
+SLOT=0/6.3.10
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index eb502bf53f66..742daf62ac8c 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-383 b/metadata/md5-cache/x11-terms/xterm-383
new file mode 100644
index 000000000000..637f34b28a1d
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-383
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst postrm preinst unpack
+DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=8
+HOMEPAGE=https://invisible-island.net/xterm/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic toolchain-funcs verify-sig xdg
+IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/xterm/xterm-383.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-383.tgz.asc )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a2091f353e3c53fc242c2a380f823b8f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4d897d91985f..8a8788019dea 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-28T18:09:53Z
+TIMESTAMP 2023-06-29T00:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScy9JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4uQ//TZ5YIPpHrNH5ADh8tK8mFnT1hjk4NkbW8cE05rWpIFSrP3j7XyElhyYX
-HTayBNBYCsEiVY/qlWvD7Wcd/Lhp+gNbg686v4CJ8zKwKg7ANE5GKmzG58hvv1pC
-QB96s1BpwotGeTyhnp/JrG6jXBz/KOJ8q4lmuTe+sGIFCnWg+sIA0PzwcKL/2wNq
-7BXNdO5lU3iba67voF7QWWANYviMPbRDcoBX7P1Xvclr7KyiQetcbjsd1OSXVnav
-jED4PR/NEoDcvB1D3/WhtMY4U0Lq5gmS6Luj2vC3Bpr7UyFn5PKEQeem/mNAlSTk
-YhqRwgJNCcxA1R/IHbIJBxKKqErCLrZJZkh8R6RCesTQ8FjOupXAB3fCqUl7pQcb
-tvZx4ROyy/e12s4kxSW3mskAOfyAKFm4X2Nz5U3tbYTrikZShU4I1nNxuBoU+6rc
-w155IOIPXxaU8C2Uf/Yf29m3k/wc6bWucBha/CVgvkDUFg2m3rhP5rY2P3e5TrR9
-KfCvEGnx2VLsYOAJL3VRh2s9WTfg/FUvJSfhtoiIsNr34X9co17MhFBs9sb86vNt
-PoyEtTaiKLYK1n9Gno43kEmiJqGWSP2Az1pach/MOcewd0+LjamioJ4srouw6vty
-8+iERQ5nYFQHJ3qRE/1q7uWdLSHt1cMzyXKYDxvguHnDy2p0vyg=
-=ntUS
+klDUrQ//U5znx+4yChd+bj+EKLKZerJcp60GBYE0jgVV/yBmntQ00frF6QB6qrMq
+jOoJTQnhjIxDNYUQhLLYdM2SJf+TFOjupG3xraMfgPtFD63ZuMjXTFw8HHy0k9hU
+eRVR+5HIknoeHD4ImntRHGkZOFs4LgpE4oB0nxLmYzWR9a+spsyZHmbU5eKPLj4Q
+jm0KJJDxtfUDduuThoDLKSMLBjBlMgPZoSM/oNVC8+7aRQUu3BO/NFUHIk7odkcI
+ELMxTlHQLTv/mx2kMc+wv0lK/2c1wQRO89SPM83vFPCk5aHDe1+P6it8vR9XTmBi
+rf0RAORvfzaPlThRoXq24FYSZK7lxshn6tHtT+C6pikOG/vaKgeFAp3guleLg2Xm
+9dwN1jmNxeFgBjnbmDcP4JTxclElr3e48OENlmUz1Uv/OJwEYcY1mq89dRgOP4eE
+BGxDKscotw7ehGWonhlwx9so3jJrTotRSZzapcPu7oR94/47O6jHZrJuJn7e7BXQ
+IVaXSpCda5cC6R4iutAVJFGLSGPuBs1D7CXNdtU5ODDRHZKQ5oEdDj7Rxd3av219
+zYhwUaCPd1Lh4hyjm+6yFjG5tZ16a8ywybLuEwnlTnZiiKgtKP+W4wWcz2jAnehb
+msDOUHDvi0ZvoHAxEoPv7+HjWEYCmzX1ShY42uEDndkUkytVYKo=
+=/BQZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 13b84ec7e979..d933b065bf11 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Thu, 29 Jun 2023 00:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d7c8b09a1ac5..0888b3b15a2e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 28 06:09:50 PM UTC 2023
+Thu Jun 29 12:09:51 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a7227883628c..88672a01ea7a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:15:01 +0000
+Thu, 29 Jun 2023 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ad8f91cba669..25bb17574b16 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ce1609e557d25de105d0422f8fbbc64b136b65b8 1687974207 2023-06-28T17:43:27+00:00
+6d4c9c57df89a7b1dd9bbcddd02e39df3c52c3b1 1687996786 2023-06-28T23:59:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 89ba44418bba..1ae47cba9ef0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1687975801 Wed 28 Jun 2023 06:10:01 PM UTC
+1687997401 Thu 29 Jun 2023 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 13b84ec7e979..935df0a32c17 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Thu, 29 Jun 2023 00:09:51 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 60e6309d1c65..b032aef365c5 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 4033169e28a3..813bafe22f02 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -39,15 +39,15 @@ DIST zabbix-6.4.3.tar.gz 43369742 BLAKE2B a19cc8fa1fec26b152f84427394d1e1dd947aa
 DIST zabbix-6.4.4-go-deps.tar.xz 21588740 BLAKE2B 4f02c2c6fbfc44ec65bd697a1494dae26d528ce18bc060939e8a86bfcee1bf513dfe51440338c0ca0209ac260abff429da6ba0f9e6c381c96ac96cd8cc7f0d9f SHA512 ce0c2f4df1c42c45db7b3f42c75973f01b83996eb1f04b7d456ee6e5b7fab99a4ed224d7bab7ac4d9ed37fd35fbbee4f40ba826849a9c4007044384310c50b09
 DIST zabbix-6.4.4.tar.gz 43403307 BLAKE2B c6616045da913aa681543d038348f5273853621ee698e21fbf196935d4ef16f6c18052ca5f9b00526d0fb0710e833a24b7fac8987affb19f2e836a5c3426f366 SHA512 f01fb33707e16a2784fbc4102222418277eb4abf4d83d01f7981b0bf085c2db8510362366c4f2bbd69790a3da5a8e563415d6b3dd36a70c1cf94f8b57ee9e283
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
-EBUILD zabbix-4.0.46.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
+EBUILD zabbix-4.0.46.ebuild 9474 BLAKE2B 8899be0bfa9bc5fdcc1e64eac3758ad0977dac67efde0c863c3f23e8f7f702d9b119e386f1c93d350f6a7093f41aaca171f30a11df36e361239c17c9943b1c6e SHA512 5fc5157e944a51f7541805a2a6d31706569381ddad31716b3142403d60cee469bb9adce2dfe591db1f2d927f8568d6898adc204fca1388c40580cd338cde9ae0
 EBUILD zabbix-4.0.47.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
 EBUILD zabbix-5.0.32.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
-EBUILD zabbix-5.0.35.ebuild 10192 BLAKE2B 88498e065c1917b2ce79fb2f7b9283a0c28ada71024582c233edab52596135e567fecc64df6b53f5ddf5bfc68f71f23fed4cbd5a9426786a89e0a786c47bb202 SHA512 68843f8f63dd2c2ca78f5e9a8c46c7056f69f16cbdab34747ed79cfb748b199a9b7f2fa0653dd0ed58c18e73b582076921f190314586e28b418bc67e05cef939
+EBUILD zabbix-5.0.35.ebuild 10191 BLAKE2B 6e0cde11a1c130f14fbc675cdfeedd9caa74db2deb232ee0c2dd0bd1da9e10bec66cebd8e4bfd6318f053d35ffef96536f726ed70e19e11f31d9cb84ef01f141 SHA512 2c62bcfaed696ffd9a0f00bdf6c767545f4ad4a19b8e8bcfe73d7a5d9eef51e2a731fa9afe3cf7fbbc2bb30031578ef325bcb243fbe6743df152c90b35c54248
 EBUILD zabbix-5.0.36.ebuild 10192 BLAKE2B 88498e065c1917b2ce79fb2f7b9283a0c28ada71024582c233edab52596135e567fecc64df6b53f5ddf5bfc68f71f23fed4cbd5a9426786a89e0a786c47bb202 SHA512 68843f8f63dd2c2ca78f5e9a8c46c7056f69f16cbdab34747ed79cfb748b199a9b7f2fa0653dd0ed58c18e73b582076921f190314586e28b418bc67e05cef939
 EBUILD zabbix-6.0.14-r1.ebuild 10235 BLAKE2B 129b343d0fcc9dfa5be311a53df26d54b26837f78afa6aee8406c767526219908c97416de0bfb5fdde3c4a66279d9deaeb6384a2557459610c7f741d559f81e5 SHA512 bfaf11251a04debe03e6273cb31e92dcf9fe9e94ac1945271fe84ab710a2c3e9146b8196227656cc2959674fceec2f1c6e3187104ea3e7a90ea91d4809e00b63
-EBUILD zabbix-6.0.18.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
+EBUILD zabbix-6.0.18.ebuild 10284 BLAKE2B 7dde9b789dfeaeed5644285b9b792ad225a48162dedd9cbaf9a3df1bb69a5f689b9f5c98773df12c026ea77a86c63be7e94b05a5d9949a0c37473a8dae397664 SHA512 ed5c05398ae3e5ef8e8507b56781cc18514f0d56acea8d782cc58dc4b88c295c20a926061d610171660298b929ac9f94987d35db87e8e92e70e84d3f7a8b627a
 EBUILD zabbix-6.0.19.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
 EBUILD zabbix-6.4.0-r1.ebuild 10233 BLAKE2B 56c70004858959aa6c72ccdb9c35821877ee599a57dbecf78720206a180d09e2c2b0aa3dadec3520d386dff8aeddb3cfffaa8571d678000eebf5f8b6b0b04a8f SHA512 dc28d64c532c303f30d42e975f28ab1ee6679122776e83e0121984c51c64ed752a015167075301de84dd041db42de411a3e4682a54fc35fdcdda67b712bc923a
-EBUILD zabbix-6.4.3.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
+EBUILD zabbix-6.4.3.ebuild 10282 BLAKE2B 7c22f62cb2fc2ce19298cf9d53b9ab82cbcff20edb88b1022a792b3aba0b30e2f9cbac449f7c67eedef34feddecc9ffd3243f72c44888943da393c5ecd382f02 SHA512 227a37f4a59a9cba6dac5873977ad35b7a04e7ce336e53ca5b8fdd3ea40369dddb22a4da91ee86279e9e8f676191d5e90c864b602a01d5271af474b236189ad2
 EBUILD zabbix-6.4.4.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-4.0.46.ebuild b/net-analyzer/zabbix/zabbix-4.0.46.ebuild
index 249e6dc9f35f..7c31bf7c6aee 100644
--- a/net-analyzer/zabbix/zabbix-4.0.46.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.46.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	?? ( gnutls mbedtls openssl )
diff --git a/net-analyzer/zabbix/zabbix-5.0.35.ebuild b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
index ec1e25bbcd14..e40485ee0974 100644
--- a/net-analyzer/zabbix/zabbix-5.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.18.ebuild b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
index e5e5f002a22e..f44b20cd675a 100644
--- a/net-analyzer/zabbix/zabbix-6.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.4.3.ebuild b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
index 2423117090ed..dd680cb76e33 100644
--- a/net-analyzer/zabbix/zabbix-6.4.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5f93e602f24c..8887c5b9f925 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 174e594f079d..32e6ee2dffea 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -3,6 +3,6 @@ AUX libssh2-1.11.0-mansyntax_sh.patch 304 BLAKE2B 465b6cf0a67fb9d4db83b0ae1556a2
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
 EBUILD libssh2-1.10.0.ebuild 1345 BLAKE2B 4c2fac289235288aaab718a78cf75113e1e7141e5ca58eb98b22a1f67722ad1f2266f31d8040005da35a3dedac68312898e7d466e7ddbc0f3d804893eec66bd2 SHA512 ffdbb9393595a75b2db0f551989fa2713fe19893798c2ad73efc86be17b9de13210a600830ba7e769048b0cb69294881754e9e5118b8570c6f7349b321cca328
-EBUILD libssh2-1.11.0.ebuild 1489 BLAKE2B c5baf6e5be59f17ab202fdfb99e8222eb453c7ec73aa75ae87802075054a307cb69d2d215622a049cae0775a79f9566814a43993fc631c6243b292697b438b2c SHA512 371e3ae24373949f6c49c48982ac5eef64a486b7d1b333eddc8850f8a61392ad77ab2ece742dd115b3d76193079bd56016f2d618eb90ef267e04398fa1435201
+EBUILD libssh2-1.11.0.ebuild 1484 BLAKE2B f11c2f5a0922d25f82759a83dfbc9a24ae17fe9cba8e79ab7c20dab3167beea3d58b5d0f7c9a8b6216943ca29f556f3d62109c01e432f035056ce93219642b2a SHA512 fbf656218302a252e8f7ce31e6d2c85eb3104998fd3962bf5b24612e1aed633c55bce24abb751f1ee020d12046ec61a1ca87497b073798085d56f4c87f8f3f8e
 EBUILD libssh2-9999.ebuild 1404 BLAKE2B c8722abf72bdf141067b8bc5b8c9c09d8fcd27b8a62be95d7ec4ab8cc9e51775cec3bd8144fb285dc2ce75b6d2b2e6b208dc9bf467056cfbae6f5834ca81f88e SHA512 189d0b54c101adc2eaa0973992194cdefa3aae8433e7d92b82742f95af4375ea788a8a6ec2858bcb8ce3603791de71537cb1404256d6f0165189891e2acdf260
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 30a399914f72..7e0d142ae351 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 14b77eecfd8f..cb374f3757f1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 4281d0f17e87..1537455ae812 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -3,5 +3,5 @@ AUX netkit-telnetd-0.17-r13-gentooification.patch 880 BLAKE2B 2727806eb103efa78d
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
-EBUILD netkit-telnetd-0.17-r13.ebuild 1594 BLAKE2B c59ad22438c1d5583187aa0920c1b3f682ca3a64fa591e737823da78e737f1d0ad11eaa9d2363a6a7d28a7df922284674a1303777022f4e3a3f8e2e0d2cf05fa SHA512 0c5ed8f45a6ceafe03ac6d26ad1bdc465042c40e7cfd2804ead9398e652783b11b6cba239e685875b35d231ba1d0d064dc998450af1b80865ad20a0f043025ec
+EBUILD netkit-telnetd-0.17-r13.ebuild 1647 BLAKE2B 89857940a0aa9b08d1549fcc7c5056a27465b840cbb4487f01a9e6f58949c4ed45b109141b57883dd85b9067b3fef3b6ed027d133a366702aa38d28820910c4b SHA512 eae79057f871940f4d4fa749c8f909ba59a29cbeaef527588ea786db9ae739cc65e86327577fa2147469a7b50a46823cc6fa92428a73e4ed0694496c7460ee47
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
index 5859b09f298b..1cdb22da14b8 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -16,11 +16,16 @@ SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-telnet-${PV}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2:=
-	!net-misc/telnet-bsd"
-RDEPEND="${DEPEND}"
+IUSE="selinux"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2:=
+	!net-misc/telnet-bsd
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-telnet )
+"
 
 S=${WORKDIR}/netkit-telnet-${PV}
 
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index eefda17224ef..0d3f5049727d 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -4,5 +4,5 @@ AUX telnet-bsd-1.2-musl.patch 1097 BLAKE2B 3b2d7424a04abd910cc6dcb94b8ca740ed7a2
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
 EBUILD telnet-bsd-1.2-r2.ebuild 987 BLAKE2B 6dac32fbd4f801b5bdd417508aca59e167e321fc7404d29cabcda4ab86adc68f8bd1830b762c970ef141a62fae14c3c384911bdba2ff1605163cd6d6336fe60c SHA512 b2b4c7d5f80bb63d5283d9f1b57949ec8d6d60f3d2c2855c3376c08731ba5a4d14849e4772796a54f0b4d6e8df3c7effddb1e44f78036651089f587ced3f20d8
-EBUILD telnet-bsd-1.2-r4.ebuild 1035 BLAKE2B e9f2c002203134a7298d229af346218cd030ee761d3bf0b063d4634dbc86e620f4242d1a73e8b03a7c75c9afc9175d6f48511c6ce4376ff3a55833d2b0c8f29c SHA512 f4407cc9bc0a6a74c3d2d3912bfe2e820196703cb3437b8f8c0b16df4663e78bf250a0875adc1fa76765fbd34f663a6a4ff92a1c815021fa026fba8a7c670924
+EBUILD telnet-bsd-1.2-r4.ebuild 1085 BLAKE2B c5f7ef9126843d42de7736e10afdafe7d170576df3726013949bbe65ede863516dae553a2aca0f70be81cc1c9cb9aec40cace4ecaeb83ea4bd5534f023e3bbee SHA512 9b925720ec41b75834c0ad38db56876a955de1def20afa741e5731d50498e5175ca4eb63a805cd5668823cf8148bb03961b3d63a4fab239bfaa34a2b5854b873
 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
index c1e8dc327468..8ba189abbfd1 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,13 +12,15 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="nls xinetd"
+IUSE="nls selinux xinetd"
 
 DEPEND="
 	sys-libs/ncurses:=
 	!net-misc/netkit-telnetd
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-telnet )
 	xinetd? ( sys-apps/xinetd )
 	!net-misc/netkit-telnetd
 "
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2c75b1ef538c..0b959586dc1b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 588610a5673f..7612834b7e4e 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,8 +1,10 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
 DIST strongswan-5.9.10.tar.bz2 4765407 BLAKE2B 757d55aa0c623356c5d8bf0360df63990ec18294d06f50b6dd475273b75a883354ea8723708e4856a8f0acc4d3237ac6bcf5adc40346fded7051d78375b2bcc9 SHA512 cf1d4a79ec02ac0502494ce6bfcab7399ddff151e2bc39bd4fbb9562bae7d0c66cf8d1e387b3c36a35e4387d597889fd7519e7bce07d3a7f764b1b73bd8a4667
+DIST strongswan-5.9.11.tar.bz2 4786552 BLAKE2B e8e84d79d1530b9a968ce8429fec0e7b3fcf19b75fdbd4371a38763d8564d5b37d012769006330b5c94cff3e914acb1b1a3e2829749effb8c35f9e5d775be491 SHA512 d500523215f5ec5c5550c4d2c49060b350ae396d8c60170792c46775d04fc7a132aa70a6242145477753668351d26ed957e08903683ecc340aa8d84fb2ae5498
 DIST strongswan-5.9.8.tar.bz2 4747096 BLAKE2B 2a7e346931f909aefa17a7e2f4a2d5b491979dd21519eaffa5d14ac0e54d86207009526aed903bfadbec2d4d449a23077f391106ed9ac02851a081b563c72eb0 SHA512 16d3afc80704f896f3f97addf452b4bb29fc1911c54e980f76ac48bdbe2340ce3bd4e79024848cb7961bbe9ad5458d93389343878ca042af658d51b11219666b
 DIST strongswan-5.9.9.tar.bz2 4764675 BLAKE2B 9cbc73192527254a2d20b28295e7583a0d9ec81e4d6eb1b7d78e54b30ba8e5304a33e813145d8a47b2b4319d7b49762cd35cdbdaf1d41161d7746d68d3cef1b5 SHA512 7f5d94527193ce7716292f30db75303a0594169647e41e8c9530a7dedd914ad7fecf94885356738fd54d3781a066fa591c621d531923b20780b1fca76ad7bd46
 EBUILD strongswan-5.9.10.ebuild 9561 BLAKE2B 08a18210298572e077ec79caff0aab2a1df6e0f619a87d0e7eb0fdda98194254f3d09d3777a1a7000d03bf9d11f9feb885216cf2ac4a14bdd41983d8498f3ca2 SHA512 2d4241e934583e666ad5f8f8603c4b373fdc42a717c6442d2246f5f225109197339c20eee819979614bd44f22f8b628b555de9d6d49e1468a4e0f5de84733426
+EBUILD strongswan-5.9.11.ebuild 9564 BLAKE2B 00c924424a97174058dd8c1416d0ae0b7615bb38abbcb09aaad9506aa72ba65d7261035229e9b00bdb19dcd2c48bb850e66f15a34102fa594af6c3b2a85dcc96 SHA512 6a9f25a9337f677bd6ae8dfb887295632f06b9d7f936813a1879d780daf1715e2d4a56e335736d058da90ebe2f77abcfcba72b64d4cdb60d0d1e9318c392e91b
 EBUILD strongswan-5.9.8.ebuild 9561 BLAKE2B 21d9d8dc44c0c29285411be37eb2c5ebed05434ea83d3b96b88eb31600f2bb32c3a87fcb7c00e212b0cf6901f75ccbdc0a102ce773d017bd7c5f04c284462c2f SHA512 361dfb69148c9ff95c5826d43c574df94d8033d11e58fa80c8d89bde026a9e8198205837c077ec406f0deaa5a7356199ecca3edd9d06f993f4c8e7e5c92bb454
 EBUILD strongswan-5.9.9.ebuild 9561 BLAKE2B 08a18210298572e077ec79caff0aab2a1df6e0f619a87d0e7eb0fdda98194254f3d09d3777a1a7000d03bf9d11f9feb885216cf2ac4a14bdd41983d8498f3ca2 SHA512 2d4241e934583e666ad5f8f8603c4b373fdc42a717c6442d2246f5f225109197339c20eee819979614bd44f22f8b628b555de9d6d49e1468a4e0f5de84733426
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.11.ebuild b/net-vpn/strongswan/strongswan-5.9.11.ebuild
new file mode 100644
index 000000000000..057c1e8f3e05
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.9.11.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit linux-info systemd
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="gcm led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
+STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
+xauth-noauth"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="non-root? (
+		acct-user/ipsec
+		acct-group/ipsec
+	)
+	dev-libs/glib:2
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		--enable-cmd \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-piddir=/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use systemd; then
+		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
+	fi
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes a few limitations mainly to the daemon 'charon' in"
+		elog "regards of the use of iptables."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
+		elog
+		elog "Thus if you require to specify a custom updown"
+		elog "script to charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  https://wiki.strongswan.org/"
+	elog
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 72f172065df9..acc583d54081 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1b26f41869ae..20a12b682a31 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8294,7 +8294,6 @@ sys-kernel/kpatch:contrib - Enable contrib kpatch services files.
 sys-kernel/kpatch:kmod - Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.
 sys-kernel/kpatch:kpatch - Enable a command-line tool which allows a user to manage a collection of patch modules.
 sys-kernel/kpatch:kpatch-build - Enable tools which convert a source diff patch to a patch module.
-sys-kernel/linux-firmware:compress - Compress firmware using xz (app-arch/xz-utils) before installation
 sys-kernel/linux-firmware:compress-xz - Compress firmware using xz (app-arch/xz-utils) before installation
 sys-kernel/linux-firmware:compress-zstd - Compress firmware using zstd (app-arch/zstd) before installation
 sys-kernel/linux-firmware:initramfs - Create and install initramfs for early microcode loading in /boot (only AMD for now)
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c1a938f2268b..1af376b31ee2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index cfb1730281fe..07f5fb914ca6 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -5,10 +5,17 @@ AUX vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 939 BLAKE2B f9778
 AUX vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch 780 BLAKE2B 4ec89cdd78560910c6aef7113282556008bc8e182ddab2800a3facfc568e90e547c85b8da54386347d7d1b73896b206c77f90a1f0363acbfdbfc2fcd09f5c1e4 SHA512 5db82e3224cd7e07850cd1fc41af91577fdaa10b13d151cf8b02c16eb5c6962a58920c4bf643aaf1b8ddf2644c814c23809df29e976542098d4c1d86f52fa2d7
 AUX vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch 957 BLAKE2B 75c8a9929a047db44b541e4bf5c8f58163bdfe1fe68183023577405378f59d78ef7722142a92273626785595fef370362939cd48aaf8a5d642421f5c5e09b7d2 SHA512 8179a31cb7dd50a2e0d0b7719354c1294e8a1997894303e75595464040b5c9340e33cc36064b0f300ac238e86bdd1b00570e23f0156a8542a568f65ee97d9fa1
 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
+DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3 SHA512 f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc
 DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9 SHA512 c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3
+DIST VTKData-9.2.6.tar.gz 594029678 BLAKE2B b3d6990a8098d9bec02a031b6d804049ce649bcd58fbcd74001e893ba41159e49f4dea74c5957737098a39a399d347b3bc65db4feadf152dd3fb8e705da16eb4 SHA512 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080
 DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559 SHA512 c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79
+DIST VTKDataFiles-9.2.6.tar.gz 609045751 BLAKE2B c8a4a8472dcc05f5b1d35c8f6923b4ed2e7adb593a3037ae7673a5e674583ef9ccc5bc1ec8cf29e87fd5b168c0bba5ed27b89c51fe2e5da432ef5d50e415af94 SHA512 f7c104641d25126956a50671934c10b25589e435d7cce6a5107c8dcf83a81f48ed3ae8a325b635f341a5a47579f9200689aa5eb34fe0d1c37acddfeedd33cd01
 DIST VTKLargeData-9.2.5.tar.gz 247523496 BLAKE2B edc785e271ba605c730b9c8d9d62d2d95d818ebf18e4b20468c247187720a27897ecbf701e1eff61ba135545e6ea8f573ef120206813ee5ca11be33d8c5ff728 SHA512 7a994024aa42b48d3633cdcc528d89a2e7e07bcc47d01a0001578720dbc2eb991b90dc2f9caafe8f26a1f10185efb1bc2c0506f799da2b96e63ba08cb564117d
+DIST VTKLargeData-9.2.6.tar.gz 247521022 BLAKE2B ee6e5f627a5cb96aac6a53b7ff14d4a40f1e243a095c7d145412d899ab9d509af5a62ab889fc48c96ff78359443afbeecfa70cb937affdad7225071374b28bec SHA512 f0b71baa4e346746e186c6a0cc93588d227b91cd4993ee6afe15708006250b0b3aa9447822845e01432728c12af56c68a213831b6dc809807ca341ff6912f55f
 DIST VTKLargeDataFiles-9.2.5.tar.gz 247506616 BLAKE2B 45cd462a11dfa65260a5aa178b2004636eb8ec000af9103fd2fc64ca55b0f607cdf39c40f5f0a9ef843b7b2e468e0f84a34dafb8b8655efce5c8d39c80961422 SHA512 da96e4f1d0e21bc597832d8cd0730dcdd8a8f7d6c1f41f74ec41a7a1d0b2a2d61e86bcb5fade7d3210b9d66cae975b537e25280767e37fe08e0965b3e98c1cae
+DIST VTKLargeDataFiles-9.2.6.tar.gz 247505945 BLAKE2B dafec016a17bc4371972e85fe95e5032f385ef090ca7f3cc4e060976798c18015e34d74aa008a0532a37b3a51df406886a1d70c2eae18f6092a1c16cc861a81a SHA512 5266d7761987d651e1185e7a8fcc556634e129bb2dab892f8bba0e408a950f38c3f96c521a2079bfdc16a6cefb7b4cebc0b63aea945c4f3f0b6a99c55d638197
 DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601766bae0314821c243a3d009e1557c5732bfbab59358670c4bc6cd598ba80c284971763e5279bc53c37d954ec30fcc03 SHA512 7901e9fb987ef3b88e8c507ecc7538b551c81d04a9cc65a84ff43b40dc1aeca2a694dd9842a030979a1370873b9fed0c8746a0634b486566086d7784a19181d6
-EBUILD vtk-9.2.5.ebuild 22692 BLAKE2B 99f2fd43aead46dd302e3afc09f6f1ce0297f3c799004b2092a8d7c15c4f5b0711d63adfd1166e81f9725a95e442639343e0fec7cb52a6f87e421960cdfff2ea SHA512 ac9b8ff795a74028eb08d657691d49b8213466dd26c93ab161c9af7d94fe6967aa4fbf878f8c79b6419e6453fdb682bacd3c8c1389e79dad5029776f2dbb7e69
+DIST vtkDocHtml-9.2.6.tar.gz 158833419 BLAKE2B 04686ee0373191fec454738b5e745f3f6d913120dd55727732ab31a021eeaf1395e6a39ee0e2a943c80dc9d32a929dacfc1325afad5a412964dabb4eda32c898 SHA512 e72cfda5cfeb3df0f915f6515bbd34bcb32052af940760cfb1c9845a5c0a81fae38837fb2e192eb95446cd27b65b37b79263f5396631e4665c9d8c57455dcf43
+EBUILD vtk-9.2.5.ebuild 22717 BLAKE2B c607fdeaff264e5339afee88bfc19933f086fb1f0dd1249e8b019a3f0fadc9d6840e05c28e6ffeb309b709bcaffb4197ae73a2801711328041aedbd57c400ecf SHA512 a899af88af37c792fe9ab0342fa395f5f79735298187e1c2d23102cc79a47e8706893a56c6033297916d29c1224eb8b5a848a9524ab6bb1e5c232e46bcbde038
+EBUILD vtk-9.2.6.ebuild 22718 BLAKE2B be7b8d3d5383d0dfb21b0ef829d6547b4bc0c6e0b9bc7dbf8d8b88611e25e171f4030ed5ef19f0236711caa5da352ab4b75d9d413a5b5de873a4f82b39aa9159 SHA512 744046c63354aa070107f471c9763bfb045d4567b6746b2ea6bb6d25428dc24619086a7e15c435ca20747cbe26ad225456de02bdf65d0087d208770b396e1ec7
 MISC metadata.xml 1703 BLAKE2B 0cda631a65906112bd56a573e6602afdc5d6eddd9a8f0a05c2b81728deb6cf1a1ecb2761126f7d0b50645cd116c9d8a62b414c3759af092114dc4395ed15bbc8 SHA512 e857ebd04a9b185bef6d2d3a1e818d22056bf272e448b942dbed9737bfa333072004aafced6cdf97b859c8fbab596b7760149eba5c945603f04d95fc83c9f654
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index 23a48458dd3a..b02f2ee03056 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -186,7 +186,7 @@ vtk_check_reqs() {
 			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
 		fi
 	fi
-	mem=$(( ${mem} * ${jobs} ))
+	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
 
 	use cuda && export CHECKREQS_MEMORY=${mem}M
 	export CHECKREQS_DISK_BUILD=${dsk}M
diff --git a/sci-libs/vtk/vtk-9.2.6.ebuild b/sci-libs/vtk/vtk-9.2.6.ebuild
new file mode 100644
index 000000000000..7f96653bff6a
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.2.6.ebuild
@@ -0,0 +1,746 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO:
+# - add USE flag for remote modules? Those modules can be downloaded
+#	properly before building.
+# - replace usex by usev where applicable
+
+PYTHON_COMPAT=( python3_{9..11} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp
+
+# Short package version
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+LICENSE="BSD LGPL-2"
+SLOT="0/${MY_PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+# TODO: Like to simplifiy these. Mostly the flags related to Groups.
+IUSE="all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging
+	java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5
+	qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	all-modules? (
+		boost ffmpeg freetype gdal imaging las mysql odbc openvdb pdal
+		postgres rendering views
+	)
+	cuda? ( video_cards_nvidia vtkm )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( rendering )
+	qt6? ( rendering )
+	sdl? ( rendering )
+	tk? ( python rendering )
+	web? ( python )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files
+# and need to be available when VTK consumers configure the dependencies.
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/xz-utils
+	dev-cpp/eigen
+	dev-cpp/nlohmann_json
+	dev-db/sqlite:3
+	dev-libs/double-conversion:=
+	dev-libs/expat
+	dev-libs/icu:=
+	dev-libs/jsoncpp:=
+	>=dev-libs/libfmt-8.1.1:=
+	dev-libs/libxml2:2
+	dev-libs/libzip:=
+	<dev-libs/pegtl-3
+	dev-libs/pugixml
+	dev-libs/utfcpp
+	media-libs/freetype
+	media-libs/libjpeg-turbo
+	>=media-libs/libharu-2.4.2:=
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libtheora
+	media-libs/tiff:=
+	>=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=]
+	sci-libs/hdf5:=[mpi=]
+	sci-libs/proj:=
+	sci-libs/netcdf:=[mpi=]
+	sys-libs/zlib
+	boost? ( dev-libs/boost:=[mpi?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	freetype? ( media-libs/fontconfig )
+	gdal? ( sci-libs/gdal:= )
+	java? ( >=virtual/jdk-1.8:* )
+	las? ( sci-geosciences/liblas )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openvdb? ( media-gfx/openvdb:= )
+	pdal? ( sci-libs/pdal:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,opengl,sql,widgets]
+		dev-qt/qtdeclarative:6[opengl]
+		dev-qt/qtshadertools:6
+		x11-libs/libxkbcommon
+	)
+	sdl? ( media-libs/libsdl2 )
+	rendering? (
+		media-libs/glew:=
+		virtual/opengl
+		x11-libs/gl2ps
+		x11-libs/libICE
+		x11-libs/libXcursor
+		x11-libs/libXext
+	)
+	tbb? ( dev-cpp/tbb:= )
+	tk? ( dev-lang/tk:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	views? (
+		x11-libs/libICE
+		x11-libs/libXext
+	)
+	web? ( ${WEBAPP_DEPEND} )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	dev-cpp/nlohmann_json
+	<dev-libs/pegtl-3
+	dev-libs/utfcpp
+	test? (
+		media-libs/glew
+		x11-libs/libXcursor
+		rendering? ( media-libs/freeglut )
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
+	"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
+	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
+	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
+	"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+vtk_check_reqs() {
+	local dsk=4096
+	local mem=$(( $(usex cuda 7168 0) ))
+
+	dsk=$(( $(usex doc 3072 0) + ${dsk} ))
+	dsk=$(( $(usex examples 3072 0) + ${dsk} ))
+	dsk=$(( $(usex cuda 8192 0) + ${dsk} ))
+
+	# In case users are not aware of the extra NINJAOPTS, check
+	# for the more common MAKEOPTS, in case NINJAOPTS is empty
+	local jobs=1
+	if [[ -n "${NINJAOPTS}" ]]; then
+		jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)")
+	else
+		if [[ -n "${MAKEOPTS}" ]]; then
+			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		fi
+	fi
+	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
+
+	use cuda && export CHECKREQS_MEMORY=${mem}M
+	export CHECKREQS_DISK_BUILD=${dsk}M
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
+
+	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
+		# FIXME: better use eerror?
+		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
+		ewarn "See bug #820593"
+	fi
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	vtk_check_reqs
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
+
+	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
+		# FIXME: better use eerror?
+		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
+		ewarn "See bug #820593"
+	fi
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	vtk_check_reqs
+
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+# Note: The following libraries are marked as internal by kitware
+#	and can currently not unbundled:
+#	diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic,
+#	vtkm, xdmf{2,3}, zfp
+# TODO: cli11 (::guru), exprtk, ioss
+# Note: As of v9.2.2 we no longer drop bundled libraries, when using system
+# libraries. This just saves a little space. CMake logic of VTK on ThirdParty
+# libraries avoids automagic builds, so deletion is not needed to catch these.
+src_prepare() {
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	if use test; then
+		ebegin "Copying data files to ${BUILD_DIR}"
+		mkdir -p "${BUILD_DIR}/ExternalData" || die
+		pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
+		ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die
+		popd >/dev/null || die
+		eend "$?"
+	fi
+}
+
+# TODO: check these and consider to use them
+#	VTK_BUILD_SCALED_SOA_ARRAYS
+#	VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses"
+
+		-DVTK_ANDROID_BUILD=OFF
+		-DVTK_IOS_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		# no package in the tree: https://github.com/LLNL/conduit
+		-DVTK_ENABLE_CATALYST=OFF
+		-DVTK_ENABLE_KITS=OFF
+		-DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
+		# defaults to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		# disable fetching files during build
+		-DVTK_FORBID_DOWNLOADS=ON
+
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_StandAlone="YES"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT")
+
+		-DVTK_INSTALL_SDK=ON
+
+		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite
+		-DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOXML="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT"
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_cgns="WANT"
+		-DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT"
+		-DVTK_MODULE_ENABLE_VTK_eigen="WANT"
+		-DVTK_MODULE_ENABLE_VTK_expat="WANT"
+		-DVTK_MODULE_ENABLE_VTK_fmt="WANT"
+		-DVTK_MODULE_ENABLE_VTK_freetype="WANT"
+		-DVTK_MODULE_ENABLE_VTK_hdf5="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jpeg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libharu="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libproj="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libxml2="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lz4="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lzma="WANT"
+		-DVTK_MODULE_ENABLE_VTK_netcdf="WANT"
+		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT"
+		-DVTK_MODULE_ENABLE_VTK_ogg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pegtl="WANT"
+		-DVTK_MODULE_ENABLE_VTK_png="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pugixml="WANT"
+		-DVTK_MODULE_ENABLE_VTK_sqlite="WANT"
+		-DVTK_MODULE_ENABLE_VTK_theora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_tiff="WANT"
+		-DVTK_MODULE_ENABLE_VTK_utf8="WANT"
+		-DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_zlib="WANT"
+
+		# not packaged in Gentoo
+		-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+		-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+
+		-DVTK_RELOCATABLE_INSTALL=ON
+
+		-DVTK_SMP_ENABLE_OPENMP=$(usex openmp ON OFF)
+		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
+		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
+
+		-DVTK_UNIFIED_INSTALL_TREE=ON
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# use system libraries where possible
+		-DVTK_USE_EXTERNAL=ON
+		# avoid finding package from either ::guru or ::sci
+		-DVTK_USE_MEMKIND=OFF
+		-DVTK_USE_MPI=$(usex mpi ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=ON
+
+		-DVTK_WHEEL_BUILD=OFF
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	if use all-modules; then
+		mycmakeargs+=(
+			# no package in ::gentoo
+			-DVTK_ENABLE_OSPRAY=OFF
+			# TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES
+			# option. Check whether we can download them clean and enable
+			# them.
+			-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO"
+			-DVTK_MODULE_ENABLE_VTK_fides="NO"
+			-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO"
+			-DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO"
+			-DVTK_MODULE_ENABLE_VTK_IOFides="NO"
+
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	fi
+
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	# TODO: checks this on updates of nvidia-cuda-toolkit and update
+	# the list of available arches if necessary, i.e. add new arches
+	# once they are released at the end of the list before all.
+	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+	# CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake,
+	# as of 3.25.1 doesn't recognize these keywords.
+	# FIXME: better use numbers than names?
+	if use cuda; then
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+#			native)
+#				ewarn "If auto detection fails for you, please try and export the"
+#				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+#				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+#				cuda_arch=native
+#				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
+	fi
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVTK_DEBUG_LEAKS=ON
+			-DVTK_DEBUG_MODULE=ON
+			-DVTK_DEBUG_MODULE_ALL=ON
+			-DVTK_ENABLE_SANITIZER=ON
+			-DVTK_EXTRA_COMPILER_WARNINGS=ON
+			-DVTK_WARN_ON_DISPATCH_FAILURE=ON
+		)
+		if use rendering; then
+			mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON )
+		fi
+	fi
+
+	if use examples || use test; then
+		mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
+	fi
+
+	if use ffmpeg; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" )
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" )
+		fi
+	fi
+
+	if use gdal; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
+		)
+	fi
+
+	if use imaging; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Java="WANT"
+		)
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="YES"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+		)
+		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" )
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		if use rendering; then
+			mycmakeargs+=(
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT"
+			)
+		fi
+		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
+	else
+		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
+	fi
+
+	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" )
+	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
+	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" )
+
+	if use python; then
+		mycmakeargs+=(
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Python="WANT"
+			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" )
+	fi
+
+	if use qt5 && use qt6; then
+		# prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
+			-DVTK_QT_VERSION="5"
+		)
+	else
+		if use qt5; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
+				-DVTK_QT_VERSION="5"
+			)
+		elif use qt6; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
+				-DVTK_QT_VERSION="6"
+			)
+		else
+			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
+		fi
+	fi
+
+	if use qt5 || use qt6; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT"
+		)
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+
+			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_gl2ps="WANT"
+			-DVTK_MODULE_ENABLE_VTK_glew="WANT"
+			-DVTK_MODULE_ENABLE_VTK_opengl="WANT"
+
+			-DVTK_USE_SDL2=$(usex sdl "YES" "NO")
+		)
+		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" )
+		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" )
+		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" )
+	fi
+
+	# Testing has been changed in 9.2.5: it is now allowed without
+	# requiring to download, if the data files are available locally!
+	if use test; then
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=ON
+			# disable fetching data files for the default 'all' target
+			-DVTK_DATA_EXCLUDE_FROM_ALL=ON
+
+			# requested even if all use flags are off
+			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	else
+		mycmakeargs+=( -DVTK_BUILD_TESTING=OFF )
+	fi
+
+	# FIXME: upstream provides 4 threading models, as of 9.1.0. These are
+	# sequential, stdthread, openmp and tbb. AFAICS all of them can be
+	# enabled at the same time. Sequential and Stdthread are enabled by
+	# default. The default selected type for the build is sequential.
+	# Assuming sequential < stdpthread < openmp < tbb wrt speed, although
+	# this is dependent on the actual scenario where threading is used.
+	if use tbb; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
+	elif use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" )
+	elif use threads; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" )
+	else
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
+	fi
+
+	use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" )
+
+	if use views; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT"
+		)
+	fi
+
+	if use vtkm; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT"
+
+			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
+			-DVTKm_Vectorization=native
+		)
+	fi
+
+	if use web; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_WebCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT"
+		)
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" )
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	cmake_src_configure
+}
+
+src_compile() {
+	use test && cmake_build VTKData
+	cmake_src_compile
+}
+
+# FIXME: avoid nonfatal?
+# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
+src_test() {
+#	nonfatal virtx cmake_src_test
+	virtx cmake_src_test
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	# Stop web page images from being compressed
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}/html/." )
+	fi
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+		einfo "Installing datafiles"
+		insinto /usr/share/${PN}/data
+		doins -r "${S}/.ExternalData"
+	fi
+
+	use python && python_optimize
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+
+	if use examples; then
+		einfo "You can get more and updated examples at"
+		einfo "https://kitware.github.io/vtk-examples/site/"
+	fi
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 34a6972b600e..adb1cd983059 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 930770cca553..9cb22a388249 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,6 +1,6 @@
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
-DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27
+DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
 EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
-EBUILD kbd-2.6.0.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
+EBUILD kbd-2.6.1.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.6.0.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild
index 23a50e0bfa38..23a50e0bfa38 100644
--- a/sys-apps/kbd/kbd-2.6.0.ebuild
+++ b/sys-apps/kbd/kbd-2.6.1.ebuild
diff --git a/sys-apps/locale-gen/Manifest b/sys-apps/locale-gen/Manifest
index 3b7191ea7291..831dc00d5348 100644
--- a/sys-apps/locale-gen/Manifest
+++ b/sys-apps/locale-gen/Manifest
@@ -1,3 +1,3 @@
 DIST locale-gen-2.23.tar.bz2 7664 BLAKE2B a529b62fbb840c9352f06e8f5c80fc764425a2619dc69cc820f550a026d391788d5e2cfeeb46a8b5b9716da63340b4fce57a5b523edd4196ee1219c1200cb752 SHA512 c1245caadb04403c535a836f19bc410d0f04b5c0e297ea5be9852e6d71e08e528071ae769d63d31a677dda8fdd618b4c4d581ed525cf8786b82d8f37636db754
-EBUILD locale-gen-2.23-r1.ebuild 898 BLAKE2B e6e73c657ce26107dd273b01f6923112f9364aa907e2d679c16d6976c0e72d4dc8303be5fe53ab88074952de5fe7271e9e92c78a64d3c06ed5830250141a957f SHA512 dd6e3466f65fb897be0814889e78889805801213eefd7ffa01dec77c690114d5d2e5ab6ba564baa288f4b0d52c7e5d6513ea7fe92afd282e49d0c9e734931eba
-MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
+EBUILD locale-gen-2.23-r1.ebuild 897 BLAKE2B dc105737e771373a071938623ada656ada4554ef736be328f7f0fb1d337226fc3bbadf2d57aba950a3ec4339fd745506932179a4928c4a802006930e4eedbb2f SHA512 d721a154058233864de0c6fb556d278a037d2e82296481466d3be49fa9109687f5e0736de89bb9aa351b073f0324869802a7df378106deb2b9ce472349069c4c
+MISC metadata.xml 399 BLAKE2B 9b0c4e964dbb8808d803352f78417d770e494ca88c28db4f7dbcbef8e43caadf6df701da762aa5704c15a0c685467cd4c51a9bdf3397a909a920f1a3a67ae7aa SHA512 04d82d54da06605db532ceae7a3a2e6bfc2d737d395f4c45f1d695a3b61d52717fd16db613d5b17b47e1d18e3f91327660c9bf1eeee36d3d3ebc85408d378eca
diff --git a/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild b/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
index fb94d8f3c620..2505276e4e10 100644
--- a/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
+++ b/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2+"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	app-alternatives/awk
diff --git a/sys-apps/locale-gen/metadata.xml b/sys-apps/locale-gen/metadata.xml
index e9de1423720b..2b151008630f 100644
--- a/sys-apps/locale-gen/metadata.xml
+++ b/sys-apps/locale-gen/metadata.xml
@@ -5,4 +5,8 @@
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/locale-gen</remote-id>
+		<remote-id type="github">gentoo/locale-gen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 96cf266ba0df..169f8acf2fd7 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index acb0e2967b92..cad5e0897bf1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aa
 DIST genpatches-6.3-11.extras.tar.xz 3804 BLAKE2B a3f7281d932090f92e4f230159d30a1b03e15e788cd03808f86d03f8df85bf0fd3a77871148af2eaae8637ea0b65e7e2c6ef9e02cd0992cc0b51924a422c5b6d SHA512 6a9d694ac9a9b3af9ac89d60fd48808fb70ee4266dc60deaecc4c2a3a48ec00aadac2074dd6cb86b698415ab24fb9b2da7284a85208e63cac7a4ec50eb423e92
 DIST genpatches-6.3-12.base.tar.xz 691736 BLAKE2B 533383ee5f0bce440f9ceff66b75d742596d22113367560cf364243d90ee418d84868adedc62e74202fd5cc1c67e8efb8fdddae35e7ba12d2026be252b4005cc SHA512 8bf1fd11b3d5c3346923ce573dbc730204370b033825b9650bce83da2292dd8ce253e7e60bb23fcbcf902d0cef6b4b4b335df07c1db4c5fff477d2fece6e6489
 DIST genpatches-6.3-12.extras.tar.xz 3808 BLAKE2B 08914680602e3a59ccdd2699b60b3707e40bd2dd28c87170e78701758f50ed2273d7b4b7e238cc6d6ae5819c48c2c8e744056e0ce964dfc900fad44dd628da5d SHA512 f99775c2aece8d77fb432fd9a013868d85cddba6546b6fa489c91b085b0ed35fc14e2e23c922d5b34f677994749e050f837112aa6c0ad171278481eca257606b
+DIST genpatches-6.3-13.base.tar.xz 754256 BLAKE2B ef146e227f2df785bb65d1cf8e50d786103aeed18a8f42e5584656f1999b943ac48db16d5cdc5917c03823364199284975837fabe9a777215373ae83e7206b99 SHA512 3df4532294febf47cb0291acdbf5ff137877186747ff7791f675686f2c08e14c0b8fd110e452c50172dc3d1b6a48bda604f6e577753380a4ab64502d0ec17724
+DIST genpatches-6.3-13.extras.tar.xz 3808 BLAKE2B 87d56c9b4869ed1741878e8dc03adf97c77872a7eda00697b21a72584393eeb89d9124299aa14aac9f4790e2a90adb42038a226e08ef01a7d1906a381c7a7d2e SHA512 8e5ef88f45333e6afcd139b83698eb7a250c7db6882fe0409361d91a52fa6997fe57ef8ae1d3e5eb4b9306efab0d2fbbc96a4a3808925f15c305df6514159fd8
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -128,6 +130,10 @@ DIST gentoo-kernel-6.1.35-1.amd64.gpkg.tar 76677120 BLAKE2B 9b0f382704f028b6121b
 DIST gentoo-kernel-6.1.35-1.arm64.gpkg.tar 69335040 BLAKE2B dbd797663eb867e6bf667575a58aa5eedd5609c5b36560fb0888100817ec3749422be95fc059ce3fb1f4d2462bae5cffa94d090d9935895a4f010beb173d3fc4 SHA512 48acee2a34bafded610899d4e324cc393b0bdbd06f8d39d02850af232bde599fb150d5121d51878f6f922b83f22de47c1907d2b42f75d84721c2a25ff058982d
 DIST gentoo-kernel-6.1.35-1.ppc64le.gpkg.tar 62730240 BLAKE2B 372f5eb878bf1e4f015fbbeb09917b3420403a105b682d1732d909ddbdfa4bd50b8cea4d3a9129e1db0982b941fe61799380ba21101a3149cec255419797c4b5 SHA512 913ec30a24697cc78f8717abdebabfa9c427b1e6edbbea4808de536be828fd809f5342d102fbb0029c3bb1f5650b439062f1de8213b08c893c776a36f5ff5604
 DIST gentoo-kernel-6.1.35-1.x86.gpkg.tar 66078720 BLAKE2B f05069cae9b4f22f3fbea82d334e2b0661c118c09631527011731f2470f5b0674ee03f7bfa935819131e805ba3ab6a8b81eda73cf6c9ef85c9cc80027050df12 SHA512 9693eba4d519d1c886bffc664bb57fcb7a4c5ebcc56d21c4f4da33bfb869d79ea1030ccbf90ef22ae5c2e43ca102f7da99f42cb5c1cc9a3ea7e637550809a039
+DIST gentoo-kernel-6.3.10-1.amd64.gpkg.tar 83527680 BLAKE2B 6876423636b0cb65ddc61aaa4ea8bebb16c178f2b94b3591607955c804ab0005dfa137366a4d4a92e855af4bb8adb4a8c760b8c52cbec0479b0229a66044b881 SHA512 8a1bb96504a13d22179eb64609aad6006c384e39ff6ffc4d171f8e410d06e40fc2f62e72581c3fbae57748fa26d392c5db8bb7eb2049e95fe08f9d08bbd47696
+DIST gentoo-kernel-6.3.10-1.arm64.gpkg.tar 72437760 BLAKE2B 1cc2e08db86f3f6d32403c49312718f72112aaa7e6a6ba9c182a4e5f1c0b3e6f144ccafa95e4aab2d1218305e7532642b95f41c1d15353fa5f735be1869870da SHA512 1068bdf4b4216b5a128629024187693f859cfe6625c13bc1fe2bad20e8febde6f68b7348067d70d728226443379b6c315d085c155d7e0b750e7c7ac045354db8
+DIST gentoo-kernel-6.3.10-1.ppc64le.gpkg.tar 64307200 BLAKE2B 96d16e1102ecc35e56b5708dfba9d4974ef42cc556150f7ce3a73163b72a1ff1ccf93572a35fc4cf4405a0acadf6932827b45f0e6dd9367265a8c8ec017be5f5 SHA512 e865b02ca02ae97f8b1fb8b5982648a253b09bb980a07646822b473705fed2ebfbcc8f13fac4a76b4c0b982a12523f1eb3f89118a0e64087b64c2d9a657fc420
+DIST gentoo-kernel-6.3.10-1.x86.gpkg.tar 67061760 BLAKE2B 1da3776fe0c227f2e79c26c953ba188eb2e5eef07fd64ad152a2877eb19421251e5da1ea6df0ed2b8bb6819a3fb9ad03f287ef9e52dadc0d910f75537da3a3f6 SHA512 fd6b8e1e5576038aabf03ce789ae4f456b5d60f9c4b51aab12198e3dd490134ead52cf65bfe60fe8a82e308071e46cfad83db14d8c3c49b53429a0dcc03ce47b
 DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8ca6b5a742a006cc6c6a1fd57760ffe72fd124d1ea3dbbc9361fc1f7ac4f64c3feaa2b213372cf72515577ae381c7921389db3e10d96 SHA512 9785a27d50e95c3dd9385b928b9dbc1e1056fd7cf999b4e1f675fa3ee724663671d8bb9de74a63588927cc5b984bfeff927e3ea9a26b12ef2009c7574804e490
 DIST gentoo-kernel-6.3.5-1.arm64.gpkg.tar 72386560 BLAKE2B b089996536ad9ac90e5fd382a490041baa3f7e2f4deb8945f961f454e042ef701bfb7ccc8259acca4a0a77fd104c6f0bea0a447aa90ee523eb42a4ef7eae72ce SHA512 1c666d1f210a81b2a803da4c3eab2c8464373cbbbe7b67ea2e6d3fd8bb786a6d13ecd9ece3d4dc7cb0b7487a3aa0eacfb80f9368d0b07d42c9ea7c0338659a63
 DIST gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar 64286720 BLAKE2B edfa70df90d9efca3394776bb30711f51a2dfd925d49cc5310ea985112b8c37deb3658581eb381d4128154acec9a39c369f9425aabf448a6d9d6a53f6796efe3 SHA512 bb551d9a588e2b801b4ce8d5a65a34b9eed1b965ee0843bf83193dd1692473fba9e576d81fcfa69f63418b056d9784f5ccbf36b5ea742d4cbf1098d64ec0b3bd
@@ -173,6 +179,7 @@ EBUILD gentoo-kernel-bin-6.1.32.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09
 EBUILD gentoo-kernel-bin-6.1.33.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.1.34.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.1.35.ebuild 3027 BLAKE2B 7991a3d474395829a86d186720d409e9114fd392bf0aa49b5f55962dc5774ed497628a3610631a560564f50ae6e9467828c0e2d7a1db416789367e82b28651c4 SHA512 5c962b885b31de97d5232c6fd428925de67b5107e0c6b8ab002370e8971b4a007ea411829258eaac834b873b1092c8a20a9f4aeeceda2ca7a455c524faebed6e
+EBUILD gentoo-kernel-bin-6.3.10.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.5.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.6.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.7.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.10.ebuild
new file mode 100644
index 000000000000..ff865204fd12
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.10.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 4cccfc25a786..c1e50f592660 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aa
 DIST genpatches-6.3-11.extras.tar.xz 3804 BLAKE2B a3f7281d932090f92e4f230159d30a1b03e15e788cd03808f86d03f8df85bf0fd3a77871148af2eaae8637ea0b65e7e2c6ef9e02cd0992cc0b51924a422c5b6d SHA512 6a9d694ac9a9b3af9ac89d60fd48808fb70ee4266dc60deaecc4c2a3a48ec00aadac2074dd6cb86b698415ab24fb9b2da7284a85208e63cac7a4ec50eb423e92
 DIST genpatches-6.3-12.base.tar.xz 691736 BLAKE2B 533383ee5f0bce440f9ceff66b75d742596d22113367560cf364243d90ee418d84868adedc62e74202fd5cc1c67e8efb8fdddae35e7ba12d2026be252b4005cc SHA512 8bf1fd11b3d5c3346923ce573dbc730204370b033825b9650bce83da2292dd8ce253e7e60bb23fcbcf902d0cef6b4b4b335df07c1db4c5fff477d2fece6e6489
 DIST genpatches-6.3-12.extras.tar.xz 3808 BLAKE2B 08914680602e3a59ccdd2699b60b3707e40bd2dd28c87170e78701758f50ed2273d7b4b7e238cc6d6ae5819c48c2c8e744056e0ce964dfc900fad44dd628da5d SHA512 f99775c2aece8d77fb432fd9a013868d85cddba6546b6fa489c91b085b0ed35fc14e2e23c922d5b34f677994749e050f837112aa6c0ad171278481eca257606b
+DIST genpatches-6.3-13.base.tar.xz 754256 BLAKE2B ef146e227f2df785bb65d1cf8e50d786103aeed18a8f42e5584656f1999b943ac48db16d5cdc5917c03823364199284975837fabe9a777215373ae83e7206b99 SHA512 3df4532294febf47cb0291acdbf5ff137877186747ff7791f675686f2c08e14c0b8fd110e452c50172dc3d1b6a48bda604f6e577753380a4ab64502d0ec17724
+DIST genpatches-6.3-13.extras.tar.xz 3808 BLAKE2B 87d56c9b4869ed1741878e8dc03adf97c77872a7eda00697b21a72584393eeb89d9124299aa14aac9f4790e2a90adb42038a226e08ef01a7d1906a381c7a7d2e SHA512 8e5ef88f45333e6afcd139b83698eb7a250c7db6882fe0409361d91a52fa6997fe57ef8ae1d3e5eb4b9306efab0d2fbbc96a4a3808925f15c305df6514159fd8
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -98,6 +100,7 @@ EBUILD gentoo-kernel-6.1.32.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f8649
 EBUILD gentoo-kernel-6.1.33.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.34.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.35.ebuild 3917 BLAKE2B 7d874950232c5ec963518170c249d974f7dfa7bf398517f09e6bf8f56663dd3407fa829d62a588c3ab6ad6bdf83ebe26641a00be837a44b88155c729bb95dca8 SHA512 c70e32185b12202830cc31889f7eb189b5bc1bec458dc57d5aa84712174b6c6e6f6526e1dfebe6bfd8f7c81ba85a4d53309cf22f6aa7aadfad7594f37eebeea3
+EBUILD gentoo-kernel-6.3.10.ebuild 3946 BLAKE2B 1fa6fcaa24bc13570986fb4fb0a62b456a9213cbf5b181b996dc99685e936a8cb57ad160e5a94b3635c5bb1b654766c9ef96df6089ab5d04784ac42f5264b3db SHA512 599cddf43b76a05d3d6e704475c89ead560b3ef6f1c930995acd90fedc5aa84afcd48f6d98927c63e4eb8a97d072f7c5164c53c5963eb8caaca385a1142c5278
 EBUILD gentoo-kernel-6.3.5.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 EBUILD gentoo-kernel-6.3.6.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 EBUILD gentoo-kernel-6.3.7.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10.ebuild
new file mode 100644
index 000000000000..e7a2be111fdb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.10.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 7df63d55d7ed..ddcd08e9d4e5 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -5,4 +5,4 @@ EBUILD linux-firmware-20230404.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04d
 EBUILD linux-firmware-20230515.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20230625.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
-MISC metadata.xml 1300 BLAKE2B 075ac0595a6408aa708224e79109b4b542f77c63841d600a89a8cc94bd13eefda3d7c6db416f16814ae67426b0d16cff48ac88bb76b692e3c4524bd3ac3cad6e SHA512 bc946c219e24b905c55004323fc7bf213a5e012bdd6b20cfc1203680a7e6460dd56e30c2735da0f94f3c95aa96b3afbbd532e3e3215da9597a512c4d448b8de7
+MISC metadata.xml 1192 BLAKE2B 52efc1e40ffdac04c33fd2c50a1b7a03f775e16c6aaac19f1a7c9c54f853f7f3dd37fd52e4cf7fcc05bf17d45e4d7956deff7b552b1b568005feca60d967fa23 SHA512 e1214670c10573aee4e272b45bb9c21c85b15d520e77f57fa1decf8c7bb1dd765bdf6b878b6c52a8455f9569735b806caf053dc7934ce74c7088b991ebb705a2
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index 9f5573f7726a..9b0f0b62ea04 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -18,7 +18,6 @@
 	<name>Gentoo Kernel Project</name>
 </maintainer>
 <use>
-	<flag name="compress">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
 	<flag name="compress-xz">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
 	<flag name="compress-zstd">Compress firmware using zstd (<pkg>app-arch/zstd</pkg>) before installation</flag>
 	<flag name="initramfs">Create and install initramfs for early microcode loading in /boot (only AMD for now)</flag>
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a428d4e62523..de8ce8452cbe 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -68,6 +68,8 @@ DIST linux-6.1.34.tar.sign 989 BLAKE2B 565ae692b396592b0ec498e9eb3f691cf28ddbce7
 DIST linux-6.1.34.tar.xz 134979752 BLAKE2B 8998cb16c6d9989bc78422142e9a25962739830f77e352c1ad5562f04fa96f495e195ee64963dd13c84189ce0db24b05d9dc7c13112bda64638d0032f1c475e3 SHA512 181a58f98f42fe584568a45d6360479d9b9fd686f03855926cb3cf7f1d4166f2d306b3966f3d77ba1c41a6ce578c37679cff64b46b9cf8f7daec2886ef62ad1d
 DIST linux-6.1.35.tar.sign 989 BLAKE2B e717c70ff3e9468799a1bb17960abb60ca1875ee4950238e0627c32f9266c15321b1c607c1b3c6f85643efac17a82efc3f5eaead73b4cf40e713c9f0ad34cc37 SHA512 934d23d90cc5aeeaa9c8e9bffbe6f97e1b0e6988e6c8212b830f224340b4ca88b93e2885e452839f7d7536a3a316586c584537d01ad5e7104ce18784b89b46b7
 DIST linux-6.1.35.tar.xz 134947896 BLAKE2B a52af7f223515da9e026c34f48fd078f7477ca6c06cca4930323fe885c18509bcafa243b39613cc8207fcf58d2dfb84baf833df068749b3d4827ad57c8939e8a SHA512 7945932912c955825f66ec72adf1ad9ff685a966e82d8a91e22919e8794b3d560c96aa0bba5376cf4b99690b4419e86ae2a7d5e52e056b858fde57a277417b33
+DIST linux-6.3.10.tar.sign 989 BLAKE2B f663bc86f8db7732697757add308efd7c87eed512734630861bfc7890ad88d1bc36d9a32e5c9da8b9f7b3edb567eb7107b7e16ebad786cfc3b6b000dc929b3ee SHA512 86b7ea543960abbb8e02769000e19d0ecb7d373c00876918dd4905d6eefc1b9d15147898e5e63bca0354dbccbf279479940ecad7e1e83b6c850eae696b34a3af
+DIST linux-6.3.10.tar.xz 136959244 BLAKE2B 995b555eee4b47fc53580d830adda183533c4a7fa5151276749cf238adee654920eeddb18f93f4d3b00b054acb9b121fd1c2bc6f4e0530d095777bf3caf8351d SHA512 20930fac15cd77abdd1e39dd5a4397a8a5c73bfb59a8f091d9ae849bf60431858df6bb50f1c2bbdc0b9c9fcb4687d68aa7a5a444b58d3b7718f16ebe733b31b5
 DIST linux-6.3.5.tar.sign 987 BLAKE2B 34ed1d758eb42af9d27b6aec986c9f52426b19ad9a7483d1b4eb1b4873e7e10efd9c102fa7e17d1fba5df15ba536ab77e6597b607dd07ea9012860fe9eff2c34 SHA512 a701dea5d297c217eb2b497a9441399c0f386f39f74f726f81872f8144d83973ec02ce533b7d48cb9c49d38a98c820668d684927983a001f7a8a27067f605867
 DIST linux-6.3.5.tar.xz 136926988 BLAKE2B 646a94591eae93db9301a11e5300579c8cce7d2a544727cb88efed86d05ba070a247498d9c83d7b7cdbead4e7d46537134c877813aa7f188dd36b403c58d0c11 SHA512 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de
 DIST linux-6.3.6.tar.sign 987 BLAKE2B db87514c0b906b3faeaeb55235234f32880de042fb2cfb05035186007d3cbbfa1051f80c54b8d9b2f93ca023e393ff3f360b8eb0dcebc3cd388122bc6cf990bb SHA512 f1c9c7d5f81906f45b6c7c2bab251f56a7fcc0ac11f59b5790e1fe5eee3bcca16da841d70055f15de4d03c24ef611520ea4339d989f4ab89354382997bebd148
@@ -103,6 +105,7 @@ EBUILD vanilla-kernel-6.1.33.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d
 EBUILD vanilla-kernel-6.1.34.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.35.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
+EBUILD vanilla-kernel-6.3.10.ebuild 3894 BLAKE2B fde25007175b9e4ca4d9b8f9c6ede5324b26d9ecd455be3c78e829e866ddecee897daa2c78e4a574db439578e0fb4aa0bf936cd78126bfe3e6314c81632f890d SHA512 d5ccdba5652ae1ebe30d2f52a2b7bf31daa9e5ae16b57e11c5ee2460add96f60dfa1fd54828e806be6e421e7d06021f76f2e1ed69601bb4a885c62c04ceef426
 EBUILD vanilla-kernel-6.3.5.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.6.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.7.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.10.ebuild
new file mode 100644
index 000000000000..8cfee9d755a6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fc59ed7eb7e2..328cac759c24 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ef6915221700..87a8b66282e3 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -47,6 +47,6 @@ EBUILD glibc-2.35-r11.ebuild 50188 BLAKE2B 7877e71cb62608e79ac5e2a7751f453aa9d14
 EBUILD glibc-2.36-r7.ebuild 52465 BLAKE2B bffd99d73276251906eaa88971d6ea4efd26a18c3498ff490cf0cf3cf9d5a2c74c277b41796dde99d99e5dfaee371c6bde1ad8f3e34905f0b9f5cd54ea176623 SHA512 c68df989238306f9586ed9ab08c06c30beb32ddf9c440ab68d2f606e7fbf33fe55bd3f77d4ec81888a6e1c4a3b6e5a6aa080ac72519b9b9ba06dc8e6ddd71d68
 EBUILD glibc-2.36-r8.ebuild 52466 BLAKE2B fc59a2935c5e9487585449477ae7a0db2b005467071d4fae7b23169a1c309b716771d9dec01920deeea5eab1dfbc363817612e560cf49be1306c0691d0badd86 SHA512 9510470fa442309ca0df07ff2f0f0ac664cecd3b11080a1aa765aa6307057bf28a35742bedbd83b7d77fec63a67886bb109b5841cdafdec3e374d7df73bb2016
 EBUILD glibc-2.37-r2.ebuild 52535 BLAKE2B c866bd4c4854a982c4f893b0a4a29245876d70a17cd4a44b941c36f15ffcb2d8afacbb96003277c7380e26a982b74e32baa238dfa3d34047ad3ab48c9ca8b7c5 SHA512 86483f33efaa2a3fe3786ef148c7b0964884b6f15b44ab8a846a799d93af2bb46c174d5b6680724325000e61d2f370a5f61f0edf202289a76f5f9fde14b7dcdd
-EBUILD glibc-2.37-r3.ebuild 51880 BLAKE2B ef26d4d0b2febf6abe26e2fa585b7e985084326187b1239af5b88af5c5ba23314c1be5d5b232195b44e75af2bc90bbd69bccabdcbf73d9120c4000f2fd06bcce SHA512 93090b077cde6ca2096935b1eaa832adb1d4bc86ab0a88a942c0362d66d97a3830ad94d7a89a9f34fa4d5bb2cfbb3306af18e5fc9b849d6c8dfb139d2e1d66b8
+EBUILD glibc-2.37-r3.ebuild 51879 BLAKE2B 138d7852d893368597da1ff4226fd7887d84b6c114d1f0fbaf378d9b87fee9563f6018385cb3652a15c22770c2fabf02c04ec23b9a13ad165d7a38bf7a961c8e SHA512 be7261f07956e7c92d35021a0ae49921029899fe34bb2c5f2530fc9d9c5a824255cce02af49293aee6de11f3127e56293086c087b5222d3319c0d50e2f68284d
 EBUILD glibc-9999.ebuild 51881 BLAKE2B 32a6f5c658571b48cb7234f6ac5e6dbb6b07c2b3379c61286fe6c053bbf64c0f790a3835ef43d75c7f76074ab87918704615fad20423d75a2fcbf9d843cc9a22 SHA512 f739739feb8c104aae038a38e5b69d7d61811c7a4c1461b8a5085544891d3f846e528613a8e13f8d27bda636546647f336849bf588edd4b5c7761a99f4dcbfe4
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.37-r3.ebuild b/sys-libs/glibc/glibc-2.37-r3.ebuild
index 8cb029656f12..a7acc180cd1e 100644
--- a/sys-libs/glibc/glibc-2.37-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r3.ebuild
@@ -39,7 +39,7 @@ MIN_PAX_UTILS_VER="1.3.3"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index a7aab296a49c..e6f814383242 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 114d00fb08e4..9c1c56203e3d 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -18,6 +18,7 @@ EBUILD dist-kernel-6.1.32.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49
 EBUILD dist-kernel-6.1.33.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.34.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.35.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.3.10.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.5.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.6.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.7.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
diff --git a/virtual/dist-kernel/dist-kernel-6.3.10.ebuild b/virtual/dist-kernel/dist-kernel-6.3.10.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.3.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c2685794458a..394f007ae9fa 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 9eab5f09ab91..3b0e7fd7604a 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -6,8 +6,11 @@ DIST xterm-381.tgz 1536598 BLAKE2B 44a94e893fa8696e58e7246c2800799ca85b4f099f059
 DIST xterm-381.tgz.asc 729 BLAKE2B d6b866eb09c42dea4956bc6997f752b3a59ae0477275e5919abd9420d151cc094cc99b06088026991d76f254bc84f637dd67dc9191870cf88ba9f48a5d74651b SHA512 05217da892f6b6261c33359b1905b97b0164bbbf155be4e516cd624e5afc9dfa8b89a46f1ae302c7ed486ad466c19200becda556c35fa09fd6a932b634cb9b10
 DIST xterm-382.tgz 1536637 BLAKE2B 50e538f9ad0735da9c108aca2ccd4e5f14c3aa923fa932952098731e2c68658eaa3f5a35d65468db18b6cabef2f0da5ff8292da9d863a4254f7ca8f4d92e363d SHA512 52780430928d071a131ba9d79ca6915d9f627e82a527f5b0c1eac8e05cea62294631e4a6f27a29e5fa046e3b15c3744e532322e547f4a6a01d05779f0807b8b5
 DIST xterm-382.tgz.asc 729 BLAKE2B 08d3c637ab1d922c951abda0306e07c3ce51d41d4f916fbc01eb2975ac294417bc4f3f07ccadf7332a8c6547bd6e373bc300a3ce6e0fb21abb8a1699f8bad64e SHA512 d399cb16dcb8b0c6c6eb998d2d37c445079d57d46e5ec3e8ca94479443a817419dc1051181b31e8f478ab8910773477de19d6b783439454fb259f135390a8bd1
+DIST xterm-383.tgz 1538968 BLAKE2B 9d9e0aff91b829b8e3d7dfcf0ad461d4f823545ebb7d0a4a1130c339afbea76f60fb2e2f514ec05256fa6e5a5f137333c4fabe7bea6eb7aa1c59ecff93a77b77 SHA512 68befcf821a752992d82c48c2fabd86953185c691b5f16d6dcc8427156469bf0790737b12d3b57e70fe52e8ddf7139380b30c46d7724b961b7c35c3a0efa097f
+DIST xterm-383.tgz.asc 729 BLAKE2B 144f78cde591454e09da11e98ba4b455faddf8dc2cba403c28cc02a9b9bd49e296be473d5404cb98a6ae420efd3f851bb5307f3a16cdcc9abe9ed93add4fece2 SHA512 5ec5ac94ac031a91d0ddabeb09afb1a72bf3f926f6fe7d840000729194923a7495463c0ff91f63a2bc920703ba07c0bb1b21a05c35a539a7b948eb42c574e358
 EBUILD xterm-379.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
 EBUILD xterm-380.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 EBUILD xterm-381.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 EBUILD xterm-382.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
+EBUILD xterm-383.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-383.ebuild b/x11-terms/xterm/xterm-383.ebuild
new file mode 100644
index 000000000000..175692654251
--- /dev/null
+++ b/x11-terms/xterm/xterm-383.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# bug #454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-icon-theme=hicolor
+		--with-icondir="${EPREFIX}"/usr/share/icons
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	sed -i -e 's/_48x48//g' *.desktop || die
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}