gentoo auto-resync : 19:02:2023 - 14:14:15

author: V3n3RiX <venerix@koprulu.sector> 2023-02-19 14:14:16 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-02-19 14:14:16 +0000
commit: 80c51284f0017d5765c7ae39207be9c58f4bfa17 (patch)
tree: f870412cb8771b0acdc3b28c70c09545bf034385
parent: fd089c26c06476b291a5255011ee378561c2615d (diff)
189 files changed, 1193 insertions, 1445 deletions
diff --git a/Manifest b/Manifest
index 9e3f46a17fd4..bad3d18d4e95 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29442 BLAKE2B 7a3492b1ea68afade108dd4ba813af070ed4606175382a3835522b8442fd38c4b2231622980622fab0b0314f4e817e23c58a4113c94861c8f4e2fda01f13bbc7 SHA512 8ee47795c239f52e289b0bd7a1fc7a66e21cfebc994e6b543eb4b6597bf1e9cda5be38426bc64698eb39cec3344c33bf55c30f4dbcf21de19fee8be8c21cfe0a
-TIMESTAMP 2023-02-19T07:39:40Z
+MANIFEST Manifest.files.gz 29424 BLAKE2B 40702ab749e5281886d3b90e03c0c446d5a8c1eadce3188ea0ff74bfbcdba86958137ee7df4f11e513d685c61608fbf7d2d3204e9cb9b03f35ec3a71e6bb863b SHA512 709a782a02f47ddc220ee21d07b3c2a03ecb61c92158d4187aa16164e0c950effacaf803792b3761b1e07e712eb64a10612e5751504471bc1d55302d8768f81b
+TIMESTAMP 2023-02-19T13:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPx0jxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPyJp1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAHYw/7BDWeRdYiTBw2dy/d6q/NOiUbnsriHpOjt6CB/9ojVGcT01JiGnImgYKk
-lbdfSW3fAQvnJJFZlD8nGOf7jtqpigZc+JB98fFrS76jxT322qbnnOvKDvKfodfC
-HDPkOfq2DSDQQxy1H4yG/yeKJTqgN1f3mE5ZL0HD2Ri9aZrE7jpx9CYprXq6Z/Wd
-ZvmBxF3ugccWqmy106SYre5ICmcvXCmBkSm5oIenBAVi9xWLuoVWRPfHIkhHFd3k
-JESYd7ZgVX0noy2vRZFwonqWJ4TnEG7G+zNpLJ93Z1Ui9qe0LYGe9G5IZg4JkiHq
-9P9+sdo8+5PkU+QR/aOn+mxCmYRHgMR3oj5FaiZEd8bkAghkG6EEt9fcA2cfzZ9c
-bBe/0rwlu5YW15fffvuL2gvLybAOFB22fXmKpyVUaqDxc7w+0Hl5zF6SBmOEtEpO
-WnRgfK8SW56ZvdAfmKA3Ayd4LebpRBPKChextn4hL4Hyj1t8xCNFGzGw2MaEoniD
-IUGm+f5oGfc/A6Jv4A8gwUGF9RLuXnmZBnoDv08FX7bc6Pahy2enucJjPnyOo+QZ
-00ue/Q2RgQhU4dVUcP9BMUxLJB2kS6TjF2AwdK/uqkqTgXzco2B3XF/stmNsX1xi
-6bBT2Gxi+lpDXjPwTarf6+S/FoMws0RmCvVVNN7FTyp1CrC0mBY=
-=gYk/
+klDd8A//RwA8wotEY2QqqXQ3NAbqUjSZR2Z3jKTjE7RvzLjDtONvS4c3rx7oeHAe
+k5elh9nxIXStHaCjcNZVP1uaUO3JZnxwToYQHRpNLBocDxaOUorGPXoWSrxACPQM
+q4JqOKCkiU4XHTwMwHYkB1Vs7u55pYOn/hSXm5/r55iCfMPedpUf+DBtKA0MZ9li
+xFUHAGoCv7JWc5NVe93PuHe7SErmGXjOlu0USuHSSecnQaNBJc/8w8JaAEEOq3Fz
+pZush5zWPd5Ya5329p4FQ2jkNUh1xYpVVvJU1Zt17VS+vzQ8gsvHGljzvJWtJlq2
+zMg4f8R93xoiLLyoD8WRWuADPX3uWWIrs8MnQmoFXrSJK59hcutfrTxsIhXTE5YN
+IPQRTGtK5H7kbCF94zv6Q+/p1D8+QjBn38zkZe1auu9YSuU8OC2LO57fk9WEdBOv
+pC9GUcwwbbWQTED0v8bueV8PIOH2lCL+DK0j08UDpofRW6kyV8gZJx7Vep49yuhn
+/SjuOqzMBjXjC/fzNTHM99YiiA3F0Fxz8K0JMzkvqN8LMjNCE3iXHOt4djivnIAT
+CJaR6R2i5u7dmAKB1A17LVqQV5DXTvJJGbvT4kCT6884BXMFjYibIeZUtYlxqVWL
+cfKeRDkgpwDIkGrERIS9whrVgst+BavcvqZASmbQc3yH0WyGu2M=
+=p8N/
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 72e444a4d1c8..56eb4ce1f481 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4d34263ea62c..f29cd65c9bda 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 844f9c5780bc..e17d06df7e8b 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -8,9 +8,12 @@ DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236
 DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
 DIST sudo-1.9.13.tar.gz 5093583 BLAKE2B a923879920ac5a3c71e6e898ecc9c1194f26ea5e0ac109a6163fbbdea02724bb0bc126cdd7ea0be2470febc4f978b00519adb2fbc2952706cd47bebcd48447aa SHA512 74c5f16a5be5823912ff239a85463b81e4463f27f7331ad2ea282765a3c21bf966310d73291014d8ca1edd4a745b012b77b1ea6099ba417ba577d76b32e40eb6
 DIST sudo-1.9.13.tar.gz.sig 566 BLAKE2B b6761e90025ccb78fe94e8152022fac74b8368b9975a4816ad1a60e9a3a5bb2a89915c55a570c1216e48ba4f1e00b08c86d84cf81e31000079d2e927c8ef5718 SHA512 045211021b12d3f7c3210be388c87a6a90391fe0b24aff567aa05b1d5431f03da852ce93e0eddc53fe3cabb5cafd46331be8f6d82efb367e5d51f46fb5017557
+DIST sudo-1.9.13p1.tar.gz 5096455 BLAKE2B e70545975c7570099100892121ae67686d6daa286d581a25cc0a574335c426e8cc3d5fe611525cb4d939a423cd9e7d836a27fb8d64aedcb79623ab9eb69488ec SHA512 4d19f06c4a592dac9a1a7feca6cc751093151af32313d9d579e2485fc6530a4340ec29cc2892b29dedf2a6aca3e91fb0bbf94bbfb6530f249c58430b83139044
+DIST sudo-1.9.13p1.tar.gz.sig 566 BLAKE2B 4176b56099394bbe78cfeb5846373614fa69d4bd84b446b714ef5d9a36307af71271df725379c3d013856fb077e7af55b377f6ea80e66b896f513a31ff633817 SHA512 df898199133082f4e9dd8e8f6c4c5b973e9d6920080ae72d6bf56247cdf2cb2c4d750b89535467e81d901ca1e09a806fa0618a7ae94ab137ba62f24257e0c4fb
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
 EBUILD sudo-1.9.12_p1.ebuild 7413 BLAKE2B 194be3b58af6bf18b65325ac3577427f493dee3ff26b03002203016b89f447b9250aed80e10f3dac46a5868cbda5d85bbae0b6ab57d95a656e18cd801d615b02 SHA512 5c82e0b52f4e3bd6381f6f910717d1f6522978332468942ac67359ded014ecd010bb16dae07f71f178c43531e5539bae1b17cd6ef45de77c61ea001a9aaa7e1a
 EBUILD sudo-1.9.12_p2.ebuild 7413 BLAKE2B 01eccb2c827cced39e5395355448123e0be8e94bd9adbe4ea9abbc1c9bd2e6c14a92069dd445823a8298be6989067f6d24db1bc485708ccf161b27ea8206a8ff SHA512 b31a539c56c0678d5be6040ff6764604de4ebfb021f387c83f497b63d05c81766040d4b552ad47c37be4ba71adfff460d0c5f4787130a7442aff59ad5d3a5ddd
 EBUILD sudo-1.9.13.ebuild 7531 BLAKE2B 136975803be86fd783804387b4c43317e2498a3a33ac52214bdeb8bdb1dc257ddf9abea2b2a63aa90c55b9d1eb48ff103e108528ab0ceb02359f577f2b1b379a SHA512 e57e6f06259d2bc5fe56893caa9597d049fc5c407efd24cbc681a29d5bb976166d69e9f66d04085b8d3ab05982a21d262b38b3d125a13aa2a03b9d5c2dd6c411
+EBUILD sudo-1.9.13_p1.ebuild 7421 BLAKE2B cee8094fde2c0433194af49bd6dfb66ab545bb6243a16800ac908df4c55e7d6e6166cd975897f7941c46b6d0bf459dfaaee18b49b613d0c896e98ec45a95882e SHA512 ad6f3af68a0e2a15f96012fca004e157a32d06b5b79082b174b4b21e145cd98f8edb86ec4bf93cb88293768e496fc44b6009518990bcfd92583d8f73e745331e
 EBUILD sudo-9999.ebuild 7421 BLAKE2B 9dfa40600141a49f26cfec28051914943fe0efbffd6e4b34d87c3f1e45dca65bca2f9a5d7584805b8411bb2ae4e70a2728525df893dce72af3484763bb9e92b0 SHA512 f392e4fe27f4df3ff162ea9c1d44ab91c03a63b5d65e6d60fceade321cb339395bd3c0cdfa9429e3c32ff90c992bdaa2118ca8b1ff485932dd85851f6d649efe
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.13_p1.ebuild b/app-admin/sudo/sudo-1.9.13_p1.ebuild
new file mode 100644
index 000000000000..2d77e6863bd9
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.13_p1.ebuild
@@ -0,0 +1,286 @@
+# 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 ~sparc-solaris"
+	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-misc/Manifest.gz b/app-misc/Manifest.gz
index 13e43d71827f..0089c71941cd 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/freewvs/Manifest b/app-misc/freewvs/Manifest
index e97f1467f04f..848410ebe21a 100644
--- a/app-misc/freewvs/Manifest
+++ b/app-misc/freewvs/Manifest
@@ -1,5 +1,6 @@
 DIST freewvs-0.1.2.tar.gz 20093 BLAKE2B de82188bd6be8e59490b3bb5faaad59466b1888603ffc3949662dc8d74fc7607a253a6779df0a87a66e09f204dfb754edd3ae4c7a8504687fa75ba9e880e0540 SHA512 a247cd46458886a4854c97a628218708a36e5c2e5e633a86651e9ccf1d7d4e1108d224234821b9d45199c471d46f2cb57600a8b1cf4a62d0ae98c6dfbb0dd64b
 DIST freewvs-0.1.3.tar.gz 20463 BLAKE2B 13fa629aeefb72f36f76ca3712fd0928681f05b88b96ad917138f8b745881135f82e8b467f59c9880a113b702e8fcb64e925066c57be5931afacfc7285c2af83 SHA512 cb0d00d4577be478136c470a7f80a667d2cbd73e516b168138bba95549b5f41025a1e11f39a214cf375b8b16ebc3334433976f63b30c100c0c08521d2c1e9c51
 EBUILD freewvs-0.1.2.ebuild 722 BLAKE2B 970a38e7405465340375ad279838b25c4f5fee90fa58d51e66999ac2215b6019ab4948352a111257b9c1152a288424760b131382998a9c2a3387a0a1da1a8165 SHA512 3d323af8932f84e6c66b27b995aba834124c6775879d14e64205f303924efdd91d1c6a0528dbeed8f97fae6563d94faee9735785cf50fb73f508b49171b9d5ad
+EBUILD freewvs-0.1.3-r1.ebuild 757 BLAKE2B ae4652016683ab3fbaf1655cdb6c5c3d24e608054329138c943daa7d5b8b69e33c7591288014ed78911a3968ba5d23da5883441b82dbb1daf02ff991ba828bc9 SHA512 e43e71f31c1419b181c6bc88c7dd9ce93fa95eaebabf457d69290fbacaba161879ad08f7971efe29f76180388ea5b876460045359ca9ef606b93c3a57d78cae1
 EBUILD freewvs-0.1.3.ebuild 722 BLAKE2B 970a38e7405465340375ad279838b25c4f5fee90fa58d51e66999ac2215b6019ab4948352a111257b9c1152a288424760b131382998a9c2a3387a0a1da1a8165 SHA512 3d323af8932f84e6c66b27b995aba834124c6775879d14e64205f303924efdd91d1c6a0528dbeed8f97fae6563d94faee9735785cf50fb73f508b49171b9d5ad
-MISC metadata.xml 217 BLAKE2B 4c798b28d6d7cb91ce9efa46084d222e24f1f62814b89dc32e8ee4c2d2e761392fa46cb368de68fdaf0c020acc5603a124b3a96edaa8e6ee333ba3f71ea59ad5 SHA512 83aaf1cf450d1a0769b0d5bc9533bb17e683dd88d04d3318da131cd1c8c66492451b9518f9f2b08d144ac0a2ba4113ed09ffaff1b7c4779f6c35bd7bdcabb874
+MISC metadata.xml 287 BLAKE2B d199b291e117d0f108c1cbe2bbe6bcf196290c76b0b4e84d4aa2ef665626ec913e49efd394779aacbf333d4bf9415d73b830a32e27999ef43389c25967ca389f SHA512 b2eab0a34dc745e133d3a6699d0a63ebf24751a7e5fca66f42536d6eb1a1428aae127680cf050025f40cd47954bc0db604d74845b34fc051142b9fc4a191118f
diff --git a/app-misc/freewvs/freewvs-0.1.3-r1.ebuild b/app-misc/freewvs/freewvs-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..a8ff9a29ba4d
--- /dev/null
+++ b/app-misc/freewvs/freewvs-0.1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Scans filesystem for known vulnerable web applications"
+HOMEPAGE="https://freewvs.schokokeks.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.md )
+
+pkg_postinst() {
+	einfo To use freewvs you need to run
+	einfo   update-freewvsdb
+	einfo first. You should run this on a regular basis to update
+	einfo the web application data, e.g. via a cronjob.
+}
+
+# Only codingstyle and similar tests, require dependencies
+# not packaged in Gentoo
+RESTRICT="test"
diff --git a/app-misc/freewvs/metadata.xml b/app-misc/freewvs/metadata.xml
index 4da67a4f4b42..29f8136298e8 100644
--- a/app-misc/freewvs/metadata.xml
+++ b/app-misc/freewvs/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">freewvs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 74daab20bce0..222c5139c397 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 99f04fdd0dc7..a1aacc7800ce 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,5 @@
 DIST skrooge-2.28.0.tar.xz 22505268 BLAKE2B 1d514d433a420f23b8320245b098ba8f320e256ae3aa4868d57f5dd03150fc3886ac769f72fc8937f11bc58c8be157549d58b8396a04fa067580483588dd2225 SHA512 593ae4a7232bc688d0119dc6a621c23163a6e4cc9d6f1da592895ab8d37093c3c65e482397558d8620dc33aab796481cc929ebb863ccba168dd3fd01bb3f091f
 DIST skrooge-2.29.0.tar.xz 22825768 BLAKE2B 7077fb27339c54f3bafb9224c30f7f22633d1318c7dd5aac0739fe24c0b5bf7092945ee30dfdf6ea03ea4ed849f79804f16c667e83e52af43af1bcedfdef7841 SHA512 7188ca3a5a9f6adbb0df986a08823813f71c7a11f184af19cbea88aa2ae4293269ad084487510676ab4095ed38c9fd951e7a31c142cc2e0f2b4b0077f84c5165
 EBUILD skrooge-2.28.0.ebuild 2574 BLAKE2B e4cbeccbcc909dd42a4d84d0da2fbd11e89dbd18d17f03f60c3abbbe2fe239d4246cad53649bf89973039551cee52752c9616bf12d2153429168c05deb07ffc9 SHA512 3efead096fb7b42f398b1225ae7217e3c4a36d303136918fae718a2a84736927fd5a619644874969b8d3c5a79180dfeb589d7cccdd7ad6339eeb8978bbb6742f
-EBUILD skrooge-2.29.0.ebuild 2584 BLAKE2B 77da49df26d434ec6224597fcd8502a8f7815430163be948580d9ef03b3c8e8a97e668e9985d4f85c13062be1aee3e071bdf7e7f5a5800170674c671f8184370 SHA512 6eaa7916f8cf23c83b8144ec0ff737d45877077d09c183bf2cb8ea55ce8f40676bf797ac301ca353b231973aed959d5d4f308c5db3e018c91224759c3f9ee57c
+EBUILD skrooge-2.29.0-r1.ebuild 2619 BLAKE2B 4741f9f0ddd50e6c345fecc19f91b2544c31edb161c9683af1b88db492891da36abc33ca85ad543d9d5e9e233fa7ff06f8cd68bdc741b88cadbaacb94e086d25 SHA512 19d5e8545e202fee774ebf50b54554ea9c5cdacda1318cf44f807ec958c0168b33c81705058180eea685ebc9d26e8f48a9d752a1bad8b326e4c8bcb49a349481
 MISC metadata.xml 393 BLAKE2B f192bb06b0b86aba02ffc2ade42d2e46927758d90759cb4c4c0edaea49e1aa82a119f073233b0028ece6a3ee976e942cb55becdf420d09c93dbb06230eedf4e7 SHA512 741040cc75c5a4df36ef09ee97fe652501754fca36884f52177936bd7b1a512e5f248e95a3e4c674918f56f76275c41899577b3621aa5e3fb97f18410f109c8a
diff --git a/app-office/skrooge/skrooge-2.29.0.ebuild b/app-office/skrooge/skrooge-2.29.0-r1.ebuild
index 4e57ea11d34a..55749ae39f62 100644
--- a/app-office/skrooge/skrooge-2.29.0.ebuild
+++ b/app-office/skrooge/skrooge-2.29.0-r1.ebuild
@@ -41,6 +41,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6f92ae5cb3ce..047ab0785ba8 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 098ca0937d41..5c90429540a8 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,9 +1,9 @@
-AUX tomcat-native-2.0.2-slibtool.patch 1099 BLAKE2B e5c294cd96747a576afcc4ad80d0a99d97cf9037d750febe681d3e4ee3cd1c3ef96b14e73829b90aa40ec85e6a33e69ce062eeed9a91a278a67ffca94f39224c SHA512 24f890d5b697a10c702f9149679df6a70ddcc663de3abbbffa863151ed655d17ef16b585ac9c6354e1d4c56ddcb920acc6ba9236095d50b96d06c17307734353
+AUX tomcat-native-2.0.3-slibtool.patch 1085 BLAKE2B a23d3756071916a550c8418ab1ded93077106313b399545c7e8c5c91201c4d61b5a8c4ae550f197b50186012d64c0be1057cb9099e762f72c3f1dea32f047734 SHA512 c0bb7146e41f4c2785d6675bd46c5c7ba9279119ea8d81db0271c9874d4da9c4d60d8df219adfe02d59d19f5be1be4e659ee3bf50475052a60d43c3d029487dd
 DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
 DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-DIST tomcat-native-2.0.2-src.tar.gz 315063 BLAKE2B c044a0b6ef226a038728d5c009a7415bc95cd4317bf8fcbcc0a0a9a9ee930c0c2e74cd6c028a92cc9e96c218f38d580c7af6599c3df35e9c677d1a382727582f SHA512 a0badfaa537dd8dc24901bbf2a11dbaab7cabe5c033eb9162daa5c748269c3dace08f99c0a477c0d0e051b7d226e2e2c6c3031ab7c45d007333cb53d72738c21
-DIST tomcat-native-2.0.2-src.tar.gz.asc 833 BLAKE2B 8368c96d6bff84c1281ab08699401286ce89adcf21ffda5d896e19d05f8279746070256612038c8b670b13e0cef4d43e678dfa785175b54b15aa68e33268bb29 SHA512 9d2e2c64cde1c1812192ad451610e32480ad005832e2b781f0eb5f5559a23730715ccf7bfd04937091bb6635b098badc61f73a926fcfa5ea09175d7a9fe0e002
+DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
+DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222
 EBUILD tomcat-native-1.2.35.ebuild 1193 BLAKE2B ce3e060b2f3d2cdaa88161e14b486040e452add5f499aaf3015b02a5c79564c281889fd8c1248f36b0f4069d472215ca8e8e58525e038b65c56186b7e7323b82 SHA512 42fbee312e571add71350399e3768b3856ec4f3ebf7a60dc1a8769f417114414cc9001ce29c7731c332b60eed1ad408c917e99975ba761707c5325231ab57710
 EBUILD tomcat-native-1.2.36.ebuild 1194 BLAKE2B 85ceafd1111a3cba29edf38c638ec33d68d64a69da15c06ba8c0c060b2353c1cae1b4d60aacc6cd19af34f557dc66d98f90c157e4c31ca4602aea0b7fd27f27c SHA512 c532e8cce0fd7b628a6602d01af7123d2c9dc87357ceb418dd54ad7546924d409f7b83e2351a8ad1d0eb1b4d9d9221ef5d0e69d3f857fd361aa4439252c6eb3f
-EBUILD tomcat-native-2.0.2.ebuild 1719 BLAKE2B 37404ca16bddb1af928d4d6defd7e69d31970ef12960e7a5fb5ed8071227a884d0dfd6fe8b2c4169a1bc270ab7bf50b23bc1103ed9ad3af13542aa0aa1a0c55f SHA512 d88ecaa32c6a845f8a9634d1cb590a4550d5404f55a474ac7b39a5a6a42ed426b47c279694e0afb35a9b788e7a77d12c2e8c866d94984a65522e0cc1d0db952e
-MISC metadata.xml 1096 BLAKE2B 5927d60847798f2e90ee40af5947bf0fec8a2a9a9b98730be22a4471155f9a627aea8f52d4f8cee6fb6b77457c7977d0aea025f2e5eedd938a64787ddeca9f29 SHA512 bbd9ec012b1b50b3c4a5967068fb2901dc184e18c5b9a8f545ff396fae4c198daeb2c5d09a377e0adeaa76580ca7c87d5b98f246db6ce83fd58d52502dc3f006
+EBUILD tomcat-native-2.0.3-r1.ebuild 2169 BLAKE2B ef455d4fe17957c4e52c38fa3946483e299b80b49106a586f0b43c96be9b57b886049eb2d42c41b7a77b85c04ad88ce8f36f6af8ce5b309b90041f3830d3638e SHA512 0bd0176625f1c10b9b7ee67add2a35a5f1df7195590c8b3d6c6c22afc5d298d069459cca951e2e3108735f370cc2de218b9db9a1d4be332dbebe4b4fd6963d88
+MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
index e0378669aad5..cd090afb9854 100644
--- a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch
+++ b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
@@ -18,8 +18,8 @@ Gentoo bug: https://bugs.gentoo.org/778914
 
 diff --git a/native/configure.in b/native/configure.in
 index 567894b10..e082ae6d2 100644
---- a/native/configure.in
-+++ b/native/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION)
  AC_CANONICAL_TARGET
  AC_PROG_INSTALL
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index e07558c04674..1989b45b9137 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -16,9 +16,9 @@
 		memory, NT pipes and Unix sockets).
 	</longdescription>
 	<upstream>
-		<remote-id type="github">apache/tomcat-native</remote-id>
 		<bugs-to>https://tomcat.apache.org/bugreport.html</bugs-to>
 		<doc>https://tomcat.apache.org/native-doc/</doc>
 		<changelog>https://tomcat.apache.org/native-doc/miscellaneous/changelog.html</changelog>
+		<remote-id type="github">apache/tomcat-native</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild
index 5874a906ef17..e5d555c68e08 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild
@@ -3,41 +3,56 @@
 
 EAPI=8
 
-inherit autotools java-pkg-2 java-ant-2 verify-sig
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit autotools java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
 HOMEPAGE="https://tomcat.apache.org/native-doc/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc  )"
-S=${WORKDIR}/${P}-src
+	verify-sig? (
+		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
+	)"
+S=${WORKDIR}/${P}-src/native
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="2"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="static-libs"
 
-RDEPEND="dev-libs/apr:1=
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
 	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
+	>=virtual/jre-1.8:*
+"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
 
-JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch #778914
+	"${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
 )
 
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+
 src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+		../build.xml \
+		| sed "s:\${version}:${PV}:" \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
 	default
 
 	# Needed for the slibtool patch
-	cd native || die
 	sed -i 's/configure.in/configure.ac/' configure.in || die
 	eautoreconf
 }
@@ -47,29 +62,24 @@ src_configure() {
 		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
 		--with-ssl="${EPREFIX}"/usr
 	)
-
-	cd native || die
 	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	eant jar
-
-	cd native || die
+	java-pkg-simple_src_compile
 	default
 }
 
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
+src_test() {
+	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
+	java-pkg-simple_src_test
 }
 
-src_test() {
-	java-pkg-2_src_test
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso .libs/*.so*
+	dodoc -r ../docs
+	! use static-libs && find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/FP16/FP16-2021.03.20-r2.ebuild b/dev-libs/FP16/FP16-2021.03.20-r3.ebuild
index b9dca4b566b5..4e21e1d10fc3 100644
--- a/dev-libs/FP16/FP16-2021.03.20-r2.ebuild
+++ b/dev-libs/FP16/FP16-2021.03.20-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-r1 cmake
 
 CommitId=0a92994d729ff76a58f692d3028ca1b64b145d91
diff --git a/dev-libs/FP16/Manifest b/dev-libs/FP16/Manifest
index 534c54d5699e..374dde880019 100644
--- a/dev-libs/FP16/Manifest
+++ b/dev-libs/FP16/Manifest
@@ -1,4 +1,4 @@
 AUX FP16-2021.03.20-gentoo.patch 1876 BLAKE2B 56863806f1040c5a92e04f7cf120e2ae4e4e6c59b336bf8734d0b0945e29d17afb5c244e94fab6023567227878b72e73d3c8d669e4af311bfc703f545b82d847 SHA512 0ac6379a5d92a70df72c4a0bce0d437ebb7733fa6f61b0006cedd007f9c071c2b7c9727cd559c39c08a8528f29c2d96397b566512eca6fa4c5a5d812085125cf
 DIST FP16-2021.03.20.tar.gz 71228 BLAKE2B e598225032324ffe38db9002e8397e67a713b6323ac57408e7e39e146826b2bb1dab60cd75181a25b1b07958463e3913bbf0e53b23803e53d472fda66b8ba6d5 SHA512 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1
-EBUILD FP16-2021.03.20-r2.ebuild 1175 BLAKE2B bc72dd0feee810add4ea5586074ac33175735d11d0056ce651f097f91ca6115f77a50e257811bb384bdbfd5d7b508eb3e1f4f05d463d4e92300f5920226b5c04 SHA512 dbf1124e5d5c2fab71270e3e43a75815c270a9b60c4e85d4a5eef106683bc09164ddd189c39ff07fda58e06841ffada072457ba19224f863c58613cc1e908129
+EBUILD FP16-2021.03.20-r3.ebuild 1176 BLAKE2B 21cf4ec28dc0f37f5415d02e89287cdcc601f248c8f150c9601f58f21bca3536c328e75c20d6f3ab2c14f8a113e36c42f69a447f7474099a34e960c8b6f65d89 SHA512 d953b1dbc3badd93de964bb39ff3d07a4c706eca776d1b63c3517d84f41007651b4c35c05254209ebb5cf202a1454484698422e389526adc5d4b04666fd4b2b9
 MISC metadata.xml 329 BLAKE2B eda810b21ca05e2e16f2eafac194cdca189d27449bc9322488aeca215a9b2c10ce68145abab1abb984e290ab6ca8ce21c3beaf06ecd76d7574fd8b82388f4e63 SHA512 27ca59c0862f75f24dc64f9af5eee96cf63ef4bd468e17f5d04cc23289dbb5c44af9b230707ad13d1ff85e75db4d5485d7226c9e6d80e8bc80d9e6f3b2e18acd
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index aab922946073..f3e7fa1cf217 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index bb623fc1ac0c..1ed59096451d 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,5 +1,3 @@
-DIST link-grammar-5.11.0.tar.gz 4672430 BLAKE2B 35892e05805a83ebbd700611d19aaa9ad1ede4ba3baf60c85ef8e5abbc40134fcb71d9cb9f41518f663c60ad11aac7bd0b316c8c95a12631032f5ad79564d686 SHA512 6a24bc8d5c9f0dd63460c092fc46880503018e949aa277148f8f551d6cc9d929d3a981eeaba00afc6e618c1e4505438d0c7e9a57dfe7a8deb7d3a8f183c56636
 DIST link-grammar-5.12.0.tar.gz 4688144 BLAKE2B 3ab74bcd23118c1d933895ac5ac8f042448f173234db1528de496e2f4aa88cd9b96d4783e54584f05d8af5bb835fee1f62f039ed883e2b24511198526d334dbd SHA512 1938e53a2d8bdb5d0c352e9bb7108b280d3c4da890f540f41bdc257eea1ea6de5712f99602fc0f4187654540e1142b5216efb2a8c9957f32ce0dec86d85ec3cb
-EBUILD link-grammar-5.11.0.ebuild 2783 BLAKE2B d730fdb43ecb501e2161448874818f420a606d1c1b97a86205864f37145c3811ac9d154bcef2181a1679402210d1d321f0b7d9c4c5700f9dc0629ca585776d8a SHA512 8beae468767a3e61216e3f1213c0a38c7f665b73b4581c3eaef48e2bb4680f11f226ad05bd8d34a7e1e8728628d9484d1afc263bf7c296e15aeb78cd71630792
 EBUILD link-grammar-5.12.0.ebuild 2783 BLAKE2B d730fdb43ecb501e2161448874818f420a606d1c1b97a86205864f37145c3811ac9d154bcef2181a1679402210d1d321f0b7d9c4c5700f9dc0629ca585776d8a SHA512 8beae468767a3e61216e3f1213c0a38c7f665b73b4581c3eaef48e2bb4680f11f226ad05bd8d34a7e1e8728628d9484d1afc263bf7c296e15aeb78cd71630792
 MISC metadata.xml 1197 BLAKE2B fac6dd40856d97100ee06cdcd340e660bb2ffe527df31983165beec9d194839336dfddb54be33561560ac2c79d8bad12809eef53abd4059b7c74b7494d728354 SHA512 dcb16b8afa977639e3fe8633762fc7a26d8ab095da15d630bedc6ba65e4c82ec5f0bedbd564b6ad0490790723c0a04065a5cab536aff93cdcf8eab5f1a2d503e
diff --git a/dev-libs/link-grammar/link-grammar-5.11.0.ebuild b/dev-libs/link-grammar/link-grammar-5.11.0.ebuild
deleted file mode 100644
index 5ad1ea313547..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.11.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
-IUSE="aspell +hunspell python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libpcre2:=
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		--disable-maintainer-mode
-		--disable-editline
-		# java is hopelessly broken, invokes maven at build time (bug #806157)
-		--disable-java-bindings
-		--disable-perl-bindings
-		--enable-sat-solver=bundled
-		--with-regexlib=pcre2
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
-	)
-
-	econf \
-		--disable-python-bindings \
-		"${myconf[@]}"
-
-	if use python; then
-		python_configure() {
-			econf \
-				--enable-python-bindings \
-				"${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-my_src_compile() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_compile() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir python_compile
-	fi
-}
-
-my_src_install() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_install() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 54ac4b76ebf0..bb3d97335bb2 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index f408905a6581..1c9aa0643b6c 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -17,6 +17,6 @@ EBUILD camlp5-8.00.01.ebuild 1062 BLAKE2B 0bee5ed9c04774badd219a2c1c3b54a4d4c17f
 EBUILD camlp5-8.00.02.ebuild 1065 BLAKE2B 4b8c725e5207d7fcb7515f4be18c9b5b65e066ce227dc08697b314632d89c61565ee5c4e49eb37df58cc21773fdbf4942eb7aca2d0314282adadea5f11a084a9 SHA512 1de1e5851cb7cf96e584c9443926aff39b413b413b442e6e05a5ab2da4040d415a85885f0cf38b452022f99e48cb4b2b1bec4c5ee43410a0138d69ac882dc1a4
 EBUILD camlp5-8.00.03.ebuild 1032 BLAKE2B 1bd1b75aaef3c011d8e849207957fa79f9b9088c882d08b66bf6597d99fe71c030c8d943b95c3826406868d4ffba0892053c92fbdeb7977a7ed9db820a8e819b SHA512 c7f80dbbc27e8b540f6a53ac19dbbaa51f7c7a54ae752914beb447718d4bfefa0b735ba430ee66584eaa70b2cbbc9df97fd259bcbfbeb78a0f4ea2fef3e9eebc
 EBUILD camlp5-8.00.04.ebuild 1032 BLAKE2B 35b0f15291ef3f3de4368c33d6ffaaab55fbb2d610c2ffc60018f1f01564dee7d387c42a593d5c85dacf8a5fbca6c3cacc4cd7e5930b0e041fd60cd87be92a63 SHA512 09c9a343cb13bbdce92a3fab926de20eb043868d658d0c7adec48d63244acba4f1bc28cf30daa8021f293d69f2c375b1aa4cb5f95d4bf6f9dcb0497aea350eef
-EBUILD camlp5-8.00.05.ebuild 1043 BLAKE2B 297e339c5f999478efb61e79feac5998b3df4be285d82f79ea661c2169449c5e01d234ec987d97250254347f709c65639fda6628a1748b3e1eefd7da6808902b SHA512 5062ec847630341a82092cc38ce4d9682fe4b405b384020e28c4d80a5d4044e9e412df234b63936a70ccf28949b87fd103557ac6c2823efccc2070eeb8aff89b
+EBUILD camlp5-8.00.05-r1.ebuild 1057 BLAKE2B 90926568df8183b4511331431e41a5cb5bde6bc417b790a34836c6cbc34b13d4f7c585719504ee6adf989d27096478ab4f338b9ecfc1c8b36b2c859e39813e87 SHA512 96cf5884b4ce43bc8017edf3d7f893d67a0e1aa39748b3480d0b0a8515178dc51a70b312d94d48cc433f1004e38716290e16cb7de34c2b00a4e57085c0b4249a
 EBUILD camlp5-8.00.ebuild 1065 BLAKE2B b89352f90f3a868c7cbd615815c160c1b01fe6b2c3a0b224ee10d72f777006376f5ab1010d72244df84b7f5633c1bbf86af8a918497b3d3e103388d0f0e34932 SHA512 8404c5d01f7f0d291de0a49952999cbef1043496da88777ad6efb9dcf6e2a39fe10f863e0d5f60a9ed704f7b7206b11982427ee8a8e177db2ab6b97ccf79e098
 MISC metadata.xml 416 BLAKE2B a354d5be50f3c22d734a960b5dac99af636478ff44b6fb31758d879ab4b31be5a64993a3cdff8fdaca59c7682d4597a73883c137679ab7817cbfd70869cb2a41 SHA512 b9eb28bca32dde11e1b266526c2381ac8c4bab983d9dab5f84bfffcd684e3c0525afce1e72d0fc7b2369298679a4c859a215ccaf6b223b6fcdf6efde12975fc0
diff --git a/dev-ml/camlp5/camlp5-8.00.05.ebuild b/dev-ml/camlp5/camlp5-8.00.05-r1.ebuild
index adad633b99f9..adb4094a4b81 100644
--- a/dev-ml/camlp5/camlp5-8.00.05.ebuild
+++ b/dev-ml/camlp5/camlp5-8.00.05-r1.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="
 	dev-ml/camlp-streams:=
 	dev-ml/rresult:=
 	dev-ml/bos:=
+	dev-ml/pcre-ocaml:=
 "
 
 src_prepare() {
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 1dc760a1630c..66c929f4888b 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,3 +1,5 @@
 DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
+DIST pcre-ocaml-7.5.0.tbz 41158 BLAKE2B 6bd16345bd915c236d727daeb5862c2aff677c394f10b4d040ce46003255f3fd5589801979cdd77c20d8ba4fceb443467cf8f38a379a86fc59ca513e69aa1b79 SHA512 be60f13ddb6bbfe20e30ca5d92434d85e1d1371479e1e2c725588af83fcc9366ed0435021b6a800c20336ac521f2134c767420136438684656a44ac1f9924be4
 EBUILD pcre-ocaml-7.4.6-r2.ebuild 724 BLAKE2B d699ebf384cd2b3a0a8f3373b09f6c273cf8b4e9f56ec885560c5cd13ecfff80aa0755aa0ad9b514ef3488bb129dd7d426c8f0d2352666b8b760590bbbf79958 SHA512 d45352e53ac327f3a5cd8dce199f8671c315b0d5ad6e087a1490577170937d534c6a15f23e96b5f176873a16c79f104454c024088cfdac6e311ab8ff4f2c7e28
+EBUILD pcre-ocaml-7.5.0.ebuild 749 BLAKE2B 268a9a0ef646e6a9227c32f95ea34a31de05448cd691ddf87a6458dbcdeafa1fadcae3aab2cc97e40f3e0e50a74e63023ac1e8bc34efa8f4b7337fc503bf3ca1 SHA512 03d7437a5c996649337807e874a7b2d9eb90c5adccdbd24a3847a39c27afede0d441c4e8152a076f3bce845b4b9f8f8d20d3f34ce8bab956a77250af016f0054
 MISC metadata.xml 387 BLAKE2B 3cc3f72757575c7ef774afb844b7ade41a0fc8e5679e0679143f8a0e36c55b26c056962075acccd91bdf77b16a2068601d48ee21573ed9e6e9e162a1fd46cdbb SHA512 f3c7c2cbaf4fab907509c97d3638718604905da35896ffbd14772e03ffdd45b08faacb0a0efe93cef4b27875fa0c27712a6f3c1e0d75cf6cc6416d9378573c50
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.5.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.5.0.ebuild
new file mode 100644
index 000000000000..8351c029f26d
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+S="${WORKDIR}/pcre-${PV}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples +ocamlopt"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-libs/libpcre-4.5
+	dev-ml/stdio:=
+	>=dev-lang/ocaml-4.12"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dune_src_install pcre
+
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ac3d7028512a..7b94a3965194 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PeachPy/Manifest b/dev-python/PeachPy/Manifest
index 50c762ce91fb..e54727203dd9 100644
--- a/dev-python/PeachPy/Manifest
+++ b/dev-python/PeachPy/Manifest
@@ -1,4 +1,3 @@
-AUX PeachPy-2021.10.13-gentoo.patch 457 BLAKE2B 73fff8ade853b5a4e8d02bd129a5c8a18a1f5b5516cdc4a5ffa4d114b8deb07cf1cef450b63e2db7dd3888b2afbb81a541180a785af6944e79880be03d2a69e0 SHA512 64c4dc1ebe5ec4166bc225bec5d596ad59e2fa162cd7037e83e2d72bded38d79d0d69534d8163a92a9ad9d845d75f2396a53328a8287c5df34615902c7467c0c
-DIST PeachPy-2021.10.13.gh.tar.gz 248855 BLAKE2B 5f8e7845dfa7327c62e6a953505260645ca29dc762dcb3ffd971a6a07c81f259776286c12c2147e980ae43f77d3ce060a87201e2189123290845f6543c74775f SHA512 c6370de8da9152e812702a3bb53592cba89ee24fdfbeaa87d49374bad7b2d79c60e54bac17a29d861f5881f4ce076f2fe96bff378ef31bdf3cbc6bc5093f6f3d
-EBUILD PeachPy-2021.10.13.ebuild 765 BLAKE2B 2ec8db711cfb8a90c5c8f53804a58887122d3ee2689e33a5b5b2988eeec87b2d3b3f099a2d7c6f9e91c4fa8c7d297cc4ccf213bf03d1c3b651b5928d10f63ef9 SHA512 f28bce281da816afd8f7bfaabfeb1b357b767b4528e386a9d7576e467161f8e61cdbeddb209412b0bb6d717a675e8da93897d7e74219217a05bad7cea11272b1
+DIST PeachPy-2022.11.13.gh.tar.gz 248834 BLAKE2B 508100af45ee2868637c9f2123d835b26a6f8fc4fe880302ec273e19f95b855c667e30e1a31a23dc621aea57b3bf1948d9c2339e35dee55d46d3205d2fe93f03 SHA512 adda0e1c2e417792d0799f2fb5fa92636eff493e83dacf38344ca4a9fe37344bbb73228409cdf8680290ea7f374025f8b23bcdce6ab67b5329ae4a2acbc1cf4f
+EBUILD PeachPy-2022.11.13.ebuild 720 BLAKE2B be4caf995a640a74662cda8dd1d5ba88841b50b861eb3fc1eed227b94f38b6cec1c19f147c39163767e3597d074e809397e9eaae5c656692fe266bd76e4cb3ad SHA512 11340c1cbe356ce58c054ae83283035cea28e7546494407f7d95d120adbd6632fafe7e55fd8488fcdcc087a5843789ba66a7361a42bf0ce41a47c63b24820551
 MISC metadata.xml 377 BLAKE2B 53a5583779da97472edd89c93fe441309a28c430baf58cb5bc665b885b74077908ac52d3f6aca8363ff688fc7994ae5caddfe2f7d2e6c7acd35012d4158fd018 SHA512 3e9f04f38a4784165e63f07817c2a9b7e9fdc4399b17887f7250bdc1c9177dcb7b0fa144ca2faa60e95555e87889a555cee229f6b3b4e7b413ff494f525a5557
diff --git a/dev-python/PeachPy/PeachPy-2021.10.13.ebuild b/dev-python/PeachPy/PeachPy-2022.11.13.ebuild
index 22f7d19818fc..493cd83fb3e1 100644
--- a/dev-python/PeachPy/PeachPy-2021.10.13.ebuild
+++ b/dev-python/PeachPy/PeachPy-2022.11.13.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
-CommitId=257881e0a7ce985c1cf96653db1264bf09adf510
+CommitId=349e8f836142b2ed0efeb6bb99b1b715d87202e9
 
 DESCRIPTION="Portable Efficient Assembly Code-generator in Higher-level Python"
 HOMEPAGE="https://pypi.org/project/PeachPy/"
@@ -27,5 +27,3 @@ DEPEND="${RDEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch b/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch
deleted file mode 100644
index c5ecab041a76..000000000000
--- a/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py	2022-05-15 19:33:42.938456878 +0200
-+++ b/setup.py	2022-05-15 19:33:57.869231488 +0200
-@@ -35,7 +35,7 @@
-     def run(self):
-         # package_dir may be None, in that case use the current directory.
-         import os
--        if self.distribution.package_dir is None:
-+        if not self.distribution.package_dir:
-             src_dir = os.getcwd()
-         else:
-             src_dir = os.path.abspath(self.distribution.package_dir[""])
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 16b712201313..f52d5dcaa59a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 35e83952b558..425fee901aca 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,8 +1,5 @@
-AUX qtcore-5.15.8-fix-crash-w-debug.patch 1427 BLAKE2B 3ef8d7e4fcd2969e6ce3931e0bd07fe7d410d18834bb2de7a760949dd4c822bb9942a4245d720a2736c4927ea536bc0a41efe3ac7e0913dd9b7ca35eb27d313b SHA512 dfdd1f30057498b0f3043faa84fda1239b17ecc02c3838a329cad46b157e91cb2cbbe488eeeebd761b0449e4c045e8a47e7354d081453bf6fe7f35a6989f30da
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc
-EBUILD qtcore-5.15.8-r3.ebuild 3105 BLAKE2B 6b287f8b99fc9aefd253cf94ede43040b21d74c55620c82c92f7b53d14bf7413c44e6f4e5f29594478fdf9fb9dc68d0b1381e3349ce4d8f45ada43574c8e37ae SHA512 734f1e8eaff2b2369de60f106e7d27ef067d8d406ce8abf22e79974a7d54272f7dc98b99f9c164e96a8e45fddbb1f6ada4fa75c1754e4a63ca47996e0212d46b
+EBUILD qtcore-5.15.8-r3.ebuild 3101 BLAKE2B 8210baf74e0b5540a0cf5626a343a71486bb916e5a8d233b9c73598a926fbf018b48fa489ec60f7219388862bdec0af1aeb3ec242ca768eba93c07cba97f9ed1 SHA512 535109e632ff78bd42cd468015a4622d67a230eddd03bf9c970dad50b4fdf52968bb99b5162fbc510bc2e5ff702cfe4b7911ecf2342013efdc82949995d62604
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
deleted file mode 100644
index 74f5ed5c4886..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 2 Jan 2023 12:38:02 +0100
-Subject: [PATCH] correctly set up ref counting in
- QThreadPool::tryStart(std::function)
-
-this function was inconsistent with the QThreadPool::tryStart(QRunnable)
-overload, where ref counting does get set up correctly. the lack of ref
-counting setup would later cause trouble because we assert the ref
-counting state all over QThreadPool. to prevent failed assertions we
-correctly set up ref counting now.
-
-this change is not applicable to Qt6 because the ref counting has
-already been removed there:
-https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670
-
-BUG: 449688
----
- src/corelib/thread/qthreadpool.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
-index 40cc646519..8aa06a4c8f 100644
---- a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function<void()> functionToRun)
-         return false;
- 
-     QRunnable *runnable = QRunnable::create(std::move(functionToRun));
-+    Q_ASSERT(runnable->ref == 0);
-+    ++runnable->ref;
-     if (d->tryStart(runnable))
-         return true;
-+    --runnable->ref;
-+    Q_ASSERT(runnable->ref == 0);
-     delete runnable;
-     return false;
- }
--- 
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
deleted file mode 100644
index 75b9d56cafc0..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-w-debug.patch" ) # bug 889160, pending upstream
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# Refs:
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-	# https://bugreports.qt.io/browse/QTBUG-103782
-	# bug #847145
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		# (Qt doesn't seem to respect CPPFLAGS?)
-		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	qt5-build_src_prepare
-
-	# workaround for 0148-Annotate-QMutex-...patch adding a header
-	perl bin/syncqt.pl -version ${PV} || die
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qmake 5
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 5824b581bd83..3b65d3d1fa82 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index f3f07137d8d1..9fc1efe539b7 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
-EBUILD qtgui-5.15.8-r3.ebuild 3840 BLAKE2B ed66d1e8e9944c13475e1e974717744d041100e6839229778f56eb0eeec41e83e83aff76406978511e43f0a4cc5d1cecfec871f55d30c279552b97532c172b35 SHA512 d238c45f839673b217c59657309df4e3835445f2956a9e25f147b6c0d0df3314d20b60ed3ab4069accda06b9d3f070df798b80c57b24f040f09679567253a256
+EBUILD qtgui-5.15.8-r3.ebuild 3836 BLAKE2B 6b35db18970ba14fdddfaf066c32d4463572e95e3210993a364cc32b0f1c7e88340efcca888bb1e6a49cddc84fc837c3f22b836761a5b8bd733b2eafb01e3859 SHA512 580277345d941089306cf416d143ee0cb6c03b83d9a0dd939ff4e66c784fcb1ef3067a3692b50d1b59453ae1ad5d269aee5d1cdc3be5e206c6ed4cdb19cbb454
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild
deleted file mode 100644
index d86e9c417ad1..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.8-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-SLOT=5/${QT5_PV} # bug 707658
-IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
-	linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
index 5a8fe26b7235..920dd819362a 100644
--- a/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index e418edce9054..36ee47295b47 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,6 @@
 DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051e4bdd6e2cb62f59dfc386d3d888071bab74fe818b7daec46baf9f9cd7d8bfad3e179c2d2c811e983008a7451255cf450f733988f3bb8 SHA512 68da3c1ee6f33dfdadd6e1ec7bca6a7c0f16671ebed232a4c12aac4d4fe2e61295901082362efd0b4e69c5576b35370a92063630da251bd71ff7d275825400d9
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
 DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
-EBUILD qtimageformats-5.15.8-r1.ebuild 700 BLAKE2B dc1002ce7aff97a6d71ec773c0e777f3f85b9a70729614537c491c4cb821d273aaa9f3868ea04fe5788e8fbfecf20c2a1710794d534a96cb9348c287f1a016ce SHA512 21fd2b4940025e2d15e2871d3bd0f9413878b8cccf8a9ec2dd60cfd0ec34defbb3cfba9e6aa903442f8f7f46442e0af732b67b2ee1766d26bd78bdc26da96dd2
-EBUILD qtimageformats-5.15.8.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
+EBUILD qtimageformats-5.15.8-r1.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
index 885404f80c86..c546fdded876 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8.ebuild
deleted file mode 100644
index c546fdded876..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index bc8293c57ae8..3a0295b582bf 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtwidgets-5.15.8-r2.ebuild 1204 BLAKE2B 7a65f8330027039cad45d002c6b3eda04ff7fdfe82d8dd96230e49c179adf0864293c13fb2e1a1aa48214f97297bfebb7a40bd8a3e6b5a0784a94cd234d9385e SHA512 219ad10a661eb64f1b01a99ea8c43e6efd8a7748810a68fc1e6c1be2c2fcf89a989d88007907f452534d9fa058c1ba28c88fdee7f62a2c9cab71e22860f6c7dc
-EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
+EBUILD qtwidgets-5.15.8-r2.ebuild 1200 BLAKE2B 81fb29cbaccc25e1ee0a094551410909e1869ee23c85d1c86c05beb0c9f93046a1672a7619ba4a41fad91f59db5e6cba250d82263a57c960695cd69d5c713b60 SHA512 95a331bbaa646d7bbf48a183434300a64e887cb51a1c5a3bf2683267d4f99d479639fe394d043dfe00996933382c2c7f2f886638c9d9dcd404085138ae5bf2ca
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
index 7ac1a76bd499..41e6e38727ff 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8.ebuild
deleted file mode 100644
index b05623690f56..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(usev dbus -dbus-linked)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4390608dd5dc..244975a85aa2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index a553518066a9..c36a3ddfd0f1 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,5 +1,7 @@
 DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
 DIST fast_gettext-2.2.0.tar.gz 93511 BLAKE2B 8f4a8b169533194a82465ca29b4cbf52e9c724b9976355ad64459826ff9ad15da9762c6e90e237fef046fc6a8114abf54e0022eec573abf98a56bd067e7c06dd SHA512 06daacf46e4c8ef272ac2a60f8fad1abbb3eaa2bf5242991e7f32fd87e911917b6baf4965b0cbc96c11d0be0425585d501258d0c1faa065469dea6c3b8c97797
+DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
 EBUILD fast_gettext-1.8.0-r1.ebuild 2053 BLAKE2B 44401de39e9758cc2e32fd821fd04fb20c228677291eaaa30c8874a7d6170439e2a191e8df1958a91237ce8d57d9f3fe7e2a7c15f6741f1e1745fbc1d554734c SHA512 311304f468c8af7816faaceb4c0e8fe85aedd34edcb7702fe2b291c825fc962c968d09f0d5be47531b2b701ab866006b02fe281e1d9cb50576beefe245292514
 EBUILD fast_gettext-2.2.0.ebuild 2209 BLAKE2B 0502c21afaa161370bdc1eebb47a751515dfa4059fea7773b41fe239ac3108140828d142c8f95ee61fae970295ffd8c689e7e38768ac9668497ae76f41962aec SHA512 8a4d7d002b575025671cdbd2e5dd19a0a705ffd961e20cdb5de86071ce74a4c702a7001c01b3d7796c4912cd5b49021d1cd863e58bee9f78fb1ccd12ab10abfa
+EBUILD fast_gettext-2.3.0.ebuild 1723 BLAKE2B a1948826a08113ce198eadd91aa3ca1124d3be9d0c3630ea38a73e66bc0d748f1e09e403d6e7b4918d4648696ca727919246b578f7341bc536a5692f8af81fec SHA512 eaf5bb20dc9380503a0ff8156d02a91f87d57e1e15d07c30d33aa146864c4b7c36f647504e2dc2ed5de192a904b3fc9810e3a3fde12fc74c3e1c7698860f984b
 MISC metadata.xml 347 BLAKE2B 4e31a112651c27ed99d38aa80ef658f244f365711abef6b17a30a89a39b1b86c183529aea6332260a424aa4024a43ed9502ba4ae9fd00e33218ef8ad3c9b9275 SHA512 d5284171ff8ee29ff612e0cdb406696963a90006d350e549ae09bb9d596e305b1901c6010c832f20071b91624fb5958575499b64561450e456890ddf64741ed6
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild
new file mode 100644
index 000000000000..eccf3ea5496c
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 75a1a78d97c3..cccb3da8b4d2 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -4,5 +4,5 @@ DIST net-imap-0.3.4.tar.gz 103226 BLAKE2B b08ee0ad9ad788c1a58e583b3e71cef6e13f6c
 DIST rfc3454.txt 138684 BLAKE2B 56c850a7f5782c1447ae633ad9a380253b97925b9edeadbeb9001f4905157c353db967125dfb3bfef1e1bc2297142e5db424cb3b1325837ab4bb05db1f0f92a9 SHA512 79a85fede7df9202cbaf3fbb0bd59d951352c56208da2adf0baa5571ad92fd2153a6348000994b733c8a1bfdc93c38c86ed33708ecdef8571f20f906564384b6
 EBUILD net-imap-0.2.3.ebuild 947 BLAKE2B c2d17b88c241492554716025ddce7c745bce1f3abb6a9f9ef80495b9be1b25b222932ba580cf446fca902c6dfd9fab37047054d71009f131007867f879d9b30f SHA512 d0ee56ed5de3399091824041da4a50b81ff133925678035fee8abc21fba134d74681b95e0f5bf8cdc6c45e00da88a64e5d08f8182bbe9c6fe62ecc1dd100a6d6
 EBUILD net-imap-0.3.1.ebuild 968 BLAKE2B 4f335ab644938525da68af7de976228185c764be8d61274ef80595ae601c7586e8ae1c1f34e2c604ba7c0030f8a1cb7b786c16b3a79c1b8cc2fb0e484cbf7322 SHA512 3a8bc6436a9cb455140bfa9e02c90d455302d052002f80fd7a184f495fe145a173ce50f27f07c4eb1e3ac12844cc7f14fae04ce5c4719f5477099681a44b18d5
-EBUILD net-imap-0.3.4.ebuild 1099 BLAKE2B d643f32886d178ed397104bdbf73b6f6feac01171ce2941a169bf5bfa9aaddaf55ff9c468cad5871e736c0416914bab99524cfcd50935ca633a367ecf8bff00f SHA512 b65d06cea810ca0cdd0c71587a09b908932ffffd3e3a9fd85dba96a34d16df80e74242a78aadf613bf103bad073f2bca54454fec9041266ef07740dbe5fcd031
+EBUILD net-imap-0.3.4.ebuild 1125 BLAKE2B a469494ab662a11a134e8ce8f703807435f736bee2c380868a9915aeefcab86dea48cffced0793e9792ca58b0cdeed7d9e1531a8b550bd106f88f30b10cbe076 SHA512 8209699603e09f18d4e45dc84e131dd7a61e3750d4cea2aff6f1c8fe2ec011a1a32c049e932e6025aa8a0a2623971db960551ab36163cddc3c003dc201970564
 MISC metadata.xml 340 BLAKE2B ce089ee2eed44b5b96fa730c464c6e0299db5bbee1db0052a5c5e959079e7c14c23c0a7d1b6bd8d8e7faf83ed8379535d5059c10ff75b69cdb9d522c5d0099ce SHA512 ecf13d294eb224c7510bfedb5a093c78de5d2537431335708bc1046254941b583b3c013006adeea41d2f8df147dcf45c46c6c9b50841500761d6a6f0e0c71bdc
diff --git a/dev-ruby/net-imap/net-imap-0.3.4.ebuild b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
index 6a6a2431601e..eaedc9142d36 100644
--- a/dev-ruby/net-imap/net-imap-0.3.4.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
@@ -33,6 +33,8 @@ all_ruby_prepare() {
 		-e 's/git ls-files -z/find * -print0/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	mkdir rfcs || die
-	cp "${DISTDIR}/rfc3454.txt" rfcs/ || die
+	if use test ; then
+		mkdir rfcs || die
+		cp "${DISTDIR}/rfc3454.txt" rfcs/ || die
+	fi
 }
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index e40e3206267f..ade698ebf50f 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-feedparser-0.10.0.tar.gz 2697849 BLAKE2B 679e8442b5b11eb56b30d346edc54d76d8f94f43ab26299ec0dd831faf6acb7fde304b4d6f8147d67ab013c9d7e50c163fcb75e8aa10ddc9091529e29eeb0d79 SHA512 0cbf8543a73385f1bd7fd2bcd647828e4e03ec648a62cd898cfd58ed574ede68760184037a5c7ba58acc42d1d51c54158ad1247216ede415791d0bbaf99a5ce8
 DIST ruby-feedparser-0.11.0.tar.gz 2698521 BLAKE2B 55e3107fbef971e865b05ac0dc4ced0c0033689a93124c7ee7aff5c9979a8bdabf65a88484f744b7a4703cd8e10473d8fe76d6970f00b248afe37681154fe4ca SHA512 96f0d0471f3a1f61e4889c988e154bf4a1f8df5e3117e9c31fdcad905435276be58ad1027bd86f9ca9872f50ee020a04b78df0ad44b39b6ae096fdce7b64ed42
+DIST ruby-feedparser-0.11.2.tar.gz 2698609 BLAKE2B b516c7d50ba6bfd769dd42b5cfe85142df596556d21551f69c7d180eb172cae1d4c8ad86e44ae20cd87734b1d8f4b11456315b9c2a7df1a428a05dd8060bd8fd SHA512 1e067b0170f2c9df531b9378d004b06d098ddc21899755843fa2a2ae37a965e1f6060272525943e8b140b9f82bb6aad37a307dbb77adf74743ae76fd2a7c26d0
 EBUILD ruby-feedparser-0.10.0.ebuild 1025 BLAKE2B 78379bd36e971cd4869a2c178d14a50893a0e8b81e1af821e4b729fea371155ff771d927cd6e7c8bcbdb02ca6cdb4890d0e3b2f5867f2e55e60ca6ecf3c7e069 SHA512 68d8f840e97767fa75e0d8564268de26a5fe9de7bdce2ff8e5813b771abc5dd262d03c7386d478dbf83e874a9a3ba97d0782966d0ec5259f6409d2d89fe15b0e
 EBUILD ruby-feedparser-0.11.0.ebuild 1025 BLAKE2B 005674aa02b5a771a77c8011c6eda2923b2eff67b8429363b1d380bdf8d35a4ef46d6901f6e72c322abcd5df945405ee226c01bb42c88f6fb2f2b0e1241e3905 SHA512 77189792bd93f92843e238e4ec793ecc79657c87a6acc7cc1ec22707874092343d290880d336e095b2dbd8e5de11f78f9da0b30c5912ba6cc7fbca95582dcd2f
+EBUILD ruby-feedparser-0.11.2.ebuild 1025 BLAKE2B 005674aa02b5a771a77c8011c6eda2923b2eff67b8429363b1d380bdf8d35a4ef46d6901f6e72c322abcd5df945405ee226c01bb42c88f6fb2f2b0e1241e3905 SHA512 77189792bd93f92843e238e4ec793ecc79657c87a6acc7cc1ec22707874092343d290880d336e095b2dbd8e5de11f78f9da0b30c5912ba6cc7fbca95582dcd2f
 MISC metadata.xml 352 BLAKE2B 4f2ef2ec78d4bd600e9207801e1f44c904df6fdd2baf42f361477c2ac015ce1cdcb20073d9806d579ce4df0f7e142a7b348f779888fbb07c6271c9ffbc3c22ea SHA512 3829503d9c799ae275340892ad81708393ccaea1fc0c65d678ce3c856fcae01546c02dabb340dc12582a774203e8a8b017c918adc66e1178c79a80ac35a79f2a
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild
new file mode 100644
index 000000000000..4388459c4a69
--- /dev/null
+++ b/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="feed2imap"
+
+DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
+HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/magic"
+
+ruby_add_bdepend "dev-ruby/magic
+	test? ( dev-ruby/mocha:1.0 )"
+
+all_ruby_prepare() {
+	# Extract gemspec source from Rakefile
+	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
+		-e 's/PKG_VERSION/"'${PV}'"/' \
+		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '2igem "mocha", "<2"' test/tc_sgml_parser.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
+}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 89992026f502..665dd43ba7b7 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,13 +1,7 @@
-DIST sus-0.13.0.tar.gz 23399 BLAKE2B f96717409f5f14727b359e39bc1bb4726fe1cae98de46bf06e6e008df9a23746219decdb8de171cbc1c6c39ac84b4011e475daa43c7996c01968f4acc5289c84 SHA512 c0cb1b1d02e2fc812c6b3cf555af59f543bcdd82829d744d0e4fafb9043e503e8c9ebb52da33e56703d23ccaeaff583abf72e1df55a726ceca59d50d21b51eb3
-DIST sus-0.14.0.tar.gz 24207 BLAKE2B 1132e6fdf7c842ec8835613b647c837a1f5ec46c19743d186f7b57a68aff35201c29443e43242f0a375d97a0209148e483b6e8b8e44e1b94848f12a717161c42 SHA512 007eab396caa7401c028ee3b72f368810a6d01b50f84e657376ad8f7ea406b9a9cd13e3d481292197de05947a521513761da1141fc6b7e73791624966969281b
-DIST sus-0.15.0.tar.gz 25434 BLAKE2B 538ac7b81f7dcc74143e42a7b3fb5e12243b6a36228ac09cdf31549a9a666601d9e155fdd6ef079772b525e6993e07a12230ef87064d99b6ec5ddc643e9128cc SHA512 0110b08af0a94595764a9085e23d9d4b3ac1dec0b16e3c672b11520c7155d6b147890d53d25f00302812d22f95cb3ee7fc5563eae2476d8c99b7cc30aaadbc9e
-DIST sus-0.15.1.tar.gz 25680 BLAKE2B 4350023a6c2ae1c77687d0ebb66a31cd7a4d90cf955eabdca44be2282984aa3740e2f489844d7e30f448ba92cda6c949992cad1ed246c48db01c5b08ec058ad9 SHA512 f962f7f921144cca25faeb53be34a892501fdc1a2bd83dc64be7640232d1faa82b4d28c046af3440f7e142ea0fba525e1087b466952988e017ff469897dc01e4
 DIST sus-0.15.2.tar.gz 25676 BLAKE2B 3cc99d849674b87c8ac919dc176d48cfc184de9ed302f33a40a3f171430e9cc0ad9624c29f95053e7a8bd0ab7b2741bd6a09c7a77707a9ef83a265b09a095b4d SHA512 0f2e0f3640cce798564c53ffb2cc93996eda28af3b49d4f0d89327be960ef68e8aee5b0e906cfbadca0582bf5b363633314fd7d2eabf7ebf4782fe2aed095394
 DIST sus-0.16.0.tar.gz 26123 BLAKE2B 829e2ec74e60eb41809d85e9f74e1c8697d7803c6f26dd5da18f705fb0b35f85d8efb976eb858e07647db2137a1e864181346b69d2dd054d81289a6bd43cca2c SHA512 cd787e63b202df8b501c5d71198b9cfa23085b7e6ad7d9d9a4d023e4fab3a6c103d89390293f9940d14c023ea224b33b5ec728b67988aee8279cf248e20547cf
-EBUILD sus-0.13.0.ebuild 814 BLAKE2B dca4143816b09ca42de7d48e1a8cf51f82ccf5406884a04090244221c869be29bb89c7986f896b4f0497e89d7a9e44f740dc66ac0ee58a04c6e6a5535b61eb47 SHA512 9e17bc2fdfc1f9e41f5d3775b211f538de8e48eef8075ca2ec1ff2d56be110bfa4c336b858ce6fde294f98f46cb447c7f80e70c96a1f7ba37c58cd393cfb1fb7
-EBUILD sus-0.14.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
-EBUILD sus-0.15.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
-EBUILD sus-0.15.1.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
+DIST sus-0.18.0.tar.gz 27299 BLAKE2B 235ee4b9229d27966eabddd9400b734bd98c9f175eb639830b45269977b75770c72357be7cc631076df90f35cec38cfa6137277394dc1af0053cf81de59a84bf SHA512 3aea3aeac304efeafd0dd27f523196965731521cebb123d781cbb3a59bbaf79a5db460f2bf8461d750865616ec1dd4cf4acc0c29d3be0a0d7f33e21c43e0844c
 EBUILD sus-0.15.2.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.16.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
+EBUILD sus-0.18.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.13.0.ebuild b/dev-ruby/sus/sus-0.13.0.ebuild
deleted file mode 100644
index 713c073218b5..000000000000
--- a/dev-ruby/sus/sus-0.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-	sed -i -E '/^#/!d' "config/${PN}.rb" || die # remove covered coverage
-}
-
-each_ruby_test() {
-	"${RUBY}" "bin/sus-parallel" || die
-}
diff --git a/dev-ruby/sus/sus-0.15.0.ebuild b/dev-ruby/sus/sus-0.15.0.ebuild
deleted file mode 100644
index 439f98b70da2..000000000000
--- a/dev-ruby/sus/sus-0.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/sus/sus-0.15.1.ebuild b/dev-ruby/sus/sus-0.15.1.ebuild
deleted file mode 100644
index 439f98b70da2..000000000000
--- a/dev-ruby/sus/sus-0.15.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/sus/sus-0.14.0.ebuild b/dev-ruby/sus/sus-0.18.0.ebuild
index 439f98b70da2..46c6a8c0fd05 100644
--- a/dev-ruby/sus/sus-0.14.0.ebuild
+++ b/dev-ruby/sus/sus-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 83218b14cbea..6579b9538d5c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1e065c6345f4..f2d9a5951693 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,5 +4,5 @@ DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95
 DIST cuda_12.0.1_525.85.12_linux.run 4207617207 BLAKE2B d99b70b253decb03f37e73c783771b50aa057c02b31a4fa629c4ba2ac91dce8f87b8316d205ee1393ab936e19aebd7753cff339d00f91dcd4cfe7a968f98364e SHA512 edd73c6e989e8469d73a8a8c4c927aa0654c1c299eff77c8b30dafd5da6e4e368626cec48978785f8e94fe8d1b7b73f1df6d5d03a80a6f58a07fa2d1f15c7f86
 EBUILD nvidia-cuda-toolkit-11.7.0-r4.ebuild 7971 BLAKE2B 3c4d3872c27748286432d4880bba46e61c16c98e1cf6536c96a461bdf5bb33bc608f91f5806054b8bc441eb6614b04b8a9d97267d7f76d7c8ffeb0234fba19d3 SHA512 d0a32abbbb5700f3bd6925a380cca95cd03ff0a0fc77dfd259410359b8a785464fe81d91391741b01a56dd788d6e90019aa6d06237f19f4829b48041cf6250fc
 EBUILD nvidia-cuda-toolkit-11.8.0-r3.ebuild 7996 BLAKE2B 2b33d330b9865a62ef5789035107958034f26d16d416a1589c04e6d2444e94ecf752584043d1e55828baa3f1aa7a790dd1450edbe88b00a50793192fdbd29cb3 SHA512 3c4efaf3363dbe8e7d3bdd8b838d53bda3c4bbb029dee4bd389a8b0efa6d274b5cda1f5e62bfec45f1984771d08ac2a62e0836f94461824928e0e47828d03067
-EBUILD nvidia-cuda-toolkit-12.0.1.ebuild 8720 BLAKE2B 390c1c104454565f991a7f320a73be9fec01512e6539e83647464ab537034cdd8fc0f2b5c1f3307bcc62d97580f1cca44ba1fa59dc1105c0be573c2e5f9d67be SHA512 ee44d74b8d2334bb876fb1459353343ac504e15135632fa38a6e7d94a8048cfdedb16ab1d93ae6beb8bbb9e843bf00a67ea041a4ac99902895560574c748343d
+EBUILD nvidia-cuda-toolkit-12.0.1-r1.ebuild 8695 BLAKE2B 29756d28b9e67350051556dee977dca4725309c372759abb9568f13b10885ab849782dab914aa230b38ab1de2646e81d07002dcb097b6ea4940352c3951e2982 SHA512 5fb8240ed117c299ed2935c5a57734740d46e5d62c7d6deeab896442d4fb59977b476e566399c1008b706547a0163d03bb9006ca8534021e240360f9a9d1f913
 MISC metadata.xml 671 BLAKE2B 20d0b15061270bdb0604e9e76e8913c9d304c51a05102f92b2ef64cddb1b369705a742aefca28f4d36976bb633d0a2cf090bf3d307ea579121578d29c41264e1 SHA512 09fe8a1c60ca7924e433c5aca460d6a757c9962371b3f2a3c42c2ff1b0dd819f1704dd5943bd31a3e74337ad0f14aa4d7836912a435396c15e4f0daaed33800e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.0.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.0.1-r1.ebuild
index ab597eca9d3f..c3abce45c73a 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.0.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.0.1-r1.ebuild
@@ -32,10 +32,7 @@ RDEPEND="
 			dev-libs/openssl-compat:1.1.1
 			=dev-libs/openssl-1.1.1*
 		)
-		|| (
-			media-libs/tiff-compat:4
-			media-libs/tiff:0
-		)
+		media-libs/tiff-compat:4
 		sys-libs/zlib
 	)
 	vis-profiler? (
@@ -52,7 +49,7 @@ pkg_setup() {
 src_prepare() {
 	# ATTENTION: change requires revbump, see link below for supported GCC # versions
 	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
-	local cuda_supported_gcc="8.5 9.4 9.5 10 10.3 10.4 11 11.1 11.2 11.3 12.1"
+	local cuda_supported_gcc="8.5 9.4 9.5 10 10.3 10.4 11 11.1 11.2 11.3 12 12.1 12.2"
 
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d40d014a3e06..5879e30cb379 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 40a92f5abd20..19572e49fab7 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,7 +1,8 @@
 AUX kdepim-addons-22.08.3-spamassassin-4.patch 2287 BLAKE2B 378da71f00f434ad8b6689063289f4f3a54f283c0e5a825ecc024d796be2339a5006530c32ffba13000cc46a70b2a9239113770a673087d937137d290f4d9612 SHA512 c1c795fc22f09a8cea95e776634c5bcc8966bc8ccee5af7736fe011412c9bf1694b17473f640ba29b39dd8e0a6cc79a700b6faa9a7ad532cbe8f18934e0e2111
+AUX kdepim-addons-22.12.2-discount-3.patch 5352 BLAKE2B 662111dc9eea63e3436c2434e723d8fb41277cca558d2baa1d3632ce204da7da4c0dc67c5809ca8e0780291dcbf71a4cdcc1098b7fe2edcab8bdf7d8edc8ddc4 SHA512 14afe36d35b49c6e323e8004271fc6953fb499fbb06ee06f864598df72c5ee18b2897ed209ce2613f9d3991a980f5c9ecc361ae9d0dd96e9c76b563920046e18
 DIST kdepim-addons-22.08.3.tar.xz 2301376 BLAKE2B 9e7cc90f8962b963e240cdf705301e399f409547396a77e3d5f506332c9897d9e89743f57bf725a21f348fe23f0b9d51e09552dbf5db88aaf7b2307a1d307671 SHA512 6e05806a5e1810c41e5af54cbf5aeef9345f4a168f520f0ed2a91552b4b786e0cfe9be98c127869640d2ed5f342a03da189fc60913c313517de4ff19ff66f1fb
 DIST kdepim-addons-22.12.2.tar.xz 2665648 BLAKE2B 4c2099f19305ec5519f974e0d037b02a7f3e03eb0e99e31ac29ab6b3545a0c5883b425ba27ac4894cec6b06cb243d11984ff44d7af51cb3c1f9f206c28e67fff SHA512 cb63b7df5694db4a898dda642a2d4e7e05c36ed1529a88c828b21d2a2ad24d16bee16a33f0df9f5a38c19dd6fa22892aff03dbbf1bc986ab1017e08b07b2312e
 EBUILD kdepim-addons-22.08.3-r1.ebuild 2438 BLAKE2B 1b1179b98f172fd4042e4da5b9209f1c0fad933cd255cacb1c4e9365e725d6f8811669b0ef894126ca53ce8a74bf6cfb5e7f89242bc97ae5f08cfdac4ea4916f SHA512 0be19375b85af830586165e6962476333505a2524f60f3a005739431795b0171f53bd7ed0cffe728e8bac530250a46e942e82f88bfcab9e390ea7a04b1012195
 EBUILD kdepim-addons-22.08.3-r2.ebuild 2493 BLAKE2B 5b90ad0f6fdc85a8558ca90149f3fbf4e9ece8932c99406cc253f3bad58ee01d5d3bb5f4a56fb50ca6f82c503f781a3d909bc5340c67d2ee851d2797f4e8bf37 SHA512 5cba1cf9d292ba3b7787485912fa55a04c9e07b96a77581ace2283605fa054c927b5a16c617b734407bba8921140fbfbf9ec438bf491d3b5b4fa9e55907c4994
-EBUILD kdepim-addons-22.12.2.ebuild 2441 BLAKE2B 89f0a17561d3a8e987b65a4cf2dc8311dcde91a30937f89fcdbf370d6e38a7c641145e0768f65d0d1b4f7754026342800549a5a739ab5e111b05138d7e89af74 SHA512 d99625c594828ddcf7a2a8e9fd9d3cc107b17eabd6d109352569334d6c8a6800e63c6ced62bfac8cab53f53024ac8121501ed655503bc8a1a33df3ab7edc8687
+EBUILD kdepim-addons-22.12.2.ebuild 2490 BLAKE2B 89c93a0b01dce94a30e4ee5fcbdb8ce5c4e5396cb8918962caec93ac00b887cdcf1885e87e107f9311e6acf9e19e1281b86fe87a9b7fb477690b5c4a8608ac85 SHA512 6d53c5878497338c185e8697bc37aecbb7a927a8e08a8b3799ee12a393d7c38b994b6990da8a1fcde51c4f2bfa4d7dba7fb7e7b247f29aa0b2cda9d45b839bca
 MISC metadata.xml 535 BLAKE2B 372b4b81f73cab00c89c12fb43fbb4edeea2521a7f443c70bdd68269780b82ed98e71d5a1b16cab55827f11fefbd70c65fbf860e3d6b73b39647bc02256edaf1 SHA512 a4a82c962488e785ecc5b36711c5730955f0352d7fcc184facfc351668dd22ba82247b9608ca39fac48f6260f29283b3c95e967ab0d887421f5849b425aa7b4d
diff --git a/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch b/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch
new file mode 100644
index 000000000000..32ab88710097
--- /dev/null
+++ b/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch
@@ -0,0 +1,127 @@
+From 81134b0dff93ecc9da4ae60cd4b0aeb0be95ab1e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 18 Feb 2023 17:39:37 +0100
+Subject: [PATCH 1/2] Make it compile against discount 3
+
+---
+ cmake/modules/FindDiscount.cmake                  |  2 +-
+ .../bodypartformatter/markdown/CMakeLists.txt     |  1 -
+ .../markdown/markdowndiscount.cpp                 | 15 +++++++++++++++
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindDiscount.cmake b/cmake/modules/FindDiscount.cmake
+index 27acf46ed..8bb4e6d09 100644
+--- a/cmake/modules/FindDiscount.cmake
++++ b/cmake/modules/FindDiscount.cmake
+@@ -21,7 +21,7 @@ else ()
+       find_package(PkgConfig QUIET)
+       PKG_CHECK_MODULES(PC_LIBMARKDOWN QUIET libmarkdown)
+       set(PC_LIBMARKDOWN_VERSION_STRING ${PC_LIBMARKDOWN_VERSION})
+-      #MESSAGE(STATUS "VERSION ${PC_LIBMARKDOWN_VERSION_STRING}")
++      MESSAGE(STATUS "VERSION ${PC_LIBMARKDOWN_VERSION_STRING}")
+   endif ()	
+   find_library (discount_LIBRARY
+     NAMES markdown libmarkdown
+diff --git a/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
+index 244810b2b..8e096b75b 100644
+--- a/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
++++ b/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
+@@ -23,5 +23,4 @@ target_link_libraries(messageviewer_bodypartformatter_text_markdown
+     KF5::MessageViewer
+     ${TEMPLATES_LIB}
+ )
+-
+ install(TARGETS messageviewer_bodypartformatter_text_markdown DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/messageviewer/bodypartformatter)
+diff --git a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
+index 8132b7b34..3ba689695 100644
+--- a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
++++ b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
+@@ -20,6 +20,8 @@ QString MarkdownDiscount::toHtml() const
+         return {};
+     }
+     const QByteArray textArray = mText.toUtf8();
++#if defined(MKD_NOLINKS)
++    // on discount 2 MKD_NOLINKS is a define
+     MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.count(), 0);
+     mkd_flag_t flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK;
+     if (!mkd_compile(markdownHandle, flags)) {
+@@ -27,6 +29,19 @@ QString MarkdownDiscount::toHtml() const
+         mkd_cleanup(markdownHandle);
+         return {};
+     }
++#else
++    // on discount 3 MKD_NOLINKS is an enum value
++    MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
++    mkd_flag_t *flags = mkd_flags();
++    mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR);
++    if (!mkd_compile(markdownHandle, flags)) {
++        qWarning() << "Failed to compile the Markdown document.";
++        mkd_cleanup(markdownHandle);
++        mkd_free_flags(flags);
++        return {};
++    }
++    mkd_free_flags(flags);
++#endif
+ 
+     char *htmlDocument;
+     const int size = mkd_document(markdownHandle, &htmlDocument);
+-- 
+2.39.2
+
+
+From dab416ac2e2ec17bf5a7a9a83064f19a3b04a08c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 19 Feb 2023 12:30:14 +0100
+Subject: [PATCH 2/2] Add missing push it
+
+---
+ .../markdownlib/markdownconverter.cpp         | 25 ++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
+index 204628656..34530dd11 100644
+--- a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
++++ b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
+@@ -52,7 +52,8 @@ QString MarkdownConverter::convertTextToMarkdown(const QString &str)
+         return {};
+     }
+     const QByteArray textArray = str.toUtf8();
+-
++#if defined(MKD_NOLINKS)
++    // on discount 2 MKD_NOLINKS is a define
+     MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.count(), 0);
+     mkd_flag_t flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK;
+     if (mEnableEmbeddedLabel) {
+@@ -69,7 +70,29 @@ QString MarkdownConverter::convertTextToMarkdown(const QString &str)
+         mkd_cleanup(markdownHandle);
+         return {};
+     }
++#else
++    // on discount 2 MKD_NOLINKS is a define
+ 
++    MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
++    mkd_flag_t *flags = mkd_flags();
++    mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK);
++    if (mEnableEmbeddedLabel) {
++        mkd_set_flag_num(flags, MKD_LATEX);
++    }
++    if (mEnableExtraDefinitionLists) {
++        mkd_set_flag_num(flags, MKD_DLEXTRA);
++    }
++#if DISCOUNT_HAS_HIGHLIGHTING_SUPPORT
++    mkd_e_code_format(markdownHandle, external_codefmt);
++#endif
++    if (!mkd_compile(markdownHandle, flags)) {
++        Q_EMIT failed(i18n("Failed to compile the Markdown document."));
++        mkd_cleanup(markdownHandle);
++        mkd_free_flags(flags);
++        return {};
++    }
++    mkd_free_flags(flags);
++#endif
+     char *htmlDocument;
+     const int size = mkd_document(markdownHandle, &htmlDocument);
+ 
+-- 
+2.39.2
+
diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
index 4689d7c29cbf..f8034c584541 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
@@ -68,6 +68,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-discount-3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package importwizard KPimImportWizard)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ad396f1c7b10..5a6b66ffd48d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index f411c5e31ffe..14fd19ddcff3 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,5 @@
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
 DIST graphviz-7.0.5.tar.xz 21484456 BLAKE2B 82fd4e97e946aaf603eeeda2d9e0628c46b5268323121262bb5b84c3b0d8bb78f35b695100c15e4a879d3b92324ae1b17e888b709be72e608e951f6f81dafe48 SHA512 2e4b4d5847503403f1bba6967095c8a24f68eedc852ffc532d397437c45d2a77f9791a2fef82fdbc7e18fd0556088fe4c2f240f1b6c276e5f12a5b68c003f4d4
 EBUILD graphviz-5.0.1-r2.ebuild 6136 BLAKE2B 6d7fcc5a35d85162baea6af1edd59c56b8655cf347ebb1b43f499019669de56576923cb1a4b8b6ac024cba27f286b3ffe9b4c01e1bb8f1ea875513a2595a2544 SHA512 d33e14ece4e87c1c7cc737c5de20e98356c1ea94bcdb5db8c1ae94b36cef580ce4ffd8cd16acca9bc8db6d6bdb8fb493f6108ced9d9f993c6b7a3839b2b1e524
-EBUILD graphviz-7.0.5.ebuild 6138 BLAKE2B 05ca01b127218ddf1670f916487cc465cd8eba755b80aaa16c9f33e2e0f032bec2cacac81fc122162974a18372724de929475ce61fcc5391129327e1f68daa44 SHA512 5c5e3671a88baf2cac5e8aaf10c4aea46194b14df7f22d5d449d314ecd108be9ac756cec4226805b38c36cd2e797e94908dfb0fd61c619431e581e23fa5f9134
+EBUILD graphviz-7.0.5.ebuild 6134 BLAKE2B b8b39b163eb17f04ef17f28e8d999d01a55a4be8a220a0f07a6240354e319e62539498aff459d3c367f946b9596535c621827086117368394c5c0736805572e8 SHA512 bbb76541c700d0ff4445f88c3805568ba3016d7613dd8c0250599608eacd2ed69539790b041bbff173127f706fa07156369e5d11db2f7aabcfdae1acc589498a
 MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
diff --git a/media-gfx/graphviz/graphviz-7.0.5.ebuild b/media-gfx/graphviz/graphviz-7.0.5.ebuild
index c8246638065f..19a09b8cb084 100644
--- a/media-gfx/graphviz/graphviz-7.0.5.ebuild
+++ b/media-gfx/graphviz/graphviz-7.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 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 ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 417733de8025..6f246500417a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 2bab90569d66..679815e6d3b2 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,3 +1,5 @@
 DIST gpodder-3.11.0.tar.gz 1155120 BLAKE2B b2e46a5ea5ceec7df632f888b00e9c25a0ec1c4597540228b50cb75bd4bd6acfc7566cfffe5c9d133e8ec29e1ffc2f4551e2fd289237d1b93d2e80f6b49db0c1 SHA512 90e33e04a8afcdafa0899f25714417ce61699c641ce3df93b3a3728224bdb0be5205c064e7263d1be1f4641e61932b945741e9848726b602633a94eb754fa937
+DIST gpodder-3.11.1.tar.gz 1174163 BLAKE2B 703b545b576c8f119427e336e71e45301d4336fc82bca6ec6c4a0866591c8742866308da680564ff1543a5a65e2407295c46b3c5831d1e2d7335c5806d4cce5a SHA512 7570a4f0ac0c974fab58e30bb5bceb998cd7260ab91140a9801cf4fda1af3549ddf1ec4930081025215ecefd920a93c16252594915778e8ecb7524d3d7d3011b
 EBUILD gpodder-3.11.0.ebuild 2150 BLAKE2B 0b5c878b26e72b632d706efddf66d42ca1fbd7e1545bf6d2a8f53ecffc5d16b939c6ad6f103010c111dd24d86eb1e7c5ba7140f68e2d09beab748fccaf5a2847 SHA512 ed00f19a48193bce6763564fa024c88b4e728f4e0bfed15aa67411192e1bd44265b3ae3c19df9ea1fd92e29fa752fac6a25d41d50d8c3f6c8e74774e66a466f3
+EBUILD gpodder-3.11.1.ebuild 2121 BLAKE2B d4e7319b707acc6660d181a87ecc01c77a36cdab2857eb2f653cc30e99109ab8f7d516f52607d85e8b52b0c75f1d6bd313e2904dfcf881295f569b89e3ac685d SHA512 8eebc09d6d853dc46b78ef96bc5849e796ba190a09fcac36c4ed98d142421760f0c82a9ec9d6e2af3896f869f014d2dfa064835a67ad6e32f214c8f24823a6fc
 MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/gpodder-3.11.1.ebuild b/media-sound/gpodder/gpodder-3.11.1.ebuild
new file mode 100644
index 000000000000..d6e67e460c88
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.11.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus bluetooth mtp"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/podcastparser[${PYTHON_USEDEP}]
+		dev-python/mygpoclient[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( media-libs/libmtp:= )
+	kernel_linux? ( sys-apps/iproute2 )
+"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+python_test() {
+	# These are pulled out from the Makefile to give us more control
+	# See bug #795165
+	# Previously, we used 'emake releasetest' in src_test
+	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
+		-p no:localserver
+	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
+		-p no:localserver
+}
+
+src_install() {
+	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
+
+	distutils-r1_src_install
+
+	touch "${ED}"/usr/share/gpodder/no-update-check || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "track length detection for device sync (only one package is needed)" media-video/mplayer dev-python/eyeD3
+	optfeature "for the YouTube extension" net-misc/yt-dlp
+	optfeature "iPod sync support" media-libs/libgpod
+}
diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest
index e5d95fbc2740..4278d86c3ebb 100644
--- a/media-sound/jack-example-tools/Manifest
+++ b/media-sound/jack-example-tools/Manifest
@@ -1,5 +1,5 @@
 DIST jack-example-tools-3.tar.gz 125686 BLAKE2B b0fbb68f2a21711113516a6754e13230b009f21d73a4fa8b94f2e8e81b71f6d95c246eae88d479daf3f4f6e0ccf3eb8295ff1b1b76603676c6d8b09d0594f9db SHA512 2fe33c4fc294a4e4e2c0c271d5e2f28bac162939c25536902c772fcc919d2a0923fcefd27305f3fce283edfe043d2da7773b66988a1f14f8670d5cac90c8d7e9
 DIST jack-example-tools-4.tar.gz 125676 BLAKE2B 0cfe696efb227558c13e3f7d3afb57938a69bc9f04a7efb7eaf6a22f123f97898d321490022a62ed1897ed6101bf04669f28dc24b70ab920d7fecadeabaf0c92 SHA512 f3fbbf24d4bdcbca959da74793b44292883192f91675f6ee80f01f9ff5181fca052bea6725c5b8b93a1ecfe293f6dc1c14c49519c2b8b57d26202b224d53f0ed
 EBUILD jack-example-tools-3.ebuild 1434 BLAKE2B d558b1cef6a14fd314b01f46e38d33478e77019a2b6696240bfd3e221a5c6ff261e2f10fa1dbf3eb8ca61c8006b4acf9e14f413a3ae14d929ea6a0febb778a9b SHA512 a53ee68ec3ca7f029e19e46e69bc32ac943c3a71b4baffc1b99472050e8882efafbdb775f957b254ca63bdeb74110a8ac3d04975796846fd9df56cfb7e816d9d
-EBUILD jack-example-tools-4.ebuild 1445 BLAKE2B d7c730bfc487a0d51b4d58e360a0ad09bf5312f837b0ea8ac8c6f90d176b338c5b2d100a5cb08b137c733ef05d8d4cd7020f25ed74f36fe5246ccd08103de1ed SHA512 da050fa4921e4d31541535b34432a898613bdf8e52305397104d2ef3e3f1a5938d39275c01fe6bf78434437bb5a7580188870c5d1532bbb10efd884a6aa25c71
+EBUILD jack-example-tools-4.ebuild 1441 BLAKE2B 628ca23ee23e6770c7237da07966e703faa20377294b9f27ff873f5f407fe3acb010eff4eb5abdc67fb3a45c5259487d8e45f5d88d26533373eb801567ec8492 SHA512 e06bfad638b39b0b440eab3db98688c25d8aa08c86feae98c29e03e401b32266332131623be9024e392de0d2e4ff7cd3e54ca3507816462c36ddb023b41c400e
 MISC metadata.xml 731 BLAKE2B 7c83aa6f9f1e4c7c43d6104cd089a69755c72577e728592ccedb8153687257c267609636832797d7dbfdac7f73bf55a3f0a195baaac442bf919f783589fb98b2 SHA512 1db07c3ba14f3a096c333630690e2b6bb1fd060fafe9aa132d7e455a5f89351b3074112eaac24bddf0e8697c0a8008ca4de192c78947cacea43a3aa2b71ef492
diff --git a/media-sound/jack-example-tools/jack-example-tools-4.ebuild b/media-sound/jack-example-tools/jack-example-tools-4.ebuild
index 96481465b552..c7ca64e78350 100644
--- a/media-sound/jack-example-tools/jack-example-tools-4.ebuild
+++ b/media-sound/jack-example-tools/jack-example-tools-4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV}
 
 LICENSE="GPL-2+ zalsa? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa"
 
 RDEPEND="
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 053ba373b83f..12fb6fc355a9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,6 +2,6 @@ AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf95
 DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
 EBUILD jack2-1.9.21-r1.ebuild 2804 BLAKE2B e4f12e7e43e5aaf180104edd6e2a90271d558e13d554a2b51d960aad1185b90f3a2cb3a869762801d812caf15028d89a609b0a7ccefac39f17281874eaf18e8f SHA512 1fcfe81604a4d73089740b024eb01165aaa84c08898577fd5ff1c9d2b3613f894cd875ba6c27289539f32b704a693dc084f8c6fb3764dc227f262d78aa8b08a8
-EBUILD jack2-1.9.22.ebuild 2575 BLAKE2B 79fe3564746ce8bb349bc1f0d7addd4bf03cf746250f2140b31e73a5463546dc713f761e67bc019dff2d02668d055340740432180884c20e9d8db060e4f4bf4f SHA512 228742ca5683228d7c9a725cc9b375339bab279cefb19eac0acab476efd8a40341d516b668367cd519ec75641538200c84b47c97c30148e499a8ac65e839ddbe
+EBUILD jack2-1.9.22.ebuild 2571 BLAKE2B fc072253d2455aa976ad3b592794c6ea18314fb18e70538de21332b5944d4476ccef67f109a99846b51c521c1deadb17d23d7145c3439a25d31c59bc8b3d6248 SHA512 6c85d7b63de041a8290b894afd0ca0af6ade1fade399d775b2aaeb5d7eb495b3874be5ec3fccfa03a13912454dfc3eb853e2f3bff90417a6adda313466ba070d
 EBUILD jack2-9999.ebuild 2575 BLAKE2B 79fe3564746ce8bb349bc1f0d7addd4bf03cf746250f2140b31e73a5463546dc713f761e67bc019dff2d02668d055340740432180884c20e9d8db060e4f4bf4f SHA512 228742ca5683228d7c9a725cc9b375339bab279cefb19eac0acab476efd8a40341d516b668367cd519ec75641538200c84b47c97c30148e499a8ac65e839ddbe
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/jack2-1.9.22.ebuild b/media-sound/jack2/jack2-1.9.22.ebuild
index 8fa6ca5113f5..a6711b5ca8f6 100644
--- a/media-sound/jack2/jack2-1.9.22.ebuild
+++ b/media-sound/jack2/jack2-1.9.22.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
 	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 40e46aa83cf5..5c156e6f742f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 79ffe28c2629..42b03970ed51 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Feb 2023 07:39:36 +0000
+Sun, 19 Feb 2023 13:39:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 655055f8ed6c..7b2b0688b8ff 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-19T07:39:39Z
+TIMESTAMP 2023-02-19T13:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPx0jtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPyJpxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA4dQ//TEjHN0WrRORiJIWMNgQjba1YF6jpHaVsxaP9qbe9kCSikMN97jKb+jdD
-oa6MBU3NPc6E4244MAG2jZkPZsIqhNYyiF07aiqO647H9CnCyU197xV5KRjmYH45
-2TuZ9GKQV/KozF7xjxbybnxZYxBg+9eYrWNw1w1FHiq9zQIXHWV1tPZwDiA9uJxH
-7gCu2YQRuDs8S3TIjZRewPiPi+YabDFMCAY+EVShQmRjT/7qjeGPOgCU62CEc5vP
-Mri/uCDuDXtpOsWANXm/u3ZyCt0+6aUlFji7VbpDdctq7SVVw1vI0lY0a4c4fOW1
-zQ1679VeFwNVmS4B0r1z9RHzt/lTxPK9MZNfmNEW7nUtqTWhiqDAhe/kUpxIS1Hq
-0+FnebTwe8+1s5v2QDGVRGy1crfX9hg0tOOkCazj1Yvcmoh9yFUcrI6tEo6ivZGe
-nvyp/SscWORphE1XKxhaRegIkdU6I/PAfPmee/NGAorbFB0/nSLmGhqMyA0KwgWI
-G8AjVt1ZllTWlhNDrt08wDKZwbJxFBGkYdJyoPOVDHqCxYthKt5nzVpi4cLaCG+U
-h815m7QPSBH5P5H8r848zuQSe29jRjCV6g+AlMbUMjWrx+PgR2wl86XXnDND4Vq5
-JZ92fDZn+qHsTJP4w4SuFlAW8ROcChmdzQsTIsaZcORE+zChhdU=
-=MMdp
+klCVUw/8C6q+lrPzZqpF6xXEo6u5oNuY43U+QXn3Kblv/QG/tLodky8eVUyfObjF
+CN1q+1qYXkEgyFOEiIUzIEBTohPQJykOAdy7QecyF/m0TwYZDmiSQlJUUVlALVft
+ogSXkqpiN4ePa6PGANikNztJbh+cJkJsF68l3N/WV9SuSkKdHHzyp4miiEh62Pm8
+mKqKSESATltSRxeiuX1F634BrreW0CDHfL6T9nGL5ghGNdr7WP7/R6bRnYAPqx9E
+aGMaiSIZKCDTfcDyeg24AxKQHFv5WHnIxcA4nUas01nK61p/33vKQW1uOb48hXlT
+qWClvsMgElp65GNKIOGSRPxneI+iPPqs/g6RkxtfYgHd0Rsj/tAKMK5ZqlQ2wqqv
+7cGwrlXcxY/PqxURvQGM4ATg74fW16iTlNO/C36iIKEy0YfSWtIXEBYiUde6Hv43
+1nkPiC5KjtRtkqnkPE1C3QdFM5MpY38hcwGPoU+D/WwJZRKOb65m691960E7af+3
+ZZF/eHdy39UDwfHA7/ApN6XGe9/xYVMIAjL3pZ/iInwoLfr/0poNweswzfQSDi/e
+/xhLm9Np66TB6oRyIY/PxS+mJkCj3Mae0fykR1eANAGFBqRrJxmBXt1qtqEQfZzz
+fXE7pZvJQTkF62Cgs4rfq5gJfz8T483qJvHEPfKdRLTiX39zzsY=
+=iAyl
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 79ffe28c2629..42b03970ed51 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Feb 2023 07:39:36 +0000
+Sun, 19 Feb 2023 13:39:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4dde7b97b8fd..d183c4959898 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 1780f0420a2f..4a5222201b8b 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.13_p1 b/metadata/md5-cache/app-admin/sudo-1.9.13_p1
new file mode 100644
index 000000000000..70f4e226940d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.13_p1
@@ -0,0 +1,16 @@
+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 ~sparc-solaris
+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.13p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p1.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.13p1.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p1.tar.gz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=7a809f42ea7e6074f65d53de1fa5aa1e
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index d1de99df6efc..daa755872559 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/freewvs-0.1.3-r1 b/metadata/md5-cache/app-misc/freewvs-0.1.3-r1
new file mode 100644
index 000000000000..c350917d3dbc
--- /dev/null
+++ b/metadata/md5-cache/app-misc/freewvs-0.1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Scans filesystem for known vulnerable web applications
+EAPI=8
+HOMEPAGE=https://freewvs.schokokeks.org/
+INHERIT=distutils-r1
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=CC0-1.0
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/freewvs/freewvs-0.1.3.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=1bfcf96d577b83649c31215630aae2da
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 9510ceadf620..936719a0e18d 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/skrooge-2.29.0 b/metadata/md5-cache/app-office/skrooge-2.29.0
deleted file mode 100644
index 6f905fd1d6b6..000000000000
--- a/metadata/md5-cache/app-office/skrooge-2.29.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxslt virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qtsql-5.15.5:5= >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebengine-5.15.5:5[widgets] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 activities? ( >=kde-frameworks/kactivities-5.102.0:5 ) kde? ( >=kde-frameworks/krunner-5.102.0:5 ) ofx? ( dev-libs/libofx:= ) >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
-EAPI=8
-HOMEPAGE=https://skrooge.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org
-IUSE=activities kde ofx test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qtsql-5.15.5:5= >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebengine-5.15.5:5[widgets] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 activities? ( >=kde-frameworks/kactivities-5.102.0:5 ) kde? ( >=kde-frameworks/krunner-5.102.0:5 ) ofx? ( dev-libs/libofx:= ) >=dev-qt/qtquickcontrols-5.15.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/skrooge/skrooge-2.29.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ac673137e0a9adbad93df0e510adaf37
diff --git a/metadata/md5-cache/app-office/skrooge-2.29.0-r1 b/metadata/md5-cache/app-office/skrooge-2.29.0-r1
new file mode 100644
index 000000000000..bc90f9c23754
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.29.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qtsql-5.15.5:5= >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebengine-5.15.5:5[widgets] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 activities? ( >=kde-frameworks/kactivities-5.102.0:5 ) kde? ( >=kde-frameworks/krunner-5.102.0:5 ) ofx? ( dev-libs/libofx:= ) >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=8
+HOMEPAGE=https://skrooge.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=activities kde ofx test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qtsql-5.15.5:5= >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebengine-5.15.5:5[widgets] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 activities? ( >=kde-frameworks/kactivities-5.102.0:5 ) kde? ( >=kde-frameworks/krunner-5.102.0:5 ) ofx? ( dev-libs/libofx:= ) >=dev-qt/qtquickcontrols-5.15.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.29.0.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c22e607b2a2d0ac194c697f1a73456ab
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f2d2ebd43256..165ad57677e0 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.2 b/metadata/md5-cache/dev-java/tomcat-native-2.0.2
deleted file mode 100644
index cd3bf1808d64..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=autotools java-pkg-2 java-ant-2 verify-sig
-IUSE=static-libs test verify-sig
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-src.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=1d449f7e565b887f772843ea4d9930d0
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1 b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
new file mode 100644
index 000000000000..362171a84ce9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Allows Tomcat to use certain native resources for better performance
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/native-doc/
+INHERIT=autotools java-pkg-2 java-pkg-simple verify-sig
+IUSE=static-libs doc source test verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=a1c9a6ba8179f9c6668bafe36b75ab9d
diff --git a/metadata/md5-cache/dev-libs/FP16-2021.03.20-r2 b/metadata/md5-cache/dev-libs/FP16-2021.03.20-r3
index 733135fe5934..30f59202869c 100644
--- a/metadata/md5-cache/dev-libs/FP16-2021.03.20-r2
+++ b/metadata/md5-cache/dev-libs/FP16-2021.03.20-r3
@@ -5,13 +5,13 @@ DESCRIPTION=conversion to/from half-precision floating point formats
 EAPI=8
 HOMEPAGE=https://github.com/Maratyszcza/FP16/
 INHERIT=python-r1 cmake
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-libs/psimd python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-python/PeachPy[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-libs/psimd python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/PeachPy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/FP16/archive/0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz -> FP16-2021.03.20.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bab8478b27a236869bd48345a6b8fc2b
+_md5_=d6afdaf501acec0005a00340f1c3c010
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 71cb8eb2ce1e..1b9b79af580c 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/link-grammar-5.11.0 b/metadata/md5-cache/dev-libs/link-grammar-5.11.0
deleted file mode 100644
index 7ab4b25dcf54..000000000000
--- a/metadata/md5-cache/dev-libs/link-grammar-5.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-db/sqlite:3 dev-libs/libpcre2:= aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) !sci-mathematics/minisat
-DESCRIPTION=A Syntactic English parser
-EAPI=8
-HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
-INHERIT=autotools python-r1 out-of-source
-IUSE=aspell +hunspell python python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 dev-libs/libpcre2:= aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) !sci-mathematics/minisat
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0/5
-SRC_URI=https://www.abisource.com/downloads/link-grammar/5.11.0/link-grammar-5.11.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	9779900d240517b0631874f05d190aae	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=eca672342efbfd45501c8bd70607c478
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 13cce84505e6..30169f74e9d5 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.05 b/metadata/md5-cache/dev-ml/camlp5-8.00.05-r1
index 7a9ba6bf2ba8..a2ed6d964eaf 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.05
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.05-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=BSD
-RDEPEND=dev-ml/camlp-streams:= dev-ml/rresult:= dev-ml/bos:= dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-ml/camlp-streams:= dev-ml/rresult:= dev-ml/bos:= dev-ml/pcre-ocaml:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.05
 SRC_URI=https://github.com/camlp5/camlp5/archive/refs/tags/8.00.05.tar.gz -> camlp5-8.00.05.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=712ea48c9835353e3ecdb57a78068d50
+_md5_=68aa32a2fbde3022476daf05215bbb51
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.5.0 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.5.0
new file mode 100644
index 000000000000..02ff20bbd188
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio:= >=dev-lang/ocaml-4.12 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
+EAPI=7
+HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
+INHERIT=dune
+IUSE=examples +ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio:= >=dev-lang/ocaml-4.12 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/7.5.0
+SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.5.0/pcre-7.5.0.tbz -> pcre-ocaml-7.5.0.tbz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=bfffc4a55ca83067a0e115941da7987a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 59ff8e621d7b..9743e949dfa7 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/PeachPy-2021.10.13 b/metadata/md5-cache/dev-python/PeachPy-2021.10.13
deleted file mode 100644
index ed57bf320c9a..000000000000
--- a/metadata/md5-cache/dev-python/PeachPy-2021.10.13
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/Opcodes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Portable Efficient Assembly Code-generator in Higher-level Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PeachPy/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=dev-python/Opcodes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Maratyszcza/PeachPy/archive/257881e0a7ce985c1cf96653db1264bf09adf510.tar.gz -> PeachPy-2021.10.13.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e33b0c8bbfc77606b466673b8f318f98
diff --git a/metadata/md5-cache/dev-python/PeachPy-2022.11.13 b/metadata/md5-cache/dev-python/PeachPy-2022.11.13
new file mode 100644
index 000000000000..c0221a9029b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PeachPy-2022.11.13
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/Opcodes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Portable Efficient Assembly Code-generator in Higher-level Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PeachPy/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-python/Opcodes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Maratyszcza/PeachPy/archive/349e8f836142b2ed0efeb6bb99b1b715d87202e9.tar.gz -> PeachPy-2022.11.13.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=a254e7ae870bb1419760f58ca2e962c6
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index a491adfd63aa..99a463ec1480 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r1
deleted file mode 100644
index afbbc3018016..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( =dev-qt/qttest-5.15.8* )
-DESCRIPTION=Cross-platform application development framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=linux-info flag-o-matic qt5-build
-IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=5/5.15.8
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7a6c58d0d5445f46b5124a11769aa6df
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3 b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
index 64e332cc5005..2e2e6442845e 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic toolchain-funcs qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.8
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=6c7f21af36b7a9506a678b6fa5b234c3
+_md5_=4cd920f9c58bca6d06a637330b36decb
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r1
deleted file mode 100644
index 7a317d4cf538..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) linuxfb? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( =dev-qt/qttest-5.15.8* )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.8* )
-RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
-REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.8
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d5a989c199e5938b1a7e6b1ac433382b
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3 b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
index db9b12ccb13c..8d1fd34033e2 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.8* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.8
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c925fa6b7031a9b054cf9196ce55db5b
+_md5_=4e89844bf9f5daf894e9760a0cd4deb6
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8
deleted file mode 100644
index 291b49e03abb..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.8* )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
-RESTRICT=test
-SLOT=5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtimageformats-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.8-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0e341f796ad9748dea8df76be8af3f34
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
index aa6014d19c91..291b49e03abb 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtimageformats-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.8-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=1337ba360f2ff9b36f2eb703cebbd1f3
+_md5_=0e341f796ad9748dea8df76be8af3f34
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8
deleted file mode 100644
index 3738d03d4c69..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( =dev-qt/qttest-5.15.8* )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
-REQUIRED_USE=gtk? ( dbus )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=a9cc0fb524c5d85cbebfd02992c31b9f
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
index dc9cd7c771af..9c29472d19bd 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=563393a893e19b92a9f217e68feab9d1
+_md5_=45d58ab935f64a75aab4c8815a56c75a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3654876f7d04..36f9bef92825 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0
new file mode 100644
index 000000000000..0ac17f2ed3aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
+EAPI=8
+HOMEPAGE=https://github.com/grosser/fast_gettext
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.3.0.tar.gz -> fast_gettext-2.3.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=cfa013fb7507989ef8a936c366b9aab5
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.3.4 b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
index cb96339933bf..b38f96abb338 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.3.4
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.3.4.tar.gz -> net-imap-0.3.4.tar.gz test? ( https://www.rfc-editor.org/rfc/rfc3454.txt )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ed36d5ee3819c3bd597aff2e22492c8a
+_md5_=82f2da4fefea191cd1306789d16dea6e
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2
new file mode 100644
index 000000000000..843a3d1faf5d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/magic[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/magic[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/magic[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-ruby/magic[ruby_targets_ruby27(-)] test? ( dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/magic[ruby_targets_ruby30(-)] test? ( dev-ruby/mocha:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/magic[ruby_targets_ruby31(-)] test? ( dev-ruby/mocha:1.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby library to parse ATOM/RSS feeds
+EAPI=8
+HOMEPAGE=https://github.com/feed2imap/ruby-feedparser
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/magic[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/magic[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/magic[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.11.2.tar.gz -> ruby-feedparser-0.11.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=02caef015059f8fd5b3dc4b2222cf7ee
diff --git a/metadata/md5-cache/dev-ruby/sus-0.13.0 b/metadata/md5-cache/dev-ruby/sus-0.13.0
deleted file mode 100644
index f6a5121dc5f5..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.13.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/refs/tags/v0.13.0.tar.gz -> sus-0.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b30c0351b6b96b2188a6d5f75b2a570d
diff --git a/metadata/md5-cache/dev-ruby/sus-0.14.0 b/metadata/md5-cache/dev-ruby/sus-0.14.0
deleted file mode 100644
index 4c7419cff5a2..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.14.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.14.0.tar.gz -> sus-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d3498f05ed0096b71e6b5f61e3a64f81
diff --git a/metadata/md5-cache/dev-ruby/sus-0.15.1 b/metadata/md5-cache/dev-ruby/sus-0.15.1
deleted file mode 100644
index d5dfcbce1b07..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.15.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.15.1.tar.gz -> sus-0.15.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d3498f05ed0096b71e6b5f61e3a64f81
diff --git a/metadata/md5-cache/dev-ruby/sus-0.15.0 b/metadata/md5-cache/dev-ruby/sus-0.18.0
index 71ac66ed3943..cdc0d00485fe 100644
--- a/metadata/md5-cache/dev-ruby/sus-0.15.0
+++ b/metadata/md5-cache/dev-ruby/sus-0.18.0
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.15.0.tar.gz -> sus-0.15.0.tar.gz
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.18.0.tar.gz -> sus-0.18.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d3498f05ed0096b71e6b5f61e3a64f81
+_md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5bfe865f16d4..355c8ac86d75 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/nvidia-cuda-toolkit-12.0.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.0.1-r1
index 0a8a20ed59ad..03a86fdbb729 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.0.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.0.1-r1
@@ -6,9 +6,9 @@ INHERIT=check-reqs toolchain-funcs unpacker
 IUSE=debugger nsight profiler vis-profiler sanitizer
 KEYWORDS=-* ~amd64 ~amd64-linux
 LICENSE=NVIDIA-CUDA
-RDEPEND=<sys-devel/gcc-13_pre[cxx] >=x11-drivers/nvidia-drivers-525.60.13 nsight? ( dev-libs/libpfm dev-libs/wayland || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) || ( media-libs/tiff-compat:4 media-libs/tiff:0 ) sys-libs/zlib ) vis-profiler? ( >=virtual/jre-1.8:* )
+RDEPEND=<sys-devel/gcc-13_pre[cxx] >=x11-drivers/nvidia-drivers-525.60.13 nsight? ( dev-libs/libpfm dev-libs/wayland || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) media-libs/tiff-compat:4 sys-libs/zlib ) vis-profiler? ( >=virtual/jre-1.8:* )
 RESTRICT=bindist mirror
 SLOT=0/12.0.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=4d2496b53b1bde957ce3465714de572f
+_md5_=fe39bf1b13efc6c0c6243af964538ce4
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 08bb725226d4..4f3cc395de9e 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-22.12.2 b/metadata/md5-cache/kde-apps/kdepim-addons-22.12.2
index b784d2324a7d..df84f49f9737 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-22.12.2
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-22.12.2
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.2/src/kdepim-addons-22.12.2.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=db9486a524546817e27dccfa1390c1b0
+_md5_=af4da757814e3348cfa75e7c48122f50
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f4b3812dd4cf..f87d5bf64f5b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/graphviz-7.0.5 b/metadata/md5-cache/media-gfx/graphviz-7.0.5
index 79fd1a58d7b0..1517ad529f65 100644
--- a/metadata/md5-cache/media-gfx/graphviz-7.0.5
+++ b/metadata/md5-cache/media-gfx/graphviz-7.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 INHERIT=python-single-r1
 IUSE=+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )
 REQUIRED_USE=!cairo? ( !X !gtk2 !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=9dd2674eec3617e1678710724522dccd
+_md5_=bf29c260d6789a216cb1d9fe19d1346d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 7ac56c59ee19..62f13aca9109 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/gpodder-3.11.1 b/metadata/md5-cache/media-sound/gpodder-3.11.1
new file mode 100644
index 000000000000..d32da6b38a8b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gpodder-3.11.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/desktop-file-utils dev-util/intltool sys-apps/help2man test? ( python_single_target_python3_9? ( dev-python/minimock[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/minimock[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/minimock[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/podcastparser[python_targets_python3_9(-)] dev-python/mygpoclient[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/html5lib[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/podcastparser[python_targets_python3_10(-)] dev-python/mygpoclient[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/html5lib[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/podcastparser[python_targets_python3_11(-)] dev-python/mygpoclient[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( media-libs/libmtp:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=A free cross-platform podcast aggregator
+EAPI=8
+HOMEPAGE=https://gpodder.github.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 optfeature xdg
+IUSE=+dbus bluetooth mtp test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/podcastparser[python_targets_python3_9(-)] dev-python/mygpoclient[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/html5lib[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/podcastparser[python_targets_python3_10(-)] dev-python/mygpoclient[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/html5lib[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/podcastparser[python_targets_python3_11(-)] dev-python/mygpoclient[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( media-libs/libmtp:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gpodder/gpodder/archive/3.11.1.tar.gz -> gpodder-3.11.1.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=40c52b78639f32a703684d8884cf1b31
diff --git a/metadata/md5-cache/media-sound/jack-example-tools-4 b/metadata/md5-cache/media-sound/jack-example-tools-4
index cbc8b2914cf5..6e89845e72a3 100644
--- a/metadata/md5-cache/media-sound/jack-example-tools-4
+++ b/metadata/md5-cache/media-sound/jack-example-tools-4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://jackaudio.org/
 INHERIT=meson
 IUSE=alsa jack-net jack-netsource opus +readline sndfile zalsa
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+ zalsa? ( GPL-3+ )
 RDEPEND=virtual/jack alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) jack-net? ( || ( media-sound/jack2[libsamplerate] media-video/pipewire[jack-sdk(-)] ) ) jack-netsource? ( media-libs/libsamplerate opus? ( media-libs/opus[custom-modes] ) ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) zalsa? ( media-libs/alsa-lib media-libs/zita-alsa-pcmi media-libs/zita-resampler:= ) !<media-sound/jack-audio-connection-kit-0.126.0 !<media-sound/jack2-1.9.21
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack-example-tools/archive/refs/tags/4.tar.gz -> jack-example-tools-4.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a8a2055362bcd8848197fca007720cfd
+_md5_=6df57955c36f24cb4cf43a111ce9e27f
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.22 b/metadata/md5-cache/media-sound/jack2-1.9.22
index a0a8bf4f6b91..f0e53ceafcce 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.22
+++ b/metadata/md5-cache/media-sound/jack2-1.9.22
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://jackaudio.org/
 INHERIT=flag-o-matic python-single-r1 waf-utils multilib-minimal
 IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=tools? ( media-sound/jack-example-tools )
 RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( classic? ( sys-apps/systemd:= ) ) dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/archive/refs/tags/v1.9.22.tar.gz -> jack2-1.9.22.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=067afe8ff05f2dfd7ebbcf69aece173d
+_md5_=247fa04c3e670c8f9cbd1db659ceb69b
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 077986b7f706..eb52ba55fb13 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.91.0.404 b/metadata/md5-cache/net-im/skypeforlinux-8.91.0.404
deleted file mode 100644
index 45d24e4b1ecd..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.91.0.404
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=8
-HOMEPAGE=https://www.skype.com/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop pax-utils rpm multilib-build xdg
-IUSE=abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] || ( >=app-accessibility/at-spi2-core-2.46.0:2[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] ) dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] sys-libs/glibc virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.91.0.404-1.x86_64.rpm
-_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d1d44ed4d91f6a182391e50fde77cad
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.90.0.407 b/metadata/md5-cache/net-im/skypeforlinux-8.94.0.422
index aaea3830c3e6..3b5fc73ea556 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.90.0.407
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.94.0.422
@@ -12,6 +12,6 @@ RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] || ( >=app-accessibility/at-spi2-cor
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.90.0.407-1.x86_64.rpm
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.94.0.422-1.x86_64.rpm
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d1d44ed4d91f6a182391e50fde77cad
+_md5_=534a6590151f7b67547cda965830ba90
diff --git a/metadata/md5-cache/net-im/synapse-1.75.0-r1 b/metadata/md5-cache/net-im/synapse-1.75.0-r1
index 493b3daa7e38..761d0fd2a56e 100644
--- a/metadata/md5-cache/net-im/synapse-1.75.0-r1
+++ b/metadata/md5-cache/net-im/synapse-1.75.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
 INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
 IUSE=postgres systemd test debug python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 RDEPEND=acct-user/synapse acct-group/synapse dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/frozendict[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ijson[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matrix-common-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/phonenumbers[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,webp] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymacaroons[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/signedjson[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sortedcontainers[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/treq[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemd? ( dev-python/python-systemd[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/synapse/archive/v1.75.0.tar.gz -> synapse-1.75.0.gh.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.68/download -> anyhow-1.0.68.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.6/download -> blake2-0.10.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-log/0.7.0/download -> pyo3-log-0.7.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/pythonize/0.17.0/download -> pythonize-0.17.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.91/download -> serde_json-1.0.91.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=020856b093d2c882abe63582f0ed326d
+_md5_=d0471caefc812b9dfbfea80823e22ae9
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 4993bcd70e18..61ccddc48763 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.8 b/metadata/md5-cache/net-p2p/nicotine+-3.2.8
index 241e0c1840be..ed9443a5d621 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.8
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.2.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
 INHERIT=distutils-r1 xdg-utils
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.8.tar.gz -> nicotine+-3.2.8.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=70db6c4f93202117f5f2f917ca1d9263
+_md5_=f466c0868af956e27e02ffbf69e9197b
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 079abef2dff0..dde598f60172 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/vpnc-0.5.3_p20220927-r1 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p20220927-r1
index c6db4268bc10..93307fd9dff2 100644
--- a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p20220927-r1
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p20220927-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~massar/vpnc/
 INHERIT=linux-info systemd tmpfiles toolchain-funcs vcs-snapshot
 IUSE=resolvconf +gnutls selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:= sys-apps/iproute2[-minimal] gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) >=net-vpn/vpnc-scripts-20210402-r1 resolvconf? ( virtual/resolvconf ) selinux? ( sec-policy/selinux-vpn ) virtual/tmpfiles
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=https://api.github.com/repos/streambinder/vpnc/tarball/fdd0de7 -> vpnc-0.5.3_p20220927.tar.gz https://dev.gentoo.org/~soap/distfiles/vpnc-0.5.3-docs.tar.xz
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=a70ec1089a42990ba7e3e9ea7f1408b2
+_md5_=b9306feba697c20b8493ce872c052040
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 09f47946b5da..0d4159aae6bc 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/folium-0.12.1 b/metadata/md5-cache/sci-geosciences/folium-0.12.1
deleted file mode 100644
index 68a2f60aa965..000000000000
--- a/metadata/md5-cache/sci-geosciences/folium-0.12.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python Data, Leaflet.js Maps
-EAPI=7
-HOMEPAGE=https://github.com/python-visualization/folium
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.12.1.tar.gz -> folium-0.12.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=242250cb5b3476e7f8cd5a6f1ff2b1f6
diff --git a/metadata/md5-cache/sci-geosciences/folium-0.13.0 b/metadata/md5-cache/sci-geosciences/folium-0.13.0
deleted file mode 100644
index ab849d969114..000000000000
--- a/metadata/md5-cache/sci-geosciences/folium-0.13.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python Data, Leaflet.js Maps
-EAPI=7
-HOMEPAGE=https://github.com/python-visualization/folium
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sci-libs/branca[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.13.0.tar.gz -> folium-0.13.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2b8c4590c4a4216ac77c82b0c0704144
diff --git a/metadata/md5-cache/sci-geosciences/folium-0.14.0 b/metadata/md5-cache/sci-geosciences/folium-0.14.0
deleted file mode 100644
index c6a7ecd8ba88..000000000000
--- a/metadata/md5-cache/sci-geosciences/folium-0.14.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python Data, Leaflet.js Maps
-EAPI=8
-HOMEPAGE=https://github.com/python-visualization/folium
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.14.0.tar.gz -> folium-0.14.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6f93f7b8c94b427f38af217233abfde4
diff --git a/metadata/md5-cache/sci-geosciences/folium-0.14.0-r1 b/metadata/md5-cache/sci-geosciences/folium-0.14.0-r1
new file mode 100644
index 000000000000..a0beee7e40d3
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/folium-0.14.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Python Data, Leaflet.js Maps
+EAPI=8
+HOMEPAGE=https://github.com/python-visualization/folium
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sci-libs/branca-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.14.0.tar.gz -> folium-0.14.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=6fd21d123be8ca0d56f35ba4a620c9e6
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b9b901d4401c..9750ddce6038 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/branca-0.4.2-r1 b/metadata/md5-cache/sci-libs/branca-0.4.2-r1
deleted file mode 100644
index eb8851c1d0c2..000000000000
--- a/metadata/md5-cache/sci-libs/branca-0.4.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/selenium[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=spinoff from folium, host the non-map-specific features
-EAPI=7
-HOMEPAGE=https://github.com/python-visualization/branca
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-visualization/branca/archive/refs/tags/v0.4.2.tar.gz -> branca-0.4.2.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=4cf6d5aabc87be331595f79bf32694c3
diff --git a/metadata/md5-cache/sci-libs/branca-0.6.0 b/metadata/md5-cache/sci-libs/branca-0.6.0
deleted file mode 100644
index 5320326848c5..000000000000
--- a/metadata/md5-cache/sci-libs/branca-0.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/selenium[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=spinoff from folium, host the non-map-specific features
-EAPI=7
-HOMEPAGE=https://github.com/python-visualization/branca
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-visualization/branca/archive/refs/tags/v0.6.0.tar.gz -> branca-0.6.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a09a3d96222f0fe3f4201a8efd2349a7
diff --git a/metadata/md5-cache/sci-libs/branca-0.6.0-r1 b/metadata/md5-cache/sci-libs/branca-0.6.0-r1
new file mode 100644
index 000000000000..60f49be059de
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/branca-0.6.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/selenium[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=spinoff from folium, host the non-map-specific features
+EAPI=7
+HOMEPAGE=https://github.com/python-visualization/branca
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-visualization/branca/archive/refs/tags/v0.6.0.tar.gz -> branca-0.6.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=d146c176f257366cac3301fdef00375e
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f31df46c90ad..733aa6f946a3 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/liburing-2.3-r4 b/metadata/md5-cache/sys-libs/liburing-2.3-r4
index 752d194a3587..dc879f48b27a 100644
--- a/metadata/md5-cache/sys-libs/liburing-2.3-r4
+++ b/metadata/md5-cache/sys-libs/liburing-2.3-r4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.3.tar.bz2
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8646efbf0cbbc8743bb65673ae2c9d02
+_md5_=d15a8a44ef41d428f39f96b42613d48b
diff --git a/metadata/md5-cache/sys-libs/liburing-9999 b/metadata/md5-cache/sys-libs/liburing-9999
index 3e588e76762e..deead43d4dff 100644
--- a/metadata/md5-cache/sys-libs/liburing-9999
+++ b/metadata/md5-cache/sys-libs/liburing-9999
@@ -5,11 +5,11 @@ DESCRIPTION=Efficient I/O with io_uring
 EAPI=8
 HOMEPAGE=https://github.com/axboe/liburing
 INHERIT=multilib-minimal toolchain-funcs git-r3
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=sys-kernel/linux-headers-5.1
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=328aa0ba63e1272b7c71766e09b706eb
+_md5_=5e5dac20108470b9494c36e9ba53f992
diff --git a/metadata/md5-cache/sys-libs/tevent-0.14.1 b/metadata/md5-cache/sys-libs/tevent-0.14.1
new file mode 100644
index 000000000000..13c0ace3091b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.14.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.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(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=sys-libs/talloc-2.4.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto ) test? ( >=dev-util/cmocka-1.1.3 )
+DESCRIPTION=Samba tevent library
+EAPI=8
+HOMEPAGE=https://tevent.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.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(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=sys-libs/talloc-2.4.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://samba.org/ftp/tevent/tevent-0.14.1.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=184ecf92066b746c6f07c671b370e53c
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index d5b947f8272b..c59cc4685b66 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
index 823cf4aaadd1..9ea151d92a48 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
 DESCRIPTION=Configurable FVWM theme with transparency and freedesktop compatible menu
 EAPI=8
-HOMEPAGE=http://fvwm-crystal.sourceforge.net/
+HOMEPAGE=https://fvwm-crystal.sourceforge.net/
 INHERIT=readme.gentoo-r1 python-single-r1 optfeature
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/fvwm-crystal || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] ) virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc app-alternatives/awk x11-apps/xwd media-sound/alsa-utils
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/fvwm-crystal app-alternatives/awk media-sound/alsa-utils sys-apps/sed sys-devel/bc virtual/imagemagick-tools x11-apps/xwd || ( x11-misc/hsetroot media-gfx/feh ) || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.7.5.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=10c623ecaf4015bdabc3878c20b2cd6b
+_md5_=bd45e75d3e6920d88fdb46e0b934ec28
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8d446f98f599..565588a1c229 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-19T07:39:39Z
+TIMESTAMP 2023-02-19T13:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPx0jtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPyJp1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCBbw/+JjrAU/8ngktE9Svxrm1SE95QILUygbRY0zN4Y9eCfi9Xr/uNhZ1Jb9+A
-Xe1y2duG2oIAMoxBH63gC47emsaSAFwPwp6KF0WuedZOWR2bnrDKKA6W5L3SRa2f
-qONnv9y9xkxAEb3jpcdQ0usY1MssD8VbZhxKr5/Mg7obWBGDwouSL0edWnVm/7iB
-LdlL/qXKV+kvhaCby2YIylTfWCZu8N1xiPHIgTvMY+FeavSytEJkNpy2FpWuuR1D
-q3cN0VpQ/9KgMjqbIczghlsZyrpR/i8CgcgSnUo1szDfsMlRMZb9YzpXgJrPr7h2
-0XglyiJNCq/9+1GBgfS+DZE1Uz4lDyYYzWjFMQCz8D1sGw9yiHEAnRW1XBDCEUAI
-/QFJ/1OkFwfbSowyP47vL69iejvQKkYCVrqsbgyMK8yxupUs//RFV9QsRUHbPR+6
-bfd76KZUYBgdn+s1s6/e08LFEsrmd3nWoLpeCiSvZWp2D5LK68EESzEsM73guRLM
-pe8LWwcwT5FoY2Tq3YTa8ylpflMh4wOzaMNxY4mo8UzmUp7mp+hqaXQT0AwShiZv
-D79Wo8Ya7pF0Snz1QBmjgpJ2QaN3lmE3rTqEcmqMthXeqbw4O5WhoWyHho1zA0kP
-bXG3GQc6i/zkqrrUXsIWUsjGsFecS0uEUMcTA+encVj7o3en4OI=
-=lU6O
+klAByw/+LyBplidiFpunUbBckX7M3My0hd1Xiwv6QrwI0fRsSlwkIo4+LuGlK5d6
+T3yWr0Fgjx6a4hMP1qWtWTYycyvLKfs4EiyuMcwMycmZFNoaviWSFPMTuFHXRyVE
+fUMc5UjcECHqXrXnvcOHMOkfnJaBuaoqBmtgo61Pp0nejKU2C/X760Z4ryABlYYl
+ZOPsKcYNxpE87KiqE42mtUvHJP8+migc6rperyB62J6+qdlE3ACkoAftEPjfVTvZ
+DON5iR/G80JYgbGFaFWGcbcHKJACDhSdNQuzgMWlmOm/5wbQ7Cq3U2MhFfNMIjyO
+fZK2+inmFRLcpVsdp8C98wTAY8LgIeMpnJPhSi4B4Q2XyH8B5X8KPJ7HHu/KVa/N
+Z1PDP+puCqmtWoDtIWGS1BM16akbdY4WUnugXKt7JFaFFWu3AFO6RCmxzVgbmWWk
+HSlkXtMT2pTPHd2upQDayZW7c/+qtikc273QFk+9ioDZjCFhiaaXxFLuah4HkmhQ
+UBXhpUo1l80Izt1bpS7RmEQo4mMlQAmCuy2MHzPHi8Qs+6M9nXRqi8zgTP+ix5c1
+8AVDBjBVIPefetnCkqXByMlcX5LvWUHpejlwIrLu1D8HxgZ2m+EKSDSJaM39DiO1
+IyD9PZBfo/WXulbEVk6pmDvUFxmV+0szwJWiTgNadHn1Kg1GTiY=
+=IGz+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 79ffe28c2629..42b03970ed51 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Feb 2023 07:39:36 +0000
+Sun, 19 Feb 2023 13:39:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e47cc3b588f3..cbf36d2b5307 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Feb 19 07:39:36 AM UTC 2023
+Sun Feb 19 01:39:37 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a78d1d1e51ba..87485223b51e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Feb 2023 07:45:01 +0000
+Sun, 19 Feb 2023 13:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b8ea43537d21..51ce1f30a567 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-6c6b1231149c2969230966288d4e9ac223c0d9c1 1676787787 2023-02-19T06:23:07+00:00
+eb2ef01b7791b3a3c6acea5033d7c9cd4826b048 1676813055 2023-02-19T13:24:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8741b96f8fca..33fd24d5ccdc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1676792401 Sun 19 Feb 2023 07:40:01 AM UTC
+1676814001 Sun 19 Feb 2023 01:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 79ffe28c2629..42b03970ed51 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Feb 2023 07:39:36 +0000
+Sun, 19 Feb 2023 13:39:37 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 26f08e67ca90..f323d6f335e8 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index ff57a520ff5d..2d52cb920af5 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-DIST skypeforlinux_8.90.0.407-1.x86_64.rpm 126406385 BLAKE2B ef3627e786b60a512576a6cee5af8b53c10a54122cb2de784a534c5effb13ea053070796a52c6672344dc5abb6dc3b503e89a1f14960c8990173b21acfc0b8e2 SHA512 ad74e6e8006f23c2f70f67373fa386e19e3b9e4da5e1ab29956191bb3626099d06ebcc80ace458401dd4f4a62d894eb735f7be0a60b6f668d576aaadf119d39d
-DIST skypeforlinux_8.91.0.404-1.x86_64.rpm 126481575 BLAKE2B 36123aa02ce6099908a7abd0d6c79ea61220339d37613588a251e0f53c605f2aba7c23d653a8f06b17d5d78323dcc3228ac3b5ac0fb90489cd318f2a1d82ebbb SHA512 0199db11aee8a01dcc2e137f2deaf6600caa92d75b113ba65c2869eeda705c3be0e4098c1697c50a75699979ed65389e03befd9de31dc7fb9225452278212c11
-EBUILD skypeforlinux-8.90.0.407.ebuild 3250 BLAKE2B eed5437754666a9da47304ab1da0539bb8e3e0e7f7e462b7e0de527038cc024f7f0d3c513ffcaaacac9d4c3223de6aa07b26f14f00d2bfa5b9ee872857909eb2 SHA512 09758ed08729dbb173e6d03fc0dbc1e04f3271ba42ff1e837d73bddb88a07a55fe67d64bfd59986a3af67e39d11e170459a2e92e1cf51f7f911cbc3f6b3bf55e
-EBUILD skypeforlinux-8.91.0.404.ebuild 3250 BLAKE2B eed5437754666a9da47304ab1da0539bb8e3e0e7f7e462b7e0de527038cc024f7f0d3c513ffcaaacac9d4c3223de6aa07b26f14f00d2bfa5b9ee872857909eb2 SHA512 09758ed08729dbb173e6d03fc0dbc1e04f3271ba42ff1e837d73bddb88a07a55fe67d64bfd59986a3af67e39d11e170459a2e92e1cf51f7f911cbc3f6b3bf55e
+DIST skypeforlinux_8.94.0.422-1.x86_64.rpm 126401643 BLAKE2B 16f5ef2adaf8f3fe9bbe2358ceaf60185da41f221ce9eb61fdb007d1ec07fb8adbca37a88a4a6399b9a30f98fdce26af9174f34a4e1589243d9e4120f0817d21 SHA512 4a1b8869e3c710e2895dcf832654e83379b7ef28ae3ee6e42cc739549cc9108845df71c4e9282f10d764bd3c280c45fae3859ebd3b38f29039f6230aacb0c462
+EBUILD skypeforlinux-8.94.0.422.ebuild 3250 BLAKE2B 760f4a7ffe0493541d0b941ee83cf0ce99150ee90aadcbe4ad2f244fad2b0df5218e240500428f4da3d40ca7a586e135878083d2c4173fd00009f50fa91641b7 SHA512 cdacf86cd0534a1f2d204dbeaf689f2e62903308561fe68b88d981f5c985eaa16d1057226e786e243c87d48619a77cc2828a0701d749ef328b577ba2f6e924d0
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.91.0.404.ebuild b/net-im/skypeforlinux/skypeforlinux-8.91.0.404.ebuild
deleted file mode 100644
index 75d4118fd051..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.91.0.404.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-S="${WORKDIR}"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
-		dev-libs/atk[${MULTILIB_USEDEP}]
-	)
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	sys-libs/glibc
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${ED}"/opt || die
-
-	# remove chrome-sandbox binary, users should use kernel namespaces
-	# https://bugs.gentoo.org/692692#c18
-	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.90.0.407.ebuild b/net-im/skypeforlinux/skypeforlinux-8.94.0.422.ebuild
index 75d4118fd051..607425b45c47 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.90.0.407.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.94.0.422.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
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 40446ac83ae1..d08001cb159e 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -67,7 +67,7 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD synapse-1.74.0-r1.ebuild 5336 BLAKE2B 0cd2771214930a4bfd259625e6daa9419e5e489e9c1d0fe331801004798a8e1eec069999857f7e282e4155e4691009dff0be672995824cda11f1058e1593c03a SHA512 d3d5f30b0eb881381bf02a2f3c64d956f5d57aaa867c121304d8c9b8424cd236e023f1342379a629b86d689321f1c3a89d187cfc970e5c8744debbfc8f3da09d
-EBUILD synapse-1.75.0-r1.ebuild 5337 BLAKE2B 1c7a52a17b15b97af8c659c2a186eec4b172c2a565a1d0220714a04d3985e981ec24a2a8e8a4f26ce9597debe33d3dbda69d3e3932351476b786a5b181e94147 SHA512 acd8f0d285cbd2b978912429dbfe8e5d67d0b22db730c4e4ff7a317b122427297607976185fb9141af0358b7e4abf8c1632ba847aafa97eacafab3ed1c534233
+EBUILD synapse-1.75.0-r1.ebuild 5336 BLAKE2B 1dae87dc568ec5bef166d275202575deba6edec5d243bbbe1aebc54c13a04e5916cac61346f813f075aea5b52afe4249a9b012873613e3b5d5eaa32b4b2019da SHA512 f67b132f018b0c6a26098ab8832cf0824f22948b413ce4796a56dab9b4fc7023b9ecd86dc6bc3505e5ab4b011fcac7d3e39123a4b66f2f11d10ededc4f5220e3
 EBUILD synapse-1.76.0.ebuild 5337 BLAKE2B e0902bae51880da7b10eae7e73135af22960caa12874ff095867e57bca3156917bf12692317cbcbd1a2b05733397650cbeede7b94fff5cc6745f24f1941ac5e9 SHA512 36a02880698fb1947e104a9970855528ebcd4a6820df1ed794bab137b7af3cd3c82af92d14a16e9487ac4afceb20d8e007b975c680edaec3e5df8d5a58ad459d
 EBUILD synapse-1.77.0.ebuild 5288 BLAKE2B 5b705657e6f35d580d67c76319be77ad5ba66e916082f54fbc6b52631b8071e95131a4a49bb70071c5be246a569ab696a87b229c3c168c9d96de82144120b220 SHA512 a4b1d3d9214a96cf0fc321da1662c4837c4d2c42ff29e0ecff227c5afa4f65ba8a63fa57ec6ba6a11fe6a6a91570124c6c7213f5df59e13fbb8447ec53cf8bcf
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.75.0-r1.ebuild b/net-im/synapse/synapse-1.75.0-r1.ebuild
index db822497a82a..693861fe92b7 100644
--- a/net-im/synapse/synapse-1.75.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.75.0-r1.ebuild
@@ -85,7 +85,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 7fb7cf19e33c..029ee5250310 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index d00692e804c5..f4eb420670d1 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -5,5 +5,5 @@ DIST nicotine+-3.2.8.tar.gz 2984416 BLAKE2B 8ca996e67a296535a158d1929579c4f47963
 EBUILD nicotine+-3.2.2-r1.ebuild 924 BLAKE2B 1d1059c3117d93e4ee3181d5f3af1835c4498cbebe112661b34ea9d4019482a44470e67480c847c75b2d4ab174a76c4ec5fc8c465d339aec78b036dd4cb3c679 SHA512 e4675f63ca95681bc18ccfa293732a5036f91bd54da672ff0de3f4a9670603c329f26426fe324f75c08277df42ea7e3dd96a5b96cdd420583bae9c7cb64a537b
 EBUILD nicotine+-3.2.5.ebuild 844 BLAKE2B 04f85eab370c067b2ba879d568067cd42e84420c7998a58d8b134def531646ad1908fa26b0ac986d73e526404366312ede8769a7e144a0976db89461547a9890 SHA512 0e937a3bfe27f5e022e6b707144dd3a3b02bba784b6b1133ee47dc98ac01de43d0bd5369e7cfdc655b17c6b71425cff0e46135b8f82dbb7b7bff97298b080d1d
 EBUILD nicotine+-3.2.6.ebuild 842 BLAKE2B 6c207c3da6ed04e5b8758ffb1d4a350dc689b04ba83410a7fc395efc403e7dbace519e43c6c38b276804aa96ea48a333108968252a1bac94c040c51f454e08c1 SHA512 b06e5b464e1d8efa1b0f937aa7351ea22c6c7c44564ec7077553bf695967dcffcc0aab8e54b186bc3789030f3887388ca3507a1c4eb5050d4e27614beded51aa
-EBUILD nicotine+-3.2.8.ebuild 844 BLAKE2B 04f85eab370c067b2ba879d568067cd42e84420c7998a58d8b134def531646ad1908fa26b0ac986d73e526404366312ede8769a7e144a0976db89461547a9890 SHA512 0e937a3bfe27f5e022e6b707144dd3a3b02bba784b6b1133ee47dc98ac01de43d0bd5369e7cfdc655b17c6b71425cff0e46135b8f82dbb7b7bff97298b080d1d
+EBUILD nicotine+-3.2.8.ebuild 843 BLAKE2B cd36ecb546c9c3a3a2d858475162bec3652ebd04d4ca4e16a2e8d55fa66e9df5de767679b21f23d9264b9eabfcf53d55fd683ad2bc94a09bfc263853cef33211 SHA512 c31d460150a12d3f931625f36f44277d13476e46045b46e24192601b1c785adac1107f0e16ad3e586ad21c20a61b2f878d563ee5c16da4aaf49aef5588786195
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-3.2.8.ebuild b/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
index 4b5e695768b5..51e0b647c9b7 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0f190a702863..a495af69ee7e 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 9731347ae2cc..989599c3ea26 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -6,7 +6,7 @@ AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d699
 DIST vpnc-0.5.3-docs.tar.xz 4816 BLAKE2B fe972fb71e74dea481593ce42225a2969608dd4d29a2f34ca1f7b5b82a71a62bfbd94d5fcd2e8db830768be1e858682904e655b8629cb164961644bc5de291e1 SHA512 e3e9f3e3651906f41a4a6b0f4247b903fb555155cbda210823f36a5613d8390b6aad7615ff88fd627ece4037b0e0f04753ac924c9cd9c1335480ca8186d476b8
 DIST vpnc-0.5.3_p20220927.tar.gz 119773 BLAKE2B 0dabadac8b5a8116c07597140b6fa31e8f7daed9448e1bf653491809453ec114c0e96d38a8103d90a8b68dd2cefa0540ed676ced3fb9d57eaf16d8be5e3f0fa1 SHA512 e8c2254042c67283749331349467b2aed29ececc26de0bc3227c9c4a14f06d9d518599b28ca979df0cbe997c8997dda8afa508a0858c80ec270922096d8f906f
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
-EBUILD vpnc-0.5.3_p20220927-r1.ebuild 2487 BLAKE2B 2768f6219e98890a1f2ba9f4560e93fb54038a746988baa9b3cb698440eeb37e02d25971f338ce7518a1c69a4b3454552a518283c0b39b8dc9494418f7586f82 SHA512 2ee97214081e83b20a5c5dd0e90e174b19072d0d7a9b085a346bd66b7d13bb802199999928ef05c9b665a16cd71f87ab78e01d8988e2fd8b385d1a6535b79b16
+EBUILD vpnc-0.5.3_p20220927-r1.ebuild 2481 BLAKE2B fba0a8e31417185c1a3316891727a4a85e7e9b7532125c8f275ffab0ed654a57f24a13739d406c40500e05f3d12c8175c8d26b98c0db7948eee987a4ce2ece17 SHA512 7428c7e90b3fffccd15ce60c2a334bfdbfd0e677b2b491cb2e18aeb0489ec7cb15186c7388825f30016b10ceb0cfcdff25196d5dbaaaa24fec5e99577692c418
 EBUILD vpnc-0.5.3_p20220927.ebuild 2510 BLAKE2B a524cfd482333ebd14382e8416a0ca36bc7b9cd0bc9834c746ba9c8b40c0721a6ba3ab3535cd77db56956296529a18189bf929f0f2068d496158f57646dcb821 SHA512 3e02bd8ea01a69dbc366f371639e9d6f404a024a70bfff0870555a2a120d4e1ed92df147bd088b2c0d6a94c0bc8facc1aae027abb07f0a331f67d37691c571df
 EBUILD vpnc-0.5.3_p550-r3.ebuild 2299 BLAKE2B f16d4c12cb5ae5373a2017ab2220bd9f52bac52e13d9ca43c54184d395f50b4d4bc9481606bcf4c1fd41a666c09362fdd68bdd69b35ec93faf603113aa149c07 SHA512 0d37011d53ed0acf1b9768ed544511d543c8299e01b5c565ae00897e12fec297b36b9cd135265aa0ff36040a0367659088642e58202fd1ceeba7f9f0ad2a8272
 EBUILD vpnc-9999.ebuild 2487 BLAKE2B 2768f6219e98890a1f2ba9f4560e93fb54038a746988baa9b3cb698440eeb37e02d25971f338ce7518a1c69a4b3454552a518283c0b39b8dc9494418f7586f82 SHA512 2ee97214081e83b20a5c5dd0e90e174b19072d0d7a9b085a346bd66b7d13bb802199999928ef05c9b665a16cd71f87ab78e01d8988e2fd8b385d1a6535b79b16
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild
index 5f4e12444a64..de63a27635f2 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="
 		https://api.github.com/repos/streambinder/vpnc/tarball/fdd0de7 -> ${P}.tar.gz
 		https://dev.gentoo.org/~soap/distfiles/${PN}-0.5.3-docs.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e80670663094..cab47c89afe4 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index ec4890806d8e..1c57f99c3448 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,11 +1,5 @@
-AUX folium-0.12.1-gentoo.patch 319 BLAKE2B f859846e54add4e65a92f7e3a71af4f71b77bc9e09e682fe8b16af6a2e79e166bc73e9329e468cc7af22753615e4ed945f9934f35617147adcca4f046ff482d8 SHA512 f55ef6e0fb50d3b5ac057d118c047b1c7b70c09a859c30d676bbc59efdf7a0a2276d0bc8514b1367306972b79a3d2e7d3afe4f5a25b554eb904d94506ea15809
 AUX folium-0.12.1-scm.patch 439 BLAKE2B 58d054e56a0ea38d63c75fa43a5cdbbf671abbf5f7c67649dc1037ca83a8bce6f388a904666b89681a4ffc3f5c517cb2eb5e7b37f2f3e577b7bdbe5f0fe80130 SHA512 aad8a6c22441d593b7895565f7cb37621da4882123e4d40ec4370d707a58c38cf9de4b5fedc9b2e229138fde5e33eef914431e0f9f7761c5a1b9d8b0f6414b04
-AUX folium-0.12.1-setup.patch 268 BLAKE2B 2b4dd0fcbd9cc44978fbdb2db6b9fb2cc697fde1805db68327503e152df17a30a0ef3125507337c78ec31440d9bfd9a7d8264f7ce0ed967edd5297055ebf286c SHA512 2ea66a0e16bc40385cb8202865d1b9d25e480078e120be71f6042d4687704c114d4c46908b43ef2aa6f314b8ff44101ac934cd24fcf58797b49a0198355ee880
 AUX folium-0.13.0-gentoo.patch 414 BLAKE2B f1f435b22c7c264ad11fb1a0127534646f0f297d27f918fd79771d80dca0485153a7a7cfe4274d5c35fc77b02ae74c2b3e91fc42145d2481b782125316390721 SHA512 acb0712621fa67f71fe41284b945be9b1267f5db2479ead189a448ec51295f1fae0be57feb8bd0af0d7654aad1ba61c796fb70f9fc6ad7e56a0ceb99fcce5527
-DIST folium-0.12.1.tar.gz 20033236 BLAKE2B 00e9fb369be9300ca04f9ba3fed18ca28a4985111ccd358312570773b80906df292e14a6f4acbd8ea7686f1b807017f729ad918b3b025af321faf5d7686333db SHA512 b19d2180c36160a370e6ab5ccfacf74ba7b735610d43e69a5200529c776e9c11ee42f4f7fa1ee54621f52b0f2e1fc1f86bc9a146c4a924831b12578643a69616
-DIST folium-0.13.0.tar.gz 19999296 BLAKE2B 4a774e36715c33e0c28a3fb4a8bffec21681ad9f1ffa617a39962f171e8ac28a55ba26aa6c7bc7c7e80f65d0ce5ef4e4c5edb5db0c166462a10adcd1d1b498ee SHA512 013707216e1e289f0ba3421c9db1d90f207ce41e7d05b6dc72c0f8f5a82dfe2ab4e0f3a797bbd6be65d2ee160722492e82082e38f93ad18507ed6409b41d009b
 DIST folium-0.14.0.tar.gz 20121396 BLAKE2B 8b6014444e4992ae6828f844d197f475d0050567ebaf630b58015ed08274793d3837903cb7a4d7f28da14bb47d8d65a6d09e097b7765fc0a115224aec521854a SHA512 2aec27c731a4d2c835172d0e29d4ddbce745ec5665e168f392fd9693d9b267f734b4a7275ae202fccba17501320414abefd332376bc917fa0fba72bcffade43e
-EBUILD folium-0.12.1.ebuild 893 BLAKE2B bb3f5d1a1374e95d72e80dab89fec79b45982a78ba91f304d272e50643df3d3d47ed3e34c11c9d2efa6b65e09fdc266568f5aa598b898df953124b8c2feade88 SHA512 83a1d04124a520e4ff53c4f832a7899cf7bf9d9656028e3ea91b295385e9fe38ab713b1025a7daa15b1d4a3932f631ce19ca72191f7fb93be60cb37a9fb70e8d
-EBUILD folium-0.13.0.ebuild 869 BLAKE2B 13ae080749df3f7414b2740f8f14fefd976d3552f8bc535883fe10cb39ae50b8a50ed47a7b10d1a3dfddb30c022cd8a4323ce26e624d93a92ec7a7e6b5ab61b2 SHA512 121b09b38ae852e8e3f29a5dc439932977fc3d2349d36f2598163c5ce46bdb49a2b15cd7146e5dde73e89f7f5fa49571415a95a53491c47e11be8a66dab63372
-EBUILD folium-0.14.0.ebuild 1220 BLAKE2B cfe3b690da24faa42e41bf25e668a3cd507c8633a3886a587796edd4dadd79ca41602815d84810d497644bd9dd31f89175ca33e6cfa1286bb65cdd298db16185 SHA512 4db124098543a0841213db6015f8f96050838171f0d51575b334a4fc40c00a9371334ee4c79a3c1c13b542784924b08a4fc75449979568875b241171fbe6bc45
+EBUILD folium-0.14.0-r1.ebuild 1220 BLAKE2B 7664b6909579e617ec90c9628fc4cd5b25ee849d1a489c2aa528fcb73fe0ec0135abf5717c4ed82a59daa1381b32de82d98426380f546247a743820897c5fa22 SHA512 a33f76dc3081ad701d5165a4f4b5c288fbd09f0394fb4d325d7e912a3cc168515a7f73c298251155781b25f1c2cdaccd66379c679e0037f938635503d41cf2e5
 MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209
diff --git a/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch b/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
deleted file mode 100644
index e2fbf5f35e15..000000000000
--- a/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.cfg	2021-07-30 23:31:49.026429515 +0200
-+++ b/setup.cfg	2021-07-30 23:32:04.638212109 +0200
-@@ -11,11 +11,6 @@
- parentdir_prefix =
- 
- [tool:pytest]
--flake8-max-line-length = 121
--flake8-ignore =
--    docs/* ALL
--select = C,E,F,W,B,B950
--ignore = E203, E501, W503
- 
- [metadata]
- description-file = README.md
diff --git a/sci-geosciences/folium/files/folium-0.12.1-setup.patch b/sci-geosciences/folium/files/folium-0.12.1-setup.patch
deleted file mode 100644
index 9689d36b3a7c..000000000000
--- a/sci-geosciences/folium/files/folium-0.12.1-setup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg	2021-08-28 17:01:33.388959675 +0200
-+++ b/setup.cfg	2021-08-28 17:01:44.492801731 +0200
-@@ -18,7 +18,7 @@
- ignore = E203, E501, W503
- 
- [metadata]
--description-file = README.md
-+description_file = README.md
- license_file = LICENSE.txt
- 
- [bdist_wheel]
diff --git a/sci-geosciences/folium/folium-0.12.1.ebuild b/sci-geosciences/folium/folium-0.12.1.ebuild
deleted file mode 100644
index 71aec9115fb0..000000000000
--- a/sci-geosciences/folium/folium-0.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python Data, Leaflet.js Maps"
-HOMEPAGE="https://github.com/python-visualization/folium"
-SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-scm.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-setup.patch
-)
-
-RDEPEND="sci-libs/branca[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r tests/selenium || die
-	default
-}
-
-python_test() {
-	epytest -m 'not web'
-}
diff --git a/sci-geosciences/folium/folium-0.13.0.ebuild b/sci-geosciences/folium/folium-0.13.0.ebuild
deleted file mode 100644
index f886eee993c5..000000000000
--- a/sci-geosciences/folium/folium-0.13.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python Data, Leaflet.js Maps"
-HOMEPAGE="https://github.com/python-visualization/folium"
-SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.1-scm.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-RDEPEND="sci-libs/branca[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r tests/selenium || die
-	default
-}
-
-python_test() {
-	epytest -m 'not web'
-}
diff --git a/sci-geosciences/folium/folium-0.14.0.ebuild b/sci-geosciences/folium/folium-0.14.0-r1.ebuild
index d0c494c7127a..07ccbd3ab761 100644
--- a/sci-geosciences/folium/folium-0.14.0.ebuild
+++ b/sci-geosciences/folium/folium-0.14.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9bb49b8cb3aa..7e2e6ecde7e7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest
index fc683032679a..a910c064a92e 100644
--- a/sci-libs/branca/Manifest
+++ b/sci-libs/branca/Manifest
@@ -1,8 +1,4 @@
-AUX branca-0.4.2-setup.patch 317 BLAKE2B 7394a0d332202df1024e8099fcedd7e7a8b85a4a0b7e6f3422350ba45b33159110e0cda3e8091ab606b7a874b0bcfa9ede33fa31c6d32d4ea041302dfe9c0f14 SHA512 ef7cea556bd272f1711be641b8f7a99b96dd049756e8681af38caccdc232bfafe919fcf30c66d6dcab2f77adb6a83d50094c0d45f06513b3368ecc57937825ab
-AUX branca-0.4.2-test.patch 358 BLAKE2B 087756ebe2507101eaf8c18b2726294b3eec99f7708fff092217b6083ea4f85878c2671671fb8bfbddf92822b60dbdcc737bc0eef0d46b33e1e74f00e244c470 SHA512 81d6542e259c7233e3a2c926b07cadd9fbc930db7d25f552d8febb70f3d689f57f01c49c0b6cc5e795e7fa817a7989a05a8b2768162d730b021bb6a4f2ff3925
 AUX branca-0.6.0-test.patch 333 BLAKE2B bdf1a556ff4b2e8b023a216a84af4b97cefe1c86177504f93882f1f68d66647de120ca58c8a40322a908e7fd03ea5ca96933fb8618457bb6b2fc18dd2983825b SHA512 eeb8c56922a5e35cb092d5362bec3fdf4f516ba38e7febdb37d672686f21165bcb5213d739ca52494eca2d5017736bb4a3495d91aa80612413fd86d900ffe0dd
-DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6
 DIST branca-0.6.0.tar.gz 40167 BLAKE2B 23cbe442862e9575d84dfb5bb1760acf2a1301be0f68bedc9965d9d3a8be090755f78640ed919b5ba8521ab30e8c52c69ea87ff2772d9fd6b3e338680b5219bb SHA512 e80b3d173bc487857ab42d10365540e91cb6fc5def61bb76f418e2da8e74c9bf69e0ca46f86a47f96f5db48d0e98d6ad3091107dd1a5ca479c52adbfa3a79a9c
-EBUILD branca-0.4.2-r1.ebuild 811 BLAKE2B cd47f56943374b0b7a642dca9e830d32ff2184dcc341472cc2eb35dcff7a7434e2459a39f6d8f2c089216d4c5f0317c94d385d2a8e24fe4141b7e3ddf849206e SHA512 1ea84050018a2d432dbfd96638a6bcd9177b263456737aa0c1b36bf85a41e3ad442152ed7e4b85ca1392a99aeb6eb0e9034c2ad662ecb1915a13bfb72d13caed
-EBUILD branca-0.6.0.ebuild 769 BLAKE2B d3c28347ef86bf443b85c62d6d33d2352315aff4c011baa6a448190438d5e49131299f88790f7851011623215bf005af82e0c9066e103e56f638dba65f4de96d SHA512 2497c1734eef54d6730f29bd56bc951b4173a013c867f211a3edbd7ec53c3f19f569c8bfe3f31c589d259097e491d10919b5b73f2d6660d775113cda568a213e
+EBUILD branca-0.6.0-r1.ebuild 769 BLAKE2B fc2fcf07b90f5aae786780307fc325d26cfa62a5c78583a1f237200f7daf2895dd2d95cc2ea3efad6dd13fe15a1badbf4391105193959ce297a90a29fcd06587 SHA512 c7787873e98d452d61606e60a821267af96db41c2f1173b8b18b429c72c33aee1938cf99db086740211dcacd5b114dc082b4f4ff4ab9440cad0f1ce19e45670d
 MISC metadata.xml 567 BLAKE2B a65dec67ea324de3bd665152174cd5d8ca121d2775e9e6db7d15f2c1a2b60058f8788769d2cd4ae54d454b667b9581fe84006b2eebfde99ccdb63ed5d015ff6c SHA512 9cff06968cb58902bc68dab33859310746e7fba3420a53f04c6fa45c5aeda061a68c41343b71240670b21d116d80fe9e6d40c7ba281e2910b7a95caebfcd5dd8
diff --git a/sci-libs/branca/branca-0.4.2-r1.ebuild b/sci-libs/branca/branca-0.4.2-r1.ebuild
deleted file mode 100644
index 23ccfa89c3c9..000000000000
--- a/sci-libs/branca/branca-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="spinoff from folium, host the non-map-specific features"
-HOMEPAGE="https://github.com/python-visualization/branca"
-SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-setup.patch
-)
-
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -m 'not headless'
-}
diff --git a/sci-libs/branca/branca-0.6.0.ebuild b/sci-libs/branca/branca-0.6.0-r1.ebuild
index edbdf573dee9..91ea6850fcc5 100644
--- a/sci-libs/branca/branca-0.6.0.ebuild
+++ b/sci-libs/branca/branca-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 inherit distutils-r1
diff --git a/sci-libs/branca/files/branca-0.4.2-setup.patch b/sci-libs/branca/files/branca-0.4.2-setup.patch
deleted file mode 100644
index 6ceea6b252b8..000000000000
--- a/sci-libs/branca/files/branca-0.4.2-setup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg	2021-08-28 16:51:20.436726385 +0200
-+++ b/setup.cfg	2021-08-28 16:51:34.275526771 +0200
-@@ -20,7 +20,7 @@
-     headless: mark headless tests (deselect with '-m "not headless"')
- 
- [metadata]
--description-file = README.rst
-+description_file = README.rst
- license_file = LICENSE.txt
- 
- [check-manifest]
diff --git a/sci-libs/branca/files/branca-0.4.2-test.patch b/sci-libs/branca/files/branca-0.4.2-test.patch
deleted file mode 100644
index 8c1525d69bf7..000000000000
--- a/sci-libs/branca/files/branca-0.4.2-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.cfg	2021-07-30 21:13:41.303271681 +0200
-+++ b/setup.cfg	2021-07-30 21:13:49.133164898 +0200
-@@ -11,11 +11,6 @@
- parentdir_prefix =
- 
- [tool:pytest]
--flake8-max-line-length = 105
--flake8-ignore =
--    docs/* ALL
--    versioneer.py ALL
--    branca/_version.py ALL
- markers =
-     headless: mark headless tests (deselect with '-m "not headless"')
- 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 72bbf29734d9..d5830a22635d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index ac417b864f21..d5b21fdee6b5 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -7,7 +7,7 @@ DIST liburing-2.2.tar.bz2 172733 BLAKE2B 19ae8a356e4fdc296bfb3ff121b777bd7c97038
 DIST liburing-2.3.tar.bz2 197929 BLAKE2B 94ae2a79522fbac13c071ad752f5cbfae3e3b3dd6b35da24e5c756ba47a7b304e5bcb18391ca23fc2edafeb2dbcdcf143fd2cda71656396ac34248159a964fb7 SHA512 341aa13d3b560617f3710291945ec2fe35d828e0b67ee3a97555fd4eb3d2042a7f9e722080d8ebb45aa74a2ca4ef58db1e8a10c351e951a604da007ba69d2738
 EBUILD liburing-2.1-r2.ebuild 1724 BLAKE2B 900c92124e14b809a698f48b81536e4b6c37e6629169fcb0b668cefb51cdcba84d7555a3eff957b0bd1b9c37bb2f4005d9c2bae569b6a1b852043c77614f3d02 SHA512 385c3f5f1d2d5bc38463d758d317ce58ee57261b80e039772a3a050d4aa870dcd80f4a7d5247e6036aea777494edf40af6669438ea4ef9b1cad87144437789aa
 EBUILD liburing-2.2.ebuild 1574 BLAKE2B 78ebce489d9b427f0832118b0e752cc8cb033a7b98bbb056b85222d69e355d01ca3c3ae3e1a9d9afbad14f0aaa4cdead017a580fc32734adb8097e0bd43f4854 SHA512 84002d4a80e24bc4516170a720f10a15d7fa94e5a7a1831c38be7e109bcc0f90423cfd9097569be4b3af45be366ea1c537fb9626012fda502377fea0438d6b83
-EBUILD liburing-2.3-r4.ebuild 2308 BLAKE2B 6a60d2aaa46eaea04d8b55a349942f602c5f9253ea89389fe3f2511c4ca5ce2bc82c14bf5e866ac3d3e9bf9f7000877cdfdb6cbe1e4f218c53dbb803e18bb768 SHA512 32396f85d8020751848a91a437e4ab2217db97b033129f0d33baf8bf2917b32dea5a07843ad88092a2216532027ffa955b6ea6a2a26e2b4902102a1e6f87c205
+EBUILD liburing-2.3-r4.ebuild 2146 BLAKE2B 4a9e6a25a6b338e617b6b9941d38312f90f8844e6323cf32bcfab35ea29f459d2569c7a8074dfd947bd42cd59fb7ff9ac40ff55e96db36ca6fe27a2fda339944 SHA512 cd3e2d5ee2c686943e8b565576f2bef91709d21458a47a9e7a70c2346e0d316eaa461cd45c9a3eb4696341b1896b5885dd77d3350a7d68dd221947971469879c
 EBUILD liburing-2.3.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
-EBUILD liburing-9999.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
+EBUILD liburing-9999.ebuild 1896 BLAKE2B 443616eb7133f1887f69373deefc21af17dea96774a15457f906fe269f3e2c6f1bac9b929cc68684d3a3326f46fd10f1fca8efb2ef2f5c43e320a111c34346c8 SHA512 20253472f8bd1fb541cac0f21aaec4d6b3f1106ff9e61bc82370d7f6d65388739dc4246b53c6171156647b70af6c11d88d6993160e8d8088f0cce648156055ee
 MISC metadata.xml 326 BLAKE2B 7c133a6dbb4ab4b537c0741ec9f3cd525c0803040950ee93e4c1cbc848c7618074471cc1a18ca07d6963c06252c83b66df0811ebae4c0cf9d7782f66ca5aa14a SHA512 1aacf941a9fa57429468fdfc8f546f559c5d483988ba5c6b0f4ed0fe5913f85d218b2a9eec83bae1d11a71eed36a37e76ccedc192697fbe9763fd0b09b2dcfd7
diff --git a/sys-libs/liburing/liburing-2.3-r4.ebuild b/sys-libs/liburing/liburing-2.3-r4.ebuild
index f599513579c9..4068e5f09a48 100644
--- a/sys-libs/liburing/liburing-2.3-r4.ebuild
+++ b/sys-libs/liburing/liburing-2.3-r4.ebuild
@@ -13,6 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	QA_PKGCONFIG_VERSION=${PV}
 fi
 LICENSE="MIT"
 SLOT="0/2" # liburing.so major version
@@ -35,12 +36,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if [[ "${PV}" != *9999 ]] ; then
-		# Make sure pkgconfig files contain the correct version
-		# bug #809095 and #833895
-		sed -i "/^Version:/s@[[:digit:]\.]\+@${PV}@" ${PN}.spec || die
-	fi
-
 	if ! use examples; then
 		sed -e '/examples/d' Makefile -i || die
 	fi
diff --git a/sys-libs/liburing/liburing-9999.ebuild b/sys-libs/liburing/liburing-9999.ebuild
index 60a614906d8e..ecb77ed5b823 100644
--- a/sys-libs/liburing/liburing-9999.ebuild
+++ b/sys-libs/liburing/liburing-9999.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,14 +12,15 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	QA_PKGCONFIG_VERSION=${PV}
 fi
 LICENSE="MIT"
 SLOT="0/2" # liburing.so major version
 
-IUSE="static-libs"
+IUSE="examples static-libs test"
 # fsync test hangs forever
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 # At least installed headers need <linux/*>, bug #802516
 DEPEND=">=sys-kernel/linux-headers-5.1"
@@ -28,10 +29,11 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	if [[ "${PV}" != *9999 ]] ; then
-		# Make sure pkgconfig files contain the correct version
-		# bug #809095 and #833895
-		sed -i "/^Version:/s@[[:digit:]\.]\+@${PV}@" ${PN}.spec || die
+	if ! use examples; then
+		sed -e '/examples/d' Makefile -i || die
+	fi
+	if ! use test; then
+		sed -e '/test/d' Makefile -i || die
 	fi
 
 	multilib_copy_sources
@@ -63,5 +65,19 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	emake V=1 runtests
+	local disabled_tests=(
+		accept.c
+		fpos.c
+		io_uring_register.c
+		link-timeout.c
+		read-before-exit.c
+		recv-msgall-stream.c
+	)
+	local disabled_test
+	for disabled_test in "${disabled_tests[@]}"; do
+		sed -i "/\s*${disabled_test}/d" test/Makefile \
+			|| die "Failed to remove ${disabled_test}"
+	done
+
+	emake -C test V=1 runtests
 }
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index c1933e3bf6bc..e825d1154dfa 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,7 +1,9 @@
 DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938
 DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f44427e74709eca497d6242bc4f46a91878d3d253c1af4819887ce7df522fe41f88f6059ec5f6c706c7e071ee35 SHA512 7aa05c09e3c708769e31cda88b319cee3629c88c51bda559193a85d4ab32204a8b4ba11f142861dbca06b578bf54953f2aca1ad847e99995a4fc40bf08618a93
 DIST tevent-0.14.0.tar.gz 878142 BLAKE2B 8c1c2b4cb683a3ca2630181904566c3cf9d0151c7e280f86e0ce24febfc5d0a1e85757e3ad9d635205bbcbe3e0d0a060dedb3207fb4e91ea76f36246f0a2704a SHA512 5e9525b2f8f8014d1147244dcccd6cf5ac49e383c49b19480ac1256dc7ccf60705960e87b8f63348fca3f4f496861f3d307ee5e0fde8189d93a596c5e689f2b1
+DIST tevent-0.14.1.tar.gz 881979 BLAKE2B 272b7d0029061dfd172a39135d806b937ee6f5bb9eb4c9c8d68a6e5cb3d9eca01582f7ddf5a15d7f033d3322c7fd4d6e87d697f76e4d44565c8e757398a5f0f8 SHA512 0bcc87c10f84e947edad8f8c31f3923253c599b7a69a1db1c21ab292e02937ccb8bad9f0f70e27420ead687aaed1a9b3830b6daa903b8a9bd48cc035a6e5f4ec
 EBUILD tevent-0.12.1.ebuild 1649 BLAKE2B d2304e9a7b79936bfb107cc8425b655d309091ebee54564dc2353695bed7427eb1be44afd368bed36ab3ca3a63715f87113f3a35cd1637c37fe9eb09103098a1 SHA512 39eb19659060d6ffeebdbfa5feb9994c9f52d23d6d238910bc4b12cb7971d2e08faaf6676a2d289b903018966c97267cd442c843357452d7b9493621c6667359
 EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 7836a61116d0721c0c50e31f691ecea1a55124d52b9bb9d48db71c33e52c0440d95a8cb6163751da73567e0024aa3caf91d868dc7d86782ff87d4825ee520503 SHA512 a61ca9ca0e91eb649e1b429c985078155668a5e60fac5b9aee9e6c44a0f25fce91653056a1d25775a8fb70c078a189bd8471c8ba1704b2b91911db830b82ec17
 EBUILD tevent-0.14.0.ebuild 2394 BLAKE2B 406ffbb4cc1fe6e0fddb01fee0d22ae2c887a8bdef7f9bd70349729c08a1ed57adc782e4206e6205981cf5b67f1f970ce0230b63a825ec515883e68b161999d3 SHA512 76ad5b726a22bf44be9c5a0baa7ef42f8e51d28908215391075b46346dbbc9f9f45404bd8eb75a621e43d04a78ecd7f8aba03ae1f886e934c40459abe63f1b59
+EBUILD tevent-0.14.1.ebuild 2393 BLAKE2B a460f2644ad9b81b076a7c72c85a1cfa4d1040beef7267ef516b2515c7de8659261641d20f0a87eb6d60d052fdee5fa41f6e3a4669683a1d23fb2877826cfcda SHA512 8ee1ae552947b262866e9d6496314759518a4bdb5a090798879bf7d07b17128b9dc322c40a3c7f3d6a3012758c2127d768dc3b68dbd8dbe584b9c9962436677e
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.14.1.ebuild b/sys-libs/tevent/tevent-0.14.1.ebuild
new file mode 100644
index 000000000000..3dad3e508985
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.14.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test !test? ( test )"
+
+TALLOC_VERSION="2.4.0"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		>=sys-libs/talloc-${TALLOC_VERSION}[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		net-libs/rpcsvc-proto
+	)
+	test? ( >=dev-util/cmocka-1.1.3 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+	check_samba_dep_versions
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	MAKEOPTS+=" -j1"
+
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	waf-utils_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-dependency-tracking \
+		--disable-warnings-as-errors \
+		--bundled-libraries="${bundled_libs}" \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4d2f6d4063df..3e3c8a324036 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 62fff8521b20..540611ed6e9d 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,5 +1,5 @@
 DIST fvwm-crystal-3.7.1.tar.gz 5936306 BLAKE2B 3a47ddab10365faf13c4b9de8ac172b2f91073addd7799315a47901c10b28b6b16c89ccb9c4a313285cd1e9b40d6ecd8b563e8764bb063d249ceb54804d63ec7 SHA512 0e61bd190ab0b9f4c51b65e9bbeb3689c38127769166f90fc2eff655c68b11c60e67ef35417ed7e97d06bb549d2a87ba6785fc6530a5269d19c1243d3cbe27ed
 DIST fvwm-crystal-3.7.5.tar.gz 5962351 BLAKE2B b5a7458c5bc97846ba48e18168da05d0cda4f26b2f0252abcfd12953de4ac80b34a521759152d559fef59ab53e5f252434d1f1840a779271fc9fffd7ec8632b0 SHA512 333eeeabf1b7b88e1ce7ba5e018a013471db215214b5d9bd86d0f0e107d7443f89bc409e23f3ef4a61c9ced63b862614507cb5ae74063f14d9e0d8b1eb97186b
 EBUILD fvwm-crystal-3.7.1.ebuild 2199 BLAKE2B 3041e49c577cda9c5a22da4b8c461801ae159c386823aa92144b56fbd357a95419da0f71f985e50d1058e4fc0664774d8fc25b1c892ad678e8f084d5af6a707b SHA512 671242d1396a3308f4a532a6a32c7956be73ea81901a9b80bcf7958db0627399c2e6065ba2fbe363228dce8e291f464008301efd10a336a5325c822fda8b5e03
-EBUILD fvwm-crystal-3.7.5.ebuild 2233 BLAKE2B ab513a4f5f57bc4c03ab360afe65769b7b530fefae2a2e3427844569815080b5eedaace6f0b2ab95cac956d6e9417ed68b8b7786505edc009aaea59594ccfb3e SHA512 0f74d89e60e111e9dc630a181274e43cf1e446f4bd6dec1168c0ceeedee44c1397b1c41e1ffa303d51aa4c9d26a2a99e753cf834e37cb9c477f39abf455a1c5a
+EBUILD fvwm-crystal-3.7.5.ebuild 2217 BLAKE2B 4054fc7165e384a7551269259fe222c77a8a45b0c5ce8725a615044740a614a3a562f710efc21a245f4f14c7cef26c9a9c0729d213e8da0ffba5c4ee822adadc SHA512 16bc3b9ccde5a50373ccb2d70fe782d024c5018df54bef4a2b0e779336549fe727be8e31b32a7a66332451a32fa56bebe37753bd4ba2672755bfee461fdfb1ca
 MISC metadata.xml 1258 BLAKE2B 87ffa421c8884bd447097d404d1bb21264e5b86f620ab554ea4854d68a0b5c62bcfa86f4c1f8ed85b36e56f894f36b63ba675e2b56806013f38dc60a643f1d1c SHA512 7b191ab2ebe7aab32158d167fb5a0b3aa2e0b8cce1b2f7324a02f775bb7a8e23f3f8c74eb1ab1ab00f82887a64f1fa9a1274ebb2741dce8a5a511ad91cd3f113
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
index d5a1fbfa9776..8162d9f4dd42 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
@@ -7,11 +7,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit readme.gentoo-r1 python-single-r1 optfeature
 
 DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
-HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+HOMEPAGE="https://fvwm-crystal.sourceforge.net/"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
@@ -21,17 +17,22 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="${PYTHON_DEPS}
 	acct-group/fvwm-crystal
-	|| ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] )
-	virtual/imagemagick-tools
-	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-	|| ( x11-misc/hsetroot media-gfx/feh )
+	app-alternatives/awk
+	media-sound/alsa-utils
 	sys-apps/sed
 	sys-devel/bc
-	app-alternatives/awk
+	virtual/imagemagick-tools
 	x11-apps/xwd
-	media-sound/alsa-utils"
+	|| ( x11-misc/hsetroot media-gfx/feh )
+	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+	|| ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] )
+"
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="After a first time installation, execute the following commands:
@@ -55,7 +56,7 @@ src_install() {
 		prefix="${EPREFIX}/usr" \
 		install
 	# GNU License is globally in the portage tree
-	rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
+	rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE || die
 
 	python_doscript "${ED}/usr/bin/${PN}".{apps,wallpaper}
 	python_scriptinto "/usr/share/${PN}"/fvwm/scripts/FvwmMPD
@@ -67,5 +68,5 @@ pkg_postinst() {
 	readme.gentoo_print_elog
 	optfeature "localized XDG user directories support" "x11-misc/xdg-user-dirs"
 	optfeature "hibernate/resume support" "sys-apps/systemd"
-	optfeature "professional sound server" "media-sound/jack-audio-connection-kit"
+	optfeature "professional sound server" "virtual/jack"
 }
author	V3n3RiX <venerix@koprulu.sector>	2023-02-19 14:14:16 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-02-19 14:14:16 +0000
commit	80c51284f0017d5765c7ae39207be9c58f4bfa17 (patch)
tree	f870412cb8771b0acdc3b28c70c09545bf034385
parent	fd089c26c06476b291a5255011ee378561c2615d (diff)